@zat-design/sisyphus-react 3.2.0-beta.2 → 3.2.1-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. package/dist/index.esm.css +10 -5
  2. package/es/ProDownload/utils.js +0 -2
  3. package/es/ProForm/components/base/Checkbox/index.d.ts +1 -0
  4. package/es/ProForm/components/base/Checkbox/index.js +5 -3
  5. package/es/ProForm/components/base/DatePicker/index.js +3 -2
  6. package/es/ProForm/components/base/Input/index.js +4 -2
  7. package/es/ProForm/components/base/Input/propsType.d.ts +1 -0
  8. package/es/ProForm/components/base/InputNumber/index.d.ts +1 -0
  9. package/es/ProForm/components/base/InputNumber/index.js +5 -3
  10. package/es/ProForm/components/base/ProCascader/index.js +6 -6
  11. package/es/ProForm/components/base/Radio/index.d.ts +1 -0
  12. package/es/ProForm/components/base/Radio/index.js +4 -2
  13. package/es/ProForm/components/base/RangePicker/index.d.ts +1 -0
  14. package/es/ProForm/components/base/RangePicker/index.js +5 -3
  15. package/es/ProForm/components/base/Select/index.d.ts +1 -0
  16. package/es/ProForm/components/base/Select/index.js +4 -2
  17. package/es/ProForm/components/base/Switch/index.d.ts +1 -0
  18. package/es/ProForm/components/base/Switch/index.js +4 -2
  19. package/es/ProForm/components/base/SwitchCheckbox/index.d.ts +1 -0
  20. package/es/ProForm/components/base/SwitchCheckbox/index.js +4 -2
  21. package/es/ProForm/components/base/TextArea/index.d.ts +1 -0
  22. package/es/ProForm/components/base/TextArea/index.js +4 -3
  23. package/es/ProForm/components/base/TimePicker/index.d.ts +1 -0
  24. package/es/ProForm/components/base/TimePicker/index.js +4 -2
  25. package/es/ProForm/components/combination/Container/index.js +7 -5
  26. package/es/ProForm/components/combination/FormList/index.js +6 -5
  27. package/es/ProForm/components/combination/Group/index.js +6 -3
  28. package/es/ProForm/components/combination/ProAddressBar/index.js +29 -30
  29. package/es/ProForm/components/combination/ProCombination/index.js +10 -11
  30. package/es/ProForm/components/combination/ProModalSelect/index.js +4 -5
  31. package/es/ProForm/components/combination/ProNumberRange/index.d.ts +1 -1
  32. package/es/ProForm/components/combination/ProNumberRange/index.js +7 -7
  33. package/es/ProForm/components/combination/ProRangeLimit/index.d.ts +1 -0
  34. package/es/ProForm/components/combination/ProRangeLimit/index.js +4 -2
  35. package/es/ProForm/components/combination/ProTimeLimit/index.d.ts +1 -0
  36. package/es/ProForm/components/combination/ProTimeLimit/index.js +4 -2
  37. package/es/ProForm/components/render/Render.js +47 -18
  38. package/es/ProForm/components/render/RenderFields.d.ts +1 -0
  39. package/es/ProForm/components/render/RenderFields.js +4 -2
  40. package/es/ProForm/index.js +5 -2
  41. package/es/ProForm/propsType.d.ts +1 -0
  42. package/es/ProForm/style/index.less +44 -43
  43. package/es/ProForm/utils/useChanged.d.ts +1 -1
  44. package/es/ProForm/utils/useChanged.js +9 -8
  45. package/es/ProLayout/components/Layout/Menu/OpenMenu/index.js +7 -13
  46. package/es/ProLayout/components/Layout/Menu/OpenMenu/style/index.less +1 -1
  47. package/es/ProSelect/index.js +6 -3
  48. package/lib/ProEditTable/components/RenderField/index.js +0 -2
  49. package/lib/ProForm/components/base/Checkbox/index.d.ts +1 -0
  50. package/lib/ProForm/components/base/Checkbox/index.js +5 -3
  51. package/lib/ProForm/components/base/DatePicker/index.js +3 -2
  52. package/lib/ProForm/components/base/Input/index.js +4 -2
  53. package/lib/ProForm/components/base/Input/propsType.d.ts +1 -0
  54. package/lib/ProForm/components/base/InputNumber/index.d.ts +1 -0
  55. package/lib/ProForm/components/base/InputNumber/index.js +5 -3
  56. package/lib/ProForm/components/base/ProCascader/index.js +6 -6
  57. package/lib/ProForm/components/base/Radio/index.d.ts +1 -0
  58. package/lib/ProForm/components/base/Radio/index.js +4 -2
  59. package/lib/ProForm/components/base/RangePicker/index.d.ts +1 -0
  60. package/lib/ProForm/components/base/RangePicker/index.js +6 -4
  61. package/lib/ProForm/components/base/Select/index.d.ts +1 -0
  62. package/lib/ProForm/components/base/Select/index.js +4 -2
  63. package/lib/ProForm/components/base/Switch/index.d.ts +1 -0
  64. package/lib/ProForm/components/base/Switch/index.js +4 -2
  65. package/lib/ProForm/components/base/SwitchCheckbox/index.d.ts +1 -0
  66. package/lib/ProForm/components/base/SwitchCheckbox/index.js +4 -2
  67. package/lib/ProForm/components/base/TextArea/index.d.ts +1 -0
  68. package/lib/ProForm/components/base/TextArea/index.js +4 -3
  69. package/lib/ProForm/components/base/TimePicker/index.d.ts +1 -0
  70. package/lib/ProForm/components/base/TimePicker/index.js +4 -2
  71. package/lib/ProForm/components/combination/Container/index.js +7 -5
  72. package/lib/ProForm/components/combination/FormList/index.js +6 -5
  73. package/lib/ProForm/components/combination/Group/index.js +6 -3
  74. package/lib/ProForm/components/combination/ProAddressBar/index.js +29 -30
  75. package/lib/ProForm/components/combination/ProCombination/index.js +10 -11
  76. package/lib/ProForm/components/combination/ProModalSelect/index.js +4 -5
  77. package/lib/ProForm/components/combination/ProNumberRange/index.d.ts +1 -1
  78. package/lib/ProForm/components/combination/ProNumberRange/index.js +7 -7
  79. package/lib/ProForm/components/combination/ProRangeLimit/index.d.ts +1 -0
  80. package/lib/ProForm/components/combination/ProRangeLimit/index.js +4 -2
  81. package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts +1 -0
  82. package/lib/ProForm/components/combination/ProTimeLimit/index.js +4 -2
  83. package/lib/ProForm/components/old/InputRange/index.js +1 -0
  84. package/lib/ProForm/components/old/ProCertValidity/index.js +1 -1
  85. package/lib/ProForm/components/render/Render.js +46 -20
  86. package/lib/ProForm/components/render/RenderFields.d.ts +1 -0
  87. package/lib/ProForm/components/render/RenderFields.js +4 -2
  88. package/lib/ProForm/index.js +5 -2
  89. package/lib/ProForm/propsType.d.ts +1 -0
  90. package/lib/ProForm/style/index.less +44 -43
  91. package/lib/ProForm/utils/useChanged.d.ts +1 -1
  92. package/lib/ProForm/utils/useChanged.js +9 -8
  93. package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js +6 -12
  94. package/lib/ProLayout/components/Layout/Menu/OpenMenu/style/index.less +1 -1
  95. package/lib/ProSelect/index.js +6 -3
  96. package/lib/ProTable/components/TableResizable/index.js +0 -8
  97. package/lib/ProTabs/index.js +0 -1
  98. package/lib/ProThemeTools/index.js +0 -1
  99. package/lib/ProTree/components/Tree.js +0 -7
  100. package/lib/ProTree/index.js +1 -0
  101. package/lib/ProTreeModal/components/Tree.js +0 -1
  102. package/lib/ProUpload/index.js +0 -7
  103. package/lib/old/ProCertValidity/index.js +1 -1
  104. package/package.json +1 -1
