@ccs-ui/rc-pro 2.3.5 → 2.3.6-alpha-2

package/es/pro-table/table.js

@@ -1,15 +1,19 @@
-var _excluded = ["type"];
+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 _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 _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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+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."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -17,12 +21,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { useSize, useUpdateEffect } from 'ahooks';
-import { theme as antTheme, Empty, Form } from 'antd';
+import { useUpdateEffect } from 'ahooks';
+import { theme as antTheme, Card, Empty } from 'antd';
 import classNames from 'classnames';
+import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { useAppConfig, useCcsPage } from '..';
-import { onDefaultFormat } from "../config";
+import { CcsResizeObserver, useAppConfig, useCcsPage } from '..';
 import { useProTableFields } from "../hooks/use-app";
 import { getDataFromFields } from "../select";
 import CcsTable from "../table";
@@ -32,12 +36,32 @@ import "./index.less";
 import TableOperation from "./operation";
 import TableTree from "./tree";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+function onSetObj(target, paths, value) {
+  while (paths.length > 0) {
+    var path = paths.shift();
+    if (paths.length > 0) {
+      if (!target[path]) target[path] = {};
+      onSetObj(target[path], paths, value);
+    } else {
+      target[path] = value;
+    }
+  }
+}
+// table 事件
+export var TableEvent = /*#__PURE__*/function (TableEvent) {
+  TableEvent["Search"] = "search";
+  TableEvent["Reset"] = "reset";
+  TableEvent["Reload"] = "reload";
+  TableEvent["ChangePage"] = "changePage";
+  TableEvent["InitSearch"] = "initSearch";
+  TableEvent["FullScreen"] = "fullScreen";
+  TableEvent["ColumnFilter"] = "columnFilter";
+  TableEvent["SelectedRows"] = "SelectedRows";
+  return TableEvent;
+}({});
 export var classPrefix = 'ccs-pl';
