vxe-table 3.12.0-beta.13 → 3.12.0-beta.15

package/es/table/src/methods.js

@@ -969,7 +969,7 @@ const Methods = {
         const isLazy = treeConfig && treeOpts.lazy;
         const fullAllDataRowIdMaps = {};
         const fullDataRowIdMaps = {};
-        const handleCache = (row, index, items, path, parent, nodes) => {
+        const handleCache = (row, index, items, path, parentRow, nodes) => {
             let rowid = getRowid(this, row);
             const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
             const level = nodes ? nodes.length - 1 : 0;
@@ -982,13 +982,13 @@ const Methods = {
             }
             let cacheItem = fullAllDataRowIdData[rowid];
             if (!cacheItem) {
-                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent, level, height: 0 };
+                cacheItem = { row, rowid, seq, index: -1, _index: -1, $index: -1, items, parent: parentRow, level, height: 0 };
             }
             cacheItem.row = row;
             cacheItem.items = items;
-            cacheItem.parent = parent;
+            cacheItem.parent = parentRow;
             cacheItem.level = level;
-            cacheItem.index = treeConfig && parent ? -1 : index;
+            cacheItem.index = treeConfig && parentRow ? -1 : index;
             if (isSource) {
                 fullDataRowIdMaps[rowid] = cacheItem;
             }
@@ -1053,9 +1053,9 @@ const Methods = {
                     sourceDataRowIdData[rowid] = XEUtils.clone(childRow, true);
                 });
             }
-            XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
+            XEUtils.eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
                 const rowid = getRowid($xeTable, childRow);
-                const parentRow = parent || parentRest.row;
+                const parentRow = parentItem || parentRest.row;
                 const rest = { row: childRow, rowid, seq: -1, index, _index: -1, $index: -1, items, parent: parentRow, level: parentLevel + nodes.length, height: 0 };
                 fullDataRowIdData[rowid] = rest;
                 fullAllDataRowIdData[rowid] = rest;
