vxe-table 3.11.28 → 3.11.30-beta.0

package/es/table/src/table.js

@@ -679,20 +679,34 @@ export default {
             const { tableColumn, visibleColumn } = this;
             return tableColumn.length || visibleColumn.length ? visibleColumn.filter((column) => column.width === 'auto' || column.minWidth === 'auto') : [];
         },
-        fixedColumnSize() {
-            const { collectColumn } = this;
+        computeFixedColumnSize() {
+            const $xeTable = this;
+            const reactData = $xeTable;
+            const internalData = $xeTable;
+            const { tableColumn } = reactData;
+            const { collectColumn } = 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;
         },
-        isMaxFixedColumn() {
-            const { maxFixedSize } = this.columnOpts;
+        fixedColumnSize() {
+            const $xeTable = this;
+            return $xeTable.computeFixedColumnSize;
+        },
+        computeIsMaxFixedColumn() {
+            const $xeTable = this;
+            const fixedColumnSize = $xeTable.computeFixedColumnSize;
+            const columnOpts = $xeTable.columnOpts;
+            const { maxFixedSize } = columnOpts;
             if (maxFixedSize) {
-                return this.fixedColumnSize >= maxFixedSize;
+                return fixedColumnSize >= maxFixedSize;
             }
             return false;
         },
@@ -817,9 +831,20 @@ export default {
             tZindex: 0,
             elemStore: {},
             // 存放横向 X 虚拟滚动相关的信息
-            scrollXStore: {},
+            scrollXStore: {
+                offsetSize: 0,
+                visibleSize: 0,
+                startIndex: 0,
+                endIndex: 0
+            },
             // 存放纵向 Y 虚拟滚动相关信息
-            scrollYStore: {},
+            scrollYStore: {
+                rowHeight: 0,
+                offsetSize: 0,
+                visibleSize: 0,
+                startIndex: 0,
+                endIndex: 0
+            },
             // 表格宽度
             tableWidth: 0,
             // 表格高度

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.28";
+export const version = "3.11.30-beta.0";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

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.28"}`;
+const version = `table v${"3.11.30-beta.0"}`;
 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.28";
+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.28"}`;
+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;
@@ -5943,10 +5944,13 @@ const Methods = {
       return this.$nextTick().then(() => {
         if (this.$toolbar) {
           this.$toolbar.syncUpdate({
-            collectColumn,
+            collectColumn: this.collectColumn,
             $table: this
           });
         }
+        if ($xeTable.handleUpdateCustomColumn) {
+          $xeTable.handleUpdateCustomColumn();
+        }
         return this.recalculate();
       });
     });
@@ -15658,7 +15662,7 @@ function panel_showDropTip(_vm, evnt, optEl, showLine, dragPos) {
       if (showLine) {
         const optRect = optEl.getBoundingClientRect();
         dragLineEl.style.display = 'block';
-        dragLineEl.style.top = `${Math.max(1, optRect.y - wrapperRect.y)}px`;
+        dragLineEl.style.top = `${Math.max(1, optRect.y + el.scrollTop - wrapperRect.y)}px`;
         dragLineEl.style.height = `${optRect.height}px`;
         dragLineEl.style.width = `${optRect.width}px`;
         dragLineEl.setAttribute('drag-pos', dragPos);
@@ -15671,8 +15675,8 @@ function panel_showDropTip(_vm, evnt, optEl, showLine, dragPos) {
   const dragTipEl = _vm.$refs.refDragTipElem;
   if (dragTipEl) {
     dragTipEl.style.display = 'block';
-    dragTipEl.style.top = `${Math.min(el.clientHeight - el.scrollTop - dragTipEl.clientHeight, evnt.clientY - wrapperRect.y)}px`;
-    dragTipEl.style.left = `${Math.min(el.clientWidth - el.scrollLeft - dragTipEl.clientWidth - 16, evnt.clientX - wrapperRect.x)}px`;
+    dragTipEl.style.top = `${Math.min(el.clientHeight + el.scrollTop - dragTipEl.clientHeight, evnt.clientY + el.scrollTop - wrapperRect.y)}px`;
+    dragTipEl.style.left = `${Math.min(el.clientWidth + el.scrollLeft - dragTipEl.clientWidth, evnt.clientX + el.scrollLeft - wrapperRect.x)}px`;
     dragTipEl.setAttribute('drag-status', showLine ? prevDragToChild ? 'sub' : 'normal' : 'disabled');
   }
 }
@@ -15707,7 +15711,7 @@ const renderDragTip = (h, _vm) => {
   }), h('span', {
     class: ['vxe-table-custom-popup--drag-tip-disabled-status', panel_getIcon().TABLE_DRAG_DISABLED]
   })]), h('div', {
-    class: 'vxe-table--drag-tip-content'
+    class: 'vxe-table-custom-popup--drag-tip-content'
   }, panel_getI18n('vxe.custom.cstmDragTarget', [dragCol && dragCol.type !== 'html' ? dragCol.getTitle() : '']))])])]);
 };
 const renderSimplePanel = (h, _vm) => {
@@ -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;
     },
-    isMaxFixedColumn() {
+    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;
     },
@@ -23740,9 +23773,20 @@ function handleUupdateResize(_vm) {
       tZindex: 0,
       elemStore: {},
       // 存放横向 X 虚拟滚动相关的信息
-      scrollXStore: {},
+      scrollXStore: {
+        offsetSize: 0,
+        visibleSize: 0,
+        startIndex: 0,
+        endIndex: 0
+      },
       // 存放纵向 Y 虚拟滚动相关信息
-      scrollYStore: {},
+      scrollYStore: {
+        rowHeight: 0,
+        offsetSize: 0,
+        visibleSize: 0,
+        startIndex: 0,
+        endIndex: 0
+      },
       // 表格宽度
       tableWidth: 0,
       // 表格高度