@zat-design/sisyphus-react 3.13.13 → 4.0.0-beta.2

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

@@ -1,23 +1,8 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/input/style";
-import _Input from "antd/es/input";
-import "antd/es/spin/style";
-import _Spin from "antd/es/spin";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/message/style";
-import _message from "antd/es/message";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 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";
 import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
@@ -26,9 +11,12 @@ import _debounce from "lodash/debounce";
 var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SearchOutlined } from '@ant-design/icons';
 import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
+import { Form, message, Input, Tooltip, Space, Button, Spin } from 'antd';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
@@ -65,7 +53,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     defaultOne = props.defaultOne,
     otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
-  var contentForm = _Form.useFormInstance();
+  var contentForm = Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
   }
@@ -120,7 +108,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       _value: value,
       isInit: true,
       onOff: false,
-      visible: false,
       open: false,
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || [],
       selectedRows: [],
@@ -131,13 +118,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     _value = _useSetState2$._value,
     isInit = _useSetState2$.isInit,
     onOff = _useSetState2$.onOff,
-    visible = _useSetState2$.visible,
     open = _useSetState2$.open,
     options = _useSetState2$.options,
     _selectedRows = _useSetState2$.selectedRows,
     _selectedRowKeys = _useSetState2$.selectedRowKeys,
     setState = _useSetState2[1];
-  var _Form$useForm = _Form.useForm(searchForm),
+  var _Form$useForm = Form.useForm(searchForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
@@ -172,7 +158,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, _objectSpread({
       manual: true,
-      ready: (initParams || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && !readOnly || open
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -273,37 +259,37 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     preValue.current = val;
   };
   var handleClick = /*#__PURE__*/function () {
-    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) {
+    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+      var _yield$beforeOpen, res, _t, _t2, _t3;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             if (disabled) {
-              _context.next = 14;
+              _context.n = 5;
               break;
             }
-            _context.next = 3;
+            _context.n = 1;
             return beforeOpen === null || beforeOpen === void 0 ? void 0 : beforeOpen();
-          case 3:
-            _context.t1 = _yield$beforeOpen = _context.sent;
-            _context.t0 = _context.t1 !== null;
-            if (!_context.t0) {
-              _context.next = 7;
+          case 1:
+            _t2 = _yield$beforeOpen = _context.v;
+            _t = _t2 !== null;
+            if (!_t) {
+              _context.n = 2;
               break;
             }
-            _context.t0 = _yield$beforeOpen !== void 0;
-          case 7:
-            if (!_context.t0) {
-              _context.next = 11;
+            _t = _yield$beforeOpen !== void 0;
+          case 2:
+            if (!_t) {
+              _context.n = 3;
               break;
             }
-            _context.t2 = _yield$beforeOpen;
-            _context.next = 12;
+            _t3 = _yield$beforeOpen;
+            _context.n = 4;
             break;
-          case 11:
-            _context.t2 = true;
-          case 12:
-            res = _context.t2;
+          case 3:
+            _t3 = true;
+          case 4:
+            res = _t3;
             if (res) {
               setState({
                 onOff: true
@@ -314,9 +300,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 });
               }, 100);
             }
-          case 14:
-          case "end":
-            return _context.stop();
+          case 5:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -329,7 +314,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form.resetFields();
     setState({
       onOff: false,
-      visible: false,
+      open: false,
       isInit: false
     });
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
@@ -340,19 +325,19 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    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) {
+    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+      var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res, _t4;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.p = _context2.n) {
           case 0:
-            _context2.prev = 0;
+            _context2.p = 0;
             if (!(!(selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || !(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length))) {
-              _context2.next = 4;
+              _context2.n = 1;
               break;
             }
-            _message.error(locale.ProModalSelect.checkMsg);
-            return _context2.abrupt("return", false);
-          case 4:
+            message.error(locale.ProModalSelect.checkMsg);
+            return _context2.a(2, false);
+          case 1:
             nextSelectedRows = selectedRows;
             if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
               nextSelectedRows = data.filter(function (item) {
@@ -368,18 +353,18 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             }
             flag = true;
             if (!onOk) {
-              _context2.next = 14;
+              _context2.n = 3;
               break;
             }
-            _context2.next = 12;
+            _context2.n = 2;
             return onOk(record);
-          case 12:
-            res = _context2.sent;
+          case 2:
+            res = _context2.v;
             if (res !== null && res !== undefined) {
               // @ts-ignore
               flag = res;
             }
-          case 14:
+          case 3:
             if (flag) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
               preValue.current = labelInValue ? record : getNextValues(record);
@@ -390,37 +375,35 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               });
               handleClose();
             }
-            return _context2.abrupt("return", flag);
-          case 18:
-            _context2.prev = 18;
-            _context2.t0 = _context2["catch"](0);
-            console.warn('error', _context2.t0);
-          case 21:
-          case "end":
-            return _context2.stop();
+            return _context2.a(2, flag);
+          case 4:
+            _context2.p = 4;
+            _t4 = _context2.v;
+            console.warn('error', _t4);
+          case 5:
+            return _context2.a(2);
         }
-      }, _callee2, null, [[0, 18]]);
+      }, _callee2, null, [[0, 4]]);
     }));
     return function handleFinish() {
       return _ref8.apply(this, arguments);
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
       var values;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
-            _context3.next = 2;
+            _context3.n = 1;
             return form.validateFields();
-          case 2:
-            values = _context3.sent;
+          case 1:
+            values = _context3.v;
             onSearch(_objectSpread(_objectSpread({}, values), {}, {
               d: Date.now()
             }));
-          case 4:
-          case "end":
-            return _context3.stop();
+          case 2:
+            return _context3.a(2);
         }
       }, _callee3);
     }));
