@zat-design/sisyphus-react 4.0.8 → 4.0.10

package/es/ProThemeTools/utils/index.js

@@ -1,8 +1,53 @@
+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 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); }
+import { getThemeUpdaters as getThemeUpdatersFromContext } from "../context/ThemeContext";
+// 动态导入 getThemeUpdaters，避免循环依赖
+// 保留向后兼容性，但优先使用 ThemeContext 中的 getThemeUpdaters
+var getThemeUpdaters = null;
+
+// 设置 getThemeUpdaters 函数（由 index.tsx 调用，用于向后兼容）
+export var setThemeUpdatersGetter = getter => {
+  getThemeUpdaters = getter;
+};
+
+// 保存待应用的主题配置（用于 ThemeProvider 初始化前设置的主题）
+var pendingThemes = null;
+
+// 获取待应用的主题配置
+export var getPendingThemes = () => {
+  return pendingThemes;
+};
+
+// 清除待应用的主题配置
+export var clearPendingThemes = () => {
+  pendingThemes = null;
+};
+
+// 获取主题更新函数的统一入口
+// 优先使用 ThemeContext 中的 getThemeUpdaters，如果不可用则使用局部变量
+var getThemeUpdatersWrapper = () => {
+  try {
+    // 优先使用 ThemeContext 中的 getThemeUpdaters（不依赖 ProThemeTools 组件）
+    var contextUpdaters = getThemeUpdatersFromContext();
+    if (contextUpdaters && (contextUpdaters.updateAntdConfig || contextUpdaters.updateCssVariables || contextUpdaters.updateLocalConfig)) {
+      return contextUpdaters;
+    }
+  } catch (e) {
+    // ThemeContext 可能还未初始化，继续使用局部变量
+  }
+  // 回退到局部变量（向后兼容）
+  return getThemeUpdaters ? getThemeUpdaters() : null;
+};
+
 /** antd5 主题配置 mapping */
 var antd5ConfigMapping = {
   'zaui-brand': 'colorPrimary'
@@ -31,18 +76,88 @@ export var convertToAntd5Tokens = (themes, themeMapping) => {
 
 /**
  * 设置主题变量 - antd5 兼容版本
- * 只设置 CSS 变量，不再使用 ConfigProvider.config
+ * 设置 CSS 变量，并同步更新 Context 的 antdConfig
+ * @param themes 主题配置对象，会自动过滤掉 antdConfig
  */
 export var setThemes = themes => {
   if (!themes || !Object.keys(themes).length) {
     return false;
   }
 
-  // 只设置 CSS 变量，主题配置通过 Context 管理
-  var list = Object.entries(themes);
-  list.forEach(item => {
-    document.documentElement.style.setProperty(`--${item[0]}`, item[1]);
+  // 过滤掉 antdConfig，它只用于 Ant Design ConfigProvider，不应作为 CSS 变量
+  var filteredThemes = Object.entries(themes).filter(_ref => {
+    var _ref2 = _slicedToArray(_ref, 1),
+      key = _ref2[0];
+    return key !== 'antdConfig';
   });
+  if (!filteredThemes.length) {
+    return false;
+  }
+
+  // 设置 CSS 变量
+  filteredThemes.forEach(_ref3 => {
+    var _ref4 = _slicedToArray(_ref3, 2),
+      key = _ref4[0],
+      value = _ref4[1];
+    // 确保值是字符串或数字，对象类型不应作为 CSS 变量
+    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+      var cssVarName = `--${key}`;
+      var cssVarValue = String(value);
+      document.documentElement.style.setProperty(cssVarName, cssVarValue);
+    }
+  });
+
+  // 同步更新 Context（如果已注册）
+  // 使用统一的获取函数，优先使用 ThemeContext 中的更新函数
+  var updaters = getThemeUpdatersWrapper();
+  if (updaters) {
+    // 更新 CSS 变量到 Context
+    if (updaters.updateCssVariables) {
+      updaters.updateCssVariables(filteredThemes.reduce((acc, _ref5) => {
+        var _ref6 = _slicedToArray(_ref5, 2),
+          key = _ref6[0],
+          value = _ref6[1];
+        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+          acc[key] = value;
+        }
+        return acc;
+      }, {}));
+    }
+
+    // 如果设置了 zaui-brand，同步更新 antdConfig
+    var zauiBrand = themes['zaui-brand'];
+    if (zauiBrand && typeof zauiBrand === 'string' && updaters.updateAntdConfig) {
+      var antdConfig = convertToAntd5Tokens({
+        'zaui-brand': zauiBrand
+      });
+      updaters.updateAntdConfig(antdConfig);
+    }
+
+    // 更新本地配置（将 kebab-case 转换为驼峰格式）
+    if (updaters.updateLocalConfig) {
+      var localConfig = {};
+      filteredThemes.forEach(_ref7 => {
+        var _ref8 = _slicedToArray(_ref7, 2),
+          key = _ref8[0],
+          value = _ref8[1];
+        if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
+          // 将 kebab-case 转换为驼峰格式
+          var camelKey = key.replace(/-(\w)/g, (_, letter) => letter.toUpperCase());
+          if (camelKey === 'zauiBrand') {
+            localConfig.zauiBrand = value;
+          }
+        }
+      });
+      if (Object.keys(localConfig).length > 0) {
+        updaters.updateLocalConfig(localConfig);
+      }
+    }
+    // 清除待应用的主题配置（因为已经应用了）
+    pendingThemes = null;
+  } else {
+    // 如果更新函数不可用，保存主题配置，等待 ThemeProvider 初始化后应用
+    pendingThemes = _objectSpread({}, themes);
+  }
   return true;
 };
 

package/es/index.d.ts

@@ -27,20 +27,21 @@ export { default as ProAction } from './ProAction';
 export * from './ProConfigProvider';
 export * from './locale';
 export { default as ProBackBtn } from './ProLayout/components/ProHeader/components/ProBackBtn';
+export type { ProConfigProviderType } from './ProConfigProvider';
 export type { ProFormType, ProColumnProps, ProFormColumnType } from './ProForm/propsType';
 export type { ProFormComponentType } from './ProForm/components';
-export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState } from './ProTable/propsType';
+export type { ProTableType, ProTableColumnType, ProTableSummaryType, ProTableUseAntdTableType, ProTableProps, ProTableSummaryProps, ProTableColumn, UseAntdTableState, } from './ProTable/propsType';
 export type { ProUploadType, ProUploadProps } from './ProUpload/propsType';
 export type { ProTabsType, ProTabsItemType, ProTabsProps, ProTabsItemsProps } from './ProTabs/propType';
