@ccs-ui/rc-pro 1.1.0 → 1.1.1-rc10

package/es/pro-table/index.js

@@ -1,8 +1,4 @@
 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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-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(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -29,6 +25,7 @@ import useProGrid from "../pro-grid/useProGrid";
 import CcsTable from "../table";
 import "./index.less";
 import SearchComponent from "./search";
+import TableTree from "./tree";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 // 判断组件所处dom
@@ -88,7 +85,6 @@ var ProTable = function ProTable(props) {
   var init = props.init,
     auth = props.auth,
     table = props.table,
-    title = props.title,
     style = props.style,
     proRef = props.proRef,
     loading = props.loading,
@@ -121,12 +117,11 @@ var ProTable = function ProTable(props) {
     requestParam = _ref$requestParam === void 0 ? {} : _ref$requestParam,
     columns = _ref.columns,
     asyncTree = _ref.asyncTree,
-    rowKey = _ref.rowKey,
-    _ref$childrenColumnNa = _ref.childrenColumnName,
-    childrenColumnName = _ref$childrenColumnNa === void 0 ? 'children' : _ref$childrenColumnNa;
+    rowKey = _ref.rowKey;
   var stickyRef = useRef(false);
   // 判断当前组件是否在弹出框中
   var isInModalOrDrawer = _typeof(stickyRef.current) === 'object';
+  // column filter
   var filtersRef = useRef({});
   // 查询form
   var _Form$useForm = Form.useForm(),
@@ -142,20 +137,14 @@ var ProTable = function ProTable(props) {
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
     setData = _useState2[1];
-  // async tree expand key
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    expandKeys = _useState4[0],
-    setExpandKeys = _useState4[1];
+  var event$ = useEventEmitter();
+  var treeRef = useRef(null);
 
   // 权限判断
   var isAuth = useMemo(function () {
-    if (auth && IsAuthButton && auth !== 'ignore') {
+    if (auth && IsAuthButton) {
       return onAuth && onAuth(auth);
     }
-    if (!auth && IsAuthButton && table) {
-      CcsUtils.showLogWarning('CcsProTable：未传入auth权限标识');
-    }
     return true;
   }, []);
   var formatFormItems = useMemo(function () {
@@ -164,108 +153,31 @@ var ProTable = function ProTable(props) {
     });
   }, []);
 
-  // 获取数据
-  var onRequestTree = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var query,
-        record,
-        params,
-        newParams,
-        requestResult,
-        newRequestResult,
-        treeData,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            query = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            record = _args.length > 1 ? _args[1] : undefined;
-            params = query;
-            if (record && asyncTree !== null && asyncTree !== void 0 && asyncTree.parentName) {
-              params[asyncTree === null || asyncTree === void 0 ? void 0 : asyncTree.parentName] = record[rowKey];
-            }
-
-            // onSearchBefore 请求前回传参数，可以在父组件进行修改
-            newParams = onSearchBefore ? onSearchBefore(params) : params; // 发起请求
-            setData(function (d) {
-              return _objectSpread(_objectSpread({}, d), {}, {
-                loading: true
-              });
-            });
-            _context.t0 = request;
-            if (!_context.t0) {
-              _context.next = 11;
-              break;
-            }
-            _context.next = 10;
-            return request(_objectSpread({}, newParams));
-          case 10:
-            _context.t0 = _context.sent;
-          case 11:
-            requestResult = _context.t0;
-            // 请求结果
-            if (requestResult && requestResult.success) {
-              // onSearchAfter 处理请求结果
-              newRequestResult = onSearchAfter ? onSearchAfter(requestResult) : requestResult;
-              treeData = newRequestResult.data;
-              if (record) {
-                // 异步树
-                record[childrenColumnName] = treeData;
-                setData(function (d) {
-                  return _objectSpread(_objectSpread({}, d), {}, {
-                    result: _toConsumableArray(d.result || []),
-                    loading: false
-                  });
-                });
-              } else {
-                setExpandKeys([]);
-                setData({
-                  loading: false,
-                  result: treeData || []
-                });
-              }
-            } else {
-              setData(function (d) {
-                return _objectSpread(_objectSpread({}, d), {}, {
-                  loading: false
-                });
-              });
-            }
-          case 13:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function onRequestTree() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-
   // 获取数据
   var onRequest = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(eventType) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
       var pageNo,
         pageSize,
         record,
-        _args3 = arguments;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+        _args2 = arguments;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            pageNo = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : 1;
-            pageSize = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
-            record = _args3.length > 3 ? _args3[3] : undefined;
+            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;
             if (!(!isAuth || !request)) {
-              _context3.next = 5;
+              _context2.next = 5;
               break;
             }
-            return _context3.abrupt("return");
+            return _context2.abrupt("return");
           case 5:
             // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-            form.validateFields().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+            form.validateFields().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
               var formValues,
                 pageValue,
                 params,
+                _treeRef$current,
                 newParams,
                 requestResult,
                 newRequestResult,
@@ -274,11 +186,11 @@ var ProTable = function ProTable(props) {
                 size,
                 no,
                 result,
-                _args2 = arguments;
-              return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+                _args = arguments;
+              return _regeneratorRuntime().wrap(function _callee$(_context) {
+                while (1) switch (_context.prev = _context.next) {
                   case 0:
-                    formValues = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+                    formValues = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
                     // 格式化条件
                     if (formatFormItems.length) {
                       Object.keys(formValues).forEach(function (k) {
@@ -298,11 +210,11 @@ var ProTable = function ProTable(props) {
                       query: _objectSpread(_objectSpread({}, formValues), requestParam)
                     }, pageValue), filtersRef.current); // 异步树
                     if (!asyncTree) {
-                      _context2.next = 7;
+                      _context.next = 7;
                       break;
                     }
-                    onRequestTree(params.query, record);
-                    return _context2.abrupt("return");
+                    (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 ? void 0 : _treeRef$current.onRequestTree(params.query, record);
+                    return _context.abrupt("return");
                   case 7:
                     // onSearchBefore 请求前回传参数，可以在父组件进行修改
                     newParams = onSearchBefore ? onSearchBefore(params, eventType) : params; // 发起请求
@@ -311,30 +223,29 @@ var ProTable = function ProTable(props) {
                         loading: true
                       });
                     });
-                    _context2.next = 11;
+                    _context.next = 11;
                     return request(_objectSpread({}, newParams));
                   case 11:
-                    requestResult = _context2.sent;
+                    requestResult = _context.sent;
                     if (!(requestResult && requestResult.success)) {
-                      _context2.next = 22;
+                      _context.next = 22;
                       break;
                     }
                     // onSearchAfter 处理请求结果
                     newRequestResult = onSearchAfter ? onSearchAfter(requestResult, eventType) : requestResult;
                     _newRequestResult$dat = newRequestResult.data, totalNum = _newRequestResult$dat.totalNum, size = _newRequestResult$dat.pageSize, no = _newRequestResult$dat.pageNo, result = _newRequestResult$dat.result;
                     if (!(totalNum === undefined || pageSize === undefined || no === undefined || result === undefined)) {
-                      _context2.next = 19;
+                      _context.next = 19;
                       break;
                     }
                     CcsUtils.showLogWarning('分页返回对象，totalNum,pageSize,no,result不能为空');
                     setData(_objectSpread(_objectSpread({}, data), {}, {
                       loading: false
                     }));
-                    return _context2.abrupt("return");
+                    return _context.abrupt("return");
                   case 19:
                     // 当前页无数据，返回上一页
                     if (!result.length && no !== 1 && no !== undefined) {
-                      console.log('no', no);
                       onRequest('reload', no - 1);
                     } else {
                       setData({
@@ -345,7 +256,7 @@ var ProTable = function ProTable(props) {
                         totalNum: totalNum || 0
                       });
                     }
-                    _context2.next = 23;
+                    _context.next = 23;
                     break;
                   case 22:
                     setData(function (d) {
@@ -355,23 +266,24 @@ var ProTable = function ProTable(props) {
                     });
                   case 23:
                   case "end":
-                    return _context2.stop();
+                    return _context.stop();
                 }
-              }, _callee2);
+              }, _callee);
             }))).catch(function () {});
           case 6:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3);
