vxe-table 4.5.0-beta.11 → 4.5.0-beta.13

package/lib/index.umd.js

@@ -1788,7 +1788,8 @@ __webpack_require__.d(__webpack_exports__, {
   "setup": function() { return /* reexport */ setup; },
   "t": function() { return /* reexport */ t; },
   "use": function() { return /* reexport */ use; },
-  "v": function() { return /* reexport */ v; }
+  "v": function() { return /* reexport */ v; },
+  "validators": function() { return /* reexport */ validators; }
 });
 
 // NAMESPACE OBJECT: ./packages/all.ts
@@ -1877,7 +1878,8 @@ __webpack_require__.d(all_namespaceObject, {
   "setup": function() { return setup; },
   "t": function() { return t; },
   "use": function() { return use; },
-  "v": function() { return v; }
+  "v": function() { return v; },
+  "validators": function() { return validators; }
 });
 
 ;// CONCATENATED MODULE: ./node_modules/@vue/cli-service/lib/commands/build/setPublicPath.js
@@ -1949,7 +1951,10 @@ const GlobalConfig = {
       enterable: true
     },
     validConfig: {
-      showMessage: true
+      showMessage: true,
+      autoClear: true,
+      message: 'default',
+      msgMode: 'single'
     },
     columnConfig: {
       maxFixedSize: 4
@@ -2271,7 +2276,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.5.0-beta.10"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.5.0-beta.12"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -3970,7 +3975,9 @@ class Store {
     _defineProperty(this, "store", {});
   }
   mixin(options) {
-    Object.assign(this.store, options);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, (item, key) => {
+      this.add(key, item);
+    });
     return this;
   }
   has(name) {
@@ -4011,7 +4018,52 @@ if (true) {
 }
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/menus.ts
 
-const menus = new store();
+
+
+class VXEMenusStore {
+  constructor() {
+    _defineProperty(this, "store", {});
+  }
+  mixin(options) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, (item, key) => {
+      this.add(key, item);
+    });
+    return this;
+  }
+  has(name) {
+    return !!this.get(name);
+  }
+  get(name) {
+    return this.store[name];
+  }
+  add(name, render) {
+    const conf = this.store[name];
+    // 兼容
+    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
+      render = {
+        menuMethod: render
+      };
+    }
+    // 检测是否覆盖
+    if (true) {
+      const confKeys = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(conf);
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(render, (item, key) => {
+        if (confKeys.includes(key)) {
+          warnLog('vxe.error.coverProp', [name, key]);
+        }
+      });
+    }
+    this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
+    return this;
+  }
+  delete(name) {
+    delete this.store[name];
+  }
+  forEach(callback) {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(this.store, callback);
+  }
+}
+const menus = new VXEMenusStore();
 if (true) {
   Object.assign(menus, {
     _name: 'Menus'
@@ -4025,6 +4077,14 @@ if (true) {
     _name: 'Formats'
   });
 }
+;// CONCATENATED MODULE: ./packages/v-x-e-table/src/validators.ts
+
+const validators = new store();
+if (true) {
+  Object.assign(validators, {
+    _name: 'Validators'
+  });
+}
 ;// CONCATENATED MODULE: ./packages/v-x-e-table/src/hooks.ts
 
 const hooks = new store();
@@ -4049,6 +4109,7 @@ const setup = options => {
 
 
 
+
 function getExportOrImpotType(types, flag) {
   const rest = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().objectEach(types, (val, type) => {
@@ -4105,12 +4166,13 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.5.0-beta.10",
+  version: "4.5.0-beta.12",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
   commands: commands,
   formats: formats,
+  validators: validators,
   menus: menus,
   hooks: hooks,
   config,
@@ -4125,6 +4187,7 @@ const VXETable = {
 
 
 
+
 /* harmony default export */ var v_x_e_table = ((/* unused pure expression or super */ null && (VXETable)));
 ;// CONCATENATED MODULE: ./packages/filter/src/panel.ts
 
@@ -5296,15 +5359,15 @@ const tableMenuHook = {
       ctxMenuLinkEvent(evnt, menu) {
         // 如果一级菜单有配置 code 则允许点击，否则不能点击
         if (!menu.disabled && (menu.code || !menu.children || !menu.children.length)) {
-          const ctxMenuMethod = VXETable.menus.get(menu.code);
+          const gMenuOpts = VXETable.menus.get(menu.code);
           const params = Object.assign({}, internalData._currMenuParams, {
             menu,
             $table: $xetable,
             $grid: $xetable.xegrid,
             $event: evnt
           });
-          if (ctxMenuMethod) {
-            ctxMenuMethod(params, evnt);
+          if (gMenuOpts && gMenuOpts.menuMethod) {
+            gMenuOpts.menuMethod(params, evnt);
           }
           $xetable.dispatchEvent('menu-click', params, evnt);
           menuMethods.closeMenu();
@@ -7982,7 +8045,10 @@ const quarterSize = 8;
     },
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.input.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.input.placeholder
+    },
     maxlength: [String, Number],
     autocomplete: {
       type: String,
@@ -10613,7 +10679,10 @@ function getOptUniqueId() {
   props: {
     modelValue: null,
     clearable: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.select.placeholder) ? conf.i18n('vxe.base.pleaseSelect') : conf.select.placeholder
+    },
     loading: Boolean,
     disabled: Boolean,
     multiple: Boolean,
@@ -14645,6 +14714,8 @@ const Keyboard = VxeModuleKeyboard;
 
 
 
+
+
 /**
  * 校验规则
  */
@@ -14681,6 +14752,9 @@ const validatorHook = {
       reactData,
       internalData
     } = $xetable;
+    const {
+      refValidTooltip
+    } = $xetable.getRefMaps();
     const {
       computeValidOpts,
       computeTreeOpts,
@@ -14708,6 +14782,19 @@ const validatorHook = {
         }
       });
     };
+    const handleErrMsgMode = validErrMaps => {
+      const validOpts = computeValidOpts.value;
+      if (validOpts.msgMode === 'single') {
+        const keys = Object.keys(validErrMaps);
+        const resMaps = validErrMaps;
+        if (keys.length) {
+          const firstKey = keys[0];
+          resMaps[firstKey] = validErrMaps[firstKey];
+        }
+        return resMaps;
+      }
+      return validErrMaps;
+    };
     /**
      * 对表格数据进行校验
      * 如果不指定数据，则默认只校验临时变动的数据，例如新增或修改
@@ -14798,7 +14885,7 @@ const validatorHook = {
         }
         return Promise.all(rowValids).then(() => {
           const ruleProps = Object.keys(validRest);
-          reactData.validErrorMaps = validErrMaps;
+          reactData.validErrorMaps = handleErrMsgMode(validErrMaps);
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
@@ -14837,7 +14924,6 @@ const validatorHook = {
             const row = firstErrParams.row;
             const rowIndex = afterFullData.indexOf(row);
             const locatRow = rowIndex > 0 ? afterFullData[rowIndex - 1] : row;
-            reactData.validErrorMaps = validErrMaps;
             if (validOpts.autoPos === false) {
               finish();
             } else {
@@ -14849,8 +14935,9 @@ const validatorHook = {
             }
           });
         });
+      } else {
+        reactData.validErrorMaps = {};
       }
-      // reactData.validErrorMaps = validErrMaps
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
         if (cb) {
           cb();
@@ -14871,11 +14958,24 @@ const validatorHook = {
         return beginValidate(rows, cb);
       },
       clearValidate(rows, fieldOrColumn) {
+        const {
+          validErrorMaps
+        } = reactData;
+        const validTip = refValidTooltip.value;
+        const validOpts = computeValidOpts.value;
         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($xetable, column));
         let validErrMaps = {};
+        if (validTip && validTip.reactData.visible) {
+          validTip.close();
+        }
+        // 如果是单个提示模式
+        if (validOpts.msgMode === 'single') {
+          reactData.validErrorMaps = {};
+          return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+        }
         if (rowList.length && colList.length) {
-          validErrMaps = Object.assign({}, reactData.validErrorMaps);
+          validErrMaps = Object.assign({}, validErrorMaps);
           rowList.forEach(row => {
             colList.forEach(column => {
               const vaildKey = `${getRowid($xetable, row)}:${column.id}`;
@@ -14886,14 +14986,14 @@ const validatorHook = {
           });
         } else if (rowList.length) {
           const rowidList = rowList.map(row => `${getRowid($xetable, row)}`);
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reactData.validErrorMaps, (item, key) => {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(validErrorMaps, (item, key) => {
             if (rowidList.indexOf(key.split(':')[0]) > -1) {
               validErrMaps[key] = item;
             }
           });
         } else if (colList.length) {
           const colidList = colList.map(column => `${column.id}`);
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(reactData.validErrorMaps, (item, key) => {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(validErrorMaps, (item, key) => {
             if (colidList.indexOf(key.split(':')[1]) > -1) {
               validErrMaps[key] = item;
             }
@@ -14962,11 +15062,12 @@ const validatorHook = {
               const {
                 type,
                 trigger,
-                required
+                required,
+                validator
               } = rule;
               if (validType === 'all' || !trigger || validType === trigger) {
-                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                  const customValid = rule.validator({
+                if (validator) {
+                  const validParams = {
                     cellValue,
                     rule,
                     rules,
@@ -14974,9 +15075,29 @@ const validatorHook = {
                     rowIndex: $xetable.getRowIndex(row),
                     column,
                     columnIndex: $xetable.getColumnIndex(column),
-                    field: column.property,
-                    $table: $xetable
-                  });
+                    field: column.field,
+                    $table: $xetable,
+                    $grid: $xetable.xegrid
+                  };
+                  let customValid;
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
+                    const gvItem = VXETable.validators.get(validator);
+                    if (gvItem) {
+                      if (gvItem.cellValidatorMethod) {
+                        customValid = gvItem.cellValidatorMethod(validParams);
+                      } else {
+                        if (true) {
+                          warnLog('vxe.error.notValidators', [validator]);
+                        }
+                      }
+                    } else {
+                      if (true) {
+                        errLog('vxe.error.notValidators', [validator]);
+                      }
+                    }
+                  } else {
+                    customValid = validator(validParams);
+                  }
                   if (customValid) {
                     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       validRuleErr = true;
@@ -15057,6 +15178,12 @@ const validatorHook = {
           actived
         } = editStore;
         const editOpts = computeEditOpts.value;
+        const validOpts = computeValidOpts.value;
+        // 检查清除校验消息
+        if (editRules && validOpts.msgMode === 'single') {
+          reactData.validErrorMaps = {};
+        }
+        // 校验单元格
         if (editConfig && editRules && actived.row) {
           const {
             row,
@@ -15093,18 +15220,44 @@ const validatorHook = {
        */
       showValidTooltip(params) {
         const {
-          validStore
+          height
+        } = props;
+        const {
+          tableData,
+          validStore,
+          validErrorMaps
         } = reactData;
+        const validOpts = computeValidOpts.value;
+        const validTip = refValidTooltip.value;
         validStore.visible = true;
-        reactData.validErrorMaps = Object.assign({}, reactData.validErrorMaps, {
-          [`${getRowid($xetable, params.row)}:${params.column.id}`]: {
-            column: params.column,
-            row: params.row,
-            rule: params.rule,
-            content: params.rule.content
-          }
-        });
+        if (validOpts.msgMode === 'single') {
+          reactData.validErrorMaps = {
+            [`${getRowid($xetable, params.row)}:${params.column.id}`]: {
+              column: params.column,
+              row: params.row,
+              rule: params.rule,
+              content: params.rule.content
+            }
+          };
+        } else {
+          reactData.validErrorMaps = Object.assign({}, validErrorMaps, {
+            [`${getRowid($xetable, params.row)}:${params.column.id}`]: {
+              column: params.column,
+              row: params.row,
+              rule: params.rule,
+              content: params.rule.content
+            }
+          });
+        }
         $xetable.dispatchEvent('valid-error', params, null);
+        if (validTip) {
+          const {
+            cell
+          } = params;
+          if (validTip && (validOpts.message === 'tooltip' || validOpts.message === 'default' && !height && tableData.length < 2)) {
+            return validTip.open(cell, params.rule.content);
+          }
+        }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
     };
@@ -19571,7 +19724,10 @@ let autoTxtElem;
     name: String,
     readonly: Boolean,
     disabled: Boolean,
-    placeholder: String,
+    placeholder: {
+      type: String,
+      default: () => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(conf.textarea.placeholder) ? conf.i18n('vxe.base.pleaseInput') : conf.textarea.placeholder
+    },
     maxlength: [String, Number],
     rows: {
       type: [String, Number],
@@ -21147,11 +21303,12 @@ function getResetValue(value, resetValue) {
               const {
                 type,
                 trigger,
-                required
+                required,
+                validator
               } = rule;
               if (validType === 'all' || !trigger || validType === trigger) {
-                if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rule.validator)) {
-                  const customValid = rule.validator({
+                if (validator) {
+                  const validParams = {
                     itemValue,
                     rule,
                     rules,
@@ -21159,7 +21316,26 @@ function getResetValue(value, resetValue) {
                     field: property,
                     property,
                     $form: $xeform
-                  });
+                  };
+                  let customValid;
+                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(validator)) {
+                    const gvItem = VXETable.validators.get(validator);
+                    if (gvItem) {
+                      if (gvItem.itemValidatorMethod) {
+                        customValid = gvItem.itemValidatorMethod(validParams);
+                      } else {
+                        if (true) {
+                          warnLog('vxe.error.notValidators', [validator]);
+                        }
+                      }
+                    } else {
+                      if (true) {
+                        errLog('vxe.error.notValidators', [validator]);
+                      }
+                    }
+                  } else {
+                    customValid = validator(validParams);
+                  }
                   if (customValid) {
                     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       errorRules.push(new form_Rule({
@@ -23059,7 +23235,8 @@ const lineOffsetSizes = {
       refTableBody,
       refTableFooter,
       refTableLeftBody,
-      refTableRightBody
+      refTableRightBody,
+      refValidTooltip
     } = $xetable.getRefMaps();
     const {
       computeEditOpts,
@@ -23172,6 +23349,7 @@ const lineOffsetSizes = {
     const renderColumn = (seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
       const {
         columnKey,
+        height,
         showOverflow: allColumnOverflow,
         cellClassName: allCellClassName,
         cellStyle,
@@ -23238,7 +23416,7 @@ const lineOffsetSizes = {
       const tdOns = {};
       const cellAlign = align || allAlign;
       const errorValidItem = validErrorMaps[`${rowid}:${column.id}`];
-      const showValidTip = editRules && validOpts.showMessage;
+      const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
       const attrs = {
         colid: column.id
       };
@@ -23648,6 +23826,7 @@ const lineOffsetSizes = {
       const tableFooter = refTableFooter.value;
       const leftBody = refTableLeftBody.value;
       const rightBody = refTableRightBody.value;
+      const validTip = refValidTooltip.value;
       const scrollBodyElem = refElem.value;
       const headerElem = tableHeader ? tableHeader.$el : null;
       const footerElem = tableFooter ? tableFooter.$el : null;
@@ -23698,6 +23877,9 @@ const lineOffsetSizes = {
       if (scrollYLoad && isRollY) {
         $xetable.triggerScrollYEvent(evnt);
       }
+      if (isRollX && validTip && validTip.reactData.visible) {
+        validTip.updatePlacement();
+      }
       $xetable.dispatchEvent('scroll', {
         type: renderType,
         fixed: fixedType,
@@ -24512,7 +24694,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     } = $xetable;
     const {
       refTableHeader,
-      refTableBody
+      refTableBody,
+      refValidTooltip
     } = $xetable.getRefMaps();
     const {
       computeTooltipOpts,
@@ -24538,6 +24721,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       const {
         lastScrollLeft
       } = tableInternalData;
+      const validTip = refValidTooltip.value;
       const tableHeader = refTableHeader.value;
       const tableBody = refTableBody.value;
       const headerElem = tableHeader ? tableHeader.$el : null;
@@ -24556,6 +24740,9 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
       if (scrollXLoad && isX) {
         $xetable.triggerScrollXEvent(evnt);
       }
+      if (isX && validTip && validTip.reactData.visible) {
+        validTip.updatePlacement();
+      }
       $xetable.dispatchEvent('scroll', {
         type: footer_renderType,
         fixed: fixedType,
@@ -25133,6 +25320,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
     const refElem = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refTooltip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refCommTooltip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
+    const refValidTooltip = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refTableFilter = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refTableMenu = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
     const refTableHeader = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.ref)();
@@ -25204,6 +25392,12 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         ...tooltipStore.currOpts
       };
     });
+    const computeValidTipOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const tooltipOpts = computeTooltipOpts.value;
+      return Object.assign({
+        isArrow: false
+      }, tooltipOpts);
+    });
     const computeEditOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, conf.table.editConfig, props.editConfig);
     });
@@ -25364,6 +25558,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
     const refMaps = {
       refElem,
       refTooltip,
+      refValidTooltip,
       refTableFilter,
       refTableMenu,
       refTableHeader,
@@ -29632,7 +29827,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
        * 如果组件值 v-model 发生 change 时，调用改函数用于更新某一列编辑状态
        * 如果单元格配置了校验规则，则会进行校验
        */
-      updateStatus(scope, cellValue) {
+      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 {
@@ -29642,11 +29837,11 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
             validStore
           } = reactData;
           const tableBody = refTableBody.value;
-          if (scope && tableBody && editRules) {
+          if (slotParams && tableBody && editRules) {
             const {
               row,
               column
-            } = scope;
+            } = slotParams;
             const type = 'change';
             if ($xetable.hasCellRules) {
               if ($xetable.hasCellRules(type, row, column)) {
@@ -29789,13 +29984,16 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         filterStore
       } = reactData;
       const {
-        mouseConfig
+        mouseConfig,
+        editRules
       } = props;
       const el = refElem.value;
       const editOpts = computeEditOpts.value;
+      const validOpts = computeValidOpts.value;
       const {
         actived
       } = editStore;
+      const $validTooltip = refValidTooltip.value;
       const tableFilter = refTableFilter.value;
       const tableMenu = refTableMenu.value;
       if (tableFilter) {
@@ -29815,7 +30013,9 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
           // 如果是激活状态，点击了单元格之外
           const cell = actived.args.cell;
           if (!cell || !getEventTargetNode(evnt, cell).flag) {
-            if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
+            if ($validTooltip && getEventTargetNode(evnt, $validTooltip.$el).flag) {
+              // 如果是激活状态，且点击了校验提示框
+            } else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
               // 如果是激活状态，点击了单元格之外
               if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
                 // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
@@ -29874,8 +30074,13 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
           $xetable.closeMenu();
         }
       }
+      const isActivated = getEventTargetNode(evnt, $xegrid ? $xegrid.getRefMaps().refElem.value : el).flag;
+      // 如果存在校验，点击了表格之外则清除
+      if (!isActivated && editRules && validOpts.autoClear) {
+        reactData.validErrorMaps = {};
+      }
       // 最后激活的表格
-      internalData.isActivated = getEventTargetNode(evnt, $xegrid ? $xegrid.getRefMaps().refElem.value : el).flag;
+      internalData.isActivated = isActivated;
     };
     /**
      * 窗口失焦事件处理
@@ -32141,13 +32346,15 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         loading,
         stripe,
         showHeader,
+        height,
         treeConfig,
         mouseConfig,
         showFooter,
         highlightCell,
         highlightHoverRow,
         highlightHoverColumn,
-        editConfig
+        editConfig,
+        editRules
       } = props;
       const {
         isGroup,
@@ -32170,18 +32377,21 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       } = columnStore;
       const loadingSlot = slots.loading;
       const tipConfig = computeTipConfig.value;
+      const validOpts = computeValidOpts.value;
       const treeOpts = computeTreeOpts.value;
       const rowOpts = computeRowOpts.value;
       const columnOpts = computeColumnOpts.value;
       const vSize = computeSize.value;
       const tableBorder = computeTableBorder.value;
       const mouseOpts = computeMouseOpts.value;
+      const validTipOpts = computeValidTipOpts.value;
       const loadingOpts = computeLoadingOpts.value;
       const isMenu = computeIsMenu.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
         ref: refElem,
         class: ['vxe-table', 'vxe-table--render-default', `tid_${xID}`, `border--${tableBorder}`, {
           [`size--${vSize}`]: vSize,
+          [`vaild-msg--${validOpts.msgMode}`]: !!editRules,
           'vxe-editable': !!editConfig,
           'cell--highlight': highlightCell,
           'cell--selected': mouseConfig && mouseOpts.selected,
@@ -32325,6 +32535,14 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         isArrow: false,
         enterable: false
       }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
+      /**
+       * 校验提示
+       */
+      hasUseTooltip && props.editRules && validOpts.showMessage && (validOpts.message === 'default' ? !height : validOpts.message === 'tooltip') ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-tooltip'), {
+        ref: refValidTooltip,
+        class: 'vxe-table--valid-error',
+        ...(validOpts.message === 'tooltip' || tableData.length === 1 ? validTipOpts : {})
+      }) : (0,external_commonjs_vue_commonjs2_vue_root_Vue_.createCommentVNode)(),
       /**
        * 工具提示
        */
@@ -32356,6 +32574,10 @@ dynamicApp.component(table.name, table);
 ;// CONCATENATED MODULE: ./packages/locale/lang/zh-CN.ts
 /* harmony default export */ var zh_CN = ({
   vxe: {
+    base: {
+      pleaseInput: '请输入',
+      pleaseSelect: '请选择'
+    },
     loading: {
       text: '加载中...'
     },
@@ -32375,6 +32597,7 @@ dynamicApp.component(table.name, table);
       errProp: '不支持的参数 "{0}"，可能为 "{1}"',
       colRepet: 'column.{0}="{1}" 重复了，这可能会导致某些功能无法使用',
       notFunc: '方法 "{0}" 不存在',
+      notValidators: '全局校验 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',