@zat-design/sisyphus-react 3.8.0-beta.15 → 3.8.0-beta.16

package/dist/index.esm.css

@@ -2339,8 +2339,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .range-split {
   width: 32px !important;
   text-align: center !important;
-  border-right: 0px;
-  border-left: 0px;
   pointer-events: none;
 }
 .pro-number-range .range-split.ant-input[disabled] {
@@ -2349,54 +2347,18 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
   border-color: var(--zaui-danger, #ff5050) !important;
 }
-.pro-number-range .ant-input-status-error.range-split {
-  color: var(--zaui-danger, #ff5050) !important;
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-split,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-before,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-after {
   border-color: var(--zaui-danger, #ff5050);
 }
-.pro-number-range .ant-input-rtl.range-right {
-  border-right-width: 0;
-}
-.pro-number-range .ant-input-rtl.range-right:hover,
-.pro-number-range .ant-input-rtl.range-right:focus {
-  border-right-width: 1px;
-}
 .pro-number-range .ant-form-item {
   margin-bottom: 0;
 }
-.pro-number-range .range-left,
-.pro-number-range .range-right {
-  width: calc(50% - 20px);
-  text-align: center;
-}
-.pro-number-range .range-left .ant-input-number {
-  border-right: none;
-}
-.pro-number-range .range-right .ant-input-number {
-  border-left: none;
-}
-.pro-number-range .range-right .range-right {
-  width: 100%;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.pro-number-range.ant-input-group.ant-input-group-compact > *:not(:last-child) {
-  margin-right: 0;
-}
-.pro-number-range > *:first-child {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:first-child > .ant-select-selector {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:last-child {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
-}
-.pro-number-range > *:last-child > .ant-select-selector {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
+.pro-number-range .range-addon-before,
+.pro-number-range .range-addon-after {
+  color: var(--zaui-disabled-text);
+  pointer-events: none;
 }
 .pro-modal-select .ant-input-group-wrapper .close-icon,
 .pro-tree-modal .ant-input-group-wrapper .close-icon {
@@ -2978,7 +2940,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .site-input-group-wrapper .site-input-left,
 .pro-form .site-input-group-wrapper .site-input-right {
-  width: calc(50% - 20px);
+  width: calc(50% - 16px);
 }
 .pro-form .site-input-group-wrapper .site-input-left .ant-input-number {
   border-right: none;

package/dist/less.esm.css

@@ -2339,8 +2339,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .range-split {
   width: 32px !important;
   text-align: center !important;
-  border-right: 0px;
-  border-left: 0px;
   pointer-events: none;
 }
 .pro-number-range .range-split.ant-input[disabled] {
@@ -2349,54 +2347,18 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-number-range .ant-input-number-status-error:not(.ant-input-number-disabled):not( .ant-input-number-borderless).ant-input-number {
   border-color: var(--zaui-danger, #ff5050) !important;
 }
-.pro-number-range .ant-input-status-error.range-split {
-  color: var(--zaui-danger, #ff5050) !important;
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-split,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-before,
+.pro-number-range:has(.ant-input-status-error):not(.pro-number-range-disabled) .range-addon-after {
   border-color: var(--zaui-danger, #ff5050);
 }
-.pro-number-range .ant-input-rtl.range-right {
-  border-right-width: 0;
-}
-.pro-number-range .ant-input-rtl.range-right:hover,
-.pro-number-range .ant-input-rtl.range-right:focus {
-  border-right-width: 1px;
-}
 .pro-number-range .ant-form-item {
   margin-bottom: 0;
 }
-.pro-number-range .range-left,
-.pro-number-range .range-right {
-  width: calc(50% - 20px);
-  text-align: center;
-}
-.pro-number-range .range-left .ant-input-number {
-  border-right: none;
-}
-.pro-number-range .range-right .ant-input-number {
-  border-left: none;
-}
-.pro-number-range .range-right .range-right {
-  width: 100%;
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-}
-.pro-number-range.ant-input-group.ant-input-group-compact > *:not(:last-child) {
-  margin-right: 0;
-}
-.pro-number-range > *:first-child {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:first-child > .ant-select-selector {
-  border-top-right-radius: 0 !important;
-  border-bottom-right-radius: 0 !important;
-}
-.pro-number-range > *:last-child {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
-}
-.pro-number-range > *:last-child > .ant-select-selector {
-  border-top-left-radius: 0 !important;
-  border-bottom-left-radius: 0 !important;
+.pro-number-range .range-addon-before,
+.pro-number-range .range-addon-after {
+  color: var(--zaui-disabled-text);
+  pointer-events: none;
 }
 .pro-modal-select .ant-input-group-wrapper .close-icon,
 .pro-tree-modal .ant-input-group-wrapper .close-icon {
@@ -2978,7 +2940,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .site-input-group-wrapper .site-input-left,
 .pro-form .site-input-group-wrapper .site-input-right {
-  width: calc(50% - 20px);
+  width: calc(50% - 16px);
 }
 .pro-form .site-input-group-wrapper .site-input-left .ant-input-number {
   border-right: none;

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

@@ -4,7 +4,7 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
+var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "valuePropName"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
@@ -41,7 +41,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    var originalValueRow = originalValueList.find(function (item) {
+    var originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
@@ -78,6 +78,9 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     rowKeyPath = props.rowKeyPath,
     children = props.children,
     type = props.type,
+    normalize = props.normalize,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref2 = useProConfig('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
@@ -96,14 +99,15 @@ var ListChangedWrapper = function ListChangedWrapper(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({
-      value: props.value,
+      value: _value,
       originalValue: originalValue,
       form: form,
       equalWith: equalWith
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
-  }, [props.value, originalValue]);
+  }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
   if (!isWatch || noChange) {

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

@@ -216,10 +216,10 @@ var RenderField = function RenderField(_ref) {
   var originalNames = names;
   if (virtualKey) {
     var _cellName$slice, _names2, _names2$map;
-    originalName = [].concat(_toConsumableArray(name), _toConsumableArray(cellName === null || cellName === void 0 ? void 0 : (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, 1)));
+    originalName = [].concat(_toConsumableArray(name), _toConsumableArray(cellName === null || cellName === void 0 ? void 0 : (_cellName$slice = cellName.slice) === null || _cellName$slice === void 0 ? void 0 : _cellName$slice.call(cellName, name.length)));
     originalNames = (_names2 = names) === null || _names2 === void 0 ? void 0 : (_names2$map = _names2.map) === null || _names2$map === void 0 ? void 0 : _names2$map.call(_names2, function (item) {
       var _item$slice;
-      return [].concat(_toConsumableArray(name), _toConsumableArray(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, 1)));
+      return [].concat(_toConsumableArray(name), _toConsumableArray(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length)));
     });
   }
   /**
@@ -559,6 +559,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }

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/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,

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,
@@ -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":

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";
@@ -13,11 +17,9 @@ import { tools } from '@zat-design/utils';
 import Container from '../../Container';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
-var formatAmount = tools.formatAmount,
-  formatPercent = tools.formatPercent,
-  formatPerMill = tools.formatPerMill;
+var formatAmount = tools.formatAmount;
 var ProNumberRange = function ProNumberRange(props) {
-  var _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
+  var _document$querySelect, _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -42,6 +44,7 @@ var ProNumberRange = function ProNumberRange(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  var addonAfterDomWidth = (_document$querySelect = document.querySelector('.ant-input-number-group-addon')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientWidth;
   var _useSetState = useSetState({
       range: value || []
     }),
@@ -87,6 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = classnames({
     'pro-number-range': true,
+    'pro-number-range-disabled': disabled,
     className: className
   });
   // 查看模式
@@ -175,44 +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), {}, {
-      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), {}, {
-      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,83 +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% - 20px);
-    text-align: center;
-  }
+  // .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/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/Render.js

@@ -437,6 +437,7 @@ var Render = function Render(props) {
         type: type,
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
+        normalize: _otherFormItemProps.normalize,
         children: child
       });
     }