@zat-design/sisyphus-react 3.8.0 → 3.8.2

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

@@ -77,8 +77,6 @@ var RenderField = function RenderField(_ref) {
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
     formNamePath = config.namePath,
-    _config$originalDiffT = config.originalDiffTip,
-    originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
     _config$validateTrigg = config.validateTrigger,
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
@@ -223,10 +221,10 @@ var RenderField = function RenderField(_ref) {
   var originalNames = names;
   if (virtualKey) {
     var _cellName$slice, _names2, _names2$map;
-    originalName = [].concat((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(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((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(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((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(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((0, _toConsumableArray2.default)(name), (0, _toConsumableArray2.default)(item === null || item === void 0 ? void 0 : (_item$slice = item.slice) === null || _item$slice === void 0 ? void 0 : _item$slice.call(item, name.length)));
     });
   }
   /**
@@ -253,7 +251,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
+    if (/*#__PURE__*/_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -269,7 +267,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
+    if (/*#__PURE__*/_react.default.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -312,7 +310,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = (0, _lodash.debounce)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _onChange = (0, _lodash.debounce)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -416,7 +414,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -552,7 +550,7 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
+    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? (/*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
     if (originalValues) {
       FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
@@ -566,6 +564,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }

package/lib/ProEditTable/components/RenderToolbar/index.js

@@ -82,7 +82,7 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
+      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
         var onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/lib/ProEditTable/index.js

@@ -180,7 +180,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
     var originalArr = (0, _lodash.get)(originalValues, name);
-    if (!isEdit && IsNew(originalArr, record)) {
+    if (IsNew(originalArr, record)) {
       return "is-new-row ".concat(className);
     }
     return className;
@@ -279,19 +279,23 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (0, _utils.transformColumns)(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   (0, _react.useEffect)(function () {
-    var _value$every;
+    var _value$every, _originalArr$every;
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
+    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
+    var originalArr = (0, _lodash.get)(originalValues, name);
+    var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
+      return item.rowKey;
+    }) : true;
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey) {
+    if ((value === null || value === void 0 ? void 0 : value.length) && !isAllHasKey || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && !isOriginalAllHasKey) {
       var _originalArr$forEach;
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
-      var originalArr = (0, _lodash.get)(originalValues, name);
       originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
         item.rowKey = getRowKey(item);
       });
@@ -300,7 +304,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         form.setFieldValue(virtualRowName, nextValues);
       }
     }
-  }, [value]);
+  }, [value, originalValues]);
   (0, _react.useImperativeHandle)((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {
       getInternalState: function getInternalState() {

package/lib/ProEditTable/style/index.less

@@ -283,7 +283,8 @@
 
   .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
     td, .@{ant-prefix}-table-cell-row-hover {
-      background: var(--ant-primary-2) !important;
+      background: var(--zaui-contract-bg-add, #d2fff4) !important;
+      
     }
   }
 }

package/lib/ProEditTable/utils/config.js

@@ -69,7 +69,7 @@ var actions = exports.actions = {
     });
   },
   save: function () {
-    var _save = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
+    var _save = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -172,7 +172,7 @@ var actions = exports.actions = {
     }
   },
   add: function () {
-    var _add = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+    var _add = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {

package/lib/ProEditTable/utils/index.js

@@ -30,7 +30,7 @@ var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick"],
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, function (value) {
-      if ( /*#__PURE__*/_react.default.isValidElement(value)) {
+      if (/*#__PURE__*/_react.default.isValidElement(value)) {
         return value;
       }
     }),
@@ -87,7 +87,7 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
+      var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, index) {
         var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
@@ -238,7 +238,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
+            children: icon ? (/*#__PURE__*/_react.default.cloneElement(icon, {
               className: 'icon-tip'
             })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
               className: "icon-tip",
@@ -384,8 +384,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
+      var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
         var _item, key, value, _ref4, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {

package/lib/ProEditTable/utils/tools.js

@@ -199,7 +199,7 @@ var handleScrollToError = exports.handleScrollToError = function handleScrollToE
  */
 function cloneDeepFilterNode(value) {
   return (0, _lodash.cloneDeepWith)(value, function (val) {
-    if ( /*#__PURE__*/_react.default.isValidElement(val)) {
+    if (/*#__PURE__*/_react.default.isValidElement(val)) {
       return val;
     }
   });

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -59,7 +59,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
+      var _setCache = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -169,7 +169,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref3 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {

package/lib/ProEnum/index.js

@@ -154,7 +154,7 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if ( /*#__PURE__*/_react.default.isValidElement(component)) {
+    if (/*#__PURE__*/_react.default.isValidElement(component)) {
       var Component = component;
       return (0, _jsxRuntime.jsx)(Component, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
         dataSource: list,

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

@@ -34,11 +34,13 @@ var FormFooter = function FormFooter(props) {
   var searchCache = (0, _react.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]);
+  (0, _react.useEffect)(function () {
+    if (formId && searchCache[formId]) {
+      form.setFieldsValue(searchCache[formId]);
+    }
+  }, [formId]);
   var _onOk = function _onOk() {
     if (formId) {
       var values = form.getFieldsValue();

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

@@ -134,7 +134,7 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(defaultCallback, callback, index, item) {
       var value, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -273,7 +273,7 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -20,7 +20,7 @@ var BlockTitle = function BlockTitle(props) {
   if (!title) {
     return (0, _jsxRuntime.jsx)("div", {});
   }
-  if ( /*#__PURE__*/_react.default.isValidElement(title)) {
+  if (/*#__PURE__*/_react.default.isValidElement(title)) {
     return title;
   }
   var titleContent = title;

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

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

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

@@ -56,7 +56,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/Group/utils.js

@@ -290,10 +290,17 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         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 (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, column), {}, {
       name: columnName
     }, reactiveProps), {}, {
-      disabled: reactiveProps.disabled || groupProps.disabled,
+      disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,

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

@@ -96,8 +96,11 @@ var ProCascader = function ProCascader(props) {
     enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource;
-    return (0, _index.transformDataName)(result, fieldNames);
+    var result = (0, _index.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 = (0, _objectSpread3.default)({}, 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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref6 = (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) {

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

@@ -25,7 +25,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-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"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -48,6 +48,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,
@@ -232,7 +233,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) {
@@ -267,6 +268,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":
@@ -294,7 +300,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) {
@@ -359,7 +365,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) {
@@ -432,7 +438,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) {
@@ -495,7 +501,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/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/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -90,8 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = (0, _classnames.default)({
     'pro-number-range': true,
-    'pro-number-range-after': addonAfter,
-    'pro-number-range-before': addonBefore,
+    'pro-number-range-disabled': disabled,
     className: className
   });
   // 查看模式
@@ -180,50 +179,51 @@ var ProNumberRange = function ProNumberRange(props) {
     }
     return result;
   };
-  return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
-    compact: true,
+  return (0, _jsxRuntime.jsx)(_antd.Space, {
     className: cls,
-    children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      id: id,
-      className: "range-left",
-      value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
-      placeholder: "".concat(_locale.default.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])), (0, _jsxRuntime.jsx)(_antd.Input, {
-      className: (0, _classnames.default)({
-        'range-split': true,
-        'range-split-disabled': !!disabled
-      }),
-      placeholder: "~",
-      disabled: true
-    }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      className: "range-right",
-      value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
-      placeholder: "".concat(_locale.default.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: (0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
+      children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        id: id,
+        className: "range-left",
+        value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
+        placeholder: "".concat(_locale.default.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 ? (0, _jsxRuntime.jsx)(_antd.Button, {
+        disabled: true,
+        className: "range-addon-before",
+        children: addonBefore
+      }) : null, (0, _jsxRuntime.jsx)(_antd.Input, {
+        className: (0, _classnames.default)({
+          'range-split': true,
+          'range-split-disabled': !!disabled
+        }),
+        placeholder: "~",
+        disabled: true
+      }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        className: "range-right",
+        value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
+        placeholder: "".concat(_locale.default.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 ? (0, _jsxRuntime.jsx)(_antd.Button, {
+        disabled: true,
+        className: "range-addon-after",
+        children: addonAfter
+      }) : null]
+    })
   });
 };
 var _default = exports.default = ProNumberRange;