@ccs-ui/rc-pro 2.4.6 → 2.4.7-beta.2

package/es/pro-table/table.js

@@ -1,16 +1,9 @@
 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 _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 _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 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); }
@@ -18,36 +11,55 @@ 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 { useUpdateEffect } from 'ahooks';
-import { theme as antTheme, Card, Empty } from 'antd';
+import { theme as antTheme, Empty } from 'antd';
 import { ConfigContext } from 'antd/es/config-provider';
 import classNames from 'classnames';
-import _debounce from 'lodash.debounce';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { CcsResizeObserver, useAppConfig, useCcsPage } from '..';
-import { useProTableFields } from "../hooks/use-app";
+import { CcsAtom, useAppConfig } from '..';
+import { DataEvent } from "../atom/_api";
+import usePageRequest from "../atom/usePageRequest";
+import { useInsertCss } from "../hooks/use-insert-css";
 import CcsTable from "../table";
-import { getDataByNamePath } from "../utils";
-import { TableEvent } from "./_api";
 import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
-import HeadComponent from "./head";
 import "./index.less";
-import TableOperation from "./operation";
 import TableTree from "./tree";
 import { jsx as _jsx } 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;
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export var classPrefix = 'ccs-pl';
+function onDefaultColumnValue(columns) {
+  var defaultValue = {
+    filters: {},
+    orderProps: [],
+    columnOptions: [],
+    columnShowKeys: []
+  };
+  columns === null || columns === void 0 || columns.forEach(function (c) {
+    if (!!c.dataIndex && !!c.title) {
+      defaultValue.columnOptions.push({
+        label: c.title,
+        value: c.dataIndex
+      });
+    }
+    if (c.hidden !== true) {
+      defaultValue.columnShowKeys.push(c.dataIndex);
+    }
+
+    // 排序
+    if (c.sorter && c.defaultSortOrder !== undefined) {
+      defaultValue.orderProps.push({
+        prop: c.dataIndex,
+        ascending: c.defaultSortOrder === 'ascend'
+      });
     }
-  }
+
+    // 过滤
+    if (c.filters && c.defaultFilteredValue !== undefined) {
+      defaultValue.filters[c.dataIndex] = c.defaultFilteredValue;
+    }
+  });
+  return defaultValue;
 }
