@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/es/style/theme/antd.less

@@ -1,6 +1,4 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-@import './index';
+@import './base';
 
 @zat-disabled-color: #bcbcbc;
 
@@ -71,6 +69,7 @@
       }
     }
 
+
     .@{ant-prefix}-form-item-explain-error {
       .set-text-size();
     }
@@ -88,7 +87,7 @@
   }
 
   .@{ant-prefix}-form-item {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
+    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
   }
 }
 
@@ -104,6 +103,10 @@
 
 // ant-table
 .@{ant-prefix}-table {
+
+  .@{ant-prefix}-table-row.@{ant-prefix}-table-row-selected >.@{ant-prefix}-table-cell-row-hover{
+    background-color: #e6f4ff !important;
+  }
   .@{ant-prefix}-empty-normal {
     margin: calc(var(--zaui-space-size-lg; 32px) * var(--zaui-size; 1)) 0;
   }
@@ -165,7 +168,7 @@
     }
 
     tr.@{ant-prefix}-table-row:hover td {
-      background-color: @zaui-table-hover-bg !important;
+      background-color: @zaui-table-hover-bg;
     }
 
     & > tr > td {
@@ -303,7 +306,7 @@
         }
 
         .@{ant-prefix}-table-row:nth-child(odd) {
-          background-color: @zaui-table-strip-bg !important;
+          background-color: @zaui-table-strip-bg;
 
           & td {
             background-color: @zaui-table-strip-bg !important;
@@ -334,6 +337,12 @@
         }
       }
 
+      &.@{ant-prefix}-table-tbody-virtual {
+        .@{ant-prefix}-table-row:nth-child(odd),.@{ant-prefix}-table-row:nth-child(even) {
+          background-color: transparent !important;
+        }
+      }
+
       .@{ant-prefix}-table-row:nth-child(odd) {
         background-color: @zaui-table-strip-bg;
 
@@ -342,6 +351,8 @@
         }
       }
     }
+    
+
   }
 }
 
@@ -412,7 +423,7 @@
   &.@{ant-prefix}-btn-link[disabled]:hover,
   &.@{ant-prefix}-btn-link[disabled]:focus,
   &.@{ant-prefix}-btn-link[disabled]:active {
-    color: @zat-disabled-color;
+    color: @zat-disabled-color !important;
     text-shadow: none;
     background: none;
     border-color: none;
@@ -421,7 +432,12 @@
   }
 
   &.@{ant-prefix}-btn-link {
-    .set-brand-color();
+    .set-brand-color() !important;
+    background: none !important;
+    box-shadow: none !important;
+    &:hover {
+      color: @zaui-brand !important;
+    }
   }
 }
 
@@ -656,35 +672,6 @@
   width: 100%;
 }
 
