amis 1.9.1-beta.12 → 1.9.1-beta.21

package/lib/renderers/Table-v2/HeadCellSearchDropdown.d.ts

@@ -21,7 +21,7 @@ export declare class HeadCellSearchDropDown extends React.Component<HeadCellSear
     formItems: Array<string>;
     constructor(props: HeadCellSearchProps);
     buildSchema(): any;
-    handleAction(e: any, action: Action, ctx: object, confirm: Function): void;
+    handleAction(e: any, action: Action, ctx: object, confirm: Function): Promise<void>;
     handleReset(): Promise<void>;
     handleSubmit(values: any, confirm: Function): Promise<void>;
     isActive(): any;

package/lib/renderers/Table-v2/HeadCellSearchDropdown.js

@@ -100,44 +100,55 @@ var HeadCellSearchDropDown = /** @class */ (function (_super) {
         return schema || 'error';
     };
     HeadCellSearchDropDown.prototype.handleAction = function (e, action, ctx, confirm) {
-        var onAction = this.props.onAction;
-        if (action.actionType === 'cancel' || action.actionType === 'close') {
-            confirm();
-            return;
-        }
-        if (action.actionType === 'reset') {
-            confirm();
-            this.handleReset();
-            return;
-        }
-        onAction && onAction(e, action, ctx);
-    };
-    HeadCellSearchDropDown.prototype.handleReset = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, onSearch, data, name, store, dispatchEvent, values, rendererEvent;
+            var _a, onAction, data, dispatchEvent, name, values, rendererEvent;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onSearch = _a.onSearch, data = _a.data, name = _a.name, store = _a.store, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, onAction = _a.onAction, data = _a.data, dispatchEvent = _a.dispatchEvent, name = _a.name;
+                        if (action.actionType === 'cancel' || action.actionType === 'close') {
+                            confirm();
+                            return [2 /*return*/];
+                        }
+                        if (action.actionType === 'reset') {
+                            confirm();
+                            this.handleReset();
+                            return [2 /*return*/];
+                        }
                         values = (0, tslib_1.__assign)({}, data);
-                        return [4 /*yield*/, dispatchEvent('columnSearch', (0, helper_1.createObject)(data, (0, tslib_1.__assign)({}, values)))];
+                        this.formItems.forEach(function (key) { return (0, helper_1.setVariable)(values, key, undefined); });
+                        return [4 /*yield*/, dispatchEvent('columnSearch', (0, helper_1.createObject)(data, {
+                                searchName: name,
+                                searchValue: values
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/];
                         }
-                        this.formItems.forEach(function (key) { return (0, helper_1.setVariable)(values, key, undefined); });
-                        if (values.orderBy === name) {
-                            values.orderBy = '';
-                            values.order = 'asc';
-                        }
-                        store.updateQuery(values);
-                        onSearch && onSearch(values);
+                        onAction && onAction(e, action, ctx);
                         return [2 /*return*/];
                 }
             });
         });
     };
+    HeadCellSearchDropDown.prototype.handleReset = function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a, onSearch, data, name, store, values;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                _a = this.props, onSearch = _a.onSearch, data = _a.data, name = _a.name, store = _a.store;
+                values = (0, tslib_1.__assign)({}, data);
+                this.formItems.forEach(function (key) { return (0, helper_1.setVariable)(values, key, undefined); });
+                if (values.orderBy === name) {
+                    values.orderBy = '';
+                    values.order = 'asc';
+                }
+                store.updateQuery(values);
+                onSearch && onSearch(values);
+                return [2 /*return*/];
+            });
+        });
+    };
     HeadCellSearchDropDown.prototype.handleSubmit = function (values, confirm) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _a, onSearch, name, store, dispatchEvent, data, rendererEvent;
@@ -148,7 +159,10 @@ var HeadCellSearchDropDown = /** @class */ (function (_super) {
                         if (values.order) {
                             values = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, values), { orderBy: name });
                         }
