vxe-table 3.10.14 → 3.10.16

package/es/table/src/methods.js

@@ -3012,7 +3012,14 @@ const Methods = {
                                 if (isClear ||
                                     // 如果点击了当前表格之外
                                     !getEventTargetNode(evnt, $el).flag) {
-                                    setTimeout(() => this.clearEdit(evnt));
+                                    setTimeout(() => {
+                                        this.clearEdit(evnt).then(() => {
+                                            // 如果存在校验，点击了表格之外则清除
+                                            if (!this.isActivated && editRules && validOpts.autoClear) {
+                                                this.validErrorMaps = {};
+                                            }
+                                        });
+                                    });
                                 }
                             });
                         }
@@ -6396,7 +6403,7 @@ const Methods = {
     }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
     Methods[name] = function (...args) {
         if (process.env.NODE_ENV === 'development') {

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.10.14";
+export const version = "3.10.16";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.10.14"}`;
+const version = `table v${"3.10.16"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.10.14";
+const version = "3.10.16";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2769,7 +2769,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.10.14"}`;
+const log_version = `table v${"3.10.16"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8282,7 +8282,14 @@ const Methods = {
                 if (isClear ||
                 // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
-                  setTimeout(() => this.clearEdit(evnt));
+                  setTimeout(() => {
+                    this.clearEdit(evnt).then(() => {
+                      // 如果存在校验，点击了表格之外则清除
+                      if (!this.isActivated && editRules && validOpts.autoClear) {
+                        this.validErrorMaps = {};
+                      }
+                    });
+                  });
                 }
               });
             }
@@ -12390,7 +12397,7 @@ const Methods = {
   }
 };
 // Module methods
-const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
+const funcs = 'setFilter,openFilter,clearFilter,getCheckedFilters,updateFilterOptionStatus,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,getCopyCellAreas,clearCopyCellArea,setCellAreas,openFNR,openFind,openReplace,closeFNR,getSelectedCell,clearSelected,insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearEdit,clearActived,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,fullValidateField,validateField,openExport,closeExport,openPrint,closePrint,getPrintHtml,exportData,openImport,closeImport,importData,saveFile,readFile,importByFile,print,openCustom,closeCustom,saveCustom,cancelCustom,resetCustom,toggleCustomAllCheckbox,setCustomAllCheckbox'.split(',');
 funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (true) {
@@ -19830,29 +19837,46 @@ function getTargetOffset(target, container) {
     offsetLeft
   };
 }
-function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
+function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offsetClientTop, moveRange) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
   let countHeight = 0;
   let rangeRows = [];
+  let moveSize = 0;
   const isDown = moveRange > 0;
-  const moveSize = moveRange > 0 ? moveRange : Math.abs(moveRange) + targetTrElem.offsetHeight;
   const {
-    afterFullData,
-    scrollYStore,
     scrollYLoad
-  } = _vm;
+  } = reactData;
+  const {
+    afterFullData,
+    scrollYStore
+  } = internalData;
   if (scrollYLoad) {
-    const _rowIndex = _vm.getVTRowIndex(params.row);
+    if (isDown) {
+      moveSize = offsetClientTop + moveRange;
+    } else {
+      moveSize = trRect.height - offsetClientTop + Math.abs(moveRange);
+    }
+    const _rowIndex = $xeTable.getVTRowIndex(params.row);
     if (isDown) {
       rangeRows = afterFullData.slice(_rowIndex, _rowIndex + Math.ceil(moveSize / scrollYStore.rowHeight));
     } else {
-      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / scrollYStore.rowHeight) + 1, _rowIndex + 1);
+      rangeRows = afterFullData.slice(_rowIndex - Math.floor(moveSize / scrollYStore.rowHeight), _rowIndex + 1);
     }
   } else {
+    if (isDown) {
+      moveSize = evnt.clientY - trRect.y;
+    } else {
+      moveSize = trRect.y - evnt.clientY + trRect.height;
+    }
     const siblingProp = isDown ? 'next' : 'previous';
     while (targetTrElem && countHeight < moveSize) {
-      rangeRows.push(_vm.getRowNode(targetTrElem).item);
-      countHeight += targetTrElem.offsetHeight;
-      targetTrElem = targetTrElem[`${siblingProp}ElementSibling`];
+      const rowNodeRest = $xeTable.getRowNode(targetTrElem);
+      if (rowNodeRest) {
+        rangeRows.push(rowNodeRest.item);
+        countHeight += targetTrElem.offsetHeight;
+        targetTrElem = targetTrElem[`${siblingProp}ElementSibling`];
+      }
     }
   }
   return rangeRows;
@@ -20077,6 +20101,8 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         const startLeft = offsetRest.offsetLeft + evnt.offsetX;
         const startScrollTop = bodyWrapperElem.scrollTop;
         const rowHeight = trElem.offsetHeight;
+        const trRect = trElem.getBoundingClientRect();
+        const offsetClientTop = disY - trRect.y;
         let mouseScrollTimeout = null;
         let isMouseScrollDown = false;
         let mouseScrollSpaceSize = 1;
@@ -20124,7 +20150,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
           checkboxRangeElem.style.left = `${rangeLeft}px`;
           checkboxRangeElem.style.top = `${rangeTop}px`;
           checkboxRangeElem.style.display = 'block';
-          const rangeRows = getCheckboxRangeRows(this, params, trElem, offsetTop < marginSize ? -rangeHeight : rangeHeight);
+          const rangeRows = getCheckboxRangeRows(this, evnt, params, trElem, trRect, offsetClientTop, offsetTop < marginSize ? -rangeHeight : rangeHeight);
           // 至少滑动 10px 才能有效匹配
           if (rangeHeight > 10 && rangeRows.length !== lastRangeRows.length) {
             lastRangeRows = rangeRows;
@@ -20342,7 +20368,7 @@ function validErrorRuleValue(rule, val) {
           warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
         }
       }
-      return this.beginValidate(rows, cb, true);
+      return this.beginValidate(rows, null, cb, true);
     },
     /**
      * 快速校验，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
@@ -20353,7 +20379,27 @@ function validErrorRuleValue(rule, val) {
           warnLog('vxe.error.notValidators', ['validate(rows, callback)', 'validate(rows)']);
         }
       }
-      return this.beginValidate(rows, cb);
+      return this.beginValidate(rows, null, cb);
+    },
+    /**
+     * 完整校验单元格，和 validateField 的区别就是会给有效数据中的每一行进行校验
+     */
+    _fullValidateField(rows, fieldOrColumn) {
+      const colList = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn(this, column));
+      if (colList.length) {
+        return this.beginValidate(rows, colList, null, true);
+      }
+      return this.$nextTick();
+    },
+    /**
+     * 快速校验单元格，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
+     */
+    _validateField(rows, fieldOrColumn) {
+      const colList = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn(this, column));
+      if (colList.length) {
+        return this.beginValidate(rows, colList, null);
+      }
+      return this.$nextTick();
     },
     /**
      * 聚焦到校验通过的单元格并弹出校验错误提示
@@ -20402,7 +20448,7 @@ function validErrorRuleValue(rule, val) {
      * 如果只传 callback 否则默认验证整个表格数据
      * 返回 Promise 对象，或者使用回调方式
      */
-    beginValidate(rows, cb, isFull) {
+    beginValidate(rows, cols, cb, isFull) {
       const validRest = {};
       const {
         editRules,
@@ -20431,12 +20477,13 @@ function validErrorRuleValue(rule, val) {
       this.clearValidate();
       const validErrMaps = {};
       if (editRules) {
-        const columns = this.getColumns();
+        const columns = cols && cols.length ? cols : this.getColumns();
         const handleVaild = row => {
           if (isFull || !this.validRuleErr) {
             const colVailds = [];
             columns.forEach(column => {
-              if ((isFull || !this.validRuleErr) && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().has(editRules, column.property)) {
+              const field = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(column) ? column : column.field;
+              if ((isFull || !this.validRuleErr) && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().has(editRules, field)) {
                 colVailds.push(this.validCellRules('all', row, column).catch(({
                   rule,
                   rules
@@ -20448,11 +20495,11 @@ function validErrorRuleValue(rule, val) {
                     row,
                     columnIndex: this.getColumnIndex(column),
                     column,
-                    field: column.property,
+                    field,
                     $table: this
                   };
-                  if (!validRest[column.property]) {
-                    validRest[column.property] = [];
+                  if (!validRest[field]) {
+                    validRest[field] = [];
                   }
                   validErrMaps[`${getRowid(this, row)}:${column.id}`] = {
                     column,
@@ -20460,7 +20507,7 @@ function validErrorRuleValue(rule, val) {
                     rule,
                     content: rule.content
                   };
-                  validRest[column.property].push(rest);
+                  validRest[field].push(rest);
                   if (!isFull) {
                     this.validRuleErr = true;
                     return Promise.reject(rest);
@@ -20677,7 +20724,7 @@ function validErrorRuleValue(rule, val) {
       } = this;
       const validTip = this.$refs.validTip;
       const rowList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows) ? rows : rows ? [rows] : [];
-      const colList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn(this, column));
+      const colList = (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => handleFieldOrColumn(this, column));
       let validErrMaps = {};
       if (validTip && validTip.visible) {
         validTip.close();