vxe-table 3.11.29 → 3.11.30-beta.0

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.29";
+const version = "3.11.30-beta.0";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2790,7 +2790,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.29"}`;
+const log_version = `table v${"3.11.30-beta.0"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5918,6 +5918,7 @@ const Methods = {
     });
   },
   handleColumn(collectColumn) {
+    const $xeTable = this;
     this.collectColumn = collectColumn;
     const tableFullColumn = getColumnList(collectColumn);
     this.tableFullColumn = tableFullColumn;
@@ -5947,6 +5948,9 @@ const Methods = {
             $table: this
           });
         }
+        if ($xeTable.handleUpdateCustomColumn) {
+          $xeTable.handleUpdateCustomColumn();
+        }
         return this.recalculate();
       });
     });
@@ -22555,33 +22559,17 @@ function validErrorRuleValue(rule, val) {
 /* harmony default export */ var custom_mixin = ({
   methods: {
     _openCustom() {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
         initStore,
-        customStore,
-        collectColumn
-      } = this;
-      const sortMaps = {};
-      const fixedMaps = {};
-      const visibleMaps = {};
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
-        const colid = column.getKey();
-        column.renderFixed = column.fixed;
-        column.renderVisible = column.visible;
-        column.renderResizeWidth = column.renderWidth;
-        sortMaps[colid] = column.renderSortNumber;
-        fixedMaps[colid] = column.fixed;
-        visibleMaps[colid] = column.visible;
-      }, {
-        children: 'children'
-      });
-      customStore.oldSortMaps = sortMaps;
-      customStore.oldFixedMaps = fixedMaps;
-      customStore.oldVisibleMaps = visibleMaps;
-      this.customColumnList = collectColumn.slice(0);
+        customStore
+      } = reactData;
       customStore.visible = true;
       initStore.custom = true;
-      this.checkCustomStatus();
-      this.calcMaxHeight();
+      $xeTable.handleUpdateCustomColumn();
+      $xeTable.checkCustomStatus();
+      $xeTable.calcMaxHeight();
       return this.$nextTick().then(() => this.calcMaxHeight());
     },
     _closeCustom() {
@@ -22852,6 +22840,35 @@ function validErrorRuleValue(rule, val) {
         this.closeCustom();
         this.emitCustomEvent('close', evnt);
       }
+    },
+    handleUpdateCustomColumn() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        customStore
+      } = reactData;
+      const {
+        collectColumn
+      } = internalData;
+      if (customStore.visible) {
+        const sortMaps = {};
+        const fixedMaps = {};
+        const visibleMaps = {};
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
+          const colid = column.getKey();
+          column.renderFixed = column.fixed;
+          column.renderVisible = column.visible;
+          column.renderResizeWidth = column.renderWidth;
+          sortMaps[colid] = column.renderSortNumber;
+          fixedMaps[colid] = column.fixed;
+          visibleMaps[colid] = column.visible;
+        });
+        customStore.oldSortMaps = sortMaps;
+        customStore.oldFixedMaps = fixedMaps;
+        customStore.oldVisibleMaps = visibleMaps;
+        reactData.customColumnList = collectColumn.slice(0);
+      }
     }
   }
 });
@@ -23567,24 +23584,40 @@ function handleUupdateResize(_vm) {
       } = this;
       return tableColumn.length || visibleColumn.length ? visibleColumn.filter(column => column.width === 'auto' || column.minWidth === 'auto') : [];
     },
-    fixedColumnSize() {
+    computeFixedColumnSize() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        tableColumn
+      } = reactData;
       const {
         collectColumn
-      } = this;
+      } = internalData;
       let fixedSize = 0;
-      collectColumn.forEach(column => {
-        if (column.renderFixed) {
-          fixedSize++;
-        }
-      });
+      // 只判断第一层
+      if (tableColumn.length && collectColumn.length) {
+        collectColumn.forEach(column => {
+          if (column.renderFixed) {
+            fixedSize++;
+          }
+        });
+      }
       return fixedSize;
     },
+    fixedColumnSize() {
+      const $xeTable = this;
+      return $xeTable.computeFixedColumnSize;
+    },
     computeIsMaxFixedColumn() {
+      const $xeTable = this;
+      const fixedColumnSize = $xeTable.computeFixedColumnSize;
+      const columnOpts = $xeTable.columnOpts;
       const {
         maxFixedSize
-      } = this.columnOpts;
+      } = columnOpts;
       if (maxFixedSize) {
-        return this.fixedColumnSize >= maxFixedSize;
+        return fixedColumnSize >= maxFixedSize;
       }
       return false;
     },