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

package/lib/components/table/HeadCellFilter.js.map

@@ -6,8 +6,8 @@
         "/src/components/table/HeadCellFilter.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "/**\n * @file table/HeadCellFilter\n * @author fex\n */\n\nimport React from 'react';\nimport {findDOMNode} from 'react-dom';\nimport isEqual from 'lodash/isEqual';\n\nimport {themeable, ThemeProps} from '../../theme';\nimport {LocaleProps, localeable} from '../../locale';\nimport HeadCellDropDown, {\n  FilterDropdownProps,\n  FilterPayload\n} from './HeadCellDropDown';\nimport CheckBox from '../Checkbox';\nimport Button from '../Button';\nimport {Icon} from '../icons';\n\nexport interface Props extends ThemeProps, LocaleProps {\n  column: any;\n  onFilter?: Function;\n  filteredValue?: Array<string>;\n  filterMultiple?: boolean;\n  popOverContainer?: () => Element | Text | null;\n}\n\nexport interface OptionProps {\n  text: string;\n  value: string;\n  selected?: boolean;\n  children?: Array<OptionProps>;\n}\n\nexport interface State {\n  options: Array<OptionProps>;\n  filteredValue: Array<string>;\n}\n\nexport class HeadCellFilter extends React.Component<Props, State> {\n  static defaultProps = {\n    filteredValue: [],\n    filterMultiple: false\n  };\n\n  constructor(props: Props) {\n    super(props);\n\n    this.state = {\n      options: [],\n      filteredValue: props.filteredValue || []\n    };\n  }\n\n  alterOptions(options: Array<any>) {\n    options = options.map(option => ({\n      ...option,\n      selected: this.state.filteredValue.indexOf(option.value) > -1\n    }));\n\n    return options;\n  }\n\n  componentDidMount() {\n    const {column} = this.props;\n    if (column.filters && column.filters.length > 0) {\n      this.setState({options: this.alterOptions(column.filters)});\n    }\n  }\n\n  componentDidUpdate(prevProps: Props, prevState: State) {\n    const {column} = this.props;\n    if (\n      column.filters &&\n      column.filters.length > 0 &&\n      !isEqual(prevState.filteredValue, this.state.filteredValue)\n    ) {\n      this.setState({options: this.alterOptions(column.filters)});\n    }\n  }\n\n  render() {\n    const {options} = this.state;\n    const {\n      column,\n      popOverContainer,\n      classnames: cx,\n      classPrefix: ns\n    } = this.props;\n\n    const filterProps = {\n      filterDropdown: (payload: FilterDropdownProps) => {\n        const {setSelectedKeys, selectedKeys, confirm, clearFilters} = payload;\n        return options && options.length > 0 ? (\n          <ul className={cx('DropDown-menu')}>\n            {!column.filterMultiple\n              ? options.map((option: any, index) => (\n                  <li\n                    key={index}\n                    className={cx({\n                      'is-active': option.selected\n                    })}\n                    onClick={() =>\n                      this.handleClick(confirm, setSelectedKeys, [option.value])\n                    }\n                  >\n                    {option.text}\n                  </li>\n                ))\n              : options.map((option: any, index) => (\n                  <li key={index}>\n                    <CheckBox\n                      classPrefix={ns}\n                      onChange={e =>\n                        this.handleCheck(\n                          confirm,\n                          setSelectedKeys,\n                          e ? [option.value] : option.value\n                        )\n                      }\n                      checked={option.selected}\n                    >\n                      {option.text}\n                    </CheckBox>\n                  </li>\n                ))}\n            {column.filterMultiple ? (\n              <li\n                key=\"dropDown-multiple-menu\"\n                className={cx('DropDown-multiple-menu')}\n              >\n                <Button\n                  size={'xs'}\n                  level={'primary'}\n                  onClick={() => this.handleConfirmClick(confirm)}\n                >\n                  确定\n                </Button>\n                <Button\n                  size={'xs'}\n                  onClick={() =>\n                    this.handleCancelClick(confirm, setSelectedKeys)\n                  }\n                >\n                  取消\n                </Button>\n              </li>\n            ) : null}\n          </ul>\n        ) : null;\n      },\n      setSelectedKeys: (keys: Array<string>) =>\n        this.setState({filteredValue: keys})\n    };\n\n    return (\n      <HeadCellDropDown\n        className={`${ns}TableCell-filterBtn`}\n        layerClassName={`${ns}TableCell-filterPopOver`}\n        filterIcon={<Icon icon=\"column-filter\" className=\"icon\" />}\n        active={\n          column.filtered ||\n          (options && options.some((item: any) => item.selected))\n        }\n        popOverContainer={\n          popOverContainer ? popOverContainer : () => findDOMNode(this)\n        }\n        selectedKeys={this.state.filteredValue}\n        {...filterProps}\n      ></HeadCellDropDown>\n    );\n  }\n\n  async handleClick(\n    confirm: (payload?: FilterPayload) => void,\n    setSelectedKeys?: (keys?: string | Array<string | number>) => void,\n    selectedKeys?: Array<string>\n  ) {\n    const {onFilter, column} = this.props;\n    const payload = {[column.key]: selectedKeys};\n\n    if (onFilter) {\n      const prevented = await onFilter(payload);\n      if (prevented) {\n        return;\n      }\n    }\n\n    setSelectedKeys && setSelectedKeys(selectedKeys);\n\n    onFilter && onFilter(payload);\n    confirm();\n  }\n\n  handleCheck(\n    confirm: (payload?: FilterPayload) => void,\n    setSelectedKeys?: (\n      keys: string | Array<string | number>\n    ) => void | undefined,\n    selectedKeys?: Array<string>\n  ) {\n    const filteredValue = this.state.filteredValue;\n    // 选中\n    if (Array.isArray(selectedKeys)) {\n      setSelectedKeys && setSelectedKeys([...filteredValue, ...selectedKeys]);\n    } else {\n      // 取消选中\n      setSelectedKeys &&\n        setSelectedKeys(filteredValue.filter(v => v !== selectedKeys));\n    }\n  }\n\n  handleConfirmClick(confirm: (payload?: FilterPayload) => void) {\n    const {onFilter, column} = this.props;\n    onFilter && onFilter({[column.key]: this.state.filteredValue});\n    confirm();\n  }\n\n  handleCancelClick(\n    confirm: (payload?: FilterPayload) => void,\n    setSelectedKeys?: (\n      keys: string | Array<string | number>\n    ) => void | undefined\n  ) {\n    setSelectedKeys && setSelectedKeys([]);\n    confirm();\n  }\n}\n\nexport default themeable(localeable(HeadCellFilter));\n"
+        "/**\n * @file table/HeadCellFilter\n * @author fex\n */\n\nimport React from 'react';\nimport {findDOMNode} from 'react-dom';\nimport isEqual from 'lodash/isEqual';\n\nimport {themeable, ThemeProps} from '../../theme';\nimport {LocaleProps, localeable} from '../../locale';\nimport HeadCellDropDown, {\n  FilterDropdownProps,\n  FilterPayload\n} from './HeadCellDropDown';\nimport CheckBox from '../Checkbox';\nimport Button from '../Button';\nimport {Icon} from '../icons';\n\nexport interface Props extends ThemeProps, LocaleProps {\n  column: any;\n  onFilter?: Function;\n  filteredValue?: Array<string>;\n  filterMultiple?: boolean;\n  popOverContainer?: () => Element | Text | null;\n}\n\nexport interface OptionProps {\n  text: string;\n  value: string;\n  selected?: boolean;\n  children?: Array<OptionProps>;\n}\n\nexport interface State {\n  options: Array<OptionProps>;\n  filteredValue: Array<string>;\n}\n\nexport class HeadCellFilter extends React.Component<Props, State> {\n  static defaultProps = {\n    filteredValue: [],\n    filterMultiple: false\n  };\n\n  constructor(props: Props) {\n    super(props);\n\n    this.state = {\n      options: [],\n      filteredValue: props.filteredValue || []\n    };\n  }\n\n  alterOptions(options: Array<any>) {\n    options = options.map(option => ({\n      ...option,\n      selected: this.state.filteredValue.indexOf(option.value) > -1\n    }));\n\n    return options;\n  }\n\n  componentDidMount() {\n    const {column} = this.props;\n    if (column.filters && column.filters.length > 0) {\n      this.setState({options: this.alterOptions(column.filters)});\n    }\n  }\n\n  componentDidUpdate(prevProps: Props, prevState: State) {\n    const {column} = this.props;\n    if (\n      column.filters &&\n      column.filters.length > 0 &&\n      !isEqual(prevState.filteredValue, this.state.filteredValue)\n    ) {\n      this.setState({options: this.alterOptions(column.filters)});\n    }\n  }\n\n  render() {\n    const {options} = this.state;\n    const {\n      column,\n      popOverContainer,\n      classnames: cx,\n      classPrefix: ns\n    } = this.props;\n\n    const filterProps = {\n      filterDropdown: (payload: FilterDropdownProps) => {\n        const {setSelectedKeys, selectedKeys, confirm, clearFilters} = payload;\n        return options && options.length > 0 ? (\n          <ul className={cx('DropDown-menu')}>\n            {!column.filterMultiple\n              ? options.map((option: any, index) => (\n                  <li\n                    key={index}\n                    className={cx({\n                      'is-active': option.selected\n                    })}\n                    onClick={() =>\n                      this.handleClick(confirm, setSelectedKeys, [option.value])\n                    }\n                  >\n                    {option.text}\n                  </li>\n                ))\n              : options.map((option: any, index) => (\n                  <li key={index}>\n                    <CheckBox\n                      classPrefix={ns}\n                      onChange={e =>\n                        this.handleCheck(\n                          confirm,\n                          setSelectedKeys,\n                          e ? [option.value] : option.value\n                        )\n                      }\n                      checked={option.selected}\n                    >\n                      {option.text}\n                    </CheckBox>\n                  </li>\n                ))}\n            {column.filterMultiple ? (\n              <li\n                key=\"dropDown-multiple-menu\"\n                className={cx('DropDown-multiple-menu')}\n              >\n                <Button\n                  size={'xs'}\n                  level={'primary'}\n                  onClick={() => this.handleConfirmClick(confirm)}\n                >\n                  确定\n                </Button>\n                <Button\n                  size={'xs'}\n                  onClick={() =>\n                    this.handleCancelClick(confirm, setSelectedKeys)\n                  }\n                >\n                  取消\n                </Button>\n              </li>\n            ) : null}\n          </ul>\n        ) : null;\n      },\n      setSelectedKeys: (keys: Array<string>) =>\n        this.setState({filteredValue: keys})\n    };\n\n    return (\n      <HeadCellDropDown\n        className={`${ns}TableCell-filterBtn`}\n        layerClassName={`${ns}TableCell-filterPopOver`}\n        filterIcon={<Icon icon=\"column-filter\" className=\"icon\" />}\n        active={\n          column.filtered ||\n          (options && options.some((item: any) => item.selected))\n        }\n        popOverContainer={\n          popOverContainer ? popOverContainer : () => findDOMNode(this)\n        }\n        selectedKeys={this.state.filteredValue}\n        {...filterProps}\n      ></HeadCellDropDown>\n    );\n  }\n\n  async handleClick(\n    confirm: (payload?: FilterPayload) => void,\n    setSelectedKeys?: (keys?: string | Array<string | number>) => void,\n    selectedKeys?: Array<string>\n  ) {\n    const {onFilter, column} = this.props;\n    const payload = {[column.key]: selectedKeys};\n\n    if (onFilter) {\n      const prevented = await onFilter({\n        filterName: column.key,\n        filterValue: selectedKeys?.join(',')\n      });\n      if (prevented) {\n        return;\n      }\n    }\n\n    setSelectedKeys && setSelectedKeys(selectedKeys);\n\n    onFilter && onFilter(payload);\n    confirm();\n  }\n\n  handleCheck(\n    confirm: (payload?: FilterPayload) => void,\n    setSelectedKeys?: (\n      keys: string | Array<string | number>\n    ) => void | undefined,\n    selectedKeys?: Array<string>\n  ) {\n    const filteredValue = this.state.filteredValue;\n    // 选中\n    if (Array.isArray(selectedKeys)) {\n      setSelectedKeys && setSelectedKeys([...filteredValue, ...selectedKeys]);\n    } else {\n      // 取消选中\n      setSelectedKeys &&\n        setSelectedKeys(filteredValue.filter(v => v !== selectedKeys));\n    }\n  }\n\n  handleConfirmClick(confirm: (payload?: FilterPayload) => void) {\n    const {onFilter, column} = this.props;\n    onFilter && onFilter({[column.key]: this.state.filteredValue});\n    confirm();\n  }\n\n  handleCancelClick(\n    confirm: (payload?: FilterPayload) => void,\n    setSelectedKeys?: (\n      keys: string | Array<string | number>\n    ) => void | undefined\n  ) {\n    setSelectedKeys && setSelectedKeys([]);\n    confirm();\n  }\n}\n\nexport default themeable(localeable(HeadCellFilter));\n"
     ]
 }

package/lib/components/table/HeadCellSort.js

@@ -26,32 +26,38 @@ var HeadCellSort = /** @class */ (function (_super) {
         return (react_1.default.createElement("span", { className: cx('TableCell-sortBtn'), onClick: function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
                 var sortPayload, prevented;
                 return (0, tslib_1.__generator)(this, function (_a) {
-                    sortPayload = {};
-                    if (column.key === this.state.orderBy) {
-                        if (this.state.order === 'descend') {
-                            // 降序改为取消
-                            sortPayload = { orderBy: '', order: 'ascend' };
-                        }
-                        else {
-                            // 升序之后降序
-                            sortPayload = { order: 'descend' };
-                        }
-                    }
-                    else {
-                        // 默认先升序
-                        sortPayload = { orderBy: column.key, order: 'ascend' };
-                    }
-                    if (onSort) {
-                        prevented = onSort({
-                            orderBy: this.state.orderBy,
-                            order: this.state.order
-                        });
-                        if (prevented) {
+                    switch (_a.label) {
+                        case 0:
+                            sortPayload = {};
+                            if (column.key === this.state.orderBy) {
+                                if (this.state.order === 'descend') {
+                                    // 降序改为取消
+                                    sortPayload = { orderBy: '', order: 'ascend' };
+                                }
+                                else {
+                                    // 升序之后降序
+                                    sortPayload = { order: 'descend' };
+                                }
+                            }
+                            else {
+                                // 默认先升序
+                                sortPayload = { orderBy: column.key, order: 'ascend' };
+                            }
+                            if (!onSort) return [3 /*break*/, 2];
+                            return [4 /*yield*/, onSort({
+                                    orderBy: this.state.orderBy,
+                                    order: this.state.order
+                                })];
+                        case 1:
+                            prevented = _a.sent();
+                            if (prevented) {
+                                return [2 /*return*/];
+                            }
+                            _a.label = 2;
+                        case 2:
+                            this.setState(sortPayload);
                             return [2 /*return*/];
-                        }
                     }
-                    this.setState(sortPayload);
-                    return [2 /*return*/];
                 });
             }); } },
             react_1.default.createElement("i", { className: cx('TableCell-sortBtn--down', this.state.orderBy === column.key && this.state.order === 'descend'

package/lib/components/table/HeadCellSort.js.map

@@ -6,8 +6,8 @@
         "/src/components/table/HeadCellSort.tsx"
     ],
     "names": [],
-    "mappings": ";AAAA;;;GAGG;;;;AAEH,6DAA0B;AAE1B,qCAAkD;AAClD,uCAAqD;AACrD,kCAA8B;AAY9B;IAAkC,6CAA6B;IAC7D,sBAAY,KAAY;QAAxB,YACE,kBAAM,KAAK,CAAC,SAMb;QAJC,KAAI,CAAC,KAAK,GAAG;YACX,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;SACZ,CAAC;;IACJ,CAAC;IAED,6BAAM,GAAN;QAAA,iBAgEC;QA/DO,IAAA,KAAmC,IAAI,CAAC,KAAK,EAA5C,MAAM,YAAA,EAAE,MAAM,YAAA,EAAc,EAAE,gBAAc,CAAC;QAEpD,OAAO,CACL,wCACE,SAAS,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAClC,OAAO,EAAE;;;oBACH,WAAW,GAAG,EAAE,CAAC;oBACrB,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;wBACrC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;4BAClC,SAAS;4BACT,WAAW,GAAG,EAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC;yBAC9C;6BAAM;4BACL,SAAS;4BACT,WAAW,GAAG,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC;yBAClC;qBACF;yBAAM;wBACL,QAAQ;wBACR,WAAW,GAAG,EAAC,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC;qBACtD;oBAED,IAAI,MAAM,EAAE;wBACJ,SAAS,GAAG,MAAM,CAAC;4BACvB,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;4BAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;yBACxB,CAAC,CAAC;wBACH,IAAI,SAAS,EAAE;4BACb,sBAAO;yBACR;qBACF;oBAED,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;;;iBAC5B;YAED,qCACE,SAAS,EAAE,EAAE,CACX,yBAAyB,EACzB,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS;oBACjE,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,EAAE,CACP;gBAED,8BAAC,YAAI,IAAC,IAAI,EAAC,WAAW,EAAC,SAAS,EAAC,MAAM,GAAG,CACxC;YACJ,qCACE,SAAS,EAAE,EAAE,CACX,uBAAuB,EACvB,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ;oBAChE,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,EAAE,CACP;gBAED,8BAAC,YAAI,IAAC,IAAI,EAAC,UAAU,EAAC,SAAS,EAAC,MAAM,GAAG,CACvC;YACJ,qCACE,SAAS,EAAE,EAAE,CACX,4BAA4B,EAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACrD;gBAED,8BAAC,YAAI,IAAC,IAAI,EAAC,cAAc,EAAC,SAAS,EAAC,MAAM,GAAG,CAC3C,CACC,CACR,CAAC;IACJ,CAAC;IACH,mBAAC;AAAD,CAAC,AA3ED,CAAkC,eAAK,CAAC,SAAS,GA2EhD;AA3EY,oCAAY;AA6EzB,kBAAe,IAAA,iBAAS,EAAC,IAAA,mBAAU,EAAC,YAAY,CAAC,CAAC,CAAC",
+    "mappings": ";AAAA;;;GAGG;;;;AAEH,6DAA0B;AAE1B,qCAAkD;AAClD,uCAAqD;AACrD,kCAA8B;AAY9B;IAAkC,6CAA6B;IAC7D,sBAAY,KAAY;QAAxB,YACE,kBAAM,KAAK,CAAC,SAMb;QAJC,KAAI,CAAC,KAAK,GAAG;YACX,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,EAAE;SACZ,CAAC;;IACJ,CAAC;IAED,6BAAM,GAAN;QAAA,iBAgEC;QA/DO,IAAA,KAAmC,IAAI,CAAC,KAAK,EAA5C,MAAM,YAAA,EAAE,MAAM,YAAA,EAAc,EAAE,gBAAc,CAAC;QAEpD,OAAO,CACL,wCACE,SAAS,EAAE,EAAE,CAAC,mBAAmB,CAAC,EAClC,OAAO,EAAE;;;;;4BACH,WAAW,GAAG,EAAE,CAAC;4BACrB,IAAI,MAAM,CAAC,GAAG,KAAK,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gCACrC,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE;oCAClC,SAAS;oCACT,WAAW,GAAG,EAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC;iCAC9C;qCAAM;oCACL,SAAS;oCACT,WAAW,GAAG,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC;iCAClC;6BACF;iCAAM;gCACL,QAAQ;gCACR,WAAW,GAAG,EAAC,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC;6BACtD;iCAEG,MAAM,EAAN,wBAAM;4BACU,qBAAM,MAAM,CAAC;oCAC7B,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;oCAC3B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;iCACxB,CAAC,EAAA;;4BAHI,SAAS,GAAG,SAGhB;4BACF,IAAI,SAAS,EAAE;gCACb,sBAAO;6BACR;;;4BAGH,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;;;;iBAC5B;YAED,qCACE,SAAS,EAAE,EAAE,CACX,yBAAyB,EACzB,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,SAAS;oBACjE,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,EAAE,CACP;gBAED,8BAAC,YAAI,IAAC,IAAI,EAAC,WAAW,EAAC,SAAS,EAAC,MAAM,GAAG,CACxC;YACJ,qCACE,SAAS,EAAE,EAAE,CACX,uBAAuB,EACvB,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ;oBAChE,CAAC,CAAC,WAAW;oBACb,CAAC,CAAC,EAAE,CACP;gBAED,8BAAC,YAAI,IAAC,IAAI,EAAC,UAAU,EAAC,SAAS,EAAC,MAAM,GAAG,CACvC;YACJ,qCACE,SAAS,EAAE,EAAE,CACX,4BAA4B,EAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,KAAK,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CACrD;gBAED,8BAAC,YAAI,IAAC,IAAI,EAAC,cAAc,EAAC,SAAS,EAAC,MAAM,GAAG,CAC3C,CACC,CACR,CAAC;IACJ,CAAC;IACH,mBAAC;AAAD,CAAC,AA3ED,CAAkC,eAAK,CAAC,SAAS,GA2EhD;AA3EY,oCAAY;AA6EzB,kBAAe,IAAA,iBAAS,EAAC,IAAA,mBAAU,EAAC,YAAY,CAAC,CAAC,CAAC",
     "sourcesContent": [
-        "/**\n * @file table/HeadCellSort\n * @author fex\n */\n\nimport React from 'react';\n\nimport {themeable, ThemeProps} from '../../theme';\nimport {LocaleProps, localeable} from '../../locale';\nimport {Icon} from '../icons';\n\nexport interface Props extends ThemeProps, LocaleProps {\n  column: any;\n  onSort?: Function;\n}\n\nexport interface State {\n  order: string; // 升序还是降序\n  orderBy: string; // 一次只能按一列排序 当前列的key\n}\n\nexport class HeadCellSort extends React.Component<Props, State> {\n  constructor(props: Props) {\n    super(props);\n\n    this.state = {\n      order: '',\n      orderBy: ''\n    };\n  }\n\n  render() {\n    const {column, onSort, classnames: cx} = this.props;\n\n    return (\n      <span\n        className={cx('TableCell-sortBtn')}\n        onClick={async () => {\n          let sortPayload = {};\n          if (column.key === this.state.orderBy) {\n            if (this.state.order === 'descend') {\n              // 降序改为取消\n              sortPayload = {orderBy: '', order: 'ascend'};\n            } else {\n              // 升序之后降序\n              sortPayload = {order: 'descend'};\n            }\n          } else {\n            // 默认先升序\n            sortPayload = {orderBy: column.key, order: 'ascend'};\n          }\n\n          if (onSort) {\n            const prevented = onSort({\n              orderBy: this.state.orderBy,\n              order: this.state.order\n            });\n            if (prevented) {\n              return;\n            }\n          }\n\n          this.setState(sortPayload);\n        }}\n      >\n        <i\n          className={cx(\n            'TableCell-sortBtn--down',\n            this.state.orderBy === column.key && this.state.order === 'descend'\n              ? 'is-active'\n              : ''\n          )}\n        >\n          <Icon icon=\"sort-desc\" className=\"icon\" />\n        </i>\n        <i\n          className={cx(\n            'TableCell-sortBtn--up',\n            this.state.orderBy === column.key && this.state.order === 'ascend'\n              ? 'is-active'\n              : ''\n          )}\n        >\n          <Icon icon=\"sort-asc\" className=\"icon\" />\n        </i>\n        <i\n          className={cx(\n            'TableCell-sortBtn--default',\n            this.state.orderBy === column.key ? '' : 'is-active'\n          )}\n        >\n          <Icon icon=\"sort-default\" className=\"icon\" />\n        </i>\n      </span>\n    );\n  }\n}\n\nexport default themeable(localeable(HeadCellSort));\n"
+        "/**\n * @file table/HeadCellSort\n * @author fex\n */\n\nimport React from 'react';\n\nimport {themeable, ThemeProps} from '../../theme';\nimport {LocaleProps, localeable} from '../../locale';\nimport {Icon} from '../icons';\n\nexport interface Props extends ThemeProps, LocaleProps {\n  column: any;\n  onSort?: Function;\n}\n\nexport interface State {\n  order: string; // 升序还是降序\n  orderBy: string; // 一次只能按一列排序 当前列的key\n}\n\nexport class HeadCellSort extends React.Component<Props, State> {\n  constructor(props: Props) {\n    super(props);\n\n    this.state = {\n      order: '',\n      orderBy: ''\n    };\n  }\n\n  render() {\n    const {column, onSort, classnames: cx} = this.props;\n\n    return (\n      <span\n        className={cx('TableCell-sortBtn')}\n        onClick={async () => {\n          let sortPayload = {};\n          if (column.key === this.state.orderBy) {\n            if (this.state.order === 'descend') {\n              // 降序改为取消\n              sortPayload = {orderBy: '', order: 'ascend'};\n            } else {\n              // 升序之后降序\n              sortPayload = {order: 'descend'};\n            }\n          } else {\n            // 默认先升序\n            sortPayload = {orderBy: column.key, order: 'ascend'};\n          }\n\n          if (onSort) {\n            const prevented = await onSort({\n              orderBy: this.state.orderBy,\n              order: this.state.order\n            });\n            if (prevented) {\n              return;\n            }\n          }\n\n          this.setState(sortPayload);\n        }}\n      >\n        <i\n          className={cx(\n            'TableCell-sortBtn--down',\n            this.state.orderBy === column.key && this.state.order === 'descend'\n              ? 'is-active'\n              : ''\n          )}\n        >\n          <Icon icon=\"sort-desc\" className=\"icon\" />\n        </i>\n        <i\n          className={cx(\n            'TableCell-sortBtn--up',\n            this.state.orderBy === column.key && this.state.order === 'ascend'\n              ? 'is-active'\n              : ''\n          )}\n        >\n          <Icon icon=\"sort-asc\" className=\"icon\" />\n        </i>\n        <i\n          className={cx(\n            'TableCell-sortBtn--default',\n            this.state.orderBy === column.key ? '' : 'is-active'\n          )}\n        >\n          <Icon icon=\"sort-default\" className=\"icon\" />\n        </i>\n      </span>\n    );\n  }\n}\n\nexport default themeable(localeable(HeadCellSort));\n"
     ]
 }

package/lib/components/table/index.d.ts

@@ -143,6 +143,7 @@ export declare class Table extends React.PureComponent<TableProps, TableState> {
     thColumns: Array<Array<ThProps>>;
     tdColumns: Array<TdProps>;
     selectedRows: Array<any>;
+    unSelectedRows: Array<any>;
     sortable: Sortable;
     resizeStart: number;
     resizeKey: string;
@@ -155,13 +156,15 @@ export declare class Table extends React.PureComponent<TableProps, TableState> {
     tfootDom: React.RefObject<HTMLTableSectionElement>;
     footDom: React.RefObject<HTMLDivElement>;
     getColWidths(): any[];
-    getSelectedRows(dataSource: Array<any>, selectedRowKeys: Array<string | number>): any[];
+    getSelectedRows(dataSource: Array<any>, selectedRowKeys: Array<string | number>): {
+        selectedRows: any[];
+        unSelectedRows: any[];
+    };
     updateTableBodyFixed(): void;
     updateColWidths(): void;
     componentDidMount(): void;
     componentDidUpdate(prevProps: TableProps, prevState: TableState): void;
     componentWillUnmount(): void;
-    exchange(fromIndex: number, toIndex: number, item: any): any[];
     initDragging(): void;
     destroyDragging(): void;
     updateStickyHeader(): void;
@@ -176,7 +179,7 @@ export declare class Table extends React.PureComponent<TableProps, TableState> {
     onResizeMouseDown(event: React.MouseEvent<any>, key: string): void;
     onResizeMouseUp(event: React.MouseEvent<any>): void;
     renderTHead(): JSX.Element;
-    onRowClick(event: React.ChangeEvent<any>, record?: any, rowIndex?: number): void;
+    onRowClick(event: React.ChangeEvent<any>, record?: any, rowIndex?: number): Promise<void>;
     onRowMouseEnter(event: React.ChangeEvent<any>, record?: any, rowIndex?: number): void;
     onRowMouseLeave(event: React.ChangeEvent<any>, record?: any, rowIndex?: number): void;
     onMouseLeave(event: React.ChangeEvent<any>): void;

package/lib/components/table/index.js

@@ -13,7 +13,6 @@ var find_1 = (0, tslib_1.__importDefault)(require("lodash/find"));
 var isEqual_1 = (0, tslib_1.__importDefault)(require("lodash/isEqual"));
 var filter_1 = (0, tslib_1.__importDefault)(require("lodash/filter"));
 var intersection_1 = (0, tslib_1.__importDefault)(require("lodash/intersection"));
-var cloneDeep_1 = (0, tslib_1.__importDefault)(require("lodash/cloneDeep"));
 var sortablejs_1 = (0, tslib_1.__importDefault)(require("sortablejs"));
 var theme_1 = require("../../theme");
 var locale_1 = require("../../locale");
@@ -142,9 +141,11 @@ var Table = /** @class */ (function (_super) {
         _this.bodyDom = react_1.default.createRef();
         _this.tfootDom = react_1.default.createRef();
         _this.footDom = react_1.default.createRef();
-        _this.selectedRows = props.rowSelection
-            ? _this.getSelectedRows(props.dataSource, (_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.selectedRowKeys)
-            : [];
+        if (props.rowSelection) {
+            var selectedResult = _this.getSelectedRows(props.dataSource, (_a = props.rowSelection) === null || _a === void 0 ? void 0 : _a.selectedRowKeys);
+            _this.selectedRows = selectedResult.selectedRows;
+            _this.unSelectedRows = selectedResult.unSelectedRows;
+        }
         _this.state = {
             selectedRowKeys: props.rowSelection
                 ? props.rowSelection.selectedRowKeys.map(function (key) { return key; }) || []
@@ -176,12 +177,16 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.getSelectedRows = function (dataSource, selectedRowKeys) {
         var _this = this;
         var selectedRows = [];
+        var unSelectedRows = [];
         dataSource.forEach(function (data) {
             if ((0, find_1.default)(selectedRowKeys, function (key) { return key === data[_this.getRowSelectionKeyField()]; })) {
                 selectedRows.push(data);
             }
+            else {
+                unSelectedRows.push(data);
+            }
         });
-        return selectedRows;
+        return { selectedRows: selectedRows, unSelectedRows: unSelectedRows };
     };
     Table.prototype.updateTableBodyFixed = function () {
         var tbodyDom = this.tbodyDom && this.tbodyDom.current;
@@ -261,7 +266,9 @@ var Table = /** @class */ (function (_super) {
         // 选择项发生了变化触发
         if (!(0, isEqual_1.default)(prevState.selectedRowKeys, this.state.selectedRowKeys)) {
             // 更新保存的已选择行数据
-            this.selectedRows = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+            var selectedResult = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+            this.selectedRows = selectedResult.selectedRows;
+            this.unSelectedRows = selectedResult.unSelectedRows;
             var rowSelection = this.props.rowSelection;
             rowSelection &&
                 rowSelection.onChange &&
@@ -276,7 +283,9 @@ var Table = /** @class */ (function (_super) {
                 this.setState({
                     selectedRowKeys: this.props.rowSelection.selectedRowKeys
                 });
-                this.selectedRows = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+                var selectedResult = this.getSelectedRows(this.state.dataSource, this.state.selectedRowKeys);
+                this.selectedRows = selectedResult.selectedRows;
+                this.unSelectedRows = selectedResult.unSelectedRows;
             }
         }
         // 外部传入的展开项发生了变化
@@ -324,31 +333,6 @@ var Table = /** @class */ (function (_super) {
         });
         this.destroyDragging();
     };
-    Table.prototype.exchange = function (fromIndex, toIndex, item) {
-        var _a = this.props, scroll = _a.scroll, headSummary = _a.headSummary;
-        // 如果有头部总结行 fromIndex就会+1
-        if ((!scroll || (scroll && !scroll.y)) && headSummary) {
-            fromIndex = fromIndex - 1;
-        }
-        var index = toIndex - fromIndex;
-        var levels = item.getAttribute('row-levels');
-        var rowIndex = +item.getAttribute('row-index');
-        var dataSource = (0, cloneDeep_1.default)(this.state.dataSource);
-        var levelsArray = levels ? levels.split(',') : [];
-        var childrenColumnName = this.getChildrenColumnName();
-        var data = dataSource;
-        var i = 0;
-        while (i < levelsArray.length) {
-            data = data[levelsArray[i]][childrenColumnName];
-            i++;
-        }
-        if (data && data.length > 0) {
-            var row = (0, cloneDeep_1.default)(data[rowIndex]);
-            data.splice(rowIndex, 1);
-            data.splice(rowIndex + index, 0, row);
-        }
-        return data;
-    };
     Table.prototype.initDragging = function () {
         var _this = this;
         var _a = this.props, cx = _a.classnames, onDrag = _a.onDrag;
@@ -374,26 +358,15 @@ var Table = /** @class */ (function (_super) {
                 return true;
             },
             onEnd: function (e) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
-                var onDrag, data, prevented;
+                var rowLevels;
                 return (0, tslib_1.__generator)(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            // 没有移动
-                            if (e.newIndex === e.oldIndex) {
-                                return [2 /*return*/];
-                            }
-                            onDrag = this.props.onDrag;
-                            if (!onDrag) return [3 /*break*/, 2];
-                            data = this.exchange(e.oldIndex, e.newIndex, e.item);
-                            return [4 /*yield*/, onDrag(data)];
-                        case 1:
-                            prevented = _a.sent();
-                            if (prevented) {
-                                return [2 /*return*/];
-                            }
-                            _a.label = 2;
-                        case 2: return [2 /*return*/];
+                    // 没有移动
+                    if (e.newIndex === e.oldIndex) {
+                        return [2 /*return*/];
                     }
+                    rowLevels = e.item.getAttribute('row-levels');
+                    onDrag && onDrag(e.oldIndex, e.newIndex, rowLevels ? rowLevels.split(',') : []);
+                    return [2 /*return*/];
                 });
             }); }
         });
@@ -670,7 +643,7 @@ var Table = /** @class */ (function (_super) {
                                             selectedRows = value ? allRows : [];
                                             selectedRowKeys = value ? allRowKeys : [];
                                             if (!onSelectAll) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, onSelectAll(value, selectedRowKeys, selectedRows, changeRows)];
+                                            return [4 /*yield*/, onSelectAll(selectedRows, value ? [] : selectedRows, changeRows)];
                                         case 1:
                                             prevented = _a.sent();
                                             if (prevented) {
@@ -727,15 +700,30 @@ var Table = /** @class */ (function (_super) {
         })));
     };
     Table.prototype.onRowClick = function (event, record, rowIndex) {
-        var _a = this.props, rowSelection = _a.rowSelection, onRow = _a.onRow;
-        if (rowSelection && rowSelection.type && rowSelection.rowClick) {
-            var defaultKey_1 = this.getRowSelectionKeyField();
-            var isSelected = !!(0, find_1.default)(this.state.selectedRowKeys, function (key) { return key === record[defaultKey_1]; });
-            this.selectedSingleRow(!isSelected, record);
-        }
-        if (record && onRow) {
-            onRow.onRowClick && onRow.onRowClick(event, record, rowIndex);
-        }
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a, rowSelection, onRow, prevented, defaultKey_1, isSelected;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this.props, rowSelection = _a.rowSelection, onRow = _a.onRow;
+                        if (!(onRow && onRow.onRowClick)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, onRow.onRowClick(event, record, rowIndex)];
+                    case 1:
+                        prevented = _b.sent();
+                        if (prevented) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 2;
+                    case 2:
+                        if (rowSelection && rowSelection.type && rowSelection.rowClick) {
+                            defaultKey_1 = this.getRowSelectionKeyField();
+                            isSelected = !!(0, find_1.default)(this.state.selectedRowKeys, function (key) { return key === record[defaultKey_1]; });
+                            this.selectedSingleRow(!isSelected, record);
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
     };
     Table.prototype.onRowMouseEnter = function (event, record, rowIndex) {
         var _a = this.props, cx = _a.classnames, onRow = _a.onRow;
@@ -855,7 +843,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.selectedSingleRow = function (value, data) {
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var _a, rowSelection, onSelect, defaultKey, isRadio, prevented;
+            var _a, rowSelection, onSelect, defaultKey, isRadio, selectedRowKeys, selectedResult, prevented;
             var _this = this;
             return (0, tslib_1.__generator)(this, function (_b) {
                 switch (_b.label) {
@@ -863,36 +851,35 @@ var Table = /** @class */ (function (_super) {
                         _a = this.props, rowSelection = _a.rowSelection, onSelect = _a.onSelect;
                         defaultKey = this.getRowSelectionKeyField();
                         isRadio = rowSelection && rowSelection.type === 'radio';
-                        if (!onSelect) return [3 /*break*/, 2];
-                        return [4 /*yield*/, onSelect(data, value, this.selectedRows, this.state.selectedRowKeys)];
-                    case 1:
-                        prevented = _b.sent();
-                        if (prevented) {
-                            return [2 /*return*/];
-                        }
-                        _b.label = 2;
-                    case 2:
+                        selectedRowKeys = [];
                         if (value) {
                             if (isRadio) {
-                                this.setState({ selectedRowKeys: [data[defaultKey]] });
+                                selectedRowKeys = [data[defaultKey]];
                             }
                             else {
-                                this.setState(function (prevState) { return ({
-                                    selectedRowKeys: (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], prevState.selectedRowKeys, true), [
-                                        data[defaultKey]
-                                    ], false), _this.getDataChildrenKeys(data), true).filter(function (key, i, a) { return a.indexOf(key) === i; })
-                                }); });
+                                selectedRowKeys = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], this.state.selectedRowKeys, true), [
+                                    data[defaultKey]
+                                ], false), this.getDataChildrenKeys(data), true).filter(function (key, i, a) { return a.indexOf(key) === i; });
                             }
                         }
                         else {
                             if (!isRadio) {
-                                this.setState({
-                                    selectedRowKeys: this.state.selectedRowKeys.filter(function (key) {
-                                        return !(0, tslib_1.__spreadArray)([data[defaultKey]], _this.getDataChildrenKeys(data), true).includes(key);
-                                    })
+                                selectedRowKeys = this.state.selectedRowKeys.filter(function (key) {
+                                    return !(0, tslib_1.__spreadArray)([data[defaultKey]], _this.getDataChildrenKeys(data), true).includes(key);
                                 });
                             }
                         }
+                        if (!onSelect) return [3 /*break*/, 2];
+                        selectedResult = this.getSelectedRows(this.state.dataSource, selectedRowKeys);
+                        return [4 /*yield*/, onSelect(selectedResult.selectedRows, selectedRowKeys, selectedResult.unSelectedRows)];
+                    case 1:
+                        prevented = _b.sent();
+                        if (prevented) {
+                            return [2 /*return*/];
+                        }
+                        _b.label = 2;
+                    case 2:
+                        this.setState({ selectedRowKeys: selectedRowKeys });
                         return [2 /*return*/];
                 }
             });
@@ -900,7 +887,7 @@ var Table = /** @class */ (function (_super) {
     };
     Table.prototype.renderRow = function (data, rowIndex, levels) {
         var _this = this;
-        var _a = this.props, cx = _a.classnames, rowSelection = _a.rowSelection, expandable = _a.expandable, draggable = _a.draggable, indentSize = _a.indentSize, rowClassName = _a.rowClassName, lineHeight = _a.lineHeight // 是否设置了固定行高
+        var _a = this.props, cx = _a.classnames, rowSelection = _a.rowSelection, expandable = _a.expandable, draggable = _a.draggable, indentSize = _a.indentSize, rowClassName = _a.rowClassName, keyField = _a.keyField, lineHeight = _a.lineHeight // 是否设置了固定行高
         ;
         var tdColumns = this.tdColumns;
         var isExpandable = this.isExpandableTable();
@@ -970,14 +957,15 @@ var Table = /** @class */ (function (_super) {
         })) : null;
         var isChecked = !!(0, find_1.default)(this.state.selectedRowKeys, function (key) { return key === data[defaultKey]; });
         var hasChildrenChecked = this.hasCheckedChildrenRows(data);
+        var isRadio = rowSelection && rowSelection.type === 'radio';
         return [
-            react_1.default.createElement("tr", { key: rowIndex, "row-index": rowIndex, "row-levels": levels.join(','), className: cx('Table-row', "Table-row-level-".concat(levels.length), rowClassNameClass, {
+            react_1.default.createElement("tr", { key: "".concat(data[keyField || 'key'] || rowIndex), "row-index": rowIndex, "row-levels": levels.join(','), className: cx('Table-row', "Table-row-level-".concat(levels.length), rowClassNameClass, {
                     'Table-row-disabled': !!checkboxProps.disabled
                 }), onMouseEnter: function (e) { return _this.onRowMouseEnter(e, data, rowIndex); }, onMouseLeave: function (e) { return _this.onRowMouseLeave(e, data, rowIndex); }, onClick: function (e) { return _this.onRowClick(e, data, rowIndex); } },
                 draggable ? (react_1.default.createElement(Cell_1.default, { className: cx('Table-dragCell') },
                     react_1.default.createElement(icons_1.Icon, { icon: "drag-bar", className: "icon" }))) : null,
                 !draggable && rowSelection ? (react_1.default.createElement(Cell_1.default, { fixed: rowSelection.fixed ? 'left' : '', className: cx('Table-checkCell') },
-                    react_1.default.createElement(Checkbox_1.default, (0, tslib_1.__assign)({ name: 'Table-checkbox', type: rowSelection.type || 'checkbox', partial: hasChildrenChecked && !isChecked, checked: hasChildrenChecked || isChecked, onChange: function (value, shift) {
+                    react_1.default.createElement(Checkbox_1.default, (0, tslib_1.__assign)({ name: 'Table-checkbox', type: rowSelection.type || 'checkbox', partial: !isRadio && hasChildrenChecked && !isChecked, checked: isRadio ? isChecked : (hasChildrenChecked || isChecked), onChange: function (value, shift) {
                             if (!(rowSelection && rowSelection.rowClick)) {
                                 _this.selectedSingleRow(value, data);
                             }
@@ -1004,9 +992,7 @@ var Table = /** @class */ (function (_super) {
                 react_1.default.createElement(Cell_1.default, { colSpan: tdColumns.length + colCount },
                     react_1.default.createElement("div", { className: cx('Table-empty') }, typeof placeholder === 'function'
                         ? placeholder()
-                        : placeholder)))) : (this.state.dataSource.map(function (data, index) {
-                return _this.renderRow(data, index, []);
-            }))));
+                        : placeholder)))) : (this.state.dataSource.map(function (data, index) { return _this.renderRow(data, index, []); }))));
     };
     Table.prototype.isExpandableTable = function () {
         var expandable = this.props.expandable;