@ccs-ui/rc-pro 2.3.6-alpha-9 → 2.3.6-alpha-11

package/es/cascader/index.js

@@ -19,7 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { useRequest } from 'ahooks';
 import { Cascader } from 'antd';
 import { useEffect } from 'react';
-import { getDataFromFields } from "../select";
+import { getDataByNamePath } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 function onIsArray(data) {
   if (Array.isArray(data)) return data;
@@ -67,9 +67,9 @@ function ApiCascader(_ref) {
                 break;
               }
               result.forEach(function (r) {
-                r.label = getDataFromFields(r, labelField);
-                r.value = getDataFromFields(r, valueField);
-                r.children = getDataFromFields(r, childrenField);
+                r.label = getDataByNamePath(r, labelField);
+                r.value = getDataByNamePath(r, valueField);
+                r.children = getDataByNamePath(r, childrenField);
               });
               return _context.abrupt("break", 15);
             case 9:

package/es/ccs.d.ts

@@ -94,11 +94,11 @@ type ShowDependType = {
     name: string;
     value: any;
 };
-type FormItemType = {
+export type TableFormItem = {
     /** label 标题 */
     label?: string;
     /** form name */
-    name?: string;
+    name?: NamePath;
     /** form item element */
     value: ReactElement;
     /** 数据依赖、依赖项对应的name数组 */
@@ -109,14 +109,9 @@ type FormItemType = {
     rules?: Rule[];
     /** 在发起请求时调用方法，格式化值 */
     onFormat?: (e: any) => any;
-    /** 组表单项名称 */
-    groupItemNames?: NamePath[];
+    /** 分组表单项，将解构name，生成独立的字段值，如时间范围选择，将数组结果解构成独立的字段值 */
+    isGroupItem?: boolean;
 };
-export type TableFormItem = ({
-    name: string;
-} & Partial<FormItemType>) | ({
-    groupItemNames: NamePath[];
-} & Partial<FormItemType>);
 type TableFormItems = TableFormItem[];
 type TableInstanceRef<T = any> = MutableRefObject<TableInstance<T> | undefined> | React.RefObject<TableInstance<T>>;
 type TableColumns<RecordType = any> = TableColumn<RecordType>[];

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>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "request" | "onClose" | "onOk" | "auth" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/dialog/button.js

@@ -18,7 +18,7 @@ import { Button, Form } from 'antd';
 import React, { useEffect, useImperativeHandle, useState } from 'react';
 import CcsDialog from '.';
 import { useDialogFields } from "../hooks/use-app";
-import { getDataFromFields } from "../select";
+import { getDataByNamePath } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -110,9 +110,9 @@ export var DialogButtonHolder = function DialogButtonHolder(_ref) {
               var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), requestFieldNames);
 
               // 获取成功标识
-              var success = getDataFromFields(result, fieldNames.success);
+              var success = getDataByNamePath(result, fieldNames.success);
               // 获取异常信息
-              var msg = getDataFromFields(result, fieldNames.errorMsg);
+              var msg = getDataByNamePath(result, fieldNames.errorMsg);
               if (success === fieldNames.successTag) {
                 // 关闭对话框
                 onHandleClose(values, result);

package/es/group-form-item/index.js

@@ -20,7 +20,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { useUpdateEffect } from 'ahooks';
 import { Form } from 'antd';
 import { useEffect, useState } from 'react';
-import { getDataFromFields } from "../select";
+import { getDataByNamePath } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -38,7 +38,7 @@ var FormUpdateItem = function FormUpdateItem(_ref) {
 
     // 根据子项初始值设置name的默认值
     groupItemNames.forEach(function (item) {
-      initNameValue.push(getDataFromFields(initialValues, Array.isArray(item) ? item : [item]));
+      initNameValue.push(getDataByNamePath(initialValues, item));
     });
 
     // 如果子项有初始值，则设置name的默认值
@@ -50,7 +50,7 @@ var FormUpdateItem = function FormUpdateItem(_ref) {
     }
 
     // 如果子项没有初始值，主项有初始值
-    var groupNameValue = getDataFromFields(initialValues, Array.isArray(name) ? name : [name]);
+    var groupNameValue = getDataByNamePath(initialValues, name);
     if (Array.isArray(groupNameValue)) {
       groupItemNames.forEach(function (item, index) {
         setFieldValue(item, groupNameValue[index]);
@@ -84,7 +84,7 @@ function GroupFormItem(_ref2) {
   var groupItemNames = _ref2.groupItemNames,
     name = _ref2.name,
     formItemProps = _objectWithoutProperties(_ref2, _excluded);
-  var _useState = useState(name || "_".concat(JSON.stringify(groupItemNames).replace(/[^a-zA-Z]/g, ''))),
+  var _useState = useState(name || "_".concat(JSON.stringify(groupItemNames).replace(/[^a-zA-Z]/g, ''), "_")),
     _useState2 = _slicedToArray(_useState, 1),
     itemName = _useState2[0];
   return /*#__PURE__*/_jsxs(_Fragment, {

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

@@ -1,7 +1,9 @@
+import { NamePath } from 'antd/es/form/interface';
 import { TableFormItem } from '../ccs';
-import { CcsProTableProps } from './table';
 type PropsType = TableFormItem & {
     dependParam?: any;
-} & Pick<CcsProTableProps<any>, 'formItemLabelWidth'>;
+    groupItemNames?: NamePath[];
+    formItemLabelWidth?: number | string;
+};
 export default function HeadFormItem({ label, name, rules, value, dependParam, groupItemNames, formItemLabelWidth, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/pro-table/form-item.js

@@ -19,7 +19,6 @@ export default function HeadFormItem(_ref) {
     groupItemNames = _ref.groupItemNames,
     formItemLabelWidth = _ref.formItemLabelWidth;
   var props = {
-    name: name,
     rules: rules,
     className: "".concat(classPrefix, "-form-label"),
     label: formItemLabelWidth ? /*#__PURE__*/_jsx("div", {
@@ -36,7 +35,9 @@ export default function HeadFormItem(_ref) {
     }));
   }
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({}, props), {}, {
+    children: /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
+      name: name
+    }, props), {}, {
       children: dependParam ? /*#__PURE__*/cloneElement(value, dependParam) : value
     }))
   });

package/es/pro-table/head.js

@@ -1,3 +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 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 _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); }
@@ -5,11 +11,11 @@ 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 { DownOutlined, UpOutlined } from '@ant-design/icons';
-import { useUpdateEffect } from 'ahooks';
 import { Button, Form, theme } from 'antd';
 import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver } from '..';
+import { getDataByNamePath } from "../select";
 import { getShowDpends } from "./_utils";
 import HeadFormItem from "./form-item";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -33,8 +39,10 @@ function HeadComponent(_ref) {
   var formItemsRef = useRef(null);
   // 根据位置判断是否换行ref
   var endItemRef = useRef(null);
+  // 查询按钮ref
+  var searchBtnRef = useRef(null);
   // 查询条件是否展开
-  var _useState = useState(expandForm),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isExpand = _useState2[0],
     setIsExpand = _useState2[1];
@@ -42,9 +50,11 @@ function HeadComponent(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     hasMore = _useState4[0],
     onToggle = _useState4[1];
-  useUpdateEffect(function () {
-    setIsExpand(expandForm);
-  }, [expandForm]);
+  useEffect(function () {
+    if (hasMore && expandForm) {
+      setIsExpand(true);
+    }
+  }, [hasMore]);
   useImperativeHandle(formRef, function () {
     return form;
   });
@@ -62,9 +72,19 @@ function HeadComponent(_ref) {
 
   // 判断是否有更多条件无法一行显示
   var onEventMore = function onEventMore() {
-    var _endItemRef$current, _formItemsRef$current;
-    if (!endItemRef.current || !formItemsRef.current || isExpand) return;
-    var hasMore = ((_endItemRef$current = endItemRef.current) === null || _endItemRef$current === void 0 || (_endItemRef$current = _endItemRef$current.getClientRects()[0]) === null || _endItemRef$current === void 0 ? void 0 : _endItemRef$current.top) !== ((_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 || (_formItemsRef$current = _formItemsRef$current.getClientRects()[0]) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.top);
+    var _endItemRef$current, _formItemsRef$current, _searchBtnRef$current, _endItemRef$current2, _formItemsRef$current2;
+    if (!endItemRef.current || !formItemsRef.current) return;
+    var endTop = (_endItemRef$current = endItemRef.current) === null || _endItemRef$current === void 0 || (_endItemRef$current = _endItemRef$current.getClientRects()[0]) === null || _endItemRef$current === void 0 ? void 0 : _endItemRef$current.top;
+    var formTop = (_formItemsRef$current = formItemsRef.current) === null || _formItemsRef$current === void 0 || (_formItemsRef$current = _formItemsRef$current.getClientRects()[0]) === null || _formItemsRef$current === void 0 ? void 0 : _formItemsRef$current.top;
+    var searchtTop = (_searchBtnRef$current = searchBtnRef.current) === null || _searchBtnRef$current === void 0 || (_searchBtnRef$current = _searchBtnRef$current.getClientRects()[0]) === null || _searchBtnRef$current === void 0 ? void 0 : _searchBtnRef$current.top;
+
+    // 都在一行，则没有更多和展开
+    if (endTop === formTop && endTop === searchtTop) {
+      onToggle(false);
+      setIsExpand(false);
+    }
+    if (isExpand) return;
+    var hasMore = ((_endItemRef$current2 = endItemRef.current) === null || _endItemRef$current2 === void 0 || (_endItemRef$current2 = _endItemRef$current2.getClientRects()[0]) === null || _endItemRef$current2 === void 0 ? void 0 : _endItemRef$current2.top) !== ((_formItemsRef$current2 = formItemsRef.current) === null || _formItemsRef$current2 === void 0 || (_formItemsRef$current2 = _formItemsRef$current2.getClientRects()[0]) === null || _formItemsRef$current2 === void 0 ? void 0 : _formItemsRef$current2.top);
     onToggle(hasMore);
   };
 
@@ -86,6 +106,7 @@ function HeadComponent(_ref) {
       textAlign: 'right',
       flex: isExpand && hasMore ? '1 1 auto' : '0 0 auto'
     },
+    ref: searchBtnRef,
     children: [hasMore && /*#__PURE__*/_jsx(Button, {
       type: "link",
       icon: isExpand ? /*#__PURE__*/_jsx(UpOutlined, {}) : /*#__PURE__*/_jsx(DownOutlined, {}),
@@ -109,60 +130,53 @@ function HeadComponent(_ref) {
       var depends = _ref2.depends,
         showDepends = _ref2.showDepends,
         name = _ref2.name,
-        groupItemNames = _ref2.groupItemNames,
+        isGroupItem = _ref2.isGroupItem,
         label = _ref2.label,
         rules = _ref2.rules,
         value = _ref2.value;
+      var itemProps = {
+        name: name,
+        label: label,
+        rules: rules,
+        value: value,
+        formItemLabelWidth: formItemLabelWidth,
+        groupItemNames: isGroupItem ? name : undefined
+      };
+      var itemContent = /*#__PURE__*/_jsx(React.Fragment, {
+        children: /*#__PURE__*/_jsx(HeadFormItem, _objectSpread({}, itemProps))
+      }, index);
       if (depends || showDepends) {
-        return /*#__PURE__*/_jsx(React.Fragment, {
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            noStyle: true,
-            shouldUpdate: function shouldUpdate(l, n) {
-              return (depends === null || depends === void 0 ? void 0 : depends.some(function (i) {
-                return l[i] !== n[i];
-              })) || (showDepends === null || showDepends === void 0 ? void 0 : showDepends.some(function (i) {
-                return l[i.name] !== n[i.name];
-              })) || false;
-            },
-            children: function children(_ref3) {
-              var getFieldValue = _ref3.getFieldValue;
-              var dependParam = {};
-              depends === null || depends === void 0 || depends.forEach(function (i) {
-                var value = getFieldValue(i);
-                dependParam[i] = value;
-              });
-              var isShow = true;
-              if (showDepends && showDepends.length > 0) {
-                isShow = showDepends === null || showDepends === void 0 ? void 0 : showDepends.every(function (i) {
-                  return getFieldValue(i.name) === i.value;
-                });
-              }
-              var itemContent = /*#__PURE__*/_jsx(HeadFormItem, {
-                name: name,
-                groupItemNames: groupItemNames,
-                label: label,
-                rules: rules,
-                value: value,
-                dependParam: dependParam,
-                formItemLabelWidth: formItemLabelWidth
+        return /*#__PURE__*/_jsx(Form.Item, {
+          noStyle: true,
+          shouldUpdate: function shouldUpdate(l, n) {
+            return (depends === null || depends === void 0 ? void 0 : depends.some(function (i) {
+              return getDataByNamePath(l, i) !== getDataByNamePath(n, i);
+            })) || (showDepends === null || showDepends === void 0 ? void 0 : showDepends.some(function (i) {
+              return getDataByNamePath(l, i.name) !== getDataByNamePath(n, i.name);
+            })) || false;
+          },
+          children: function children(_ref3) {
+            var getFieldValue = _ref3.getFieldValue;
+            var dependParam = {};
+            depends === null || depends === void 0 || depends.forEach(function (i) {
+              var value = getFieldValue(i);
+              dependParam[i] = value;
+            });
+            var isShow = true;
+            if (showDepends && showDepends.length > 0) {
+              isShow = showDepends === null || showDepends === void 0 ? void 0 : showDepends.every(function (i) {
+                return getFieldValue(i.name) === i.value;
               });
-              if (!isShow) return null;
-              return itemContent;
             }
-          })
-        }, name);
+            var itemContent = /*#__PURE__*/_jsx(HeadFormItem, _objectSpread(_objectSpread({}, itemProps), {}, {
+              dependParam: dependParam
+            }));
+            if (!isShow) return null;
+            return itemContent;
+          }
+        }, index);
       }
-      var itemContent = /*#__PURE__*/_jsx(HeadFormItem, {
-        groupItemNames: groupItemNames,
-        name: name,
-        value: value,
-        rules: rules,
-        label: label,
-        formItemLabelWidth: formItemLabelWidth
-      });
-      return /*#__PURE__*/_jsx(React.Fragment, {
-        children: itemContent
-      }, index);
+      return itemContent;
     });
   };
   var formStyles = {
@@ -183,16 +197,21 @@ function HeadComponent(_ref) {
         onFinish: onSearch,
         layout: "inline",
         style: formStyles,
-        children: [/*#__PURE__*/_jsxs("div", {
+        children: [/*#__PURE__*/_jsx("div", {
           style: {
-            justifyContent: isExpand && hasMore ? 'flex-start' : 'flex-end',
             height: isExpand ? 'auto' : controlHeight
           },
           className: "ccs-pl-adaptation-form",
-          ref: formItemsRef,
-          children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
-            ref: endItemRef
-          }), isExpand && renderSearchBtn]
+          children: /*#__PURE__*/_jsxs("div", {
+            className: "ccs-pl-form-".concat(isExpand && hasMore ? 'expand' : 'collapse'),
+            ref: formItemsRef,
+            children: [renderFormItems(), /*#__PURE__*/_jsx("div", {
+              style: {
+                height: 1
+              },
+              ref: endItemRef
+            }), isExpand && renderSearchBtn]
+          })
         }), !isExpand && /*#__PURE__*/_jsx("div", {
           style: {
             flex: '0 0 auto'

package/es/pro-table/index.less

@@ -62,12 +62,23 @@
     }
   }
 
-  &-adaptation-form {
-    flex: 1 1 auto;
+  &-form-collapse {
     display: flex;
     justify-content: flex-end;
     flex-wrap: wrap;
-    gap: 16px 10px;
+    column-gap: 10px;
+  }
+
+  &-form-expand {
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    column-gap: 10px;
+  }
+
+  &-adaptation-form {
+    flex: 1 1 auto;
+
     overflow: hidden;
 
     &::-webkit-scrollbar {
@@ -76,7 +87,7 @@
   }
 
   .ant-form-item {
-    margin-bottom: 0;
+    margin-bottom: 10px;
   }
 
   &-form {

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

@@ -13,14 +13,16 @@ export type ShowDependType = {
     value: any;
 };
 export declare enum TableEvent {
-    Search = "search",
-    Reset = "reset",
-    Reload = "reload",
-    ChangePage = "changePage",
-    InitSearch = "initSearch",
-    FullScreen = "fullScreen",
-    ColumnFilter = "columnFilter",
-    SelectedRows = "SelectedRows"
+    Search = "search",// 查询
+    Reset = "reset",// 重置
+    Reload = "reload",// 刷新
+    ChangePage = "changePage",// 分页
+    InitSearch = "initSearch",// 初始化查询
+    FullScreen = "fullScreen",// 全屏
+    ColumnFilter = "columnFilter",// 列过滤
+    SelectedRows = "SelectedRows",// 选中行
+    Expand = "Expand",// 异步树展开
+    PartialReload = "PartialReload"
 }
 export type TableColumn<RecordType = any> = (Omit<ColumnGroupType<RecordType>, 'ellipsis'> | Omit<ColumnType<RecordType>, 'ellipsis'>) & {
     dataIndex?: keyof RecordType;

package/es/pro-table/table.js

@@ -24,7 +24,7 @@ import _debounce from 'lodash.debounce';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsResizeObserver, useAppConfig, useCcsPage } from '..';
 import { useProTableFields } from "../hooks/use-app";
-import { getDataFromFields } from "../select";
+import { getDataByNamePath } from "../select";
 import CcsTable from "../table";
 import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
 import HeadComponent from "./head";
@@ -55,8 +55,10 @@ export var TableEvent = /*#__PURE__*/function (TableEvent) {
   TableEvent["FullScreen"] = "fullScreen";
   TableEvent["ColumnFilter"] = "columnFilter";
   TableEvent["SelectedRows"] = "SelectedRows";
+  TableEvent["Expand"] = "Expand";
+  TableEvent["PartialReload"] = "PartialReload";
   return TableEvent;
-}({});
+}({}); // 异步树局部刷新
 export var classPrefix = 'ccs-pl';
 
 /**
@@ -169,7 +171,7 @@ var InternalProTable = function InternalProTable(props) {
   var getFormValues = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _formRef$current;
-      var formValues;
+      var formValues, _delField;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -177,8 +179,19 @@ var InternalProTable = function InternalProTable(props) {
             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) {
@@ -189,7 +202,7 @@ var InternalProTable = function InternalProTable(props) {
               });
             }
             return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
-          case 5:
+          case 6:
           case "end":
             return _context.stop();
         }
@@ -274,9 +287,10 @@ var InternalProTable = function InternalProTable(props) {
               _context2.next = 19;
               break;
             }
-            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(params.query, record);
+            (_treeRef$current = treeRef.current) === null || _treeRef$current === void 0 || _treeRef$current.onRequestTree(eventType, params.query, record);
             return _context2.abrupt("return");
           case 19:
+            // 事件回调，请求中
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: true,
               params: params
@@ -292,6 +306,7 @@ var InternalProTable = function InternalProTable(props) {
             return httpRequest(params);
           case 23:
             requestResult = _context2.sent;
+            // 事件回调，请求完成
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: false,
               params: params,
@@ -304,11 +319,11 @@ var InternalProTable = function InternalProTable(props) {
               break;
             }
             // 获取table数据
-            dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // 默认添加一条数据
+            dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 默认添加一条数据
             if (table !== null && table !== void 0 && table.emptyDefaultOne && dataSource && dataSource.length === 0) {
               dataSource.push(_defineProperty({}, rowKey || 'id', '0'));
             }
-            total = getDataFromFields(requestResult, fieldNames.total);
+            total = getDataByNamePath(requestResult, fieldNames.total);
             if (!(total === undefined || dataSource === undefined)) {
               _context2.next = 33;
               break;
@@ -367,7 +382,7 @@ var InternalProTable = function InternalProTable(props) {
     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({}, treeNode);
+    (_treeRef$current3 = treeRef.current) === null || _treeRef$current3 === void 0 || _treeRef$current3.onRequestTree(TableEvent.PartialReload, {}, treeNode);
   };
   useEffect(function () {
     // 判断是否在弹出框中
@@ -547,6 +562,7 @@ var InternalProTable = function InternalProTable(props) {
         sticky: stickyRef.current || true,
         parentFieldName: parentFieldName,
         setData: setData,
+        onEvent: onEvent,
         handlePageChange: handlePageChange
       });
     }

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

@@ -4,12 +4,12 @@ import { RefObject } from 'react';
 import CCS from '..';
 import { CcsFieldNamesType } from '../context';
 import { TableRefType } from '../table';
-import { CcsProTableProps } from './table';
+import { CcsProTableProps, TableEvent } from './table';
 export type TreeInstance<T> = {
-    onRequestTree: (query: any, record: T | any) => void;
+    onRequestTree: (eventType: TableEvent, query: any, record: T | any) => void;
     onExpandKeys: (ids: string[]) => void;
 };
-type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode'> & {
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode' | 'onEvent'> & {
     data: CCS.TableData<T>;
     sticky: boolean | TableSticky;
     tableRowSize: TableProps['size'];

package/es/pro-table/tree.js

@@ -21,7 +21,8 @@ import CcsUtils from '@ccs-ui/utils';
 import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
 import { useProTableTreeFields } from "../hooks/use-app";
-import { getDataFromFields } from "../select";
+import { getDataByNamePath } from "../select";
+import { TableEvent } from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TableTree = function TableTree(props) {
   var data = props.data,
@@ -34,7 +35,8 @@ var TableTree = function TableTree(props) {
     tableContentRef = props.tableContentRef,
     parentFieldName = props.parentFieldName,
     handlePageChange = props.handlePageChange,
-    setData = props.setData;
+    setData = props.setData,
+    onEvent = props.onEvent;
   // async tree expand key
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -53,8 +55,8 @@ var TableTree = function TableTree(props) {
   var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), props.fieldNames);
 
   // 获取数据
-  var _onRequestTree = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onRequestTree = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
       var query,
         record,
         params,
@@ -64,13 +66,18 @@ var TableTree = function TableTree(props) {
       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;
+            query = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+            record = _args.length > 2 ? _args[2] : undefined;
             params = query;
             if (record) {
               params[parentFieldName] = record[rowKey];
             }
 
+            // 事件回调，请求中
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params
+            });
             // 发起请求
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -79,19 +86,25 @@ var TableTree = function TableTree(props) {
             });
             _context.t0 = httpRequest;
             if (!_context.t0) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
-            _context.next = 9;
+            _context.next = 10;
             return httpRequest(params);
-          case 9:
-            _context.t0 = _context.sent;
           case 10:
+            _context.t0 = _context.sent;
+          case 11:
             requestResult = _context.t0;
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params,
+              data: requestResult
+            });
+
             // 请求结果
             if (requestResult) {
               // 获取table数据
-              dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // 判断非叶子节点，添加children
+              dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 判断非叶子节点，添加children
               if (leafNode && dataSource && Array.isArray(dataSource)) {
                 dataSource.forEach(function (d) {
                   if (typeof leafNode === 'string' && !d[leafNode]) {
@@ -126,21 +139,19 @@ var TableTree = function TableTree(props) {
                 });
               });
             }
-          case 12:
+          case 14:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onRequestTree() {
+    return function onRequestTree(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   useImperativeHandle(treeRef, function () {
     return {
-      onRequestTree: function onRequestTree(query, record) {
-        _onRequestTree(query, record);
-      },
+      onRequestTree: onRequestTree,
       onExpandKeys: function onExpandKeys(ids) {
         setExpandKeys(expandKeys.filter(function (e) {
           return !ids.includes(e);
@@ -158,7 +169,7 @@ var TableTree = function TableTree(props) {
       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);
+      onRequestTree(TableEvent.Expand, {}, record);
     } else {
       setExpandKeys(expandKeys.filter(function (e) {
         return e !== expandId;

package/es/select/index.d.ts

@@ -1,8 +1,9 @@
 import { SelectProps } from 'antd';
+import { NamePath } from 'antd/es/form/interface';
 import ModalSelect from './ modal';
 import ApiSelect from './api';
 import CustomizeSelect from './customize';
-export declare function getDataFromFields(data: Record<string, any>, fields: string[]): any;
+export declare function getDataByNamePath(data: Record<string, any>, name: NamePath): any;
 export interface CcsSelectProps extends Omit<SelectProps, 'fieldNames'> {
     /** 配置全部选项 */
     showAll?: boolean | {

package/es/select/index.js

@@ -20,13 +20,16 @@ import ModalSelect from "./ modal";
 import ApiSelect from "./api";
 import CustomizeSelect from "./customize";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function getDataFromFields(data, fields) {
-  if (!data || fields.length === 0) return;
-  var newFields = _toConsumableArray(fields);
+export function getDataByNamePath(data, name) {
+  if (!data || !name) return;
+  if (typeof name === 'string') {
+    return data[name];
+  }
+  var newFields = _toConsumableArray(name);
   var field = newFields.shift();
   var newData = data[field];
   if (_typeof(newData) === 'object' && newFields.length > 0) {
-    return getDataFromFields(newData, newFields);
+    return getDataByNamePath(newData, newFields);
   }
   return newData;
 }
@@ -64,8 +67,8 @@ function InternalSelect(_ref) {
     while (labelField.length > 0 || valueField.length > 0) {
       if (Array.isArray(ops)) {
         ops.forEach(function (r) {
-          r.label = getDataFromFields(r, labelField);
-          r.value = getDataFromFields(r, valueField);
+          r.label = getDataByNamePath(r, labelField);
+          r.value = getDataByNamePath(r, valueField);
         });
         break;
       }

package/package.json

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