@ccs-ui/rc-pro 2.3.6-beta-40 → 2.4.0-beta.1

package/es/config.js

@@ -1,9 +1,13 @@
 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); }
+var _excluded = ["theme", "prefixCls"],
+  _excluded2 = ["token", "components"];
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _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); }
@@ -13,7 +17,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { darkTheme, defaultTheme } from '@ant-design/compatible';
 import { theme as antTheme, App, ConfigProvider, message, Modal, notification } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
-import React, { useState } from 'react';
+import { insertCss } from 'insert-css';
+import React, { useEffect, useState } from 'react';
 import { AppConfigContext } from "./context";
 import { DialogElementsHolder } from "./dialog/hook";
 import ThemeDialog from "./theme-dialog";
@@ -52,11 +57,24 @@ function AppConfig(_ref) {
     theme = _ref$theme === void 0 ? 'light' : _ref$theme,
     isCompact = _ref.isCompact,
     watermark = _ref.watermark,
-    themeConfig = _ref.themeConfig,
+    antConfig = _ref.antConfig,
     fieldNames = _ref.fieldNames;
   var dialogHolderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
+  var _ref2 = antConfig || {},
+    themeConfig = _ref2.theme,
+    _ref2$prefixCls = _ref2.prefixCls,
+    prefixCls = _ref2$prefixCls === void 0 ? 'ant' : _ref2$prefixCls,
+    otherAntConfig = _objectWithoutProperties(_ref2, _excluded);
+
+  // 传入的配置参数
+  var _ref3 = themeConfig || {},
+    token = _ref3.token,
+    components = _ref3.components,
+    otherThemeConfig = _objectWithoutProperties(_ref3, _excluded2);
+
+  // 主题算法
   var algorithm = function algorithm() {
     var algorithms = theme === 'dark' ? [antTheme.darkAlgorithm] : [antTheme.defaultAlgorithm];
     if (isCompact) {
@@ -64,23 +82,27 @@ function AppConfig(_ref) {
     }
     return algorithms;
   };
+  useEffect(function () {
+    var csss = [".".concat(prefixCls, "-drawer .").concat(prefixCls, "-drawer-extra >.").concat(prefixCls, "-btn+.").concat(prefixCls, "-btn {margin-inline-start: 8px;}"), ".ccs-dialog-drawer .".concat(prefixCls, "-drawer-footer{padding:0 !important;}"), ".ccs-tabs-auto-height > .".concat(prefixCls, "-tabs-content-holder,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content > div,\n      .ccs-tabs-auto-height> .").concat(prefixCls, "-tabs-content-holder> .").concat(prefixCls, "-tabs-content> div> .ccs-pl { height: 100%;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab {border: 0 !important;border-radius: 0 !important;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #f0f2f5 !important;}"), ".ccs-keep-alive .dark .ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #2b2c2c !important;} "), ".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} ")];
+    insertCss(csss.join(''));
+  }, []);
 
   // 合并token
-  var token = _objectSpread(_objectSpread({}, appTheme.token), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.token);
-
+  var newToken = _objectSpread(_objectSpread({}, appTheme.token), token);
   // 暗黑模式背景色