@@ -479,13 +462,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref0 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
       var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             if (!(initParams || defaultOne)) {
-              _context4.next = 9;
+              _context4.n = 2;
               break;
             }
             queryBean = _objectSpread(_objectSpread({}, defaultParams), initParams || {});
@@ -497,10 +480,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context4.next = 7;
+            _context4.n = 1;
             return runAsync(params);
-          case 7:
-            res = _context4.sent;
+          case 1:
+            res = _context4.v;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
@@ -528,23 +511,22 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 });
               }
             }
-          case 9:
-          case "end":
-            return _context4.stop();
+          case 2:
+            return _context4.a(2);
         }
       }, _callee4);
     }));
     return function getInitValues() {
-      return _ref10.apply(this, arguments);
+      return _ref0.apply(this, arguments);
     };
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref1 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
       var _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
             queryBean = _objectSpread({}, defaultParams);
             page = _objectSpread({
@@ -555,10 +537,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context5.next = 6;
+            _context5.n = 1;
             return runAsync(params);
-          case 6:
-            res = _context5.sent;
+          case 1:
+            res = _context5.v;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
@@ -585,14 +567,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 selectedRowKeys: nextSelectRowKeys
               });
             }
-          case 8:
-          case "end":
-            return _context5.stop();
+          case 2:
+            return _context5.a(2);
         }
       }, _callee5);
     }));
     return function getDefaultOneValues() {
-      return _ref11.apply(this, arguments);
+      return _ref1.apply(this, arguments);
     };
   }();
   useImperativeHandle(ref, function () {
@@ -624,13 +605,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   });
   useEffect(function () {
-    if (onOff && !visible) {
+    if (onOff && !open) {
       var _useRequest$options7;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
-        visible: true
+        open: true
       };
       if (labelInValue) {
         if (!value) {
@@ -658,17 +639,17 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }
       setState(nextState);
     }
-  }, [onOff, visible, JSON.stringify(value)]);
+  }, [onOff, open, JSON.stringify(value)]);
   useEffect(function () {
-    hideTooltipIfOpen(fieldRef.current, visible);
-  }, [visible]);
+    hideTooltipIfOpen(fieldRef.current, open);
+  }, [open]);
   useEffect(function () {
-    if (value && !visible && isInit && !readOnly) {
+    if (value && !open && isInit && !readOnly) {
       getInitValues();
     }
-  }, [JSON.stringify(value), visible, isInit]);
+  }, [JSON.stringify(value), open, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !open && readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -691,7 +672,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), open, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   var handleSelectFocus = function handleSelectFocus() {
     if (useRequest) {
       var queryBean = defaultParams || {};
@@ -753,7 +734,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   }, [value, _value]);
   // 加个中间状态Input
