vxe-table 3.11.18 → 3.11.21

package/es/table/src/methods.js

@@ -634,8 +634,10 @@ const Methods = {
      * @param {Array} datas 数据
      */
     loadTableData(datas) {
+        const $xeTable = this;
         const { keepSource, showOverflow, treeConfig, treeOpts, editStore, scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop, scrollYLoad: oldScrollYLoad, sXOpts, sYOpts } = this;
         const childrenField = treeOpts.children || treeOpts.childrenField;
+        const rowOpts = $xeTable.computeRowOpts;
         let treeData = [];
         let fullData = datas ? datas.slice(0) : [];
         if (treeConfig) {
@@ -698,9 +700,11 @@ const Methods = {
         }
         if (sYLoad) {
             if (showOverflow) {
-                const errColumn = this.tableFullColumn.find((column) => column.showOverflow === false);
-                if (errColumn) {
-                    errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+                if (!rowOpts.height) {
+                    const errColumn = this.tableFullColumn.find((column) => column.showOverflow === false);
+                    if (errColumn) {
+                        errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+                    }
                 }
             }
             if (process.env.NODE_ENV === 'development') {
@@ -2237,7 +2241,7 @@ const Methods = {
         const isCustomVisible = isAllCustom || storageOpts.visible;
         const isCustomFixed = isAllCustom || storageOpts.fixed;
         const isCustomSort = isAllCustom || storageOpts.sort;
-        if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+        if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
                 return;
@@ -2334,7 +2338,11 @@ const Methods = {
         return storeData;
     },
     saveCustomStore(type) {
-        const { tableId, customOpts } = this;
+        const $xeTable = this;
+        const props = $xeTable;
+        const { customConfig } = props;
+        const tableId = $xeTable.computeTableId;
+        const customOpts = $xeTable.computeCustomOpts;
         const { updateStore, storage } = customOpts;
         const isAllCustom = storage === true;
         const storageOpts = isAllCustom ? {} : Object.assign({}, storage || {});
@@ -2342,7 +2350,7 @@ const Methods = {
         const isCustomVisible = isAllCustom || storageOpts.visible;
         const isCustomFixed = isAllCustom || storageOpts.fixed;
         const isCustomSort = isAllCustom || storageOpts.sort;
-        if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
+        if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
             if (!tableId) {
                 errLog('vxe.error.reqProp', ['id']);
                 return this.$nextTick();
@@ -2396,6 +2404,11 @@ const Methods = {
      * 将固定的列左边、右边分别靠边
      */
     parseColumns() {
+        const $xeTable = this;
+        const props = $xeTable;
+        const internalData = $xeTable;
+        const { showOverflow } = props;
+        const rowOpts = $xeTable.computeRowOpts;
         const leftList = [];
         const centerList = [];
         const rightList = [];
@@ -2466,6 +2479,14 @@ const Methods = {
         this.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
         Object.assign(columnStore, { leftList, centerList, rightList });
         if (scrollXLoad) {
+            if (showOverflow) {
+                if (!rowOpts.height) {
+                    const errColumn = internalData.tableFullColumn.find((column) => column.showOverflow === false);
+                    if (errColumn) {
+                        errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+                    }
+                }
+            }
             if (process.env.NODE_ENV === 'development') {
                 // if (this.showHeader && !this.showHeaderOverflow) {
                 //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
@@ -2612,11 +2633,7 @@ const Methods = {
     },
     calcCellWidth() {
         const $xeTable = this;
-        const { autoWidthColumnList, tableData } = this;
-        if (!tableData.length || !autoWidthColumnList.length) {
-            this.isCalcColumn = false;
-            return this.$nextTick();
-        }
+        const { autoWidthColumnList } = this;
         this.isCalcColumn = true;
         return this.$nextTick().then(() => {
             const internalData = $xeTable;
@@ -3440,30 +3457,32 @@ const Methods = {
                     else {
                         // 如果是激活状态，退则出到上一行/下一行
                         if (selected.row || actived.row) {
-                            const targetArgs = selected.row ? selected.args : actived.args;
+                            const activeParams = selected.row ? selected.args : actived.args;
                             if (hasShiftKey) {
                                 if (keyboardOpts.enterToTab) {
-                                    this.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                                    this.moveTabSelected(activeParams, hasShiftKey, evnt);
                                 }
                                 else {
-                                    this.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                                    this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                                 }
                             }
                             else {
                                 if (keyboardOpts.enterToTab) {
-                                    this.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                                    this.moveTabSelected(activeParams, hasShiftKey, evnt);
                                 }
                                 else {
-                                    const _rowIndex = $xeTable.getVTRowIndex(selected.row);
+                                    const activeRow = selected.row || actived.row;
+                                    const activeColumn = selected.column || actived.column;
+                                    const _rowIndex = $xeTable.getVTRowIndex(activeRow);
                                     const etrParams = {
-                                        row: selected.row,
-                                        rowIndex: $xeTable.getRowIndex(selected.row),
-                                        $rowIndex: $xeTable.getVMRowIndex(selected.row),
+                                        row: activeRow,
+                                        rowIndex: $xeTable.getRowIndex(activeRow),
+                                        $rowIndex: $xeTable.getVMRowIndex(activeRow),
                                         _rowIndex,
-                                        column: selected.column,
-                                        columnIndex: $xeTable.getColumnIndex(selected.column),
-                                        $columnIndex: $xeTable.getVMColumnIndex(selected.column),
-                                        _columnIndex: $xeTable.getVTColumnIndex(selected.column),
+                                        column: activeColumn,
+                                        columnIndex: $xeTable.getColumnIndex(activeColumn),
+                                        $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
+                                        _columnIndex: $xeTable.getVTColumnIndex(activeColumn),
                                         $table: $xeTable
                                     };
                                     if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
@@ -3472,13 +3491,13 @@ const Methods = {
                                             if (_rowIndex >= afterFullData.length - 1) {
                                                 $xeTable.insertAt({}, -1).then(({ row: newRow }) => {
                                                     $xeTable.scrollToRow(newRow, selected.column);
-                                                    $xeTable.setSelectCell(newRow, selected.column);
+                                                    $xeTable.handleSelected(Object.assign(Object.assign({}, activeParams), { row: newRow }), evnt);
                                                 });
                                                 $xeTable.dispatchEvent('enter-append-row', etrParams, evnt);
                                                 return;
                                             }
                                         }
-                                        this.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                                        this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                                         if (enterMethod) {
                                             enterMethod(etrParams);
                                         }
@@ -6197,7 +6216,7 @@ const Methods = {
             $xeTable.checkScrolling();
             internalData.lastScrollLeft = scrollLeft;
         }
-        else {
+        if (isRollY) {
             const yThreshold = $xeTable.computeScrollYThreshold;
             isTop = scrollTop <= 0;
             if (!isTop) {
@@ -6310,7 +6329,7 @@ const Methods = {
     scrollXEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { inFooterScroll, inBodyScroll } = internalData;
+        const { inFooterScroll, inBodyScroll, lastScrollTop } = internalData;
         if (inFooterScroll) {
             return;
         }
@@ -6323,10 +6342,16 @@ const Methods = {
         const bodyElem = tableBody.$el;
         const headerElem = tableHeader ? tableHeader.$el : null;
         const footerElem = tableFooter ? tableFooter.$el : null;
+        const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
         const wrapperEl = evnt.currentTarget;
-        const { scrollTop, scrollLeft } = wrapperEl;
+        const { scrollLeft } = wrapperEl;
+        const yBodyEl = yHandleEl || bodyElem;
+        let scrollTop = 0;
+        if (yBodyEl) {
+            scrollTop = yBodyEl.scrollTop;
+        }
         const isRollX = true;
-        const isRollY = false;
+        const isRollY = scrollTop !== lastScrollTop;
         internalData.inVirtualScroll = true;
         setScrollLeft(bodyElem, scrollLeft);
         setScrollLeft(headerElem, scrollLeft);
@@ -6340,7 +6365,7 @@ const Methods = {
     scrollYEvent(evnt) {
         const $xeTable = this;
         const internalData = $xeTable;
-        const { inFooterScroll, inBodyScroll } = internalData;
+        const { inFooterScroll, inBodyScroll, lastScrollLeft } = internalData;
         if (inFooterScroll) {
             return;
         }
@@ -6353,9 +6378,15 @@ const Methods = {
         const bodyElem = tableBody.$el;
         const leftElem = leftBody ? leftBody.$el : null;
         const rightElem = rightBody ? rightBody.$el : null;
+        const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
         const wrapperEl = evnt.currentTarget;
-        const { scrollTop, scrollLeft } = wrapperEl;
-        const isRollX = false;
+        const { scrollTop } = wrapperEl;
+        const xBodyEl = xHandleEl || bodyElem;
+        let scrollLeft = 0;
+        if (xBodyEl) {
+            scrollLeft = xBodyEl.scrollLeft;
+        }
+        const isRollX = scrollLeft !== lastScrollLeft;
         const isRollY = true;
         internalData.inVirtualScroll = true;
         setScrollTop(bodyElem, scrollTop);
@@ -6599,7 +6630,7 @@ const Methods = {
             }
         }
         if (this.scrollXLoad || this.scrollYLoad) {
-            return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50));
+            return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
         }
         return this.$nextTick();
     },

package/es/table/src/table.js

@@ -397,6 +397,9 @@ export default {
         };
     },
     computed: Object.assign(Object.assign({}, {}), { tableId() {
+            return this.computeTableId;
+        },
+        computeTableId() {
             const { id } = this;
             if (id) {
                 if (XEUtils.isFunction(id)) {
@@ -878,8 +881,10 @@ export default {
         }
         if (process.env.NODE_ENV === 'development') {
             const customOpts = this.customOpts;
-            if (!this.id && this.customConfig && (customOpts.storage === true || (customOpts.storage && customOpts.storage.resizable) || (customOpts.storage && customOpts.storage.visible))) {
-                errLog('vxe.error.reqProp', ['id']);
+            if (!this.id) {
+                if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+                    errLog('vxe.error.reqProp', ['id']);
+                }
             }
             if (this.treeConfig && this.checkboxOpts.range) {
                 errLog('vxe.error.noTree', ['checkbox-config.range']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.11.18";
+export const version = "3.11.21";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -69,6 +69,7 @@ VxeUI.setConfig({
         //   visibleMethod () {}
         // },
         customConfig: {
+            // enabled: false,
             allowVisible: true,
             allowResizable: true,
             allowFixed: true,
@@ -83,6 +84,12 @@ VxeUI.setConfig({
                 lockView: true,
                 resize: true,
                 escClosable: true
+            },
+            drawerOptions: {
+                mask: true,
+                lockView: true,
+                escClosable: true,
+                resize: true
             }
         },
         sortConfig: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.11.18"}`;
+const version = `table v${"3.11.21"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.18";
+const version = "3.11.21";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2289,6 +2289,7 @@ core_.VxeUI.setConfig({
     //   visibleMethod () {}
     // },
     customConfig: {
+      // enabled: false,
       allowVisible: true,
       allowResizable: true,
       allowFixed: true,
@@ -2303,6 +2304,12 @@ core_.VxeUI.setConfig({
         lockView: true,
         resize: true,
         escClosable: true
+      },
+      drawerOptions: {
+        mask: true,
+        lockView: true,
+        escClosable: true,
+        resize: true
       }
     },
     sortConfig: {
@@ -2778,7 +2785,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.18"}`;
+const log_version = `table v${"3.11.21"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5587,6 +5594,7 @@ const Methods = {
    * @param {Array} datas 数据
    */
   loadTableData(datas) {
+    const $xeTable = this;
     const {
       keepSource,
       showOverflow,
@@ -5602,6 +5610,7 @@ const Methods = {
       sYOpts
     } = this;
     const childrenField = treeOpts.children || treeOpts.childrenField;
+    const rowOpts = $xeTable.computeRowOpts;
     let treeData = [];
     let fullData = datas ? datas.slice(0) : [];
     if (treeConfig) {
@@ -5663,9 +5672,11 @@ const Methods = {
     }
     if (sYLoad) {
       if (showOverflow) {
-        const errColumn = this.tableFullColumn.find(column => column.showOverflow === false);
-        if (errColumn) {
-          errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+        if (!rowOpts.height) {
+          const errColumn = this.tableFullColumn.find(column => column.showOverflow === false);
+          if (errColumn) {
+            errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+          }
         }
       }
       if (true) {
@@ -7513,7 +7524,7 @@ const Methods = {
     const isCustomVisible = isAllCustom || storageOpts.visible;
     const isCustomFixed = isAllCustom || storageOpts.fixed;
     const isCustomSort = isAllCustom || storageOpts.sort;
-    if (customConfig && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
+    if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
         return;
@@ -7620,10 +7631,13 @@ const Methods = {
     return storeData;
   },
   saveCustomStore(type) {
+    const $xeTable = this;
+    const props = $xeTable;
     const {
-      tableId,
-      customOpts
-    } = this;
+      customConfig
+    } = props;
+    const tableId = $xeTable.computeTableId;
+    const customOpts = $xeTable.computeCustomOpts;
     const {
       updateStore,
       storage
@@ -7634,7 +7648,7 @@ const Methods = {
     const isCustomVisible = isAllCustom || storageOpts.visible;
     const isCustomFixed = isAllCustom || storageOpts.fixed;
     const isCustomSort = isAllCustom || storageOpts.sort;
-    if (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort) {
+    if ((customConfig ? isEnableConf(customOpts) : customOpts.enabled) && (isCustomResizable || isCustomVisible || isCustomFixed || isCustomSort)) {
       if (!tableId) {
         errLog('vxe.error.reqProp', ['id']);
         return this.$nextTick();
@@ -7685,6 +7699,13 @@ const Methods = {
    * 将固定的列左边、右边分别靠边
    */
   parseColumns() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      showOverflow
+    } = props;
+    const rowOpts = $xeTable.computeRowOpts;
     const leftList = [];
     const centerList = [];
     const rightList = [];
@@ -7759,6 +7780,14 @@ const Methods = {
       rightList
     });
     if (scrollXLoad) {
+      if (showOverflow) {
+        if (!rowOpts.height) {
+          const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
+          if (errColumn) {
+            errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
+          }
+        }
+      }
       if (true) {
         // if (this.showHeader && !this.showHeaderOverflow) {
         //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
@@ -7926,13 +7955,8 @@ const Methods = {
   calcCellWidth() {
     const $xeTable = this;
     const {
-      autoWidthColumnList,
-      tableData
+      autoWidthColumnList
     } = this;
-    if (!tableData.length || !autoWidthColumnList.length) {
-      this.isCalcColumn = false;
-      return this.$nextTick();
-    }
     this.isCalcColumn = true;
     return this.$nextTick().then(() => {
       const internalData = $xeTable;
@@ -8865,27 +8889,29 @@ const Methods = {
           } else {
             // 如果是激活状态，退则出到上一行/下一行
             if (selected.row || actived.row) {
-              const targetArgs = selected.row ? selected.args : actived.args;
+              const activeParams = selected.row ? selected.args : actived.args;
               if (hasShiftKey) {
                 if (keyboardOpts.enterToTab) {
-                  this.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  this.moveTabSelected(activeParams, hasShiftKey, evnt);
                 } else {
-                  this.moveSelected(targetArgs, isLeftArrow, true, isRightArrow, false, evnt);
+                  this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
-                  this.moveTabSelected(targetArgs, hasShiftKey, evnt);
+                  this.moveTabSelected(activeParams, hasShiftKey, evnt);
                 } else {
-                  const _rowIndex = $xeTable.getVTRowIndex(selected.row);
+                  const activeRow = selected.row || actived.row;
+                  const activeColumn = selected.column || actived.column;
+                  const _rowIndex = $xeTable.getVTRowIndex(activeRow);
                   const etrParams = {
-                    row: selected.row,
-                    rowIndex: $xeTable.getRowIndex(selected.row),
-                    $rowIndex: $xeTable.getVMRowIndex(selected.row),
+                    row: activeRow,
+                    rowIndex: $xeTable.getRowIndex(activeRow),
+                    $rowIndex: $xeTable.getVMRowIndex(activeRow),
                     _rowIndex,
-                    column: selected.column,
-                    columnIndex: $xeTable.getColumnIndex(selected.column),
-                    $columnIndex: $xeTable.getVMColumnIndex(selected.column),
-                    _columnIndex: $xeTable.getVTColumnIndex(selected.column),
+                    column: activeColumn,
+                    columnIndex: $xeTable.getColumnIndex(activeColumn),
+                    $columnIndex: $xeTable.getVMColumnIndex(activeColumn),
+                    _columnIndex: $xeTable.getVTColumnIndex(activeColumn),
                     $table: $xeTable
                   };
                   if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
@@ -8896,13 +8922,16 @@ const Methods = {
                           row: newRow
                         }) => {
                           $xeTable.scrollToRow(newRow, selected.column);
-                          $xeTable.setSelectCell(newRow, selected.column);
+                          $xeTable.handleSelected({
+                            ...activeParams,
+                            row: newRow
+                          }, evnt);
                         });
                         $xeTable.dispatchEvent('enter-append-row', etrParams, evnt);
                         return;
                       }
                     }
-                    this.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                    this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                     if (enterMethod) {
                       enterMethod(etrParams);
                     }
@@ -12221,7 +12250,8 @@ const Methods = {
       }
       $xeTable.checkScrolling();
       internalData.lastScrollLeft = scrollLeft;
-    } else {
+    }
+    if (isRollY) {
       const yThreshold = $xeTable.computeScrollYThreshold;
       isTop = scrollTop <= 0;
       if (!isTop) {
@@ -12351,7 +12381,8 @@ const Methods = {
     const internalData = $xeTable;
     const {
       inFooterScroll,
-      inBodyScroll
+      inBodyScroll,
+      lastScrollTop
     } = internalData;
     if (inFooterScroll) {
       return;
@@ -12365,13 +12396,18 @@ const Methods = {
     const bodyElem = tableBody.$el;
     const headerElem = tableHeader ? tableHeader.$el : null;
     const footerElem = tableFooter ? tableFooter.$el : null;
+    const yHandleEl = $xeTable.$refs.refScrollYHandleElem;
     const wrapperEl = evnt.currentTarget;
     const {
-      scrollTop,
       scrollLeft
     } = wrapperEl;
+    const yBodyEl = yHandleEl || bodyElem;
+    let scrollTop = 0;
+    if (yBodyEl) {
+      scrollTop = yBodyEl.scrollTop;
+    }
     const isRollX = true;
-    const isRollY = false;
+    const isRollY = scrollTop !== lastScrollTop;
     internalData.inVirtualScroll = true;
     setScrollLeft(bodyElem, scrollLeft);
     setScrollLeft(headerElem, scrollLeft);
@@ -12387,7 +12423,8 @@ const Methods = {
     const internalData = $xeTable;
     const {
       inFooterScroll,
-      inBodyScroll
+      inBodyScroll,
+      lastScrollLeft
     } = internalData;
     if (inFooterScroll) {
       return;
@@ -12401,12 +12438,17 @@ const Methods = {
     const bodyElem = tableBody.$el;
     const leftElem = leftBody ? leftBody.$el : null;
     const rightElem = rightBody ? rightBody.$el : null;
+    const xHandleEl = $xeTable.$refs.refScrollXHandleElem;
     const wrapperEl = evnt.currentTarget;
     const {
-      scrollTop,
-      scrollLeft
+      scrollTop
     } = wrapperEl;
-    const isRollX = false;
+    const xBodyEl = xHandleEl || bodyElem;
+    let scrollLeft = 0;
+    if (xBodyEl) {
+      scrollLeft = xBodyEl.scrollLeft;
+    }
+    const isRollX = scrollLeft !== lastScrollLeft;
     const isRollY = true;
     internalData.inVirtualScroll = true;
     setScrollTop(bodyElem, scrollTop);
@@ -12711,7 +12753,7 @@ const Methods = {
       }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
-      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50));
+      return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 30));
     }
     return this.$nextTick();
   },
@@ -13222,7 +13264,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   const showEllipsis = cellOverflow === 'ellipsis';
   const showTitle = cellOverflow === 'title';
   const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-  const hasEllipsis = showTitle || showTooltip || showEllipsis;
+  // 如果表格加上 showOverflow 则不再支持列单独设置
+  const hasEllipsis = allColumnOverflow || showTitle || showTooltip || showEllipsis;
   let isDirty;
   const tdOns = {};
   const rest = fullAllDataRowIdData[rowid];
@@ -15739,7 +15782,9 @@ const renderPopupPanel = (h, _vm) => {
         title: drawerOpts.title || panel_getI18n('vxe.custom.cstmTitle'),
         width: drawerOpts.width || Math.min(880, Math.floor(document.documentElement.clientWidth * 0.6)),
         position: drawerOpts.position,
+        resize: !!drawerOpts.resize,
         escClosable: !!drawerOpts.escClosable,
+        maskClosable: !!drawerOpts.maskClosable,
         destroyOnClose: true,
         showFooter: true
       },
@@ -15768,6 +15813,7 @@ const renderPopupPanel = (h, _vm) => {
       lockView: modalOpts.lockView,
       resize: modalOpts.resize,
       escClosable: !!modalOpts.escClosable,
+      maskClosable: !!modalOpts.maskClosable,
       destroyOnClose: true,
       showFooter: true
     },
@@ -22555,6 +22601,9 @@ function handleUupdateResize(_vm) {
   computed: {
     ...{},
     tableId() {
+      return this.computeTableId;
+    },
+    computeTableId() {
       const {
         id
       } = this;
@@ -23097,8 +23146,10 @@ function handleUupdateResize(_vm) {
     }
     if (true) {
       const customOpts = this.customOpts;
-      if (!this.id && this.customConfig && (customOpts.storage === true || customOpts.storage && customOpts.storage.resizable || customOpts.storage && customOpts.storage.visible)) {
-        errLog('vxe.error.reqProp', ['id']);
+      if (!this.id) {
+        if ((this.customConfig ? isEnableConf(customOpts) : customOpts.enabled) && customOpts.storage) {
+          errLog('vxe.error.reqProp', ['id']);
+        }
       }
       if (this.treeConfig && this.checkboxOpts.range) {
         errLog('vxe.error.noTree', ['checkbox-config.range']);