vxe-table 4.23.1 → 4.23.2

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

@@ -142,6 +142,44 @@ hooks.add('tableValidatorModule', {
         const { computeValidOpts, computeTreeOpts, computeEditOpts, computeAggregateOpts } = $xeTable.getComputeMaps();
         let validatorMethods = {};
         let validatorPrivateMethods = {};
+        const handleClearValid = (rows, fieldOrColumn) => {
+            const { validErrorMaps } = reactData;
+            const validOpts = computeValidOpts.value;
+            const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : []);
+            const colList = (XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : (fieldOrColumn ? [fieldOrColumn] : [])).map(column => handleFieldOrColumn($xeTable, column));
+            let validErrMaps = {};
+            // 如果是多个提示模式
+            if (validOpts.msgMode === 'full') {
+                validErrMaps = Object.assign({}, validErrorMaps);
+                if (rowList.length && colList.length) {
+                    rowList.forEach(row => {
+                        colList.forEach((column) => {
+                            const validKey = `${getRowid($xeTable, row)}:${column.id}`;
+                            if (validErrMaps[validKey]) {
+                                delete validErrMaps[validKey];
+                            }
+                        });
+                    });
+                }
+                else if (rowList.length) {
+                    const rowIdList = rowList.map(row => `${getRowid($xeTable, row)}`);
+                    XEUtils.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.each(validErrorMaps, (item, key) => {
+                        if (colidList.indexOf(key.split(':')[1]) > -1) {
+                            delete validErrMaps[key];
+                        }
+                    });
+                }
+            }
+            return validErrMaps;
+        };
         /**
          * 聚焦到校验通过的单元格并弹出校验错误提示
          */
@@ -278,7 +316,7 @@ hooks.add('tableValidatorModule', {
                 }
                 return Promise.all(rowValidErrs).then(() => {
                     const ruleProps = Object.keys(validRest);
-                    reactData.validErrorMaps = handleErrMsgMode(validErrMaps);
+                    reactData.validErrorMaps = Object.assign(handleClearValid(rows, columns), handleErrMsgMode(validErrMaps));
                     return nextTick().then(() => {
                         if (ruleProps.length) {
                             return Promise.reject(validRest[ruleProps[0]][0]);
@@ -373,48 +411,11 @@ hooks.add('tableValidatorModule', {
                 return nextTick();
             },
             clearValidate(rows, fieldOrColumn) {
-                const { validErrorMaps } = reactData;
                 const validTip = refValidTooltip.value;
-                const validOpts = computeValidOpts.value;
-                const rowList = XEUtils.isArray(rows) ? rows : (rows ? [rows] : []);
-                const colList = (XEUtils.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 nextTick();
-                }
-                if (rowList.length && colList.length) {
-                    validErrMaps = Object.assign({}, validErrorMaps);
-                    rowList.forEach(row => {
-                        colList.forEach((column) => {
-                            const validKey = `${getRowid($xeTable, row)}:${column.id}`;
-                            if (validErrMaps[validKey]) {
-                                delete validErrMaps[validKey];
-                            }
-                        });
-                    });
-                }
-                else if (rowList.length) {
-                    const rowIdList = rowList.map(row => `${getRowid($xeTable, row)}`);
-                    XEUtils.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}`);
-                    XEUtils.each(validErrorMaps, (item, key) => {
-                        if (colidList.indexOf(key.split(':')[1]) > -1) {
-                            validErrMaps[key] = item;
-                        }
-                    });
-                }
-                reactData.validErrorMaps = validErrMaps;
+                reactData.validErrorMaps = handleClearValid(rows, fieldOrColumn);
                 return nextTick();
             }
         };

package/es/ui/index.js

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

package/es/ui/src/log.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const tableVersion = `table v${"4.23.1"}`;
+const tableVersion = `table v${"4.23.2"}`;
 export function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';

package/lib/index.umd.js

@@ -3322,7 +3322,7 @@ function getDefaultConfig(val1, def1) {
 /* unused harmony import specifier */ var VxeUI;
 
 
-const version = "4.23.1";
+const version = "4.23.2";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -4309,7 +4309,7 @@ function getPopupAppendElement(appendTo) {
 const {
   log: log_log
 } = core_.VxeUI;
-const tableVersion = `table v${"4.23.1"}`;
+const tableVersion = `table v${"4.23.2"}`;
 function createComponentLog(name) {
   const uiVersion = core_.VxeUI.uiVersion ? `ui v${core_.VxeUI.uiVersion}` : '';
   const ganttVersion = core_.VxeUI.ganttVersion ? `gantt v${core_.VxeUI.ganttVersion}` : '';
@@ -18751,6 +18751,44 @@ validator_hook_hooks.add('tableValidatorModule', {
     } = $xeTable.getComputeMaps();
     let validatorMethods = {};
     let validatorPrivateMethods = {};
+    const handleClearValid = (rows, fieldOrColumn) => {
+      const {
+        validErrorMaps
+      } = reactData;
+      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 (validOpts.msgMode === 'full') {
+        validErrMaps = Object.assign({}, validErrorMaps);
+        if (rowList.length && colList.length) {
+          rowList.forEach(row => {
+            colList.forEach(column => {
+              const validKey = `${getRowid($xeTable, row)}:${column.id}`;
+              if (validErrMaps[validKey]) {
+                delete validErrMaps[validKey];
+              }
+            });
+          });
+        } 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(validErrorMaps, (item, key) => {
+            if (rowIdList.indexOf(key.split(':')[0]) > -1) {
+              delete validErrMaps[key];
+            }
+          });
+        } 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(validErrorMaps, (item, key) => {
+            if (colidList.indexOf(key.split(':')[1]) > -1) {
+              delete validErrMaps[key];
+            }
+          });
+        }
+      }
+      return validErrMaps;
+    };
     /**
      * 聚焦到校验通过的单元格并弹出校验错误提示
      */
@@ -18899,7 +18937,7 @@ validator_hook_hooks.add('tableValidatorModule', {
         }
         return Promise.all(rowValidErrs).then(() => {
           const ruleProps = Object.keys(validRest);
-          reactData.validErrorMaps = handleErrMsgMode(validErrMaps);
+          reactData.validErrorMaps = Object.assign(handleClearValid(rows, columns), handleErrMsgMode(validErrMaps));
           return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
             if (ruleProps.length) {
               return Promise.reject(validRest[ruleProps[0]][0]);
@@ -18990,48 +19028,11 @@ validator_hook_hooks.add('tableValidatorModule', {
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       },
       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({}, validErrorMaps);
-          rowList.forEach(row => {
-            colList.forEach(column => {
-              const validKey = `${getRowid($xeTable, row)}:${column.id}`;
-              if (validErrMaps[validKey]) {
-                delete validErrMaps[validKey];
-              }
-            });
-          });
-        } 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(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(validErrorMaps, (item, key) => {
-            if (colidList.indexOf(key.split(':')[1]) > -1) {
-              validErrMaps[key] = item;
-            }
-          });
-        }
-        reactData.validErrorMaps = validErrMaps;
+        reactData.validErrorMaps = handleClearValid(rows, fieldOrColumn);
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
       }
     };