@zat-design/sisyphus-react 4.0.0 → 4.0.1

package/README.md

@@ -2,7 +2,7 @@
 
 ## 快速上手
 
-西西弗基于 antd@4 版本开发
+西西弗4 基于 antd@6 版本开发
 
 ### 安装
 

package/es/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -9,7 +9,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useMemo } from 'react';
 import { Space, Tooltip } from 'antd';
 import classnames from 'classnames';
-import { get } from 'lodash';
+import { get, omit } from 'lodash';
 import { diffOriginal } from "../../utils/diffOriginal";
 import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
@@ -174,7 +174,9 @@ var ListChangedWrapper = props => {
     })) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
+    // 过滤掉 disabled，避免传递到 div 等不支持 disabled 的元素
+    var filteredRest = omit(rest, ['disabled']);
+    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), filteredRest));
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -206,7 +208,7 @@ var ListChangedWrapper = props => {
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: /*#__PURE__*/_jsxs(Space, {
-      direction: "vertical",
+      orientation: "vertical",
       className: "changed-tooltip",
       children: [/*#__PURE__*/_jsxs(Space, {
         align: "start",
@@ -214,14 +216,16 @@ var ListChangedWrapper = props => {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), omit(rest, ['disabled'])), {}, {
+          // 过滤掉 disabled，避免传递到不支持 disabled 的元素
           isView: true
         })) : undefined]
       })]
     }),
     children: /*#__PURE__*/_jsx("div", {
       className: diffClassName,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), omit(rest, ['disabled'])), {}, {
+        // 过滤掉 disabled，避免传递到不支持 disabled 的元素
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/es/ProEditTable/index.js

@@ -487,10 +487,5 @@ var ProEditTable = (_ref, ref) => {
 };
 var ForwardProEditTable = /*#__PURE__*/forwardRef(ProEditTable);
 
-// 删除输入就卡顿，需要研究
-ForwardProEditTable.defaultProps = {
-  actionProps: [],
-  toolbarProps: []
-};
 // 导出组件
 export default ForwardProEditTable;

package/es/ProEditTable/utils/index.js

@@ -169,7 +169,7 @@ var getActionColumn = config => {
       }
       return /*#__PURE__*/_jsx(Space, {
         size: "small",
-        direction: actionDirection,
+        orientation: actionDirection,
         children: actionBtns.map(btnConfig => {
           return /*#__PURE__*/_jsx(React.Fragment, {
             children: /*#__PURE__*/_jsx(ActionButton, {

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

@@ -75,31 +75,34 @@ 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>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    vertical?: boolean;
+    style?: React.CSSProperties;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    valuePropName?: string;
+    viewRender?: (value: any, record: any, { form, index, namePath, }: {
+        [key: string]: any;
+        form: FormInstance<any>;
+        index?: number;
+    }) => string | React.ReactElement<any, any>;
+    isView?: boolean;
+    trim?: boolean;
+    prefixCls?: string;
+    trigger?: string;
     id?: string;
+    vertical?: boolean;
     className?: string;
     hidden?: boolean;
-    style?: React.CSSProperties;
+    htmlFor?: string;
     onReset?: () => void;
-    prefixCls?: string;
     rootClassName?: string;
-    status?: "" | "success" | "error" | "warning" | "validating";
-    trigger?: string;
+    validateTrigger?: string | false | string[];
     colon?: boolean;
-    isView?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
-    valuePropName?: string;
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -110,23 +113,20 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "error" | "warning" | "validating";
+    validateStatus?: "" | "error" | "warning" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    status?: "" | "error" | "warning" | "success" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
+    clearNotShow?: boolean;
     valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number;
-    }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
     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" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "clearNotShow" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/es/ProForm/index.js

@@ -233,6 +233,9 @@ var ProForm = (props, ref) => {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
+
+  // 过滤掉自定义 props，避免传递到 DOM 元素
+  var filteredOtherProps = omit(otherProps, ['desensitizationKey']);
   return /*#__PURE__*/_jsxs(Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: event => {
       if (!submitOnEnter) return;
@@ -242,7 +245,7 @@ var ProForm = (props, ref) => {
     },
     className: cls,
     form: form
-  }, formProps), omit(config, ['isDiffAll'])), otherProps), {}, {
+  }, formProps), omit(config, ['isDiffAll'])), filteredOtherProps), {}, {
     labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,

package/es/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -41,7 +41,7 @@ var FoldMenu = props => {
     children: /*#__PURE__*/_jsx("ul", {
       className: "pro-layout-menu-fold-list",
       style: _objectSpread({}, style),
-      children: menus.map((item, index) => {
+      children: menus.filter(item => !item.hideInMenu).map((item, index) => {
         var _url$split;
         var id = item.id,
           url = item.url,
@@ -49,14 +49,8 @@ var FoldMenu = props => {
           icon = item.icon,
           imgUrl = item.imgUrl,
           imgActiveUrl = item.imgActiveUrl,
-          hideInMenu = item.hideInMenu,
           children = item.children;
         var toPath = item.redirectUrl || item.url;
-
-        // 隐藏菜单
-        if (hideInMenu) {
-          return null;
-        }
         var selectedMenu = getUrlParams('activeMenu');
         var pathToMatch = selectedPath || selectedMenu || window.location.pathname;
 
@@ -88,7 +82,7 @@ var FoldMenu = props => {
               children: name
             })]
           })
-        }, `${id}-${name}`);
+        });
         return hasChildrenMenu ? /*#__PURE__*/_jsx(Popover, {
           mouseEnterDelay: 0,
           content: /*#__PURE__*/_jsx(SideMenu, {
@@ -98,10 +92,14 @@ var FoldMenu = props => {
             onMenuClick: onMenuClick
           }),
           color: "#fff",
-          overlayClassName: noticeCls,
-          overlayInnerStyle: {
-            marginTop: headerHeight - 48,
-            height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
+          classNames: {
+            root: noticeCls
+          },
+          styles: {
+            content: {
+              marginTop: headerHeight - 48,
+              height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
+            }
           },
           placement: "rightTop",
           children: /*#__PURE__*/_jsx("span", {
@@ -145,9 +143,9 @@ var FoldMenu = props => {
             children: /*#__PURE__*/_jsx(Link, {
               to: toPath,
               children: LiNode
-            }, toPath)
+            })
           })
-        }, toPath) : /*#__PURE__*/_jsx("span", {
+        }, `${id}-${name}`) : /*#__PURE__*/_jsx("span", {
           onClick: () => {
             // 查找完整的菜单项数据
             var menuItem = findMenuItemByKey(menus, String(id));
@@ -165,8 +163,8 @@ var FoldMenu = props => {
           children: /*#__PURE__*/_jsx(Link, {
             to: toPath,
             children: LiNode
-          }, toPath)
-        });
+          })
+        }, `${id}-${name}`);
       })
     })
   });

