amis 1.7.0 → 1.8.0-beta.13

package/lib/renderers/Table/TableCell.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/Table/TableCell.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport {RendererProps, Renderer} from '../../factory';\nimport QuickEdit from '../QuickEdit';\nimport Copyable from '../Copyable';\nimport PopOverable from '../PopOver';\nimport {observer} from 'mobx-react';\nimport omit = require('lodash/omit');\nimport {filter} from '../../utils/tpl';\nimport {Badge} from '../../components/Badge';\n\nexport interface TableCellProps extends RendererProps {\n  wrapperComponent?: React.ReactType;\n  column: object;\n}\n\nexport class TableCell extends React.Component<RendererProps> {\n  static defaultProps = {\n    wrapperComponent: 'td'\n  };\n\n  static propsList: Array<string> = [\n    'type',\n    'label',\n    'column',\n    'body',\n    'tpl',\n    'rowSpan',\n    'remark'\n  ];\n\n  render() {\n    let {\n      classnames: cx,\n      className,\n      classNameExpr,\n      render,\n      style,\n      wrapperComponent: Component,\n      column,\n      value,\n      data,\n      children,\n      width,\n      align,\n      innerClassName,\n      label,\n      tabIndex,\n      onKeyUp,\n      rowSpan,\n      body: _body,\n      tpl,\n      remark,\n      prefix,\n      affix,\n      isHead,\n      colIndex,\n      row,\n      showBadge,\n      itemBadge,\n      ...rest\n    } = this.props;\n    const schema = {\n      ...column,\n      className: innerClassName,\n      type: (column && column.type) || 'plain'\n    };\n\n    // 如果本来就是 type 为 button，不要删除，其他情况下都应该删除。\n    if (schema.type !== 'button' && schema.type !== 'dropdown-button') {\n      delete schema.label;\n    }\n\n    let body = children\n      ? children\n      : render('field', schema, {\n          ...omit(rest, Object.keys(schema)),\n          inputOnly: true,\n          value,\n          data\n        });\n\n    if (width) {\n      style = {\n        ...style,\n        width: (style && style.width) || width\n      };\n\n      if (!/%$/.test(String(style.width))) {\n        body = (\n          <div style={{width: style.width}}>\n            {prefix}\n            {body}\n            {affix}\n          </div>\n        );\n        prefix = null;\n        affix = null;\n        // delete style.width;\n      }\n    }\n\n    if (align) {\n      style = {\n        ...style,\n        textAlign: align\n      };\n    }\n\n    if (!Component) {\n      return body as JSX.Element;\n    }\n\n    if (isHead) {\n      Component = 'th';\n    }\n\n    return (\n      <Component\n        rowSpan={rowSpan > 1 ? rowSpan : undefined}\n        style={style}\n        className={cx(\n          className,\n          column.classNameExpr ? filter(column.classNameExpr, data) : null\n        )}\n        tabIndex={tabIndex}\n        onKeyUp={onKeyUp}\n      >\n        {showBadge ? (\n          <Badge\n            classnames={cx}\n            badge={{\n              ...itemBadge,\n              className: cx(`Table-badge`, itemBadge?.className)\n            }}\n            data={row.data}\n          />\n        ) : null}\n        {prefix}\n        {body}\n        {affix}\n      </Component>\n    );\n  }\n}\n\n@Renderer({\n  test: /(^|\\/)table\\/(?:.*\\/)?cell$/,\n  name: 'table-cell'\n})\n@QuickEdit()\n@PopOverable({\n  targetOutter: true\n})\n@Copyable()\n@observer\nexport class TableCellRenderer extends TableCell {\n  static propsList = [\n    'quickEdit',\n    'quickEditEnabledOn',\n    'popOver',\n    'copyable',\n    'inline',\n    ...TableCell.propsList\n  ];\n}\n\n@Renderer({\n  type: 'field',\n  name: 'field'\n})\n@PopOverable()\n@Copyable()\nexport class FieldRenderer extends TableCell {\n  static defaultProps = {\n    ...TableCell.defaultProps,\n    wrapperComponent: 'div'\n  };\n}\n"
+        "import React from 'react';\nimport {RendererProps, Renderer} from '../../factory';\nimport QuickEdit from '../QuickEdit';\nimport Copyable from '../Copyable';\nimport PopOverable from '../PopOver';\nimport {observer} from 'mobx-react';\nimport omit = require('lodash/omit');\nimport {filter} from '../../utils/tpl';\nimport {Badge} from '../../components/Badge';\nimport ColorScale from '../../utils/ColorScale';\nimport {\n  isPureVariable,\n  resolveVariableAndFilter\n} from '../../utils/tpl-builtin';\n\nexport interface TableCellProps extends RendererProps {\n  wrapperComponent?: React.ReactType;\n  column: object;\n}\n\nexport class TableCell extends React.Component<RendererProps> {\n  static defaultProps = {\n    wrapperComponent: 'td'\n  };\n\n  static propsList: Array<string> = [\n    'type',\n    'label',\n    'column',\n    'body',\n    'tpl',\n    'rowSpan',\n    'remark'\n  ];\n\n  render() {\n    let {\n      classnames: cx,\n      className,\n      classNameExpr,\n      render,\n      style = {},\n      wrapperComponent: Component,\n      column,\n      value,\n      data,\n      children,\n      width,\n      align,\n      innerClassName,\n      label,\n      tabIndex,\n      onKeyUp,\n      rowSpan,\n      body: _body,\n      tpl,\n      remark,\n      prefix,\n      affix,\n      isHead,\n      colIndex,\n      row,\n      showBadge,\n      itemBadge,\n      ...rest\n    } = this.props;\n    const schema = {\n      ...column,\n      className: innerClassName,\n      type: (column && column.type) || 'plain'\n    };\n\n    // 如果本来就是 type 为 button，不要删除，其他情况下都应该删除。\n    if (schema.type !== 'button' && schema.type !== 'dropdown-button') {\n      delete schema.label;\n    }\n\n    let body = children\n      ? children\n      : render('field', schema, {\n          ...omit(rest, Object.keys(schema)),\n          inputOnly: true,\n          value,\n          data\n        });\n\n    if (width) {\n      style = {\n        ...style,\n        width: (style && style.width) || width\n      };\n\n      if (!/%$/.test(String(style.width))) {\n        body = (\n          <div style={{width: style.width}}>\n            {prefix}\n            {body}\n            {affix}\n          </div>\n        );\n        prefix = null;\n        affix = null;\n        // delete style.width;\n      }\n    }\n\n    if (align) {\n      style = {\n        ...style,\n        textAlign: align\n      };\n    }\n\n    if (column.backgroundScale) {\n      const backgroundScale = column.backgroundScale;\n      let min = backgroundScale.min;\n      let max = backgroundScale.max;\n\n      if (isPureVariable(min)) {\n        min = resolveVariableAndFilter(min, data, '| raw');\n      }\n      if (isPureVariable(max)) {\n        max = resolveVariableAndFilter(max, data, '| raw');\n      }\n\n      if (typeof min === 'undefined') {\n        min = Math.min(...data.rows.map((r: any) => r[column.name]));\n      }\n      if (typeof max === 'undefined') {\n        max = Math.max(...data.rows.map((r: any) => r[column.name]));\n      }\n\n      const colorScale = new ColorScale(\n        min,\n        max,\n        backgroundScale.colors || ['#FFEF9C', '#FF7127']\n      );\n      let value = data[column.name];\n      if (isPureVariable(backgroundScale.source)) {\n        value = resolveVariableAndFilter(backgroundScale.source, data, '| raw');\n      }\n\n      const color = colorScale.getColor(Number(value)).toHexString();\n      style.background = color;\n    }\n\n    if (!Component) {\n      return body as JSX.Element;\n    }\n\n    if (isHead) {\n      Component = 'th';\n    }\n\n    return (\n      <Component\n        rowSpan={rowSpan > 1 ? rowSpan : undefined}\n        style={style}\n        className={cx(\n          className,\n          column.classNameExpr ? filter(column.classNameExpr, data) : null\n        )}\n        tabIndex={tabIndex}\n        onKeyUp={onKeyUp}\n      >\n        {showBadge ? (\n          <Badge\n            classnames={cx}\n            badge={{\n              ...itemBadge,\n              className: cx(`Table-badge`, itemBadge?.className)\n            }}\n            data={row.data}\n          />\n        ) : null}\n        {prefix}\n        {body}\n        {affix}\n      </Component>\n    );\n  }\n}\n\n@Renderer({\n  test: /(^|\\/)table\\/(?:.*\\/)?cell$/,\n  name: 'table-cell'\n})\n@QuickEdit()\n@PopOverable({\n  targetOutter: true\n})\n@Copyable()\n@observer\nexport class TableCellRenderer extends TableCell {\n  static propsList = [\n    'quickEdit',\n    'quickEditEnabledOn',\n    'popOver',\n    'copyable',\n    'inline',\n    ...TableCell.propsList\n  ];\n}\n\n@Renderer({\n  type: 'field',\n  name: 'field'\n})\n@PopOverable()\n@Copyable()\nexport class FieldRenderer extends TableCell {\n  static defaultProps = {\n    ...TableCell.defaultProps,\n    wrapperComponent: 'div'\n  };\n}\n"
     ]
 }

