@zat-design/sisyphus-react 3.8.0 → 3.8.2

package/es/ProForm/components/FormFooter/index.js

@@ -4,7 +4,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useProConfig } from '../../../ProConfigProvider';
 import locale from '../../../locale';
 export var PRO_FORM_CACHE = 'PRO_FORM_CACHE';
@@ -30,11 +30,13 @@ var FormFooter = function FormFooter(props) {
   var searchCache = useMemo(function () {
     var cacheStr = window.sessionStorage.getItem(PRO_FORM_CACHE);
     var cache = JSON.parse(cacheStr || '{}');
-    if (formId && cache[formId]) {
-      form.setFieldsValue(cache[formId]);
-    }
     return cache;
   }, [formId]);
+  useEffect(function () {
+    if (formId && searchCache[formId]) {
+      form.setFieldsValue(searchCache[formId]);
+    }
+  }, [formId]);
   var _onOk = function _onOk() {
     if (formId) {
       var values = form.getFieldsValue();

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

@@ -133,7 +133,7 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,7 +272,7 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -13,7 +13,7 @@ var BlockTitle = function BlockTitle(props) {
   if (!title) {
     return _jsx("div", {});
   }
-  if ( /*#__PURE__*/React.isValidElement(title)) {
+  if (/*#__PURE__*/React.isValidElement(title)) {
     return title;
   }
   var titleContent = title;

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

@@ -55,7 +55,7 @@ var ToolbarButton = function ToolbarButton(props) {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

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

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

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

@@ -48,7 +48,7 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
-  var Component = component ? ( /*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
+  var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {

package/es/ProForm/components/combination/Group/utils.js

@@ -283,10 +283,17 @@ export var useTransformColumns = function useTransformColumns(params) {
         option: args === null || args === void 0 ? void 0 : args[1]
       });
     };
+    // 内外一个为true则为true
+    var getLastDisabled = function getLastDisabled() {
+      if (Array.isArray(groupProps.disabled)) {
+        return reactiveProps.disabled || groupProps.disabled[index];
+      }
+      return reactiveProps.disabled || groupProps.disabled;
+    };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
       name: columnName
     }, reactiveProps), {}, {
-      disabled: reactiveProps.disabled || groupProps.disabled,
+      disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,

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

@@ -96,8 +96,11 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
-    return transformDataName(result, fieldNames);
+    var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    if (transformResponse) {
+      return transformResponse(result);
+    }
+    return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
     service = _useRequest.service,
@@ -112,7 +115,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

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

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

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

@@ -19,7 +19,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -53,6 +53,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     style = props.style,
     className = props.className,
     beforeOpen = props.beforeOpen,
+    afterOpen = props.afterOpen,
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
     searchKey = props.searchKey,
@@ -237,7 +238,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,6 +273,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               setState({
                 onOff: true
               });
+              setTimeout(function () {
+                afterOpen === null || afterOpen === void 0 ? void 0 : afterOpen({
+                  setInnerState: setState
+                });
+              }, 100);
             }
           case 14:
           case "end":
@@ -299,7 +305,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -364,7 +370,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -437,7 +443,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -500,7 +506,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {

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

@@ -39,6 +39,7 @@ interface ProModalPropsType {
     labelInValue?: boolean;
     defaultOne?: boolean;
     beforeOpen?: any;
+    afterOpen?: any;
     isTooltip?: any;
     showCodeName?: boolean;
     searchForm?: FormInstance;

package/es/ProForm/components/combination/ProNumberRange/index.js

@@ -1,8 +1,12 @@
+import "antd/es/input/style";
+import _Input from "antd/es/input";
+import "antd/es/button/style";
+import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/input-number/style";
 import _InputNumber from "antd/es/input-number";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -86,8 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = classnames({
     'pro-number-range': true,
-    'pro-number-range-after': addonAfter,
-    'pro-number-range-before': addonBefore,
+    'pro-number-range-disabled': disabled,
     className: className
   });
   // 查看模式
@@ -176,50 +179,51 @@ var ProNumberRange = function ProNumberRange(props) {
     }
     return result;
   };
-  return _jsxs(_Input.Group, {
-    compact: true,
+  return _jsx(_Space, {
     className: cls,
-    children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
-      id: id,
-      className: "range-left",
-      value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
-      placeholder: "".concat(locale.ProForm.inputPlaceholder),
-      precision: precision,
-      disabled: getDisabled(disabled, 0),
-      onChange: function onChange(e) {
-        firstHandleChange(e);
-      },
-      addonBefore: addonBefore
-    }, valueProps), {}, {
-      style: addonAfter ? {
-        width: "calc(50% - ".concat(16 + addonAfterDomWidth / 2, "px)")
-      } : null,
-      min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
-      max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
-    }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
-      className: classnames({
-        'range-split': true,
-        'range-split-disabled': !!disabled
-      }),
-      placeholder: "~",
-      disabled: true
-    }), _jsx(_InputNumber, _objectSpread(_objectSpread({
-      className: "range-right",
-      value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
-      placeholder: "".concat(locale.ProForm.inputPlaceholder),
-      precision: precision,
-      disabled: getDisabled(disabled, 1),
-      onChange: function onChange(e) {
-        lastHandleChange(e);
-      },
-      addonAfter: addonAfter
-    }, valueProps), {}, {
-      style: addonAfter ? {
-        width: "calc(50% - ".concat(16 - addonAfterDomWidth / 2, "px)")
-      } : null,
-      min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
-      max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
-    }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
+    children: _jsxs(_Space.Compact, {
+      children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
+        id: id,
+        className: "range-left",
+        value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
+        placeholder: "".concat(locale.ProForm.inputPlaceholder),
+        precision: precision,
+        disabled: getDisabled(disabled, 0),
+        onChange: function onChange(e) {
+          firstHandleChange(e);
+        }
+      }, valueProps), {}, {
+        min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
+        max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? _jsx(_Button, {
+        disabled: true,
+        className: "range-addon-before",
+        children: addonBefore
+      }) : null, _jsx(_Input, {
+        className: classnames({
+          'range-split': true,
+          'range-split-disabled': !!disabled
+        }),
+        placeholder: "~",
+        disabled: true
+      }), _jsx(_InputNumber, _objectSpread(_objectSpread({
+        className: "range-right",
+        value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
+        placeholder: "".concat(locale.ProForm.inputPlaceholder),
+        precision: precision,
+        disabled: getDisabled(disabled, 1),
+        onChange: function onChange(e) {
+          lastHandleChange(e);
+        }
+      }, valueProps), {}, {
+        min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
+        max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? _jsx(_Button, {
+        disabled: true,
+        className: "range-addon-after",
+        children: addonAfter
+      }) : null]
+    })
   });
 };
 export default ProNumberRange;

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -6,87 +6,82 @@
     width: 32px !important;
     text-align: center !important;
 
-    border-right: 0px;
-    border-left: 0px;
     pointer-events: none;
     &.@{ant-prefix}-input[disabled] {
       background: #fff !important;
     }
   }
+  // 数字输入框error状态
   .@{ant-prefix}-input-number-status-error:not(.@{ant-prefix}-input-number-disabled):not(
       .@{ant-prefix}-input-number-borderless
     ).@{ant-prefix}-input-number {
     border-color: @zaui-danger !important;
   }
-  .@{ant-prefix}-input-status-error {
-    &.range-split {
-      color: @zaui-danger !important;
+
+  // 分隔符输入框error状态
+  &:has(.@{ant-prefix}-input-status-error):not(.pro-number-range-disabled) {
+    .range-split,
+    .range-addon-before,
+    .range-addon-after {
+      // color: @zaui-danger !important;
       border-color: @zaui-danger;
     }
   }
 
-  & .@{ant-prefix}-input-rtl.range-right {
-    border-right-width: 0;
-  }
-
-  & .@{ant-prefix}-input-rtl.range-right:hover,
-  & .@{ant-prefix}-input-rtl.range-right:focus {
-    border-right-width: 1px;
-  }
-
   .@{ant-prefix}-form-item {
     margin-bottom: 0;
   }
 
-  .range-left,
-  .range-right {
-    width: calc(50% - 16px);
-    text-align: center;
-    transition: none;
-    .range-left {
-      width: calc(100% + 2px) !important;
-    }
-  }
+  // .range-left,
+  // .range-right {
+  //   text-align: center;
+  // }
 
-  .range-left {
-    .@{ant-prefix}-input-number {
-      border-right: none;
-    }
-  }
+  // .range-left {
+  //   .@{ant-prefix}-input-number {
+  //     border-right: none;
+  //   }
+  // }
 
-  .range-right {
-    .@{ant-prefix}-input-number {
-      border-left: none;
-    }
+  // .range-right {
+  //   .@{ant-prefix}-input-number {
+  //     border-left: none;
+  //   }
 
-    .range-right {
-      width: 100%;
-      border-top-left-radius: 0;
-      border-bottom-left-radius: 0;
-    }
-  }
+  //   .range-right {
+  //     width: 100%;
+  //     border-top-left-radius: 0;
+  //     border-bottom-left-radius: 0;
+  //   }
+  // }
 
-  &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
-    margin-right: 0;
+  .range-addon-before,
+  .range-addon-after {
+    color: var(--zaui-disabled-text);
+    pointer-events: none;
   }
 
-  > *:first-child {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
+  // &.@{ant-prefix}-input-group.@{ant-prefix}-input-group-compact > *:not(:last-child) {
+  //   margin-right: 0;
+  // }
 
-    > .@{ant-prefix}-select-selector {
-      border-top-right-radius: 0 !important;
-      border-bottom-right-radius: 0 !important;
-    }
-  }
+  // > *:first-child {
+  //   border-top-right-radius: 0 !important;
+  //   border-bottom-right-radius: 0 !important;
 
-  > *:last-child {
-    border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
+  //   > .@{ant-prefix}-select-selector {
+  //     border-top-right-radius: 0 !important;
+  //     border-bottom-right-radius: 0 !important;
+  //   }
+  // }
 
-    > .@{ant-prefix}-select-selector {
-      border-top-left-radius: 0 !important;
-      border-bottom-left-radius: 0 !important;
-    }
-  }
+  // > *:last-child {
+  //   border-top-left-radius: 0 !important;
+  //   border-bottom-left-radius: 0 !important;
+
+  //   > .@{ant-prefix}-select-selector {
+  //     border-top-left-radius: 0 !important;
+  //     border-bottom-left-radius: 0 !important;
+  //   }
+  // }
 }

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

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

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

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -25,6 +25,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     diffConfig = props.diffConfig,
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    normalize = props.normalize,
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -39,9 +40,10 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
   var diffType = useMemo(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return diffOriginal({
       originalValue: originalValue,
-      value: props[valuePropName],
+      value: _value,
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
@@ -79,7 +81,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
   return _jsx(_Tooltip, {
     open: tipOpenCalc(),
-    mouseEnterDelay: 1,
+    // mouseEnterDelay={1}
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },

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

@@ -22,7 +22,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = ProForm.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(value) {
       var _len,
         other,
         _key,

package/es/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.isValidElement(AutoComponent)) {
+    if (/*#__PURE__*/React.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(_toConsumableArray(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat(_toConsumableArray(_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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().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.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? (/*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -437,6 +437,7 @@ var Render = function Render(props) {
         type: type,
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
+        normalize: _otherFormItemProps.normalize,
         children: child
       });
     }

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

@@ -197,7 +197,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
      * @default           -
      */
     labelWidth?: string | number;
-    disabled?: boolean | ReactiveFunction<Values, boolean>;
+    disabled?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     trim?: boolean;
     upperCase?: boolean;
     hiddenNames?: string[] | any[];

package/es/ProForm/index.js

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

package/es/ProForm/utils/useForm.js

@@ -38,7 +38,7 @@ export var useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

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

@@ -3,7 +3,7 @@ import { ProColumnProps, ProRule } from '../components/render/propsType';
 interface Result<Values> {
     shouldUpdate?: FormItemProps<Values>['shouldUpdate'];
     show?: boolean;
-    disabled?: boolean;
+    disabled?: boolean | boolean[];
     rules?: ProRule[];
     required?: boolean;
     [key: string]: any;
@@ -15,7 +15,7 @@ interface UseShouldUpdateProps<Values> {
         names?: any[];
     };
     form?: FormInstance<Values>;
-    disabled?: ProColumnProps['disabled'];
+    disabled?: boolean;
     rules?: ProRule[];
     required?: boolean;
     type: string;

package/es/ProForm/utils/useShouldUpdate.js

@@ -63,7 +63,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   if (isFunction(disabled)) {
     // RangePicker返回数组时，特殊处理
-    if (type === 'RangePicker' && Array.isArray(disabled(values, {
+    if (['Group', 'RangePicker'].includes(type) && Array.isArray(disabled(values, {
       form: form,
       index: index,
       namePath: namePath