package/es/ProLayout/index.d.ts

@@ -10,17 +10,6 @@ interface LayoutContextValue {
 export declare const LayoutContext: import("react").Context<LayoutContextValue>;
 declare const ProLayout: {
     (props: ProLayoutType): import("react/jsx-runtime").JSX.Element;
-    defaultProps: {
-        menus: any[];
-        iconfontUrl: string;
-        title: string;
-        collapsed: boolean;
-        routerMatch: string;
-        pure: boolean;
-        theme: string;
-        headerHeight: number;
-        contentStyle: {};
-    };
     ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseType) => import("react/jsx-runtime").JSX.Element;
     ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterType) => import("react/jsx-runtime").JSX.Element>;
     ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderType) => import("react/jsx-runtime").JSX.Element>;

package/es/ProLayout/index.js

@@ -57,9 +57,11 @@ var ProLayout = props => {
     headerTitleRender = props.headerTitleRender,
     headerContentRender = props.headerContentRender,
     rightContentRender = props.rightContentRender,
-    title = props.title,
+    _props$title = props.title,
+    title = _props$title === void 0 ? '' : _props$title,
     logo = props.logo,
-    iconfontUrl = props.iconfontUrl,
+    _props$iconfontUrl = props.iconfontUrl,
+    iconfontUrl = _props$iconfontUrl === void 0 ? '' : _props$iconfontUrl,
     sideMenuFooterRender = props.sideMenuFooterRender,
     sideMenuHeaderRender = props.sideMenuHeaderRender,
     _props$mode = props.mode,
@@ -242,17 +244,6 @@ var ProLayout = props => {
     }))
   });
 };
