vxe-table 4.7.17-beta.3 → 4.7.18-beta.0

package/es/table/module/export/hook.js

@@ -435,7 +435,7 @@ hooks.add('tableExportModule', {
             }
             return getLabelData(opts, columns, datas);
         };
-        const getFooterCellValue = (opts, items, column) => {
+        const getFooterCellValue = (opts, row, column) => {
             const columnOpts = computeColumnOpts.value;
             const renderOpts = column.editRender || column.cellRender;
             let footLabelMethod = column.footerExportMethod;
@@ -449,8 +449,14 @@ hooks.add('tableExportModule', {
                 footLabelMethod = columnOpts.footerExportMethod;
             }
             const _columnIndex = $xeTable.getVTColumnIndex(column);
-            const cellValue = footLabelMethod ? footLabelMethod({ $table: $xeTable, items, itemIndex: _columnIndex, row: items, _columnIndex, column, options: opts }) : XEUtils.toValueString(items[_columnIndex]);
-            return cellValue;
+            if (footLabelMethod) {
+                return footLabelMethod({ $table: $xeTable, items: row, itemIndex: _columnIndex, row, _columnIndex, column, options: opts });
+            }
+            // 兼容老模式
+            if (XEUtils.isArray(row)) {
+                return XEUtils.toValueString(row[_columnIndex]);
+            }
+            return XEUtils.get(row, column.field);
         };
         const toCsv = (opts, columns, datas) => {
             let content = csvBOM;
@@ -463,8 +469,8 @@ hooks.add('tableExportModule', {
             if (opts.isFooter) {
                 const { footerTableData } = reactData;
                 const footers = getFooterData(opts, footerTableData);
-                footers.forEach((rows) => {
-                    content += columns.map((column) => toTxtCellLabel(getFooterCellValue(opts, rows, column))).join(',') + enterSymbol;
+                footers.forEach((row) => {
+                    content += columns.map((column) => toTxtCellLabel(getFooterCellValue(opts, row, column))).join(',') + enterSymbol;
                 });
             }
             return content;
@@ -480,8 +486,8 @@ hooks.add('tableExportModule', {
             if (opts.isFooter) {
                 const { footerTableData } = reactData;
                 const footers = getFooterData(opts, footerTableData);
-                footers.forEach((rows) => {
-                    content += columns.map((column) => toTxtCellLabel(getFooterCellValue(opts, rows, column))).join(',') + enterSymbol;
+                footers.forEach((row) => {
+                    content += columns.map((column) => toTxtCellLabel(getFooterCellValue(opts, row, column))).join(',') + enterSymbol;
                 });
             }
             return content;
@@ -639,11 +645,11 @@ hooks.add('tableExportModule', {
                 const footers = getFooterData(opts, footerTableData);
                 if (footers.length) {
                     tables.push('<tfoot>');
-                    footers.forEach((rows) => {
+                    footers.forEach((row) => {
                         tables.push(`<tr>${columns.map((column) => {
                             const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
                             const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
-                            const cellValue = getFooterCellValue(opts, rows, column);
+                            const cellValue = getFooterCellValue(opts, row, column);
                             if (footAlign) {
                                 classNames.push(`col--${footAlign}`);
                             }
@@ -687,8 +693,8 @@ hooks.add('tableExportModule', {
             if (opts.isFooter) {
                 const { footerTableData } = reactData;
                 const footers = getFooterData(opts, footerTableData);
-                footers.forEach((rows) => {
-                    xml += `<Row>${columns.map((column) => `<Cell><Data ss:Type="String">${getFooterCellValue(opts, rows, column)}</Data></Cell>`).join('')}</Row>`;
+                footers.forEach((row) => {
+                    xml += `<Row>${columns.map((column) => `<Cell><Data ss:Type="String">${getFooterCellValue(opts, row, column)}</Data></Cell>`).join('')}</Row>`;
                 });
             }
             return `${xml}</Table></Worksheet></Workbook>`;

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-VxeUI.version = "4.7.17-beta.3";
-VxeUI.tableVersion = "4.7.17-beta.3";
+VxeUI.version = "4.7.18-beta.0";
+VxeUI.tableVersion = "4.7.18-beta.0";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"4.7.17-beta.3"}`;
+const version = `table v${"4.7.18-beta.0"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -1949,8 +1949,8 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-core_.VxeUI.version = "4.7.17-beta.3";
-core_.VxeUI.tableVersion = "4.7.17-beta.3";
+core_.VxeUI.version = "4.7.18-beta.0";
+core_.VxeUI.tableVersion = "4.7.18-beta.0";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2253,7 +2253,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const version = `table v${"4.7.17-beta.3"}`;
+const version = `table v${"4.7.18-beta.0"}`;
 const warnLog = log_log.create('warn', version);
 const errLog = log_log.create('error', version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -18408,7 +18408,7 @@ export_hook_hooks.add('tableExportModule', {
       }
       return getLabelData(opts, columns, datas);
     };
-    const getFooterCellValue = (opts, items, column) => {
+    const getFooterCellValue = (opts, row, column) => {
       const columnOpts = computeColumnOpts.value;
       const renderOpts = column.editRender || column.cellRender;
       let footLabelMethod = column.footerExportMethod;
@@ -18422,16 +18422,22 @@ export_hook_hooks.add('tableExportModule', {
         footLabelMethod = columnOpts.footerExportMethod;
       }
       const _columnIndex = $xeTable.getVTColumnIndex(column);
-      const cellValue = footLabelMethod ? footLabelMethod({
-        $table: $xeTable,
-        items,
-        itemIndex: _columnIndex,
-        row: items,
-        _columnIndex,
-        column,
-        options: opts
-      }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(items[_columnIndex]);
-      return cellValue;
+      if (footLabelMethod) {
+        return footLabelMethod({
+          $table: $xeTable,
+          items: row,
+          itemIndex: _columnIndex,
+          row,
+          _columnIndex,
+          column,
+          options: opts
+        });
+      }
+      // 兼容老模式
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row)) {
+        return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(row[_columnIndex]);
+      }
+      return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
     };
     const toCsv = (opts, columns, datas) => {
       let content = csvBOM;
@@ -18446,8 +18452,8 @@ export_hook_hooks.add('tableExportModule', {
           footerTableData
         } = reactData;
         const footers = getFooterData(opts, footerTableData);
-        footers.forEach(rows => {
-          content += columns.map(column => toTxtCellLabel(getFooterCellValue(opts, rows, column))).join(',') + enterSymbol;
+        footers.forEach(row => {
+          content += columns.map(column => toTxtCellLabel(getFooterCellValue(opts, row, column))).join(',') + enterSymbol;
         });
       }
       return content;
@@ -18465,8 +18471,8 @@ export_hook_hooks.add('tableExportModule', {
           footerTableData
         } = reactData;
         const footers = getFooterData(opts, footerTableData);
-        footers.forEach(rows => {
-          content += columns.map(column => toTxtCellLabel(getFooterCellValue(opts, rows, column))).join(',') + enterSymbol;
+        footers.forEach(row => {
+          content += columns.map(column => toTxtCellLabel(getFooterCellValue(opts, row, column))).join(',') + enterSymbol;
         });
       }
       return content;
@@ -18642,11 +18648,11 @@ export_hook_hooks.add('tableExportModule', {
         const footers = getFooterData(opts, footerTableData);
         if (footers.length) {
           tables.push('<tfoot>');
-          footers.forEach(rows => {
+          footers.forEach(row => {
             tables.push(`<tr>${columns.map(column => {
               const footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
               const classNames = hasEllipsis(column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
-              const cellValue = getFooterCellValue(opts, rows, column);
+              const cellValue = getFooterCellValue(opts, row, column);
               if (footAlign) {
                 classNames.push(`col--${footAlign}`);
               }
@@ -18674,8 +18680,8 @@ export_hook_hooks.add('tableExportModule', {
           footerTableData
         } = reactData;
         const footers = getFooterData(opts, footerTableData);
-        footers.forEach(rows => {
-          xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue(opts, rows, column)}</Data></Cell>`).join('')}</Row>`;
+        footers.forEach(row => {
+          xml += `<Row>${columns.map(column => `<Cell><Data ss:Type="String">${getFooterCellValue(opts, row, column)}</Data></Cell>`).join('')}</Row>`;
         });
       }
       return `${xml}</Table></Worksheet></Workbook>`;