-export var TableSelectionContext = /*#__PURE__*/React.createContext({
-  selectedRows: undefined
-});
 
 /**
  * 布局组件 包括form、查询、toolbar、table 自动初始化数据
@@ -46,7 +70,7 @@ export var TableSelectionContext = /*#__PURE__*/React.createContext({
  * @returns
  */
 var InternalProTable = function InternalProTable(props) {
-  var _props$table, _table$scroll2, _table$scroll3;
+  var _table$scroll2, _table$scroll3;
   var init = props.init,
     auth = props.auth,
     table = props.table,
@@ -57,23 +81,24 @@ var InternalProTable = function InternalProTable(props) {
     children = props.children,
     className = props.className,
     expandForm = props.expandForm,
-    searchEvent = props.searchEvent,
-    toolbarExtra = props.toolbarExtra,
     _props$formItems = props.formItems,
     formItems = _props$formItems === void 0 ? [] : _props$formItems,
     leafNode = props.leafNode,
+    bordered = props.bordered,
     parentFieldName = props.parentFieldName,
     _props$formInitValues = props.formInitValues,
-    formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues;
+    formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
+    onEvent = props.onEvent;
   var _useCcsPage = useCcsPage(),
     onAuth = _useCcsPage.onAuth;
   var _ref = table || {},
     pagination = _ref.pagination,
-    httpRequest = _ref.request,
     _ref$requestParam = _ref.requestParam,
     requestParam = _ref$requestParam === void 0 ? {} : _ref$requestParam,
     columns = _ref.columns,
-    rowKey = _ref.rowKey;
+    rowKey = _ref.rowKey,
+    httpRequest = _ref.request,
+    rowSelection = _ref.rowSelection;
   // table sticky
   var stickyRef = useRef(false);
 
@@ -101,17 +126,17 @@ var InternalProTable = function InternalProTable(props) {
   }, []);
 
   // column filter
-  var filtersRef = useRef(defaultColumnValues);
+  var filterOrderRef = useRef(defaultColumnValues);
   // table content
   var tableContentRef = useRef(null);
+  // 接口查询条件
+  var searchParamRef = useRef({});
   // container
   var containerRef = useRef(null);
   // table ref
   var tableRef = useRef();
   // 查询form
-  var _Form$useForm = Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
+  var formRef = useRef(null);
   // table data
   var _useState = useState({
       total: 0,
@@ -123,10 +148,14 @@ var InternalProTable = function InternalProTable(props) {
     data = _useState2[0],
     setData = _useState2[1];
   var treeRef = useRef(null);
-  var _useState3 = useState([]),
+  // const [selectedRowKeys, setSelectedRowKeys] = useState(
+  //   table?.rowSelection?.defaultSelectedRowKeys || [],
+  // );
+  var _useState3 = useState({}),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectedRows = _useState4[0],
-    setSelectedRows = _useState4[1];
+    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],
@@ -136,10 +165,6 @@ var InternalProTable = function InternalProTable(props) {
     theme = _useAppConfig.theme;
   // 接口字段指定全局配置
   var globalFieldNames = useProTableFields();
-  // 接口字段指定
-  var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames);
-  var onSearchBefore = props.onSearchBefore || onDefaultFormat;
-  var onSearchAfter = props.onSearchAfter || onDefaultFormat;
 
   // 暗黑模式
   var isDark = theme === 'dark';
@@ -155,143 +180,167 @@ var InternalProTable = function InternalProTable(props) {
     });
   }, []);
 
-  // 监听容器尺寸变化
-  var size = useSize(containerRef);
-  useEffect(function () {
-    var _table$scroll, _tableContentRef$curr;
-    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto' && ((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) !== 0) {
-      var _tableRef$current;
-      (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
-    }
-  }, [size === null || size === void 0 ? void 0 : size.height]);
-
   // 获取数据
   var onRequest = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
+      var _formRef$current, _props$table;
       var pageNo,
         pageSize,
         record,
-        _args2 = arguments;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        formValues,
+        fieldNames,
+        _fieldNames$requestPa,
+        _fieldNames$requestPa2,
+        fsFilters,
+        _fieldNames$requestPa3,
+        fsPageNo,
+        _fieldNames$requestPa4,
+        fsPageSize,
+        _fieldNames$requestPa5,
+        fsOrderProps,
+        fsQuery,
+        params,
+        _filterOrderRef$curre,
+        filters,
+        orderProps,
+        _treeRef$current,
+        requestResult,
+        dataSource,
+        total,
+        newData,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            pageNo = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 1;
-            pageSize = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
-            record = _args2.length > 3 ? _args2[3] : undefined;
+            pageNo = _args.length > 1 && _args[1] !== undefined ? _args[1] : 1;
+            pageSize = _args.length > 2 && _args[2] !== undefined ? _args[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
+            record = _args.length > 3 ? _args[3] : undefined;
             if (!(!isAuth || !httpRequest)) {
-              _context2.next = 5;
+              _context.next = 5;
               break;
             }
-            return _context2.abrupt("return");
+            return _context.abrupt("return");
           case 5:
-            // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-            form.validateFields().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              var formValues,
-                pageValue,
-                params,
-                _treeRef$current,
-                newParams,
-                requestResult,
-                newReqResult,
-                dataSource,
-                _pageSize,
-                current,
-                total,
-                _args = arguments;
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
-                  case 0:
-                    formValues = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-                    // 格式化条件
-                    if (formatFormItems.length) {
-                      Object.keys(formValues).forEach(function (k) {
-                        if (formValues[k] !== undefined) {
-                          var s = formatFormItems.find(function (f) {
-                            return f.name === k;
-                          });
-                          if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
-                        }
-                      });
-                    }
-                    pageValue = pagination === false ? {} : {
-                      pageNo: pageNo,
-                      pageSize: pageSize
-                    };
-                    params = _objectSpread(_objectSpread({
-                      query: _objectSpread(_objectSpread({}, formValues), requestParam)
-                    }, pageValue), filtersRef.current); // 异步树
-                    if (!parentFieldName) {
-                      _context.next = 7;
-                      break;
-                    }
-                    (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
-                    return _context.abrupt("return");
-                  case 7:
-                    // onSearchBefore 请求前回传参数，可以在父组件进行修改
-                    newParams = onSearchBefore(params, eventType); // 发起请求
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: true
-                      });
-                    });
-                    _context.next = 11;
-                    return httpRequest(_objectSpread({}, newParams));
-                  case 11:
-                    requestResult = _context.sent;
-                    if (!requestResult) {
-                      _context.next = 24;
-                      break;
-                    }
-                    // onSearchAfter 处理请求结果
-                    newReqResult = onSearchAfter(requestResult, eventType); // 获取table数据
-                    dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
-                    _pageSize = getDataFromFields(newReqResult, fieldNames.pageSize);
-                    current = getDataFromFields(newReqResult, fieldNames.current);
-                    total = getDataFromFields(newReqResult, fieldNames.total);
-                    if (!(total === undefined || _pageSize === undefined || current === undefined || dataSource === undefined)) {
-                      _context.next = 21;
-                      break;
-                    }
-                    setData({
-                      dataSource: dataSource,
-                      pageSize: _pageSize,
-                      current: current,
-                      total: total,
-                      loading: false
-                    });
-                    return _context.abrupt("return");
-                  case 21:
-                    // 当前页无数据，返回上一页
-                    if (!dataSource.length && current !== 1 && current !== undefined) {
-                      onRequest('reload', current - 1);
-                    } else {
-                      setData({
-                        current: current,
-                        pageSize: _pageSize,
-                        loading: false,
-                        dataSource: dataSource,
-                        total: total || 0
-                      });
-                    }
-                    _context.next = 25;
-                    break;
-                  case 24:
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: false
-                      });
-                    });
-                  case 25:
-                  case "end":
-                    return _context.stop();
+            _context.next = 7;
+            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
+          case 7:
+            formValues = _context.sent;
+            // 接口字段指定
+            fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 格式化条件
+            if (formatFormItems.length) {
+              Object.keys(formValues).forEach(function (k) {
+                if (formValues[k] !== undefined) {
+                  var s = formatFormItems.find(function (f) {
+                    return f.name === k;
+                  });
+                  if (s) formValues[k] = s.onFormat && s.onFormat(formValues[k]);
                 }
-              }, _callee);
-            }))).catch(function () {});
-          case 6:
+              });
+            }
+
+            // 请求字段
+            _fieldNames$requestPa = fieldNames.requestParam, _fieldNames$requestPa2 = _fieldNames$requestPa.filters, fsFilters = _fieldNames$requestPa2 === void 0 ? ['filters'] : _fieldNames$requestPa2, _fieldNames$requestPa3 = _fieldNames$requestPa.pageNo, fsPageNo = _fieldNames$requestPa3 === void 0 ? ['pageNo'] : _fieldNames$requestPa3, _fieldNames$requestPa4 = _fieldNames$requestPa.pageSize, fsPageSize = _fieldNames$requestPa4 === void 0 ? ['pageSize'] : _fieldNames$requestPa4, _fieldNames$requestPa5 = _fieldNames$requestPa.orderProps, fsOrderProps = _fieldNames$requestPa5 === void 0 ? ['orderProps'] : _fieldNames$requestPa5, fsQuery = _fieldNames$requestPa.query; // 构建请求参数
+            params = {};
+            if (fsQuery && fsQuery.length > 0) {
+              onSetObj(params, _toConsumableArray(fsQuery), _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+            } else {
+              params = _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues);
+            }
+            if (pagination !== false) {
+              // 分页
+              onSetObj(params, _toConsumableArray(fsPageNo), pageNo);
+              onSetObj(params, _toConsumableArray(fsPageSize), pageSize);
+            }
+
+            // 列过滤或排序参数
+            _filterOrderRef$curre = filterOrderRef.current, filters = _filterOrderRef$curre.filters, orderProps = _filterOrderRef$curre.orderProps;
+            if (Object.keys(filters).length > 0) {
+              onSetObj(params, _toConsumableArray(fsFilters), filters);
+            }
+            if (orderProps.length > 0) {
+              onSetObj(params, _toConsumableArray(fsOrderProps), orderProps);
+            }
+
+            // 异步树
+            if (!parentFieldName) {
+              _context.next = 20;
+              break;
+            }
+            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
+            return _context.abrupt("return");
+          case 20:
+            // 记录查询条件
+            searchParamRef.current = params;
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params
+            });
+
+            // 发起请求
+            setData(function (d) {
+              return _objectSpread(_objectSpread({}, d), {}, {
+                loading: true
+              });
+            });
+            _context.next = 25;
+            return httpRequest(params);
+          case 25:
+            requestResult = _context.sent;
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: false,
+              params: params,
+              data: requestResult
+            });
+
+            // 请求结果
+            if (!requestResult) {
+              _context.next = 37;
+              break;
+            }
+            // 获取table数据
+            dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // 默认添加一条数据
+            if (table !== null && table !== void 0 && table.emptyDefaultOne && dataSource && dataSource.length === 0) {
+              dataSource.push(_defineProperty({}, rowKey || 'id', '0'));
+            }
+            total = getDataFromFields(requestResult, fieldNames.total);
+            if (!(total === undefined || dataSource === undefined)) {
+              _context.next = 35;
+              break;
+            }
+            newData = {
+              dataSource: dataSource,
+              pageSize: pageSize,
+              current: pageNo,
+              total: total,
+              loading: false
+            };
+            setData(newData);
+            return _context.abrupt("return");
+          case 35:
+            // 当前页无数据，返回上一页
+            if (!dataSource.length && pageNo !== 1) {
+              onRequest(TableEvent.Reload, pageNo - 1);
+            } else {
+              setData({
+                current: pageNo,
+                pageSize: pageSize,
+                loading: false,
+                dataSource: dataSource,
+                total: total || 0
+              });
+            }
+            return _context.abrupt("return");
+          case 37:
+            setData(function (d) {
+              return _objectSpread(_objectSpread({}, d), {}, {
+                loading: false
+              });
+            });
+          case 38:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     return function onRequest(_x) {
       return _ref2.apply(this, arguments);
@@ -305,7 +354,7 @@ var InternalProTable = function InternalProTable(props) {
     var treeNode = getDataById(data.dataSource || [], rowKey, id);
     // 没有查找到、全部刷新
     if (!treeNode) {
-      onRequest('search');
+      onRequest(TableEvent.Search);
       return;
     }
     // 获取所有下级ID
@@ -340,20 +389,153 @@ var InternalProTable = function InternalProTable(props) {
   // 初始查询
   useEffect(function () {
     if (init !== false && httpRequest) {
-      onRequest('initSearch');
+      onRequest(TableEvent.InitSearch);
     }
   }, [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() {
-    if (searchEvent) searchEvent();
-    onRequest('search');
+  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() {
-    if (selectedRows.length > 0) setSelectedRows([]);
-    form === null || form === void 0 || form.resetFields();
+  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值
     columns === null || columns === void 0 || columns.forEach(function (c) {
       if (c.filterDropdown || c.filters) {
@@ -364,38 +546,31 @@ var InternalProTable = function InternalProTable(props) {
       }
     });
     // 清空filter请求值
-    filtersRef.current = defaultColumnValues;
-    onRequest('reset');
+    filterOrderRef.current = defaultColumnValues;
+    onRequest(TableEvent.Reset);
   };
 
   // 刷新
-  var _onReload = function onReload() {
-    if (selectedRows.length > 0) setSelectedRows([]);
-    onRequest('reload', data.current, data.pageSize);
+  var onReload = function onReload() {
+    onClearSelected(undefined, true);
+    onRequest(TableEvent.Reload, data.current, data.pageSize);
   };
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
     return {
       data: data,
-      selectedRows: selectedRows,
-      formValues: form.getFieldsValue(),
-      onSearch: function onSearch() {
-        _onSearch();
-      },
-      onReload: function onReload() {
-        _onReload();
-      },
+      selectedRows: rowSelectionRef.current.selectedRows,
+      formValues: searchParamRef.current,
+      searchParam: searchParamRef.current,
+      onSearch: onSearch,
+      onReload: onReload,
       onPartialReload: function onPartialReload(param) {
         _onPartialReload(param);
       },
-      onReset: function onReset() {
-        _onReset();
-      },
+      onReset: onReset,
       onChangeData: setData,
-      onClearSelected: function onClearSelected() {
-        return setSelectedRows([]);
-      }
+      onClearSelected: onClearSelected
     };
   });
 
@@ -409,21 +584,28 @@ var InternalProTable = function InternalProTable(props) {
           c.filteredValue = filters[c.dataIndex];
         }
       });
-      filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
+      filterOrderRef.current = _objectSpread(_objectSpread({}, filterOrderRef.current), {}, {
         filters: filters
       });
     }
     if (sorter) {
       columns === null || columns === void 0 || columns.forEach(function (c) {
         if (c.sorter) {
-          var curSorter = Array.isArray(sorter) ?
-          // @ts-ignore
-          sorter.find(function (sort) {
-            return sort.field === c.dataIndex;
-          }) : sorter;
+          if (Array.isArray(sorter)) {
+            // @ts-ignore
+            var curSorter = sorter.find(function (sort) {
+              return sort.field === c.dataIndex;
+            });
+            if (curSorter) c.sortOrder = curSorter === null || curSorter === void 0 ? void 0 : curSorter.order;
+            return;
+          }
 
           // @ts-ignore
-          c.sortOrder = curSorter === null || curSorter === void 0 ? void 0 : curSorter.order;
+          if (sorter.field === c.dataIndex) {
+            c.sortOrder = sorter.order;
+            return;
+          }
+          c.sortOrder = undefined;
         }
       });
 
@@ -444,12 +626,18 @@ var InternalProTable = function InternalProTable(props) {
           });
         }
       }
-      filtersRef.current = _objectSpread(_objectSpread({}, filtersRef.current), {}, {
+      filterOrderRef.current = _objectSpread(_objectSpread({}, filterOrderRef.current), {}, {
         orderProps: orderProps
       });
     }
-    onRequest('changePage', paginationTable.current || 0, paginationTable.pageSize || 10);
+    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) {
@@ -475,38 +663,15 @@ var InternalProTable = function InternalProTable(props) {
       }
     }
 
-    // 选择,只传入一个type参数或不传，封装选择行为
-    var _ref4 = table.rowSelection || {},
-      _ref4$type = _ref4.type,
-      type = _ref4$type === void 0 ? 'checkbox' : _ref4$type,
-      restSelection = _objectWithoutProperties(_ref4, _excluded);
-    var hasSelection = table.rowSelection && CcsUtils.isEmpty(restSelection);
-    var rowSelection = hasSelection ? {
-      type: type,
-      selectedRowKeys: selectedRows.map(function (k) {
-        return k[rowKey];
-      }),
-      onChange: function onChange(_, rows) {
-        return setSelectedRows(rows);
-      },
-      preserveSelectedRowKeys: true
-    } : table.rowSelection;
-
     // table title
-    var tableTitle = table.title ? table.title({
-      selectedRows: selectedRows,
-      data: data.dataSource || [],
-      onClear: function onClear() {
-        return setSelectedRows([]);
-      }
-    }) : undefined;
+    var tableTitle = CcsUtils.isFunction(table.title) ? table.title(extraProps) : undefined;
 
     // 异步树
     if (parentFieldName) {
       return /*#__PURE__*/_jsx(TableTree, {
         data: data,
         table: _objectSpread(_objectSpread({}, table), {}, {
-          rowSelection: rowSelection,
+          rowSelection: newRowSelection,
           title: tableTitle ? function () {
             return tableTitle;
           } : undefined
@@ -519,8 +684,6 @@ var InternalProTable = function InternalProTable(props) {
         sticky: stickyRef.current || true,
         parentFieldName: parentFieldName,
         setData: setData,
-        onSearchAfter: onSearchAfter,
-        onSearchBefore: onSearchBefore,
         handlePageChange: handlePageChange
       });
     }
@@ -534,39 +697,28 @@ var InternalProTable = function InternalProTable(props) {
       size: tableRowSize,
       columns: columns,
       showSorterTooltip: true,
-      rowSelection: rowSelection,
+      rowSelection: newRowSelection,
       showNumber: props.showNumber,
       loading: table.loading || data.loading || false,
       title: tableTitle ? function () {
         return tableTitle;
-      } : undefined
+      } : undefined,
+      onEvent: onEvent
     }));
   };