-ProLayout.defaultProps = {
-  menus: [],
-  iconfontUrl: '',
-  title: '',
-  collapsed: false,
-  routerMatch: 'id',
-  pure: false,
-  theme: 'dark',
-  headerHeight: 48,
-  contentStyle: {}
-};
 ProLayout.ProCollapse = ProCollapse;
 ProLayout.ProFooter = ProFooter;
 ProLayout.ProHeader = ProHeader;

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

@@ -31,7 +31,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var SHOW_PARENT = TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = (props, ref) => {
-  var _useRequest$options, _selectProps$classNam, _selectProps$classNam2, _selectProps$styles, _selectProps$styles2;
+  var _useRequest$options, _useRequest$options3, _selectProps$classNam, _selectProps$classNam2, _selectProps$styles, _selectProps$styles2;
   // 全局属性配置在ConfigProvider
   var _ref = useProConfig('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -234,7 +234,8 @@ export var ProTreeSelect = (props, ref) => {
         defaultOnSuccessFun(fetchFunction.data);
       }
     }
-  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, transformFieldNames]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey]);
   useDeepCompareEffect(() => {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -256,7 +257,8 @@ export var ProTreeSelect = (props, ref) => {
         origDataSource: _resultData
       });
     }
-  }, [enumCode, dataSource, transformFieldNames]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [enumCode, dataSource, showCodeName]);
   useDeepCompareEffect(() => {
     // code存在huo dataSource存在，不执行接口请求
     if (enumCode || dataSource) {

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -182,7 +182,9 @@ var ListChangedWrapper = props => {
     })) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
+    // 过滤掉 disabled，避免传递到 div 等不支持 disabled 的元素
+    var filteredRest = (0, _lodash.omit)(rest, ['disabled']);
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread({}, children.props), filteredRest));
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -214,7 +216,7 @@ var ListChangedWrapper = props => {
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
-      direction: "vertical",
+      orientation: "vertical",
       className: "changed-tooltip",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "start",
@@ -222,14 +224,16 @@ var ListChangedWrapper = props => {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), (0, _lodash.omit)(rest, ['disabled'])), {}, {
+          // 过滤掉 disabled，避免传递到不支持 disabled 的元素
           isView: true
         })) : undefined]
       })]
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), (0, _lodash.omit)(rest, ['disabled'])), {}, {
+        // 过滤掉 disabled，避免传递到不支持 disabled 的元素
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/lib/ProEditTable/index.js

@@ -494,10 +494,5 @@ var ProEditTable = (_ref, ref) => {
 };
 var ForwardProEditTable = /*#__PURE__*/(0, _react.forwardRef)(ProEditTable);
 
-// 删除输入就卡顿，需要研究
-ForwardProEditTable.defaultProps = {
-  actionProps: [],
-  toolbarProps: []
-};
 // 导出组件
 var _default = exports.default = ForwardProEditTable;

package/lib/ProEditTable/utils/index.js

@@ -173,7 +173,7 @@ var getActionColumn = config => {
       }
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
         size: "small",
-        direction: actionDirection,
+        orientation: actionDirection,
         children: actionBtns.map(btnConfig => {
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_components.ActionButton, {

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

@@ -75,31 +75,34 @@ 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>;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    vertical?: boolean;
+    style?: React.CSSProperties;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    valuePropName?: string;
+    viewRender?: (value: any, record: any, { form, index, namePath, }: {
+        [key: string]: any;
+        form: FormInstance<any>;
+        index?: number;
+    }) => string | React.ReactElement<any, any>;
+    isView?: boolean;
+    trim?: boolean;
+    prefixCls?: string;
+    trigger?: string;
     id?: string;
+    vertical?: boolean;
     className?: string;
     hidden?: boolean;
-    style?: React.CSSProperties;
+    htmlFor?: string;
     onReset?: () => void;
-    prefixCls?: string;
     rootClassName?: string;
-    status?: "" | "success" | "error" | "warning" | "validating";
-    trigger?: string;
+    validateTrigger?: string | false | string[];
     colon?: boolean;
-    isView?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
-    valuePropName?: string;
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -110,23 +113,20 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "error" | "warning" | "validating";
+    validateStatus?: "" | "error" | "warning" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    status?: "" | "error" | "warning" | "success" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
+    clearNotShow?: boolean;
     valueType?: import("../../../render/propsType").ProFormValueType;
     switchValue?: [any, any];
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number;
-    }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
     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" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
+    componentProps: import("lodash").Omit<any, "clearNotShow" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/ProForm/index.js

@@ -241,6 +241,9 @@ var ProForm = (props, ref) => {
       otherProps.layout = otherProps.layout || 'vertical';
     }
   }
+
+  // 过滤掉自定义 props，避免传递到 DOM 元素
+  var filteredOtherProps = (0, _lodash.omit)(otherProps, ['desensitizationKey']);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Form, _objectSpread(_objectSpread(_objectSpread(_objectSpread({
     onKeyPress: event => {
       if (!submitOnEnter) return;
@@ -250,7 +253,7 @@ var ProForm = (props, ref) => {
     },
     className: cls,
     form: form
-  }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), otherProps), {}, {
+  }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), filteredOtherProps), {}, {
     labelAlign: (_ref3 = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref3 !== void 0 ? _ref3 : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,

package/lib/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -47,7 +47,7 @@ var FoldMenu = props => {
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("ul", {
       className: "pro-layout-menu-fold-list",
       style: _objectSpread({}, style),
-      children: menus.map((item, index) => {
+      children: menus.filter(item => !item.hideInMenu).map((item, index) => {
         var _url$split;
         var id = item.id,
           url = item.url,
@@ -55,14 +55,8 @@ var FoldMenu = props => {
           icon = item.icon,
           imgUrl = item.imgUrl,
           imgActiveUrl = item.imgActiveUrl,
-          hideInMenu = item.hideInMenu,
           children = item.children;
         var toPath = item.redirectUrl || item.url;
-
-        // 隐藏菜单
-        if (hideInMenu) {
-          return null;
-        }
         var selectedMenu = (0, _utils.getUrlParams)('activeMenu');
         var pathToMatch = selectedPath || selectedMenu || window.location.pathname;
 
@@ -94,7 +88,7 @@ var FoldMenu = props => {
               children: name
             })]
           })
-        }, `${id}-${name}`);
+        });
         return hasChildrenMenu ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Popover, {
           mouseEnterDelay: 0,
           content: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SideMenu.default, {
@@ -104,10 +98,14 @@ var FoldMenu = props => {
             onMenuClick: onMenuClick
           }),
           color: "#fff",
-          overlayClassName: noticeCls,
-          overlayInnerStyle: {
-            marginTop: headerHeight - 48,
-            height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
+          classNames: {
+            root: noticeCls
+          },
+          styles: {
+            content: {
+              marginTop: headerHeight - 48,
+              height: `calc(100vh - ${headerHeight + (notice ? 32 : 0)}px)`
+            }
           },
           placement: "rightTop",
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
@@ -151,9 +149,9 @@ var FoldMenu = props => {
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {
               to: toPath,
               children: LiNode
-            }, toPath)
+            })
           })
-        }, toPath) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        }, `${id}-${name}`) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
           onClick: () => {
             // 查找完整的菜单项数据
             var menuItem = (0, _utils.findMenuItemByKey)(menus, String(id));
@@ -171,8 +169,8 @@ var FoldMenu = props => {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Link, {
             to: toPath,
             children: LiNode
-          }, toPath)
-        });
+          })
+        }, `${id}-${name}`);
       })
     })
   });

