vxe-table 4.10.11 → 4.10.13

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.11";
+const version = "4.10.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3585,7 +3585,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.11"}`;
+const log_version = `table v${"4.10.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6606,6 +6606,7 @@ const renderType = 'body';
           'fixed--width': !isAutoCellWidth,
           'fixed--hidden': fixedHiddenColumn,
           'is--padding': isCellPadding,
+          'is--progress': fixedHiddenColumn && isAllOverflow || isVNPreEmptyStatus,
           'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
           'is--drag-disabled': isDisabledDrag,
           'col--dirty': isDirty,
@@ -12059,7 +12060,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
-        transform
+        transform,
+        rowField,
+        parentField,
+        mapChildrenField
       } = treeOpts;
       const {
         remote: allRemoteFilter,
@@ -12073,7 +12077,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = sortOpts;
       let tableData = [];
       let tableTree = [];
-      // 处理列
+      // 处理数据
       if (!allRemoteFilter || !allRemoteSort) {
         const filterColumns = [];
         let orderColumns = [];
@@ -12175,7 +12179,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             });
             tableData = tableTree;
@@ -12189,7 +12193,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             });
             tableData = tableTree;
@@ -12211,10 +12215,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               });
               tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
             } else {
-              tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableTree, orderColumns.map(({
+              const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+                children: mapChildrenField
+              });
+              tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
                 column,
                 order
-              }) => [getOrderField(column), order]));
+              }) => [getOrderField(column), order])), {
+                key: rowField,
+                parentKey: parentField,
+                children: childrenField,
+                mapChildren: mapChildrenField
+              });
             }
             tableData = tableTree;
           } else {
@@ -16535,46 +16547,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 如果单元格配置了校验规则，则会进行校验
        */
       updateStatus(slotParams, cellValue) {
-        const customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           const {
             editRules
           } = props;
-          const {
-            validStore
-          } = reactData;
-          const tableBody = refTableBody.value;
-          if (slotParams && tableBody && editRules) {
-            const {
-              row,
-              column
-            } = slotParams;
-            const type = 'change';
-            if ($xeTable.hasCellRules) {
-              if ($xeTable.hasCellRules(type, row, column)) {
-                const cell = tableMethods.getCellElement(row, column);
-                if (cell) {
-                  return $xeTable.validCellRules(type, row, column, cellValue).then(() => {
-                    if (customVal && validStore.visible) {
-                      setCellValue(row, column, cellValue);
-                    }
-                    $xeTable.clearValidate(row, column);
-                  }).catch(({
-                    rule
-                  }) => {
-                    if (customVal) {
-                      setCellValue(row, column, cellValue);
-                    }
-                    $xeTable.showValidTooltip({
-                      rule,
-                      row,
-                      column,
-                      cell
-                    });
-                  });
-                }
-              }
-            }
+          if (slotParams && editRules) {
+            return $xeTable.handleCellRuleUpdateStatus('change', slotParams, cellValue);
           }
         });
       },
@@ -19284,6 +19262,42 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           $xeTable.handleColumnSortEvent(evnt, column);
         }
       },
+      handleCellRuleUpdateStatus(type, cellParams, cellValue) {
+        const {
+          validStore
+        } = reactData;
+        const {
+          row,
+          column
+        } = cellParams;
+        if ($xeTable.hasCellRules) {
+          if ($xeTable.hasCellRules(type, row, column)) {
+            const cell = $xeTable.getCellElement(row, column);
+            if (cell) {
+              const customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
+              return $xeTable.validCellRules(type, row, column, cellValue).then(() => {
+                if (customVal && validStore.visible) {
+                  setCellValue(row, column, cellValue);
+                }
+                $xeTable.clearValidate(row, column);
+              }).catch(({
+                rule
+              }) => {
+                if (customVal) {
+                  setCellValue(row, column, cellValue);
+                }
+                $xeTable.showValidTooltip({
+                  rule,
+                  row,
+                  column,
+                  cell
+                });
+              });
+            }
+          }
+        }
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      },
       /**
        * 表头单元格按下事件
        */
@@ -23021,11 +23035,8 @@ edit_hook_hooks.add('tableEditModule', {
           $columnIndex: $xeTable.getVMColumnIndex(column)
         }, evnt || null);
       }
