vxe-table 4.4.4 → 4.4.6-beta.0

package/lib/index.umd.js

@@ -2263,7 +2263,7 @@ const GlobalConfig = {
 ;// CONCATENATED MODULE: ./packages/tools/log.ts
 
 function getLog(message, params) {
-  return `[vxe-table v${"4.4.4"}] ${conf.i18n(message, params)}`;
+  return `[vxe-table v${"4.4.6-beta.0"}] ${conf.i18n(message, params)}`;
 }
 function outLog(type) {
   return function (message, params) {
@@ -4069,7 +4069,7 @@ const config = new VXETableConfig();
 const v = 'v4';
 const VXETable = {
   v,
-  version: "4.4.4",
+  version: "4.4.6-beta.0",
   setup: setup,
   interceptor: interceptor,
   renderer: renderer,
@@ -14608,9 +14608,6 @@ const validatorHook = {
       reactData,
       internalData
     } = $xetable;
-    const {
-      refValidTooltip
-    } = $xetable.getRefMaps();
     const {
       computeValidOpts,
       computeTreeOpts,
@@ -14796,7 +14793,6 @@ const validatorHook = {
         const {
           validStore
         } = reactData;
-        const validTip = refValidTooltip.value;
         Object.assign(validStore, {
           visible: false,
           row: null,
@@ -14804,9 +14800,6 @@ const validatorHook = {
           content: '',
           rule: null
         });
-        if (validTip && validTip.reactData.visible) {
-          validTip.close();
-        }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
     };
@@ -14857,14 +14850,14 @@ const validatorHook = {
           editRules
         } = props;
         const {
-          property
+          field
         } = column;
         const errorRules = [];
         const syncVailds = [];
-        if (property && editRules) {
-          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, property);
+        if (field && editRules) {
+          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(editRules, field);
           if (rules) {
-            const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, property) : val;
+            const cellValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, field) : val;
             rules.forEach(rule => {
               const {
                 type,
@@ -15003,20 +14996,13 @@ const validatorHook = {
        */
       showValidTooltip(params) {
         const {
-          height
-        } = props;
-        const {
-          tableData,
           validStore
         } = reactData;
-        const validOpts = computeValidOpts.value;
         const {
           rule,
           row,
-          column,
-          cell
+          column
         } = params;
-        const validTip = refValidTooltip.value;
         const content = rule.content;
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           Object.assign(validStore, {
@@ -15027,9 +15013,6 @@ const validatorHook = {
             visible: true
           });
           $xetable.dispatchEvent('valid-error', params, null);
-          if (validTip && (validOpts.message === 'tooltip' || validOpts.message === 'default' && !height && tableData.length < 2)) {
-            return validTip.open(cell, content);
-          }
         });
       }
     };
@@ -18072,26 +18055,7 @@ dynamicApp.component(grid.name, grid);
       }
     };
     const resetCustomEvent = evnt => {
-      const {
-        columns
-      } = reactData;
-      const {
-        computeCustomOpts: computeTableCustomOpts
-      } = $xetable.getComputeMaps();
-      const tableCustomOpts = computeTableCustomOpts.value;
-      const {
-        checkMethod
-      } = tableCustomOpts;
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(columns, column => {
-        if (!checkMethod || checkMethod({
-          column
-        })) {
-          column.visible = column.defaultVisible;
-          column.halfVisible = false;
-        }
-        column.resizeWidth = 0;
-      });
-      $xetable.saveCustomResizable(true);
+      $xetable.resetColumn(true);
       closeCustom();
       emitCustomEvent('reset', evnt);
     };
@@ -18329,13 +18293,15 @@ dynamicApp.component(grid.name, grid);
           if (item.visible !== false) {
             const compConf = buttonRender ? VXETable.renderer.get(buttonRender.name) : null;
             if (buttonRender && compConf && compConf.renderToolbarButton) {
-              btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-                class: 'vxe-button--item'
-              }, getSlotVNs(compConf.renderToolbarButton(buttonRender, {
+              const toolbarButtonClassName = compConf.toolbarButtonClassName;
+              const params = {
                 $grid: $xegrid,
                 $table: $xetable,
                 button: item
-              }))));
+              };
+              btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+                class: ['vxe-button--item', toolbarButtonClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarButtonClassName) ? toolbarButtonClassName(params) : toolbarButtonClassName : '']
+              }, getSlotVNs(compConf.renderToolbarButton(buttonRender, params))));
             } else {
               btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-button'), {
                 disabled: item.disabled,
@@ -18383,13 +18349,15 @@ dynamicApp.component(grid.name, grid);
           if (item.visible !== false) {
             const compConf = toolRender ? VXETable.renderer.get(toolRender.name) : null;
             if (toolRender && compConf && compConf.renderToolbarTool) {
-              btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
-                class: 'vxe-tool--item'
-              }, getSlotVNs(compConf.renderToolbarTool(toolRender, {
+              const toolbarToolClassName = compConf.toolbarToolClassName;
+              const params = {
                 $grid: $xegrid,
                 $table: $xetable,
                 tool: item
-              }))));
+              };
+              btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+                class: ['vxe-tool--item', toolbarToolClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(toolbarToolClassName) ? toolbarToolClassName(params) : toolbarToolClassName : '']
+              }, getSlotVNs(compConf.renderToolbarTool(toolRender, params))));
             } else {
               btnVNs.push((0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)((0,external_commonjs_vue_commonjs2_vue_root_Vue_.resolveComponent)('vxe-button'), {
                 disabled: item.disabled,
@@ -20909,10 +20877,18 @@ function getResetValue(value, resetValue) {
     };
     const clearValidate = fieldOrItem => {
       if (fieldOrItem) {
-        const item = handleFieldOrItem($xeform, fieldOrItem);
-        if (item) {
-          item.showError = false;
+        let fields = fieldOrItem;
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+          fields = [fieldOrItem];
         }
+        fields.forEach(field => {
+          if (field) {
+            const item = handleFieldOrItem($xeform, field);
+            if (item) {
+              item.showError = false;
+            }
+          }
+        });
       } else {
         getItems().forEach(item => {
           item.showError = false;
@@ -21002,80 +20978,94 @@ function getResetValue(value, resetValue) {
      *  validator=Function({ itemValue, rule, rules, data, property }) 自定义校验，接收一个 Promise
      *  trigger=change 触发方式
      */
-    const validItemRules = (validType, property, val) => {
+    const validItemRules = (validType, fields, val) => {
       const {
         data,
         rules: formRules
       } = props;
-      const errorRules = [];
-      const syncVailds = [];
-      if (property && formRules) {
-        const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(formRules, property);
-        if (rules) {
-          const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, property) : val;
-          rules.forEach(rule => {
-            const {
-              type,
-              trigger,
-              required
-            } = 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({
-                  itemValue,
-                  rule,
-                  rules,
-                  data,
-                  field: property,
-                  property,
-                  $form: $xeform
-                });
-                if (customValid) {
-                  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
-                    errorRules.push(new form_Rule({
-                      type: 'custom',
-                      trigger,
-                      content: customValid.message,
-                      rule: new form_Rule(rule)
-                    }));
-                  } else if (customValid.catch) {
-                    // 如果为异步校验（注：异步校验是并发无序的）
-                    syncVailds.push(customValid.catch(e => {
+      const errorMaps = {};
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fields)) {
+        fields = [fields];
+      }
+      return Promise.all(fields.map(property => {
+        const errorRules = [];
+        const syncVailds = [];
+        if (property && formRules) {
+          const rules = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(formRules, property);
+          if (rules) {
+            const itemValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(val) ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(data, property) : val;
+            rules.forEach(rule => {
+              const {
+                type,
+                trigger,
+                required
+              } = 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({
+                    itemValue,
+                    rule,
+                    rules,
+                    data,
+                    field: property,
+                    property,
+                    $form: $xeform
+                  });
+                  if (customValid) {
+                    if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isError(customValid)) {
                       errorRules.push(new form_Rule({
                         type: 'custom',
                         trigger,
-                        content: e ? e.message : rule.content || rule.message,
+                        content: customValid.message,
                         rule: new form_Rule(rule)
                       }));
-                    }));
+                    } else if (customValid.catch) {
+                      // 如果为异步校验（注：异步校验是并发无序的）
+                      syncVailds.push(customValid.catch(e => {
+                        errorRules.push(new form_Rule({
+                          type: 'custom',
+                          trigger,
+                          content: e ? e.message : rule.content || rule.message,
+                          rule: new form_Rule(rule)
+                        }));
+                      }));
+                    }
                   }
-                }
-              } else {
-                const isArrType = type === 'array';
-                const isArrVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(itemValue);
-                let hasEmpty = true;
-                if (isArrType || isArrVal) {
-                  hasEmpty = !isArrVal || !itemValue.length;
-                } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(itemValue)) {
-                  hasEmpty = eqEmptyValue(itemValue.trim());
                 } else {
-                  hasEmpty = eqEmptyValue(itemValue);
-                }
-                if (required ? hasEmpty || validErrorRuleValue(rule, itemValue) : !hasEmpty && validErrorRuleValue(rule, itemValue)) {
-                  errorRules.push(new form_Rule(rule));
+                  const isArrType = type === 'array';
+                  const isArrVal = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(itemValue);
+                  let hasEmpty = true;
+                  if (isArrType || isArrVal) {
+                    hasEmpty = !isArrVal || !itemValue.length;
+                  } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(itemValue)) {
+                    hasEmpty = eqEmptyValue(itemValue.trim());
+                  } else {
+                    hasEmpty = eqEmptyValue(itemValue);
+                  }
+                  if (required ? hasEmpty || validErrorRuleValue(rule, itemValue) : !hasEmpty && validErrorRuleValue(rule, itemValue)) {
+                    errorRules.push(new form_Rule(rule));
+                  }
                 }
               }
-            }
-          });
+            });
+          }
         }
-      }
-      return Promise.all(syncVailds).then(() => {
-        if (errorRules.length) {
-          const rest = {
-            rules: errorRules,
-            rule: errorRules[0]
-          };
-          return Promise.reject(rest);
+        return Promise.all(syncVailds).then(() => {
+          if (errorRules.length) {
+            errorMaps[property] = errorRules.map(rule => {
+              return {
+                $form: $xeform,
+                rule,
+                data,
+                field: property,
+                property
+              };
+            });
+          }
+        });
+      })).then(() => {
+        if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isEmpty(errorMaps)) {
+          return Promise.reject(errorMaps);
         }
       });
     };
@@ -21098,24 +21088,14 @@ function getResetValue(value, resetValue) {
           if (field && !isHiddenItem($xeform, item) && isActivetem($xeform, item)) {
             itemValids.push(validItemRules(type || 'all', field).then(() => {
               item.errRule = null;
-            }).catch(({
-              rule,
-              rules
-            }) => {
-              const rest = {
-                rule,
-                rules,
-                data,
-                field,
-                property: field,
-                $form: $xeform
-              };
+            }).catch(errorMaps => {
+              const rest = errorMaps[field];
               if (!validRest[field]) {
                 validRest[field] = [];
               }
               validRest[field].push(rest);
               validFields.push(field);
-              item.errRule = rule;
+              item.errRule = rest[0].rule;
               return Promise.reject(rest);
             }));
           }
@@ -21157,8 +21137,11 @@ function getResetValue(value, resetValue) {
       return beginValidate(getItems(), '', callback);
     };
     const validateField = (fieldOrItem, callback) => {
-      const item = handleFieldOrItem($xeform, fieldOrItem);
-      return beginValidate(item ? [item] : [], '', callback);
+      let fields = [];
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(fieldOrItem)) {
+        fields = [fieldOrItem];
+      }
+      return beginValidate(fields.map(field => handleFieldOrItem($xeform, field)), '', callback);
     };
     const submitEvent = evnt => {
       evnt.preventDefault();
@@ -21240,13 +21223,12 @@ function getResetValue(value, resetValue) {
       if (field) {
         return validItemRules(evnt ? ['blur'].includes(evnt.type) ? 'blur' : 'change' : 'all', field, itemValue).then(() => {
           clearValidate(field);
-        }).catch(({
-          rule
-        }) => {
+        }).catch(errorMaps => {
+          const rest = errorMaps[field];
           const item = getItemByField(field);
-          if (item) {
+          if (rest && item) {
             item.showError = true;
-            item.errRule = rule;
+            item.errRule = rest[0].rule;
           }
         });
       }
@@ -22918,8 +22900,7 @@ const lineOffsetSizes = {
       refTableBody,
       refTableFooter,
       refTableLeftBody,
-      refTableRightBody,
-      refValidTooltip
+      refTableRightBody
     } = $xetable.getRefMaps();
     const {
       computeEditOpts,
@@ -23032,7 +23013,6 @@ const lineOffsetSizes = {
     const renderColumn = (seq, rowid, fixedType, rowLevel, row, rowIndex, $rowIndex, _rowIndex, column, $columnIndex, columns, items) => {
       const {
         columnKey,
-        height,
         showOverflow: allColumnOverflow,
         cellClassName: allCellClassName,
         cellStyle,
@@ -23099,7 +23079,7 @@ const lineOffsetSizes = {
       const tdOns = {};
       const cellAlign = align || allAlign;
       const hasValidError = validStore.row === row && validStore.column === column;
-      const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? height || tableData.length > 1 : validOpts.message === 'inline');
+      const showValidTip = editRules && validOpts.showMessage;
       const attrs = {
         colid: column.id
       };
@@ -23509,7 +23489,6 @@ 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;
@@ -23560,9 +23539,6 @@ const lineOffsetSizes = {
       if (scrollYLoad && isRollY) {
         $xetable.triggerScrollYEvent(evnt);
       }
-      if (isRollX && validTip && validTip.reactData.visible) {
-        validTip.updatePlacement();
-      }
       $xetable.dispatchEvent('scroll', {
         type: renderType,
         fixed: fixedType,
@@ -24377,8 +24353,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
     } = $xetable;
     const {
       refTableHeader,
-      refTableBody,
-      refValidTooltip
+      refTableBody
     } = $xetable.getRefMaps();
     const {
       computeTooltipOpts,
@@ -24404,7 +24379,6 @@ 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;
@@ -24423,9 +24397,6 @@ 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,
@@ -25004,7 +24975,6 @@ 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)();
@@ -25076,12 +25046,6 @@ 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);
     });
@@ -25219,7 +25183,6 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
     const refMaps = {
       refElem,
       refTooltip,
-      refValidTooltip,
       refTableFilter,
       refTableMenu,
       refTableHeader,
@@ -28317,7 +28280,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         return 0;
       },
       /**
-       * 手动重置列的显示隐藏、列宽拖动的状态；
+       * 手动重置列的显示隐藏、列宽拖动的状态、固定列、排序列；
        * 如果为 true 则重置所有状态
        * 如果已关联工具栏，则会同步更新
        */
@@ -28331,12 +28294,16 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         } = customOpts;
         const opts = Object.assign({
           visible: true,
-          resizable: options === true
+          resizable: options === true,
+          fixed: options === true
         }, options);
         tableFullColumn.forEach(column => {
           if (opts.resizable) {
             column.resizeWidth = 0;
           }
+          if (opts.fixed) {
+            column.fixed = column.defaultFixed;
+          }
           if (!checkMethod || checkMethod({
             column
           })) {
@@ -28346,6 +28313,9 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         if (opts.resizable) {
           tablePrivateMethods.saveCustomResizable(true);
         }
+        if (opts.fixed) {
+          tablePrivateMethods.saveCustomFixed();
+        }
         return tablePrivateMethods.handleCustom();
       },
       /**
@@ -29564,7 +29534,6 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       const {
         actived
       } = editStore;
-      const $validTooltip = refValidTooltip.value;
       const tableFilter = refTableFilter.value;
       const tableMenu = refTableMenu.value;
       if (tableFilter) {
@@ -29584,9 +29553,7 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
           // 如果是激活状态，点击了单元格之外
           const cell = actived.args.cell;
           if (!cell || !getEventTargetNode(evnt, cell).flag) {
-            if ($validTooltip && getEventTargetNode(evnt, $validTooltip.$el).flag) {
-              // 如果是激活状态，且点击了校验提示框
-            } else if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
+            if (!internalData._lastCallTime || internalData._lastCallTime + 50 < Date.now()) {
               // 如果是激活状态，点击了单元格之外
               if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
                 // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
@@ -31882,7 +31849,6 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
         loading,
         stripe,
         showHeader,
-        height,
         treeConfig,
         mouseConfig,
         showFooter,
@@ -31918,8 +31884,6 @@ const orderStorageKey = 'VXE_TABLE_CUSTOM_COLUMN_ORDER';
       const vSize = computeSize.value;
       const tableBorder = computeTableBorder.value;
       const mouseOpts = computeMouseOpts.value;
-      const validOpts = computeValidOpts.value;
-      const validTipOpts = computeValidTipOpts.value;
       const loadingOpts = computeLoadingOpts.value;
       const isMenu = computeIsMenu.value;
       return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
@@ -32069,14 +32033,6 @@ 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)(),
       /**
        * 工具提示
        */
@@ -32355,7 +32311,7 @@ dynamicApp.component(table.name, table);
       custom: '列设置',
       customAll: '全部',
       customConfirm: '确认',
-      customRestore: '还原'
+      customRestore: '重置'
     },
     input: {
       date: {