amis 1.8.0-beta.2 → 1.8.0-beta.3

package/lib/renderers/Table/index.js

@@ -174,9 +174,9 @@ var Table = /** @class */ (function (_super) {
             return;
         }
         var table = (0, react_dom_1.findDOMNode)(this);
-        var tableContent = table.querySelector("." + ns + "Table-content");
-        var tableContentWrap = table.querySelector("." + ns + "Table-contentWrap");
-        var footToolbar = table.querySelector("." + ns + "Table-footToolbar");
+        var tableContent = table.querySelector(".".concat(ns, "Table-content"));
+        var tableContentWrap = table.querySelector(".".concat(ns, "Table-contentWrap"));
+        var footToolbar = table.querySelector(".".concat(ns, "Table-footToolbar"));
         if (!tableContent) {
             return;
         }
@@ -203,11 +203,11 @@ var Table = /** @class */ (function (_super) {
                 allParentPaddingButtom + paddingButtom + borderBottom;
             parentNode = parentNode.parentElement;
         }
-        tableContent.style.height = viewportHeight -
+        tableContent.style.height = "".concat(viewportHeight -
             tableContentTop -
             tableContentWrapMarginButtom -
             footToolbarHeight -
-            allParentPaddingButtom + "px";
+            allParentPaddingButtom, "px");
     };
     Table.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
@@ -284,7 +284,7 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.subFormRef = function (form, x, y) {
         var quickEditFormRef = this.props.quickEditFormRef;
         quickEditFormRef && quickEditFormRef(form, x, y);
-        this.subForms[x + "-" + y] = form;
+        this.subForms["".concat(x, "-").concat(y)] = form;
         form && this.props.store.addForm(form.props.store, y);
     };
     Table.prototype.handleAction = function (e, action, ctx) {
@@ -418,12 +418,12 @@ var Table = /** @class */ (function (_super) {
         var dom = (0, react_dom_1.findDOMNode)(this);
         var clip = this.table.getBoundingClientRect();
         var offsetY = (_b = (_a = this.props.affixOffsetTop) !== null && _a !== void 0 ? _a : this.props.env.affixOffsetTop) !== null && _b !== void 0 ? _b : 0;
-        var headingHeight = ((_c = dom.querySelector("." + ns + "Table-heading")) === null || _c === void 0 ? void 0 : _c.getBoundingClientRect().height) || 0;
-        var headerHeight = ((_d = dom.querySelector("." + ns + "Table-headToolbar")) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect().height) || 0;
+        var headingHeight = ((_c = dom.querySelector(".".concat(ns, "Table-heading"))) === null || _c === void 0 ? void 0 : _c.getBoundingClientRect().height) || 0;
+        var headerHeight = ((_d = dom.querySelector(".".concat(ns, "Table-headToolbar"))) === null || _d === void 0 ? void 0 : _d.getBoundingClientRect().height) || 0;
         var affixed = clip.top - headerHeight - headingHeight < offsetY &&
             clip.top + clip.height - 40 > offsetY;
-        var affixedDom = dom.querySelector("." + ns + "Table-fixedTop");
-        affixedDom.style.cssText += "top: " + offsetY + "px;width: " + this.table.parentNode.offsetWidth + "px";
+        var affixedDom = dom.querySelector(".".concat(ns, "Table-fixedTop"));
+        affixedDom.style.cssText += "top: ".concat(offsetY, "px;width: ").concat(this.table.parentNode.offsetWidth, "px");
         affixed
             ? affixedDom.classList.add('in')
             : affixedDom.classList.remove('in');
@@ -469,30 +469,30 @@ var Table = /** @class */ (function (_super) {
         var dom = (0, react_dom_1.findDOMNode)(this);
         (0, forEach_1.default)(
         // 折叠 footTable 不需要改变
-        dom.querySelectorAll("." + ns + "Table-fixedTop table, ." + ns + "Table-fixedLeft>table, ." + ns + "Table-fixedRight>table"), function (table) {
+        dom.querySelectorAll(".".concat(ns, "Table-fixedTop table, .").concat(ns, "Table-fixedLeft>table, .").concat(ns, "Table-fixedRight>table")), function (table) {
             var totalWidth = 0;
             var totalWidth2 = 0;
             (0, forEach_1.default)(table.querySelectorAll('thead>tr:last-child>th'), function (item) {
                 var width = widths[item.getAttribute('data-index')];
-                item.style.cssText += "width: " + width + "px; height: " + heights.header + "px";
+                item.style.cssText += "width: ".concat(width, "px; height: ").concat(heights.header, "px");
                 totalWidth += width;
             });
             (0, forEach_1.default)(table.querySelectorAll('thead>tr:first-child>th'), function (item) {
                 var width = widths2[item.getAttribute('data-index')];
-                item.style.cssText += "width: " + width + "px; height: " + heights.header2 + "px";
+                item.style.cssText += "width: ".concat(width, "px; height: ").concat(heights.header2, "px");
                 totalWidth2 += width;
             });
             (0, forEach_1.default)(table.querySelectorAll('colgroup>col'), function (item) {
                 var width = widths[item.getAttribute('data-index')];
-                item.setAttribute('width', "" + width);
+                item.setAttribute('width', "".concat(width));
             });
             (0, forEach_1.default)(table.querySelectorAll('tbody>tr'), function (item, index) {
-                item.style.cssText += "height: " + heights[index] + "px";
+                item.style.cssText += "height: ".concat(heights[index], "px");
             });
-            table.style.cssText += "width: " + Math.max(totalWidth, totalWidth2) + "px;table-layout: auto;";
+            table.style.cssText += "width: ".concat(Math.max(totalWidth, totalWidth2), "px;table-layout: auto;");
         });
         if (affixHeader) {
-            dom.querySelector("." + ns + "Table-fixedTop>." + ns + "Table-wrapper").style.cssText += "width: " + this.outterWidth + "px";
+            dom.querySelector(".".concat(ns, "Table-fixedTop>.").concat(ns, "Table-wrapper")).style.cssText += "width: ".concat(this.outterWidth, "px");
         }
         this.lastScrollLeft = -1;
         this.handleOutterScroll();
@@ -511,14 +511,14 @@ var Table = /** @class */ (function (_super) {
         // store.setTrailing(trailing);
         var ns = this.props.classPrefix;
         var dom = (0, react_dom_1.findDOMNode)(this);
-        var fixedLeft = dom.querySelectorAll("." + ns + "Table-fixedLeft");
+        var fixedLeft = dom.querySelectorAll(".".concat(ns, "Table-fixedLeft"));
         if (fixedLeft && fixedLeft.length) {
             for (var i = 0, len = fixedLeft.length; i < len; i++) {
                 var node = fixedLeft[i];
                 leading ? node.classList.remove('in') : node.classList.add('in');
             }
         }
-        var fixedRight = dom.querySelectorAll("." + ns + "Table-fixedRight");
+        var fixedRight = dom.querySelectorAll(".".concat(ns, "Table-fixedRight"));
         if (fixedRight && fixedRight.length) {
             for (var i = 0, len = fixedRight.length; i < len; i++) {
                 var node = fixedRight[i];
@@ -527,7 +527,7 @@ var Table = /** @class */ (function (_super) {
         }
         var table = this.affixedTable;
         if (table) {
-            table.style.cssText += "transform: translateX(-" + scrollLeft + "px)";
+            table.style.cssText += "transform: translateX(-".concat(scrollLeft, "px)");
         }
     };
     Table.prototype.tableRef = function (ref) {
@@ -558,8 +558,8 @@ var Table = /** @class */ (function (_super) {
         this.sortable = new sortablejs_1.default(this.table.querySelector('tbody'), {
             group: 'table',
             animation: 150,
-            handle: "." + ns + "Table-dragCell",
-            filter: "." + ns + "Table-dragCell.is-dragDisabled",
+            handle: ".".concat(ns, "Table-dragCell"),
+            filter: ".".concat(ns, "Table-dragCell.is-dragDisabled"),
             ghostClass: 'is-dragging',
             onEnd: function (e) {
                 // 没有移动
@@ -629,7 +629,7 @@ var Table = /** @class */ (function (_super) {
         tbody.addEventListener('dragover', this.handleDragOver);
         tbody.addEventListener('drop', this.handleDrop);
         this.draggingSibling = siblings.map(function (item) {
-            var tr = tbody.querySelector("tr[data-id=\"" + item.id + "\"]");
+            var tr = tbody.querySelector("tr[data-id=\"".concat(item.id, "\"]"));
             tr.classList.add('is-drop-allowed');
             return tr;
         });
@@ -795,12 +795,12 @@ var Table = /** @class */ (function (_super) {
                         return {
                             type: 'checkbox',
                             className: cx('Table-searchableForm-checkbox'),
-                            name: "__search_" + ((_b = (_a = column.searchable) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : column.name),
+                            name: "__search_".concat((_b = (_a = column.searchable) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : column.name),
                             option: (_d = (_c = column.searchable) === null || _c === void 0 ? void 0 : _c.label) !== null && _d !== void 0 ? _d : column.label,
                             value: column.enableSearch,
                             badge: {
                                 offset: [-10, 5],
-                                visibleOn: "" + (column.toggable && !column.toggled && column.enableSearch)
+                                visibleOn: "".concat(column.toggable && !column.toggled && column.enableSearch)
                             },
                             onChange: function (value) {
                                 column.setEnableSearch(value);
@@ -926,14 +926,14 @@ var Table = /** @class */ (function (_super) {
             props.style = props.style || {};
             props.style.textAlign = column.pristine.align;
         }
-        var resizeLine = (react_1.default.createElement("div", { className: cx('Table-content-colDragLine'), key: "resize-" + column.index, onMouseDown: this.handleColResizeMouseDown }));
+        var resizeLine = (react_1.default.createElement("div", { className: cx('Table-content-colDragLine'), key: "resize-".concat(column.index), onMouseDown: this.handleColResizeMouseDown }));
         return (react_1.default.createElement("th", (0, tslib_1.__assign)({}, props, { className: cx(props ? props.className : '', {
                 'TableCell--sortable': column.sortable,
                 'TableCell--searchable': column.searchable,
                 'TableCell--filterable': column.filterable,
                 'Table-operationCell': column.type === 'operation'
             }) }),
-            react_1.default.createElement("div", { className: cx(ns + "TableCell--title", column.pristine.className, column.pristine.labelClassName) },
+            react_1.default.createElement("div", { className: cx("".concat(ns, "TableCell--title"), column.pristine.className, column.pristine.labelClassName) },
                 column.label ? render('tpl', column.label) : null,
                 column.remark
                     ? render('remark', {
@@ -1098,7 +1098,7 @@ var Table = /** @class */ (function (_super) {
         }
         return (react_1.default.createElement(Button_1.default, { classPrefix: ns, onClick: 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, 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, 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 _b, _c;
                     return (0, tslib_1.__generator)(this, function (_d) {
                         switch (_d.label) {
@@ -1140,9 +1140,13 @@ var Table = /** @class */ (function (_super) {
                                     properties: { defaultColWidth: 15 }
                                 });
                                 worksheet.views = [{ state: 'frozen', xSplit: 0, ySplit: 1 }];
-                                filteredColumns = toolbar.columns
+                                exportColumns = toolbar.columns;
+                                if ((0, tpl_builtin_1.isPureVariable)(exportColumns)) {
+                                    exportColumns = (0, tpl_builtin_1.resolveVariableAndFilter)(exportColumns, data, '| raw');
+                                }
+                                filteredColumns = exportColumns
                                     ? columns.filter(function (column) {
-                                        var filterColumnsNames = toolbar.columns;
+                                        var filterColumnsNames = exportColumns;
                                         if (filterColumnsNames.indexOf(column.name) !== -1) {
                                             return true;
                                         }
@@ -1353,7 +1357,7 @@ var Table = /** @class */ (function (_super) {
             });
         }
         return Array.isArray(actions) && actions.length ? (react_1.default.createElement("div", { className: cx('Table-actions') }, actions.map(function (action, key) {
-            return render("action/" + key, (0, tslib_1.__assign)({ type: 'button' }, action), {
+            return render("action/".concat(key), (0, tslib_1.__assign)({ type: 'button' }, action), {
                 onAction: _this.handleAction,
                 key: key,
                 btnDisabled: store.dragging,