-      (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas();
-        }
-      });
+      focused.row = null;
+      focused.column = null;
       if (validOpts.autoClear) {
         if (validOpts.msgMode !== 'full' || hook_getConfig().cellVaildMode === 'obsolete') {
           if ($xeTable.clearValidate) {
@@ -23033,9 +23044,11 @@ edit_hook_hooks.add('tableEditModule', {
           }
         }
       }
-      focused.row = null;
-      focused.column = null;
-      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas();
+        }
+      });
     };
     editMethods = {
       /**
@@ -23802,6 +23815,7 @@ function createHtmlPage(opts, content) {
 
 
 
+
 const {
   getI18n: export_hook_getI18n,
   hooks: export_hook_hooks,
@@ -24203,7 +24217,7 @@ export_hook_hooks.add('tableExportModule', {
                         cellValue = htmlCellElem.innerText.trim();
                       } else {
                         const cell = $xeTable.getCellElement(row, column);
-                        if (cell) {
+                        if (cell && !hasClass(cell, 'is--progress')) {
                           cellValue = cell.innerText.trim();
                         }
                       }
@@ -24273,7 +24287,7 @@ export_hook_hooks.add('tableExportModule', {
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
                     const cell = $xeTable.getCellElement(row, column);
-                    if (cell) {
+                    if (cell && !hasClass(cell, 'is--progress')) {
                       cellValue = cell.innerText.trim();
                     }
                   }
@@ -26178,9 +26192,16 @@ validator_hook_hooks.add('tableValidatorModule', {
         editRules,
         treeConfig
       } = props;
+      const {
+        editStore,
+        pendingRowMaps
+      } = reactData;
       const {
         afterFullData
       } = internalData;
+      const {
+        removeMaps
+      } = editStore;
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const validOpts = computeValidOpts.value;
@@ -26209,6 +26230,15 @@ validator_hook_hooks.add('tableValidatorModule', {
       if (editRules) {
         const columns = cols && cols.length ? cols : $xeTable.getColumns();
         const handleVaild = row => {
+          const rowid = getRowid($xeTable, row);
+          // 是否删除
+          if (removeMaps[rowid]) {
+            return;
+          }
+          // 是否标记删除
+          if (pendingRowMaps[rowid]) {
+            return;
+          }
           if (isFull || !validRuleErr) {
             const colVailds = [];
             columns.forEach(column => {
@@ -27132,12 +27162,17 @@ function getCellLabelVNs(renderOpts, params, cellLabel) {
  * @param modelFunc
  * @param changeFunc
  */
-function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
+function getNativeElementOns(renderOpts, params, eFns) {
   const {
     events
   } = renderOpts;
   const modelEvent = getModelEvent(renderOpts);
   const changeEvent = getChangeEvent(renderOpts);
+  const {
+    model: modelFunc,
+    change: changeFunc,
+    blur: blurFunc
+  } = eFns || {};
   const isSameEvent = changeEvent === modelEvent;
   const ons = {};
   if (events) {
@@ -27159,15 +27194,24 @@ function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
     };
   }
   if (!isSameEvent && changeFunc) {
-    ons[getOnName(changeEvent)] = function (...args) {
-      changeFunc(...args);
+    ons[getOnName(changeEvent)] = function (evnt) {
+      changeFunc(evnt);
       if (events && events[changeEvent]) {
-        events[changeEvent](params, ...args);
+        events[changeEvent](params, evnt);
+      }
+    };
+  }
+  if (blurFunc) {
+    ons[getOnName(blurEvent)] = function (evnt) {
+      blurFunc(evnt);
+      if (events && events[blurEvent]) {
+        events[blurEvent](params, evnt);
       }
     };
   }
   return ons;
 }
+const blurEvent = 'blur';
 /**
  * 组件事件处理
  * @param renderOpts
@@ -27175,12 +27219,17 @@ function getNativeElementOns(renderOpts, params, modelFunc, changeFunc) {
  * @param modelFunc
  * @param changeFunc
  */
-function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
+function getComponentOns(renderOpts, params, eFns) {
   const {
     events
   } = renderOpts;
   const modelEvent = getModelEvent(renderOpts);
   const changeEvent = getChangeEvent(renderOpts);
+  const {
+    model: modelFunc,
+    change: changeFunc,
+    blur: blurFunc
+  } = eFns || {};
   const ons = {};
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(events, (func, key) => {
     ons[getOnName(key)] = function (...args) {
@@ -27208,6 +27257,14 @@ function getComponentOns(renderOpts, params, modelFunc, changeFunc) {
       }
     };
   }
+  if (blurFunc) {
+    ons[getOnName(blurEvent)] = function (...args) {
+      blurFunc(...args);
+      if (events && events[blurEvent]) {
+        events[blurEvent](params, ...args);
+      }
+    };
+  }
   return ons;
 }
 function getEditOns(renderOpts, params) {
@@ -27223,31 +27280,47 @@ function getEditOns(renderOpts, params) {
     model
   } = column;
   const isImmediate = isImmediateCell(renderOpts, params);
-  return getComponentOns(renderOpts, params, cellValue => {
-    // 处理 model 值双向绑定
-    model.update = true;
-    model.value = cellValue;
-    if (isImmediate) {
-      setCellValue(row, column, cellValue);
-    }
-  }, eventParams => {
-    // 处理 change 事件相关逻辑
-    if (!isImmediate && ['VxeInput', 'VxeNumberInput', 'VxeTextarea', '$input', '$textarea'].includes(name)) {
-      const cellValue = eventParams.value;
+  return getComponentOns(renderOpts, params, {
+    model(cellValue) {
+      // 处理 model 值双向绑定
       model.update = true;
       model.value = cellValue;
-      $table.updateStatus(params, cellValue);
-    } else {
-      $table.updateStatus(params);
+      if (isImmediate) {
+        setCellValue(row, column, cellValue);
+      }
+    },
+    change(eventParams) {
+      // 处理 change 事件相关逻辑
+      if (!isImmediate && name && ['VxeInput', 'VxeNumberInput', 'VxeTextarea', '$input', '$textarea'].includes(name)) {
+        const cellValue = eventParams.value;
+        model.update = true;
+        model.value = cellValue;
+        $table.updateStatus(params, cellValue);
+      } else {
+        $table.updateStatus(params);
+      }
+    },
+    blur() {
+      if (isImmediate) {
+        $table.handleCellRuleUpdateStatus('blur', params);
+      } else {
+        $table.handleCellRuleUpdateStatus('blur', params, model.value);
+      }
     }
   });
 }
 function getFilterOns(renderOpts, params, option) {
-  return getComponentOns(renderOpts, params, value => {
-    // 处理 model 值双向绑定
-    option.data = value;
-  }, () => {
-    handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+  return getComponentOns(renderOpts, params, {
+    model(value) {
+      // 处理 model 值双向绑定
+      option.data = value;
+    },
+    change() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    },
+    blur() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    }
   });
 }
 function getNativeEditOns(renderOpts, params) {
@@ -27259,27 +27332,52 @@ function getNativeEditOns(renderOpts, params) {
   const {
     model
   } = column;
-  return getNativeElementOns(renderOpts, params, evnt => {
-    // 处理 model 值双向绑定
-    const cellValue = evnt.target.value;
-    if (isImmediateCell(renderOpts, params)) {
-      setCellValue(row, column, cellValue);
-    } else {
-      model.update = true;
-      model.value = cellValue;
+  return getNativeElementOns(renderOpts, params, {
+    model(evnt) {
+      // 处理 model 值双向绑定
+      const targetEl = evnt.target;
+      if (targetEl) {
+        const cellValue = targetEl.value;
+        if (isImmediateCell(renderOpts, params)) {
+          setCellValue(row, column, cellValue);
+        } else {
+          model.update = true;
+          model.value = cellValue;
+        }
+      }
+    },
+    change(evnt) {
+      // 处理 change 事件相关逻辑
+      const targetEl = evnt.target;
+      if (targetEl) {
+        const cellValue = targetEl.value;
+        $table.updateStatus(params, cellValue);
+      }
+    },
+    blur(evnt) {
+      const targetEl = evnt.target;
+      if (targetEl) {
+        const cellValue = targetEl.value;
+        $table.updateStatus(params, cellValue);
+      }
     }
-  }, evnt => {
-    // 处理 change 事件相关逻辑
-    const cellValue = evnt.target.value;
-    $table.updateStatus(params, cellValue);
   });
 }
 function getNativeFilterOns(renderOpts, params, option) {
-  return getNativeElementOns(renderOpts, params, evnt => {
-    // 处理 model 值双向绑定
-    option.data = evnt.target.value;
-  }, () => {
-    handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+  return getNativeElementOns(renderOpts, params, {
+    model(evnt) {
+      // 处理 model 值双向绑定
+      const targetEl = evnt.target;
+      if (targetEl) {
+        option.data = targetEl.value;
+      }
+    },
+    change() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    },
+    blur() {
+      handleConfirmFilter(params, !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(option.data), option);
+    }
   });
 }
 /**