amis 1.8.0-beta.5 → 1.8.0-beta.9

package/lib/renderers/Table/index.js

@@ -1076,7 +1076,7 @@ var Table = /** @class */ (function (_super) {
         if (!store.columnsTogglable) {
             return null;
         }
-        return (react_1.default.createElement(ColumnToggler_1.default, (0, tslib_1.__assign)({}, rest, ((0, helper_1.isObject)(config) ? config : {}), { tooltip: (config === null || config === void 0 ? void 0 : config.tooltip) || __('Table.columnsVisibility'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, align: (_a = config === null || config === void 0 ? void 0 : config.align) !== null && _a !== void 0 ? _a : 'left', isActived: store.hasColumnHidden(), classnames: cx, classPrefix: ns, key: "columns-toggable", size: (config === null || config === void 0 ? void 0 : config.size) || 'sm', label: (config === null || config === void 0 ? void 0 : config.label) || react_1.default.createElement(icons_1.Icon, { icon: "columns", className: "icon m-r-none" }), draggable: config === null || config === void 0 ? void 0 : config.draggable, columns: store.columnsData, onColumnToggle: this.handleColumnToggle }), store.toggableColumns.map(function (column) { return (react_1.default.createElement("li", { className: cx('ColumnToggler-menuItem'), key: column.index, onClick: column.toggleToggle },
+        return (react_1.default.createElement(ColumnToggler_1.default, (0, tslib_1.__assign)({}, rest, ((0, helper_1.isObject)(config) ? config : {}), { tooltip: (config === null || config === void 0 ? void 0 : config.tooltip) || __('Table.columnsVisibility'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, align: (_a = config === null || config === void 0 ? void 0 : config.align) !== null && _a !== void 0 ? _a : 'left', isActived: store.hasColumnHidden(), classnames: cx, classPrefix: ns, key: "columns-toggable", size: (config === null || config === void 0 ? void 0 : config.size) || 'sm', icon: config === null || config === void 0 ? void 0 : config.icon, label: config === null || config === void 0 ? void 0 : config.label, draggable: config === null || config === void 0 ? void 0 : config.draggable, columns: store.columnsData, onColumnToggle: this.handleColumnToggle }), store.toggableColumns.map(function (column) { return (react_1.default.createElement("li", { className: cx('ColumnToggler-menuItem'), key: column.index, onClick: column.toggleToggle },
             react_1.default.createElement(Checkbox_1.default, { size: "sm", classPrefix: ns, checked: column.toggled }, column.label ? render('tpl', column.label) : null))); })));
     };
     Table.prototype.renderDragToggler = function () {
@@ -1093,13 +1093,15 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.renderExportExcel = function (toolbar) {
         var _this = this;
-        var _a = this.props, store = _a.store, env = _a.env, ns = _a.classPrefix, cx = _a.classnames, __ = _a.translate, columns = _a.columns, data = _a.data;
+        var _a = this.props, store = _a.store, env = _a.env, ns = _a.classPrefix, cx = _a.classnames, __ = _a.translate, data = _a.data, render = _a.render;
+        var columns = store.filteredColumns || [];
         if (!columns) {
             return null;
         }
-        return (react_1.default.createElement(Button_1.default, { classPrefix: ns, onClick: function () {
+        return render('exportExcel', (0, tslib_1.__assign)((0, tslib_1.__assign)({ label: __('CRUD.exportExcel') }, toolbar), { type: 'button' }), {
+            onAction: function () {
                 Promise.resolve().then(function () { return new Promise(function(resolve){require(['exceljs'], function(ret) {resolve(tslib_1.__importStar(ret));})}); }).then(function (ExcelJS) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                    var rows, tmpStore, filename, res, workbook, worksheet, exportColumns, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, _i, rows_1, row, sheetRow, columIndex, _a, filteredColumns_1, column, name, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, linkURL, map, source, sourceValue, mapKey, res, viewValue, buffer, blob;
+                    var rows, tmpStore, filename, res, workbook, worksheet, exportColumnNames, filteredColumns, firstRowLabels, firstRow, remoteMappingCache, rowIndex, _i, rows_1, row, sheetRow, columIndex, _a, filteredColumns_1, column, name, value, type, imageData, imageDimensions, imageWidth, imageHeight, imageMaxSize, imageMatch, imageExt, imageId, linkURL, e_1, linkURL, map, source, sourceValue, mapKey, res, viewValue, buffer, blob;
                     var _b, _c;
                     return (0, tslib_1.__generator)(this, function (_d) {
                         switch (_d.label) {
@@ -1141,14 +1143,19 @@ var Table = /** @class */ (function (_super) {
                                     properties: { defaultColWidth: 15 }
                                 });
                                 worksheet.views = [{ state: 'frozen', xSplit: 0, ySplit: 1 }];
-                                exportColumns = toolbar.columns;
-                                if ((0, tpl_builtin_1.isPureVariable)(exportColumns)) {
-                                    exportColumns = (0, tpl_builtin_1.resolveVariableAndFilter)(exportColumns, data, '| raw');
+                                exportColumnNames = toolbar.columns;
+                                if ((0, tpl_builtin_1.isPureVariable)(exportColumnNames)) {
+                                    exportColumnNames = (0, tpl_builtin_1.resolveVariableAndFilter)(exportColumnNames, data, '| raw');
                                 }
-                                filteredColumns = exportColumns
+                                // 自定义导出列配置
+                                if (toolbar.exportColumns && Array.isArray(toolbar.exportColumns)) {
+                                    columns = toolbar.exportColumns;
+                                }
+                                filteredColumns = exportColumnNames
                                     ? columns.filter(function (column) {
-                                        var filterColumnsNames = exportColumns;
-                                        if (filterColumnsNames.indexOf(column.name) !== -1) {
+                                        var filterColumnsNames = exportColumnNames;
+                                        if (column.name &&
+                                            filterColumnsNames.indexOf(column.name) !== -1) {
                                             return true;
                                         }
                                         return false;
@@ -1333,7 +1340,8 @@ var Table = /** @class */ (function (_super) {
                         }
                     });
                 }); });
-            }, size: "sm" }, toolbar.label || __('CRUD.exportExcel')));
+            }
+        });
     };
     Table.prototype.renderActions = function (region) {
         var _this = this;