@zat-design/sisyphus-react 3.8.3-beta.5 → 3.8.3-beta.7

package/lib/ProForm/components/combination/FormList/index.js

@@ -11,6 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
 var _antd = require("antd");
 var _core = require("@dnd-kit/core");
+var _lodash = require("lodash");
 var _sortable = require("@dnd-kit/sortable");
 var _utils = require("../../../utils");
 var _utils2 = require("./utils");
@@ -18,6 +19,7 @@ var _ToolbarButton = _interopRequireDefault(require("./components/ToolbarButton"
 var _BlockFields = _interopRequireDefault(require("./components/BlockFields"));
 var _LineFields = _interopRequireDefault(require("./components/LineFields"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var _ProConfigProvider = require("../../../../ProConfigProvider");
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
     min = props.min,
@@ -39,9 +41,16 @@ var FormList = function FormList(props, ref) {
   var _ref = _ProForm.default.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
-    isView = _ref.isView;
+    isView = _ref.isView,
+    diffConfig = _ref.diffConfig;
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = (0, _utils.toArray)(name);
+  var orgValues = (0, _lodash.get)(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var _diffConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, diffConfig), {}, {
+    originalValues: isDiffAll ? orgValues || [] : orgValues
+  });
   var processColumns = (0, _react.useCallback)(function (fieldName, namePath) {
     return columns.map(function (item) {
       // names的name处理
@@ -104,7 +113,8 @@ var FormList = function FormList(props, ref) {
           colProps: {
             span: span
           },
-          form: form
+          form: form,
+          diffConfig: _diffConfig
         }), field.key) : (0, _jsxRuntime.jsx)(_LineFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
@@ -118,7 +128,8 @@ var FormList = function FormList(props, ref) {
           colProps: {
             span: mode === 'less' ? 24 : span
           },
-          form: form
+          form: form,
+          diffConfig: _diffConfig
         }), field.key);
       }), (0, _jsxRuntime.jsx)(_antd.Form.ErrorList, {
         errors: errors

package/lib/ProForm/components/combination/FormList/utils.js

@@ -30,7 +30,7 @@ var namesPathTransform = exports.namesPathTransform = function namesPathTransfor
 // 比较memo
 var memoWith = exports.memoWith = function memoWith(pre, next) {
   return (0, _lodash.isEqualWith)(pre, next, function (objValue, othValue) {
-    if (/*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
+    if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -57,7 +57,7 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
-  var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {

package/lib/ProForm/components/combination/ProCascader/index.d.ts

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

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -29,9 +29,9 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -101,7 +101,7 @@ var ProCascader = function ProCascader(props) {
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -117,7 +117,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -136,7 +136,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -206,7 +206,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var _findSelectedOptions = function findSelectedOptions(options, value) {
+  var findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -225,7 +225,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -234,7 +234,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = (0, _react.useMemo)(function () {
-    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -190,11 +190,25 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         value: item[valueKey],
         label: item[labelKey]
       }));
-    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : undefined;
+    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : '';
   };
   var viewText = (0, _react.useMemo)(function () {
-    return formatValue(labelInValue ? value : _value);
-  }, [value, _value]);
+    var nextValue = labelInValue ? value : _value;
+    if (labelInValue) {
+      nextValue = value;
+    } else {
+      var _options$find;
+      var optionDTO = options === null || options === void 0 ? void 0 : (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (optionDTO) {
+        nextValue = optionDTO;
+      } else {
+        nextValue = _value;
+      }
+    }
+    return formatValue(nextValue);
+  }, [value, _value, options]);
   /**
    * 获取表格的rowKey，支持函数、字符串
    * @date 2023-02-16
@@ -233,7 +247,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$beforeOpen, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -300,7 +314,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -365,7 +379,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -438,7 +452,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -501,7 +515,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
+    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {

package/lib/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
 export default InputRange;

package/lib/ProForm/components/old/InputWithSuffix/index.d.ts

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

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -23,5 +24,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
 export default ProAddress;

package/lib/ProForm/components/old/ProAddress/index.js

@@ -93,7 +93,7 @@ function ProAddress(_ref3) {
     secondCitys = _useState6[0],
     setSecondCitys = _useState6[1];
   var queryCity = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
+    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
       var cityList, _cityList, newList, _secondCitys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/lib/ProForm/components/old/ProRangeBox/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;

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

@@ -28,7 +28,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
+    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
       var _len,
         other,
         _key,

package/lib/ProForm/components/render/Render.js

@@ -240,7 +240,7 @@ var Render = function Render(props) {
       _args = functionArgs([].concat(args));
     }
     var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if (/*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
+    if ( /*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
@@ -290,7 +290,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -373,7 +373,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,

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

@@ -194,7 +194,8 @@ var RenderFields = function RenderFields(props) {
       namePath: column.namePath,
       listName: column.listName,
       globalControl: globalControl,
-      formDisabled: formDisabled
+      formDisabled: formDisabled,
+      diffConfig: diffConfig
     };
     return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       value: otherProps,

package/lib/ProForm/index.js

@@ -201,7 +201,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
+    } else if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {

package/lib/ProForm/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
     isDiffChange?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */

package/lib/ProForm/utils/index.js

@@ -136,7 +136,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -150,20 +150,20 @@ var _filterInternalFields = exports.filterInternalFields = function filterIntern
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return _filterInternalFields(item);
+      return filterInternalFields(item);
     });
   }
   if ((0, _lodash.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;
 };
-var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -177,7 +177,7 @@ var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if ((0, _lodash.isObject)(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+      resultKeys.concat(getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
     }
     resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
   });
@@ -320,7 +320,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
+var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -330,7 +330,7 @@ var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -346,7 +346,7 @@ var view = exports.view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -382,7 +382,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
@@ -392,7 +392,7 @@ var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(
       return (0, _lodash.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 (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }

package/lib/ProForm/utils/useForm.js

@@ -44,7 +44,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

package/lib/ProIcon/utils/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.recurseGetNodes = exports.onBeforeInjection = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _config = require("../config");
-var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -26,7 +26,7 @@ var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type,
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      _recurseGetNodes(type, node.childNodes[i], queue);
+      recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
@@ -56,7 +56,7 @@ var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_
     // 目前只支持处理渐变及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/lib/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/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -56,7 +56,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
@@ -97,7 +97,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;
@@ -105,7 +105,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    _menuDeep(result);
+    menuDeep(result);
     return result;
   }, [dataSource]);
   (0, _ahooks.useDeepCompareEffect)(function () {

package/lib/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/lib/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/lib/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/lib/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/lib/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;

package/lib/ProLayout/utils/index.js

@@ -25,7 +25,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
     _pathName = activeMenu;
   }
   var result;
-  var _menuDeep = function menuDeep(menuDeepItem) {
+  var menuDeep = function menuDeep(menuDeepItem) {
     for (var i = 0; i <= menuDeepItem.length - 1; i++) {
       var item = menuDeepItem[i];
       // 只包含一级菜单时，解决URL：/endorsement/demo/123无法选中问题
@@ -34,7 +34,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
-        _menuDeep(item.children);
+        menuDeep(item.children);
       } else if (((item === null || item === void 0 ? void 0 : item.url) && _pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
         // 当循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
@@ -42,7 +42,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
       }
     }
   };
-  _menuDeep(menus);
+  menuDeep(menus);
   return result || [];
 };
 /**
@@ -52,7 +52,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
  */
 var transformMenu = exports.transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = (0, _toConsumableArray2.default)(menuData);
-  var _menuDeep2 = function menuDeep(menuDeepItem) {
+  var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -85,11 +85,11 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData, pat
           childrenItem.keyUrlPath = (0, _toConsumableArray2.default)(item.keyUrlPath);
           childrenItem.keyIdPath = (0, _toConsumableArray2.default)(item.keyIdPath);
         });
-        _menuDeep2(item.children);
+        menuDeep(item.children);
       }
     });
   };
-  _menuDeep2(data);
+  menuDeep(data);
   return data;
 };
 /**
@@ -144,7 +144,7 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
   var menus = _ref.menus,
     pathName = _ref.pathName;
   var result;
-  var _menuDeep3 = function menuDeep(menuDeepItem) {
+  var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -158,7 +158,7 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
-        _menuDeep3(item.children);
+        menuDeep(item.children);
       } else if (((item === null || item === void 0 ? void 0 : item.url) && pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
         // URL未匹配时，循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
@@ -166,6 +166,6 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
       }
     }
   };
-  _menuDeep3(menus);
+  menuDeep(menus);
   return result;
 };

package/lib/ProSelect/components/AdaptiveTooltip.d.ts

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