vxe-table 4.12.0-beta.28 → 4.12.0-beta.29

package/es/table/src/footer.js

@@ -53,7 +53,7 @@ export default defineComponent({
             const { fixedType } = props;
             const { resizable: allResizable, border, footerCellClassName, footerCellStyle, footerAlign: allFooterAlign, footerSpanMethod, align: allAlign, columnKey, showFooterOverflow: allColumnFooterOverflow } = tableProps;
             const { scrollXLoad, scrollYLoad, overflowX, currentColumn, mergeFooterList } = tableReactData;
-            const { scrollXStore } = tableInternalData;
+            const { fullColumnIdData, scrollXStore } = tableInternalData;
             const tooltipOpts = computeTooltipOpts.value;
             const resizableOpts = computeResizableOpts.value;
             const { isAllColumnDrag } = resizableOpts;
@@ -65,6 +65,7 @@ export default defineComponent({
             return tableColumn.map((column, $columnIndex) => {
                 const { type, showFooterOverflow, footerAlign, align, footerClassName, editRender, cellRender } = column;
                 const colid = column.id;
+                const colRest = fullColumnIdData[colid] || {};
                 const renderOpts = editRender || cellRender;
                 const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
                 const showAllTip = tooltipOpts.showAll;
@@ -80,8 +81,8 @@ export default defineComponent({
                 const showResizable = (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable));
                 const attrs = { colid };
                 const tfOns = {};
-                const columnIndex = $xeTable.getColumnIndex(column);
-                const _columnIndex = $xeTable.getVTColumnIndex(column);
+                const columnIndex = colRest.index;
+                const _columnIndex = colRest._index;
                 const itemIndex = _columnIndex;
                 const cellParams = {
                     $table: $xeTable,

package/es/table/src/header.js

@@ -37,7 +37,7 @@ export default defineComponent({
             const { fixedType } = props;
             const { resizable: allResizable, columnKey, headerCellClassName, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, mouseConfig } = tableProps;
             const { currentColumn, dragCol, scrollXLoad, scrollYLoad, overflowX } = tableReactData;
-            const { scrollXStore } = tableInternalData;
+            const { fullColumnIdData, scrollXStore } = tableInternalData;
             const columnOpts = computeColumnOpts.value;
             const columnDragOpts = computeColumnDragOpts.value;
             const cellOpts = computeCellOpts.value;
@@ -48,6 +48,7 @@ export default defineComponent({
             return cols.map((column, $columnIndex) => {
                 const { type, showHeaderOverflow, headerAlign, align, filters, headerClassName, editRender, cellRender } = column;
                 const colid = column.id;
+                const colRest = fullColumnIdData[colid] || {};
                 const renderOpts = editRender || cellRender;
                 const compConf = renderOpts ? renderer.get(renderOpts.name) : null;
                 const isColGroup = column.children && column.children.length;
@@ -65,8 +66,8 @@ export default defineComponent({
                     firstFilterOption = filters[0];
                     hasFilter = filters.some((item) => item.checked);
                 }
-                const columnIndex = $xeTable.getColumnIndex(column);
-                const _columnIndex = $xeTable.getVTColumnIndex(column);
+                const columnIndex = colRest.index;
+                const _columnIndex = colRest._index;
                 const cellParams = { $table: $xeTable, $grid: $xeGrid, $rowIndex, column, columnIndex, $columnIndex, _columnIndex, firstFilterOption, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, hasFilter };
                 const thAttrs = {
                     colid,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.0-beta.28";
+export const version = "4.12.0-beta.29";
 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.12.0-beta.28"}`;
+const version = `table v${"4.12.0-beta.29"}`;
 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.12.0-beta.28";
+const version = "4.12.0-beta.29";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3587,7 +3587,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.0-beta.28"}`;
+const log_version = `table v${"4.12.0-beta.29"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6348,6 +6348,7 @@ const renderType = 'body';
       const $xeGrid = $xeTable.xeGrid;
       const {
         fullAllDataRowIdData,
+        fullColumnIdData,
         visibleColumn
       } = tableInternalData;
       const {
@@ -6431,15 +6432,16 @@ const renderType = 'body';
       const {
         actived
       } = editStore;
-      const rowRest = fullAllDataRowIdData[rowid];
+      const rowRest = fullAllDataRowIdData[rowid] || {};
       const colid = column.id;
+      const colRest = fullColumnIdData[colid] || {};
       const renderOpts = editRender || cellRender;
       const compConf = renderOpts ? body_renderer.get(renderOpts.name) : null;
       const compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : null;
       const compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
       const showAllTip = tooltipOpts.showAll;
-      const columnIndex = $xeTable.getColumnIndex(column);
-      const _columnIndex = $xeTable.getVTColumnIndex(column);
+      const columnIndex = colRest.index;
+      const _columnIndex = colRest._index;
       const isEdit = isEnableConf(editRender);
       const resizeHeight = resizeHeightFlag ? rowRest.resizeHeight : 0;
       let fixedHiddenColumn = fixedType ? column.fixed !== fixedType : column.fixed && overflowX;
@@ -6788,7 +6790,7 @@ const renderType = 'body';
           };
         }
         const rowid = handleGetRowId(row);
-        const rowRest = fullAllDataRowIdData[rowid];
+        const rowRest = fullAllDataRowIdData[rowid] || {};
         let rowLevel = 0;
         let seq = -1;
         let _rowIndex = 0;
@@ -7257,6 +7259,7 @@ const header_renderType = 'header';
         overflowX
       } = tableReactData;
       const {
+        fullColumnIdData,
         scrollXStore
       } = tableInternalData;
       const columnOpts = computeColumnOpts.value;
@@ -7282,6 +7285,7 @@ const header_renderType = 'header';
           cellRender
         } = column;
         const colid = column.id;
+        const colRest = fullColumnIdData[colid] || {};
         const renderOpts = editRender || cellRender;
         const compConf = renderOpts ? header_renderer.get(renderOpts.name) : null;
         const isColGroup = column.children && column.children.length;
@@ -7299,8 +7303,8 @@ const header_renderType = 'header';
           firstFilterOption = filters[0];
           hasFilter = filters.some(item => item.checked);
         }
-        const columnIndex = $xeTable.getColumnIndex(column);
-        const _columnIndex = $xeTable.getVTColumnIndex(column);
+        const columnIndex = colRest.index;
+        const _columnIndex = colRest._index;
         const cellParams = {
           $table: $xeTable,
           $grid: $xeGrid,
@@ -7725,6 +7729,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
         mergeFooterList
       } = tableReactData;
       const {
+        fullColumnIdData,
         scrollXStore
       } = tableInternalData;
       const tooltipOpts = computeTooltipOpts.value;
@@ -7748,6 +7753,7 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           cellRender
         } = column;
         const colid = column.id;
+        const colRest = fullColumnIdData[colid] || {};
         const renderOpts = editRender || cellRender;
         const compConf = renderOpts ? footer_renderer.get(renderOpts.name) : null;
         const showAllTip = tooltipOpts.showAll;
@@ -7765,8 +7771,8 @@ function mergeFooterMethod(mergeFooterList, _rowIndex, _columnIndex) {
           colid
         };
         const tfOns = {};
-        const columnIndex = $xeTable.getColumnIndex(column);
-        const _columnIndex = $xeTable.getVTColumnIndex(column);
+        const columnIndex = colRest.index;
+        const _columnIndex = colRest._index;
         const itemIndex = _columnIndex;
         const cellParams = {
           $table: $xeTable,