vxe-table 4.7.57 → 4.7.59

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.57";
+const version = "4.7.59";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.57";
+core_.VxeUI.tableVersion = "4.7.59";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2124,7 +2124,8 @@ core_.VxeUI.setConfig({
     proxyConfig: {
       enabled: true,
       autoLoad: true,
-      message: true,
+      showResponseMsg: true,
+      showActiveMsg: true,
       props: {
         list: null,
         result: 'result',
@@ -2331,7 +2332,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.57"}`;
+const log_version = `table v${"4.7.59"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -17771,11 +17772,18 @@ edit_hook_hooks.add('tableEditModule', {
        * 获取表格数据集，包含新增、删除、修改、标记
        */
       getRecordset() {
+        const removeRecords = editMethods.getRemoveRecords();
+        const pendingRecords = $xeTable.getPendingRecords();
+        const delRecords = removeRecords.concat(pendingRecords);
+        // 如果已经被删除，则无需放到更新数组
+        const updateRecords = editMethods.getUpdateRecords().filter(row => {
+          return !delRecords.some(item => $xeTable.eqRow(item, row));
+        });
         return {
           insertRecords: editMethods.getInsertRecords(),
-          removeRecords: editMethods.getRemoveRecords(),
-          updateRecords: editMethods.getUpdateRecords(),
-          pendingRecords: $xeTable.getPendingRecords()
+          removeRecords,
+          updateRecords,
+          pendingRecords
         };
       },
       /**
@@ -21974,6 +21982,23 @@ render_renderer.mixin({
       })];
     }
   },
+  VxeImageGroup: {
+    renderDefault(renderOpts, params) {
+      const {
+        row,
+        column
+      } = params;
+      const {
+        props
+      } = renderOpts;
+      const cellValue = getCellValue(row, column);
+      return [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)(getDefaultComponent(renderOpts), {
+        ...props,
+        urlList: cellValue,
+        ...getEditOns(renderOpts, params)
+      })];
+    }
+  },
   // 以下已废弃
   $input: {
     autofocus: '.vxe-input--inner',
@@ -22783,9 +22808,13 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
     const computeProxyOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, grid_getConfig().grid.proxyConfig, props.proxyConfig);
     });
-    const computeIsMsg = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+    const computeIsRespMsg = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const proxyOpts = computeProxyOpts.value;
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(proxyOpts.message) ? proxyOpts.message : proxyOpts.showResponseMsg;
+    });
+    const computeIsActiveMsg = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const proxyOpts = computeProxyOpts.value;
-      return proxyOpts.message !== false;
+      return proxyOpts.showActiveMsg;
     });
     const computePagerOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, grid_getConfig().grid.pagerConfig, props.pagerConfig);
@@ -22907,14 +22936,14 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       }
     };
     const triggerPendingEvent = code => {
-      const isMsg = computeIsMsg.value;
+      const isActiveMsg = computeIsActiveMsg.value;
       const $xeTable = refTable.value;
       const selectRecords = $xeTable.getCheckboxRecords();
       if (selectRecords.length) {
         $xeTable.togglePendingRow(selectRecords);
         gridExtendTableMethods.clearCheckboxRow();
       } else {
-        if (isMsg) {
+        if (isActiveMsg) {
           if (core_.VxeUI.modal) {
             core_.VxeUI.modal.message({
               id: code,
@@ -22939,9 +22968,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       return msg || grid_getI18n(defaultMsg);
     };
     const handleDeleteRow = (code, alertKey, callback) => {
-      const isMsg = computeIsMsg.value;
+      const isActiveMsg = computeIsActiveMsg.value;
       const selectRecords = gridExtendTableMethods.getCheckboxRecords();
-      if (isMsg) {
+      if (isActiveMsg) {
         if (selectRecords.length) {
           if (core_.VxeUI.modal) {
             return core_.VxeUI.modal.confirm({
@@ -23471,7 +23500,8 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
           tablePage,
           formData
         } = reactData;
-        const isMsg = computeIsMsg.value;
+        const isActiveMsg = computeIsActiveMsg.value;
+        const isRespMsg = computeIsRespMsg.value;
         const proxyOpts = computeProxyOpts.value;
         const pagerOpts = computePagerOpts.value;
         const toolbarOpts = computeToolbarOpts.value;
@@ -23676,7 +23706,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                     return Promise.resolve((beforeDelete || ajaxMethods)(...applyArgs)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.setPendingRow(removeRecords, false);
-                      if (isMsg) {
+                      if (isRespMsg) {
                         if (core_.VxeUI.modal) {
                           core_.VxeUI.modal.message({
                             content: getRespMsg(rest, 'vxe.grid.delSuccess'),
@@ -23694,7 +23724,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                       };
                     }).catch(rest => {
                       reactData.tableLoading = false;
-                      if (isMsg) {
+                      if (isRespMsg) {
                         if (core_.VxeUI.modal) {
                           core_.VxeUI.modal.message({
                             id: code,
@@ -23709,7 +23739,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                     });
                   });
                 } else {
-                  if (isMsg) {
+                  if (isActiveMsg) {
                     if (core_.VxeUI.modal) {
                       core_.VxeUI.modal.message({
                         id: code,
@@ -23769,7 +23799,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                     return Promise.resolve((beforeSave || ajaxMethods)(...applyArgs)).then(rest => {
                       reactData.tableLoading = false;
                       $xeTable.clearPendingRow();
-                      if (isMsg) {
+                      if (isRespMsg) {
                         if (core_.VxeUI.modal) {
                           core_.VxeUI.modal.message({
                             content: getRespMsg(rest, 'vxe.grid.saveSuccess'),
@@ -23787,7 +23817,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                       };
                     }).catch(rest => {
                       reactData.tableLoading = false;
-                      if (isMsg) {
+                      if (isRespMsg) {
                         if (core_.VxeUI.modal) {
                           core_.VxeUI.modal.message({
                             id: code,
@@ -23801,7 +23831,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
                       };
                     });
                   } else {
-                    if (isMsg) {
+                    if (isActiveMsg) {
                       if (core_.VxeUI.modal) {
                         core_.VxeUI.modal.message({
                           id: code,