@@ -9,11 +9,9 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
9
9
  import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
10
10
  import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
11
11
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
12
- import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
13
12
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
14
13
  import "antd/es/typography/style";
15
14
  import _Typography from "antd/es/typography";
16
- var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
17
15
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
18
16
  import { useEffect, useState, memo, useMemo } from 'react';
19
17
  import { useSetState } from 'ahooks';
@@ -21,6 +19,7 @@ import { tools } from '@zat-design/utils';
21
19
  import { useProConfig } from '../../../../ProConfigProvider';
22
20
  import useEnum from '../../../../ProEnum/hooks/useEnum';
23
21
  import locale from '../../../../locale';
22
+ import ProForm from '../../../../ProForm';
24
23
  var transformDataName = tools.transformDataName;
25
24
  var Text = _Typography.Text;
26
25
  var filterDataSource = function filterDataSource(dataSource, level) {
@@ -48,7 +47,7 @@ var levelMap = {
48
47
  3: 'county'
49
48
  };
50
49
  var ProAddressBar = function ProAddressBar(props) {
51
- var _otherProps$otherProp, _ref11, _ref11$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
50
+ var _ref12, _ref12$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
52
51
  var _ref = useProConfig('ProAddressBar') || {},
53
52
  configUseRequest = _ref.useRequest,
54
53
  configTransformResponse = _ref.transformResponse,
@@ -78,30 +77,30 @@ var ProAddressBar = function ProAddressBar(props) {
78
77
  transformResponse = _props$transformRespo === void 0 ? configTransformResponse : _props$transformRespo,
79
78
  _props$level = props.level,
80
79
  level = _props$level === void 0 ? 3 : _props$level,
81
- _props$isView = props.isView,
82
- isView = _props$isView === void 0 ? false : _props$isView,
80
+ isView = props.isView,
83
81
  _props$enumCode = props.enumCode,
84
82
  enumCode = _props$enumCode === void 0 ? configEnumCode : _props$enumCode,
85
83
  _props$code = props.code,
86
84
  code = _props$code === void 0 ? configCode : _props$code,
87
85
  tooltip = props.tooltip,
88
86
  _props$separator = props.separator,
89
- separator = _props$separator === void 0 ? '' : _props$separator,
90
- otherProps = _objectWithoutProperties(props, _excluded);
87
+ separator = _props$separator === void 0 ? '' : _props$separator;
88
+ var _ref2 = ProForm.useFieldProps() || {},
89
+ isViewCon = _ref2.isView;
91
90
  var addressCode = code || enumCode;
92
- var realIsView = isView || (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$otherProp = otherProps.otherProps) === null || _otherProps$otherProp === void 0 ? void 0 : _otherProps$otherProp.isView);
93
- var _ref2 = value || [],
94
- _ref3 = _slicedToArray(_ref2, 2),
95
- province = _ref3[0],
96
- city = _ref3[1];
91
+ var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
92
+ var _ref3 = value || [],
93
+ _ref4 = _slicedToArray(_ref3, 2),
94
+ province = _ref4[0],
95
+ city = _ref4[1];
97
96
  var realLevel = Math.max(2, level);
98
97
  var county = realLevel === 3 ? value === null || value === void 0 ? void 0 : value[realLevel - 1] : undefined;
99
98
  var address = value === null || value === void 0 ? void 0 : value[realLevel];
100
99
  var enumData = useEnum(addressCode);
101
- var _ref4 = Array.isArray(enumData) ? enumData : [],
102
- _ref5 = _slicedToArray(_ref4, 1),
103
- _ref5$ = _ref5[0],
104
- enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
100
+ var _ref5 = Array.isArray(enumData) ? enumData : [],
101
+ _ref6 = _slicedToArray(_ref5, 1),
102
+ _ref6$ = _ref6[0],
103
+ enumDataSource = _ref6$ === void 0 ? [] : _ref6$;
105
104
  var realDataSource = useMemo(function () {
106
105
  var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
107
106
  return realLevel === 2 ? filterDataSource(innerDataSource, level) : innerDataSource;
@@ -141,12 +140,12 @@ var ProAddressBar = function ProAddressBar(props) {
141
140
  _useSetState2 = _slicedToArray(_useSetState, 2),
142
141
  defaultLabel = _useSetState2[0],
143
142
  setDefaultLabel = _useSetState2[1];
144
- var _ref6 = defaultLabel || {},
145
- provinceLabel = _ref6.province,
146
- cityLabel = _ref6.city,
147
- countyLabel = _ref6.county;
143
+ var _ref7 = defaultLabel || {},
144
+ provinceLabel = _ref7.province,
145
+ cityLabel = _ref7.city,
146
+ countyLabel = _ref7.county;
148
147
  var getProvinces = /*#__PURE__*/function () {
149
- var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(loadData) {
148
+ var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(loadData) {
150
149
  var _yield$service, data, newData, _newData, _provinces, transFormData;
151
150
  return _regeneratorRuntime().wrap(function _callee$(_context) {
152
151
  while (1) switch (_context.prev = _context.next) {
@@ -186,11 +185,11 @@ var ProAddressBar = function ProAddressBar(props) {
186
185
  }, _callee);
187
186
  }));
188
187
  return function getProvinces(_x) {
189
- return _ref7.apply(this, arguments);
188
+ return _ref8.apply(this, arguments);
190
189
  };
191
190
  }();
192
191
  var getAddressData = /*#__PURE__*/function () {
193
- var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
192
+ var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
194
193
  var _yield$service2, data;
195
194
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
196
195
  while (1) switch (_context2.prev = _context2.next) {
@@ -214,12 +213,12 @@ var ProAddressBar = function ProAddressBar(props) {
214
213
  }, _callee2);
215
214
  }));
216
215
  return function getAddressData(_x2) {
217
- return _ref8.apply(this, arguments);
216
+ return _ref9.apply(this, arguments);
218
217
  };
219
218
  }();
220
219
  // 传入useRequest时,得到地址省市区的label,初次加载需要
221
220
  var initAddressLabel = /*#__PURE__*/function () {
222
- var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, value, extra) {
221
+ var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(key, value, extra) {
223
222
  var selectProvince, _newData2, _yield$service3, data, newData;
224
223
  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
225
224
  while (1) switch (_context3.prev = _context3.next) {
@@ -259,7 +258,7 @@ var ProAddressBar = function ProAddressBar(props) {
259
258
  }, _callee3);
260
259
  }));
261
260
  return function initAddressLabel(_x3, _x4, _x5) {
262
- return _ref9.apply(this, arguments);
261
+ return _ref10.apply(this, arguments);
263
262
  };
264
263
  }();
265
264
  useEffect(function () {
@@ -298,7 +297,7 @@ var ProAddressBar = function ProAddressBar(props) {
298
297
  }
299
298
  }, [realIsView, value, serviceData]);
300
299
  var handleLoadData = /*#__PURE__*/function () {
301
- var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(selectedOptions) {
300
+ var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(selectedOptions) {
302
301
  var targetOption, data;
303
302
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
304
303
  while (1) switch (_context4.prev = _context4.next) {
@@ -327,7 +326,7 @@ var ProAddressBar = function ProAddressBar(props) {
327
326
  }, _callee4);
328
327
  }));
329
328
  return function handleLoadData(_x6) {
330
- return _ref10.apply(this, arguments);
329
+ return _ref11.apply(this, arguments);
331
330
  };
332
331
  }();