@@ -1093,9 +1093,9 @@ const Methods = {
         let radioColumn;
         let htmlColumn;
         let hasFixed;
-        const handleFunc = (column, index, items, path, parent) => {
+        const handleFunc = (column, index, items, path, parentColumn) => {
             const { id: colid, field, fixed, type, treeNode } = column;
-            const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parent || null, width: 0 };
+            const rest = { $index: -1, _index: -1, column, colid, index, items, parent: parentColumn || null, width: 0 };
             if (field) {
                 if (fullColumnFieldData[field]) {
                     errLog('vxe.error.colRepet', ['field', field]);
@@ -1160,9 +1160,9 @@ const Methods = {
             fullColumnIdData[colid] = rest;
         };
         if (isGroup) {
-            XEUtils.eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
+            XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
                 column.level = nodes.length;
-                handleFunc(column, index, items, path, parent);
+                handleFunc(column, index, items, path, parentColumn);
             });
         }
         else {
@@ -1754,10 +1754,10 @@ const Methods = {
         if (treeConfig && treeOpts.transform) {
             const fullData = [];
             const expandMaps = {};
-            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+            XEUtils.eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
                 const rowid = getRowid(this, row);
-                const parentRowid = getRowid(this, parent);
-                if (!parent || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
+                const parentRowid = getRowid(this, parentRow);
+                if (!parentRow || (expandMaps[parentRowid] && treeExpandedMaps[parentRowid])) {
                     const rowRest = fullAllDataRowIdData[rowid];
                     if (rowRest) {
                         rowRest._index = fullData.length;
@@ -2292,11 +2292,11 @@ const Methods = {
         let hasCustomSort = false;
         // 处理还原
         if (resizableData || sortData || visibleData || fixedData) {
-            XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+            XEUtils.eachTree(collectColumn, (column, index, items, path, parentRow) => {
                 const colKey = column.getKey();
                 // 支持一级
-                if (!parent) {
-                    if (fixedData && fixedData[colKey]) {
+                if (!parentRow) {
+                    if (fixedData && fixedData[colKey] !== undefined) {
                         column.fixed = fixedData[colKey];
                     }
                     if (sortData && XEUtils.isNumber(sortData[colKey])) {
@@ -2375,9 +2375,9 @@ const Methods = {
         let hasSort = 0;
         let hasFixedt = 0;
         let hasVisible = 0;
-        XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+        XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
             // 只支持一级
-            if (!parent) {
+            if (!parentColumn) {
                 collectColumn.forEach((column) => {
                     const colKey = column.getKey();
                     if (colKey) {
@@ -2385,7 +2385,7 @@ const Methods = {
                         sortData[colKey] = column.renderSortNumber;
                     }
                 });
-                if (column.fixed && column.fixed !== column.defaultFixed) {
+                if (column.fixed !== column.defaultFixed) {
                     const colKey = column.getKey();
                     if (colKey) {
                         hasFixedt = 1;
@@ -2508,13 +2508,13 @@ const Methods = {
             const leftGroupList = [];
             const centerGroupList = [];
             const rightGroupList = [];
-            XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
+            XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
                 const isColGroup = hasChildrenList(column);
                 // 如果是分组，必须按组设置固定列，不允许给子列设置固定
-                if (parent && parent.fixed) {
-                    column.fixed = parent.fixed;
+                if (parentColumn && parentColumn.fixed) {
+                    column.fixed = parentColumn.fixed;
                 }
-                if (parent && column.fixed !== parent.fixed) {
+                if (parentColumn && column.fixed !== parentColumn.fixed) {
                     errLog('vxe.error.groupFixed');
                 }
                 if (isColGroup) {
@@ -5607,8 +5607,8 @@ const Methods = {
                             nafIndex = nIndex;
                         }
                     }
-                    XEUtils.eachTree(collectColumn, (column, index, items, path, parent) => {
-                        if (!parent) {
+                    XEUtils.eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+                        if (!parentColumn) {
                             const sortIndex = index + 1;
                             column.renderSortNumber = sortIndex;
                         }

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.0-beta.13";
+export const version = "3.12.0-beta.15";
 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.0-beta.13"}`;
+const version = `table v${"3.12.0-beta.15"}`;
 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.12.0-beta.13";
+const version = "3.12.0-beta.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2808,7 +2808,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.12.0-beta.13"}`;
+const log_version = `table v${"3.12.0-beta.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6029,7 +6029,7 @@ const Methods = {
     const isLazy = treeConfig && treeOpts.lazy;
     const fullAllDataRowIdMaps = {};
     const fullDataRowIdMaps = {};
-    const handleCache = (row, index, items, path, parent, nodes) => {
+    const handleCache = (row, index, items, path, parentRow, nodes) => {
       let rowid = getRowid(this, row);
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1;
       const level = nodes ? nodes.length - 1 : 0;
@@ -6050,16 +6050,16 @@ const Methods = {
           _index: -1,
           $index: -1,
           items,
-          parent,
+          parent: parentRow,
           level,
           height: 0
         };
       }
       cacheItem.row = row;
       cacheItem.items = items;
-      cacheItem.parent = parent;
+      cacheItem.parent = parentRow;
       cacheItem.level = level;
-      cacheItem.index = treeConfig && parent ? -1 : index;
+      cacheItem.index = treeConfig && parentRow ? -1 : index;
       if (isSource) {
         fullDataRowIdMaps[rowid] = cacheItem;
       }
@@ -6142,9 +6142,9 @@ const Methods = {
           sourceDataRowIdData[rowid] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(childRow, true);
         });
       }
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, (childRow, index, items, path, parent, nodes) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, (childRow, index, items, path, parentItem, nodes) => {
         const rowid = getRowid($xeTable, childRow);
-        const parentRow = parent || parentRest.row;
+        const parentRow = parentItem || parentRest.row;
         const rest = {
           row: childRow,
           rowid,
@@ -6201,7 +6201,7 @@ const Methods = {
     let radioColumn;
     let htmlColumn;
     let hasFixed;
-    const handleFunc = (column, index, items, path, parent) => {
+    const handleFunc = (column, index, items, path, parentColumn) => {
       const {
         id: colid,
         field,
@@ -6216,7 +6216,7 @@ const Methods = {
         colid,
         index,
         items,
-        parent: parent || null,
+        parent: parentColumn || null,
         width: 0
       };
       if (field) {
@@ -6280,9 +6280,9 @@ const Methods = {
       fullColumnIdData[colid] = rest;
     };
     if (isGroup) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent, nodes) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn, nodes) => {
         column.level = nodes.length;
-        handleFunc(column, index, items, path, parent);
+        handleFunc(column, index, items, path, parentColumn);
       });
     } else {
       tableFullColumn.forEach(handleFunc);
@@ -6952,10 +6952,10 @@ const Methods = {
     if (treeConfig && treeOpts.transform) {
       const fullData = [];
       const expandMaps = {};
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path, parent) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path, parentRow) => {
         const rowid = getRowid(this, row);
-        const parentRowid = getRowid(this, parent);
-        if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+        const parentRowid = getRowid(this, parentRow);
+        if (!parentRow || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
             rowRest._index = fullData.length;
@@ -7651,11 +7651,11 @@ const Methods = {
     let hasCustomSort = false;
     // 处理还原
     if (resizableData || sortData || visibleData || fixedData) {
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentRow) => {
         const colKey = column.getKey();
         // 支持一级
-        if (!parent) {
-          if (fixedData && fixedData[colKey]) {
+        if (!parentRow) {
+          if (fixedData && fixedData[colKey] !== undefined) {
             column.fixed = fixedData[colKey];
           }
           if (sortData && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNumber(sortData[colKey])) {
@@ -7749,9 +7749,9 @@ const Methods = {
     let hasSort = 0;
     let hasFixedt = 0;
     let hasVisible = 0;
-    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
       // 只支持一级
-      if (!parent) {
+      if (!parentColumn) {
         collectColumn.forEach(column => {
           const colKey = column.getKey();
           if (colKey) {
@@ -7759,7 +7759,7 @@ const Methods = {
             sortData[colKey] = column.renderSortNumber;
           }
         });
-        if (column.fixed && column.fixed !== column.defaultFixed) {
+        if (column.fixed !== column.defaultFixed) {
           const colKey = column.getKey();
           if (colKey) {
             hasFixedt = 1;
@@ -7895,13 +7895,13 @@ const Methods = {
       const leftGroupList = [];
       const centerGroupList = [];
       const rightGroupList = [];
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
         const isColGroup = hasChildrenList(column);
         // 如果是分组，必须按组设置固定列，不允许给子列设置固定
-        if (parent && parent.fixed) {
-          column.fixed = parent.fixed;
+        if (parentColumn && parentColumn.fixed) {
+          column.fixed = parentColumn.fixed;
         }
-        if (parent && column.fixed !== parent.fixed) {
+        if (parentColumn && column.fixed !== parentColumn.fixed) {
           errLog('vxe.error.groupFixed');
         }
         if (isColGroup) {
@@ -11529,8 +11529,8 @@ const Methods = {
               nafIndex = nIndex;
             }
           }
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parent) => {
-            if (!parent) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, (column, index, items, path, parentColumn) => {
+            if (!parentColumn) {
               const sortIndex = index + 1;
               column.renderSortNumber = sortIndex;
             }
@@ -21582,10 +21582,7 @@ const convertToRows = originColumns => {
       const customCols = columns && columns.length ? columns : null;
       const handleOptions = Object.assign({}, opts, {
         filename: '',
-        sheetName: '',
-        colgroups: [],
-        columns: [],
-        data: []
+        sheetName: ''
       });
       // 如果设置源数据，则默认导出设置了字段的列
       if (!customCols && !columnFilterMethod) {