@zat-design/sisyphus-react 3.7.3-beta.2 → 3.7.3-beta.21

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

@@ -2,7 +2,7 @@ import { ColProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import React from 'react';
 import { ProColumnProps } from './propsType';
-import { ProFormProps } from '../../propsType';
+import { DiffConfigProps } from '../../propsType';
 interface Props<T = any> {
     isView?: boolean;
     columns: ProColumnProps[];
@@ -13,11 +13,10 @@ interface Props<T = any> {
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
-    originalValues?: ProFormProps<T>['originalValues'];
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);
-    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;

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

@@ -22,11 +22,10 @@ var RenderFields = function RenderFields(props) {
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
     openState = props.openState,
     labelWidth = props.labelWidth,
-    originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
     globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -154,6 +153,7 @@ var RenderFields = function RenderFields(props) {
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
+      componentProps.diffConfig = diffConfig;
     }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
@@ -206,10 +206,9 @@ var RenderFields = function RenderFields(props) {
         otherProps: otherProps,
         fieldProps: isFunction(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));

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

@@ -30,7 +30,8 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
-import { DistributiveOmit } from '../../propsType';
+import { DistributiveOmit, DiffConfigProps } from '../../propsType';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -201,7 +202,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
-    equalWith?: (originValue: any, currentValue: any) => boolean;
+    equalWith?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
@@ -267,7 +268,7 @@ export interface RenderProps<Values = any> {
     form: FormInstance<Values>;
     fieldProps?: ReactiveFunction<Values, React.ReactNode>;
     isSelect: boolean;
-    originalValues?: Values;
+    diffConfig: DiffConfigProps;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
     globalControl?: boolean;

package/es/ProForm/index.js

@@ -11,7 +11,7 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl", "scrollToError", "optimize"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -53,7 +53,7 @@ var ProForm = function ProForm(props, ref) {
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
-    originalValues = props.originalValues,
+    diffConfig = props.diffConfig,
     submitOnEnter = props.submitOnEnter,
     _props$clearNotShow = props.clearNotShow,
     clearNotShow = _props$clearNotShow === void 0 ? true : _props$clearNotShow,
@@ -62,8 +62,6 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalDiffTi = props.originalDiffTip,
-    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     _props$scrollToError = props.scrollToError,
@@ -261,11 +259,10 @@ var ProForm = function ProForm(props, ref) {
         colProps: colProps,
         viewEmpty: viewEmpty,
         labelWidth: labelWidth,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), footerRender()]
     })), children]

package/es/ProForm/propsType.d.ts

