vxe-table 3.12.13 → 3.12.14

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.12.13";
+const version = "3.12.14";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2842,7 +2842,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.13"}`;
+const log_version = `table v${"3.12.14"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -12145,10 +12145,9 @@ const Methods = {
     } = sortOpts;
     const {
       field,
-      sortable,
-      remoteSort
+      sortable
     } = column;
-    if (sortable || remoteSort) {
+    if (sortable || column.remoteSort) {
       if (!order || column.order === order) {
         if (allowClear) {
           $xeTable.clearSort(multiple ? column : null);
@@ -12162,6 +12161,44 @@ const Methods = {
       $xeTable.handleColumnSortEvent(evnt, column);
     }
   },
+  handleCellRuleUpdateStatus(type, cellParams, cellValue) {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    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 $xeTable.$nextTick();
+  },
   /**
    * 表头单元格按下事件
    */
@@ -14884,45 +14921,14 @@ const Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus(slotParams, cellValue) {
-    const customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(cellValue);
+    const $xeTable = this;
+    const props = $xeTable;
     return this.$nextTick().then(() => {
       const {
-        $refs,
-        editRules,
-        validStore
-      } = this;
-      const refTableBody = $refs.refTableBody;
-      if (slotParams && refTableBody && editRules) {
-        const {
-          row,
-          column
-        } = slotParams;
-        const type = 'change';
-        if (this.hasCellRules) {
-          if (this.hasCellRules(type, row, column)) {
-            const cell = this.getCellElement(row, column);
-            if (cell) {
-              return this.validCellRules(type, row, column, cellValue).then(() => {
-                if (customVal && validStore.visible) {
-                  setCellValue(row, column, cellValue);
-                }
-                this.clearValidate(row, column);
-              }).catch(({
-                rule
-              }) => {
-                if (customVal) {
-                  setCellValue(row, column, cellValue);
-                }
-                this.showValidTooltip({
-                  rule,
-                  row,
-                  column,
-                  cell
-                });
-              });
-            }
-          }
-        }
+        editRules
+      } = props;
+      if (slotParams && editRules) {
+        return $xeTable.handleCellRuleUpdateStatus('change', slotParams, cellValue);
       }
     });
   },
@@ -16167,8 +16173,10 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
-      isVNPreEmptyStatus = true;
+    if (!isGroup) {
+      if (scrollXLoad && !column.fixed && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
+        isVNPreEmptyStatus = true;
+      }
     }
     const tcStyle = {};
     if (hasEllipsis) {
@@ -21079,11 +21087,6 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
       }
       focused.row = null;
       focused.column = null;
-      $xeTable.$nextTick(() => {
-        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
-          return $xeTable.handleRecalculateCellAreas();
-        }
-      });
       if (validOpts.autoClear) {
         if (validOpts.msgMode !== 'full' || mixin_getConfig().cellVaildMode === 'obsolete') {
           if ($xeTable.clearValidate) {
@@ -21091,7 +21094,11 @@ function handleInsertChildRowAt($xeTable, records, parentRow, targetRow, isInser
           }
         }
       }
-      return $xeTable.$nextTick();
+      return $xeTable.$nextTick().then(() => {
+        if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreas) {
+          return $xeTable.handleRecalculateCellAreas();
+        }
+      });
     },
     _getActiveRecord() {
       if (true) {
@@ -23921,13 +23928,22 @@ function validErrorRuleValue(rule, val) {
      * 返回 Promise 对象，或者使用回调方式
      */
     beginValidate(rows, cols, cb, isFull) {
+      const $xeTable = this;
+      const props = $xeTable;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
       const validRest = {};
       const {
         editRules,
-        afterFullData,
-        treeConfig,
-        treeOpts
-      } = this;
+        treeConfig
+      } = props;
+      const {
+        pendingRowMaps
+      } = reactData;
+      const {
+        afterFullData
+      } = internalData;
+      const treeOpts = $xeTable.computeTreeOpts;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       let validList;
       if (rows === true) {
@@ -23950,6 +23966,11 @@ function validErrorRuleValue(rule, val) {
       if (editRules) {
         const columns = cols && cols.length ? cols : this.getColumns();
         const handleVaild = row => {
+          const rowid = getRowid($xeTable, row);
+          // 是否标记删除
+          if (pendingRowMaps[rowid]) {
+            return;
+          }
           if (isFull || !this.validRuleErr) {
             const colVailds = [];
             columns.forEach(column => {
@@ -25188,6 +25209,12 @@ function renderBody(h, $xeTable) {
         isHeader: false,
         isFooter: false
       },
+      rowHeightStore: {
+        default: 48,
+        medium: 44,
+        small: 40,
+        mini: 36
+      },
       scrollVMLoading: false,
       calcCellHeightFlag: 0,
       resizeHeightFlag: 0,
@@ -25295,12 +25322,9 @@ function renderBody(h, $xeTable) {
       return this.computeRowHeightMaps;
     },
     computeRowHeightMaps() {
-      return {
-        default: 48,
-        medium: 44,
-        small: 40,
-        mini: 36
-      };
+      const $xeTable = this;
+      const reactData = $xeTable;
+      return reactData.rowHeightStore;
     },
     computeDefaultRowHeight() {
       const $xeTable = this;
@@ -26075,9 +26099,29 @@ function renderBody(h, $xeTable) {
   mounted() {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
+    const {
+      rowHeightStore
+    } = reactData;
+    const varEl = $xeTable.$refs.refVarElem;
     const columnOpts = $xeTable.computeColumnOpts;
     const rowOpts = $xeTable.computeRowOpts;
     const customOpts = $xeTable.computeCustomOpts;
+    if (varEl) {
+      const [defEl, mediumEl, smallEl, miniEl] = varEl.children;
+      if (defEl) {
+        rowHeightStore.default = defEl.clientHeight;
+      }
+      if (mediumEl) {
+        rowHeightStore.medium = mediumEl.clientHeight;
+      }
+      if (smallEl) {
+        rowHeightStore.small = smallEl.clientHeight;
+      }
+      if (miniEl) {
+        rowHeightStore.mini = miniEl.clientHeight;
+      }
+    }
     if (columnOpts.drag || rowOpts.drag || customOpts.allowSort) {
       initTpImg();
     }
@@ -26256,6 +26300,17 @@ function renderBody(h, $xeTable) {
       class: 'vxe-table-slots',
       ref: 'hideColumn'
     }, this.$slots.default), h('div', {
+      ref: 'refVarElem',
+      class: 'vxe-table-vars'
+    }, [h('div', {
+      class: 'vxe-table-var-default'
+    }), h('div', {
+      class: 'vxe-table-var-medium'
+    }), h('div', {
+      class: 'vxe-table-var-small'
+    }), h('div', {
+      class: 'vxe-table-var-mini'
+    })]), h('div', {
       key: 'tw',
       class: 'vxe-table--render-wrapper'
     }, scrollbarXToTop ? [renderScrollX(h, $xeTable), renderBody(h, $xeTable)] : [renderBody(h, $xeTable), renderScrollX(h, $xeTable)]),
@@ -28931,12 +28986,17 @@ function getCellLabelVNs(h, 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) {
@@ -28958,15 +29018,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
@@ -28974,12 +29043,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) {
@@ -29007,6 +29081,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) {
@@ -29022,31 +29104,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) {
@@ -29058,27 +29156,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);
+    }
   });
 }
 /**