vxe-table 4.23.5 → 4.23.6

package/lib/table/module/validator/hook.js

@@ -1,25 +1,35 @@
 "use strict";
-
-var _vue = require("vue");
-var _xeUtils = _interopRequireDefault(require("xe-utils"));
-var _ui = require("../../../ui");
-var _utils = require("../../../ui/src/utils");
-var _dom = require("../../../ui/src/dom");
-var _util = require("../../src/util");
-var _log = require("../../../ui/src/log");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const {
-  warnLog,
-  errLog
-} = (0, _log.createComponentLog)('table');
-const {
-  getConfig,
-  validators,
-  hooks
-} = _ui.VxeUI;
-/**
- * 校验规则
- */
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var import_vue = require("vue");
+var import_xe_utils = __toESM(require("xe-utils"));
+var import_ui = require("../../../ui");
+var import_utils = require("../../../ui/src/utils");
+var import_dom = require("../../../ui/src/dom");
+var import_util = require("../../src/util");
+var import_log = require("../../../ui/src/log");
+const { warnLog, errLog } = (0, import_log.createComponentLog)("table");
+const { getConfig, validators, hooks } = import_ui.VxeUI;
 class Rule {
   constructor(rule) {
     Object.assign(this, {
@@ -39,49 +49,41 @@ class Rule {
    * 支持国际化翻译
    */
   get content() {
-    return (0, _utils.getFuncText)(this.$options.content || this.$options.message);
+    return (0, import_utils.getFuncText)(this.$options.content || this.$options.message);
   }
   get message() {
     return this.content;
   }
 }
-// 如果存在 pattern，判断正则
 function validREValue(pattern, val) {
-  if (pattern && !(_xeUtils.default.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+  if (pattern && !(import_xe_utils.default.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
     return false;
   }
   return true;
 }
-// 如果存在 max，判断最大值
 function validMaxValue(max, num) {
-  if (!_xeUtils.default.eqNull(max) && num > _xeUtils.default.toNumber(max)) {
+  if (!import_xe_utils.default.eqNull(max) && num > import_xe_utils.default.toNumber(max)) {
     return false;
   }
   return true;
 }
-// 如果存在 min，判断最小值
 function validMinValue(min, num) {
-  if (!_xeUtils.default.eqNull(min) && num < _xeUtils.default.toNumber(min)) {
+  if (!import_xe_utils.default.eqNull(min) && num < import_xe_utils.default.toNumber(min)) {
     return false;
   }
   return true;
 }
 function validRuleValue(rule, val, required) {
-  const {
-    type,
-    min,
-    max,
-    pattern
-  } = rule;
-  const isArrType = type === 'array';
-  const isNumType = type === 'number';
-  const isStrType = type === 'string';
+  const { type, min, max, pattern } = rule;
+  const isArrType = type === "array";
+  const isNumType = type === "number";
+  const isStrType = type === "string";
   const strVal = `${val}`;
   if (!validREValue(pattern, strVal)) {
     return false;
   }
   if (isArrType) {
-    if (!_xeUtils.default.isArray(val)) {
+    if (!import_xe_utils.default.isArray(val)) {
       return false;
     }
     if (required) {
@@ -108,7 +110,7 @@ function validRuleValue(rule, val, required) {
     }
   } else {
     if (isStrType) {
-      if (!_xeUtils.default.isString(val)) {
+      if (!import_xe_utils.default.isString(val)) {
         return false;
       }
     }
@@ -127,12 +129,9 @@ function validRuleValue(rule, val, required) {
   return true;
 }
 function checkRuleStatus(rule, row, val) {
-  const {
-    required,
-    field
-  } = rule;
-  const currVal = field ? _xeUtils.default.get(row, field) : val;
-  const isEmptyVal = _xeUtils.default.isArray(currVal) ? !currVal.length : (0, _utils.eqEmptyValue)(currVal);
+  const { required, field } = rule;
+  const currVal = field ? import_xe_utils.default.get(row, field) : val;
+  const isEmptyVal = import_xe_utils.default.isArray(currVal) ? !currVal.length : (0, import_utils.eqEmptyValue)(currVal);
   if (required) {
     if (isEmptyVal) {
       return false;
@@ -149,56 +148,42 @@ function checkRuleStatus(rule, row, val) {
   }
   return true;
 }
-const tableValidatorMethodKeys = ['fullValidate', 'validate', 'fullValidateField', 'validateField', 'clearValidate'];
-hooks.add('tableValidatorModule', {
+const tableValidatorMethodKeys = ["fullValidate", "validate", "fullValidateField", "validateField", "clearValidate"];
+hooks.add("tableValidatorModule", {
   setupTable($xeTable) {
-    const {
-      props,
-      reactData,
-      internalData
-    } = $xeTable;
-    const {
-      refValidTooltip
-    } = $xeTable.getRefMaps();
-    const {
-      computeValidOpts,
-      computeTreeOpts,
-      computeEditOpts,
-      computeAggregateOpts
-    } = $xeTable.getComputeMaps();
+    const { props, reactData, internalData } = $xeTable;
+    const { refValidTooltip } = $xeTable.getRefMaps();
+    const { computeValidOpts, computeTreeOpts, computeEditOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
     let validatorMethods = {};
     let validatorPrivateMethods = {};
     const handleClearValid = (rows, fieldOrColumn) => {
-      const {
-        validErrorMaps
-      } = reactData;
+      const { validErrorMaps } = reactData;
       const validOpts = computeValidOpts.value;
-      const rowList = _xeUtils.default.isArray(rows) ? rows : rows ? [rows] : [];
-      const colList = (_xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => (0, _util.handleFieldOrColumn)($xeTable, column));
+      const rowList = import_xe_utils.default.isArray(rows) ? rows : rows ? [rows] : [];
+      const colList = (import_xe_utils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map((column) => (0, import_util.handleFieldOrColumn)($xeTable, column));
       let validErrMaps = {};
-      // 如果是多个提示模式
-      if (validOpts.msgMode === 'full') {
+      if (validOpts.msgMode === "full") {
         validErrMaps = Object.assign({}, validErrorMaps);
         if (rowList.length && colList.length) {
-          rowList.forEach(row => {
-            colList.forEach(column => {
-              const validKey = `${(0, _util.getRowid)($xeTable, row)}:${column.id}`;
+          rowList.forEach((row) => {
+            colList.forEach((column) => {
+              const validKey = `${(0, import_util.getRowid)($xeTable, row)}:${column.id}`;
               if (validErrMaps[validKey]) {
                 delete validErrMaps[validKey];
               }
             });
           });
         } else if (rowList.length) {
-          const rowIdList = rowList.map(row => `${(0, _util.getRowid)($xeTable, row)}`);
-          _xeUtils.default.each(validErrorMaps, (item, key) => {
-            if (rowIdList.indexOf(key.split(':')[0]) > -1) {
+          const rowIdList = rowList.map((row) => `${(0, import_util.getRowid)($xeTable, row)}`);
+          import_xe_utils.default.each(validErrorMaps, (item, key) => {
+            if (rowIdList.indexOf(key.split(":")[0]) > -1) {
               delete validErrMaps[key];
             }
           });
         } else if (colList.length) {
-          const colidList = colList.map(column => `${column.id}`);
-          _xeUtils.default.each(validErrorMaps, (item, key) => {
-            if (colidList.indexOf(key.split(':')[1]) > -1) {
+          const colidList = colList.map((column) => `${column.id}`);
+          import_xe_utils.default.each(validErrorMaps, (item, key) => {
+            if (colidList.indexOf(key.split(":")[1]) > -1) {
               delete validErrMaps[key];
             }
           });
@@ -206,28 +191,22 @@ hooks.add('tableValidatorModule', {
       }
       return validErrMaps;
     };
-    /**
-     * 聚焦到校验通过的单元格并弹出校验错误提示
-     */
-    const handleValidError = params => {
-      return new Promise(resolve => {
+    const handleValidError = (params) => {
+      return new Promise((resolve) => {
         const validOpts = computeValidOpts.value;
         if (validOpts.autoPos === false) {
-          $xeTable.dispatchEvent('valid-error', params, null);
+          $xeTable.dispatchEvent("valid-error", params, null);
           resolve();
         } else {
-          $xeTable.handleEdit(params, {
-            type: 'valid-error',
-            trigger: 'call'
-          }).then(() => {
+          $xeTable.handleEdit(params, { type: "valid-error", trigger: "call" }).then(() => {
             resolve($xeTable.showValidTooltip(params));
           });
         }
       });
     };
-    const handleErrMsgMode = validErrMaps => {
+    const handleErrMsgMode = (validErrMaps) => {
       const validOpts = computeValidOpts.value;
-      if (validOpts.msgMode === 'single') {
+      if (validOpts.msgMode === "single") {
         const keys = Object.keys(validErrMaps);
         const resMaps = {};
         if (keys.length) {
@@ -238,29 +217,11 @@ hooks.add('tableValidatorModule', {
       }
       return validErrMaps;
     };
-    /**
-     * 对表格数据进行校验
-     * 如果不指定数据，则默认只校验临时变动的数据，例如新增或修改
-     * 如果传 true 则校验当前表格数据
-     * 如果传 row 指定行记录，则只验证传入的行
-     * 如果传 rows 为多行记录，则只验证传入的行
-     * 如果只传 callback 否则默认验证整个表格数据
-     * 返回 Promise 对象，或者使用回调方式
-     */
     const beginValidate = (rows, cols, cb, isFull) => {
       const validRest = {};
-      const {
-        editRules,
-        treeConfig
-      } = props;
-      const {
-        isRowGroupStatus
-      } = reactData;
-      const {
-        afterFullData,
-        pendingRowMaps,
-        removeRowMaps
-      } = internalData;
+      const { editRules, treeConfig } = props;
+      const { isRowGroupStatus } = reactData;
+      const { afterFullData, pendingRowMaps, removeRowMaps } = internalData;
       const treeOpts = computeTreeOpts.value;
       const aggregateOpts = computeAggregateOpts.value;
       const validOpts = computeValidOpts.value;
@@ -268,10 +229,10 @@ hooks.add('tableValidatorModule', {
       if (rows === true) {
         validList = afterFullData;
       } else if (rows) {
-        if (_xeUtils.default.isFunction(rows)) {
+        if (import_xe_utils.default.isFunction(rows)) {
           cb = rows;
         } else {
-          validList = _xeUtils.default.isArray(rows) ? rows : [rows];
+          validList = import_xe_utils.default.isArray(rows) ? rows : [rows];
         }
       }
       if (!validList) {
@@ -283,18 +244,16 @@ hooks.add('tableValidatorModule', {
       }
       const rowValidErrs = [];
       internalData._lastCallTime = Date.now();
-      internalData.validRuleErr = false; // 如果为快速校验，当存在某列校验不通过时将终止执行
+      internalData.validRuleErr = false;
       $xeTable.clearValidate();
       const validErrMaps = {};
       if (editRules) {
         const columns = cols && cols.length ? cols : $xeTable.getColumns();
-        const handleVaild = row => {
-          const rowid = (0, _util.getRowid)($xeTable, row);
-          // 是否删除
+        const handleVaild = (row) => {
+          const rowid = (0, import_util.getRowid)($xeTable, row);
           if (removeRowMaps[rowid]) {
             return;
           }
-          // 是否标记删除
           if (pendingRowMaps[rowid]) {
             return;
           }
@@ -303,59 +262,54 @@ hooks.add('tableValidatorModule', {
           }
           if (isFull || !internalData.validRuleErr) {
             const colVailds = [];
-            columns.forEach(column => {
-              const field = _xeUtils.default.isString(column) ? column : column.field;
-              if ((isFull || !internalData.validRuleErr) && _xeUtils.default.has(editRules, field)) {
-                colVailds.push(validatorPrivateMethods.validCellRules('all', row, column).catch(({
-                  rule,
-                  rules
-                }) => {
-                  const rest = {
-                    rule,
-                    rules,
-                    rowIndex: $xeTable.getRowIndex(row),
-                    row,
-                    columnIndex: $xeTable.getColumnIndex(column),
-                    column,
-                    field,
-                    $table: $xeTable
-                  };
-                  if (!validRest[field]) {
-                    validRest[field] = [];
-                  }
-                  validErrMaps[`${(0, _util.getRowid)($xeTable, row)}:${column.id}`] = {
-                    column,
-                    row,
-                    rule,
-                    content: rule.content
-                  };
-                  validRest[field].push(rest);
-                  if (!isFull) {
-                    internalData.validRuleErr = true;
-                    return Promise.reject(rest);
-                  }
-                }));
+            columns.forEach((column) => {
+              const field = import_xe_utils.default.isString(column) ? column : column.field;
+              if ((isFull || !internalData.validRuleErr) && import_xe_utils.default.has(editRules, field)) {
+                colVailds.push(
+                  validatorPrivateMethods.validCellRules("all", row, column).catch(({ rule, rules }) => {
+                    const rest = {
+                      rule,
+                      rules,
+                      rowIndex: $xeTable.getRowIndex(row),
+                      row,
+                      columnIndex: $xeTable.getColumnIndex(column),
+                      column,
+                      field,
+                      $table: $xeTable
+                    };
+                    if (!validRest[field]) {
+                      validRest[field] = [];
+                    }
+                    validErrMaps[`${(0, import_util.getRowid)($xeTable, row)}:${column.id}`] = {
+                      column,
+                      row,
+                      rule,
+                      content: rule.content
+                    };
+                    validRest[field].push(rest);
+                    if (!isFull) {
+                      internalData.validRuleErr = true;
+                      return Promise.reject(rest);
+                    }
+                  })
+                );
               }
             });
             rowValidErrs.push(Promise.all(colVailds));
           }
         };
         if (isRowGroupStatus) {
-          _xeUtils.default.eachTree(validList, handleVaild, {
-            children: aggregateOpts.mapChildrenField
-          });
+          import_xe_utils.default.eachTree(validList, handleVaild, { children: aggregateOpts.mapChildrenField });
         } else if (treeConfig) {
           const childrenField = treeOpts.children || treeOpts.childrenField;
-          _xeUtils.default.eachTree(validList, handleVaild, {
-            children: childrenField
-          });
+          import_xe_utils.default.eachTree(validList, handleVaild, { children: childrenField });
         } else {
           validList.forEach(handleVaild);
         }
         return Promise.all(rowValidErrs).then(() => {
           const ruleProps = Object.keys(validRest);
           reactData.validErrorMaps = Object.assign(handleClearValid(rows, columns), handleErrMsgMode(validErrMaps));
-          return (0, _vue.nextTick)().then(() => {
+          return (0, import_vue.nextTick)().then(() => {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
             }
@@ -363,16 +317,15 @@ hooks.add('tableValidatorModule', {
               cb();
             }
           });
-        }).catch(firstErrParams => {
+        }).catch((firstErrParams) => {
           return new Promise((resolve, reject) => {
             const finish = () => {
-              (0, _vue.nextTick)(() => {
+              (0, import_vue.nextTick)(() => {
                 if (cb) {
                   cb(validRest);
                   resolve();
                 } else {
-                  if (getConfig().validToReject === 'obsolete') {
-                    // 已废弃，校验失败将不会执行catch
+                  if (getConfig().validToReject === "obsolete") {
                     reject(validRest);
                   } else {
                     resolve(validRest);
@@ -382,14 +335,9 @@ hooks.add('tableValidatorModule', {
             };
             const posAndFinish = () => {
               firstErrParams.cell = $xeTable.getCellElement(firstErrParams.row, firstErrParams.column);
-              (0, _dom.scrollToView)(firstErrParams.cell);
+              (0, import_dom.scrollToView)(firstErrParams.cell);
               handleValidError(firstErrParams).then(finish);
             };
-            /**
-             * 当校验不通过时
-             * 将表格滚动到可视区
-             * 由于提示信息至少需要占一行，定位向上偏移一行
-             */
             if (validOpts.autoPos === false) {
               finish();
             } else {
@@ -402,7 +350,7 @@ hooks.add('tableValidatorModule', {
       } else {
         reactData.validErrorMaps = {};
       }
-      return (0, _vue.nextTick)().then(() => {
+      return (0, import_vue.nextTick)().then(() => {
         if (cb) {
           cb();
         }
@@ -413,8 +361,8 @@ hooks.add('tableValidatorModule', {
        * 完整校验行，和 validate 的区别就是会给有效数据中的每一行进行校验
        */
       fullValidate(rows, cb) {
-        if (_xeUtils.default.isFunction(cb)) {
-          warnLog('vxe.error.notValidators', ['fullValidate(rows, callback)', 'fullValidate(rows)']);
+        if (import_xe_utils.default.isFunction(cb)) {
+          warnLog("vxe.error.notValidators", ["fullValidate(rows, callback)", "fullValidate(rows)"]);
         }
         return beginValidate(rows, null, cb, true);
       },
@@ -428,21 +376,21 @@ hooks.add('tableValidatorModule', {
        * 完整校验单元格，和 validateField 的区别就是会给有效数据中的每一行进行校验
        */
       fullValidateField(rows, fieldOrColumn) {
-        const colList = (_xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => (0, _util.handleFieldOrColumn)($xeTable, column));
+        const colList = (import_xe_utils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map((column) => (0, import_util.handleFieldOrColumn)($xeTable, column));
         if (colList.length) {
           return beginValidate(rows, colList, null, true);
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       /**
        * 快速校验单元格，如果存在记录不通过的记录，则返回不再继续校验（异步校验除外）
        */
       validateField(rows, fieldOrColumn) {
-        const colList = (_xeUtils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map(column => (0, _util.handleFieldOrColumn)($xeTable, column));
+        const colList = (import_xe_utils.default.isArray(fieldOrColumn) ? fieldOrColumn : fieldOrColumn ? [fieldOrColumn] : []).map((column) => (0, import_util.handleFieldOrColumn)($xeTable, column));
         if (colList.length) {
           return beginValidate(rows, colList, null);
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       },
       clearValidate(rows, fieldOrColumn) {
         const validTip = refValidTooltip.value;
@@ -450,7 +398,7 @@ hooks.add('tableValidatorModule', {
           validTip.close();
         }
         reactData.validErrorMaps = handleClearValid(rows, fieldOrColumn);
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       }
     };
     validatorPrivateMethods = {
@@ -471,24 +419,17 @@ hooks.add('tableValidatorModule', {
       validCellRules(validType, row, column, val) {
         const $xeGrid = $xeTable.xeGrid;
         const $xeGantt = $xeTable.xeGantt;
-        const {
-          editRules
-        } = props;
-        const {
-          field
-        } = column;
+        const { editRules } = props;
+        const { field } = column;
         const errorRules = [];
         const syncValidList = [];
         if (field && editRules) {
-          const rules = column.rules ? column.rules : _xeUtils.default.get(editRules, field);
+          const rules = column.rules ? column.rules : import_xe_utils.default.get(editRules, field);
           if (rules) {
-            const cellValue = _xeUtils.default.isUndefined(val) ? _xeUtils.default.get(row, field) : val;
-            rules.forEach(rule => {
-              const {
-                trigger,
-                validator
-              } = rule;
-              if (validType === 'all' || !trigger || validType === trigger) {
+            const cellValue = import_xe_utils.default.isUndefined(val) ? import_xe_utils.default.get(row, field) : val;
+            rules.forEach((rule) => {
+              const { trigger, validator } = rule;
+              if (validType === "all" || !trigger || validType === trigger) {
                 if (validator) {
                   const validParams = {
                     cellValue,
@@ -504,41 +445,32 @@ hooks.add('tableValidatorModule', {
                     $gantt: $xeGantt
                   };
                   let customValid;
-                  if (_xeUtils.default.isString(validator)) {
+                  if (import_xe_utils.default.isString(validator)) {
                     const gvItem = validators.get(validator);
                     if (gvItem) {
                       const tcvMethod = gvItem.tableCellValidatorMethod || gvItem.cellValidatorMethod;
                       if (tcvMethod) {
                         customValid = tcvMethod(validParams);
                       } else {
-                        errLog('vxe.error.notValidators', [validator]);
+                        errLog("vxe.error.notValidators", [validator]);
                       }
                     } else {
-                      errLog('vxe.error.notValidators', [validator]);
+                      errLog("vxe.error.notValidators", [validator]);
                     }
                   } else {
                     customValid = validator(validParams);
                   }
                   if (customValid) {
-                    if (_xeUtils.default.isError(customValid)) {
+                    if (import_xe_utils.default.isError(customValid)) {
                       internalData.validRuleErr = true;
-                      errorRules.push(new Rule({
-                        type: 'custom',
-                        trigger,
-                        content: customValid.message,
-                        rule: new Rule(rule)
-                      }));
+                      errorRules.push(new Rule({ type: "custom", trigger, content: customValid.message, rule: new Rule(rule) }));
                     } else if (customValid.catch) {
-                      // 如果为异步校验（注：异步校验是并发无序的）
-                      syncValidList.push(customValid.catch(e => {
-                        internalData.validRuleErr = true;
-                        errorRules.push(new Rule({
-                          type: 'custom',
-                          trigger,
-                          content: e && e.message ? e.message : rule.content || rule.message,
-                          rule: new Rule(rule)
-                        }));
-                      }));
+                      syncValidList.push(
+                        customValid.catch((e) => {
+                          internalData.validRuleErr = true;
+                          errorRules.push(new Rule({ type: "custom", trigger, content: e && e.message ? e.message : rule.content || rule.message, rule: new Rule(rule) }));
+                        })
+                      );
                     }
                   }
                 } else {
@@ -553,24 +485,17 @@ hooks.add('tableValidatorModule', {
         }
         return Promise.all(syncValidList).then(() => {
           if (errorRules.length) {
-            const rest = {
-              rules: errorRules,
-              rule: errorRules[0]
-            };
+            const rest = { rules: errorRules, rule: errorRules[0] };
             return Promise.reject(rest);
           }
         });
       },
       hasCellRules(type, row, column) {
-        const {
-          editRules
-        } = props;
-        const {
-          field
-        } = column;
+        const { editRules } = props;
+        const { field } = column;
         if (field && editRules) {
-          const rules = column.rules ? column.rules : _xeUtils.default.get(editRules, field);
-          return rules && !!_xeUtils.default.find(rules, rule => type === 'all' || !rule.trigger || type === rule.trigger);
+          const rules = column.rules ? column.rules : import_xe_utils.default.get(editRules, field);
+          return rules && !!import_xe_utils.default.find(rules, (rule) => type === "all" || !rule.trigger || type === rule.trigger);
         }
         return false;
       },
@@ -578,45 +503,24 @@ hooks.add('tableValidatorModule', {
        * 触发校验
        */
       triggerValidate(type) {
-        const {
-          editConfig,
-          editRules
-        } = props;
-        const {
-          editStore
-        } = reactData;
-        const {
-          actived
-        } = editStore;
+        const { editConfig, editRules } = props;
+        const { editStore } = reactData;
+        const { actived } = editStore;
         const editOpts = computeEditOpts.value;
         const validOpts = computeValidOpts.value;
-        // 检查清除校验消息
-        if (editRules && validOpts.msgMode === 'single') {
+        if (editRules && validOpts.msgMode === "single") {
           reactData.validErrorMaps = {};
         }
-        // 校验单元格
         if (editConfig && editRules && actived.row) {
-          const {
-            row,
-            column,
-            cell
-          } = actived.args;
+          const { row, column, cell } = actived.args;
           if ($xeTable.hasCellRules(type, row, column)) {
             return $xeTable.validCellRules(type, row, column).then(() => {
-              if (editOpts.mode === 'row') {
+              if (editOpts.mode === "row") {
                 validatorMethods.clearValidate(row, column);
               }
-            }).catch(({
-              rule
-            }) => {
-              // 如果校验不通过与触发方式一致，则聚焦提示错误，否则跳过并不作任何处理
+            }).catch(({ rule }) => {
               if (!rule.trigger || type === rule.trigger) {
-                const rest = {
-                  rule,
-                  row,
-                  column,
-                  cell
-                };
+                const rest = { rule, row, column, cell };
                 $xeTable.showValidTooltip(rest);
                 return Promise.reject(rest);
               }
@@ -630,27 +534,16 @@ hooks.add('tableValidatorModule', {
        * 弹出校验错误提示
        */
       showValidTooltip(params) {
-        const {
-          height
-        } = props;
-        const {
-          tableData,
-          validStore,
-          validErrorMaps
-        } = reactData;
-        const {
-          rule,
-          row,
-          column,
-          cell
-        } = params;
+        const { height } = props;
+        const { tableData, validStore, validErrorMaps } = reactData;
+        const { rule, row, column, cell } = params;
         const validOpts = computeValidOpts.value;
         const validTip = refValidTooltip.value;
         const content = rule.content;
         validStore.visible = true;
-        if (validOpts.msgMode === 'single') {
+        if (validOpts.msgMode === "single") {
           reactData.validErrorMaps = {
-            [`${(0, _util.getRowid)($xeTable, row)}:${column.id}`]: {
+            [`${(0, import_util.getRowid)($xeTable, row)}:${column.id}`]: {
               column,
               row,
               rule,
@@ -659,7 +552,7 @@ hooks.add('tableValidatorModule', {
           };
         } else {
           reactData.validErrorMaps = Object.assign({}, validErrorMaps, {
-            [`${(0, _util.getRowid)($xeTable, row)}:${column.id}`]: {
+            [`${(0, import_util.getRowid)($xeTable, row)}:${column.id}`]: {
               column,
               row,
               rule,
@@ -667,16 +560,16 @@ hooks.add('tableValidatorModule', {
             }
           });
         }
-        $xeTable.dispatchEvent('valid-error', params, null);
+        $xeTable.dispatchEvent("valid-error", params, null);
         if (validTip) {
-          if (validTip && (validOpts.message === 'tooltip' || validOpts.message === 'default' && !height && tableData.length < 2)) {
+          if (validTip && (validOpts.message === "tooltip" || validOpts.message === "default" && !height && tableData.length < 2)) {
             return validTip.open(cell, content);
           }
         }
-        return (0, _vue.nextTick)();
+        return (0, import_vue.nextTick)();
       }
     };
-    return Object.assign(Object.assign({}, validatorMethods), validatorPrivateMethods);
+    return { ...validatorMethods, ...validatorPrivateMethods };
   },
   setupGrid($xeGrid) {
     return $xeGrid.extendTableMethods(tableValidatorMethodKeys);
@@ -684,4 +577,4 @@ hooks.add('tableValidatorModule', {
   setupGantt($xeGantt) {
     return $xeGantt.extendTableMethods(tableValidatorMethodKeys);
   }
-});
+});