vxe-table 4.10.12 → 4.10.13

package/es/table/src/table.js

@@ -1540,12 +1540,12 @@ export default defineComponent({
             const sortOpts = computeSortOpts.value;
             const treeOpts = computeTreeOpts.value;
             const childrenField = treeOpts.children || treeOpts.childrenField;
-            const { transform } = treeOpts;
+            const { transform, rowField, parentField, mapChildrenField } = treeOpts;
             const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
             const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
             let tableData = [];
             let tableTree = [];
-            // 处理列
+            // 处理数据
             if (!allRemoteFilter || !allRemoteSort) {
                 const filterColumns = [];
                 let orderColumns = [];
@@ -1601,7 +1601,7 @@ export default defineComponent({
                         tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
                             original: true,
                             isEvery: true,
-                            children: treeOpts.mapChildrenField,
+                            children: mapChildrenField,
                             mapChildren: childrenField
                         });
                         tableData = tableTree;
@@ -1617,7 +1617,7 @@ export default defineComponent({
                         tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                             original: true,
                             isEvery: true,
-                            children: treeOpts.mapChildrenField,
+                            children: mapChildrenField,
                             mapChildren: childrenField
                         });
                         tableData = tableTree;
@@ -1637,7 +1637,15 @@ export default defineComponent({
                             tableTree = XEUtils.isArray(sortRests) ? sortRests : tableTree;
                         }
                         else {
-                            tableTree = XEUtils.orderBy(tableTree, orderColumns.map(({ column, order }) => [getOrderField(column), order]));
+                            const treeList = XEUtils.toTreeArray(tableTree, {
+                                children: mapChildrenField
+                            });
+                            tableTree = XEUtils.toArrayTree(XEUtils.orderBy(treeList, orderColumns.map(({ column, order }) => [getOrderField(column), order])), {
+                                key: rowField,
+                                parentKey: parentField,
+                                children: childrenField,
+                                mapChildren: mapChildrenField
+                            });
                         }
                         tableData = tableTree;
                     }

package/es/ui/index.js

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

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.10.12";
+const version = "4.10.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3585,7 +3585,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.10.12"}`;
+const log_version = `table v${"4.10.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6606,6 +6606,7 @@ const renderType = 'body';
           'fixed--width': !isAutoCellWidth,
           'fixed--hidden': fixedHiddenColumn,
           'is--padding': isCellPadding,
+          'is--progress': fixedHiddenColumn && isAllOverflow || isVNPreEmptyStatus,
           'is--drag-cell': isRowDragCell && (isCrossDrag || isPeerDrag || !rowLevel),
           'is--drag-disabled': isDisabledDrag,
           'col--dirty': isDirty,
@@ -12059,7 +12060,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const treeOpts = computeTreeOpts.value;
       const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
-        transform
+        transform,
+        rowField,
+        parentField,
+        mapChildrenField
       } = treeOpts;
       const {
         remote: allRemoteFilter,
@@ -12073,7 +12077,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } = sortOpts;
       let tableData = [];
       let tableTree = [];
-      // 处理列
+      // 处理数据
       if (!allRemoteFilter || !allRemoteSort) {
         const filterColumns = [];
         let orderColumns = [];
@@ -12175,7 +12179,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             });
             tableData = tableTree;
@@ -12189,7 +12193,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
               original: true,
               isEvery: true,
-              children: treeOpts.mapChildrenField,
+              children: mapChildrenField,
               mapChildren: childrenField
             });
             tableData = tableTree;
@@ -12211,10 +12215,18 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               });
               tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(sortRests) ? sortRests : tableTree;
             } else {
-              tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(tableTree, orderColumns.map(({
+              const treeList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(tableTree, {
+                children: mapChildrenField
+              });
+              tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toArrayTree(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().orderBy(treeList, orderColumns.map(({
                 column,
                 order
-              }) => [getOrderField(column), order]));
+              }) => [getOrderField(column), order])), {
+                key: rowField,
+                parentKey: parentField,
+                children: childrenField,
+                mapChildren: mapChildrenField
+              });
             }
             tableData = tableTree;
           } else {
@@ -23803,6 +23815,7 @@ function createHtmlPage(opts, content) {
 
 
 
+
 const {
   getI18n: export_hook_getI18n,
   hooks: export_hook_hooks,
@@ -24204,7 +24217,7 @@ export_hook_hooks.add('tableExportModule', {
                         cellValue = htmlCellElem.innerText.trim();
                       } else {
                         const cell = $xeTable.getCellElement(row, column);
-                        if (cell) {
+                        if (cell && !hasClass(cell, 'is--progress')) {
                           cellValue = cell.innerText.trim();
                         }
                       }
@@ -24274,7 +24287,7 @@ export_hook_hooks.add('tableExportModule', {
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
                     const cell = $xeTable.getCellElement(row, column);
-                    if (cell) {
+                    if (cell && !hasClass(cell, 'is--progress')) {
                       cellValue = cell.innerText.trim();
                     }
                   }