-export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps } from './ProLayout/components/ProHeader/PropTypes';
+export type { BreadcrumbColumnType, SubDescribeColumnType, DescribeColumnType, ProHeaderType, ProHeaderProps, BreadcrumbColumnsProps, SubDescribeColumnsProps, DescribeColumnsProps, } from './ProLayout/components/ProHeader/PropTypes';
 export type { ProLayoutTabsInstance, AddTabParams, AddTabOptions } from './ProLayout/propTypes';
 export type { ProTooltipType, ProTooltipProps } from './ProTooltip/propsType';
 export type { ProIconType, ProIconProps } from './ProIcon/propsTypes';
 export type { ProTreeType, ProTreeSelectType, ProTreeProps, PropTreeSelectProps } from './ProTree/propsType';
-export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction } from './ProTreeModal/propsType';
-export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps } from './ProEditTable/propsType';
-export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType } from './ProStep/propsType';
+export type { ProTreeModalType, ProTreeModalActionType, ProTreeModalProps, ProTreeModalAction, } from './ProTreeModal/propsType';
+export type { ProEditTableType, ProEditTableColumnType, ProEditTableSummaryColumnType, ProEditTableSummaryConfigType, ProEditTableActionType, ProEditTableProps, ProEditTableColumnsProps, SummaryProps, SummaryColumnProps, BaseActionProps, } from './ProEditTable/propsType';
+export type { ProStepType, ProStepContextType, ProStepItemType, ProStepPropsType, ProStepItemPropsType, } from './ProStep/propsType';
 export type { ProDrawerFormType, ProDrawerFormPropsType } from './ProDrawerForm/propsType';
-export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType } from './ProForm/components/combination/ProModalSelect/propsType';
+export type { ProModalSelectType, ProModalSelectConfigType, ProModalSelectPropsType, } from './ProForm/components/combination/ProModalSelect/propsType';
 export type { ProStepTabType, ProStepTabResultType } from './ProStepTab/propsType';
 export * from './tokens';

package/es/index.js

@@ -39,7 +39,6 @@ export * from "./ProConfigProvider";
 export * from "./locale";
 export { default as ProBackBtn } from "./ProLayout/components/ProHeader/components/ProBackBtn";
 
