@ccs-ui/rc-pro 2.3.6-alpha-3 → 2.3.6-alpha-5

package/es/ccs.d.ts

@@ -52,8 +52,6 @@ type TableInstance<T = any> = {
     searchParam: Record<string, any>;
     /** 获取当前表单数据 */
     data: TableData<T>;
-    /** 获取当前选中的数据 */
-    selectedRows: T[];
     /** 查询数据，根据条件，从第一页开始显示 */
     onSearch: () => void;
     /** 刷新数据、根据条件，当前页 */
@@ -64,8 +62,6 @@ type TableInstance<T = any> = {
     onReset: () => void;
     /** 改变data 数据 */
     onChangeData: React.Dispatch<React.SetStateAction<TableDataType<T>>>;
-    /** 清空选中的数据 */
-    onClearSelected: (key?: React.Key) => void;
 };
 type AuthButtonItem = {
     key: string;

package/es/date-picker/index.js

@@ -12,6 +12,25 @@ import { DatePicker } from 'antd';
 import dayjs from 'dayjs';
 import _isArray from 'lodash.isarray';
 import { jsx as _jsx } from "react/jsx-runtime";
+var rangePresets = [{
+  label: '今天',
+  value: [dayjs().startOf('day'), dayjs().endOf('day')]
+}, {
+  label: '最近3天',
+  value: [dayjs().add(-3, 'd'), dayjs()]
+}, {
+  label: '最近7天',
+  value: [dayjs().add(-7, 'd'), dayjs()]
+}, {
+  label: '最近14天',
+  value: [dayjs().add(-14, 'd'), dayjs()]
+}, {
+  label: '最近30天',
+  value: [dayjs().add(-30, 'd'), dayjs()]
+}, {
+  label: '最近90天',
+  value: [dayjs().add(-90, 'd'), dayjs()]
+}];
 function CcsDatePicker(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
@@ -41,6 +60,7 @@ function RangePicker(_ref2) {
     if (onChange) onChange(dateString || undefined);
   };
   return /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread({
+    presets: restProps.picker === 'date' || !restProps.picker ? rangePresets : undefined,
     value: getDateValue(),
     onChange: handleOnChange
   }, restProps));

package/es/ellipsis/index.js

@@ -114,8 +114,10 @@ var Ellipsis = function Ellipsis(p) {
       },
       placement: "bottomLeft",
       destroyTooltipOnHide: true,
-      overlayInnerStyle: {
-        whiteSpace: 'normal'
+      styles: {
+        body: {
+          whiteSpace: 'normal'
+        }
       },
       children: renderNode
     });

package/es/hooks/use-selection.js

@@ -128,8 +128,8 @@ export default function useTableSelection(props) {
     // 未传入key，删除全部
     if (!key) {
       selectionRef.current = {
-        selectedRowKeys: undefined,
-        selectedRows: undefined,
+        selectedRowKeys: [],
+        selectedRows: [],
         info: {
           type: 'none'
         }
@@ -160,6 +160,7 @@ export default function useTableSelection(props) {
   return _objectSpread(_objectSpread({}, selectionRef.current), {}, {
     onChange: onChange,
     onClear: onClear,
-    type: type
+    type: type,
+    preserveSelectedRowKeys: true
   });
 }

package/es/pro-table/table.d.ts

@@ -29,18 +29,7 @@ export type TableColumn<RecordType = any> = (Omit<ColumnGroupType<RecordType>, '
     /** 省略显示行数,最大支持10行 */
     ellipsis?: Omit<EllipsisProps, 'content'> | boolean | number;
 };
-type TableTitleType<T> = {
-    /** 选中Key */
-    selectedRowKeys?: React.Key[];
-    /** 选中记录 */
-    selectedRows?: T[];
-    /** table datasource */
-    data: T[];
-    /** 清空选择,传入key取消指定选中，否清空所有 */
-    onClear: (key?: React.Key) => void;
-};
-export type TableExtraNode<T> = ReactNode | (({ selectedRowKeys, selectedRows, data, onClear, }: TableTitleType<T>) => ReactNode);
-export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title' | 'summary'> & {
+export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'summary'> & {
     data?: CCS.TableData<T>;
     /** 为空时,默认一条数据 */
     emptyDefaultOne?: boolean;
@@ -58,8 +47,6 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title' | 'summar
     hideOperation?: boolean;
     /** 列配置 */
     columns?: TableColumns<T>;
-    /** table title  */
-    title?: TableExtraNode<T>;
     /** table summary */
     summary?: (data: readonly T[], columns: TableColumn<T>[]) => React.ReactNode;
 };
@@ -78,7 +65,7 @@ export type CcsProTableProps<RecordType = any> = Pick<PropsWithCss, 'className'>
     /** 查询form 初始值 */
     formInitValues?: ParamType;
     /** 按钮 操作部分 */
-    toolbar?: TableExtraNode<RecordType>;
+    toolbar?: ReactNode;
     /** 边框 */
     bordered?: boolean;
     /** 展开查询条件，默认false */

package/es/pro-table/table.js

@@ -1,7 +1,4 @@
-var _excluded = ["selectedRowKeys", "onChange"];
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -20,7 +17,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import CcsUtils from '@ccs-ui/utils';
 import { useUpdateEffect } from 'ahooks';
 import { theme as antTheme, Card, Empty } from 'antd';
 import classNames from 'classnames';
@@ -97,8 +93,7 @@ var InternalProTable = function InternalProTable(props) {
     requestParam = _ref$requestParam === void 0 ? {} : _ref$requestParam,
     columns = _ref.columns,
     rowKey = _ref.rowKey,
-    httpRequest = _ref.request,
-    rowSelection = _ref.rowSelection;
+    httpRequest = _ref.request;
   // table sticky
   var stickyRef = useRef(false);
 
@@ -148,18 +143,10 @@ var InternalProTable = function InternalProTable(props) {
     data = _useState2[0],
     setData = _useState2[1];
   var treeRef = useRef(null);
-  // const [selectedRowKeys, setSelectedRowKeys] = useState(
-  //   table?.rowSelection?.defaultSelectedRowKeys || [],
-  // );
-  var _useState3 = useState({}),
+  var _useState3 = useState((table === null || table === void 0 ? void 0 : table.size) || 'middle'),
     _useState4 = _slicedToArray(_useState3, 2),
-    update = _useState4[1];
-  var rowSelectionRef = useRef({});
-  // const selectedRowsRef = useRef<RecordType[]>([]);
-  var _useState5 = useState((table === null || table === void 0 ? void 0 : table.size) || 'middle'),
-    _useState6 = _slicedToArray(_useState5, 2),
-    tableRowSize = _useState6[0],
-    setTableRowSize = _useState6[1];
+    tableRowSize = _useState4[0],
+    setTableRowSize = _useState4[1];
   // 上下文配置
   var _useAppConfig = useAppConfig(),
     theme = _useAppConfig.theme;
@@ -393,147 +380,14 @@ var InternalProTable = function InternalProTable(props) {
     }
   }, [Object.keys(requestParam || {}).toString(), Object.values(requestParam || {}).toString()]);
 
-  // 初始状态，记录选中key和选中记录，用作选中数据回显
-  // useEffect(() => {
-  //   if (!rowSelectionDefaultRows) return;
-
-  //   const { selectedRowKeys } = table?.rowSelection || {};
-  //   if (
-  //     selectedRowKeys &&
-  //     selectedRowKeys.length > 0 &&
-  //     !rowSelectionRef.current.selectedRowKeys &&
-  //     rowSelectionDefaultRows.length > 0
-  //   ) {
-  //     rowSelectionRef.current = {
-  //       selectedRowKeys,
-  //       selectedRows: rowSelectionDefaultRows,
-  //     };
-  //     update({});
-  //   }
-  // }, [rowSelectionDefaultRows]);
-
   // 查询按钮
   var onSearch = function onSearch() {
     onRequest(TableEvent.Search);
   };
 
-  // ==================== 封装table行选中逻辑 start====================
-  var _ref3 = rowSelection || {},
-    selectedRowKeys = _ref3.selectedRowKeys,
-    onRowChange = _ref3.onChange,
-    rsProps = _objectWithoutProperties(_ref3, _excluded);
-  var _rowSelectionRef$curr = rowSelectionRef.current.selectedRowKeys,
-    keys = _rowSelectionRef$curr === void 0 ? [] : _rowSelectionRef$curr;
-
-  // // 传入了选中的key,生成与之匹配的selectedRows数据
-  // if (
-  //   rowSelection &&
-  //   'selectedRowKeys' in rowSelection &&
-  //   !isEqual(selectedRowKeys, keys)
-  // ) {
-  //   // 初始状态，传入了默认值，根据rowSelectionDefaultRows 生成选中rows
-  //   if (
-  //     selectedRowKeys.length > 0 &&
-  //     keys.length === 0 &&
-  //     (rowSelectionDefaultRows || []).length > 0
-  //   ) {
-  //     rowSelectionRef.current = {
-  //       selectedRowKeys,
-  //       selectedRows: rowSelectionDefaultRows,
-  //     };
-  //   }
-
-  //   // 选中数据清空了,清空当前rowSelectionRef.current 数据
-  //   if (selectedRowKeys.length === 0 && keys.length !== 0) {
-  //     rowSelectionRef.current = { selectedRowKeys: [], selectedRows: [] };
-  //   }
-  // }
-
-  // 行选择配置
-  var newRowSelection = rowSelection ? _objectSpread({
-    selectedRowKeys: selectedRowKeys || keys,
-    onChange: function onChange(keys, rows, info) {
-      onRowChange === null || onRowChange === void 0 || onRowChange(keys, rows, info);
-      // // row 中存在undefined记录，由于初始渲染造成无法获取选中记录,需从rowSelectionDefaultRows 中获取
-      // rows.forEach((row, index) => {
-      //   if (!row) {
-      //     const defaultRow = rowSelectionDefaultRows?.find(
-      //       (rs: any) => rs[rowKey || 'id'] === keys[index],
-      //     );
-      //     CcsUtils.showWarning(
-      //       !!defaultRow,
-      //       'CcsProTable:存在未知选中记录，请使用rowSelectionDefaultRows传入初始选中记录',
-      //     );
-      //     rows[index] = defaultRow || ({} as RecordType);
-      //   }
-      // });
-      // rowSelectionRef.current = {
-      //   selectedRowKeys: keys,
-      //   selectedRows: rows,
-      // };
-      onEvent === null || onEvent === void 0 || onEvent(TableEvent.SelectedRows, {
-        keys: keys,
-        rows: rows
-      });
-
-      // 未传入onChange则更新状态
-      if (!onRowChange) update({});
-    },
-    preserveSelectedRowKeys: true
-  }, rsProps) : undefined;
-  // ==================== 当处于受控状态，处理table选中记录 end====================
-
-  // 清除选择
-  var onClearSelected = function onClearSelected(key, noUpdate) {
-    var _rowSelection$onChang2;
-    // 指定删除
-    if (key !== undefined) {
-      var _rowSelectionRef$curr2 = rowSelectionRef.current,
-        _rowSelectionRef$curr3 = _rowSelectionRef$curr2.selectedRowKeys,
-        _selectedRowKeys = _rowSelectionRef$curr3 === void 0 ? [] : _rowSelectionRef$curr3,
-        _rowSelectionRef$curr4 = _rowSelectionRef$curr2.selectedRows,
-        selectedRows = _rowSelectionRef$curr4 === void 0 ? [] : _rowSelectionRef$curr4;
-      rowSelectionRef.current = {
-        selectedRowKeys: _selectedRowKeys.filter(function (r) {
-          return r !== key;
-        }),
-        selectedRows: selectedRows.filter(function (r) {
-          return r[rowKey || 'id'] !== key;
-        })
-      };
-    } else {
-      // 删除全部
-      rowSelectionRef.current = {
-        selectedRowKeys: undefined,
-        selectedRows: undefined
-      };
-    }
-    var _rowSelectionRef$curr5 = rowSelectionRef.current,
-      keys = _rowSelectionRef$curr5.selectedRowKeys,
-      _rowSelectionRef$curr6 = _rowSelectionRef$curr5.selectedRows,
-      rows = _rowSelectionRef$curr6 === void 0 ? [] : _rowSelectionRef$curr6;
-    onEvent === null || onEvent === void 0 || onEvent(TableEvent.SelectedRows, {
-      keys: keys,
-      rows: rows
-    });
-
-    // 受控状态，需要调用onchange
-    if (rowSelection !== null && rowSelection !== void 0 && rowSelection.onChange) {
-      var _rowSelection$onChang;
-      rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang = rowSelection.onChange) === null || _rowSelection$onChang === void 0 || _rowSelection$onChang.call(rowSelection, keys, rows, {});
-      return;
-    }
-    if (!noUpdate)
-      // 需要更新状态
-      update({});
-    rowSelection === null || rowSelection === void 0 || (_rowSelection$onChang2 = rowSelection.onChange) === null || _rowSelection$onChang2 === void 0 || _rowSelection$onChang2.call(rowSelection, selectedRowKeys, rows, {});
-  };
-
   // 重置
   var onReset = function onReset() {
     var _formRef$current2;
-    // 清空选择
-    onClearSelected(undefined, true);
     // 重置表单
     (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.resetFields();
     // 清空columns显示filter和sort值
@@ -552,16 +406,15 @@ var InternalProTable = function InternalProTable(props) {
 
   // 刷新
   var onReload = function onReload() {
-    onClearSelected(undefined, true);
     onRequest(TableEvent.Reload, data.current, data.pageSize);
   };
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
+    var _formRef$current3;
     return {
       data: data,
-      selectedRows: rowSelectionRef.current.selectedRows,
-      formValues: searchParamRef.current,
+      formValues: (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue(),
       searchParam: searchParamRef.current,
       onSearch: onSearch,
       onReload: onReload,
@@ -569,8 +422,7 @@ var InternalProTable = function InternalProTable(props) {
         _onPartialReload(param);
       },
       onReset: onReset,
-      onChangeData: setData,
-      onClearSelected: onClearSelected
+      onChangeData: setData
     };
   });
 
@@ -632,12 +484,6 @@ var InternalProTable = function InternalProTable(props) {
     }
     onRequest(TableEvent.ChangePage, paginationTable.current || 0, paginationTable.pageSize || 10);
   };
-
-  // 扩展组件传递参数
-  var extraProps = _objectSpread(_objectSpread({}, rowSelectionRef.current), {}, {
-    data: data.dataSource || [],
-    onClear: onClearSelected
-  });
   var renderTable = function renderTable() {
     if (!table) return null;
     if (!isAuth) {
@@ -663,19 +509,11 @@ var InternalProTable = function InternalProTable(props) {
       }
     }
 
-    // table title
-    var tableTitle = CcsUtils.isFunction(table.title) ? table.title(extraProps) : undefined;
-
     // 异步树
     if (parentFieldName) {
       return /*#__PURE__*/_jsx(TableTree, {
         data: data,
-        table: _objectSpread(_objectSpread({}, table), {}, {
-          rowSelection: newRowSelection,
-          title: tableTitle ? function () {
-            return tableTitle;
-          } : undefined
-        }),
+        table: table,
         leafNode: leafNode,
         treeRef: treeRef,
         tableRef: tableRef,
@@ -697,12 +535,8 @@ var InternalProTable = function InternalProTable(props) {
       size: tableRowSize,
       columns: columns,
       showSorterTooltip: true,
-      rowSelection: newRowSelection,
       showNumber: props.showNumber,
       loading: table.loading || data.loading || false,
-      title: tableTitle ? function () {
-        return tableTitle;
-      } : undefined,
       onEvent: onEvent
     }));
   };
@@ -716,9 +550,9 @@ var InternalProTable = function InternalProTable(props) {
     }, rootStyle);
   }
   var onFullScreen = function onFullScreen(isFull) {
-    var _ref4 = containerRef.current || {},
-      classList = _ref4.classList,
-      style = _ref4.style;
+    var _ref3 = containerRef.current || {},
+      classList = _ref3.classList,
+      style = _ref3.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
       style.backgroundColor = token.colorBgContainer;
@@ -754,9 +588,6 @@ var InternalProTable = function InternalProTable(props) {
 
   // 有查询条件
   var hasFormItem = formItems.length > 0;
-
-  // table 按钮区
-  var tableToolbar = CcsUtils.isFunction(toolbar) ? toolbar(extraProps) : toolbar;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -781,7 +612,7 @@ var InternalProTable = function InternalProTable(props) {
         title: props.title,
         children: hasFormItem && /*#__PURE__*/_jsx(HeadComponent, {
           formRef: formRef,
-          toolbar: tableToolbar,
+          toolbar: toolbar,
           formItems: formItems,
           expandForm: expandForm,
           formInitValues: formInitValues,
@@ -813,7 +644,7 @@ var InternalProTable = function InternalProTable(props) {
           style: {
             flex: '1 1 auto'
           },
-          children: tableToolbar
+          children: toolbar
         }), /*#__PURE__*/_jsx("div", {
           style: {
             flex: '0 0 auto'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-3",
+  "version": "2.3.6-alpha-5",
   "description": "",
   "license": "MIT",
   "author": {