-  var newToolbar = toolbar && /*#__PURE__*/_jsx(TableSelectionContext.Provider, {
-    value: {
-      selectedRows: selectedRows
-    },
-    children: toolbar
-  });
-  var newToolbarExtra = /*#__PURE__*/_jsx(TableSelectionContext.Provider, {
-    value: {
-      selectedRows: selectedRows
-    },
-    children: toolbarExtra
-  });
   var _antTheme$useToken = antTheme.useToken(),
     token = _antTheme$useToken.token;
   var rootStyle = styles.root || {};
-  if (table !== null && table !== void 0 && table.bordered) {
+  if (bordered) {
     rootStyle = _objectSpread({
       border: "1px solid ".concat(token.colorBorderSecondary),
       borderRadius: 4
     }, rootStyle);
   }
   var onFullScreen = function onFullScreen(isFull) {
-    var _ref5 = containerRef.current || {},
-      classList = _ref5.classList,
-      style = _ref5.style;
+    var _ref4 = containerRef.current || {},
+      classList = _ref4.classList,
+      style = _ref4.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
       style.backgroundColor = token.colorBgContainer;
@@ -575,39 +727,107 @@ var InternalProTable = function InternalProTable(props) {
       style.backgroundColor = 'transparent';
     }
   };
-  return /*#__PURE__*/_jsxs("div", {
-    className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
-    style: _objectSpread(_objectSpread({}, rootStyle), {}, {
-      overflow: (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? 'hidden' : 'unset'
-    }),
-    ref: containerRef,
-    children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(HeadComponent, {
-      form: form,
-      toolbar: newToolbar,
-      formItems: formItems,
-      expandForm: expandForm,
-      formInitValues: formInitValues,
-      formItemLabelWidth: props.formItemLabelWidth,
-      onSearch: _onSearch,
-      title: props.title,
-      tableOperation: (table === null || table === void 0 ? void 0 : table.hideOperation) !== true ? /*#__PURE__*/_jsx(TableOperation, {
-        onChangeRowSize: function onChangeRowSize(e) {
-          return setTableRowSize(e);
-        },
-        tableRowSize: tableRowSize,
-        onReset: _onReset,
-        columns: columns,
-        tableRef: tableRef,
-        onFullScreen: onFullScreen
-      }) : /*#__PURE__*/_jsx(_Fragment, {}),
-      children: newToolbarExtra
+
+  // 尺寸变化重设尺寸
+  var resizeFn = function resizeFn() {
+    var _table$scroll, _tableContentRef$curr;
+    if ((table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto' && ((_tableContentRef$curr = tableContentRef.current) === null || _tableContentRef$curr === void 0 ? void 0 : _tableContentRef$curr.clientHeight) !== 0) {
+      var _tableRef$current;
+      (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 || _tableRef$current.onFixedThead();
+    }
+  };
+
+  // 监听容器尺寸变化
+  var onResize = _debounce(resizeFn, 500);
+
+  // table 操作按钮
+  var renderTableOperation = (table === null || table === void 0 ? void 0 : table.hideOperation) !== true ? /*#__PURE__*/_jsx(TableOperation, {
+    onChangeRowSize: function onChangeRowSize(e) {
+      return setTableRowSize(e);
+    },
+    tableRowSize: tableRowSize,
+    onReset: onReset,
+    columns: columns,
+    tableRef: tableRef,
+    onFullScreen: onFullScreen
+  }) : undefined;
+
+  // 有查询条件
+  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,
+      onResize: onResize
     }), /*#__PURE__*/_jsxs("div", {
-      className: "".concat(classPrefix, "-table-content"),
-      style: _objectSpread(_objectSpread({}, styles === null || styles === void 0 ? void 0 : styles.table), {}, {
-        overflow: (table === null || table === void 0 || (_table$scroll3 = table.scroll) === null || _table$scroll3 === void 0 ? void 0 : _table$scroll3.y) === 'auto' ? 'hidden' : 'unset'
+      className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
+      style: _objectSpread(_objectSpread({}, rootStyle), {}, {
+        overflow: (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? 'hidden' : 'unset'
       }),
-      ref: tableContentRef,
-      children: [renderTable(), children]
+      ref: containerRef,
+      children: [/*#__PURE__*/_jsx(Card, {
+        className: "ccs-pl-adaptation",
+        style: {
+          boxShadow: 'none'
+        },
+        styles: {
+          body: {
+            padding: hasFormItem ? 16 : 0
+          }
+        },
+        variant: "borderless",
+        title: props.title,
+        children: hasFormItem && /*#__PURE__*/_jsx(HeadComponent, {
+          formRef: formRef,
+          toolbar: tableToolbar,
+          formItems: formItems,
+          expandForm: expandForm,
+          formInitValues: formInitValues,
+          formItemLabelWidth: props.formItemLabelWidth,
+          onSearch: onSearch,
+          tableOperation: renderTableOperation
+        })
+      }), (toolbar || !hasFormItem && renderTableOperation) && /*#__PURE__*/_jsxs(Card, {
+        styles: {
+          cover: {
+            borderRadius: 0
+          },
+          body: {
+            display: 'flex',
+            justifyContent: 'space-between',
+            width: '100%',
+            padding: '12px 16px',
+            alignContent: 'center'
+          }
+        },
+        style: {
+          borderRadius: 0,
+          borderLeft: 0,
+          borderBottom: 0,
+          borderRight: 0,
+          borderTop: !hasFormItem ? 0 : undefined
+        },
+        children: [/*#__PURE__*/_jsx("div", {
+          style: {
+            flex: '1 1 auto'
+          },
+          children: tableToolbar
+        }), /*#__PURE__*/_jsx("div", {
+          style: {
+            flex: '0 0 auto'
+          },
+          children: renderTableOperation
+        })]
+      }), /*#__PURE__*/_jsxs("div", {
+        className: "".concat(classPrefix, "-table-content"),
+        style: _objectSpread(_objectSpread({}, styles === null || styles === void 0 ? void 0 : styles.table), {}, {
+          overflow: (table === null || table === void 0 || (_table$scroll3 = table.scroll) === null || _table$scroll3 === void 0 ? void 0 : _table$scroll3.y) === 'auto' ? 'hidden' : 'unset'
+        }),
+        ref: tableContentRef,
+        children: [renderTable(), children]
+      })]
     })]
   });
 };