@zat-design/sisyphus-react 4.3.5-beta.1 → 4.3.5-beta.3

package/es/ProEnum/hooks/useEnumRequest.js

@@ -64,13 +64,14 @@ const useEnumRequest = (props, dispatch) => {
       // 缓存命中时跳过 transformResponse 和重复处理，直接 dispatch
       if (fromCacheRef.current) {
         const cachedData = fromCacheRef.current;
+        const mergedPayload = {
+          ...dics,
+          ...cachedData,
+          ...dataSource
+        };
         dispatch({
           type: 'setProEnumDic',
-          payload: {
-            ...dics,
-            ...dataSource,
-            ...cachedData
-          }
+          payload: mergedPayload
         });
         if (main) {
           setTimeout(() => {
@@ -132,13 +133,14 @@ const useEnumRequest = (props, dispatch) => {
       await Promise.resolve(setEnumData(storage, cacheKey, res));
 
       // 同步数据到全局
+      const mergedPayload = {
+        ...dics,
+        ...res.data,
+        ...dataSource
+      };
       dispatch({
         type: 'setProEnumDic',
-        payload: {
-          ...dics,
-          ...dataSource,
-          ...res.data
-        }
+        payload: mergedPayload
       });
       if (main) {
         setTimeout(() => {
@@ -157,13 +159,14 @@ const useEnumRequest = (props, dispatch) => {
       const res = getEnumData(storage, cacheKey) || {
         data: {}
       };
+      const mergedPayload = {
+        ...dics,
+        ...res?.data,
+        ...dataSource
+      };
       dispatch({
         type: 'setProEnumDic',
-        payload: {
-          ...dics,
-          ...dataSource,
-          ...res?.data
-        }
+        payload: mergedPayload
       });
       if (main) {
         setTimeout(() => {
@@ -229,18 +232,25 @@ const useEnumRequest = (props, dispatch) => {
             type: 'setProEnumDic',
             payload: {
               ...dics,
-              ...dataSource,
-              ...cacheData.data
+              ...cacheData.data,
+              ...dataSource
             }
           });
         } else if (dataSource && Object.keys(dataSource).length > 0) {
-          // 子系统也可能会有 dataSource
+          // 子系统也可能会有 dataSource，并需要同步写入缓存
+          const mergedPayload = {
+            ...dics,
+            ...cacheData.data,
+            ...dataSource
+          };
+          await Promise.resolve(setEnumData(storage, cacheKey, {
+            ...cacheData,
+            data: mergedPayload,
+            time: Date.now()
+          }));
           dispatch({
             type: 'setProEnumDic',
-            payload: {
-              ...dics,
-              ...dataSource
-            }
+            payload: mergedPayload
           });
         }
       }
@@ -266,12 +276,18 @@ const useEnumRequest = (props, dispatch) => {
         const res = await Promise.resolve(getEnumData(storage, cacheKey) || {
           data: {}
         });
+        const mergedData = {
+          ...res?.data,
+          ...dataSource
+        };
+        await Promise.resolve(setEnumData(storage, cacheKey, {
+          ...res,
+          data: mergedData,
+          time: Date.now()
+        }));
         dispatch({
           type: 'setProEnumDic',
-          payload: {
-            ...dataSource,
-            ...res?.data
-          }
+          payload: mergedData
         });
       } else {
         const res = await Promise.resolve(getEnumData(storage, cacheKey) || {

package/es/ProEnum/index.js

@@ -1,4 +1,3 @@
-import _isNumber from "lodash/isNumber";
 import _omit from "lodash/omit";
 import _isArray from "lodash/isArray";
 import _isString from "lodash/isString";
@@ -36,7 +35,7 @@ const ProEnum = props => {
   const {
     viewEmpty
   } = otherProps || {};
-  const _defalutValue = props?.defaultValue;
+  const _defaultValue = props?.defaultValue;
   const {
     isView: configIsView
   } = useFieldProps() || {};
@@ -68,8 +67,8 @@ const ProEnum = props => {
     fieldValue = 'value';
   }
 
-  // 这种时候优先级最高、完全走自定义
-  if (useRequest?.service && props.fieldNames) {
+  // 组件显式传入 fieldNames 时优先级最高，必须覆盖 clear 默认映射
+  if (props.fieldNames && Object.keys(props.fieldNames).length) {
     if (props.fieldNames?.label) label = props.fieldNames.label;
     if (props.fieldNames?.value) fieldValue = props.fieldNames.value;
   }
@@ -264,7 +263,7 @@ const ProEnum = props => {
     return _isFunction(props.optionRender) && record.length ? _optionRender() : labelList?.join('，');
   };
   if (_isView) {
-    const __value = value || _defalutValue;
+    const __value = value ?? _defaultValue;
     if (Array.isArray(__value)) {
       return /*#__PURE__*/_jsx(Container, {
         tooltip: true,
@@ -274,7 +273,7 @@ const ProEnum = props => {
     }
     return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
-      children: __value || _isNumber(__value) ? transToLabel([__value]) : null
+      children: __value != null ? transToLabel([__value]) : null
     });
   }
   return /*#__PURE__*/_jsx(_Fragment, {

package/es/ProForm/components/base/InputNumber/index.js

@@ -148,7 +148,7 @@ const InputNumber = props => {
         }
       }
     }
-    return [_min ?? min ?? valueProps?.min, _max ?? max ?? valueProps?.max];
+    return [_min ?? min ?? valueProps?.min ?? initialConfig?.min, _max ?? max ?? valueProps?.max ?? initialConfig?.max];
   }, [range, min, max, rest.precision]);
   const _className = classNames({
     'full-form-item': true,

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

@@ -75,38 +75,33 @@ 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>;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    status?: "" | "warning" | "error" | "success" | "validating";
-    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;
     rootClassName?: string;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    status?: "" | "warning" | "error" | "success" | "validating";
     vertical?: boolean;
-    trigger?: string;
-    hidden?: boolean;
-    onReset?: () => void;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    validateTrigger?: string | false | string[];
-    preserve?: boolean;
-    clearNotShow?: boolean;
-    labelAlign?: import("antd/es/form/interface").FormLabelAlign;
+    isView?: boolean;
     colon?: boolean;
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    labelCol?: import("antd").ColProps;
-    wrapperCol?: import("antd").ColProps;
     htmlFor?: string;
+    labelAlign?: import("antd/es/form/interface").FormLabelAlign;
+    labelCol?: import("antd").ColProps;
     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;
+    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
     noStyle?: boolean;
@@ -114,6 +109,8 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
     validateStatus?: "" | "warning" | "error" | "success" | "validating";
+    layout?: import("antd/es/form/Form").FormItemLayout;
+    wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
     valueType?: import("../../../render/propsType").ProFormValueType;
@@ -124,9 +121,12 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
     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" | "clearNotShow" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -22,7 +22,7 @@ const ConfirmWrapper = props => {
     name,
     index,
     listName
-  } = ProForm.useFieldProps();
+  } = ProForm.useFieldProps() || {};
   const handleChange = async (value, ...other) => {
     const _value = value?.target ? value.target.value : value;
     const confirmProps = _isFunction(confirm) ? await confirm(value, form.getFieldsValue(), {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.3.5-beta.1",
+  "version": "4.3.5-beta.3",
   "license": "MIT",
   "files": [
     "es",