vxe-table 4.23.0 → 4.23.2

package/dist/all.esm.js

@@ -56,7 +56,7 @@ function getDefaultConfig(val1, def1) {
     return XEUtils.eqNull(val1) ? def1 : val1;
 }
 
-const version = "4.23.0";
+const version = "4.23.2";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -952,7 +952,7 @@ function getPopupAppendElement(appendTo) {
 }
 
 const { log } = VxeUI;
-const tableVersion = `table v${"4.23.0"}`;
+const tableVersion = `table v${"4.23.2"}`;
 function createComponentLog(name) {
     const uiVersion = VxeUI.uiVersion ? `ui v${VxeUI.uiVersion}` : '';
     const ganttVersion = VxeUI.ganttVersion ? `gantt v${VxeUI.ganttVersion}` : '';
@@ -13535,6 +13535,44 @@ hooks$2.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;
+        };
         /**
          * 聚焦到校验通过的单元格并弹出校验错误提示
          */
@@ -13671,7 +13709,7 @@ hooks$2.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]);
@@ -13766,48 +13804,11 @@ hooks$2.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();
             }
         };
@@ -16224,12 +16225,14 @@ var VxeTableComponent = defineVxeComponent({
         });
         const computeScrollbarWrapperClss = computed(() => {
             const { yThumbHeight, xThumbWidth } = reactData;
+            const scrollbarOpts = computeScrollbarOpts.value;
             const scrollbarXToTop = computeScrollbarXToTop.value;
             const scrollbarYToLeft = computeScrollbarYToLeft.value;
             const scrollXVisible = computeScrollXVisible.value;
             const scrollYVisible = computeScrollYVisible.value;
             return domUtils.buildClass([
                 'vxe-scrollbar is--virtual',
+                scrollbarOpts.fluentOverlay ? 'is--fluent-overlay' : 'is--default-mode',
                 `ov-x--${scrollXVisible === false ? 'hidden' : 'visible'}`,
                 `ov-y--${scrollYVisible === false ? 'hidden' : 'visible'}`,
                 `sx-pos--${scrollbarXToTop ? 'top' : 'bottom'}`,
@@ -29537,6 +29540,8 @@ var VxeTableComponent = defineVxeComponent({
             if (isVScrollbar) {
                 const el = refElem.value;
                 const viewInnerEl = getRefElem(elemStore['main-body-table']);
+                const viewXSpaceEl = getRefElem(elemStore['main-body-xSpace']);
+                const viewYSpaceEl = getRefElem(elemStore['main-body-ySpace']);
                 const scrollObserver = globalResize.create(() => {
                     reScrollFlag.value++;
                 });
@@ -29546,6 +29551,12 @@ var VxeTableComponent = defineVxeComponent({
                 if (viewInnerEl) {
                     scrollObserver.observe(viewInnerEl);
                 }
+                if (viewXSpaceEl) {
+                    scrollObserver.observe(viewXSpaceEl);
+                }
+                if (viewYSpaceEl) {
+                    scrollObserver.observe(viewYSpaceEl);
+                }
                 internalData.scrollObserver = scrollObserver;
             }
         };