package/lib/renderers/Table/TableRow.js

@@ -85,7 +85,7 @@ var TableRow = /** @class */ (function (_super) {
                     'is-checked': item.checked,
                     'is-modified': item.modified,
                     'is-moved': item.moved,
-                    'is-expanded': item.expanded,
+                    'is-expanded': item.expanded && item.expandable,
                     'is-expandable': item.expandable
                 },
                 _b["Table-tr--hasItemAction"] = itemAction,

package/lib/renderers/Table/TableRow.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/Table/TableRow.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import {observer} from 'mobx-react';\nimport React from 'react';\nimport {IRow, IColumn} from '../../store/table';\nimport {RendererProps} from '../../factory';\nimport {Action} from '../Action';\nimport {reaction} from 'mobx';\nimport {isClickOnInput} from '../../utils/helper';\n\ninterface TableRowProps extends Pick<RendererProps, 'render'> {\n  onCheck: (item: IRow) => void;\n  classPrefix: string;\n  renderCell: (\n    region: string,\n    column: IColumn,\n    item: IRow,\n    props: any\n  ) => React.ReactNode;\n  columns: Array<IColumn>;\n  item: IRow;\n  parent?: IRow;\n  itemClassName?: string;\n  itemIndex: number;\n  regionPrefix?: string;\n  checkOnItemClick?: boolean;\n  ignoreFootableContent?: boolean;\n  [propName: string]: any;\n}\n\n@observer\nexport class TableRow extends React.Component<TableRowProps> {\n  // reaction?: () => void;\n  constructor(props: TableRowProps) {\n    super(props);\n    this.handleAction = this.handleAction.bind(this);\n    this.handleQuickChange = this.handleQuickChange.bind(this);\n    this.handleChange = this.handleChange.bind(this);\n    this.handleItemClick = this.handleItemClick.bind(this);\n  }\n\n  // 定义点击一行的行为，通过 itemAction配置\n  handleItemClick(e: React.MouseEvent<HTMLTableRowElement>) {\n    if (isClickOnInput(e)) {\n      return;\n    }\n    const {itemAction, onAction, item} = this.props;\n    if (itemAction) {\n      onAction && onAction(e, itemAction, item?.data);\n      item.toggle();\n    } else {\n      this.props.onCheck(this.props.item);\n    }\n  }\n\n  handleAction(e: React.UIEvent<any>, action: Action, ctx: any) {\n    const {onAction, item} = this.props;\n    onAction && onAction(e, action, ctx || item.data);\n  }\n\n  handleQuickChange(\n    values: object,\n    saveImmediately?: boolean,\n    savePristine?: boolean,\n    resetOnFailed?: boolean\n  ) {\n    const {onQuickChange, item} = this.props;\n    onQuickChange &&\n      onQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);\n  }\n\n  handleChange(\n    value: any,\n    name: string,\n    submit?: boolean,\n    changePristine?: boolean\n  ) {\n    if (!name || typeof name !== 'string') {\n      return;\n    }\n\n    const {item, onQuickChange} = this.props;\n\n    onQuickChange?.(\n      item,\n      {\n        [name]: value\n      },\n      submit,\n      changePristine\n    );\n  }\n\n  render() {\n    const {\n      itemClassName,\n      itemIndex,\n      item,\n      columns,\n      renderCell,\n      children,\n      footableMode,\n      ignoreFootableContent,\n      footableColSpan,\n      regionPrefix,\n      checkOnItemClick,\n      classPrefix: ns,\n      render,\n      classnames: cx,\n      parent,\n      itemAction,\n      ...rest\n    } = this.props;\n\n    if (footableMode) {\n      if (!item.expanded) {\n        return null;\n      }\n\n      return (\n        <tr\n          data-id={item.id}\n          data-index={item.newIndex}\n          onClick={\n            checkOnItemClick || itemAction ? this.handleItemClick : undefined\n          }\n          className={cx(itemClassName, {\n            'is-hovered': item.isHover,\n            'is-checked': item.checked,\n            'is-modified': item.modified,\n            'is-moved': item.moved,\n            [`Table-tr--hasItemAction`]: itemAction, // 就是为了加鼠标效果\n            [`Table-tr--odd`]: itemIndex % 2 === 0,\n            [`Table-tr--even`]: itemIndex % 2 === 1\n          })}\n        >\n          <td className={cx(`Table-foot`)} colSpan={footableColSpan}>\n            <table className={cx(`Table-footTable`)}>\n              <tbody>\n                {ignoreFootableContent\n                  ? columns.map(column => (\n                      <tr key={column.index}>\n                        {column.label !== false ? <th></th> : null}\n                        <td></td>\n                      </tr>\n                    ))\n                  : columns.map(column => (\n                      <tr key={column.index}>\n                        {column.label !== false ? (\n                          <th>\n                            {render(\n                              `${regionPrefix}${itemIndex}/${column.index}/tpl`,\n                              column.label\n                            )}\n                          </th>\n                        ) : null}\n\n                        {renderCell(\n                          `${regionPrefix}${itemIndex}/${column.index}`,\n                          column,\n                          item,\n                          {\n                            ...rest,\n                            width: null,\n                            rowIndex: itemIndex,\n                            colIndex: column.index,\n                            key: column.index,\n                            onAction: this.handleAction,\n                            onQuickChange: this.handleQuickChange,\n                            onChange: this.handleChange\n                          }\n                        )}\n                      </tr>\n                    ))}\n              </tbody>\n            </table>\n          </td>\n        </tr>\n      );\n    }\n\n    if (parent && !parent.expanded) {\n      return null;\n    }\n\n    return (\n      <tr\n        onClick={\n          checkOnItemClick || itemAction ? this.handleItemClick : undefined\n        }\n        data-index={item.depth === 1 ? item.newIndex : undefined}\n        data-id={item.id}\n        className={cx(\n          itemClassName,\n          {\n            'is-hovered': item.isHover,\n            'is-checked': item.checked,\n            'is-modified': item.modified,\n            'is-moved': item.moved,\n            'is-expanded': item.expanded,\n            'is-expandable': item.expandable,\n            [`Table-tr--hasItemAction`]: itemAction,\n            [`Table-tr--odd`]: itemIndex % 2 === 0,\n            [`Table-tr--even`]: itemIndex % 2 === 1\n          },\n          `Table-tr--${item.depth}th`\n        )}\n      >\n        {columns.map(column =>\n          renderCell(`${itemIndex}/${column.index}`, column, item, {\n            ...rest,\n            rowIndex: itemIndex,\n            colIndex: column.index,\n            key: column.index,\n            onAction: this.handleAction,\n            onQuickChange: this.handleQuickChange,\n            onChange: this.handleChange\n          })\n        )}\n      </tr>\n    );\n  }\n}\n"
+        "import {observer} from 'mobx-react';\nimport React from 'react';\nimport {IRow, IColumn} from '../../store/table';\nimport {RendererProps} from '../../factory';\nimport {Action} from '../Action';\nimport {reaction} from 'mobx';\nimport {isClickOnInput} from '../../utils/helper';\n\ninterface TableRowProps extends Pick<RendererProps, 'render'> {\n  onCheck: (item: IRow) => void;\n  classPrefix: string;\n  renderCell: (\n    region: string,\n    column: IColumn,\n    item: IRow,\n    props: any\n  ) => React.ReactNode;\n  columns: Array<IColumn>;\n  item: IRow;\n  parent?: IRow;\n  itemClassName?: string;\n  itemIndex: number;\n  regionPrefix?: string;\n  checkOnItemClick?: boolean;\n  ignoreFootableContent?: boolean;\n  [propName: string]: any;\n}\n\n@observer\nexport class TableRow extends React.Component<TableRowProps> {\n  // reaction?: () => void;\n  constructor(props: TableRowProps) {\n    super(props);\n    this.handleAction = this.handleAction.bind(this);\n    this.handleQuickChange = this.handleQuickChange.bind(this);\n    this.handleChange = this.handleChange.bind(this);\n    this.handleItemClick = this.handleItemClick.bind(this);\n  }\n\n  // 定义点击一行的行为，通过 itemAction配置\n  handleItemClick(e: React.MouseEvent<HTMLTableRowElement>) {\n    if (isClickOnInput(e)) {\n      return;\n    }\n    const {itemAction, onAction, item} = this.props;\n    if (itemAction) {\n      onAction && onAction(e, itemAction, item?.data);\n      item.toggle();\n    } else {\n      this.props.onCheck(this.props.item);\n    }\n  }\n\n  handleAction(e: React.UIEvent<any>, action: Action, ctx: any) {\n    const {onAction, item} = this.props;\n    onAction && onAction(e, action, ctx || item.data);\n  }\n\n  handleQuickChange(\n    values: object,\n    saveImmediately?: boolean,\n    savePristine?: boolean,\n    resetOnFailed?: boolean\n  ) {\n    const {onQuickChange, item} = this.props;\n    onQuickChange &&\n      onQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);\n  }\n\n  handleChange(\n    value: any,\n    name: string,\n    submit?: boolean,\n    changePristine?: boolean\n  ) {\n    if (!name || typeof name !== 'string') {\n      return;\n    }\n\n    const {item, onQuickChange} = this.props;\n\n    onQuickChange?.(\n      item,\n      {\n        [name]: value\n      },\n      submit,\n      changePristine\n    );\n  }\n\n  render() {\n    const {\n      itemClassName,\n      itemIndex,\n      item,\n      columns,\n      renderCell,\n      children,\n      footableMode,\n      ignoreFootableContent,\n      footableColSpan,\n      regionPrefix,\n      checkOnItemClick,\n      classPrefix: ns,\n      render,\n      classnames: cx,\n      parent,\n      itemAction,\n      ...rest\n    } = this.props;\n\n    if (footableMode) {\n      if (!item.expanded) {\n        return null;\n      }\n\n      return (\n        <tr\n          data-id={item.id}\n          data-index={item.newIndex}\n          onClick={\n            checkOnItemClick || itemAction ? this.handleItemClick : undefined\n          }\n          className={cx(itemClassName, {\n            'is-hovered': item.isHover,\n            'is-checked': item.checked,\n            'is-modified': item.modified,\n            'is-moved': item.moved,\n            [`Table-tr--hasItemAction`]: itemAction, // 就是为了加鼠标效果\n            [`Table-tr--odd`]: itemIndex % 2 === 0,\n            [`Table-tr--even`]: itemIndex % 2 === 1\n          })}\n        >\n          <td className={cx(`Table-foot`)} colSpan={footableColSpan}>\n            <table className={cx(`Table-footTable`)}>\n              <tbody>\n                {ignoreFootableContent\n                  ? columns.map(column => (\n                      <tr key={column.index}>\n                        {column.label !== false ? <th></th> : null}\n                        <td></td>\n                      </tr>\n                    ))\n                  : columns.map(column => (\n                      <tr key={column.index}>\n                        {column.label !== false ? (\n                          <th>\n                            {render(\n                              `${regionPrefix}${itemIndex}/${column.index}/tpl`,\n                              column.label\n                            )}\n                          </th>\n                        ) : null}\n\n                        {renderCell(\n                          `${regionPrefix}${itemIndex}/${column.index}`,\n                          column,\n                          item,\n                          {\n                            ...rest,\n                            width: null,\n                            rowIndex: itemIndex,\n                            colIndex: column.index,\n                            key: column.index,\n                            onAction: this.handleAction,\n                            onQuickChange: this.handleQuickChange,\n                            onChange: this.handleChange\n                          }\n                        )}\n                      </tr>\n                    ))}\n              </tbody>\n            </table>\n          </td>\n        </tr>\n      );\n    }\n\n    if (parent && !parent.expanded) {\n      return null;\n    }\n\n    return (\n      <tr\n        onClick={\n          checkOnItemClick || itemAction ? this.handleItemClick : undefined\n        }\n        data-index={item.depth === 1 ? item.newIndex : undefined}\n        data-id={item.id}\n        className={cx(\n          itemClassName,\n          {\n            'is-hovered': item.isHover,\n            'is-checked': item.checked,\n            'is-modified': item.modified,\n            'is-moved': item.moved,\n            'is-expanded': item.expanded && item.expandable,\n            'is-expandable': item.expandable,\n            [`Table-tr--hasItemAction`]: itemAction,\n            [`Table-tr--odd`]: itemIndex % 2 === 0,\n            [`Table-tr--even`]: itemIndex % 2 === 1\n          },\n          `Table-tr--${item.depth}th`\n        )}\n      >\n        {columns.map(column =>\n          renderCell(`${itemIndex}/${column.index}`, column, item, {\n            ...rest,\n            rowIndex: itemIndex,\n            colIndex: column.index,\n            key: column.index,\n            onAction: this.handleAction,\n            onQuickChange: this.handleQuickChange,\n            onChange: this.handleChange\n          })\n        )}\n      </tr>\n    );\n  }\n}\n"
     ]
 }