-  if (theme === 'dark') token.colorBgContainer = 'rgb(36, 37, 37)';
-  return /*#__PURE__*/_jsx(ConfigProvider, {
+  if (theme === 'dark') newToken.colorBgContainer = 'rgb(36, 37, 37)';
+  return /*#__PURE__*/_jsx(ConfigProvider, _objectSpread(_objectSpread({
     locale: zhCN,
-    theme: _objectSpread(_objectSpread({}, appTheme), {}, {
-      token: token,
-      components: _objectSpread(_objectSpread({}, appTheme.components), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.components),
+    prefixCls: prefixCls
+  }, otherAntConfig), {}, {
+    theme: _objectSpread(_objectSpread(_objectSpread({}, appTheme), otherThemeConfig), {}, {
+      token: newToken,
+      components: _objectSpread(_objectSpread({}, appTheme.components), components),
       algorithm: algorithm()
     }),
     children: /*#__PURE__*/_jsxs(AppConfigContext.Provider, {
       value: {
         theme: theme,
-        themeConfig: themeConfig,
         dialogHolderRef: dialogHolderRef,
         fieldNames: fieldNames
       },
@@ -92,7 +114,7 @@ function AppConfig(_ref) {
         zIndex: 105
       })]
     })
-  });
+  }));
 }
 export default function CssAppConfig(props) {
   return /*#__PURE__*/_jsx(App, {

package/es/context/index.d.ts

@@ -1,4 +1,4 @@
-import { TabPaneProps, ThemeConfig } from 'antd';
+import { ConfigProviderProps, TabPaneProps } from 'antd';
 import { Store } from 'antd/es/form/interface';
 import React from 'react';
 import { Location } from 'react-router';
@@ -90,7 +90,7 @@ type CssAppConfigType = {
     /** 主题 */
     theme?: 'dark' | 'light' | 'colorful';
     /** 主题参数配置 */
-    themeConfig?: ThemeConfig;
+    antConfig?: ConfigProviderProps;
     /** 紧凑模式 */
     isCompact?: boolean;
     /** 全局水印 */

package/es/date-picker/index.js

@@ -12,6 +12,25 @@ import { DatePicker } from 'antd';
 import dayjs from 'dayjs';
 import _isArray from 'lodash.isarray';
 import { jsx as _jsx } from "react/jsx-runtime";
+var rangePresets = [{
+  label: '今天',
+  value: [dayjs().startOf('day'), dayjs().endOf('day')]
+}, {
+  label: '最近3天',
+  value: [dayjs().add(-3, 'd'), dayjs()]
+}, {
+  label: '最近7天',
+  value: [dayjs().add(-7, 'd'), dayjs()]
+}, {
+  label: '最近14天',
+  value: [dayjs().add(-14, 'd'), dayjs()]
+}, {
+  label: '最近30天',
+  value: [dayjs().add(-30, 'd'), dayjs()]
+}, {
+  label: '最近90天',
+  value: [dayjs().add(-90, 'd'), dayjs()]
+}];
 function CcsDatePicker(_ref) {
   var value = _ref.value,
     onChange = _ref.onChange,
@@ -41,6 +60,7 @@ function RangePicker(_ref2) {
     if (onChange) onChange(dateString || undefined);
   };
   return /*#__PURE__*/_jsx(DatePicker.RangePicker, _objectSpread({
+    presets: restProps.picker === 'date' || !restProps.picker ? rangePresets : undefined,
     value: getDateValue(),
     onChange: handleOnChange
   }, restProps));

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

package/es/dialog/button.js

@@ -13,12 +13,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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 { CcsButton } from "./..";
+import { CcsButton } from '@ccs-ui/rc-pro';
 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/dialog/index.d.ts

@@ -3,7 +3,6 @@ import CcsDialogFooter from './button';
 import { useDialogContext } from './context';
 import CcsDrawerFooter from './drawer-footer';
 import useCcsDialog from './hook';
-import './index.less';
 type DialogInterface = {
     /** 获取openModal,openDrawer方法 */
     useDialog: typeof useCcsDialog;

package/es/dialog/index.js

@@ -3,7 +3,6 @@ import CcsDialogFooter from "./button";
 import { useDialogContext } from "./context";
 import CcsDrawerFooter from "./drawer-footer";
 import useCcsDialog from "./hook";
-import "./index.less";
 var CcsDialog = ThemeDialog;
 CcsDialog.Buttons = CcsDialogFooter;
 CcsDialog.useDialog = useCcsDialog;

package/es/ellipsis/index.js

@@ -114,8 +114,10 @@ var Ellipsis = function Ellipsis(p) {
       },
       placement: "bottomLeft",
       destroyTooltipOnHide: true,
-      overlayInnerStyle: {
-        whiteSpace: 'normal'
+      styles: {
+        body: {
+          whiteSpace: 'normal'
+        }
       },
       children: renderNode
     });

package/es/ellipsis/useResizeEffect.js

@@ -1,28 +1,14 @@
-import { useIsomorphicLayoutEffect, useMemoizedFn } from 'ahooks';
+import { useDebounceEffect, useMemoizedFn, useSize } from 'ahooks';
 import { useRef } from 'react';
 export function useResizeEffect(effect, targetRef) {
-  var ref = useRef(0);
   var fn = useMemoizedFn(effect);
-  useIsomorphicLayoutEffect(function () {
-    var target = targetRef.current;
-    if (!target) return;
-    if (window.ResizeObserver) {
-      var animationFrame;
-      var observer = new ResizeObserver(function () {
-        // 隐藏了，为0不处理
-        if (target.clientWidth === 0 || (target === null || target === void 0 ? void 0 : target.clientWidth) === ref.current) return;
-        animationFrame = window.requestAnimationFrame(function () {
-          return fn(target);
-        });
-        ref.current = target === null || target === void 0 ? void 0 : target.clientWidth;
-      });
-      observer.observe(target);
-      return function () {
-        window.cancelAnimationFrame(animationFrame);
-        observer.disconnect();
-      };
-    } else {
-      fn(target);
-    }
-  }, [targetRef]);
+  var widthRef = useRef();
+  var size = useSize(targetRef);
+  useDebounceEffect(function () {
+    if ((size === null || size === void 0 ? void 0 : size.width) === 0 || (size === null || size === void 0 ? void 0 : size.width) === widthRef.current) return;
+    fn(targetRef.current);
+    widthRef.current = size === null || size === void 0 ? void 0 : size.width;
+  }, [size === null || size === void 0 ? void 0 : size.width], {
+    wait: 500
+  });
 }

package/es/group-form-item/index.d.ts

@@ -0,0 +1,11 @@
+import { FormItemProps } from 'antd';
+import { NamePath } from 'antd/es/form/interface';
+export type GroupFormItemProps = FormItemProps & {
+    /** 组表单项名称 */
+    groupItemNames: NamePath[];
+};
+declare function GroupFormItem({ groupItemNames, name, ...formItemProps }: GroupFormItemProps): import("react/jsx-runtime").JSX.Element;
+declare namespace GroupFormItem {
+    var displayName: string;
+}
+export default GroupFormItem;

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

@@ -0,0 +1,124 @@
+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); }
+var _excluded = ["groupItemNames", "name"];
+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 _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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _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 _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); }
+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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import { useUpdateEffect } from 'ahooks';
+import { Form } from 'antd';
+import { useEffect, useState } from 'react';
+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";
+var FormUpdateItem = function FormUpdateItem(_ref) {
+  var name = _ref.name,
+    getFieldsValue = _ref.getFieldsValue,
+    setFieldValue = _ref.setFieldValue,
+    getFieldValue = _ref.getFieldValue,
+    groupItemNames = _ref.groupItemNames;
+  var nameValue = getFieldValue(name);
+  useEffect(function () {
+    // 初始值
+    var initialValues = getFieldsValue(true);
+    var initNameValue = [];
+
+    // 根据子项初始值设置name的默认值
+    groupItemNames.forEach(function (item) {
+      initNameValue.push(getDataByNamePath(initialValues, item));
+    });
+
+    // 如果子项有初始值，则设置name的默认值
+    if (initNameValue.filter(function (n) {
+      return n !== undefined;
+    }).length > 0) {
+      setFieldValue(name, initNameValue);
+      return;
+    }
+
+    // 如果子项没有初始值，主项有初始值
+    var groupNameValue = getDataByNamePath(initialValues, name);
+    if (Array.isArray(groupNameValue)) {
+      groupItemNames.forEach(function (item, index) {
+        setFieldValue(item, groupNameValue[index]);
+      });
+    }
+  }, []);
+
+  // 依赖主字段变更，更新子项属性值
+  useUpdateEffect(function () {
+    setTimeout(function () {
+      groupItemNames.forEach(function (item, index) {
+        setFieldValue(item, Array.isArray(nameValue) ? nameValue[index] : undefined);
+      });
+    }, 1);
+  }, [nameValue]);
+  return null;
+};
+function onGetNameValue() {
+  var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var name = arguments.length > 1 ? arguments[1] : undefined;
+  if (!obj) return undefined;
+  if (Array.isArray(name)) {
+    var names = _toConsumableArray(name);
+    var newName = names.shift();
+    if (names.length === 0) return obj[newName];
+    return onGetNameValue(obj[newName], names);
+  }
+  return obj[name];
+}
+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, ''), "_")),
+    _useState2 = _slicedToArray(_useState, 1),
+    itemName = _useState2[0];
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(Form.Item, _objectSpread({
+      name: itemName
+    }, formItemProps)), groupItemNames && groupItemNames.length > 0 && /*#__PURE__*/_jsxs(_Fragment, {
+      children: [/*#__PURE__*/_jsx(Form.Item, {
+        noStyle: true,
+        shouldUpdate: function shouldUpdate(l, r) {
+          return onGetNameValue(l, itemName) !== onGetNameValue(r, itemName);
+        },
+        children: function children(_ref3) {
+          var getFieldsValue = _ref3.getFieldsValue,
+            setFieldValue = _ref3.setFieldValue,
+            getFieldValue = _ref3.getFieldValue;
+          return /*#__PURE__*/_jsx(FormUpdateItem, {
+            getFieldsValue: getFieldsValue,
+            setFieldValue: setFieldValue,
+            getFieldValue: getFieldValue,
+            groupItemNames: groupItemNames,
+            name: itemName
+          });
+        }
+      }), groupItemNames.map(function (item, index) {
+        return /*#__PURE__*/_jsx(Form.Item, {
+          noStyle: true,
+          name: item,
+          hidden: true
+        }, index);
+      })]
+    })]
+  });
+}
+if (process.env.NODE_ENV !== 'production') {
+  GroupFormItem.displayName = 'CcsGroupFormItem';
+}
+export default GroupFormItem;

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