-                        return [4 /*yield*/, dispatchEvent('columnSearch', (0, helper_1.createObject)(data, (0, tslib_1.__assign)({}, values)))];
+                        return [4 /*yield*/, dispatchEvent('columnSearch', (0, helper_1.createObject)(data, {
+                                searchName: name,
+                                searchValue: values
+                            }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {

package/lib/renderers/Table-v2/HeadCellSearchDropdown.js.map

@@ -6,8 +6,8 @@
         "/src/renderers/Table-v2/HeadCellSearchDropdown.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport {findDOMNode} from 'react-dom';\n\nimport {RendererProps} from '../../factory';\nimport {Action} from '../../types';\nimport {Icon} from '../../components/icons';\nimport {setVariable, createObject} from '../../utils/helper';\nimport {ITableStore} from '../../store/table-v2';\nimport HeadCellDropDown from '../../components/table/HeadCellDropDown';\n\nexport interface QuickSearchConfig {\n  type?: string;\n  controls?: any;\n  tabs?: any;\n  fieldSet?: any;\n  [propName: string]: any;\n}\n\nexport interface HeadCellSearchProps extends RendererProps {\n  name: string;\n  searchable: boolean | QuickSearchConfig;\n  classPrefix: string;\n  onSearch?: (values: object) => void;\n  onAction?: Function;\n  store: ITableStore;\n}\n\nexport class HeadCellSearchDropDown extends React.Component<\n  HeadCellSearchProps,\n  any\n> {\n  formItems: Array<string> = [];\n  constructor(props: HeadCellSearchProps) {\n    super(props);\n\n    this.handleSubmit = this.handleSubmit.bind(this);\n    this.handleAction = this.handleAction.bind(this);\n  }\n\n  buildSchema() {\n    const {searchable, sortable, name, label, translate: __} = this.props;\n\n    let schema: any;\n\n    if (searchable === true) {\n      schema = {\n        title: '',\n        controls: [\n          {\n            type: 'text',\n            name,\n            placeholder: label,\n            clearable: true\n          }\n        ]\n      };\n    } else if (searchable) {\n      if (searchable.controls || searchable.tabs || searchable.fieldSet) {\n        schema = {\n          title: '',\n          ...searchable,\n          controls: Array.isArray(searchable.controls)\n            ? searchable.controls.concat()\n            : undefined\n        };\n      } else {\n        schema = {\n          title: '',\n          className: searchable.formClassName,\n          controls: [\n            {\n              type: searchable.type || 'text',\n              name: searchable.name || name,\n              placeholder: label,\n              ...searchable\n            }\n          ]\n        };\n      }\n    }\n\n    if (schema && schema.controls && sortable) {\n      schema.controls.unshift(\n        {\n          type: 'hidden',\n          name: 'orderBy',\n          value: name\n        },\n        {\n          type: 'button-group',\n          name: 'order',\n          label: __('sort'),\n          options: [\n            {\n              label: __('asc'),\n              value: 'asc'\n            },\n            {\n              label: __('desc'),\n              value: 'desc'\n            }\n          ]\n        }\n      );\n    }\n\n    if (schema) {\n      const formItems: Array<string> = [];\n      schema.controls?.forEach(\n        (item: any) =>\n          item.name &&\n          item.name !== 'orderBy' &&\n          item.name !== 'order' &&\n          formItems.push(item.name)\n      );\n      this.formItems = formItems;\n      schema = {\n        ...schema,\n        type: 'form',\n        wrapperComponent: 'div',\n        actions: [\n          {\n            type: 'button',\n            label: __('reset'),\n            actionType: 'clear-and-submit'\n          },\n\n          {\n            type: 'button',\n            label: __('cancel'),\n            actionType: 'cancel'\n          },\n\n          {\n            label: __('search'),\n            type: 'submit',\n            primary: true\n          }\n        ]\n      };\n    }\n\n    return schema || 'error';\n  }\n\n  handleAction(e: any, action: Action, ctx: object, confirm: Function) {\n    const {onAction} = this.props;\n\n    if (action.actionType === 'cancel' || action.actionType === 'close') {\n      confirm();\n      return;\n    }\n\n    if (action.actionType === 'reset') {\n      confirm();\n      this.handleReset();\n      return;\n    }\n\n    onAction && onAction(e, action, ctx);\n  }\n\n  async handleReset() {\n    const {onSearch, data, name, store, dispatchEvent} = this.props;\n    const values = {...data};\n\n    const rendererEvent = await dispatchEvent(\n      'columnSearch',\n      createObject(data, {\n        ...values\n      })\n    );\n\n    if (rendererEvent?.prevented) {\n      return;\n    }\n\n    this.formItems.forEach(key => setVariable(values, key, undefined));\n\n    if (values.orderBy === name) {\n      values.orderBy = '';\n      values.order = 'asc';\n    }\n\n    store.updateQuery(values);\n\n    onSearch && onSearch(values);\n  }\n\n  async handleSubmit(values: any, confirm: Function) {\n    const {onSearch, name, store, dispatchEvent, data} = this.props;\n\n    if (values.order) {\n      values = {\n        ...values,\n        orderBy: name\n      };\n    }\n\n    const rendererEvent = await dispatchEvent(\n      'columnSearch',\n      createObject(data, {\n        ...values\n      })\n    );\n\n    if (rendererEvent?.prevented) {\n      return;\n    }\n\n    store.updateQuery(values);\n\n    onSearch && onSearch(values);\n\n    confirm();\n  }\n\n  isActive() {\n    const {data, name, orderBy} = this.props;\n\n    return (\n      (orderBy && orderBy === name) || this.formItems.some(key => data?.[key])\n    );\n  }\n\n  render() {\n    const {\n      render,\n      name,\n      data,\n      searchable,\n      store,\n      orderBy,\n      popOverContainer,\n      classPrefix: ns,\n      classnames: cx\n    } = this.props;\n\n    const formSchema = this.buildSchema();\n    const isActive = this.isActive();\n\n    return (\n      <HeadCellDropDown\n        className={`${ns}TableCell-searchBtn`}\n        layerClassName={cx(\n          `${ns}TableCell-searchPopOver`,\n          (searchable as any).className\n        )}\n        active={isActive}\n        filterIcon={<Icon icon=\"search\" className=\"icon\" />}\n        popOverContainer={\n          popOverContainer ? popOverContainer : () => findDOMNode(this)\n        }\n        filterDropdown={({\n          setSelectedKeys,\n          selectedKeys,\n          confirm,\n          clearFilters\n        }) => {\n          return render('quick-search-form', formSchema, {\n            data: {\n              ...data,\n              orderBy,\n              order:\n                orderBy && orderBy === name ? (store as ITableStore).order : ''\n            },\n            onSubmit: (values: object) => this.handleSubmit(values, confirm),\n            onAction: (e: any, action: Action, ctx: object) => {\n              this.handleAction(e, action, ctx, confirm);\n            }\n          }) as JSX.Element;\n        }}\n      ></HeadCellDropDown>\n    );\n  }\n}\n"
+        "import React from 'react';\nimport {findDOMNode} from 'react-dom';\n\nimport {RendererProps} from '../../factory';\nimport {Action} from '../../types';\nimport {Icon} from '../../components/icons';\nimport {setVariable, createObject} from '../../utils/helper';\nimport {ITableStore} from '../../store/table-v2';\nimport HeadCellDropDown from '../../components/table/HeadCellDropDown';\n\nexport interface QuickSearchConfig {\n  type?: string;\n  controls?: any;\n  tabs?: any;\n  fieldSet?: any;\n  [propName: string]: any;\n}\n\nexport interface HeadCellSearchProps extends RendererProps {\n  name: string;\n  searchable: boolean | QuickSearchConfig;\n  classPrefix: string;\n  onSearch?: (values: object) => void;\n  onAction?: Function;\n  store: ITableStore;\n}\n\nexport class HeadCellSearchDropDown extends React.Component<\n  HeadCellSearchProps,\n  any\n> {\n  formItems: Array<string> = [];\n  constructor(props: HeadCellSearchProps) {\n    super(props);\n\n    this.handleSubmit = this.handleSubmit.bind(this);\n    this.handleAction = this.handleAction.bind(this);\n  }\n\n  buildSchema() {\n    const {searchable, sortable, name, label, translate: __} = this.props;\n\n    let schema: any;\n\n    if (searchable === true) {\n      schema = {\n        title: '',\n        controls: [\n          {\n            type: 'text',\n            name,\n            placeholder: label,\n            clearable: true\n          }\n        ]\n      };\n    } else if (searchable) {\n      if (searchable.controls || searchable.tabs || searchable.fieldSet) {\n        schema = {\n          title: '',\n          ...searchable,\n          controls: Array.isArray(searchable.controls)\n            ? searchable.controls.concat()\n            : undefined\n        };\n      } else {\n        schema = {\n          title: '',\n          className: searchable.formClassName,\n          controls: [\n            {\n              type: searchable.type || 'text',\n              name: searchable.name || name,\n              placeholder: label,\n              ...searchable\n            }\n          ]\n        };\n      }\n    }\n\n    if (schema && schema.controls && sortable) {\n      schema.controls.unshift(\n        {\n          type: 'hidden',\n          name: 'orderBy',\n          value: name\n        },\n        {\n          type: 'button-group',\n          name: 'order',\n          label: __('sort'),\n          options: [\n            {\n              label: __('asc'),\n              value: 'asc'\n            },\n            {\n              label: __('desc'),\n              value: 'desc'\n            }\n          ]\n        }\n      );\n    }\n\n    if (schema) {\n      const formItems: Array<string> = [];\n      schema.controls?.forEach(\n        (item: any) =>\n          item.name &&\n          item.name !== 'orderBy' &&\n          item.name !== 'order' &&\n          formItems.push(item.name)\n      );\n      this.formItems = formItems;\n      schema = {\n        ...schema,\n        type: 'form',\n        wrapperComponent: 'div',\n        actions: [\n          {\n            type: 'button',\n            label: __('reset'),\n            actionType: 'clear-and-submit'\n          },\n\n          {\n            type: 'button',\n            label: __('cancel'),\n            actionType: 'cancel'\n          },\n\n          {\n            label: __('search'),\n            type: 'submit',\n            primary: true\n          }\n        ]\n      };\n    }\n\n    return schema || 'error';\n  }\n\n  async handleAction(e: any, action: Action, ctx: object, confirm: Function) {\n    const {onAction, data, dispatchEvent, name} = this.props;\n\n    if (action.actionType === 'cancel' || action.actionType === 'close') {\n      confirm();\n      return;\n    }\n\n    if (action.actionType === 'reset') {\n      confirm();\n      this.handleReset();\n      return;\n    }\n\n    const values = {...data};\n    this.formItems.forEach(key => setVariable(values, key, undefined));\n\n    const rendererEvent = await dispatchEvent(\n      'columnSearch',\n      createObject(data, {\n        searchName: name,\n        searchValue: values\n      })\n    );\n\n    if (rendererEvent?.prevented) {\n      return;\n    }\n\n    onAction && onAction(e, action, ctx);\n  }\n\n  async handleReset() {\n    const {onSearch, data, name, store} = this.props;\n    const values = {...data};\n\n    this.formItems.forEach(key => setVariable(values, key, undefined));\n\n    if (values.orderBy === name) {\n      values.orderBy = '';\n      values.order = 'asc';\n    }\n\n    store.updateQuery(values);\n\n    onSearch && onSearch(values);\n  }\n\n  async handleSubmit(values: any, confirm: Function) {\n    const {onSearch, name, store, dispatchEvent, data} = this.props;\n\n    if (values.order) {\n      values = {\n        ...values,\n        orderBy: name\n      };\n    }\n\n    const rendererEvent = await dispatchEvent(\n      'columnSearch',\n      createObject(data, {\n        searchName: name,\n        searchValue: values\n      })\n    );\n\n    if (rendererEvent?.prevented) {\n      return;\n    }\n\n    store.updateQuery(values);\n\n    onSearch && onSearch(values);\n\n    confirm();\n  }\n\n  isActive() {\n    const {data, name, orderBy} = this.props;\n\n    return (\n      (orderBy && orderBy === name) || this.formItems.some(key => data?.[key])\n    );\n  }\n\n  render() {\n    const {\n      render,\n      name,\n      data,\n      searchable,\n      store,\n      orderBy,\n      popOverContainer,\n      classPrefix: ns,\n      classnames: cx\n    } = this.props;\n\n    const formSchema = this.buildSchema();\n    const isActive = this.isActive();\n\n    return (\n      <HeadCellDropDown\n        className={`${ns}TableCell-searchBtn`}\n        layerClassName={cx(\n          `${ns}TableCell-searchPopOver`,\n          (searchable as any).className\n        )}\n        active={isActive}\n        filterIcon={<Icon icon=\"search\" className=\"icon\" />}\n        popOverContainer={\n          popOverContainer ? popOverContainer : () => findDOMNode(this)\n        }\n        filterDropdown={({\n          setSelectedKeys,\n          selectedKeys,\n          confirm,\n          clearFilters\n        }) => {\n          return render('quick-search-form', formSchema, {\n            data: {\n              ...data,\n              orderBy,\n              order:\n                orderBy && orderBy === name ? (store as ITableStore).order : ''\n            },\n            onSubmit: (values: object) => this.handleSubmit(values, confirm),\n            onAction: (e: any, action: Action, ctx: object) => {\n              this.handleAction(e, action, ctx, confirm);\n            }\n          }) as JSX.Element;\n        }}\n      ></HeadCellDropDown>\n    );\n  }\n}\n"
     ]
 }

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

@@ -266,12 +266,18 @@ export default class TableRenderer extends React.Component<TableV2Props, object>
     renderColumnsToggler(): JSX.Element | null;
     handleAction(e: React.UIEvent<any>, action: Action, ctx: object): void;
     renderActions(region: string): JSX.Element | null;
-    handleSelected(record: any, value: boolean, selectedRows: Array<any>, selectedRowKeys: Array<string | number>): Promise<any>;
-    handleSelectedAll(value: boolean, selectedRowKeys: Array<string | number>, selectedRows: Array<any>, changeRows: Array<any>): Promise<any>;
+    handleSelected(selectedRows: Array<any>, selectedRowKeys: Array<string | number>, unSelectedRows: Array<string | number>): Promise<any>;
     handleSort(payload: SortProps): Promise<any>;
-    handleFilter(payload: any): Promise<any>;
-    handleDragOver(dataSource: Array<any>): Promise<any>;
+    handleFilter(payload: {
+        filterName: string;
+        filterValue: string;
+    }): Promise<any>;
+    handleRowClick(event: React.ChangeEvent<any>, rowItem: any, rowIndex?: number): Promise<any>;
+    handleOrderChange(oldIndex: number, newIndex: number, levels: Array<string>): Promise<void>;
+    handleSaveOrder(): Promise<void>;
+    reset(): void;
     doAction(action: Action, args: any, throwErrors: boolean): any;
     renderTable(): JSX.Element | null;
+    renderHeading(): JSX.Element | null;
     render(): JSX.Element;
 }

package/lib/renderers/Table-v2/index.js

@@ -14,6 +14,7 @@ var tpl_builtin_1 = require("../../utils/tpl-builtin");
 var tpl_1 = require("../../utils/tpl");
 var api_1 = require("../../utils/api");
 var Checkbox_1 = (0, tslib_1.__importDefault)(require("../../components/Checkbox"));
+var icons_1 = require("../../components/icons");
 var table_v2_1 = require("../../store/table-v2");
 var HeadCellSearchDropdown_1 = require("./HeadCellSearchDropdown");
 require("./TableCell");
@@ -51,7 +52,7 @@ var TableRenderer = /** @class */ (function (_super) {
     TableRenderer.prototype.syncSelected = function () {
         var _a = this.props, store = _a.store, onSelect = _a.onSelect;
         onSelect &&
-            onSelect(null, false, store.selectedRowKeys.map(function (item) { return item; }), store.selectedRows.map(function (item) { return item.data; }));
+            onSelect(store.selectedRows.map(function (item) { return item.data; }), store.unSelectedRows.map(function (item) { return item.data; }));
     };
     TableRenderer.syncRows = function (store, props, prevProps) {
         var source = props.source;
@@ -83,11 +84,11 @@ var TableRenderer = /** @class */ (function (_super) {
         if (props.rowSelection && props.rowSelection.selectedRowKeysExpr) {
             rows.forEach(function (row, index) {
                 var _a;
-                var flag = (0, tpl_1.filter)(props.rowSelection.selectedRowKeysExpr, {
+                var flag = (0, tpl_1.evalExpression)(props.rowSelection.selectedRowKeysExpr, {
                     record: row,
                     rowIndex: index
                 });
-                if (flag === 'true') {
+                if (flag) {
                     selectedRowKeys.push(row[((_a = props === null || props === void 0 ? void 0 : props.rowSelection) === null || _a === void 0 ? void 0 : _a.keyField) || 'key']);
                 }
             });
@@ -102,11 +103,11 @@ var TableRenderer = /** @class */ (function (_super) {
         if (props.expandable && props.expandable.expandedRowKeysExpr) {
             rows.forEach(function (row, index) {
                 var _a;
-                var flag = (0, tpl_1.filter)(props.expandable.expandedRowKeysExpr, {
+                var flag = (0, tpl_1.evalExpression)(props.expandable.expandedRowKeysExpr, {
                     record: row,
                     rowIndex: index
                 });
-                if (flag === 'true') {
+                if (flag) {
                     expandedRowKeys.push(row[((_a = props === null || props === void 0 ? void 0 : props.expandable) === null || _a === void 0 ? void 0 : _a.keyField) || 'key']);
                 }
             });
@@ -476,18 +477,16 @@ var TableRenderer = /** @class */ (function (_super) {
             });
         }))) : null;
     };
-    TableRenderer.prototype.handleSelected = function (record, value, selectedRows, selectedRowKeys) {
+    TableRenderer.prototype.handleSelected = function (selectedRows, selectedRowKeys, unSelectedRows) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _a, dispatchEvent, data, rowSelection, onSelect, store, rendererEvent;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, rowSelection = _a.rowSelection, onSelect = _a.onSelect, store = _a.store;
-                        return [4 /*yield*/, dispatchEvent('selected', (0, helper_1.createObject)(data, {
-                                record: record,
-                                value: value,
-                                selectedRows: selectedRows,
-                                selectedRowKeys: selectedRowKeys
+                        return [4 /*yield*/, dispatchEvent('selectedChange', (0, helper_1.createObject)(data, {
+                                selectedItems: selectedRows,
+                                unSelectedItems: unSelectedRows
                             }))];
                     case 1:
                         rendererEvent = _b.sent();
@@ -495,101 +494,115 @@ var TableRenderer = /** @class */ (function (_super) {
                             return [2 /*return*/, rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented];
                         }
                         store.updateSelected(selectedRowKeys, rowSelection.keyField);
-                        onSelect && onSelect(record, value, selectedRows, selectedRowKeys);
+                        onSelect && onSelect(selectedRows, unSelectedRows);
                         return [2 /*return*/];
                 }
             });
         });
     };
-    TableRenderer.prototype.handleSelectedAll = function (value, selectedRowKeys, selectedRows, changeRows) {
+    TableRenderer.prototype.handleSort = function (payload) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, rowSelection, onSelectAll, store, rendererEvent;
+            var _a, dispatchEvent, data, onSort, rendererEvent;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, rowSelection = _a.rowSelection, onSelectAll = _a.onSelectAll, store = _a.store;
-                        return [4 /*yield*/, dispatchEvent('selectedAll', (0, helper_1.createObject)(data, {
-                                value: value,
-                                selectedRowKeys: selectedRowKeys,
-                                selectedRows: selectedRows,
-                                changeRows: changeRows
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onSort = _a.onSort;
+                        return [4 /*yield*/, dispatchEvent('columnSort', (0, helper_1.createObject)(data, {
+                                orderBy: payload.orderBy,
+                                orderDir: payload.order
                             }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/, rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented];
                         }
-                        store.updateSelected(selectedRowKeys, rowSelection.keyField);
-                        onSelectAll &&
-                            onSelectAll(value, selectedRowKeys, selectedRows, selectedRowKeys);
+                        onSort && onSort(payload);
                         return [2 /*return*/];
                 }
             });
         });
     };
-    TableRenderer.prototype.handleSort = function (payload) {
+    TableRenderer.prototype.handleFilter = function (payload) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onSort, rendererEvent;
+            var _a, dispatchEvent, data, onFilter, rendererEvent;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onSort = _a.onSort;
-                        return [4 /*yield*/, dispatchEvent('columnSort', (0, helper_1.createObject)(data, (0, tslib_1.__assign)({}, payload)))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onFilter = _a.onFilter;
+                        return [4 /*yield*/, dispatchEvent('columnFilter', (0, helper_1.createObject)(data, payload))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/, rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented];
                         }
-                        onSort && onSort(payload);
+                        onFilter && onFilter(payload);
                         return [2 /*return*/];
                 }
             });
         });
     };
-    TableRenderer.prototype.handleFilter = function (payload) {
+    TableRenderer.prototype.handleRowClick = function (event, rowItem, rowIndex) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onFilter, rendererEvent;
+            var _a, dispatchEvent, data, onRow, rendererEvent;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onFilter = _a.onFilter;
-                        return [4 /*yield*/, dispatchEvent('columnFilter', (0, helper_1.createObject)(data, {
-                                payload: payload
-                            }))];
+                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onRow = _a.onRow;
+                        return [4 /*yield*/, dispatchEvent('rowClick', (0, helper_1.createObject)(data, { rowItem: rowItem }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                             return [2 /*return*/, rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented];
                         }
-                        onFilter && onFilter(payload);
+                        if (rowItem && onRow) {
+                            onRow.onRowClick && onRow.onRowClick(event, rowItem, rowIndex);
+                        }
                         return [2 /*return*/];
                 }
             });
         });
     };
-    TableRenderer.prototype.handleDragOver = function (dataSource) {
+    TableRenderer.prototype.handleOrderChange = function (oldIndex, newIndex, levels) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var store, rowItem;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                store = this.props.store;
+                rowItem = store.getRowByIndex(oldIndex, levels);
+                store.exchange(oldIndex, newIndex, rowItem);
+                return [2 /*return*/];
+            });
+        });
+    };
+    TableRenderer.prototype.handleSaveOrder = function () {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, onDrag, rendererEvent;
+            var _a, store, onSaveOrder, data, dispatchEvent, movedItems, items, rendererEvent;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, onDrag = _a.onDrag;
-                        return [4 /*yield*/, dispatchEvent('dragOver', (0, helper_1.createObject)(data, {
-                                dataSource: dataSource
-                            }))];
+                        _a = this.props, store = _a.store, onSaveOrder = _a.onSaveOrder, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        movedItems = store.movedRows.map(function (item) { return item.data; });
+                        items = store.rows.map(function (item) { return item.getDataWithModifiedChilden(); });
+                        return [4 /*yield*/, dispatchEvent('orderChange', (0, helper_1.createObject)(data, { movedItems: movedItems }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
-                            return [2 /*return*/, rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented];
+                            return [2 /*return*/];
                         }
-                        onDrag && onDrag(dataSource);
+                        if (!onSaveOrder || !store.movedRows.length) {
+                            return [2 /*return*/];
+                        }
+                        onSaveOrder(movedItems, items);
                         return [2 /*return*/];
                 }
             });
         });
     };
