vxe-table 3.12.1 → 3.12.3

package/es/table/src/methods.js

@@ -212,6 +212,54 @@ function cacheColumnMap($xeTable) {
     reactData.expandColumn = expandColumn;
     reactData.isAllOverflow = isAllOverflow;
 }
+const updateScrollYStatus = ($xeTable, fullData) => {
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { treeConfig } = props;
+    const sYOpts = $xeTable.computeSYOpts;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const { transform } = treeOpts;
+    const allList = fullData || internalData.tableFullData;
+    // 如果gt为0，则总是启用
+    const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt < allList.length);
+    reactData.scrollYLoad = scrollYLoad;
+    return scrollYLoad;
+};
+/**
+ * 如果为虚拟树，将树结构拍平
+ * @returns
+ */
+function handleVirtualTreeToList($xeTable) {
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const { treeConfig } = props;
+    const { treeExpandedMaps } = reactData;
+    const { fullAllDataRowIdData } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    if (treeConfig && treeOpts.transform) {
+        const fullData = [];
+        const expandMaps = {};
+        XEUtils.eachTree(internalData.afterTreeFullData, (row, index, items, path, parentRow) => {
+            const rowid = getRowid($xeTable, row);
+            const parentRowid = getRowid($xeTable, parentRow);
+            if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
+                const rowRest = fullAllDataRowIdData[rowid];
+                if (rowRest) {
+                    rowRest._index = fullData.length;
+                }
+                expandMaps[rowid] = 1;
+                fullData.push(row);
+            }
+        }, { children: childrenField });
+        internalData.afterFullData = fullData;
+        updateScrollYStatus($xeTable, fullData);
+        return fullData;
+    }
+    return internalData.afterFullData;
+}
 function computeRowHeight($xeTable) {
     const tableHeader = $xeTable.$refs.tableHeader;
     const tableBody = $xeTable.$refs.tableBody;
@@ -1102,6 +1150,7 @@ const Methods = {
         });
     },
     handleTableData(force) {
+        const $xeTable = this;
         const { scrollYLoad, scrollYStore, fullDataRowIdData, afterFullData } = this;
         let fullList = afterFullData;
         // 是否进行数据处理
@@ -1109,7 +1158,7 @@ const Methods = {
             // 更新数据，处理筛选和排序
             this.updateAfterFullData();
             // 如果为虚拟树，将树结构拍平
-            fullList = this.handleVirtualTreeToList();
+            fullList = handleVirtualTreeToList($xeTable);
         }
         const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
         tableData.forEach((row, $index) => {
@@ -1122,15 +1171,6 @@ const Methods = {
         this.tableData = tableData;
         return this.$nextTick();
     },
-    updateScrollYStatus(fullData) {
-        const { treeConfig, treeOpts, sYOpts } = this;
-        const { transform } = treeOpts;
-        const allList = fullData || this.tableFullData;
-        // 如果gt为0，则总是启用
-        const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt <= allList.length);
-        this.scrollYLoad = scrollYLoad;
-        return scrollYLoad;
-    },
     /**
      * 加载表格数据
      * @param {Array} datas 数据
@@ -1186,7 +1226,7 @@ const Methods = {
         editStore.insertMaps = {};
         editStore.removeList = [];
         editStore.removeMaps = {};
-        const sYLoad = this.updateScrollYStatus(fullData);
+        const sYLoad = updateScrollYStatus($xeTable, fullData);
         this.isDragRowMove = false;
         // 全量数据
         this.tableFullData = fullData;
@@ -2069,37 +2109,6 @@ const Methods = {
         }
         return rowList;
     },
-    /**
-     * 如果为虚拟树，将树结构拍平
-     * @returns
-     */
-    handleVirtualTreeToList() {
-        const $xeTable = this;
-        const internalData = $xeTable;
-        const { fullAllDataRowIdData } = internalData;
-        const { treeOpts, treeConfig, treeExpandedMaps, afterTreeFullData, afterFullData } = this;
-        const childrenField = treeOpts.children || treeOpts.childrenField;
-        if (treeConfig && treeOpts.transform) {
-            const fullData = [];
-            const expandMaps = {};
-            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
-                const rowid = getRowid(this, row);
-                const parentRowid = getRowid(this, parentRow);
-                if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
-                    const rowRest = fullAllDataRowIdData[rowid];
-                    if (rowRest) {
-                        rowRest._index = fullData.length;
-                    }
-                    expandMaps[rowid] = 1;
-                    fullData.push(row);
-                }
-            }, { children: childrenField });
-            this.afterFullData = fullData;
-            this.updateScrollYStatus(fullData);
-            return fullData;
-        }
-        return afterFullData;
-    },
     /**
      * 获取处理后全量的表格数据
      * 如果存在筛选条件，继续处理
@@ -5547,7 +5556,7 @@ const Methods = {
                     reactData.isDragRowMove = true;
                     $xeTable.handleTableData(treeConfig && transform);
                     $xeTable.cacheRowMap();
-                    $xeTable.updateScrollYStatus();
+                    updateScrollYStatus($xeTable);
                     if (!(treeConfig && transform)) {
                         $xeTable.updateAfterDataIndex();
                     }
@@ -6214,19 +6223,20 @@ const Methods = {
     },
     clearRowExpandLoaded(row) {
         const $xeTable = this;
-        const { expandOpts, rowExpandLazyLoadedMaps, fullAllDataRowIdData } = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
+        const { fullAllDataRowIdData } = internalData;
+        const expandOpts = $xeTable.computeExpandOpts;
         const { lazy } = expandOpts;
         const rowid = getRowid($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
         if (lazy && rowRest) {
             rowRest.expandLoaded = false;
-            const rowTempExpandLazyLoadedMaps = Object.assign({}, rowExpandLazyLoadedMaps);
-            if (rowTempExpandLazyLoadedMaps[rowid]) {
-                delete rowTempExpandLazyLoadedMaps[rowid];
-            }
-            this.rowExpandLazyLoadedMaps = rowTempExpandLazyLoadedMaps;
+            delete rExpandLazyLoadedMaps[rowid];
         }
-        return this.$nextTick();
+        reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+        return $xeTable.$nextTick();
     },
     /**
      * 重新懒加载展开行，并展开内容
@@ -6314,30 +6324,36 @@ const Methods = {
     },
     handleAsyncRowExpand(row) {
         const $xeTable = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
         return new Promise(resolve => {
             const { expandOpts } = this;
             const { loadMethod } = expandOpts;
             if (loadMethod) {
-                const { rowExpandLazyLoadedMaps, fullAllDataRowIdData } = this;
+                const { fullAllDataRowIdData } = internalData;
+                const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
                 const rowid = getRowid($xeTable, row);
                 const rowRest = fullAllDataRowIdData[rowid];
-                rowExpandLazyLoadedMaps[rowid] = row;
-                loadMethod({ $table: $xeTable, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) }).then(() => {
-                    const { rowExpandedMaps } = this;
+                rExpandLazyLoadedMaps[rowid] = row;
+                reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+                loadMethod({ $table: $xeTable, row, rowIndex: $xeTable.getRowIndex(row), $rowIndex: $xeTable.getVMRowIndex(row) }).then(() => {
+                    const rExpandedMaps = Object.assign({}, reactData.rowExpandedMaps);
                     if (rowRest) {
                         rowRest.expandLoaded = true;
                     }
-                    rowExpandedMaps[rowid] = row;
+                    rExpandedMaps[rowid] = row;
+                    reactData.rowExpandedMaps = rExpandedMaps;
                 }).catch(() => {
                     if (rowRest) {
                         rowRest.expandLoaded = false;
                     }
                 }).finally(() => {
-                    const { rowExpandLazyLoadedMaps } = this;
-                    if (rowExpandLazyLoadedMaps[rowid]) {
-                        delete rowExpandLazyLoadedMaps[rowid];
+                    const rExpandLazyLoadedMaps = Object.assign({}, reactData.rowExpandLazyLoadedMaps);
+                    if (rExpandLazyLoadedMaps[rowid]) {
+                        delete rExpandLazyLoadedMaps[rowid];
                     }
-                    this.$nextTick().then(() => this.recalculate()).then(() => resolve());
+                    reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps;
+                    $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve());
                 });
             }
             else {
@@ -6490,7 +6506,11 @@ const Methods = {
     },
     clearTreeExpandLoaded(rows) {
         const $xeTable = this;
-        const { treeOpts, treeExpandedMaps, fullAllDataRowIdData } = this;
+        const reactData = $xeTable;
+        const internalData = $xeTable;
+        const tExpandedMaps = Object.assign({}, reactData.treeExpandedMaps);
+        const { fullAllDataRowIdData } = internalData;
+        const treeOpts = $xeTable.computeTreeOpts;
         const { transform } = treeOpts;
         if (rows) {
             if (!XEUtils.isArray(rows)) {
@@ -6501,23 +6521,25 @@ const Methods = {
                 const rowRest = fullAllDataRowIdData[rowid];
                 if (rowRest) {
                     rowRest.treeLoaded = false;
-                    if (treeExpandedMaps[rowid]) {
-                        delete treeExpandedMaps[rowid];
+                    if (tExpandedMaps[rowid]) {
+                        delete tExpandedMaps[rowid];
                     }
                 }
             });
         }
+        reactData.treeExpandedMaps = tExpandedMaps;
         if (transform) {
-            this.handleVirtualTreeToList();
-            return this.handleTableData();
+            handleVirtualTreeToList($xeTable);
+            return $xeTable.handleTableData();
         }
-        return this.$nextTick();
+        return $xeTable.$nextTick();
     },
     /**
      * 重新懒加载树节点，并展开该节点
      * @param {Row} row 行对象
      */
     reloadTreeExpand(row) {
+        const $xeTable = this;
         const { treeOpts, treeExpandLazyLoadedMaps } = this;
         const { transform, lazy } = treeOpts;
         const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
@@ -6527,7 +6549,7 @@ const Methods = {
                 return this.handleAsyncTreeExpandChilds(row);
             }).then(() => {
                 if (transform) {
-                    this.handleVirtualTreeToList();
+                    handleVirtualTreeToList($xeTable);
                     return this.handleTableData();
                 }
             }).then(() => {
@@ -6739,8 +6761,9 @@ const Methods = {
      * @returns
      */
     handleVirtualTreeExpand(rows, expanded) {
+        const $xeTable = this;
         return this.handleBaseTreeExpand(rows, expanded).then(() => {
-            this.handleVirtualTreeToList();
+            handleVirtualTreeToList($xeTable);
             this.handleTableData();
             this.updateTreeDataIndex();
         }).then(() => {
@@ -6789,6 +6812,7 @@ const Methods = {
      * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
      */
     clearTreeExpand() {
+        const $xeTable = this;
         const { treeOpts, tableFullData } = this;
         const { transform, reserve } = treeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
@@ -6799,7 +6823,7 @@ const Methods = {
         }
         return this.handleTableData().then(() => {
             if (transform) {
-                this.handleVirtualTreeToList();
+                handleVirtualTreeToList($xeTable);
                 return this.handleTableData();
             }
         }).then(() => {

package/es/toolbar/src/toolbar.js

@@ -4,7 +4,7 @@ import { VxeUI } from '../../ui';
 import { getSlotVNs } from '../../ui/src/vn';
 import { warnLog, errLog } from '../../ui/src/log';
 const { getConfig, getIcon, getI18n, renderer, commands, createEvent, globalMixins, renderEmptyElement } = VxeUI;
-export default {
+export default defineVxeComponent({
     name: 'VxeToolbar',
     mixins: [
         globalMixins.sizeMixin
@@ -704,4 +704,4 @@ export default {
     render(h) {
         return this.renderVN(h);
     }
-};
+});

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.12.1";
+export const version = "3.12.3";
 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.12.1"}`;
+const version = `table v${"3.12.3"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);