@zat-design/sisyphus-react 3.2.1 → 3.2.2

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

@@ -10,7 +10,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
@@ -20,7 +19,7 @@ var _utils = require("@zat-design/utils");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var transformDataName = _utils.tools.transformDataName;
 var Text = _antd.Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
@@ -48,7 +47,7 @@ var levelMap = {
   3: 'county'
 };
 var ProAddressBar = function ProAddressBar(props) {
-  var _otherProps$otherProp, _ref11, _ref11$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
+  var _ref12, _ref12$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configUseRequest = _ref.useRequest,
     configTransformResponse = _ref.transformResponse,
@@ -78,30 +77,30 @@ var ProAddressBar = function ProAddressBar(props) {
     transformResponse = _props$transformRespo === void 0 ? configTransformResponse : _props$transformRespo,
     _props$level = props.level,
     level = _props$level === void 0 ? 3 : _props$level,
-    _props$isView = props.isView,
-    isView = _props$isView === void 0 ? false : _props$isView,
+    isView = props.isView,
     _props$enumCode = props.enumCode,
     enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
     _props$code = props.code,
     code = _props$code === void 0 ? configCode : _props$code,
     tooltip = props.tooltip,
     _props$separator = props.separator,
-    separator = _props$separator === void 0 ? '' : _props$separator,
-    otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
+    separator = _props$separator === void 0 ? '' : _props$separator;
+  var _ref2 = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref2.isView;
   var addressCode = code || enumCode;
-  var realIsView = isView || (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$otherProp = otherProps.otherProps) === null || _otherProps$otherProp === void 0 ? void 0 : _otherProps$otherProp.isView);
-  var _ref2 = value || [],
-    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-    province = _ref3[0],
-    city = _ref3[1];
+  var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
+  var _ref3 = value || [],
+    _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+    province = _ref4[0],
+    city = _ref4[1];
   var realLevel = Math.max(2, level);
   var county = realLevel === 3 ? value === null || value === void 0 ? void 0 : value[realLevel - 1] : undefined;
   var address = value === null || value === void 0 ? void 0 : value[realLevel];
   var enumData = (0, _useEnum.default)(addressCode);
-  var _ref4 = Array.isArray(enumData) ? enumData : [],
-    _ref5 = (0, _slicedToArray2.default)(_ref4, 1),
-    _ref5$ = _ref5[0],
-    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var _ref5 = Array.isArray(enumData) ? enumData : [],
+    _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
+    _ref6$ = _ref6[0],
+    enumDataSource = _ref6$ === void 0 ? [] : _ref6$;
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
@@ -141,12 +140,12 @@ var ProAddressBar = function ProAddressBar(props) {
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     defaultLabel = _useSetState2[0],
     setDefaultLabel = _useSetState2[1];
-  var _ref6 = defaultLabel || {},
-    provinceLabel = _ref6.province,
-    cityLabel = _ref6.city,
-    countyLabel = _ref6.county;
+  var _ref7 = defaultLabel || {},
+    provinceLabel = _ref7.province,
+    cityLabel = _ref7.city,
+    countyLabel = _ref7.county;
   var getProvinces = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(loadData) {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(loadData) {
       var _yield$service, data, newData, _newData, _provinces, transFormData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -186,11 +185,11 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee);
     }));
     return function getProvinces(_x) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var getAddressData = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
