@ccs-ui/rc-pro 2.3.6-beta-25 → 2.3.6-beta-27

package/es/context/index.d.ts

@@ -53,8 +53,30 @@ type FnContextType<T = Store> = {
     close: () => void;
 };
 type CcsFieldNamesType = {
+    /** 数据源 */
     dataSource?: string[];
+    /** 数据总条数 */
     total?: string[];
+    /** 自定义接口请求属性对象，
+     * 默认配置
+     * { pageNo:['pageNo'],
+     *   pageSize: ['pageSize'],
+     *   filters':['filters'],
+     *   orderProps: ['orderProps'],
+     *   query: ['query'] }
+     * */
+    requestParam?: {
+        /** 页码 */
+        pageNo: string[];
+        /** 页记录数 */
+        pageSize: string[];
+        /** 查询条件 */
+        query?: string[];
+        /** 排序 */
+        orderProps?: string[];
+        /** 列过滤条件 */
+        filters?: string[];
+    };
 };
 type CcsDialogFieldNames = {
     /** 成功标识字段 */

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/hooks/use-app.d.ts

@@ -6,6 +6,13 @@ declare const useAppConfig: () => import("../context").CssAppConfigType;
 export declare const useProTableFields: () => {
     dataSource: string[];
     total: string[];
+    requestParam: {
+        pageNo: string[];
+        pageSize: string[];
+        query?: string[] | undefined;
+        orderProps?: string[] | undefined;
+        filters?: string[] | undefined;
+    };
 };
 export declare const useProTableTreeFields: () => {
     dataSource: string[];

package/es/hooks/use-app.js

@@ -23,9 +23,14 @@ export var useProTableFields = function useProTableFields() {
   var context = useContext(AppConfigContext) || {};
   return _objectSpread({
     dataSource: ['data', 'result'],
-    // current: ['data', 'pageNo'],
-    // pageSize: ['data', 'pageSize'],
-    total: ['data', 'totalNum']
+    total: ['data', 'totalNum'],
+    requestParam: {
+      pageNo: ['pageNo'],
+      pageSize: ['pageSize'],
+      filters: ['filters'],
+      orderProps: ['orderProps'],
+      query: ['query']
+    }
   }, context === null || context === void 0 || (_context$fieldNames = context.fieldNames) === null || _context$fieldNames === void 0 ? void 0 : _context$fieldNames.proTable);
 };
 export var useProTableTreeFields = function useProTableTreeFields() {

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

@@ -1,16 +1,17 @@
-import { FormInstance } from 'antd/lib/form';
-import { ReactElement } from 'react';
+import { FormInstance } from 'antd';
+import React, { ReactElement } from 'react';
 import { PropsWithElementChildren } from '../ccs';
 import { CcsProTableProps } from './table';
 type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & PropsWithElementChildren & {
     /** 更多查询条件 */
     hasMore?: boolean;
-    form: FormInstance<any>;
     /** table 操作栏 */
     tableOperation: ReactElement;
     /** 查询 */
     onSearch: () => void;
+    /** form */
+    formRef: React.RefObject<FormInstance<any>>;
 };
 /** 操作按钮、查询，重置、列筛选、 */
-declare function HeadComponent<T>({ form, title, toolbar, children, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
+declare function HeadComponent<T>({ title, toolbar, expandForm, formItems, formInitValues, formItemLabelWidth, tableOperation, formRef, onSearch, }: PropsType<T>): import("react/jsx-runtime").JSX.Element;
 export default HeadComponent;

package/es/pro-table/head.js

@@ -8,7 +8,7 @@ import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
 import { Button, Card, Form, theme } from 'antd';
 import _debounce from 'lodash.debounce';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
 import { getShowDpends } from "./_utils";
 import HeadFormItem from "./form-item";
@@ -17,10 +17,8 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /** 操作按钮、查询，重置、列筛选、 */
 function HeadComponent(_ref) {
-  var form = _ref.form,
-    title = _ref.title,
+  var title = _ref.title,
     toolbar = _ref.toolbar,
-    children = _ref.children,
     _ref$expandForm = _ref.expandForm,
     expandForm = _ref$expandForm === void 0 ? false : _ref$expandForm,
     _ref$formItems = _ref.formItems,
@@ -28,7 +26,11 @@ function HeadComponent(_ref) {
     formInitValues = _ref.formInitValues,
     formItemLabelWidth = _ref.formItemLabelWidth,
     tableOperation = _ref.tableOperation,
+    formRef = _ref.formRef,
     onSearch = _ref.onSearch;
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var formItemsRef = useRef(null);
 
   // 根据位置判断是否换行ref
@@ -46,6 +48,9 @@ function HeadComponent(_ref) {
   useUpdateEffect(function () {
     setIsExpand(expandForm);
   }, [expandForm]);
+  useImperativeHandle(formRef, function () {
+    return form;
+  });
 
   // 处理form item 依赖
   var allFormItems = useMemo(function () {
@@ -99,9 +104,6 @@ function HeadComponent(_ref) {
       onClick: function onClick() {
         return form.submit();
       },
-      style: {
-        marginLeft: !hasMore ? 10 : undefined
-      },
       children: "\u67E5\u8BE2"
     }), toolbar ? null : tableOperation]
   });
@@ -168,8 +170,8 @@ function HeadComponent(_ref) {
   var token = theme.useToken().token;
   var controlHeight = token.rootValue ? "".concat((token.controlHeight / token.rootValue).toFixed(3), "rem") : token.controlHeight;
   var adaptationRef = useRef(null);
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: allFormItems.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
         targetRef: formItemsRef,
         onResize: onResize
@@ -210,37 +212,7 @@ function HeadComponent(_ref) {
           })]
         })
       })]