+    TableRenderer.prototype.reset = function () {
+        var store = this.props.store;
+        store.reset();
+    };
     TableRenderer.prototype.doAction = function (action, args, throwErrors) {
-        var _a = this.props, store = _a.store, rowSelection = _a.rowSelection;
+        var _a = this.props, store = _a.store, rowSelection = _a.rowSelection, data = _a.data;
         var actionType = action === null || action === void 0 ? void 0 : action.actionType;
         var keyField = rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.keyField;
         switch (actionType) {
@@ -600,7 +613,15 @@ var TableRenderer = /** @class */ (function (_super) {
                 store.updateSelected([], keyField);
                 break;
             case 'select':
-                store.updateSelected(args === null || args === void 0 ? void 0 : args.selectedRowKeys, keyField);
+                var dataSource = store.getData(data);
+                var selected_1 = [];
+                dataSource.items.forEach(function (item, rowIndex) {
+                    var flag = (0, tpl_1.evalExpression)(args === null || args === void 0 ? void 0 : args.selectedRowKeysExpr, { record: item, rowIndex: rowIndex });
+                    if (flag) {
+                        selected_1.push(item[keyField]);
+                    }
+                });
+                store.updateSelected(selected_1, keyField);
                 break;
             default:
                 break;
@@ -608,7 +629,7 @@ var TableRenderer = /** @class */ (function (_super) {
     };
     TableRenderer.prototype.renderTable = function () {
         var _this = this;
-        var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection, columns = _a.columns, expandable = _a.expandable, expandableBody = _a.expandableBody, footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, store = _a.store, rest = (0, tslib_1.__rest)(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "expandableBody", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "store"]);
+        var _a = this.props, render = _a.render, title = _a.title, footer = _a.footer, rowSelection = _a.rowSelection, columns = _a.columns, expandable = _a.expandable, expandableBody = _a.expandableBody, footSummary = _a.footSummary, headSummary = _a.headSummary, loading = _a.loading, cx = _a.classnames, placeholder = _a.placeholder, rowClassNameExpr = _a.rowClassNameExpr, itemActions = _a.itemActions, onRow = _a.onRow, store = _a.store, rest = (0, tslib_1.__rest)(_a, ["render", "title", "footer", "rowSelection", "columns", "expandable", "expandableBody", "footSummary", "headSummary", "loading", "classnames", "placeholder", "rowClassNameExpr", "itemActions", "onRow", "store"]);
         var expandableConfig = null;
         if (expandable) {
             var expandedRowKeys = expandable.expandedRowKeys, rest_1 = (0, tslib_1.__rest)(expandable, ["expandedRowKeys"]);
@@ -706,47 +727,77 @@ var TableRenderer = /** @class */ (function (_super) {
                 })));
             };
         }
-        return (react_1.default.createElement(table_1.default, (0, tslib_1.__assign)({}, rest, { title: this.renderSchema('title', title, { data: this.props.data }), footer: this.renderSchema('footer', footer, { data: this.props.data }), columns: this.buildColumns(store.filteredColumns), dataSource: store.dataSource, rowSelection: rowSelectionConfig, rowClassName: rowClassName, expandable: expandableConfig, footSummary: this.buildSummary('footSummary', footSummary), headSummary: this.buildSummary('headSummary', headSummary), loading: this.renderSchema('loading', loading), placeholder: this.renderSchema('placeholder', placeholder), onSelect: this.handleSelected, onSelectAll: this.handleSelectedAll, onSort: this.handleSort, onFilter: this.handleFilter, onDrag: this.handleDragOver, itemActions: itemActionsConfig })));
+        return (react_1.default.createElement(table_1.default, (0, tslib_1.__assign)({}, rest, { title: this.renderSchema('title', title, { data: this.props.data }), footer: this.renderSchema('footer', footer, { data: this.props.data }), columns: this.buildColumns(store.filteredColumns), dataSource: store.dataSource, rowSelection: rowSelectionConfig, rowClassName: rowClassName, expandable: expandableConfig, footSummary: this.buildSummary('footSummary', footSummary), headSummary: this.buildSummary('headSummary', headSummary), loading: this.renderSchema('loading', loading), placeholder: this.renderSchema('placeholder', placeholder), onSelect: this.handleSelected, onSelectAll: this.handleSelected, onSort: this.handleSort, onFilter: this.handleFilter, onDrag: this.handleOrderChange, itemActions: itemActionsConfig, onRow: (0, tslib_1.__assign)((0, tslib_1.__assign)({}, onRow), { onRowClick: this.handleRowClick }) })));
+    };
+    TableRenderer.prototype.renderHeading = function () {
+        var _a = this.props, store = _a.store, cx = _a.classnames, headingClassName = _a.headingClassName, __ = _a.translate;
+        if (store.moved) {
+            return (react_1.default.createElement("div", { className: cx('Table-heading', headingClassName), key: "heading" }, store.moved ? (react_1.default.createElement("span", null,
+                __('Table.moved', {
+                    moved: store.moved
+                }),
+                react_1.default.createElement("button", { type: "button", className: cx('Button Button--xs Button--success m-l-sm'), onClick: this.handleSaveOrder },
+                    react_1.default.createElement(icons_1.Icon, { icon: "check", className: "icon m-r-xs" }),
+                    __('Form.submit')),
+                react_1.default.createElement("button", { type: "button", className: cx('Button Button--xs Button--danger m-l-sm'), onClick: this.reset },
+                    react_1.default.createElement(icons_1.Icon, { icon: "close", className: "icon m-r-xs" }),
+                    __('Table.discard')))) : null));
+        }
+        return null;
     };
     TableRenderer.prototype.render = function () {
         var cx = this.props.classnames;
         this.renderedToolbars = []; // 用来记录哪些 toolbar 已经渲染了
+        var heading = this.renderHeading();
         return (react_1.default.createElement("div", { className: cx('Table-render-wrapper') },
             this.renderActions('header'),
+            heading,
             this.renderTable()));
     };
-    var TableRenderer_1, _a, _b, _c, _d, _e, _f, _g, _h;
+    var TableRenderer_1, _a, _b, _c, _d, _e, _f, _g;
     TableRenderer.contextType = Scoped_1.ScopedContext;
     (0, tslib_1.__decorate)([
         helper_1.autobind,
         (0, tslib_1.__metadata)("design:type", Function),
-        (0, tslib_1.__metadata)("design:paramtypes", [Object, Boolean, typeof (_a = typeof Array !== "undefined" && Array) === "function" ? _a : Object, typeof (_b = typeof Array !== "undefined" && Array) === "function" ? _b : Object]),
+        (0, tslib_1.__metadata)("design:paramtypes", [typeof (_a = typeof Array !== "undefined" && Array) === "function" ? _a : Object, typeof (_b = typeof Array !== "undefined" && Array) === "function" ? _b : Object, typeof (_c = typeof Array !== "undefined" && Array) === "function" ? _c : Object]),
         (0, tslib_1.__metadata)("design:returntype", Promise)
     ], TableRenderer.prototype, "handleSelected", null);
     (0, tslib_1.__decorate)([
         helper_1.autobind,
         (0, tslib_1.__metadata)("design:type", Function),
-        (0, tslib_1.__metadata)("design:paramtypes", [Boolean, typeof (_c = typeof Array !== "undefined" && Array) === "function" ? _c : Object, typeof (_d = typeof Array !== "undefined" && Array) === "function" ? _d : Object, typeof (_e = typeof Array !== "undefined" && Array) === "function" ? _e : Object]),
+        (0, tslib_1.__metadata)("design:paramtypes", [typeof (_d = typeof table_1.SortProps !== "undefined" && table_1.SortProps) === "function" ? _d : Object]),
         (0, tslib_1.__metadata)("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleSelectedAll", null);
+    ], TableRenderer.prototype, "handleSort", null);
     (0, tslib_1.__decorate)([
         helper_1.autobind,
         (0, tslib_1.__metadata)("design:type", Function),
-        (0, tslib_1.__metadata)("design:paramtypes", [typeof (_f = typeof table_1.SortProps !== "undefined" && table_1.SortProps) === "function" ? _f : Object]),
+        (0, tslib_1.__metadata)("design:paramtypes", [Object]),
         (0, tslib_1.__metadata)("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleSort", null);
+    ], TableRenderer.prototype, "handleFilter", null);
     (0, tslib_1.__decorate)([
         helper_1.autobind,
         (0, tslib_1.__metadata)("design:type", Function),
-        (0, tslib_1.__metadata)("design:paramtypes", [Object]),
+        (0, tslib_1.__metadata)("design:paramtypes", [typeof (_e = typeof react_1.default !== "undefined" && react_1.default.ChangeEvent) === "function" ? _e : Object, Object, Number]),
         (0, tslib_1.__metadata)("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleFilter", null);
+    ], TableRenderer.prototype, "handleRowClick", null);
     (0, tslib_1.__decorate)([
         helper_1.autobind,
         (0, tslib_1.__metadata)("design:type", Function),
-        (0, tslib_1.__metadata)("design:paramtypes", [typeof (_g = typeof Array !== "undefined" && Array) === "function" ? _g : Object]),
+        (0, tslib_1.__metadata)("design:paramtypes", [Number, Number, typeof (_f = typeof Array !== "undefined" && Array) === "function" ? _f : Object]),
         (0, tslib_1.__metadata)("design:returntype", Promise)
-    ], TableRenderer.prototype, "handleDragOver", null);
+    ], TableRenderer.prototype, "handleOrderChange", null);
+    (0, tslib_1.__decorate)([
+        helper_1.autobind,
+        (0, tslib_1.__metadata)("design:type", Function),
+        (0, tslib_1.__metadata)("design:paramtypes", []),
+        (0, tslib_1.__metadata)("design:returntype", Promise)
+    ], TableRenderer.prototype, "handleSaveOrder", null);
+    (0, tslib_1.__decorate)([
+        helper_1.autobind,
+        (0, tslib_1.__metadata)("design:type", Function),
+        (0, tslib_1.__metadata)("design:paramtypes", []),
+        (0, tslib_1.__metadata)("design:returntype", void 0)
+    ], TableRenderer.prototype, "reset", null);
     TableRenderer = TableRenderer_1 = (0, tslib_1.__decorate)([
         (0, factory_1.Renderer)({
             type: 'table-v2',
@@ -754,7 +805,7 @@ var TableRenderer = /** @class */ (function (_super) {
             name: 'table-v2',
             isolateScope: true
         }),
-        (0, tslib_1.__metadata)("design:paramtypes", [Object, typeof (_h = typeof Scoped_1.IScopedContext !== "undefined" && Scoped_1.IScopedContext) === "function" ? _h : Object])
+        (0, tslib_1.__metadata)("design:paramtypes", [Object, typeof (_g = typeof Scoped_1.IScopedContext !== "undefined" && Scoped_1.IScopedContext) === "function" ? _g : Object])
     ], TableRenderer);
     return TableRenderer;
 }(react_1.default.Component));