@@ -3,7 +3,7 @@ declare const usePage: () => {
     id: string;
     location: import("react-router").Location<any>;
     isActive: boolean;
-    dialogHolderRef: import("react").RefObject<import("../dialog/hook").ElementsHolderRef>;
+    dialogHolderRef: import("react").RefObject<import("@ccs-ui/packages/rc-pro/src/dialog/hook").ElementsHolderRef>;
     onDestroy: (path: string) => void;
     onAuth: (code: string) => boolean;
 };

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

@@ -1,28 +1,17 @@
-import { RowSelectMethod } from 'antd/es/table/interface';
+import { SelectProps } from 'antd';
+import { TableRowSelection } from 'antd/es/table/interface';
 import React from 'react';
-interface PropsType<T> {
-    /** 表单受控 value */
-    value?: any[];
+type PropsType<T> = Pick<SelectProps, 'value' | 'onChange'> & Omit<TableRowSelection<T>, 'value' | 'onChange' | 'renderCell'> & {
+    /** rowKey 字段，选中key值 */
+    keyField: string;
     /** 默认选择行数据,一般用于回显数据 */
     defaultRows?: T[];
-    /** 是否多选 */
-    multiple?: boolean;
-    /** 字段配置,默认 { key: 'key'; label: 'label' } */
-    keyField: string;
-    /** 表单受控 onChange*/
-    onChange?: (value: any) => void;
-    /** 设置选项 */
-    onChangeOptions?: (options: any[]) => void;
-}
-export default function useTableSelection<T = any>(props: PropsType<T>): {
-    onChange: (keys: React.Key[], rows: T[], info: {
-        type: RowSelectMethod;
-    }) => void;
-    onClear: (key?: React.Key) => void;
-    selectedRowKeys?: React.Key[] | undefined;
-    selectedRows?: T[] | undefined;
-    info: {
-        type: RowSelectMethod;
-    };
+    /** 选中行数据回调 */
+    onChangeRows?: (options: any[]) => void;
 };
+interface ReturnType<T> extends Omit<TableRowSelection<T>, 'renderCell'> {
+    selectedRows?: T[];
+    onClear: (key?: React.Key) => void;
+}
+export default function useTableSelection<T = any>(props: PropsType<T>): ReturnType<T>;
 export {};

package/es/hooks/use-selection.js

@@ -1,15 +1,18 @@
+var _excluded = ["value", "type", "defaultRows", "keyField", "onChangeRows", "onChange"];
 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 _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 _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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { useEffect, useRef, useState } from 'react';
 // 判断相对
@@ -21,34 +24,53 @@ function isEq(obj1, obj2) {
   }
   return JSON.stringify(o1) !== JSON.stringify(o2);
 }