package/lib/ProLayout/index.d.ts

@@ -10,17 +10,6 @@ interface LayoutContextValue {
 export declare const LayoutContext: import("react").Context<LayoutContextValue>;
 declare const ProLayout: {
     (props: ProLayoutType): import("react/jsx-runtime").JSX.Element;
-    defaultProps: {
-        menus: any[];
-        iconfontUrl: string;
-        title: string;
-        collapsed: boolean;
-        routerMatch: string;
-        pure: boolean;
-        theme: string;
-        headerHeight: number;
-        contentStyle: {};
-    };
     ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseType) => import("react/jsx-runtime").JSX.Element;
     ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterType) => import("react/jsx-runtime").JSX.Element>;
     ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderType) => import("react/jsx-runtime").JSX.Element>;

package/lib/ProLayout/index.js

@@ -71,9 +71,11 @@ var ProLayout = props => {
     headerTitleRender = props.headerTitleRender,
     headerContentRender = props.headerContentRender,
     rightContentRender = props.rightContentRender,
-    title = props.title,
+    _props$title = props.title,
+    title = _props$title === void 0 ? '' : _props$title,
     logo = props.logo,
-    iconfontUrl = props.iconfontUrl,
+    _props$iconfontUrl = props.iconfontUrl,
+    iconfontUrl = _props$iconfontUrl === void 0 ? '' : _props$iconfontUrl,
     sideMenuFooterRender = props.sideMenuFooterRender,
     sideMenuHeaderRender = props.sideMenuHeaderRender,
     _props$mode = props.mode,
@@ -256,17 +258,6 @@ var ProLayout = props => {
     }))
   });
 };
