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

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
       });
     }

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

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

package/es/ProForm/style/index.less

@@ -218,7 +218,7 @@
 
     .site-input-left,
     .site-input-right {
-      width: calc(50% - 20px);
+      width: calc(50% - 16px);
     }
 
     .site-input-left {

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

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

package/es/ProForm/utils/useShouldUpdate.js

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

package/es/ProSelect/index.js

@@ -296,9 +296,8 @@ export var ProSelect = function ProSelect(props, ref) {
       showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      // optionLabelProp={otherProps?.isDiffChange ? "label" : 'children'} // 解决warning报错，添加默认值
-      optionLabelProp: "label" // 解决warning报错，添加默认值
-      ,
+      optionLabelProp: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isDiffChange) ? 'label' : 'children',
+      // optionLabelProp="label" // 解决warning报错，添加默认值
       showSearch: true,
       filterOption: isFunction(_onSearch) ? false : function (input, option) {
         var _option$children, _option$children$prop;

package/es/ProSelect/utils/index.js

@@ -30,7 +30,7 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
       _iterator.f();
     }
     if (mode === 'multiple') {
-      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result));
+      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result || []));
     } else {
       selectValues.push(result);
     }
@@ -53,13 +53,14 @@ export var getSelectList = function getSelectList(_ref2) {
   if (!otherProps) {
     return null;
   }
-  var listName = otherProps.listName,
+  var name = otherProps.name,
+    listName = otherProps.listName,
     form = otherProps.form;
   var firstNumberIndex = listName.lastIndexOf(listName.findLast(function (item) {
     return typeof item === 'number';
   }));
-  var fatherName = listName.slice(0, firstNumberIndex);
-  var selectName = listName.slice(firstNumberIndex + 1);
+  var fatherName = (name || listName).slice(0, firstNumberIndex);
+  var selectName = (name || listName).slice(firstNumberIndex + 1);
   return findSelectNameValues({
     list: form.getFieldValue(fatherName) || [],
     selectName: selectName,

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -1,11 +1,12 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, }: {
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
     rowKey: any;
     diffToolTip?: boolean;
+    wrapToolTipProps?: any;
 }) => void;
 /**
  * 查找最近的父级className

package/es/ProTable/components/FormatColumn/index.js

@@ -1,5 +1,6 @@
 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, Fragment as _Fragment } from "react/jsx-runtime";
 import { isValidElement } from 'react';
 import moment from 'moment';
@@ -16,7 +17,8 @@ export var formatColumn = function formatColumn(_ref) {
     originalObj = _ref.originalObj,
     dataSourceObj = _ref.dataSourceObj,
     rowKey = _ref.rowKey,
-    diffToolTip = _ref.diffToolTip;
+    diffToolTip = _ref.diffToolTip,
+    wrapToolTipProps = _ref.wrapToolTipProps;
   var title = column.title,
     valueType = column.valueType,
     _column$format = column.format,
@@ -36,6 +38,7 @@ export var formatColumn = function formatColumn(_ref) {
     originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT,
     _column$toolTipProps = column.toolTipProps,
     toolTipProps = _column$toolTipProps === void 0 ? {} : _column$toolTipProps;
+  var _toolTipProps = _objectSpread(_objectSpread({}, toolTipProps), wrapToolTipProps);
   var _originalDiffTip = diffToolTip !== null && diffToolTip !== void 0 ? diffToolTip : originalDiffTip;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
@@ -105,7 +108,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -135,7 +138,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -188,7 +191,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -226,7 +229,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (precision || prefix || suffix) {
@@ -253,7 +256,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: renderValue,
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   } else if (valueType === 'address') {
@@ -309,7 +312,7 @@ export var formatColumn = function formatColumn(_ref) {
           node: value,
           value: value,
           currentValue: value,
-          toolTipProps: toolTipProps
+          toolTipProps: _toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -330,7 +333,7 @@ export var formatColumn = function formatColumn(_ref) {
           value: value,
           currentValue: value || '-',
           originalDiffTip: _originalDiffTip,
-          toolTipProps: toolTipProps
+          toolTipProps: _toolTipProps
         }), suffixNode(value, record, index)]
       });
     };
@@ -353,7 +356,7 @@ export var formatColumn = function formatColumn(_ref) {
         value: value,
         currentValue: value || '-',
         originalDiffTip: _originalDiffTip,
-        toolTipProps: toolTipProps
+        toolTipProps: _toolTipProps
       });
     };
   }

package/es/ProTable/index.js

@@ -56,6 +56,15 @@ function ProTable(props) {
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
     restProps = _objectWithoutProperties(props, _excluded);
+  var _props$scrollFollowPa = props.scrollFollowParent,
+    scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
+  var wrapToolTipProps = {
+    getPopupContainer: scrollFollowParent ? function (triggerNode) {
+      return triggerNode.parentNode;
+    } : function () {
+      return document.body;
+    }
+  };
   var _ref3 = diffConfig || {},
     originalDataSource = _ref3.originalDataSource,
     changeTipColor = _ref3.changeTipColor,
@@ -198,7 +207,8 @@ function ProTable(props) {
         originalObj: originalObj,
         dataSourceObj: dataSourceObj,
         rowKey: 'rowKey',
-        diffToolTip: toolTip
+        diffToolTip: toolTip,
+        wrapToolTipProps: wrapToolTipProps
       });
     });
     return newColumns;

package/es/ProTable/propsType.d.ts

@@ -103,6 +103,10 @@ export interface ProTableProps<T = any> extends Omit<TableProps<any>, 'summary'
      */
     onDragStart?: DragStartGuardProps;
     onDragEnd?: DragEndGuardProps;
+    /**
+     * 滚动额外配置
+     */
+    scrollFollowParent?: boolean;
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

package/es/ProTree/components/ProTreeSelect/index.js

@@ -297,6 +297,16 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     var labelText = node[label];
     var value = node[code];
     var key = node[uuidKey];
+    // 三无走默认
+    if (['undefined-undefined', 'undefined'].includes(labelText) && !value && !key) {
+      if (showCodeName) {
+        labelText = "".concat(node === null || node === void 0 ? void 0 : node.value, "-").concat(node === null || node === void 0 ? void 0 : node.label);
+      } else {
+        labelText = node === null || node === void 0 ? void 0 : node.label;
+      }
+      value = node === null || node === void 0 ? void 0 : node.value;
+      key = node === null || node === void 0 ? void 0 : node.value;
+    }
     var titleHtml = _jsx("span", {
       dangerouslySetInnerHTML: {
         __html: labelText

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

@@ -16,7 +16,7 @@ var _lodash = require("lodash");
 var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
-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"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -46,7 +46,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = (0, _lodash.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;
@@ -83,13 +83,16 @@ 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 = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
     isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var isWatch = originalValues;
   var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
@@ -101,14 +104,15 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
   var diffType = (0, _react.useMemo)(function () {
     if (!isWatch || noChange) return 'same';
+    var _value = normalize ? normalize(props[valuePropName]) : props[valuePropName];
     return (0, _diffOriginal.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/lib/ProEditTable/components/RenderField/index.js

@@ -223,10 +223,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)));
     });
   }
   /**
@@ -566,6 +566,8 @@ var RenderField = function RenderField(_ref) {
         equalWith: equalWith,
         type: type,
         onChange: _onChange,
+        valuePropName: _formItemProps.valuePropName,
+        normalize: _formItemProps.normalize,
         children: FieldComponent
       });
     }

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;

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

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

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

@@ -17,11 +17,9 @@ var _utils = require("@zat-design/utils");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var formatAmount = _utils.tools.formatAmount,
-  formatPercent = _utils.tools.formatPercent,
-  formatPerMill = _utils.tools.formatPerMill;
+var formatAmount = _utils.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,
@@ -46,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 = (0, _ahooks.useSetState)({
       range: value || []
     }),
@@ -91,6 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = (0, _classnames.default)({
     'pro-number-range': true,
+    'pro-number-range-disabled': disabled,
     className: className
   });
   // 查看模式
@@ -179,44 +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), {}, {
-      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), {}, {
-      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;