+    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
       var _yield$service2, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -214,12 +213,12 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee2);
     }));
     return function getAddressData(_x2) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   // 传入useRequest时，得到地址省市区的label，初次加载需要
   var initAddressLabel = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(key, value, extra) {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(key, value, extra) {
       var selectProvince, _newData2, _yield$service3, data, newData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -259,7 +258,7 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee3);
     }));
     return function initAddressLabel(_x3, _x4, _x5) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   (0, _react.useEffect)(function () {
@@ -298,7 +297,7 @@ var ProAddressBar = function ProAddressBar(props) {
     }
   }, [realIsView, value, serviceData]);
   var handleLoadData = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(selectedOptions) {
+    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4(selectedOptions) {
       var targetOption, data;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -327,7 +326,7 @@ var ProAddressBar = function ProAddressBar(props) {
       }, _callee4);
     }));
     return function handleLoadData(_x6) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   var handleChange = function handleChange(changeValue, selectedOptions) {
@@ -369,9 +368,9 @@ var ProAddressBar = function ProAddressBar(props) {
     })) === null || _filter === void 0 ? void 0 : _filter.join('/') : undefined;
   };
   var addressValue = value && (province || city || county) ? [province, city, county].slice(0, realLevel) : undefined;
-  var viewValue = ((_ref11 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref11 === void 0 ? void 0 : (_ref11$filter = _ref11.filter(function (item) {
+  var viewValue = ((_ref12 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref12 === void 0 ? void 0 : (_ref12$filter = _ref12.filter(function (item) {
     return !!item;
-  })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
+  })) === null || _ref12$filter === void 0 ? void 0 : _ref12$filter.join(separator)) || '-';
   return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     className: className,
     title: tooltip === true ? viewValue : tooltip,

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

@@ -17,6 +17,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var componentMap = _interopRequireWildcard(require("../../index"));
 var _utils = require("../../../utils");
 var _propsType = require("../../../propsType");
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 require("./style/index.less");
 // @ts-nocheck
 
@@ -53,17 +54,16 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
     }, {
       renderType: 'Input'
     }] : _props$childProps,
-    separator = props.separator,
-    _props$otherProps = props.otherProps,
-    otherProps = _props$otherProps === void 0 ? {} : _props$otherProps;
-  var _otherProps$isView = otherProps.isView,
-    isView = _otherProps$isView === void 0 ? false : _otherProps$isView,
-    viewEmpty = otherProps.viewEmpty,
-    form = otherProps.form;
+    separator = props.separator;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    _ref$isView = _ref.isView,
+    isView = _ref$isView === void 0 ? false : _ref$isView,
+    viewEmpty = _ref.viewEmpty,
+    form = _ref.form;
   // 取到对应组件
-  var _ref = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
-    BeforeCom = _ref[0],
-    AfterCom = _ref[1];
+  var _ref2 = [componentMap[((_childProps$ = childProps[0]) === null || _childProps$ === void 0 ? void 0 : _childProps$.renderType) || 'Input'], componentMap[((_childProps$2 = childProps[1]) === null || _childProps$2 === void 0 ? void 0 : _childProps$2.renderType) || 'Input']],
+    BeforeCom = _ref2[0],
+    AfterCom = _ref2[1];
   var _useControlled = useControlled(props),
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     values = _useControlled2[0],
@@ -111,7 +111,7 @@ var ProCombination = exports.ProCombination = function ProCombination(props) {
   // 查看模式
   if (isView) {
     if (!values || !Array.isArray(values)) {
-      return otherProps.viewEmpty;
+      return viewEmpty;
     }
     var childData = childProps;
     if (!childData || Array.isArray(childData) && !childData.length) {

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

@@ -24,7 +24,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList2 = _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", "otherProps", "searchForm", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -48,7 +48,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     className = props.className,
     beforeOpen = props.beforeOpen,
     isTooltip = props.isTooltip,
-    otherProps = props.otherProps,
     searchForm = props.searchForm,
     defaultOne = props.defaultOne,
     restInputProps = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -69,10 +68,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var _ref = modalProps || {},
     onOk = _ref.onOk,
     restModalProps = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
-  var _ref2 = otherProps || {},
-    _ref2$isView = _ref2.isView,
-    isView = _ref2$isView === void 0 ? false : _ref2$isView,
+  var _ref2 = _index.ProForm.useFieldProps() || {},
+    isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   // 是否多选
   var isMultiple = type === 'checkbox';
   // 生成一个唯一id，用于满足tooltip功能

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

@@ -22,7 +22,7 @@
 
       > span {
         position: relative;
-        font-size: var(--zaui-font-size, 14px);
+        font-size: 10px;
         border: none;
         border-radius: 50%;
       }

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

@@ -1,3 +1,3 @@
 import { ProNumberRangeProps } from './propsType';
-declare const ProNumberRange: (props: ProNumberRangeProps) => import("react").ReactNode;
+declare const ProNumberRange: (props: ProNumberRangeProps) => any;
 export default ProNumberRange;

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

@@ -16,6 +16,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 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;
@@ -33,17 +34,16 @@ var ProNumberRange = function ProNumberRange(props) {
     decimal = _props$decimal === void 0 ? 2 : _props$decimal,
     precision = props.precision,
     childProps = props.childProps,
-    otherProps = props.otherProps,
     addonBefore = props.addonBefore,
     addonAfter = props.addonAfter,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
     inValueType = props.valueType;
-  var _ref = otherProps || {},
-    _ref$isView = _ref.isView,
-    isView = _ref$isView === void 0 ? false : _ref$isView,
-    valueType = _ref.valueType,
-    viewEmpty = _ref.viewEmpty;
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty,
+    valueType = _ref.valueType;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useSetState = (0, _ahooks.useSetState)({
       range: value || []
     }),
@@ -94,7 +94,7 @@ var ProNumberRange = function ProNumberRange(props) {
   // 查看模式
   if (isView || props.isView) {
     if ((0, _lodash.isEmpty)(value)) {
-      return otherProps.viewEmpty;
+      return viewEmpty;
     }
     switch (valueType) {
       // 百分比

package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -10,6 +10,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     value?: ValueStr;
     format?: string;
     separator?: any;
+    isView?: boolean;
 };
 type Value = [Moment?, Moment?, boolean?];
 type ValueStr = [string?, string?, string?];

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

@@ -17,6 +17,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
 var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
 var useControlled = function useControlled(props) {
@@ -54,9 +55,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useControlled = useControlled((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
       format: format
     })),

package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -15,6 +15,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     valueType?: 'moment' | 'format' | 'ISO';
     otherProps?: ProFormOtherProps;
     mode?: 'DatePicker';
+    isView?: boolean;
 };
 export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
 export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {

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

@@ -20,6 +20,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
 var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
+var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 // 永久有效默认值
@@ -34,9 +35,10 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _ref = otherProps || {},
-    isView = _ref.isView,
+  var _ref = _ProForm.default.useFieldProps() || {},
+    isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var _useMemo = (0, _react.useMemo)(function () {
       var foreverMoment = foreverTime ? (0, _moment.default)(foreverTime, format) : (0, _moment.default)('9999-01-01', 'YYYY-MM-DD');
       var foreverString = foreverTime || foreverMoment.format(format);

package/lib/ProForm/components/render/Render.js

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -23,7 +24,7 @@ var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
-var _useChanged = require("../../utils/useChanged");
+var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
@@ -46,7 +47,8 @@ var Render = function Render(props) {
     isSelect = props.isSelect,
     originalValues = props.originalValues,
     equalWith = props.equalWith,
-    requiredOnView = props.requiredOnView;
+    requiredOnView = props.requiredOnView,
+    originalTip = props.originalTip;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -67,7 +69,6 @@ var Render = function Render(props) {
       disabled: componentProps.disabled,
       rules: rules,
       required: required,
-      componentProps: componentProps,
       fieldProps: fieldProps,
       component: component,
       originComponent: originComponent,
@@ -78,7 +79,6 @@ var Render = function Render(props) {
     _disabled = _useShouldUpdate.disabled,
     _rules = _useShouldUpdate.rules,
     _required = _useShouldUpdate.required,
-    _componentProps = _useShouldUpdate.componentProps,
     _fieldProps = _useShouldUpdate.fieldProps,
     AutoComponent = _useShouldUpdate.component;
   otherFormItemProps.shouldUpdate = shouldUpdate;
@@ -96,7 +96,17 @@ var Render = function Render(props) {
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
   // 判断当前字段是否变更
-  var changed = (0, _useChanged.useChanged)(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith);
+  var _useChanged = (0, _useChanged3.useChanged)({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -351,7 +361,9 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange',
+    // 'shouldUpdate',
+    'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -376,26 +388,46 @@ var Render = function Render(props) {
       });
     }
     // 当存在shouldUpdate时补货所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-        shouldUpdate: _otherFormItemProps.shouldUpdate,
-        noStyle: true,
-        children: function children() {
-          return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-            // @ts-ignore
-            _internalItemRender: internalItemRender,
-            className: _className,
-            children: child
-          }));
-        }
-      });
-    }
-    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+    // if (_otherFormItemProps.shouldUpdate) {
+    //   return (
+    //     <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
+    //       {() => {
+    //         return (
+    //           <Form.Item
+    //             {...omit(_otherFormItemProps, filterFormItemKey)}
+    //             // @ts-ignore
+    //             _internalItemRender={internalItemRender}
+    //             className={_className}
+    //           >
+    //             {child}
+    //           </Form.Item>
+    //         );
+    //       }}
+    //     </Form.Item>
+    //   );
+    // }
+    var formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
+    // 不渲染tooltip
+    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: title,
+      visible: changed ? undefined : false,
+      children: formItem
+    });
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -17,6 +17,7 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
+    originalTip?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/lib/ProForm/components/render/RenderFields.js

@@ -32,7 +32,8 @@ var RenderFields = function RenderFields(props) {
     originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
-    required = props.required;
+    required = props.required,
+    originalTip = props.originalTip;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -127,10 +128,10 @@ var RenderFields = function RenderFields(props) {
       }
     }
     var label = formItemChildProps.label,
-      comDisabled = formItemChildProps.disabled,
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
+    var comDisabled = formItemChildProps.disabled || fieldProps.disabled || disabled;
     var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({
@@ -139,17 +140,16 @@ var RenderFields = function RenderFields(props) {
     });
     var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
     // 表单组件Props 兼容2.0版本
-    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabled: disabled
-    }, formItemChildProps), fieldProps);
+    var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemChildProps), fieldProps);
     if ((0, _lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
     }
-    var componentProps = (0, _objectSpread2.default)({
-      disabled: _disabled,
-      placeholder: _placeholder,
+    var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabledStrictly: true
-    }, _fieldProps);
+    }, _fieldProps), {}, {
+      disabled: _disabled,
+      placeholder: _placeholder
+    });
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
@@ -167,7 +167,7 @@ var RenderFields = function RenderFields(props) {
     var otherProps = {
       label: _formItemProps.label,
       name: _formItemProps.name,
-      disabled: formDisabled,
+      disabled: _disabled,
       isView: _isView,
       viewEmpty: viewEmpty,
       valueType: valueType,
@@ -202,7 +202,8 @@ var RenderFields = function RenderFields(props) {
         isSelect: _isSelect,
         originalValues: originalValues,
         equalWith: equalWith,
-        requiredOnView: requiredOnView
+        requiredOnView: requiredOnView,
+        originalTip: originalTip
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip"];
 var ProForm = function ProForm(props, ref) {
   var _localStorage;
   var _props$mode = props.mode,
@@ -64,6 +64,8 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
+    _props$originalTip = props.originalTip,
+    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _useForm = (0, _useForm3.useForm)(originForm),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
@@ -222,7 +224,8 @@ var ProForm = function ProForm(props, ref) {
         originalValues: originalValues,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
-        required: required
+        required: required,
+        originalTip: originalTip
       }), children, footerRender()]
     }))
   }));

package/lib/ProForm/propsType.d.ts

@@ -66,6 +66,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean;
+    originalTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;