-    }), toolbar && /*#__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
-      },
-      children: [/*#__PURE__*/_jsx("div", {
-        style: {
-          flex: '1 1 auto'
-        },
-        children: toolbar
-      }), /*#__PURE__*/_jsx("div", {
-        style: {
-          flex: '0 0 auto'
-        },
-        children: tableOperation
-      })]
-    }), children]
+    })
   });
 }
 export default HeadComponent;

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

@@ -109,5 +109,5 @@ export declare const TableSelectionContext: React.Context<{
  * @param ref
  * @returns
  */
-declare const InternalProTable: <RecordType extends object = any>(props: CcsProTableProps<RecordType>) => import("react/jsx-runtime").JSX.Element;
+declare const InternalProTable: <RecordType_1 extends object = any>(props: CcsProTableProps<RecordType_1>) => import("react/jsx-runtime").JSX.Element;
 export default InternalProTable;

package/es/pro-table/table.js

@@ -3,13 +3,13 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 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,7 +18,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useUpdateEffect } from 'ahooks';
-import { theme as antTheme, Empty, Form } from 'antd';
+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';
@@ -31,11 +31,23 @@ import HeadComponent from "./head";
 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";
+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;
+    }
+  }
+}
+
+/** 请求参数类型 */
+
 export var classPrefix = 'ccs-pl';
 export var TableSelectionContext = /*#__PURE__*/React.createContext({
   selectedRows: undefined
@@ -48,7 +60,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,
@@ -110,9 +122,7 @@ var InternalProTable = function InternalProTable(props) {
   // 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,
@@ -137,8 +147,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 isDark = theme === 'dark';
@@ -156,146 +164,150 @@ var InternalProTable = function InternalProTable(props) {
 
   // 获取数据
   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,
+        _filtersRef$current,
+        filters,
+        orderProps,
+        _treeRef$current,
+        requestResult,
+        dataSource,
+        total,
+        _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,
-                _filtersRef$current,
-                filters,
-                orderProps,
-                _treeRef$current,
-                requestResult,
-                dataSource,
-                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]);
-                        }
-                      });
-                    }
+            _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]);
+                }
+              });
+            }
+
+            // 请求字段
+            _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 = {
+              eventType: eventType
+            };
+            if (fsQuery && fsQuery.length > 0) {
+              onSetObj(params, fsQuery, _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+            } else {
+              params = _objectSpread(_objectSpread({}, requestParam), formValues);
+            }
 
-                    // 构建请求参数
-                    pageValue = pagination === false ? {} : {
-                      pageNo: pageNo,
-                      pageSize: pageSize
-                    };
-                    params = _objectSpread(_objectSpread({
-                      query: _objectSpread(_objectSpread({}, requestParam), formValues)
-                    }, pageValue), {}, {
-                      eventType: eventType
-                    }); // 列过滤或排序参数
-                    _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
-                    if (Object.keys(filters).length > 0) {
-                      params.filters = filters;
-                    }
-                    if (orderProps.length > 0) {
-                      params.orderProps = orderProps;
-                    }
+            // 分页
+            if (pagination !== false) {
+              onSetObj(params, fsPageNo, pageNo);
+              onSetObj(params, fsPageSize, pageSize);
+            }
 
-                    // 异步树
-                    if (!parentFieldName) {
-                      _context.next = 10;
-                      break;
-                    }
-                    (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
-                    return _context.abrupt("return");
-                  case 10:
-                    // 发起请求
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: true
-                      });
-                    });
-                    _context.next = 13;
-                    return httpRequest(params);
-                  case 13:
-                    requestResult = _context.sent;
-                    if (!requestResult) {
-                      _context.next = 23;
-                      break;
-                    }
-                    // 获取table数据
-                    dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // const pageSize = getDataFromFields(
-                    //   requestResult,
-                    //   fieldNames.pageSize,
-                    // );
-                    // const current = getDataFromFields(requestResult, fieldNames.current);
-                    total = getDataFromFields(requestResult, fieldNames.total);
-                    if (!(total === undefined ||
-                    // pageSize === undefined ||
-                    // current === undefined ||
-                    dataSource === undefined)) {
-                      _context.next = 20;
-                      break;
-                    }
-                    setData({
-                      dataSource: dataSource,
-                      pageSize: pageSize,
-                      current: pageNo,
-                      total: total,
-                      loading: false
-                    });
-                    return _context.abrupt("return");
-                  case 20:
-                    // 当前页无数据，返回上一页
-                    if (!dataSource.length && pageNo !== 1) {
-                      onRequest('reload', pageNo - 1);
-                    } else {
-                      setData({
-                        current: pageNo,
-                        pageSize: pageSize,
-                        loading: false,
-                        dataSource: dataSource,
-                        total: total || 0
-                      });
-                    }
-                    _context.next = 24;
-                    break;
-                  case 23:
-                    setData(function (d) {
-                      return _objectSpread(_objectSpread({}, d), {}, {
-                        loading: false
-                      });
-                    });
-                  case 24:
-                  case "end":
-                    return _context.stop();
-                }
-              }, _callee);
-            }))).catch(function () {});
-          case 6:
+            // 列过滤或排序参数
+            _filtersRef$current = filtersRef.current, filters = _filtersRef$current.filters, orderProps = _filtersRef$current.orderProps;
+            if (Object.keys(filters).length > 0) {
+              onSetObj(params, fsFilters, filters);
+            }
+            if (orderProps.length > 0) {
+              onSetObj(params, 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:
+            // 发起请求
+            setData(function (d) {
+              return _objectSpread(_objectSpread({}, d), {}, {
+                loading: true
+              });
+            });
+            _context.next = 23;
+            return httpRequest(params);
+          case 23:
+            requestResult = _context.sent;
+            if (!requestResult) {
+              _context.next = 33;
+              break;
+            }
+            // 获取table数据
+            dataSource = getDataFromFields(requestResult, fieldNames.dataSource);
+            total = getDataFromFields(requestResult, fieldNames.total);
+            if (!(total === undefined || dataSource === undefined)) {
+              _context.next = 30;
+              break;
+            }
+            setData({
+              dataSource: dataSource,
+              pageSize: pageSize,
+              current: pageNo,
+              total: total,
+              loading: false
+            });
+            return _context.abrupt("return");
+          case 30:
+            // 当前页无数据，返回上一页
+            if (!dataSource.length && pageNo !== 1) {
+              onRequest('reload', pageNo - 1);
+            } else {
+              setData({
+                current: pageNo,
+                pageSize: pageSize,
+                loading: false,
+                dataSource: dataSource,
+                total: total || 0
+              });
+            }
+            _context.next = 34;
+            break;
+          case 33:
+            setData(function (d) {
+              return _objectSpread(_objectSpread({}, d), {}, {
+                loading: false
+              });
+            });
+          case 34:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     return function onRequest(_x) {
       return _ref2.apply(this, arguments);
@@ -355,8 +367,9 @@ var InternalProTable = function InternalProTable(props) {
 
   // 重置
   var _onReset = function onReset() {
+    var _formRef$current2;
     if (selectedRows.length > 0) setSelectedRows([]);
-    form === null || form === void 0 || form.resetFields();
+    (_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) {
@@ -379,10 +392,11 @@ var InternalProTable = function InternalProTable(props) {
 
   // form 数据 查询，重载，重置方法
   useImperativeHandle(proRef, function () {
+    var _formRef$current3;
     return {
       data: data,
       selectedRows: selectedRows,
-      formValues: _objectSpread(_objectSpread({}, form.getFieldsValue()), filtersRef.current),
+      formValues: _objectSpread(_objectSpread({}, (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.getFieldsValue()), filtersRef.current),
       onSearch: function onSearch() {
         _onSearch();
       },
@@ -486,10 +500,10 @@ 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 _ref3 = table.rowSelection || {},
+      _ref3$type = _ref3.type,
+      type = _ref3$type === void 0 ? 'checkbox' : _ref3$type,
+      restSelection = _objectWithoutProperties(_ref3, _excluded);
     var hasSelection = table.rowSelection && CcsUtils.isEmpty(restSelection);
     var rowSelection = hasSelection ? {
       type: type,
@@ -550,18 +564,6 @@ var InternalProTable = function InternalProTable(props) {
       } : undefined
     }));
   };
-  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 || {};
@@ -572,9 +574,9 @@ var InternalProTable = function InternalProTable(props) {
     }, 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;
@@ -595,6 +597,18 @@ var InternalProTable = function InternalProTable(props) {
 
   // 监听容器尺寸变化
   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
+  }) : /*#__PURE__*/_jsx(_Fragment, {});
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -605,26 +619,52 @@ var InternalProTable = function InternalProTable(props) {
         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);
+      children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsxs(TableSelectionContext.Provider, {
+        value: {
+          selectedRows: selectedRows
+        },
+        children: [/*#__PURE__*/_jsx(HeadComponent, {
+          formRef: formRef,
+          toolbar: toolbar,
+          formItems: formItems,
+          expandForm: expandForm,
+          formInitValues: formInitValues,
+          formItemLabelWidth: props.formItemLabelWidth,
+          onSearch: _onSearch,
+          title: props.title,
+          tableOperation: renderTableOperation,
+          children: toolbarExtra
+        }), toolbar && /*#__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
           },
-          tableRowSize: tableRowSize,
-          onReset: _onReset,
-          columns: columns,
-          tableRef: tableRef,
-          onFullScreen: onFullScreen
-        }) : /*#__PURE__*/_jsx(_Fragment, {}),
-        children: newToolbarExtra
+          children: [/*#__PURE__*/_jsx("div", {
+            style: {
+              flex: '1 1 auto'
+            },
+            children: toolbar
+          }), /*#__PURE__*/_jsx("div", {
+            style: {
+              flex: '0 0 auto'
+            },
+            children: renderTableOperation
+          })]
+        }), children]
       }), /*#__PURE__*/_jsxs("div", {
         className: "".concat(classPrefix, "-table-content"),
         style: _objectSpread(_objectSpread({}, styles === null || styles === void 0 ? void 0 : styles.table), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-beta-25",
+  "version": "2.3.6-beta-27",
   "description": "",
   "license": "MIT",
   "author": {