+function onGetKeys(value, keyField) {
+  if (value === undefined) return value;
+  if (Array.isArray(value)) {
+    return value.map(function (item) {
+      return _typeof(item) === 'object' ? item[keyField] : item;
+    });
+  }
+  if (_typeof(value) === 'object') {
+    return value[keyField];
+  }
+  return [value];
+}
 export default function useTableSelection(props) {
   var _ref = props || {},
     value = _ref.value,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'checkbox' : _ref$type,
     defaultRows = _ref.defaultRows,
     _ref$keyField = _ref.keyField,
     keyField = _ref$keyField === void 0 ? 'key' : _ref$keyField,
-    multiple = _ref.multiple,
+    onChangeRows = _ref.onChangeRows,
     onChangeValue = _ref.onChange,
-    onChangeOptions = _ref.onChangeOptions;
+    rowSelectionProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     setUpdate = _useState2[1];
   var selectionRef = useRef({
-    selectedRowKeys: ['number', 'string'].includes(_typeof(value)) ? [value] : value,
+    selectedRowKeys: onGetKeys(value, keyField),
     selectedRows: defaultRows,
     info: {
       type: 'none'
     }
   });
+  var isMultiple = type === 'checkbox';
   var handleOnChange = useMemoizedFn(function () {
-    var _selectionRef$current = selectionRef.current.selectedRowKeys,
-      selectedRowKeys = _selectionRef$current === void 0 ? [] : _selectionRef$current;
-    if (multiple) {
+    var _selectionRef$current = selectionRef.current,
+      _selectionRef$current2 = _selectionRef$current.selectedRowKeys,
+      selectedRowKeys = _selectionRef$current2 === void 0 ? [] : _selectionRef$current2,
+      _selectionRef$current3 = _selectionRef$current.selectedRows,
+      selectedRows = _selectionRef$current3 === void 0 ? [] : _selectionRef$current3;
+    if (isMultiple) {
       // 受控调用onChange
-      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys);
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys, selectedRows);
     } else {
-      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys[0]);
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys[0], selectedRows[0]);
     }