+      }, _callee2);
     }));
     return function onRequest(_x2) {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 
   // 异步树、局部刷新方法
   var _onPartialReload = function onPartialReload(id) {
+    var _treeRef$current2, _treeRef$current3;
     // 查找需要刷新的节点
     var treeNode = getDataById(data.result || [], rowKey, id);
     // 没有查找到、全部刷新
@@ -382,10 +294,8 @@ var ProTable = function ProTable(props) {
     // 获取所有下级ID
     var ids = getAllChildrenId(treeNode.children || [], rowKey);
     // 局部重载
-    setExpandKeys(expandKeys.filter(function (e) {
-      return !ids.includes(e);
-    }));
-    onRequestTree({}, treeNode);
+    (_treeRef$current2 = treeRef.current) === null || _treeRef$current2 === void 0 ? void 0 : _treeRef$current2.onExpandKeys(ids);
+    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 ? void 0 : _treeRef$current3.onRequestTree({}, treeNode);
   };
 
   // 尺寸变化重设尺寸
@@ -494,37 +404,21 @@ var ProTable = function ProTable(props) {
     }
     onRequest('changePage', paginationTable.current || 0, paginationTable.pageSize || 10);
   };
-
-  // 发布订阅、组件通信模式
-  var event$ = useEventEmitter();
-  var onExpand = function onExpand(expanded, record) {
-    var _table$asyncTree;
-    if (!(table !== null && table !== void 0 && table.asyncTree)) return;
-    if (!(table !== null && table !== void 0 && (_table$asyncTree = table.asyncTree) !== null && _table$asyncTree !== void 0 && _table$asyncTree.parentName)) {
-      CcsUtils.showLogWarning('执行失败、参数treeParentName为空！！！');
-      return;
-    }
-    if (!rowKey || (rowKey && record[rowKey]) === undefined) {
-      CcsUtils.showLogWarning('rowKey未传入或传入rowKey不正确');
-      return;
-    }
-    var expandId = record[rowKey];
-    if (expanded) {
-      var _record$childrenColum;
-      expandKeys.push(expandId);
-      if (((_record$childrenColum = record[childrenColumnName]) === null || _record$childrenColum === void 0 ? void 0 : _record$childrenColum.length) > 0) return;
-      onRequestTree({}, record);
-    } else {
-      setExpandKeys(expandKeys.filter(function (e) {
-        return e !== expandId;
-      }));
-    }
-  };
   var renderTable = function renderTable() {
     if (!table) return null;
-
-    // 判断吸顶dom是否有paddingTop，设置offsetHeader
+    if (!isAuth) {
+      return /*#__PURE__*/_jsx(Empty, {
+        style: {
+          margin: 0,
+          padding: '32px 0',
+          color: 'red'
+        },
+        image: Empty.PRESENTED_IMAGE_DEFAULT,
+        description: "\u6CA1\u6709\u6570\u636E\u8BF7\u6C42\u6743\u9650"
+      });
+    }
     if (_typeof(stickyRef.current) === 'object' && 'getContainer' in stickyRef.current) {
+      // 判断吸顶dom是否有paddingTop，设置offsetHeader
       var dom = stickyRef.current.getContainer();
       var _window$getComputedSt = window.getComputedStyle(dom),
         paddingTop = _window$getComputedSt.paddingTop;
@@ -534,43 +428,39 @@ var ProTable = function ProTable(props) {
         });
       }
     }