@@ -44,6 +44,17 @@ export interface ProFormOtherProps {
     listName?: any[] | string | number;
     globalControl?: boolean;
     formDisabled?: boolean;
+    isDiffChange?: boolean;
+}
+export interface DiffConfigProps<Values = any> {
+    /** 比对原始数据源 */
+    originalValues: Values;
+    /** 是否显示对比值气泡 */
+    toolTip?: boolean;
+    /** 变更提示颜色 */
+    changeTipColor?: string;
+    /** 新增提示颜色 */
+    addTipColor?: string;
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
@@ -67,14 +78,14 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     viewEmpty?: React.ReactNode | string;
     confirmLoading?: boolean;
     labelWidth?: string | number;
-    originalValues?: Values;
     /** 是否回车提交 */
     submitOnEnter?: boolean;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean | boolean[];
-    originalDiffTip?: boolean;
+    /** 表单比对配置 */
+    diffConfig?: DiffConfigProps;
     scrollToError?: boolean;
     /** 性能模式，谨慎使用，默认不开启
      * 1. 开启不过滤names的中间态值

package/es/ProForm/style/index.less

@@ -99,10 +99,12 @@
 
     &.pro-form-item-width-auto {
       .@{ant-prefix}-form-item-control-input {
+        width: 100%;
         flex-grow: inherit;
       }
 
       .@{ant-prefix}-form-item-control-input-content {
+        width: 100%;
         flex: initial;
       }
     }
@@ -314,16 +316,23 @@
       vertical-align: middle;
     }
   }
-  .pro-form-list-mode-block{
-    .pro-collapse-content{
-      .@{ant-prefix}-row{
+
+  .pro-form-list-mode-block {
+    .pro-collapse-content {
+      .@{ant-prefix}-row {
         width: auto;
       }
     }
   }
 
-  // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
+    border-radius: 4px;
+    background: @zaui-contract-bg !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg !important;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -367,10 +376,99 @@
       }
     }
 
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea  {
+      background: @zaui-contract-bg;
+    }
+
     .pro-form-view-container {
       padding: 4px 8px;
       background: @zaui-contract-bg;
       border-radius: 4px;
     }
   }
+
+
+  // 比较原始值场景下  不同时的样式
+  .pro-form-item-add {
+    border-radius: 4px;
+    background: @zaui-contract-bg-add !important;
+
+    .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
+      background: @zaui-contract-bg-add !important;
+    }
+
+    span.@{ant-prefix}-input-affix-wrapper,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-picker,
+    .@{ant-prefix}-input-number {
+      background: @zaui-contract-bg-add !important;
+
+      input {
+        background: transparent !important;
+      }
+      .@{ant-prefix}-select-selection-placeholder {
+        z-index: 9;
+      }
+    }
+
+    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
+      background: @zaui-contract-bg-add;
+      border-radius: 4px;
+    }
+
+    // 地址组件
+    .@{ant-prefix}-form-item-control-input-content {
+      // 查看模式
+      & > span {
+        border-radius: 4px;
+        padding: 5px 8px;
+        background: @zaui-contract-bg-add;
+      }
+
+      & > .pro-address {
+        .@{ant-prefix}-select-selector,
+        .@{ant-prefix}-input-affix-wrapper,
+        .@{ant-prefix}-input-disabled {
+          background: @zaui-contract-bg-add;
+        }
+      }
+      & > .@{ant-prefix}-input-group {
+        .forever-checkbox {
+          background: @zaui-contract-bg-add;
+        }
+      }
+    }
+
+    // checkbox
+    .@{ant-prefix}-checkbox-group {
+      padding: 5px 0
+    }
+    // switch
+    &:has(.@{ant-prefix}-switch) {
+      padding: 5px 0;
+    }
+    
+    // textArea
+    .@{ant-prefix}-input-textarea > textarea {
+      background: @zaui-contract-bg-add;
+    }
+
+
+    .pro-form-view-container {
+      padding: 4px 8px;
+      background: @zaui-contract-bg-add;
+      border-radius: 4px;
+    }
+  }
 }

package/es/ProForm/utils/diffOriginal.d.ts

@@ -1,9 +1,9 @@
 import { FormInstance } from 'antd';
-interface Params {
+export interface DiffOriginalParams {
     originalValue: any;
     value: any;
     form: FormInstance;
-    equalWith?: (originalValue: any, currentValue: any) => boolean;
+    equalWith?: (originalValue: any, currentValue: any) => DiffType | boolean | undefined;
 }
-export declare const diffOriginal: (params: Params) => boolean;
-export {};
+export type DiffType = 'same' | 'add' | 'changed';
+export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/es/ProForm/utils/diffOriginal.js

@@ -1,4 +1,5 @@
 import { isEqual, isFunction } from 'lodash';
+import { isEmpty } from '../../utils';
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
@@ -6,19 +7,29 @@ export var diffOriginal = function diffOriginal(params) {
     equalWith = params.equalWith;
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
-    return !equalWith(originalValue, value);
+    var diffRes = equalWith(originalValue, value);
+    if (diffRes === undefined) return 'same';
+    if (typeof diffRes === 'boolean') {
+      return diffRes ? 'same' : 'changed';
+    }
+    return diffRes;
+  }
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if (isEmpty(originalValue) && !isEmpty(value)) {
+    return 'add';
   }
   if (Array.isArray(originalValue)) {
-    return originalValue.some(function (valueItem, index) {
+    var isSame = originalValue.every(function (valueItem, index) {
       // 如果两个值有一个不是空值, 则进行深比较
-      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
-        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
+        return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
       }
-      return false;
+      return true;
     });
+    return isSame ? 'same' : 'changed';
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
+    return isEqual(value, originalValue) ? 'same' : 'changed';
   }
-  return false;
+  return 'same';
 };

package/es/ProForm/utils/index.js

@@ -120,7 +120,7 @@ export var splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = function filterInternalFields(values, optimize) {
+export var filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -134,21 +134,20 @@ var _filterInternalFields = function filterInternalFields(values, optimize) {
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return _filterInternalFields(item);
+      return filterInternalFields(item);
     });
   }
   if (isObject(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = _filterInternalFields(nextValues[key]);
+      result[key] = filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-export { _filterInternalFields as filterInternalFields };
-var _getAllNamePath = function getAllNamePath(object) {
+export var getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -162,14 +161,13 @@ var _getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if (isObject(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
+      resultKeys.concat(getAllNamePath(value, [].concat(_toConsumableArray(currentPath), [key])));
     }
     resultKeys.push([].concat(_toConsumableArray(currentPath), [key]));
   });
   return resultKeys;
 };
 // 判断一个字段值是否算空
-export { _getAllNamePath as getAllNamePath };
 var nullList = [undefined, 'null', '""', '[]'];
 export var isNullValue = function isNullValue(value) {
   return nullList.includes(JSON.stringify(value));
@@ -306,7 +304,7 @@ export var customEqualForFun = function customEqualForFun(value, other) {
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = function hasRowKey(obj) {
+export var hasRowKey = function hasRowKey(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -316,13 +314,12 @@ var _hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
  * 查询数据中是否包含rowKey
  */
-export { _hasRowKey as hasRowKey };
 export var view = function view(obj) {
   if (_typeof(obj) !== 'object' || obj === null) {
     return false;
@@ -333,7 +330,7 @@ export var view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -369,7 +366,7 @@ export var deleteForPath = function deleteForPath(values, namePath) {
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+export var findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if (isObject(value)) {
     return value;
   }
@@ -379,7 +376,7 @@ var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames)
       return omit(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return omit(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }
@@ -389,7 +386,6 @@ var _findOptionByValue = function findOptionByValue(treeData, value, fieldNames)
 /**
  * 对比依赖列表中的 值是否变更
  */
-export { _findOptionByValue as findOptionByValue };
 export var equalDependencies = function equalDependencies(dependencies, prevValues, currentValues) {
   if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
     return dependencies.some(function (namePath) {

package/es/ProForm/utils/transformValue.js

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value"];
 import { set } from 'lodash';
 import { diffField } from '../utils';
+import { isEmpty } from '../../utils';
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
@@ -22,23 +21,30 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       return _value;
     },
     getValueProps: function getValueProps(value) {
+      var _curValue;
       var _value = [];
       names.forEach(function (name, index) {
         var value = form.getFieldValue(name);
         _value[index] = value;
       });
       // 支持外部传入转换函数
-      var _ref = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
-          value: _value
-        },
-        cusValue = _ref.value,
-        cusRest = _objectWithoutProperties(_ref, _excluded);
+      var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
+        value: _value
+      };
+      // 如果数组中值都为空, 则值置为空
+      var curValue = res === null || res === void 0 ? void 0 : res.value;
       // @ts-ignore
-      set(form.getFieldsValue(true), fieldName, cusValue);
+      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
+        return isEmpty(item);
+      })) {
+        curValue = undefined;
+      }
+      // @ts-ignore
+      set(form.getFieldsValue(true), fieldName, curValue);
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
-      return _objectSpread({
-        value: cusValue
-      }, cusRest);
+      return _objectSpread(_objectSpread({}, res), {}, {
+        value: curValue
+      });
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
       return diffField(prevValues, curValues, names);

package/es/ProIcon/utils/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { themeMap, themeFillMap } from '../config';
-var _recurseGetNodes = function recurseGetNodes(type, node, queue) {
+export var recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -19,11 +19,10 @@ var _recurseGetNodes = function recurseGetNodes(type, node, queue) {
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      _recurseGetNodes(type, node.childNodes[i], queue);
+      recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
-export { _recurseGetNodes as recurseGetNodes };
 export var onBeforeInjection = function onBeforeInjection(_ref) {
   var svg = _ref.svg,
     actionMap = _ref.actionMap,
@@ -50,7 +49,7 @@ export var onBeforeInjection = function onBeforeInjection(_ref) {
     // 目前只支持处理渐变及fill填充
     var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
     types.forEach(function (typeKey) {
-      _recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
     });
     if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
       nodeMap.gradation.forEach(function (item, index) {

package/es/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts

@@ -1,3 +1,3 @@
 import type { OpenMenuPropsType } from './propsType';
-declare const OpenMenu: (props: OpenMenuPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const OpenMenu: (props: OpenMenuPropsType) => JSX.Element;
 export default OpenMenu;

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

@@ -50,7 +50,7 @@ var OpenMenu = function OpenMenu(props) {
     if (!Array.isArray(result) || !result.length) {
       return [];
     }
-    var _menuDeep = function menuDeep(data) {
+    var menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
         var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
@@ -91,7 +91,7 @@ var OpenMenu = function OpenMenu(props) {
           if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
             delete item.children;
           } else {
-            _menuDeep(item.children);
+            menuDeep(item.children);
           }
         } else {
           delete item.children;
@@ -99,7 +99,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    _menuDeep(result);
+    menuDeep(result);
     return result;
   }, [dataSource]);
   useDeepCompareEffect(function () {

package/es/ProLayout/components/ProCollapse/index.d.ts

@@ -1,3 +1,3 @@
 import { ProCollapseProps } from './PropTypes';
-declare const ProCollapse: (props: ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
+declare const ProCollapse: (props: ProCollapseProps) => JSX.Element;
 export default ProCollapse;

package/es/ProLayout/components/ProFooter/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProFooterProps } from './PropTypes';
-declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProFooterProps) => JSX.Element>;
 export default _default;

package/es/ProLayout/components/ProHeader/components/Copy/index.d.ts

@@ -1,4 +1,4 @@
 declare const Copy: ({ text }: {
     text: any;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => JSX.Element;
 export default Copy;

package/es/ProLayout/components/ProHeader/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { ProHeaderProps } from './PropTypes';
-declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: React.MemoExoticComponent<(props: ProHeaderProps) => JSX.Element>;
 export default _default;

package/es/ProLayout/index.d.ts

@@ -5,7 +5,7 @@ export declare const LayoutContext: import("react").Context<{
     onSelected: (params: any) => void;
 }>;
 declare const ProLayout: {
-    (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;
+    (props: ProLayoutProps): JSX.Element;
     defaultProps: {
         menus: any[];
         iconfontUrl: string;
@@ -17,8 +17,8 @@ declare const ProLayout: {
         headerHeight: number;
         contentStyle: {};
     };
-    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
-    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
-    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
+    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => JSX.Element;
+    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => JSX.Element>;
+    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => JSX.Element>;
 };
 export default ProLayout;