package/lib/renderers/Table/index.d.ts

@@ -260,6 +260,7 @@ export interface TableProps extends RendererProps {
 declare type ExportExcelToolbar = SchemaNode & {
     api?: SchemaApi;
     columns?: string[];
+    exportColumns?: any[];
     filename?: string;
 };
 export default class Table extends React.Component<TableProps, object> {
@@ -288,6 +289,7 @@ export default class Table extends React.Component<TableProps, object> {
     };
     renderedToolbars: Array<string>;
     subForms: any;
+    timer: ReturnType<typeof setTimeout>;
     constructor(props: TableProps);
     static syncRows(store: ITableStore, props: TableProps, prevProps?: TableProps): boolean;
     componentDidMount(): void;

package/lib/renderers/Table/index.js

@@ -187,7 +187,7 @@ var Table = /** @class */ (function (_super) {
         var footToolbarHeight = footToolbar ? (0, offset_1.default)(footToolbar).height : 0;
         // 有时候会拿不到 footToolbar，等一下在执行
         if (!footToolbarHeight && footerToolbar && footerToolbar.length) {
-            setTimeout(function () {
+            this.timer = setTimeout(function () {
                 _this.updateAutoFillHeight();
             }, 100);
             return;
@@ -280,6 +280,7 @@ var Table = /** @class */ (function (_super) {
         this.updateTableInfoLazy.cancel();
         this.unSensor && this.unSensor();
         formItem && (0, mobx_state_tree_1.isAlive)(formItem) && formItem.setSubStore(null);
+        clearTimeout(this.timer);
     };
     Table.prototype.subFormRef = function (form, x, y) {
         var quickEditFormRef = this.props.quickEditFormRef;
@@ -863,7 +864,7 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.renderHeadCell = function (column, props) {
         var _a = this.props, store = _a.store, query = _a.query, onQuery = _a.onQuery, multiple = _a.multiple, env = _a.env, render = _a.render, ns = _a.classPrefix, resizable = _a.resizable, cx = _a.classnames, autoGenerateFilter = _a.autoGenerateFilter;
         if (column.type === '__checkme') {
-            return (react_1.default.createElement("th", (0, tslib_1.__assign)({}, props, { className: cx(column.pristine.className) }), store.rows.length && multiple ? (react_1.default.createElement(Checkbox_1.default, { classPrefix: ns, partial: !store.allChecked, checked: store.someChecked, disabled: store.disabledHeadCheckbox, onChange: this.handleCheckAll })) : ('\u00A0')));
+            return (react_1.default.createElement("th", (0, tslib_1.__assign)({}, props, { className: cx(column.pristine.className) }), store.rows.length && multiple ? (react_1.default.createElement(Checkbox_1.default, { classPrefix: ns, partial: store.someChecked && !store.allChecked, checked: store.someChecked, disabled: store.disabledHeadCheckbox, onChange: this.handleCheckAll })) : ('\u00A0')));
         }
         else if (column.type === '__dragme') {
             return react_1.default.createElement("th", (0, tslib_1.__assign)({}, props, { className: cx(column.pristine.className) }));
@@ -1075,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 () {
@@ -1092,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, 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) {
@@ -1140,10 +1143,19 @@ var Table = /** @class */ (function (_super) {
                                     properties: { defaultColWidth: 15 }
                                 });
                                 worksheet.views = [{ state: 'frozen', xSplit: 0, ySplit: 1 }];
-                                filteredColumns = toolbar.columns
+                                exportColumnNames = toolbar.columns;
+                                if ((0, tpl_builtin_1.isPureVariable)(exportColumnNames)) {
+                                    exportColumnNames = (0, tpl_builtin_1.resolveVariableAndFilter)(exportColumnNames, data, '| raw');
+                                }
+                                // 自定义导出列配置
+                                if (toolbar.exportColumns && Array.isArray(toolbar.exportColumns)) {
+                                    columns = toolbar.exportColumns;
+                                }
+                                filteredColumns = exportColumnNames
                                     ? columns.filter(function (column) {
-                                        var filterColumnsNames = toolbar.columns;
-                                        if (filterColumnsNames.indexOf(column.name) !== -1) {
+                                        var filterColumnsNames = exportColumnNames;
+                                        if (column.name &&
+                                            filterColumnsNames.indexOf(column.name) !== -1) {
                                             return true;
                                         }
                                         return false;
@@ -1328,7 +1340,8 @@ var Table = /** @class */ (function (_super) {
                         }
                     });
                 }); });
-            }, size: "sm" }, toolbar.label || __('CRUD.exportExcel')));
+            }
+        });
     };
     Table.prototype.renderActions = function (region) {
         var _this = this;