-    // 添加吸顶
-    var tableParams = _objectSpread({
-      sticky: stickyRef.current || true
-    }, table);
 
     // 异步树
     if (table !== null && table !== void 0 && table.asyncTree) {
-      tableParams.onExpand = onExpand;
-      tableParams.expandedRowKeys = expandKeys;
+      return /*#__PURE__*/_jsx(TableTree, {
+        data: data,
+        table: table,
+        event$: event$,
+        loading: loading,
+        treeRef: treeRef,
+        sticky: stickyRef.current || true,
+        setData: setData,
+        onSearchAfter: onSearchAfter,
+        onSearchBefore: onSearchBefore,
+        handlePageChange: handlePageChange,
+        isInModalOrDrawer: isInModalOrDrawer
+      });
     }
-    return isAuth ? /*#__PURE__*/_jsx(CcsTable, _objectSpread(_objectSpread({
+    return /*#__PURE__*/_jsx(CcsTable, _objectSpread(_objectSpread({
       onChange: handlePageChange,
       data: data,
       event$: event$,
-      size: isInModalOrDrawer ? 'small' : 'middle'
-    }, tableParams), {}, {
+      size: isInModalOrDrawer ? 'small' : 'middle',
+      sticky: stickyRef.current || true
+    }, table), {}, {
       columns: columns,
       showSorterTooltip: true,
       loading: loading || data.loading || false
-    })) : /*#__PURE__*/_jsx(Empty, {
-      style: {
-        margin: 0,
-        padding: '32px 0',
-        color: 'red'
-      },
-      image: Empty.PRESENTED_IMAGE_DEFAULT,
-      description: "\u6CA1\u6709\u6570\u636E\u8BF7\u6C42\u6743\u9650"
-    });
+    }));
   };
   var render = /*#__PURE__*/_jsxs("div", {
     className: classNames(classPrefix, className),
     style: style,
-    children: [title && /*#__PURE__*/_jsx("div", {
-      className: "".concat(classPrefix, "-title"),
-      style: {},
-      children: title
-    }), !(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(SearchComponent, {
+    children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(SearchComponent, {
       form: form,
       toolbar: toolbar,
       columns: columns,

package/es/pro-table/index.less

@@ -12,7 +12,6 @@
   //   display: none;
   // }
   .ant-pagination {
-    background-color: #fff;
     margin: 0 !important;
   }
 
@@ -27,15 +26,6 @@
     position: relative;
   }
 
-  &-title {
-    padding: 10px 16px;
-    color: rgb(0 0 0 / 85%);
-    font-weight: 500;
-    font-size: 16px;
-    background: #fff;
-    border-bottom: 1px solid #f0f0f0;
-  }
-
   &-form {
     flex: 0 1 auto;
     overflow: hidden;
@@ -79,8 +69,8 @@
   }
 
   &-high-form {
-    background: #fff;
-    box-shadow: 0 2px 2px 0 rgb(0 0 0 / 3%);
+    // background: #fff;
+    // box-shadow: 0 2px 2px 0 rgb(0 0 0 / 3%);
 
     .ant-form-item {
       margin-bottom: 10px !important;
@@ -127,7 +117,7 @@
     gap: 10px;
     justify-content: space-between;
     align-items: center;
-    background-color: #fff;
+    // background-color: #fff;
 
     .ant-form-item-explain {
       position: absolute;

package/es/pro-table/search.js

@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { MoreOutlined, RedoOutlined, SettingOutlined, UpOutlined } from '@ant-design/icons';
-import { Button, Checkbox, Col, Dropdown, Form, Row, Tooltip } from 'antd';
+import { Button, Card, Checkbox, Col, Dropdown, Form, Row, Tooltip } from 'antd';
 import _debounce from 'lodash/debounce';
 import ResizeObserver from 'rc-resize-observer';
 import { cloneElement, useMemo, useRef, useState } from 'react';
@@ -418,11 +418,14 @@ function SearchComponent(_ref) {
     });
   };
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsxs("div", {
+    children: /*#__PURE__*/_jsxs(Card, {
+      bodyStyle: {
+        padding: 16
+      },
       style: {
-        padding: 16,
-        background: '#fff'
+        borderRadius: 0
       },
+      bordered: false,
       children: [(hasMore || expandForm) && renderMoreForm(), /*#__PURE__*/_jsxs("div", {
         className: "".concat(classPrefix, "-header"),
         children: [/*#__PURE__*/_jsx("div", {

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

@@ -0,0 +1,22 @@
+import { EventEmitter } from 'ahooks/lib/useEventEmitter';
+import { TableSticky } from 'rc-table/lib/interface';
+import { RefObject } from 'react';
+import { CcsProTableProps } from '.';
+import { TableDataType } from '..';
+export type TreeInstance<T> = {
+    onRequestTree: (query: any, record: T | any) => void;
+    onExpandKeys: (ids: string[]) => void;
+};
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchAfter' | 'onSearchBefore' | 'loading'> & {
+    data: TableDataType<T>;
+    event$: EventEmitter<{
+        key: 'formFilter' | 'columnFilter' | 'columnFilter';
+    }>;
+    treeRef: RefObject<TreeInstance<T>>;
+    isInModalOrDrawer: boolean;
+    sticky: true | TableSticky;
+    setData: React.Dispatch<React.SetStateAction<TableDataType<T>>>;
+    handlePageChange: any;
+};
+declare const TableTree: <T extends object = any>({ data, table, event$, loading, treeRef, sticky, setData, onSearchAfter, onSearchBefore, handlePageChange, isInModalOrDrawer, }: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
+export default TableTree;