-ProLayout.defaultProps = {
-  menus: [],
-  iconfontUrl: '',
-  title: '',
-  collapsed: false,
-  routerMatch: 'id',
-  pure: false,
-  theme: 'dark',
-  headerHeight: 48,
-  contentStyle: {}
-};
 ProLayout.ProCollapse = _components.ProCollapse;
 ProLayout.ProFooter = _components.ProFooter;
 ProLayout.ProHeader = _components.ProHeader;

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

@@ -39,7 +39,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = (props, ref) => {
-  var _useRequest$options, _selectProps$classNam, _selectProps$classNam2, _selectProps$styles, _selectProps$styles2;
+  var _useRequest$options, _useRequest$options3, _selectProps$classNam, _selectProps$classNam2, _selectProps$styles, _selectProps$styles2;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -242,7 +242,8 @@ var ProTreeSelect = (props, ref) => {
         defaultOnSuccessFun(fetchFunction.data);
       }
     }
-  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, transformFieldNames]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data, useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.cacheKey]);
   (0, _ahooks.useDeepCompareEffect)(() => {
     if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -264,7 +265,8 @@ var ProTreeSelect = (props, ref) => {
         origDataSource: _resultData
       });
     }
-  }, [enumCode, dataSource, transformFieldNames]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [enumCode, dataSource, showCodeName]);
   (0, _ahooks.useDeepCompareEffect)(() => {
     // code存在huo dataSource存在，不执行接口请求
     if (enumCode || dataSource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/babel.config.js.backup

@@ -1,13 +0,0 @@
-module.exports = {
-  presets: [
-    ['@babel/preset-env', { loose: true }],
-    ['@babel/preset-react', { runtime: 'automatic' }],
-    '@babel/preset-typescript',
-  ],
-  plugins: [
-    ['@babel/plugin-proposal-decorators', { legacy: true }],
-    ['@babel/plugin-proposal-class-properties', { loose: true }],
-    ['@babel/plugin-transform-private-methods', { loose: true }],
-    ['@babel/plugin-transform-private-property-in-object', { loose: true }],
-  ],
-};

package/package.json.backup-antd5

@@ -1,159 +0,0 @@
-{
-  "name": "@zat-design/sisyphus-react",
-  "version": "4.0.0-ant6",
-  "license": "MIT",
-  "main": "lib/index.js",
-  "module": "es/index.js",
-  "typings": "lib/index.d.ts",
-  "homepage": "https://procomponents.zhongan.tech",
-  "keywords": [
-    "components",
-    "design",
-    "framework",
-    "frontend",
-    "react",
-    "react-component",
-    "ui",
-    "zat-design",
-    "sisyphus",
-    "react-sisyphus",
-    "pro-components"
-  ],
-  "scripts": {
-    "analyze": "ANALYZE=1 dumi build",
-    "build": "father build && mv dist/index.min.css dist/index.esm.css && mv dist/less.min.css dist/less.esm.css",
-    "build-es": "father build --format esm",
-    "build-lib": "father build --format cjs",
-    "build-dist": "father build --format umd",
-    "docs": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
-    "lint-staged": "lint-staged",
-    "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.*' --ignore-pattern '**/*.spec.*'",
-    "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
-    "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
-    "lint:prettier": "prettier --check \"**/*\" --end-of-line auto",
-    "lint:report": "eslint --ext .jsx,.js src -f checkstyle -o report_zacc_eslint_js.xml & exit 0; stylelint --custom-formatter node_modules/stylelint-checkstyle-formatter src/**/*.{css,scss,less} > report_zacc_stylelint_css.xml & exit 0",
-    "lint:style": "stylelint --fix \"src/**/*.less\" --syntax less",
-    "precommit": "lint-staged",
-    "prettier": "prettier --write '**/*.{js,jsx,tsx,ts,less,md,json}'",
-    "postpublish": "git clean -fd",
-    "release": "yarn build && npm publish",
-    "release:beta": "yarn build && npm publish --tag=beta",
-    "start": "cross-env NODE_OPTIONS=\"--openssl-legacy-provider\" dumi dev",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "tsc": "tsc --noEmit"
-  },
-  "husky": {
-    "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "npm run lint-staged"
-    }
-  },
-  "lint-staged": {
-    "src/**/*.{js,jsx,ts,tsx}": "npm run lint-staged:js"
-  },
-  "browserslist": [
-    "last 2 versions",
-    "Firefox ESR",
-    "> 1%",
-    "ie >= 11",
-    "iOS >= 7",
-    "Android >= 4"
-  ],
-  "overrides": {
-    "react-resizable": {
-      "react-draggable": "<4.5.0"
-    }
-  },
-  "resolutions": {
-    "mockjs/commander": "9.2.0",
-    "react-draggable": "<4.5.0"
-  },
-  "dependencies": {
-    "@ant-design/icons": "^5.6.1",
-    "@babel/runtime": "^7.18.0",
-    "@dnd-kit/core": "^6.0.8",
-    "@dnd-kit/sortable": "^7.0.2",
-    "@dnd-kit/utilities": "^3.2.1",
-    "@zat-design/utils": "4.0.0-beta.5",
-    "ahooks": "3.9.5",
-    "antd": "^5.28.1",
-    "big.js": "^6.2.1",
-    "classnames": "^2.3.1",
-    "dayjs": "^1.11.13",
-    "lodash": "^4.17.21",
-    "rc-resize-observer": "^1.4.0",
-    "react-lazyload": "^3.2.1",
-    "react-resizable": "^3.0.5",
-    "react-svg": "^15.1.7"
-  },
-  "peerDependencies": {
-    "antd": "^5.26.4",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-router-dom": "^6.0.0"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^12.1.1",
-    "@commitlint/config-conventional": "^12.1.1",
-    "@testing-library/jest-dom": "^6.0.0",
-    "@testing-library/react": "^14.0.0",
-    "@types/classnames": "^2.3.1",
-    "@types/jest": "^29.5.11",
-    "@types/lodash": "^4.14.171",
-    "@types/react": "^18.2.0",
-    "@types/react-dom": "^18.2.0",
-    "@types/react-lazyload": "^3.2.3",
-    "@types/react-resizable": "^3.0.8",
-    "@typescript-eslint/eslint-plugin": "4.0.1",
-    "@typescript-eslint/parser": "4.0.1",
-    "@umijs/fabric": "^2.8.1",
-    "@umijs/preset-react": "^1.8.22",
-    "@umijs/test": "^3.0.5",
-    "@zat-design/login-react": "1.0.25",
-    "babel-eslint": "10.0.3",
-    "babel-plugin-import": "^1.13.8",
-    "babel-plugin-lodash": "^3.3.4",
-    "commander": "9.2.0",
-    "cross-env": "^7.0.3",
-    "dumi": "^1.0.9",
-    "eslint": "7.10.0",
-    "eslint-config-za": "2.1.0",
-    "eslint-plugin-babel": "5.3.0",
-    "eslint-plugin-complexity": "^1.0.2",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-react": "7.16.0",
-    "eslint-plugin-react-hooks": "2.2.0",
-    "eslint-plugin-unused-imports": "^3.0.0",
-    "father": "^4.6.1",
-    "gh-pages": "^3.0.0",
-    "husky": "^4.0.7",
-    "jest-canvas-mock": "^2.5.2",
-    "lint-staged": "^10.0.0",
-    "mini-css-extract-plugin": "^2.9.4",
-    "minimatch": "^10.1.1",
-    "mockjs": "^1.0.0",
-    "prettier": "^2.5.0",
-    "pretty-quick": "^3.1.3",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "react-json-view": "^1.21.3",
-    "slash2": "^2.0.0",
-    "stylelint": "13.0.0",
-    "stylelint-checkstyle-formatter": "0.1.2",
-    "typescript": "^4.9.5",
-    "webpack-deadcode-plugin": "^0.1.17",
-    "yorkie": "^2.0.0"
-  },
-  "checkFiles": [
-    "src/**/*.js*",
-    "src/**/*.ts*",
-    "src/**/*.tsx*",
-    "src/**/*.less",
-    "config/**/*.js*",
-    "scripts/**/*.js"
-  ]
-}