-// TS类型导出
 // TS类型导出
 
 // token导出

package/lib/ProConfigProvider/index.d.ts

@@ -1,51 +1,9 @@
 import React, { FC } from 'react';
-import { FormInstance } from 'antd';
 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';
-import type { ProEnumConfig } from '../ProEnum/propsType';
-export interface ProConfigState {
-    locale?: string;
-    ProEnum?: Partial<ProEnumConfig>;
-    ProSelect?: Partial<PropSelectType> & Record<string, any>;
-    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
-    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
-    forms: Record<string, FormInstance | undefined>;
-    [key: string]: any;
-}
-interface ConfigContext {
-    state: ProConfigState;
-    dispatch: React.Dispatch<Actions>;
-}
+import type { ProConfigProviderProps, ConfigContext } from './propsType';
 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 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 declare const ProConfigProvider: FC<ProConfigProviderProps>;
+export type { ProConfigProviderType, ProConfigProviderProps } from './propsType';
 export default ProConfigProvider;

package/lib/ProConfigProvider/index.js

@@ -47,38 +47,36 @@ var initialState = {
     }]
   }
 };
+var antdLangMap = {
+  'zh-CN': _zh_CN.default,
+  'en-US': _en_US.default
+};
 var ProConfigContext = exports.ProConfigContext = /*#__PURE__*/_react.default.createContext({
   state: initialState,
   dispatch: () => {}
 });
-
-// eslint-disable-next-line no-redeclare
-
-// eslint-disable-next-line no-redeclare
 function useProConfig(name) {
   var _useContext = (0, _react.useContext)(ProConfigContext),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
-  if (name) {
-    return state[name];
-  }
+  if (name) return state[name];
   return {
     state,
     dispatch
   };
 }