333
332
  var handleChange = function handleChange(changeValue, selectedOptions) {
@@ -369,9 +368,9 @@ var ProAddressBar = function ProAddressBar(props) {
369
368
  })) === null || _filter === void 0 ? void 0 : _filter.join('/') : undefined;
370
369
  };
371
370
  var addressValue = value && (province || city || county) ? [province, city, county].slice(0, realLevel) : undefined;
372
- 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) {
371
+ 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) {
373
372
  return !!item;
374
- })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
373
+ })) === null || _ref12$filter === void 0 ? void 0 : _ref12$filter.join(separator)) || '-';
375
374
  return realIsView ? tooltip ? _jsx(_Tooltip, {
376
375
  className: className,
377
376
  title: tooltip === true ? viewValue : tooltip,
@@ -49,17 +49,16 @@ export var ProCombination = function ProCombination(props) {
49
49
  }, {
50
50
  renderType: 'Input'
51
51
  }] : _props$childProps,
52
- separator = props.separator,
53
- _props$otherProps = props.otherProps,
54
- otherProps = _props$otherProps === void 0 ? {} : _props$otherProps;
55
- var _otherProps$isView = otherProps.isView,
56
- isView = _otherProps$isView === void 0 ? false : _otherProps$isView,
57
- viewEmpty = otherProps.viewEmpty,
58
- form = otherProps.form;
52
+ separator = props.separator;
53
+ var _ref = ProForm.useFieldProps() || {},
54
+ _ref$isView = _ref.isView,
55
+ isView = _ref$isView === void 0 ? false : _ref$isView,
56
+ viewEmpty = _ref.viewEmpty,
57
+ form = _ref.form;
59
58
  // 取到对应组件
60
- 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']],
61
- BeforeCom = _ref[0],
62
- AfterCom = _ref[1];
59
+ 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']],
60
+ BeforeCom = _ref2[0],
61
+ AfterCom = _ref2[1];
63
62
  var _useControlled = useControlled(props),
64
63
  _useControlled2 = _slicedToArray(_useControlled, 2),
65
64
  values = _useControlled2[0],
@@ -107,7 +106,7 @@ export var ProCombination = function ProCombination(props) {
107
106
  // 查看模式
108
107
  if (isView) {
109
108
  if (!values || !Array.isArray(values)) {
110
- return otherProps.viewEmpty;
109
+ return viewEmpty;
111
110
  }
112
111
  var childData = childProps;
113
112
  if (!childData || Array.isArray(childData) && !childData.length) {
@@ -12,7 +12,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
12
12
  import "antd/es/form/style";
13
13
  import _Form from "antd/es/form";
14
14
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
15
- var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm", "defaultOne"],
15
+ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
16
16
  _excluded2 = ["onOk"],
17
17
  _excluded3 = ["rowKey", "columns", "rowSelection"];
18
18
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -47,7 +47,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
47
47
  className = props.className,
48
48
  beforeOpen = props.beforeOpen,
49
49
  isTooltip = props.isTooltip,
50
- otherProps = props.otherProps,
51
50
  searchForm = props.searchForm,
52
51
  defaultOne = props.defaultOne,
53
52
  restInputProps = _objectWithoutProperties(props, _excluded);
@@ -68,10 +67,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
68
67
  var _ref = modalProps || {},
69
68
  onOk = _ref.onOk,
70
69
  restModalProps = _objectWithoutProperties(_ref, _excluded2);
71
- var _ref2 = otherProps || {},
72
- _ref2$isView = _ref2.isView,
73
- isView = _ref2$isView === void 0 ? false : _ref2$isView,
70
+ var _ref2 = ProForm.useFieldProps() || {},
71
+ isViewCon = _ref2.isView,
74
72
  viewEmpty = _ref2.viewEmpty;
73
+ var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
75
74
  // 是否多选
76
75
  var isMultiple = type === 'checkbox';
77
76
  // 生成一个唯一id,用于满足tooltip功能
@@ -1,3 +1,3 @@
1
1
  import { ProNumberRangeProps } from './propsType';
2
- declare const ProNumberRange: (props: ProNumberRangeProps) => import("react").ReactNode;
2
+ declare const ProNumberRange: (props: ProNumberRangeProps) => any;
3
3
  export default ProNumberRange;
@@ -12,6 +12,7 @@ import classnames from 'classnames';
12
12
  import { tools } from '@zat-design/utils';
13
13
  import Container from '../../Container';
14
14
  import locale from '../../../../locale';
15
+ import ProForm from '../../../../ProForm';
15
16
  var formatAmount = tools.formatAmount,
16
17
  formatPercent = tools.formatPercent,
17
18
  formatPerMill = tools.formatPerMill;
@@ -29,17 +30,16 @@ var ProNumberRange = function ProNumberRange(props) {
29
30
  decimal = _props$decimal === void 0 ? 2 : _props$decimal,
30
31
  precision = props.precision,
31
32
  childProps = props.childProps,
32
- otherProps = props.otherProps,
33
33
  addonBefore = props.addonBefore,
34
34
  addonAfter = props.addonAfter,
35
35
  _props$separator = props.separator,
36
36
  separator = _props$separator === void 0 ? '~' : _props$separator,
37
37
  inValueType = props.valueType;
38
- var _ref = otherProps || {},
39
- _ref$isView = _ref.isView,
40
- isView = _ref$isView === void 0 ? false : _ref$isView,
41
- valueType = _ref.valueType,
42
- viewEmpty = _ref.viewEmpty;
38
+ var _ref = ProForm.useFieldProps() || {},
39
+ isViewCon = _ref.isView,
40
+ viewEmpty = _ref.viewEmpty,
41
+ valueType = _ref.valueType;
42
+ var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
43
43
  var _useSetState = useSetState({
44
44
  range: value || []
45
45
  }),
@@ -90,7 +90,7 @@ var ProNumberRange = function ProNumberRange(props) {
90
90
  // 查看模式
91
91
  if (isView || props.isView) {
92
92
  if (isEmpty(value)) {
93
- return otherProps.viewEmpty;
93
+ return viewEmpty;
94
94
  }
95
95
  switch (valueType) {
96
96
  // 百分比
@@ -10,6 +10,7 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
10
10
  value?: ValueStr;
11
11
  format?: string;
12
12
  separator?: any;
13
+ isView?: boolean;
13
14
  };
14
15
  type Value = [Moment?, Moment?, boolean?];
15
16
  type ValueStr = [string?, string?, string?];
@@ -16,6 +16,7 @@ import moment from 'moment';
16
16
  import { useProConfig } from '../../../../ProConfigProvider';
17
17
  import Container from '../../Container';
18
18
  import locale from '../../../../locale';
19
+ import ProForm from '../../../../ProForm';
19
20
  var defaultPickerValue = [moment(), moment()];
20
21
  var useControlled = function useControlled(props) {
21
22
  var _useState = useState(),
@@ -52,9 +53,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
52
53
  _props$separator = props.separator,
53
54
  separator = _props$separator === void 0 ? '~' : _props$separator,
54
55
  rest = _objectWithoutProperties(props, _excluded);
55
- var _ref = otherProps || {},
56
- isView = _ref.isView,
56
+ var _ref = ProForm.useFieldProps() || {},
57
+ isViewCon = _ref.isView,
57
58
  viewEmpty = _ref.viewEmpty;
59
+ var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
58
60
  var _useControlled = useControlled(_objectSpread(_objectSpread({}, props), {}, {
59
61
  format: format
60
62
  })),
@@ -15,6 +15,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
15
15
  valueType?: 'moment' | 'format' | 'ISO';
16
16
  otherProps?: ProFormOtherProps;
17
17
  mode?: 'DatePicker';
18
+ isView?: boolean;
18
19
  };
19
20
  export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
20
21
  export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {
@@ -19,6 +19,7 @@ import Container from '../../Container';
19
19
  import useControlled from './hooks/useControlled';
20
20
  import ProRangeLimit from '../ProRangeLimit';
21
21
  import locale from '../../../../locale';
22
+ import ProForm from '../../../../ProForm';
22
23
  // 永久有效默认值
23
24
  export var ProTimeLimit = function ProTimeLimit(props) {
24
25
  var _props$format = props.format,
@@ -31,9 +32,10 @@ export var ProTimeLimit = function ProTimeLimit(props) {
31
32
  valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
32
33
  otherProps = props.otherProps,
33
34
  rest = _objectWithoutProperties(props, _excluded);
34
- var _ref = otherProps || {},
35
- isView = _ref.isView,
35
+ var _ref = ProForm.useFieldProps() || {},
36
+ isViewCon = _ref.isView,
36
37
  viewEmpty = _ref.viewEmpty;
38
+ var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
37
39
  var _useMemo = useMemo(function () {
38
40
  var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
39
41
  var foreverString = foreverTime || foreverMoment.format(format);
@@ -1,5 +1,7 @@
1
1
  import "antd/es/col/style";
2
2
  import _Col from "antd/es/col";
3
+ import "antd/es/tooltip/style";
4
+ import _Tooltip from "antd/es/tooltip";
3
5
  import "antd/es/space/style";
4
6
  import _Space from "antd/es/space";
5
7
  import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -11,6 +13,7 @@ import "antd/es/form/style";
11
13
  import _Form from "antd/es/form";
12
14
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
13
15
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
16
+ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
14
17
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
15
18
  var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
16
19
  import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -46,7 +49,8 @@ var Render = function Render(props) {
46
49
  isSelect = props.isSelect,
47
50
  originalValues = props.originalValues,
48
51
  equalWith = props.equalWith,
49
- requiredOnView = props.requiredOnView;
52
+ requiredOnView = props.requiredOnView,
53
+ originalTip = props.originalTip;
50
54
  var colProps = props.colProps;
51
55
  // 剔除一些不是FormItem的属性, 防止控制台报warning
52
56
  var labelWidth = formItemProps.labelWidth,
@@ -96,7 +100,10 @@ var Render = function Render(props) {
96
100
  }).join('-');
97
101
  }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
98
102
  // 判断当前字段是否变更
99
- var changed = useChanged(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith);
103
+ var _useChanged = useChanged(formItemProps.name, otherProps.names, namesStr, originalValues, form, equalWith, originalTip),
104
+ _useChanged2 = _slicedToArray(_useChanged, 2),
105
+ changed = _useChanged2[0],
106
+ originalValue = _useChanged2[1];
100
107
  var internalRule = useRules({
101
108
  names: otherProps.names,
102
109
  label: otherFormItemProps.label,
@@ -351,7 +358,9 @@ var Render = function Render(props) {
351
358
  };
352
359
  }
353
360
  // 需要过滤掉的form_item的key
354
- var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
361
+ var filterFormItemKey = ['onFieldChange',
362
+ // 'shouldUpdate',
363
+ 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
355
364
  if (type === 'FormList') {
356
365
  lastComponentProps.disabled = lastDisabled;
357
366
  var lessMode = lastComponentProps.mode === 'less';
@@ -376,26 +385,46 @@ var Render = function Render(props) {
376
385
  });
377
386
  }
378
387
  // 当存在shouldUpdate时补货所有form变更(防止表单onchange设置form值时无法更新的问题)
379
- if (_otherFormItemProps.shouldUpdate) {
380
- return _jsx(_Form.Item, {
381
- shouldUpdate: _otherFormItemProps.shouldUpdate,
382
- noStyle: true,
383
- children: function children() {
384
- return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
385
- // @ts-ignore
386
- _internalItemRender: internalItemRender,
387
- className: _className,
388
- children: child
389
- }));
390
- }
391
- });
392
- }
393
- return _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
388
+ // if (_otherFormItemProps.shouldUpdate) {
389
+ // return (
390
+ // <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
391
+ // {() => {
392
+ // return (
393
+ // <Form.Item
394
+ // {...omit(_otherFormItemProps, filterFormItemKey)}
395
+ // // @ts-ignore
396
+ // _internalItemRender={internalItemRender}
397
+ // className={_className}
398
+ // >
399
+ // {child}
400
+ // </Form.Item>
401
+ // );
402
+ // }}
403
+ // </Form.Item>
404
+ // );
405
+ // }
406
+ var formItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
394
407
  // @ts-ignore
395
408
  _internalItemRender: internalItemRender,
396
409
  className: _className,
397
410
  children: child
398
411
  }));
412
+ // 不渲染tooltip
413
+ if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
414
+ return formItem;
415
+ }
416
+ var title = _jsxs(_Space, {
417
+ children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.cloneElement(child, _objectSpread(_objectSpread({}, child), {}, {
418
+ isView: true,
419
+ value: originalValue,
420
+ checked: type === 'Switch' ? originalValue : undefined
421
+ }))]
422
+ });
423
+ return _jsx(_Tooltip, {
424
+ title: title,
425
+ visible: changed ? undefined : false,
426
+ children: formItem
427
+ });
399
428
  };
400
429
  var FormItem = _jsxs(_Fragment, {
401
430
  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) {
@@ -17,6 +17,7 @@ interface Props<T = any> {
17
17
  clearNotShow?: boolean;
18
18
  requiredOnView?: boolean;
19
19
  required?: boolean | (() => boolean);
20
+ originalTip?: boolean;
20
21
  }
21
22
  declare const RenderFields: React.FC<Props>;
22
23
  export default RenderFields;
@@ -24,7 +24,8 @@ var RenderFields = function RenderFields(props) {
24
24
  originalValues = props.originalValues,
25
25
  outerClearNotShow = props.clearNotShow,
26
26
  requiredOnView = props.requiredOnView,
27
- required = props.required;
27
+ required = props.required,
28
+ originalTip = props.originalTip;
28
29
  // 是否包含隐藏字段
29
30
  var hiddenData = columns.filter(function (item) {
30
31
  return Array.isArray(item.hiddenNames);
@@ -194,7 +195,8 @@ var RenderFields = function RenderFields(props) {
194
195
  isSelect: _isSelect,
195
196
  originalValues: originalValues,
196
197
  equalWith: equalWith,
197
- requiredOnView: requiredOnView
198
+ requiredOnView: requiredOnView,
199
+ originalTip: originalTip
198
200
  })
199
201
  }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
200
202
  });
@@ -12,7 +12,7 @@ import "antd/es/space/style";
12
12
  import _Space from "antd/es/space";
13
13
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
14
14
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
15
- 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"];
15
+ 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"];
16
16
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
17
17
  import { DoubleLeftOutlined } from '@ant-design/icons';
18
18
  import classnames from 'classnames';
@@ -63,6 +63,8 @@ var ProForm = function ProForm(props, ref) {
63
63
  requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
64
64
  formId = props.formId,
65
65
  required = props.required,
66
+ _props$originalTip = props.originalTip,
67
+ originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
66
68
  otherProps = _objectWithoutProperties(props, _excluded);
67
69
  var _useForm = useForm(originForm),
68
70
  _useForm2 = _slicedToArray(_useForm, 1),
@@ -221,7 +223,8 @@ var ProForm = function ProForm(props, ref) {
221
223
  originalValues: originalValues,
222
224
  clearNotShow: clearNotShow,
223
225
  requiredOnView: requiredOnView,
224
- required: required
226
+ required: required,
227
+ originalTip: originalTip
225
228
  }), children, footerRender()]
226
229
  }))
227
230
  }));
@@ -66,6 +66,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
66
66
  requiredOnView?: boolean;
67
67
  formId?: string;
68
68
  required?: boolean;
69
+ originalTip?: boolean;
69
70
  }
70
71
  export interface Transform<T = any> {
71
72
  normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;