+    onChangeRows === null || onChangeRows === void 0 || onChangeRows(selectedRows || []);
     if (!onChangeValue) setUpdate({});
   });
 
@@ -58,22 +80,23 @@ export default function useTableSelection(props) {
       selectionRef.current.selectedRows = defaultRows;
 
       // 生成选项
-      if (onChangeOptions) onChangeOptions(defaultRows);
+      if (onChangeRows) onChangeRows(defaultRows);
       setUpdate({});
     }
   }, [defaultRows]);
 
   // value 变更,与当前选中数据不匹配
   useUpdateEffect(function () {
-    if (isEq(value, selectionRef.current.selectedRowKeys)) {
-      var _selectionRef$current2;
-      var rows = (_selectionRef$current2 = selectionRef.current.selectedRows) === null || _selectionRef$current2 === void 0 ? void 0 : _selectionRef$current2.filter(function () {
+    var newValue = onGetKeys(value, keyField);
+    if (isEq(newValue, selectionRef.current.selectedRowKeys)) {
+      var _selectionRef$current4;
+      var rows = (_selectionRef$current4 = selectionRef.current.selectedRows) === null || _selectionRef$current4 === void 0 ? void 0 : _selectionRef$current4.filter(function () {
         var _ref2;
         var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        return (_ref2 = value || []) === null || _ref2 === void 0 ? void 0 : _ref2.includes(row[keyField]);
+        return (_ref2 = newValue || []) === null || _ref2 === void 0 ? void 0 : _ref2.includes(row[keyField]);
       });
       selectionRef.current = {
-        selectedRowKeys: value,
+        selectedRowKeys: newValue === undefined && isMultiple ? [] : newValue,
         selectedRows: rows,
         info: {
           type: 'none'
@@ -101,7 +124,6 @@ export default function useTableSelection(props) {
         }
       });
     }
-    onChangeOptions === null || onChangeOptions === void 0 || onChangeOptions(rows);
     handleOnChange();
   });
 
@@ -110,18 +132,18 @@ export default function useTableSelection(props) {
     // 未传入key，删除全部
     if (!key) {
       selectionRef.current = {
-        selectedRowKeys: undefined,
-        selectedRows: undefined,
+        selectedRowKeys: [],
+        selectedRows: [],
         info: {
           type: 'none'
         }
       };
     } else {
-      var _selectionRef$current3 = selectionRef.current,
-        _selectionRef$current4 = _selectionRef$current3.selectedRowKeys,
-        selectedRowKeys = _selectionRef$current4 === void 0 ? [] : _selectionRef$current4,
-        _selectionRef$current5 = _selectionRef$current3.selectedRows,
-        selectedRows = _selectionRef$current5 === void 0 ? [] : _selectionRef$current5;
+      var _selectionRef$current5 = selectionRef.current,
+        _selectionRef$current6 = _selectionRef$current5.selectedRowKeys,
+        selectedRowKeys = _selectionRef$current6 === void 0 ? [] : _selectionRef$current6,
+        _selectionRef$current7 = _selectionRef$current5.selectedRows,
+        selectedRows = _selectionRef$current7 === void 0 ? [] : _selectionRef$current7;
       var newRows = selectedRows.filter(function () {
         var r = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return r[keyField] !== key;
@@ -139,8 +161,12 @@ export default function useTableSelection(props) {
     }
     handleOnChange();
   });
-  return _objectSpread(_objectSpread({}, selectionRef.current), {}, {
+  return _objectSpread(_objectSpread(_objectSpread({}, selectionRef.current), {}, {
     onChange: onChange,
-    onClear: onClear
+    onClear: onClear,
+    type: type
+  }, rowSelectionProps), {}, {
+    // @ts-ignore
+    onClearByProTable: onClear
   });
 }

package/es/index.d.ts

@@ -9,6 +9,7 @@ export { default as CcsDialog } from './dialog';
 export { default as CcsEditor } from './editor';
 export { default as CcsEllipsis } from './ellipsis';
 export { default as CcsFullScreenButton } from './full-screen';
+export { default as CcsGroupFormItem } from './group-form-item';
 export { default as useAppConfig } from './hooks/use-app';
 export { default as useCcsOnceEvent } from './hooks/use-once-event';
 export { default as useCcsPage } from './hooks/use-page';
@@ -19,7 +20,6 @@ export { default as CcsIntervalButton } from './interval-button';
 export { default as CcsKeepAliveTabs } from './layout-keep-alive';
 export { default as CcsSinglePage } from './layout-single-page';
 export { default as CcsLoading } from './loading';
-export { default as CcsProGrid } from './pro-grid';
 export { default as CcsProTable } from './pro-table';
 export { default as CcsProTabs } from './pro-tabs';
 export { default as CcsResizeObserver } from './resize-observer';
@@ -28,9 +28,7 @@ export { default as CcsSelect } from './select';
 export { default as CcsStatusTag } from './status-tag';
 export { default as CcsTable } from './table';
 export { default as CcsTimePicker } from './time-picker';
-export { default as CcsTrigger } from './trigger';
 export { default as CcsUpload } from './upload';
-export { default as CcsVirtualList } from './virtual-list';
 export { default as CcsWaterMark } from './water-mark';
 import * as CCS from './ccs';
 export default CCS;