-var reducer = (state, action) => {
-  var _state$ProEnum;
+function reducer(state, action) {
+  var _state$forms, _state$forms2, _state$ProEnum$dics, _state$ProEnum;
   switch (action.type) {
     case 'setFormRef':
       return _objectSpread(_objectSpread({}, state), {}, {
-        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+        forms: _objectSpread(_objectSpread({}, (_state$forms = state.forms) !== null && _state$forms !== void 0 ? _state$forms : {}), {}, {
           [action.name]: action.value
         })
       });
     case 'deleteFormRef':
       return _objectSpread(_objectSpread({}, state), {}, {
-        forms: _objectSpread(_objectSpread({}, state.forms), {}, {
+        forms: _objectSpread(_objectSpread({}, (_state$forms2 = state.forms) !== null && _state$forms2 !== void 0 ? _state$forms2 : {}), {}, {
           [action.name]: undefined
         })
       });
@@ -91,19 +89,16 @@ var reducer = (state, action) => {
     case 'setProEnumDic':
       return _objectSpread(_objectSpread({}, state), {}, {
         ProEnum: _objectSpread(_objectSpread({}, state.ProEnum), {}, {
-          dics: _objectSpread(_objectSpread({}, ((_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dataSource) || {}), action.payload)
+          dics: _objectSpread(_objectSpread({}, (_state$ProEnum$dics = (_state$ProEnum = state.ProEnum) === null || _state$ProEnum === void 0 ? void 0 : _state$ProEnum.dics) !== null && _state$ProEnum$dics !== void 0 ? _state$ProEnum$dics : {}), action.payload)
         })
       });
     case 'setWithLocal':
-      // 本地配置合并
       localStorage.setItem('localConfig', JSON.stringify(action.payload));
       return _objectSpread({}, state);
     default:
-      return _objectSpread({}, state);
+      return state;
   }
-};
-
-// 内部组件，用于监听主题变化并应用到 ConfigProvider
+}
 var ThemeAwareConfigProvider = _ref => {
   var locale = _ref.locale,
     children = _ref.children;
@@ -118,45 +113,33 @@ var ThemeAwareConfigProvider = _ref => {
   });
 };
 var ProConfigProvider = props => {
-  var _props$value, _props$value2, _props$value3, _props$value4;
+  var _props$value, _props$value2, _props$value3, _props$value4, _ref2, _ref3, _state$locale, _antdLangMap$lang;
   var _useReducer = (0, _react.useReducer)(reducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
   var enumRes = (0, _useEnumRequest.default)(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 || (_props$value = props.value) === null || _props$value === void 0 ? void 0 : _props$value.ProEnum), props === null || props === void 0 || (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.globalConfig), dispatch);
-
-  // 处理频繁枚举请求
   var frequentEnumRes = (0, _useFrequentEnumRequest.default)(_objectSpread(_objectSpread(_objectSpread({}, state.ProEnum), props === null || props === void 0 || (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.ProEnum), props === null || props === void 0 || (_props$value4 = props.value) === null || _props$value4 === void 0 ? void 0 : _props$value4.globalConfig), dispatch);
+  var cacheLang = localStorage.getItem('locale');
+  var lang = (_ref2 = (_ref3 = (_state$locale = state === null || state === void 0 ? void 0 : state.locale) !== null && _state$locale !== void 0 ? _state$locale : cacheLang) !== null && _ref3 !== void 0 ? _ref3 : props === null || props === void 0 ? void 0 : props.locale) !== null && _ref2 !== void 0 ? _ref2 : 'zh-CN';
   (0, _react.useEffect)(() => {
-    // 本地配置取出
-    var localConfigStr = localStorage.getItem('localConfig');
-    var localConfig = JSON.parse(localConfigStr || '{}');
+    var raw = localStorage.getItem('localConfig');
+    var localConfig = JSON.parse(raw || '{}');
     dispatch({
       type: 'set',
-      payload: (0, _merge.default)(state, localConfig)
+      payload: (0, _merge.default)(initialState, localConfig)
     });
   }, []);
-  var cacheLang = localStorage.getItem('locale');
-  // 如果是用户切换了语言那么优先使用用户切换的，否则从缓存中取用户语言，在取默认值
-  var lang = (state === null || state === void 0 ? void 0 : state.locale) || cacheLang || (props === null || props === void 0 ? void 0 : props.locale);
   (0, _react.useEffect)(() => {
     (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));
-    }
+    var _props$onSuccess;
+    if (enumRes !== null && enumRes !== void 0 && enumRes.data) props === null || props === void 0 || (_props$onSuccess = props.onSuccess) === null || _props$onSuccess === void 0 || _props$onSuccess.call(props, enumRes.data, 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));
-    }
+    var _props$onSuccess2;
+    if (frequentEnumRes !== null && frequentEnumRes !== void 0 && frequentEnumRes.data) props === null || props === void 0 || (_props$onSuccess2 = props.onSuccess) === null || _props$onSuccess2 === void 0 || _props$onSuccess2.call(props, frequentEnumRes.data, frequentEnumRes.params);
   }, [frequentEnumRes === null || frequentEnumRes === void 0 ? void 0 : frequentEnumRes.loading]);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_ThemeContext.ThemeProvider, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ProConfigContext.Provider, {
@@ -165,7 +148,7 @@ var ProConfigProvider = props => {
         dispatch
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ThemeAwareConfigProvider, {
-        locale: antdLangMap[lang],
+        locale: (_antdLangMap$lang = antdLangMap[lang]) !== null && _antdLangMap$lang !== void 0 ? _antdLangMap$lang : _zh_CN.default,
         children: props.children
       })
     })

package/lib/ProConfigProvider/propsType.d.ts

@@ -0,0 +1,55 @@
+import type React from 'react';
+import type { FormInstance } from 'antd';
+import type { PropSelectType } from '../ProSelect/propsType';
+import type { ProModalSelectType } from '../ProForm/components/combination/ProModalSelect/propsType';
+import type { ProCascaderType } from '../ProForm/components/combination/ProCascader/propsType';
+import type { ProEnumConfigType } from '../ProEnum/propsType';
+/** 对外配置项类型（value、内部 state 均为此类型，字段均可选） */
+export interface ProConfigProviderType {
+    locale?: string;
+    ProEnum?: Partial<ProEnumConfigType>;
+    ProSelect?: Partial<PropSelectType> & Record<string, any>;
+    ProModalSelect?: Partial<ProModalSelectType> & Record<string, any>;
+    ProAddressBar?: Partial<ProCascaderType> & Record<string, any>;
+    forms?: Record<string, FormInstance | undefined>;
+    [key: string]: any;
+}
+/** ProConfigProvider 组件 Props（内部使用） */
+export interface ProConfigProviderProps {
+    value?: ProConfigProviderType;
+    locale?: string;
+    onSuccess?: (data: any, params: any) => void;
+    children?: React.ReactNode;
+}
+/** Config 上下文 */
+export interface ConfigContext {
+    state: ProConfigProviderType;
+    dispatch: React.Dispatch<ProConfigActions>;
+}
+/** ThemeAwareConfigProvider 内部组件 Props */
+export interface ThemeAwareConfigProviderProps {
+    locale: any;
+    children: React.ReactNode;
+}
+/** Reducer Actions */
+export type ProConfigActions = {
+    type: 'setFormRef';
+    name: string;
+    value: FormInstance;
+} | {
+    type: 'deleteFormRef';
+    name: string;
+} | {
+    type: 'set';
+    payload: ProConfigProviderType;
+} | {
+    type: 'setProEnum';
+    payload: Record<string, any>;
+} | {
+    type: 'setProEnumDic';
+    key: string;
+    payload: any;
+} | {
+    type: 'setWithLocal';
+    payload: ProConfigProviderType;
+};

