@zat-design/sisyphus-react 4.5.7-beta.2 → 4.5.8-beta.1

package/README.md

@@ -86,6 +86,12 @@ createRoot(document.getElementById('root')!).render(<App />);
 
 ### 本地开发
 
+本项目当前依赖链包含旧版 Umi/Dumi 与 React 19 的 peer dependency 冲突，使用 npm 安装时会自动启用 legacy peer 解析：
+
+```bash
+npm install --legacy-peer-deps
+```
+
 ```bash
 yarn install
 yarn start

package/es/ProDrawerForm/components/ProModal/index.js

@@ -144,7 +144,7 @@ const ProModal = ({
       title: title,
       width: width,
       open: open,
-      mask: typeof modalMask === 'object' ? {
+      mask: typeof modalMask === 'object' && modalMask !== null ? {
         closable: maskClosable,
         ...modalMask
       } : modalMask ?? {

package/es/ProEditTable/index.js

@@ -6,6 +6,7 @@ import _get from "lodash/get";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useLocalStorageState, useSetState } from 'ahooks';
 import { ConfigProvider, Form, Affix } from 'antd';
+import { ConfigContext } from 'antd/es/config-provider';
 import classnames from 'classnames';
 import { transformColumns } from "./utils";
 import { createErrorStore } from "./utils/validateAll";
@@ -87,7 +88,7 @@ const ProEditTable = ({
 
   const {
     getPrefixCls
-  } = React.useContext(ConfigProvider.ConfigContext);
+  } = React.useContext(ConfigContext);
   const prefixCls = getPrefixCls();
   const [themeConfig] = useLocalStorageState('themeConfig');
   const requiredAlign = useMemo(() => {

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -40,7 +40,6 @@ const ToolbarButton = props => {
     const _toolbarProps = props.toolbarProps?.map(item => {
       return {
         ...item,
-        // @ts-ignore
         type: item.actionType || item.type
       };
     });

package/es/ProForm/components/combination/FormList/propsType.d.ts

@@ -26,6 +26,8 @@ export interface ActionType extends Omit<ButtonProps, 'onClick' | 'type'> {
     addIndex?: number | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath' | 'operation'>) => number);
 }
 export interface ToolbarActionType extends Omit<ActionType, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
+    /** @deprecated 使用 type，保留旧配置兼容 */
+    actionType?: 'add';
     type?: 'add';
     onHandle?: ToolbarCallback;
     onClick?: ToolbarCallback;

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

@@ -1,5 +1,5 @@
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
-import { FormInstance } from 'antd';
+import { FormInstance, type FormItemProps } from 'antd';
 import React from 'react';
 import type { GroupColumnType, SpaceType, FlexibleGroupColumnType } from '../propsType';
 import type { ProFormColumnType, ReactiveFunction } from '../../../render/propsType';
@@ -62,80 +62,13 @@ interface GroupProps {
     disabled?: boolean;
     formDisabled?: boolean;
 }
+type GroupFormItemProps = FormItemProps & {
+    disabled?: boolean;
+};
 /**
  * 创建FormItem属性（Hook版本）
  */
-export declare const useFormItemProps: (column: FlexibleGroupColumnType, contextProps: ContextProps, groupProps: GroupProps) => {
-    rules: any[];
-    required: boolean;
-    label: string;
-    before?: React.ReactNode;
-    after?: React.ReactNode;
-    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>;
-    className?: string;
-    hidden?: boolean;
-    id?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    onReset?: () => void;
-    prefixCls?: string;
-    isView?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    rootClassName?: string;
-    status?: import("antd/es/form/FormItem").ValidateStatus;
-    vertical?: boolean;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: import("@rc-component/form/lib/interface").StoreValue) => Record<string, unknown>);
-    colon?: boolean;
-    htmlFor?: string;
-    labelAlign?: import("antd/es/form/interface").FormLabelAlign;
-    labelCol?: import("antd").ColProps;
-    getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => import("@rc-component/form/lib/interface").StoreValue;
-    normalize?: (value: import("@rc-component/form/lib/interface").StoreValue, prevValue: import("@rc-component/form/lib/interface").StoreValue, allValues: import("@rc-component/form/lib/interface").Store) => import("@rc-component/form/lib/interface").StoreValue;
-    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    trigger?: string;
-    validateTrigger?: string | string[] | false;
-    validateDebounce?: number;
-    valuePropName?: string;
-    messageVariables?: Record<string, string>;
-    initialValue?: any;
-    onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
-    preserve?: boolean;
-    isListField?: boolean;
-    isList?: boolean;
-    noStyle?: boolean;
-    hasFeedback?: boolean | {
-        icons: import("antd/es/form/FormItem").FeedbackIcons;
-    };
-    validateStatus?: import("antd/es/form/FormItem").ValidateStatus;
-    layout?: import("antd/es/form/Form").FormItemLayout;
-    wrapperCol?: import("antd").ColProps;
-    help?: React.ReactNode;
-    fieldId?: string;
-    valueType?: import("../../../render/propsType").ProFormValueType;
-    toISOString?: boolean;
-    toCSTString?: boolean;
-    switchValue?: [any, any];
-    clearNotShow?: boolean;
-    trim?: boolean;
-    upperCase?: boolean;
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number | undefined;
-    }) => React.ReactElement<any, any> | string | undefined | null;
-    viewType?: import("../../../render/propsType").ViewType;
-    name: any;
-    dependencies: any[];
-    tooltip: string | {
-        title: string;
-        icon?: React.ReactNode;
-    };
-    extra: React.ReactNode;
-    validateFirst: boolean | "parallel";
-    disabled: any;
-};
+export declare const useFormItemProps: (column: FlexibleGroupColumnType, contextProps: ContextProps, groupProps: GroupProps) => GroupFormItemProps;
 /**
  * 创建组件属性
  */

package/es/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
-import { DefaultOptionType } from '@rc-component/select/es/Select';
+import type { CascaderProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
+export type CascaderOptionType = NonNullable<CascaderProps['options']>[number];
 export interface FieldNamesType {
     label: string;
     value: string;
@@ -17,7 +18,7 @@ export interface ProCascaderType {
     tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
     fieldNames?: FieldNamesType;
-    dataSource?: DefaultOptionType[];
+    dataSource?: CascaderOptionType[];
     useRequest?: {
         /**
          * @description 请求服务函数

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

@@ -42,10 +42,12 @@ export interface ProRule extends Omit<RuleObject, 'type'> {
  */
 export type ViewType = 'percent' | 'permillage' | 'amount' | 'thousandth';
 export type PartialOf<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
-interface ControlProps {
-    value?: unknown;
-    onChange?: (...args: any[]) => void;
-}
+type ControlValue<T> = T extends {
+    value?: infer Value;
+} ? Value : unknown;
+type ControlChangeArgs<T> = T extends {
+    onChange?: (...args: infer Args) => any;
+} ? Args : any[];
 /**
  * 扩展函数的参数
  */
@@ -55,9 +57,9 @@ 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' | 'role'> & {
-    value?: T['value'];
-    onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
+type TransformToFormField<T, Values> = DistributiveOmit<T, 'onChange' | 'value' | 'role'> & {
+    value?: ControlValue<T>;
+    onChange?: (value: ControlChangeArgs<T>[0], options: ControlChangeArgs<T>[1], form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;
     dataSource?: any[];
     /** ProForm disable时，是否完全受控 */
@@ -66,9 +68,9 @@ type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T,
 type ProEnumFormType<Values> = TransformToFormField<ProEnumType, Values> | TransformToFormField<ProEnumType & PropProSelectsMapType, Values> | TransformToFormField<ProEnumType & PropRadioPropsMapType, Values> | TransformToFormField<ProEnumType & CheckboxPropsMapType, Values>;
 type ProEnumTableType<Values> = TransformToTableField<ProEnumType, Values> | TransformToTableField<ProEnumType & PropProSelectsMapType, Values> | TransformToTableField<ProEnumType & PropRadioPropsMapType, Values> | TransformToTableField<ProEnumType & CheckboxPropsMapType, 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' | 'role'> & {
-    value?: T['value'];
-    onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], record: any, index: number, form: FormInstance<Values>) => void;
+type TransformToTableField<T, Values> = Omit<T, 'onChange' | 'value' | 'onBlur' | 'role'> & {
+    value?: ControlValue<T>;
+    onChange?: (value: ControlChangeArgs<T>[0], options: ControlChangeArgs<T>[1], record: any, index: number, form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;
     onBlur?: FunctionArgs<Values>;
 };
@@ -78,7 +80,7 @@ export type ReactiveFunction<Values, R> = (values: Values, { form, index, namePa
     namePath?: NamePath;
     [key: string]: any;
 }) => R;
-type FieldType<T extends ControlProps, Values, TT> = TT extends 'ProForm' ? TransformToFormField<T, Values> | ReactiveFunction<Values, TransformToFormField<T, Values>> : TransformToTableField<T, Values> | ((text: any, values: Values, index: number) => TransformToTableField<T, Values>);
+type FieldType<T, Values, TT> = TT extends 'ProForm' ? TransformToFormField<T, Values> | ReactiveFunction<Values, TransformToFormField<T, Values>> : TransformToTableField<T, Values> | ((text: any, values: Values, index: number) => TransformToTableField<T, Values>);
 /**
  * 值转换
  */
@@ -272,7 +274,7 @@ export interface RenderType<Values = any> {
 export type ProEnumFormProps<Values> = ProEnumFormType<Values>;
 export type ProEnumTableProps<Values> = ProEnumTableType<Values>;
 export type ProEnumFieldProps<Values, TT> = ProEnumFieldType<Values, TT>;
-export type FieldProps<T extends ControlProps, Values, TT> = FieldType<T, Values, TT>;
+export type FieldProps<T, Values, TT> = FieldType<T, Values, TT>;
 export type ColumnPropsMap<Values = any, T = 'ProForm'> = ColumnTypeMap<Values, T>;
 export type ProColumnProps<Values = any> = ProFormColumnType<Values>;
 export type RenderProps<Values = any> = RenderType<Values>;

package/es/ProLayout/components/TabsManager/components/TabItem.js

@@ -74,7 +74,6 @@ const TabItemComponent = ({
             text: displayTitle,
             title: tabTitle,
             line: 1,
-            width: "12em",
             placement: "top",
             scrollFollowParent: false
           }) : tabTitle

package/es/ProLayout/components/TabsManager/hooks/useTabsState.js

@@ -59,12 +59,15 @@ export const useTabsState = options => {
         delete restoredState.activeTab;
       }
 
-      // 兼容旧缓存：无 pinned 字段的标签用 closable===false 推导出 pinned，
-      // 保证刷新后固定标签仍落在左侧固定区
-      restoredState.tabsList = restoredState.tabsList.map(tab => tab.pinned === undefined ? {
+      // 兼容旧缓存：Ant Tabs 的 onChange 始终返回字符串 key；旧版本可能保存数字 id，
+      // 若不归一化，严格比较会导致恢复后的标签无法切换。
+      restoredState.tabsList = restoredState.tabsList.map(tab => ({
         ...tab,
-        pinned: derivePinned(tab)
-      } : tab);
+        id: String(tab.id),
+        pinned: tab.pinned === undefined ? derivePinned(tab) : tab.pinned
+      }));
+      restoredState.activeKey = restoredState.activeKey === undefined || restoredState.activeKey === null ? '' : String(restoredState.activeKey);
+      restoredState.activeTabInfo = restoredState.tabsList.find(tab => tab.id === restoredState.activeKey);
       setState(restoredState);
     }
     setIsInitialized(true);

package/es/ProSelect/index.js

@@ -1,6 +1,5 @@
 import _isNumber from "lodash/isNumber";
 import _omit from "lodash/omit";
-import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { message, Select, Space, Tooltip } from 'antd';
@@ -224,7 +223,7 @@ export const ProSelect = (props, ref) => {
     if (customShowSearch === true || customShowSearch == null) {
       return defaultConfig;
     }
-    if (_isObject(customShowSearch)) {
+    if (typeof customShowSearch === 'object' && customShowSearch !== null) {
       return {
         ...defaultConfig,
         ...customShowSearch,

package/es/ProSelect/propsType.d.ts

@@ -2,6 +2,11 @@ import { ReactNode } from 'react';
 import type { SelectProps } from 'antd';
 import { Service, Options, Result } from 'ahooks/lib/useRequest/src/types';
 import type { ProFormOtherType } from '../ProForm/propsType';
+export interface ProSelectShowSearchConfig {
+    filterOption?: SelectProps['filterOption'];
+    optionFilterProp?: SelectProps['optionFilterProp'];
+    onSearch?: SelectProps['onSearch'];
+}
 /**
  * @description 数据选项类型
  */
@@ -24,7 +29,8 @@ export interface DataOptionType {
 /**
  * @description 选择框属性类型
  */
-export interface PropSelectType extends Omit<SelectProps, 'onSearch'> {
+export interface PropSelectType extends Omit<SelectProps, 'onSearch' | 'showSearch'> {
+    showSearch?: boolean | ProSelectShowSearchConfig;
     /**
      * @description 是否查看模式
      * @default false

package/es/ProTree/components/ProTreeSelect/index.js

@@ -710,6 +710,8 @@ export const ProTreeSelect = (props, ref) => {
     [`${innerClass}`]: true,
     [`${popupClassName}`]: popupClassName
   });
+  const selectClassNames = selectProps?.classNames;
+  const selectStyles = selectProps?.styles;
   const treeProps = {
     disabled,
     showSearch,
@@ -736,22 +738,22 @@ export const ProTreeSelect = (props, ref) => {
     ...selectProps,
     // 使用新的 API 替代弃用的 popupClassName 和 dropdownStyle
     classNames: {
-      ...selectProps?.classNames,
+      ...selectClassNames,
       popup: {
-        ...selectProps?.classNames?.popup,
-        root: [selectProps?.classNames?.popup?.root, dropDownClassName].filter(Boolean).join(' ')
+        ...selectClassNames?.popup,
+        root: [selectClassNames?.popup?.root, dropDownClassName].filter(Boolean).join(' ')
       }
     },
     styles: {
-      ...selectProps?.styles,
+      ...selectStyles,
       popup: {
-        ...selectProps?.styles?.popup,
+        ...selectStyles?.popup,
         root: {
           maxHeight: 320,
           paddingTop: '0px',
           maxWidth: '580px',
           ...dropdownStyle,
-          ...selectProps?.styles?.popup?.root
+          ...selectStyles?.popup?.root
         }
       }
     }

package/es/ProUpload/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { UploadFile } from 'antd/es/upload/interface';
-import type { UploadRequestOption } from '@rc-component/upload/es/interface';
+import type { UploadFile, UploadProps } from 'antd';
+type UploadRequestOption = Parameters<NonNullable<UploadProps['customRequest']>>[0];
 export type UploadType = 'drag' | 'button' | 'image';
 export interface UploadFileResType {
     /**
@@ -262,3 +262,4 @@ export interface DraggableUploadListItemType {
      */
     children: React.ReactNode;
 }
+export {};

package/es/ProViewer/index.js

@@ -1,5 +1,5 @@
 import { useSetState } from 'ahooks';
-import { Button, Image, Modal } from 'antd';
+import { Button, Image as AntdImage, Modal } from 'antd';
 import React, { useEffect, useRef } from 'react';
 import locale from "../locale";
 
@@ -14,6 +14,7 @@ const MIMEType = {
   word: 'application/msword',
   excel: 'application/vnd.ms-excel'
 };
+const Image = AntdImage;
 const ProViewer = /*#__PURE__*/React.forwardRef(({
   disabled = false,
   mode = 'page',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.5.7-beta.2",
+  "version": "4.5.8-beta.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
@@ -121,6 +121,7 @@
     "@dnd-kit/core": "^6.0.8",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@rc-component/form": "~1.8.5",
     "@zat-design/utils": "^4.0.0",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
@@ -140,6 +141,7 @@
     "react-router-dom": "^6.0.0"
   },
   "devDependencies": {
+    "@ant-design/icons": "^6.1.0",
     "@babel/core": "^7.26.0",
     "@babel/runtime": "^7.28.4",
     "@commitlint/cli": "^12.1.1",
@@ -157,8 +159,9 @@
     "@typescript-eslint/parser": "^7.18.0",
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
-    "@zat-design/sisyphus-login": "4.0.2",
+    "@zat-design/sisyphus-login": "4.0.3",
     "ahooks": "3.9.5",
+    "antd": "^6.1.3",
     "babel-plugin-import": "^1.13.8",
     "babel-plugin-lodash": "^3.3.4",
     "cross-env": "^7.0.3",