-.@{ant-prefix}-input-textarea {
-  position: relative;
-
-  textarea.@{ant-prefix}-input {
-    padding-bottom: 20px;
-  }
-
-  &.@{ant-prefix}-input-textarea-show-count.@{ant-prefix}-input-textarea-in-form-item {
-    &::after {
-      background: transparent;
-    }
-
-    &.disabled {
-      &::after {
-        background: #f2f2f2;
-      }
-    }
-
-    &::after {
-      position: absolute;
-      right: 16px;
-      bottom: 1px;
-      width: calc(100% - 18px);
-      margin-bottom: 0;
-      text-align: right;
-    }
-  }
-}
-
 // 间隔
 .@{ant-prefix}-space {
   &.@{ant-prefix}-space-vertical {
@@ -725,6 +712,16 @@
 
 // tooltip样式重载
 .@{ant-prefix}-tooltip {
+  > .@{ant-prefix}-tooltip-arrow {
+    &::before,
+    &::after {
+      background: linear-gradient(
+        to right bottom,
+        rgba(255, 255, 255, 0.95),
+        rgba(255, 255, 255, 1)
+      );
+    }
+  }
   > .@{ant-prefix}-tooltip-content {
     > .@{ant-prefix}-tooltip-inner {
       max-height: 360px;
@@ -736,24 +733,15 @@
         0 9px 28px 8px rgba(0, 0, 0, 0.05);
       &::selection {
         color: inherit !important;
-        background: rgba(@primary-color, 0.3) !important;
+        background: rgba(0, 106, 255, 0.3) !important;
       }
       > div {
         &::selection {
           color: inherit !important;
-          background: rgba(@primary-color, 0.3) !important;
+          background: rgba(0, 106, 255, 0.3) !important;
         }
       }
     }
-    > .@{ant-prefix}-tooltip-arrow {
-      > .@{ant-prefix}-tooltip-arrow-content {
-        --antd-arrow-background-color: linear-gradient(
-          to right bottom,
-          rgba(255, 255, 255, 0.95),
-          rgba(255, 255, 255, 1)
-        );
-      }
-    }
   }
 }
 

package/es/style/theme/base.less

@@ -0,0 +1,90 @@
+@ant-prefix: ant;
+@import '../core/index.less';
+@import './tokens.less';
+
+/* 兼容IE11  默认会生成2个值，默认值，var值。IE11下读取默认值 */
+:root {
+  --zaui-global-bg                  : #ffffff;
+  --zaui-base-bg                    : #ffffff;
+  --zaui-brand                      : #006aff;
+  --zaui-brand-hover                : #3387ff;
+  --zaui-brand-active               : #005ad9;
+  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
+  --zaui-text                       : #343434;
+  --zaui-text-weak                  : #616161;
+  --zaui-aide-text                  : #909090;
+  --zaui-placeholder                : #a0a0a0;
+  --zaui-link                       : var(--zaui-brand);
+  --zaui-link-light-active          : var(--zaui-brand-active);
+  --zaui-line                       : #dcdcdc;
+  --zaui-dividing-line              : #dcdcdc;
+  --zaui-area                       : #fafafa;
+  --zaui-shadow                     : rgba(56, 56, 56, 0.15);
+  --zaui-form-control-line          : var(--zaui-line);
+  --zaui-form-control-line-hover    : var(--zaui-brand-hover);
+  --zaui-form-control-line-active   : var(--zaui-brand-active);
+  --zaui-list-item-active-bg        : var(--zaui-brand);
+  --zaui-list-item-active-hover-bg  : var(--zaui-brand);
+  --zaui-list-item-selected-bg      : var(--zaui-brand);
+  --zaui-list-item-selected-hover-bg: var(--zaui-brand);
+  --zaui-disabled-bg                : #f2f2f2;
+  --zaui-disabled-text              : #333333;
+  --zaui-feedback-overlay-bg        : rgba(0, 0, 0, 0.7);
+  --zaui-feedback-overlay-text      : #343434;
+  --zaui-primary                    : var(--zaui-brand);
+  --zaui-primary-hover              : var(--zaui-brand-hover);
+  --zaui-primary-active             : var(--zaui-brand-active);
+  --zaui-danger-line                : var(--zaui-line);
+  --zaui-danger-bg                  : #fff2f0;
+  --zaui-warning-line               : var(--zaui-line);
+  --zaui-warning-bg                 : #fffbe6;
+  --zaui-info-line                  : var(--zaui-line);
+  --zaui-info-bg                    : #e6f7ff;
+  --zaui-success-line               : var(--zaui-line);
+  --zaui-success-bg                 : #f6ffed;
+  --zaui-danger                     : #ff5050;
+  --zaui-warning                    : #ec9131;
+  --zaui-success                    : #00ae4d;
+  --zaui-menu-top-bg                : #ffffff;
+  --zaui-menu-left-bg               : #1a202d;
+  --zaui-menu-second-bg             : #ffffff;
+  --zaui-form-align                 : left;
+  --zaui-table-header-bg            : #f2f3f5;
+  --zaui-table-strip-bg             : #fafafa;
+  --zaui-table-hover-bg             : #fafafa;
+  --zaui-table-selected-bg          : var(--zaui-table-hover-bg); // 默认同悬停
+  --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
+  --zaui-table-nested-bg            : #fafcfe;
+  --zaui-contract-bg                : #fffaa1; // 对比背景色
+  --zaui-contract-bg-add            : #d2fff4; // 新增对比背景色
+  --zaui-form-label-width           : 130px; // 8个全角字符宽度
+  --zaui-border-radius              : 8px;
+  --zaui-border-radius-card         : 4px;
+  --zaui-font-size-title            : 16px;
+  --zaui-font-size-card-title       : var(--zaui-font-size-title);
+  --zaui-font-size                  : 14px;
+  --zaui-font-size-sm               : 12px;
+  --zaui-font-size-md               : var(--zaui-font-size);
+  --zaui-font-size-lg               : 16px;
+  --zaui-font-size-xl               : 18px;
+  --zaui-font-size-xxl              : 20px;
+  --zaui-font-size-lg-title         : 24px;
+  --zaui-height-border              : var(--zaui-height-size-md);
+  --zaui-height-card                : var(--zaui-height-size-lg);
+  --zaui-height-size-xs             : 4px;
+  --zaui-height-size-sm             : 8px;
+  --zaui-height-size-md             : 16px;
+  --zaui-height-size-lg             : 32px;
+  --zaui-height-size-xl             : 64px;
+  --zaui-space-border               : var(--zaui-space-size-md); // 兼容1.1.35一下版本 变量
+  --zaui-space-card                 : var(--zaui-space-size-lg);
+  --zaui-space-size-xs              : 4px;
+  --zaui-space-size-sm              : 8px;
+  --zaui-space-size-md              : 16px;
+  --zaui-space-size-lg              : 32px;
+  --zaui-space-size-xl              : 64px;
+
+  --zaui-line-height-base: 1.5;
+  --zaui-size            : 1;
+  --zaui-base-font-size  : 0px;
+} 

package/es/style/theme/index.less

@@ -1,89 +1,2 @@
-@import '../core/index.less';
-@import './tokens.less';
-
-/* 兼容IE11  默认会生成2个值，默认值，var值。IE11下读取默认值 */
-:root {
-  --zaui-global-bg                  : #ffffff;
-  --zaui-base-bg                    : #ffffff;
-  --zaui-brand                      : #006aff;
-  --zaui-brand-hover                : #3387ff;
-  --zaui-brand-active               : #005ad9;
-  --zaui-brand-disabled             : color-mix(in srgb, var(--zaui-brand) 70%, white);
-  --zaui-text                       : #343434;
-  --zaui-text-weak                  : #616161;
-  --zaui-aide-text                  : #909090;
-  --zaui-placeholder                : #a0a0a0;
-  --zaui-link                       : var(--zaui-brand);
-  --zaui-link-light-active          : var(--zaui-brand-active);
-  --zaui-line                       : #dcdcdc;
-  --zaui-dividing-line              : #dcdcdc;
-  --zaui-area                       : #fafafa;
-  --zaui-shadow                     : rgba(56, 56, 56, 0.15);
-  --zaui-form-control-line          : var(--zaui-line);
-  --zaui-form-control-line-hover    : var(--zaui-brand-hover);
-  --zaui-form-control-line-active   : var(--zaui-brand-active);
-  --zaui-list-item-active-bg        : var(--zaui-brand);
-  --zaui-list-item-active-hover-bg  : var(--zaui-brand);
-  --zaui-list-item-selected-bg      : var(--zaui-brand);
-  --zaui-list-item-selected-hover-bg: var(--zaui-brand);
-  --zaui-disabled-bg                : #f2f2f2;
-  --zaui-disabled-text              : #333333;
-  --zaui-feedback-overlay-bg        : rgba(0, 0, 0, 0.7);
-  --zaui-feedback-overlay-text      : #343434;
-  --zaui-primary                    : var(--zaui-brand);
-  --zaui-primary-hover              : var(--zaui-brand-hover);
-  --zaui-primary-active             : var(--zaui-brand-active);
-  --zaui-danger-line                : var(--zaui-line);
-  --zaui-danger-bg                  : #fff2f0;
-  --zaui-warning-line               : var(--zaui-line);
-  --zaui-warning-bg                 : #fffbe6;
-  --zaui-info-line                  : var(--zaui-line);
-  --zaui-info-bg                    : #e6f7ff;
-  --zaui-success-line               : var(--zaui-line);
-  --zaui-success-bg                 : #f6ffed;
-  --zaui-danger                     : #ff5050;
-  --zaui-warning                    : #ec9131;
-  --zaui-success                    : #00ae4d;
-  --zaui-menu-top-bg                : #ffffff;
-  --zaui-menu-left-bg               : #1a202d;
-  --zaui-menu-second-bg             : #ffffff;
-  --zaui-form-align                 : left;
-  --zaui-table-header-bg            : #f2f3f5;
-  --zaui-table-strip-bg             : #fafafa;
-  --zaui-table-hover-bg             : #fafafa;
-  --zaui-table-selected-bg          : var(--zaui-table-hover-bg); // 默认同悬停
-  --zaui-table-selected-hover-bg    : var(--zaui-table-hover-bg); // 默认同悬停
-  --zaui-table-nested-bg            : #fafcfe;
-  --zaui-contract-bg                : #fffaa1; // 对比背景色
-  --zaui-contract-bg-add            : #d2fff4; // 新增对比背景色
-  --zaui-form-label-width           : 130px; // 8个全角字符宽度
-  --zaui-border-radius              : 8px;
-  --zaui-border-radius-card         : 4px;
-  --zaui-font-size-title            : 16px;
-  --zaui-font-size-card-title       : var(--zaui-font-size-title);
-  --zaui-font-size                  : 14px;
-  --zaui-font-size-sm               : 12px;
-  --zaui-font-size-md               : var(--zaui-font-size);
-  --zaui-font-size-lg               : 16px;
-  --zaui-font-size-xl               : 18px;
-  --zaui-font-size-xxl              : 20px;
-  --zaui-font-size-lg-title         : 24px;
-  --zaui-height-border              : var(--zaui-height-size-md);
-  --zaui-height-card                : var(--zaui-height-size-lg);
-  --zaui-height-size-xs             : 4px;
-  --zaui-height-size-sm             : 8px;
-  --zaui-height-size-md             : 16px;
-  --zaui-height-size-lg             : 32px;
-  --zaui-height-size-xl             : 64px;
-  --zaui-space-border               : var(--zaui-space-size-md); // 兼容1.1.35一下版本 变量
-  --zaui-space-card                 : var(--zaui-space-size-lg);
-  --zaui-space-size-xs              : 4px;
-  --zaui-space-size-sm              : 8px;
-  --zaui-space-size-md              : 16px;
-  --zaui-space-size-lg              : 32px;
-  --zaui-space-size-xl              : 64px;
-
-  --zaui-line-height-base: 1.5;
-  --zaui-size            : 1;
-  --zaui-base-font-size  : 0px;
-}
+// 引用基础主题文件，避免重复
+@import './base.less';

package/es/utils/index.d.ts

@@ -1,3 +1,10 @@
+export declare const customEqualForFunction: (value: any, other: any) => boolean;
+/**
+ * 兼容 React17/18 的 startTransition。
+ *  - React18+: 使用原生 startTransition
+ *  - React17 : 直接执行回调
+ */
+export declare function compatStartTransition(cb: () => void): void;
 /**
  * 判断一个值是否是空值
  * 空值 或者 仅包含空值的数组视为空

package/es/utils/index.js

@@ -1,7 +1,43 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
+import { isFunction } from 'lodash';
 var EMPTY_VALUE = [undefined, null, ''];
 
+// 自定义深比对 如果两边都是函数类型则认为相等
+// 对于 React 元素，不直接认为相等，而是让 lodash 继续进行深度比较
+export var customEqualForFunction = (value, other) => {
+  // 只有当两边都是函数时才认为相等
+  if (isFunction(value) && isFunction(other)) {
+    return true;
+  }
+  // 对于 React 元素，返回 undefined 让 isEqualWith 继续使用默认比较逻辑
+  // 这样会比较 React 元素的 type、props 等属性
+  if ( /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
+    // 比较 React 元素的类型和关键 props
+    if (value.type !== other.type) {
+      return false;
+    }
+    // 对于相同类型的 React 元素，返回 undefined 让 isEqualWith 继续深度比较 props
+    return undefined;
+  }
+};
+
+/**
+ * 兼容 React17/18 的 startTransition。
+ *  - React18+: 使用原生 startTransition
+ *  - React17 : 直接执行回调
+ */
+export function compatStartTransition(cb) {
+  var maybeStartTransition = React.startTransition;
+  if (typeof maybeStartTransition === 'function') {
+    // React 18+
+    maybeStartTransition(cb);
+  } else {
+    // React 17 及以下
+    cb();
+  }
+}
+
 /**
  * 判断一个值是否是空值
  * 空值 或者 仅包含空值的数组视为空

package/lib/FormsProvider/index.d.ts

@@ -11,5 +11,8 @@ export declare const FormsContext: React.Context<Forms>;
 export declare const useForms: () => Forms;
 /** 获取所有表单实例 */
 export declare const useContextForms: () => Forms;
-declare const FormsProvider: React.FC;
+interface FormsProviderProps {
+    children?: React.ReactNode;
+}
+declare const FormsProvider: React.FC<FormsProviderProps>;
 export default FormsProvider;

package/lib/ProAction/components/CheckModalContent/index.js

@@ -6,15 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 require("./index.less");
 var _jsxRuntime = require("react/jsx-runtime");
-/*
- * @Author: za-xuwenli xuwenli@zhongan.io
- * @Date: 2025-02-17 11:49:02
- * @LastEditors: za-xuwenli xuwenli@zhongan.io
- * @LastEditTime: 2025-05-29 13:55:34
- * @FilePath: /zat-wjs-pro-product-web/src/components/CheckModalContent/index.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-
 var CheckModalContent = props => {
   var _ref = props !== null && props !== void 0 ? props : {},
     errorTitle = _ref.errorTitle,

package/lib/ProAction/index.js

@@ -6,15 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/popconfirm/style");
-var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-require("antd/es/form/style");
-var _form = _interopRequireDefault(require("antd/es/form"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _lodash = require("lodash");
 var _CheckModalContent = _interopRequireDefault(require("./components/CheckModalContent"));
 var _index = require("../index");
@@ -25,7 +22,7 @@ var ProAction = props => {
   var _config$, _config$2, _locale$ProAction2, _config$index;
   var children = props.children,
     config = props.config;
-  var _Form$useForm = _form.default.useForm(),
+  var _Form$useForm = _antd.Form.useForm(),
     _Form$useForm2 = (0, _slicedToArray2.default)(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useSetState = (0, _ahooks.useSetState)({
@@ -196,7 +193,7 @@ var ProAction = props => {
     return TargetComponent;
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_popconfirm.default, {
+    children: [((_config$ = config[0]) === null || _config$ === void 0 ? void 0 : _config$.mode) === 'confirm' ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popconfirm, {
       onConfirm: () => onActionRun(0, []),
       title: ((_config$2 = config[0]) === null || _config$2 === void 0 ? void 0 : _config$2.title) || (_locale.default === null || _locale.default === void 0 || (_locale$ProAction2 = _locale.default.ProAction) === null || _locale$ProAction2 === void 0 ? void 0 : _locale$ProAction2.defaultTitle),
       children: children

package/lib/ProAction/index.less

@@ -1,5 +1,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-action-error-modal {
   .ant-modal-content {

package/lib/ProConfigProvider/index.d.ts

@@ -1,6 +1,6 @@
 import React, { FC } from 'react';
 import { FormInstance } from 'antd';
-import 'moment/locale/zh-cn';
+import 'dayjs/locale/zh-cn';
 import type { PropSelectType } from '../ProSelect/propsType';
 import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
 import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
@@ -21,14 +21,31 @@ interface ConfigContext {
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
-interface Actions {
-    type: ActionsType;
+type Actions = {
+    type: 'setFormRef';
+    name: string;
+    value: FormInstance;
+} | {
+    type: 'deleteFormRef';
+    name: string;
+} | {
+    type: 'set';
+    payload: ProConfigState;
+} | {
+    type: 'setProEnum';
+    payload: Record<string, any>;
+} | {
+    type: 'setProEnumDic';
+    key: string;
     payload: any;
-}
+} | {
+    type: 'setWithLocal';
+    payload: ProConfigState;
+};
 export declare const ProConfigProvider: FC<{
     value?: ProConfigState;
     locale?: string;
     onSuccess?: (data: any, params: any) => void;
+    children?: React.ReactNode;
 }>;
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js

@@ -7,18 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
 exports.useProConfig = useProConfig;
-require("antd/es/config-provider/style");
-var _configProvider = _interopRequireDefault(require("antd/es/config-provider"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _zh_CN = _interopRequireDefault(require("antd/es/locale/zh_CN"));
 var _en_US = _interopRequireDefault(require("antd/es/locale/en_US"));
-require("moment/locale/zh-cn");
+require("dayjs/locale/zh-cn");
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _useEnumRequest = _interopRequireDefault(require("../ProEnum/hooks/useEnumRequest"));
 var _useFrequentEnumRequest = _interopRequireDefault(require("../ProEnum/hooks/useFrequentEnumRequest"));
 var _locale = require("../locale");
+var _ThemeContext = require("../ProThemeTools/context/ThemeContext");
 var _jsxRuntime = require("react/jsx-runtime");
 var initialState = {
   ProEnum: {
@@ -46,25 +46,34 @@ var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.cr
 
 // eslint-disable-next-line no-redeclare
 function useProConfig(name) {
-  var config = (0, _react.useContext)(ProConfigContext);
-  return name ? config.state[name] : config;
+  var _useContext = (0, _react.useContext)(ProConfigContext),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  if (name) {
+    return state[name];
+  }
+  return {
+    state,
+    dispatch
+  };
 }
-var antdLangMap = {
-  'zh-CN': _zh_CN.default,
-  // zh-CN 中文
-  'en-US': _en_US.default // en-US
-};
 var reducer = (state, action) => {
   var _state$ProEnum;
   switch (action.type) {
+    case 'setFormRef':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        forms: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.forms), {}, {
+          [action.name]: action.value
+        })
+      });
+    case 'deleteFormRef':
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
+        forms: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.forms), {}, {
+          [action.name]: undefined
+        })
+      });
     case 'set':
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), action.payload);
-    // 设置的值会被存入localStorage
-    case 'setWithLocal':
-      {
-        var _state = (0, _merge.default)({}, state, action.payload);
-        return _state;
-      }
     case 'setProEnum':
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
         ProEnum: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.ProEnum), action.payload)
@@ -75,10 +84,29 @@ var reducer = (state, action) => {
           dics: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, ((_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dataSource) || {}), action.payload)
         })
       });
+    case 'setWithLocal':
+      // 本地配置合并
+      localStorage.setItem('localConfig', JSON.stringify(action.payload));
+      return (0, _objectSpread2.default)({}, state);
     default:
       return (0, _objectSpread2.default)({}, state);
   }
 };
+
+// 内部组件，用于监听主题变化并应用到 ConfigProvider
+var ThemeAwareConfigProvider = _ref => {
+  var locale = _ref.locale,
+    children = _ref.children;
+  var _useTheme = (0, _ThemeContext.useTheme)(),
+    themeState = _useTheme.state;
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
+    locale: locale,
+    theme: themeState.antdConfig,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      children: children
+    })
+  });
+};
 var ProConfigProvider = props => {
   var _props$value, _props$value2, _props$value3, _props$value4;
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
@@ -102,28 +130,32 @@ var ProConfigProvider = props => {
   // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
   var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
   (0, _react.useEffect)(() => {
-    if (lang) (0, _locale.setLanguage)(lang);
+    (0, _locale.setLanguage)(lang);
   }, [lang]);
   (0, _react.useEffect)(() => {
     if (enumRes !== null && enumRes !== void 0 && enumRes.data) {
       (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(enumRes === null || enumRes === void 0 ? void 0 : enumRes.data, enumRes === null || enumRes === void 0 ? void 0 : enumRes.params));
     }
   }, [enumRes === null || enumRes === void 0 ? void 0 : enumRes.loading]);
-
+  var antdLangMap = {
+    'zh-CN': _zh_CN.default,
+    // zh-CN 中文
+    'en-US': _en_US.default // en-US
+  };
   // 处理频繁枚举的成功回调
   (0, _react.useEffect)(() => {
     if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) {
       (props === null || props === void 0 ? void 0 : props.onSuccess) && (props === null || props === void 0 ? void 0 : props.onSuccess(frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.data, frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.params));
     }
   }, [frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.loading]);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(ProConfigContext.Provider, {
-    value: {
-      state: (0, _merge.default)(state, props.value),
-      dispatch
-    },
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_configProvider.default, {
-      locale: antdLangMap[lang],
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeContext.ThemeProvider, {
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProConfigContext.Provider, {
+      value: {
+        state: (0, _merge.default)(state, props.value),
+        dispatch
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThemeAwareConfigProvider, {
+        locale: antdLangMap[lang],
         children: props.children
       })
     })