-  var initRender = _jsxs(_Space.Compact, {
+  var initRender = _jsxs(Space.Compact, {
     style: {
       width: '100%'
     },
@@ -769,7 +750,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
-      notFoundContent: selectLoading ? _jsx(_Spin, {
+      notFoundContent: selectLoading ? _jsx(Spin, {
         size: "small"
       }) : null,
       onFocus: handleSelectFocus,
@@ -777,17 +758,17 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : _jsx(_Input, _objectSpread({
+    }, restProps)) : _jsx(Input, _objectSpread({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
       autoComplete: "off",
       allowClear: true
-    }, restProps)), isView || disabled ? null : _jsx(_Button, {
+    }, restProps)), isView || disabled ? null : _jsx(Button, {
+      onClick: handleClick,
       icon: _jsx(ReactSVG, {
         className: "viewSvg",
-        src: viewSvg,
-        onClick: handleClick
+        src: viewSvg
       })
     })]
   });
@@ -863,14 +844,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }
   var _className = classNames(_defineProperty(_defineProperty({
     'pro-modal-select': true
-  }, props.className, props.className), 'pro-modal-select-open', visible));
+  }, props.className, props.className), 'pro-modal-select-open', open));
   return _jsxs(_Fragment, {
     children: [_jsx("div", {
       id: uuid,
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? _jsx(_Tooltip, {
+      children: isTooltip && viewText ? _jsx(Tooltip, {
         placement: "topLeft",
         open: open,
         title: viewText,
@@ -882,7 +863,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      open: visible
+      open: open
     }, restModalProps), {}, {
       children: [_jsx(ProForm, {
         submitOnEnter: true,

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-modal-select,
 .pro-tree-modal {
@@ -59,9 +59,9 @@
     border-bottom-right-radius: 0;
     &.@{ant-prefix}-input-affix-wrapper-status-error{
        & + .@{ant-prefix}-btn{
-        border: 1px solid var(--ant-error-color);
+        border: 1px solid #ff4d4f;
         >.viewSvg{
-          color: var(--ant-error-color);
+          color: #ff4d4f;
         }
       }
     }
@@ -81,7 +81,9 @@
   .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(.@{ant-prefix}-btn-compact-first-item):not(.@{ant-prefix}-btn-compact-item-rtl){
     &:hover{
       position: relative;
+      z-index: 1;
       transition: none;
+      border-color: var(--ant-primary-color-hover, #1677ff) !important;
       &::before{
         opacity: 1;
       }
@@ -93,16 +95,13 @@
       left: -1px;
       width: 1px;
       height: calc(100% + 2px);
-      background:var(--ant-primary-color-hover);
+      background: var(--ant-primary-color-hover, #1677ff);
       opacity: 0;
       display: block;
+      z-index: 2;
     }
   }
 
-  .@{ant-prefix}-input-affix-wrapper-status-error{
-    
-  }
-
 
   .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
@@ -132,7 +131,7 @@
   }
 
   .viewSvg {
-    height: 20px;
+    height: 16px;
     cursor: pointer;
     fill: #c5c7cd;
   }
@@ -140,11 +139,11 @@
   .@{ant-prefix}-space-compact {
     .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
       & + .@{ant-prefix}-btn-compact-last-item {
-        border-top: 1px solid var(--ant-error-color);
-        border-right: 1px solid var(--ant-error-color);
-        border-bottom: 1px solid var(--ant-error-color);
+        border-top: 1px solid #ff4d4f;
+        border-right: 1px solid #ff4d4f;
+        border-bottom: 1px solid #ff4d4f;
         >.viewSvg{
-          color: var(--ant-error-color);
+          color: #ff4d4f;
         }
       }
     }

package/es/ProForm/components/combination/ProNumberRange/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { ProNumberRangeType } from './propsType';
-declare const ProNumberRange: (props: ProNumberRangeType) => any;
-export default ProNumberRange;
+declare const _default: import("react").MemoExoticComponent<(props: ProNumberRangeType) => any>;
+export default _default;

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

@@ -1,17 +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/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 _isEmpty from "lodash/isEmpty";
+import _isEqual from "lodash/isEqual";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useSetState, useDeepCompareEffect } from 'ahooks';
+import { Button, Input, InputNumber, Space } from 'antd';
+import { memo } from 'react';
 import classnames from 'classnames';
 import { tools } from '@zat-design/utils';
 import Container from '../../Container';
@@ -179,10 +174,10 @@ var ProNumberRange = function ProNumberRange(props) {
     }
     return result;
   };
-  return _jsx(_Space, {
+  return _jsx(Space, {
     className: cls,
-    children: _jsxs(_Space.Compact, {
-      children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
+    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],
@@ -195,18 +190,18 @@ var ProNumberRange = function ProNumberRange(props) {
       }, 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, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), addonBefore ? _jsx(Button, {
         disabled: true,
         className: "range-addon-before",
         children: addonBefore
-      }) : null, _jsx(_Input, {
+      }) : null, _jsx(Input, {
         className: classnames({
           'range-split': true,
           'range-split-disabled': !!disabled
         }),
         placeholder: "~",
         disabled: true
-      }), _jsx(_InputNumber, _objectSpread(_objectSpread({
+      }), _jsx(InputNumber, _objectSpread(_objectSpread({
         className: "range-right",
         value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
         placeholder: "".concat(locale.ProForm.inputPlaceholder),
@@ -218,7 +213,7 @@ var ProNumberRange = function ProNumberRange(props) {
       }, 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, {
+      }, childProps === null || childProps === void 0 ? void 0 : childProps[1])), addonAfter ? _jsx(Button, {
         disabled: true,
         className: "range-addon-after",
         children: addonAfter
@@ -226,4 +221,10 @@ var ProNumberRange = function ProNumberRange(props) {
     })
   });
 };
-export default ProNumberRange;
+export default /*#__PURE__*/memo(ProNumberRange, function (prevProps, nextProps) {
+  // 基本props比较 只比较关键的
+  if (!_isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.value, nextProps === null || nextProps === void 0 ? void 0 : nextProps.value) || (prevProps === null || prevProps === void 0 ? void 0 : prevProps.disabled) !== (nextProps === null || nextProps === void 0 ? void 0 : nextProps.disabled) || !_isEqual(prevProps === null || prevProps === void 0 ? void 0 : prevProps.childProps, nextProps === null || nextProps === void 0 ? void 0 : nextProps.childProps)) {
+    return false;
+  }
+  return true;
+});