-export var classPrefix = 'ccs-pl';
 
 /**
  * 布局组件 包括form、查询、toolbar、table 自动初始化数据
@@ -56,7 +68,7 @@ export var classPrefix = 'ccs-pl';
  * @returns
  */
 var InternalProTable = function InternalProTable(props) {
-  var _table$scroll2, _table$scroll3;
+  var _props$table, _table$scroll;
   var init = props.init,
     auth = props.auth,
     table = props.table,
@@ -75,16 +87,16 @@ var InternalProTable = function InternalProTable(props) {
     _props$formInitValues = props.formInitValues,
     formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
     onEvent = props.onEvent;
-
-  // 权限判断方法
-  var _useCcsPage = useCcsPage(),
-    onAuth = _useCcsPage.onAuth;
   // antd config
   var config = useContext(ConfigContext);
 
+  // 添加额外样式
+  useInsertCss('table', function (prefixCls) {
+    return [".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} ")];
+  });
+
   // table 参数
   var _ref = table || {},
-    pagination = _ref.pagination,
     _ref$requestParam = _ref.requestParam,
     requestParam = _ref$requestParam === void 0 ? {} : _ref$requestParam,
     columns = _ref.columns,
@@ -93,27 +105,9 @@ var InternalProTable = function InternalProTable(props) {
   // table sticky
   var stickyRef = useRef(false);
 
-  // 字段默认过滤，排序值
+  // 字段默认过滤，排序值,列字段显示筛选
   var defaultColumnValues = useMemo(function () {
-    var defaultValue = {
-      filters: {},
-      orderProps: []
-    };
-    columns === null || columns === void 0 || columns.forEach(function (c) {
-      // 排序
-      if (c.sorter && c.defaultSortOrder !== undefined) {
-        defaultValue.orderProps.push({
-          prop: c.dataIndex,
-          ascending: c.defaultSortOrder === 'ascend'
-        });
-      }
-
-      // 过滤
-      if (c.filters && c.defaultFilteredValue !== undefined) {
-        defaultValue.filters[c.dataIndex] = c.defaultFilteredValue;
-      }
-    });
-    return defaultValue;
+    return onDefaultColumnValue(columns);
   }, []);
 
   // column filter
@@ -124,249 +118,48 @@ var InternalProTable = function InternalProTable(props) {
   var containerRef = useRef(null);
   // table ref
   var tableRef = useRef();
-  // 查询form
-  var formRef = useRef(null);
-  // table data
-  var _useState = useState({
-      total: 0,
-      dataSource: [],
-      pageSize: 10,
-      current: 1
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    data = _useState2[0],
-    setData = _useState2[1];
+  // 查询过滤条件ref
+  var atomFilterRef = useRef(null);
   // table tree ref
   var treeRef = useRef(null);
   // table size change
-  var _useState3 = useState((table === null || table === void 0 ? void 0 : table.size) || 'middle'),
-    _useState4 = _slicedToArray(_useState3, 2),
-    tableRowSize = _useState4[0],
-    setTableRowSize = _useState4[1];
+  var _useState = useState((table === null || table === void 0 ? void 0 : table.size) || 'middle'),
+    _useState2 = _slicedToArray(_useState, 2),
+    tableRowSize = _useState2[0],
+    setTableRowSize = _useState2[1];
   // CCS 组件上下文配置
   var _useAppConfig = useAppConfig(),
     theme = _useAppConfig.theme;
-  // 接口字段指定全局配置
-  var globalFieldNames = useProTableFields();
   // antd theme token
   var _antTheme$useToken = antTheme.useToken(),
     token = _antTheme$useToken.token;
-
-  // 权限判断
-  var isAuth = useMemo(function () {
-    if (auth) return onAuth && onAuth(auth);
-    return true;
-  }, [auth]);
-
-  // 获取有格式方法的查询条件
-  var formatFormItems = useMemo(function () {
-    return formItems.flat(Infinity).filter(function (f) {
-      return f.onFormat;
-    });
-  }, []);
-
-  // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-  var getFormValues = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _formRef$current;
-      var formValues, _delField;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validateFields();
-          case 2:
-            formValues = _context.sent;
-            // 删除无意义字段
-            if (formValues) {
-              _delField = Object.keys(formValues).filter(function (k) {
-                return k.startsWith('_') && k.endsWith('_');
-              });
-              if (_delField.length > 0) {
-                _delField.forEach(function (d) {
-                  return delete formValues[d];
-                });
-              }
-            }
-
-            // 格式化条件，格式化结果数据
-            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]);
-                }
-              });
-            }
-            return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
-          case 6:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getFormValues() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-
-  // 获取数据
-  var onRequest = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(eventType) {
-      var _props$table;
-      var pageNo,
-        pageSize,
-        record,
-        filterValues,
-        fieldNames,
-        _ref4,
-        _ref4$filters,
-        fsFilters,
-        _ref4$pageNo,
-        fsPageNo,
-        _ref4$pageSize,
-        fsPageSize,
-        _ref4$orderProps,
-        fsOrderProps,
-        fsQuery,
-        params,
-        _filterOrderRef$curre,
-        filters,
-        orderProps,
-        _treeRef$current,
-        requestResult,
-        dataSource,
-        total,
-        newData,
-        _args2 = arguments;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.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;
-            if (!(!isAuth || !httpRequest)) {
-              _context2.next = 5;
-              break;
-            }
-            return _context2.abrupt("return");
-          case 5:
-            _context2.next = 7;
-            return getFormValues();
-          case 7:
-            filterValues = _context2.sent;
-            // 接口字段指定
-            fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames); // 请求字段
-            _ref4 = fieldNames.requestParam || {}, _ref4$filters = _ref4.filters, fsFilters = _ref4$filters === void 0 ? ['filters'] : _ref4$filters, _ref4$pageNo = _ref4.pageNo, fsPageNo = _ref4$pageNo === void 0 ? ['pageNo'] : _ref4$pageNo, _ref4$pageSize = _ref4.pageSize, fsPageSize = _ref4$pageSize === void 0 ? ['pageSize'] : _ref4$pageSize, _ref4$orderProps = _ref4.orderProps, fsOrderProps = _ref4$orderProps === void 0 ? ['orderProps'] : _ref4$orderProps, fsQuery = _ref4.query; // 构建请求参数
-            params = {};
-            if (fsQuery && fsQuery.length > 0) {
-              onSetObj(params, _toConsumableArray(fsQuery), filterValues);
-            } else {
-              params = filterValues;
-            }
-            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) {
-              _context2.next = 19;
-              break;
-            }
-            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(eventType, params.query || params, record);
-            return _context2.abrupt("return");
-          case 19:
-            // 事件回调，请求中
-            onEvent === null || onEvent === void 0 || onEvent(eventType, {
-              loading: true,
-              params: params
-            });
-
-            // 发起请求
-            setData(function (d) {
-              return _objectSpread(_objectSpread({}, d), {}, {
-                loading: true
-              });
-            });
-            _context2.next = 23;
-            return httpRequest(params);
-          case 23:
-            requestResult = _context2.sent;
-            // 事件回调，请求完成
-            onEvent === null || onEvent === void 0 || onEvent(eventType, {
-              loading: false,
-              params: params,
-              data: requestResult
-            });
-
-            // 请求结果
-            if (!requestResult) {
-              _context2.next = 35;
-              break;
-            }
-            // 获取table数据
-            dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 默认添加一条数据
-            if (table !== null && table !== void 0 && table.emptyDefaultOne && dataSource && dataSource.length === 0) {
-              dataSource.push(_defineProperty({}, rowKey || 'id', '0'));
-            }
-            // 数据总数
-            total = getDataByNamePath(requestResult, fieldNames.total);
-            if (!(total === undefined || dataSource === undefined)) {
-              _context2.next = 33;
-              break;
-            }
-            newData = {
-              dataSource: dataSource,
-              pageSize: pageSize,
-              current: pageNo,
-              total: total,
-              loading: false
-            };
-            setData(newData);
-            return _context2.abrupt("return");
-          case 33:
-            // 当前页无数据，返回上一页
-            if (!dataSource.length && pageNo !== 1) {
-              onRequest(TableEvent.Reload, pageNo - 1);
-            } else {
-              setData({
-                current: pageNo,
-                pageSize: pageSize,
-                loading: false,
-                dataSource: dataSource,
-                total: total || 0
-              });
-            }
-            return _context2.abrupt("return");
-          case 35:
-            setData(function (d) {
-              return _objectSpread(_objectSpread({}, d), {}, {
-                loading: false
-              });
-            });
-          case 36:
-          case "end":
-            return _context2.stop();
+  var _usePageRequest = usePageRequest({
+      auth: auth,
+      rowKey: rowKey,
+      pagination: table === null || table === void 0 ? void 0 : table.pagination,
+      fieldNames: (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames,
+      emptyDefaultOne: table === null || table === void 0 ? void 0 : table.emptyDefaultOne,
+      onFilterOrder: function onFilterOrder() {
+        return filterOrderRef.current;
+      },
+      onEvent: onEvent,
+      getFormValues: function getFormValues() {
+        var _atomFilterRef$curren;
+        return (_atomFilterRef$curren = atomFilterRef.current) === null || _atomFilterRef$curren === void 0 ? void 0 : _atomFilterRef$curren.getFormValues();
+      },
+      request: httpRequest,
+      onRequestCustom: parentFieldName ? function () {
+        var _treeRef$current;
+        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+          args[_key] = arguments[_key];
         }
-      }, _callee2);
-    }));
-    return function onRequest(_x) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
+        return (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 ? void 0 : _treeRef$current.onRequestTree.apply(_treeRef$current, args);
+      } : undefined
+    }),
+    isAuth = _usePageRequest.isAuth,
+    data = _usePageRequest.data,
+    onRequest = _usePageRequest.onRequest,
+    onChangeData = _usePageRequest.onChangeData;
 
   // 异步树、局部刷新方法
   var _onPartialReload = function onPartialReload(id) {
@@ -375,14 +168,14 @@ var InternalProTable = function InternalProTable(props) {
     var treeNode = getDataById(data.dataSource || [], rowKey, id);
     // 没有查找到、全部刷新
     if (!treeNode) {
-      onRequest(TableEvent.Search);
+      onRequest(DataEvent.Search);
       return;
     }
     // 获取所有下级ID
     var ids = getAllChildrenId(treeNode.children || [], rowKey);
     // 局部重载
     (_treeRef$current2 = treeRef.current) === null || _treeRef$current2 === void 0 || _treeRef$current2.onExpandKeys(ids);
-    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 || _treeRef$current3.onRequestTree(TableEvent.PartialReload, {}, treeNode);
+    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 || _treeRef$current3.onRequestTree(DataEvent.PartialReload, {}, treeNode);
   };
   useEffect(function () {
     // 判断是否在弹出框中
@@ -410,7 +203,7 @@ var InternalProTable = function InternalProTable(props) {
   // 初始查询
   useEffect(function () {
     if (init !== false && httpRequest) {
-      onRequest(TableEvent.InitSearch);
+      onRequest(DataEvent.InitSearch);
     }
   }, [Object.keys(requestParam || {}).toString(), Object.values(requestParam || {}).toString()]);
 
@@ -419,20 +212,20 @@ var InternalProTable = function InternalProTable(props) {
     var _table$rowSelection, _table$rowSelection$o;
     // @ts-ignore
     table === null || table === void 0 || (_table$rowSelection = table.rowSelection) === null || _table$rowSelection === void 0 || (_table$rowSelection$o = _table$rowSelection.onClearByProTable) === null || _table$rowSelection$o === void 0 || _table$rowSelection$o.call(_table$rowSelection);
-    onRequest(TableEvent.Search);
+    onRequest(DataEvent.Search);
   };
 
   // 重置
   var onReset = function onReset() {
-    var _table$rowSelection2, _table$rowSelection2$, _formRef$current2;
+    var _table$rowSelection2, _table$rowSelection2$, _atomFilterRef$curren2;
     // @ts-ignore
     table === null || table === void 0 || (_table$rowSelection2 = table.rowSelection) === null || _table$rowSelection2 === void 0 || (_table$rowSelection2$ = _table$rowSelection2.onClearByProTable) === null || _table$rowSelection2$ === void 0 || _table$rowSelection2$.call(_table$rowSelection2);
     // 重置表单
-    (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.resetFields();
+    (_atomFilterRef$curren2 = atomFilterRef.current) === null || _atomFilterRef$curren2 === void 0 || _atomFilterRef$curren2.form.resetFields();
     // 清空columns显示filter和sort值
     columns === null || columns === void 0 || columns.forEach(function (c) {
       if (c.filterDropdown || c.filters) {
-        c.filteredValue = c.defaultFilteredValue;
+        c.filteredValue = c.defaultFilteredValue || [];
       }
       if (c.sorter) {
         c.sortOrder = c.defaultSortOrder;
@@ -440,7 +233,7 @@ var InternalProTable = function InternalProTable(props) {
     });
     // 清空filter请求值
     filterOrderRef.current = defaultColumnValues;
-    onRequest(TableEvent.Reset);
+    onRequest(DataEvent.Reset);
   };
 
   // 刷新
@@ -448,21 +241,22 @@ var InternalProTable = function InternalProTable(props) {
     var _table$rowSelection3, _table$rowSelection3$;
     // @ts-ignore
     table === null || table === void 0 || (_table$rowSelection3 = table.rowSelection) === null || _table$rowSelection3 === void 0 || (_table$rowSelection3$ = _table$rowSelection3.onClearByProTable) === null || _table$rowSelection3$ === void 0 || _table$rowSelection3$.call(_table$rowSelection3);
-    onRequest(TableEvent.Reload, data.current, data.pageSize);
+    onRequest(DataEvent.Reload, data.current, data.pageSize);
   };
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
+    var _atomFilterRef$curren3;
     return {
       data: data,
-      getFormValues: getFormValues,
+      getFormValues: (_atomFilterRef$curren3 = atomFilterRef.current) === null || _atomFilterRef$curren3 === void 0 ? void 0 : _atomFilterRef$curren3.getFormValues,
       onSearch: onSearch,
       onReload: onReload,
       onPartialReload: function onPartialReload(param) {
         _onPartialReload(param);
       },
       onReset: onReset,
-      onChangeData: setData
+      onChangeData: onChangeData
     };
   });
 
@@ -522,7 +316,7 @@ var InternalProTable = function InternalProTable(props) {
         orderProps: orderProps
       });
     }
-    onRequest(TableEvent.ChangePage, paginationTable.current || 0, paginationTable.pageSize || 10);
+    onRequest(DataEvent.ChangePage, paginationTable.current || 0, paginationTable.pageSize || 10);
   };
   var renderTable = function renderTable() {
     if (!table) return null;
@@ -562,9 +356,8 @@ var InternalProTable = function InternalProTable(props) {
         tableRowSize: tableRowSize,
         sticky: stickyRef.current || true,
         parentFieldName: parentFieldName,
-        setData: setData,
-        onEvent: onEvent,
-        handlePageChange: handlePageChange
+        setData: onChangeData,
+        onEvent: onEvent
       });
     }
     return /*#__PURE__*/_jsx(CcsTable, _objectSpread(_objectSpread({
@@ -582,123 +375,97 @@ var InternalProTable = function InternalProTable(props) {
       onEvent: onEvent
     }));
   };
-  var rootStyle = styles.root || {};
-  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;
-    if (isFull) {
-      classList === null || classList === void 0 || classList.add('css-table-full');
-      style.backgroundColor = token.colorBgContainer;
-    } else {
-      classList === null || classList === void 0 || classList.remove('css-table-full');
-      style.backgroundColor = 'transparent';
+  var isAutoScroll = (table === null || table === void 0 || (_table$scroll = table.scroll) === null || _table$scroll === void 0 ? void 0 : _table$scroll.y) === 'auto';
+  // 样式处理
+  var newStyles = useMemo(function () {
+    var rootStyle = styles.root || {};
+    var tableStyle = styles.table || {};
+    tableStyle.overflow = 'unset';
+
+    // 添加边框
+    if (bordered) {
+      rootStyle.border = "1px solid ".concat(token.colorBorderSecondary);
+      rootStyle.borderRadius = 4;
     }
-  };
+
+    // 自适应高度样式
+    if (isAutoScroll) {
+      rootStyle.overflow = 'hidden';
+      rootStyle.height = '100%';
+      tableStyle.overflow = 'hidden';
+    }
+    return {
+      root: rootStyle,
+      table: tableStyle
+    };
+  }, []);
 
   // 尺寸变化重设尺寸
   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 _tableContentRef$curr;
+    if (isAutoScroll && ((_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);
+  var extraOper = /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(CcsAtom.FullScreen, {
+      parentHtmlId: "ccs-pro-table"
+    }), /*#__PURE__*/_jsx(CcsAtom.Checkbox, {
+      options: defaultColumnValues.columnOptions,
+      defaultCheckedKeys: defaultColumnValues.columnShowKeys,
+      placement: "bottomRight",
+      onChange: function onChange(e) {
+        var _tableRef$current2;
+        var hideKeys = defaultColumnValues.columnShowKeys.filter(function (key) {
+          return !e.includes(key);
+        });
+        (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 || _tableRef$current2.onColumnFilter(hideKeys);
+      }
+    })]
+  });
 
   // table 操作按钮
-  var renderTableOperation = (table === null || table === void 0 ? void 0 : table.hideOperation) !== true ? /*#__PURE__*/_jsx(TableOperation, {
-    onChangeRowSize: function onChangeRowSize(e) {
+  var renderTableOperation = table !== null && table !== void 0 && table.hideOperation ? /*#__PURE__*/_jsx(CcsAtom.Operation, {
+    extraLeft: toolbar,
+    extraRight: extraOper
+  }) : /*#__PURE__*/_jsx(CcsAtom.Operation, {
+    extraLeft: toolbar,
+    extraRight: extraOper,
+    onChangeSize: function onChangeSize(e) {
       return setTableRowSize(e);
     },
-    tableRowSize: tableRowSize,
+    size: tableRowSize,
     onReset: onReset,
     columns: columns,
     tableRef: tableRef,
-    onFullScreen: onFullScreen
-  }) : undefined;
-
-  // 有查询条件
-  var hasFormItem = formItems.length > 0;
-  // 头部间距
-  var tokenPadding = tableRowSize === 'small' ? token.paddingSM : token.paddingMD;
+    style: {
+      marginLeft: !!toolbar ? 0 : 8
+    }
+  });
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
+    children: [isAutoScroll && /*#__PURE__*/_jsx(CcsAtom.Resize, {
       targetRef: tableContentRef,
-      onResize: onResize
+      onResize: resizeFn
     }), /*#__PURE__*/_jsxs("div", {
+      id: "ccs-pro-table",
       className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', theme === 'dark')),
-      style: _objectSpread(_objectSpread({}, rootStyle), (table === null || table === void 0 || (_table$scroll2 = table.scroll) === null || _table$scroll2 === void 0 ? void 0 : _table$scroll2.y) === 'auto' ? {
-        overflow: 'hidden',
-        height: '100%'
-      } : {}),
+      style: newStyles.root,
       ref: containerRef,
-      children: [/*#__PURE__*/_jsx(Card, {
-        style: {
-          boxShadow: 'none',
-          borderRadius: 0
-        },
-        styles: {
-          body: {
-            padding: hasFormItem ? tokenPadding : 0
-          }
-        },
-        variant: "borderless",
-        title: props.title,
-        children: hasFormItem && /*#__PURE__*/_jsx(HeadComponent, {
-          formRef: formRef,
-          toolbar: toolbar,
-          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: "".concat(token.paddingSM, "px ").concat(tokenPadding, "px"),
-            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: toolbar
-        }), /*#__PURE__*/_jsx("div", {
-          style: {
-            flex: '0 0 auto'
-          },
-          children: renderTableOperation
-        })]
-      }), /*#__PURE__*/_jsxs("div", {
+      children: [/*#__PURE__*/_jsx(CcsAtom.Title, {
+        children: props.title
+      }), /*#__PURE__*/_jsx(CcsAtom.Filter, {
+        ref: atomFilterRef,
+        extra: !toolbar ? renderTableOperation : undefined,
+        formItems: formItems,
+        expandForm: expandForm,
+        formInitValues: formInitValues,
+        formItemLabelWidth: props.formItemLabelWidth,
+        onSearch: onSearch,
+        requestParam: table === null || table === void 0 ? void 0 : table.requestParam
+      }), toolbar && 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'
-        }),
+        style: newStyles.table,
         ref: tableContentRef,
         children: [renderTable(), children]
       })]