package/lib/ProConfigProvider/propsType.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/lib/ProEnum/propsType.d.ts

@@ -303,7 +303,6 @@ export interface TagPropsMapType {
  */
 export type ProEnumType = Omit<ProEnumBaseType, 'type'> & (PropProSelectsMapType | PropRadioPropsMapType | CheckboxPropsMapType | TagPropsMapType);
 export type DataOption = DataOptionType;
-export type ProEnumConfig = ProEnumConfigType;
 export type ProEnum = ProEnumBaseType;
 export type PropProSelectsMap = PropProSelectsMapType;
 export type PropRadioPropsMap = PropRadioPropsMapType;

package/lib/ProForm/components/combination/Group/style/index.less

@@ -314,7 +314,8 @@
         .@{ant-prefix}-input,
         .@{ant-prefix}-select .@{ant-prefix}-select-selector,
         .@{ant-prefix}-input-number,
-        .@{ant-prefix}-input-number-input {
+        .@{ant-prefix}-input-number-input,
+        .@{ant-prefix}-picker{
           // 重置z-index确保正确的层级关系
           position: relative;
           // 重置圆角
@@ -337,7 +338,8 @@
           .@{ant-prefix}-input,
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
-          .@{ant-prefix}-input-number-input {
+          .@{ant-prefix}-input-number-input,
+          .@{ant-prefix}-picker{
             border-top-right-radius: 6px;
             border-bottom-right-radius: 6px;
           }

package/lib/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,29 +75,31 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
+    validateTrigger?: string | false | string[];
+    isView?: boolean;
     id?: string;
+    prefixCls?: string;
     className?: string;
-    hidden?: boolean;
     style?: React.CSSProperties;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    onReset?: () => void;
-    prefixCls?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
     rootClassName?: string;
-    isView?: boolean;
+    status?: "" | "warning" | "error" | "success" | "validating";
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    hidden?: boolean;
+    onReset?: () => void;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    vertical?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
-    vertical?: boolean;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -113,7 +115,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
-    valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
     viewRender?: (value: any, record: any, { form, index, namePath, }: {
         [key: string]: any;
@@ -126,7 +127,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     toISOString?: boolean;
     toCSTString?: boolean;
     clearNotShow?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "precision" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/ProForm/components/render/propsType.d.ts

@@ -55,7 +55,7 @@ export type FunctionArgs<Values, R = any> = (value: any, record: any, { form, in
     namePath?: NamePath;
     [key: string]: any;
 }) => R;
-type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
+type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value' | 'role'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;
@@ -66,7 +66,7 @@ type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T,
 type ProEnumFormType<Values> = TransformToFormField<ProEnum, Values> | TransformToFormField<ProEnum & PropProSelectsMap, Values> | TransformToFormField<ProEnum & PropRadioPropsMap, Values> | TransformToFormField<ProEnum & CheckboxPropsMap, Values>;
 type ProEnumTableType<Values> = TransformToTableField<ProEnum, Values> | TransformToTableField<ProEnum & PropProSelectsMap, Values> | TransformToTableField<ProEnum & PropRadioPropsMap, Values> | TransformToTableField<ProEnum & CheckboxPropsMap, Values>;
 type ProEnumFieldType<Values, TT> = TT extends 'ProForm' ? ProEnumFormType<Values> | ReactiveFunction<Values, ProEnumFormType<Values>> : ProEnumTableType<Values> | ((text: any, values: Values, index: number) => ProEnumTableType<Values>);
-type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur'> & {
+type TransformToTableField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value' | 'onBlur' | 'role'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], record: any, index: number, form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;