@zat-design/sisyphus-react 4.0.6 → 4.0.8

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 (51) hide show
  1. package/dist/index.esm.css +1 -1
  2. package/dist/less.esm.css +1 -1
  3. package/es/ProDrawerForm/components/ProDrawer/index.js +2 -2
  4. package/es/ProEditTable/index.js +1 -1
  5. package/es/ProEnum/index.js +1 -1
  6. package/es/ProForm/components/base/Input/index.js +75 -17
  7. package/es/ProForm/components/combination/FormList/components/BlockFields.js +2 -2
  8. package/es/ProForm/components/combination/Group/utils/index.d.ts +25 -25
  9. package/es/ProForm/components/render/ChangedWrapper.js +1 -3
  10. package/es/ProForm/style/index.less +18 -0
  11. package/es/ProIcon/index.js +115 -25
  12. package/es/ProIcon/propsTypes.d.ts +17 -11
  13. package/es/ProLayout/components/ProCollapse/index.js +1 -1
  14. package/es/ProLayout/components/ProHeader/index.js +2 -6
  15. package/es/ProSelect/index.js +1 -1
  16. package/es/ProTable/components/RenderColumn/index.js +1 -1
  17. package/es/ProTable/components/RenderTabs/index.js +9 -3
  18. package/es/ProThemeTools/component/ProTools/index.js +1 -1
  19. package/es/ProTreeModal/components/Trigger.js +34 -13
  20. package/es/ProTreeModal/index.js +6 -0
  21. package/es/ProTreeModal/style/index.less +41 -0
  22. package/es/ProUpload/components/ImageRender.js +1 -1
  23. package/es/ProViewer/index.js +2 -3
  24. package/es/style/theme/antd.less +0 -9
  25. package/es/style/theme/base.less +1 -1
  26. package/es/style/variables.less +1 -0
  27. package/lib/ProDrawerForm/components/ProDrawer/index.js +1 -1
  28. package/lib/ProEditTable/index.js +1 -1
  29. package/lib/ProEnum/index.js +1 -1
  30. package/lib/ProForm/components/base/Input/index.js +73 -16
  31. package/lib/ProForm/components/combination/FormList/components/BlockFields.js +2 -2
  32. package/lib/ProForm/components/combination/Group/utils/index.d.ts +25 -25
  33. package/lib/ProForm/components/render/ChangedWrapper.js +1 -3
  34. package/lib/ProForm/style/index.less +18 -0
  35. package/lib/ProIcon/index.js +117 -25
  36. package/lib/ProIcon/propsTypes.d.ts +17 -11
  37. package/lib/ProLayout/components/ProCollapse/index.js +1 -1
  38. package/lib/ProLayout/components/ProHeader/index.js +3 -6
  39. package/lib/ProSelect/index.js +1 -1
  40. package/lib/ProTable/components/RenderColumn/index.js +1 -1
  41. package/lib/ProTable/components/RenderTabs/index.js +9 -3
  42. package/lib/ProThemeTools/component/ProTools/index.js +1 -1
  43. package/lib/ProTreeModal/components/Trigger.js +34 -13
  44. package/lib/ProTreeModal/index.js +6 -0
  45. package/lib/ProTreeModal/style/index.less +41 -0
  46. package/lib/ProUpload/components/ImageRender.js +1 -1
  47. package/lib/ProViewer/index.js +3 -3
  48. package/lib/style/theme/antd.less +0 -9
  49. package/lib/style/theme/base.less +1 -1
  50. package/lib/style/variables.less +1 -0
  51. package/package.json +14 -14
@@ -29,7 +29,9 @@ var RenderTabs = props => {
29
29
  _useState2 = _slicedToArray(_useState, 2),
30
30
  activeKey = _useState2[0],
31
31
  setActiveKey = _useState2[1];
32
- var _useEnum = useEnum(code),
32
+
33
+ // 当 code 不存在时,传入一个不存在的 code 值,这样 useEnum 会返回 [空数组, getEnumLabel] 而不是整个缓存数据
34
+ var _useEnum = useEnum(code || '__PRO_TABLE_NO_CODE__'),
33
35
  _useEnum2 = _slicedToArray(_useEnum, 1),
34
36
  options = _useEnum2[0];
35
37
  var fieldValue = Form.useWatch(name, form);
@@ -56,8 +58,12 @@ var RenderTabs = props => {
56
58
  }, [dataSource, options, transformResponse]);
57
59
  useEffect(() => {
58
60
  var _tabItems$;
59
- setActiveKey(fieldValue || (tabItems === null || tabItems === void 0 || (_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.key));
60
- }, [fieldValue]);
61
+ if (fieldValue !== undefined && fieldValue !== null && fieldValue !== activeKey) {
62
+ setActiveKey(fieldValue);
63
+ } else if (!fieldValue && !activeKey && tabItems !== null && tabItems !== void 0 && (_tabItems$ = tabItems[0]) !== null && _tabItems$ !== void 0 && _tabItems$.key) {
64
+ setActiveKey(tabItems[0].key);
65
+ }
66
+ }, [fieldValue, tabItems, activeKey]);
61
67
  if (!(tabItems !== null && tabItems !== void 0 && tabItems.length)) {
62
68
  return null;
63
69
  }
@@ -84,7 +84,7 @@ var ProTools = _ref => {
84
84
  }, []);
85
85
  return /*#__PURE__*/_jsxs(NewDrawer, {
86
86
  className: "pro-theme-prd-tools-drawer",
87
- width: 400,
87
+ size: 400,
88
88
  title: `${locale.ProThemeTools.title}`,
89
89
  placement: "right",
90
90
  onClose: onClose,
@@ -127,16 +127,40 @@ function Trigger(props) {
127
127
  }
128
128
  return props.children;
129
129
  };
130
+
131
+ // 构建 Input 的基础属性
132
+ var inputProps = {
133
+ className: classNames(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
134
+ onClick: handleClick,
135
+ value: checkedValues.length === 0 ? null : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {
136
+ all: label
137
+ }) : formatMessage(locale === null || locale === void 0 || (_locale$ProTreeModal2 = locale.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
138
+ num: checkedValues.length
139
+ }),
140
+ placeholder: locale === null || locale === void 0 || (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
141
+ disabled: afterDisabled || state.mode === 'all'
142
+ };
143
+
144
+ // 如果 mode === 'all',不显示 addonAfter,直接返回 Input
145
+ if (state.mode === 'all') {
146
+ return /*#__PURE__*/_jsx(TriggerComponent, {
147
+ children: /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({}, inputProps), {}, {
148
+ style: _objectSpread({}, triggerStyle)
149
+ }))
150
+ });
151
+ }
152
+
153
+ // 使用 Space.Compact 包装 Input 和 addonAfter
154
+ // 注意:Space.Compact 中的元素应该是表单控件,但为了保持原有样式,使用 div 并添加适当的样式
130
155
  return /*#__PURE__*/_jsx(TriggerComponent, {
131
- children: /*#__PURE__*/_jsx(Input, {
132
- className: classNames(afterDisabled ? 'trigger-no-hover' : '', appoint ? 'pro-tree-modal-input-appoint' : ''),
133
- onClick: handleClick,
134
- value: checkedValues.length === 0 ? null : state.mode === 'all' ? formatMessage(locale === null || locale === void 0 ? void 0 : locale.ProTreeModal.checkAll1, {
135
- all: label
136
- }) : formatMessage(locale === null || locale === void 0 || (_locale$ProTreeModal2 = locale.ProTreeModal) === null || _locale$ProTreeModal2 === void 0 ? void 0 : _locale$ProTreeModal2.checkNumber, {
137
- num: checkedValues.length
138
- }),
139
- addonAfter: state.mode === 'all' ? null : /*#__PURE__*/_jsxs("div", {
156
+ children: /*#__PURE__*/_jsxs(Space.Compact, {
157
+ block: true,
158
+ style: appoint ? undefined : triggerStyle,
159
+ children: [/*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({}, inputProps), {}, {
160
+ style: _objectSpread(_objectSpread({}, triggerStyle), {}, {
161
+ flex: 1
162
+ })
163
+ })), /*#__PURE__*/_jsxs("div", {
140
164
  className: "pro-enum-input-addonAfter",
141
165
  children: [checkedValues.length > 0 && !afterDisabled && /*#__PURE__*/_jsx("span", {
142
166
  className: "close-icon",
@@ -148,10 +172,7 @@ function Trigger(props) {
148
172
  src: viewSvg,
149
173
  onClick: onIconClick
150
174
  })]
151
- }),
152
- placeholder: locale === null || locale === void 0 || (_locale$ProTreeModal3 = locale.ProTreeModal) === null || _locale$ProTreeModal3 === void 0 ? void 0 : _locale$ProTreeModal3.select,
153
- disabled: afterDisabled || state.mode === 'all',
154
- style: _objectSpread({}, triggerStyle)
175
+ })]
155
176
  })
156
177
  });
157
178
  }
@@ -322,6 +322,12 @@ var ProTreeModal = props => {
322
322
  treeViewData: [],
323
323
  checkAll: false
324
324
  });
325
+ // 通知父组件更新 value prop,确保清空操作被正确保存
326
+ if (labelInValue) {
327
+ onChange === null || onChange === void 0 || onChange([]);
328
+ } else {
329
+ onChange === null || onChange === void 0 || onChange(_checkedValues);
330
+ }
325
331
  };
326
332
 
327
333
  /**
@@ -11,6 +11,47 @@
11
11
  }
12
12
 
13
13
  .pro-tree-modal {
14
+ .pro-enum-input-addonAfter {
15
+ display: flex;
16
+ align-items: center;
17
+ padding: 0px 8px;
18
+ background-color: var(--zaui-base-bg, #ffffff);
19
+ border: 1px solid #d9d9d9;
20
+ border-left: none;
21
+ border-top-right-radius: 6px;
22
+ border-bottom-right-radius: 6px;
23
+ cursor: pointer;
24
+ transition: none;
25
+ position: relative;
26
+ .close-icon{
27
+ position: absolute;
28
+ left: -20px;
29
+ background: #bfbfbf;
30
+ border-radius: 50%;
31
+ width: 12px;
32
+ height: 12px;
33
+ display: flex;
34
+ align-items: center;
35
+ justify-content: center;
36
+ color: #fff;
37
+ font-size: 8px;
38
+ cursor: pointer;
39
+ z-index: 5;
40
+ &:hover {
41
+ background: #666;
42
+ }
43
+ }
44
+ }
45
+
46
+ &:hover{
47
+ .@{ant-prefix}-input{
48
+ border-color: var(--zaui-brand-hover, #3387ff);
49
+ }
50
+ .pro-enum-input-addonAfter {
51
+ border-color: var(--zaui-brand-hover, #3387ff);
52
+ color: var(--zaui-brand-hover, #3387ff);
53
+ }
54
+ }
14
55
  &-placeholder {
15
56
  color: #939499;
16
57
  }
@@ -216,7 +216,7 @@ var ImageRender = props => {
216
216
  }
217
217
  });
218
218
  return /*#__PURE__*/_jsxs(Space, {
219
- direction: "vertical",
219
+ orientation: "vertical",
220
220
  size: 8,
221
221
  className: "pro-upload-image",
222
222
  children: [headerRender(), /*#__PURE__*/_jsxs("div", {
@@ -12,7 +12,6 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
12
12
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
13
13
  function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
14
14
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
15
- /* eslint-disable jsx-a11y/iframe-has-title */
16
15
  import { useSetState } from 'ahooks';
17
16
  import { Button, Image, Modal } from 'antd';
18
17
  import React, { useEffect, useRef } from 'react';
@@ -195,8 +194,8 @@ var ProViewer = /*#__PURE__*/React.forwardRef((_ref, ref) => {
195
194
  })), mode && fileType === 'img' && /*#__PURE__*/_jsx(Image, {
196
195
  src: url,
197
196
  preview: {
198
- visible: imgVisible,
199
- onVisibleChange: value => {
197
+ open: imgVisible,
198
+ onOpenChange: value => {
200
199
  setState({
201
200
  imgVisible: value
202
201
  });
@@ -1,17 +1,8 @@
1
1
  @import '../variables.less';
2
2
  @import './base';
3
3
 
4
- @zat-disabled-color: #bcbcbc;
5
-
6
4
  /* antd 默认样式重置 */
7
5
 
8
- .@{ant-prefix}-tooltip {
9
- .@{ant-prefix}-tooltip-container{
10
- // background: #fff;
11
- // color: #343434;
12
- }
13
- }
14
-
15
6
  // 表单
16
7
  .@{ant-prefix}-form,
17
8
  .@{ant-prefix}-drawer,
@@ -1,4 +1,4 @@
1
- @ant-prefix: ant;
1
+ @import '../variables.less';
2
2
  @import '../core/index.less';
3
3
  @import './tokens.less';
4
4
 
@@ -1 +1,2 @@
1
1
  @ant-prefix: ant;
2
+ @zat-disabled-color: #bcbcbc;
@@ -258,7 +258,7 @@ var ProDrawer = _ref => {
258
258
  closable: false,
259
259
  onClose: onCancel,
260
260
  zIndex: zIndex
261
- }, restDrawerProps), {}, {
261
+ }, (0, _lodash.omit)(restDrawerProps, 'width')), {}, {
262
262
  children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
263
263
  className: "pro-drawer-close",
264
264
  onClick: onConfirm,
@@ -470,7 +470,7 @@ var ProEditTable = (_ref, ref) => {
470
470
  className: "pro-edit-table-footer",
471
471
  children: footerRender
472
472
  }) : null, pagination ? /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
473
- id: `pro-edit-table-pagination-${config.name.join('-')}`,
473
+ id: `pro-edit-table-pagination-${Array.isArray(config.name) ? config.name.filter(Boolean).join('-') : config.name || 'default'}`,
474
474
  onClick: () => {
475
475
  (0, _tools.onPageCheck)({
476
476
  form,
@@ -272,7 +272,7 @@ var ProEnum = props => {
272
272
  arr.push(props.optionRender(item));
273
273
  });
274
274
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
275
- direction: "vertical",
275
+ orientation: "vertical",
276
276
  size: 4,
277
277
  children: arr.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {
278
278
  children: item
@@ -13,7 +13,8 @@ var _locale = _interopRequireDefault(require("../../../../locale"));
13
13
  var _index = _interopRequireDefault(require("../../../index"));
14
14
  var _valueType = require("../../../utils/valueType");
15
15
  var _jsxRuntime = require("react/jsx-runtime");
16
- var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"]; // 参数优先级
16
+ var _excluded = ["label", "form", "placeholder", "fieldName", "otherProps", "desensitization"],
17
+ _excluded2 = ["addonBefore", "addonAfter"]; // 参数优先级
17
18
  // 组件内默认值 < config默认值 < props
18
19
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
19
20
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -36,43 +37,99 @@ var Input = function Input(props) {
36
37
  viewEmpty = _ref.viewEmpty;
37
38
  var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
38
39
  var initialConfig = (0, _ProConfigProvider.useProConfig)('Input');
39
- if (typeof rest.value === 'number') {
40
- var _rest$value, _rest$value$toString;
41
- rest.value = rest === null || rest === void 0 || (_rest$value = rest.value) === null || _rest$value === void 0 || (_rest$value$toString = _rest$value.toString) === null || _rest$value$toString === void 0 ? void 0 : _rest$value$toString.call(_rest$value);
40
+
41
+ // 提取 addonBefore 和 addonAfter(antd 6 已废弃,需要使用 Space.Compact)
42
+ var addonBefore = rest.addonBefore,
43
+ addonAfter = rest.addonAfter,
44
+ restProps = _objectWithoutProperties(rest, _excluded2);
45
+ if (typeof restProps.value === 'number') {
46
+ var _restProps$value, _restProps$value$toSt;
47
+ restProps.value = restProps === null || restProps === void 0 || (_restProps$value = restProps.value) === null || _restProps$value === void 0 || (_restProps$value$toSt = _restProps$value.toString) === null || _restProps$value$toSt === void 0 ? void 0 : _restProps$value$toSt.call(_restProps$value);
42
48
  }
43
49
  if (isView) {
44
50
  if ((Array.isArray(desensitization) || (0, _lodash.isFunction)(desensitization)) && props !== null && props !== void 0 && props.disabled) {
45
- if (typeof rest.value === 'number') {
46
- var _rest$value2, _rest$value2$toString;
47
- rest.value = rest === null || rest === void 0 || (_rest$value2 = rest.value) === null || _rest$value2 === void 0 || (_rest$value2$toString = _rest$value2.toString) === null || _rest$value2$toString === void 0 ? void 0 : _rest$value2$toString.call(_rest$value2);
51
+ if (typeof restProps.value === 'number') {
52
+ var _restProps$value2, _restProps$value2$toS;
53
+ restProps.value = restProps === null || restProps === void 0 || (_restProps$value2 = restProps.value) === null || _restProps$value2 === void 0 || (_restProps$value2$toS = _restProps$value2.toString) === null || _restProps$value2$toS === void 0 ? void 0 : _restProps$value2$toS.call(_restProps$value2);
48
54
  }
49
55
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
50
56
  viewEmpty: viewEmpty,
51
- children: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
57
+ children: (0, _valueType.maskStringRangeWithRegex)(restProps.value, desensitization)
52
58
  });
53
59
  }
54
60
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
55
61
  viewEmpty: viewEmpty,
56
- children: rest.value
62
+ children: restProps.value
57
63
  });
58
64
  }
59
- var ComInput = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, _objectSpread(_objectSpread({
65
+
66
+ // 构建 Input 组件
67
+ var buildInput = inputProps => /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, _objectSpread(_objectSpread({
60
68
  autoComplete: "off",
61
69
  placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}`
62
- }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest));
70
+ }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), inputProps));
71
+
72
+ // 如果存在 addonBefore 或 addonAfter,使用 Space.Compact 包装
73
+ if (addonBefore || addonAfter) {
74
+ // 确保 Input 在 Space.Compact 中能自动扩展宽度
75
+ var inputPropsWithFlex = _objectSpread(_objectSpread({}, restProps), {}, {
76
+ style: _objectSpread(_objectSpread({}, restProps.style), {}, {
77
+ flex: 1
78
+ })
79
+ });
80
+ var _ComInput = buildInput(inputPropsWithFlex);
81
+
82
+ // 仅查看模式下进行数据脱敏
83
+ if ((Array.isArray(desensitization) || (0, _lodash.isFunction)(desensitization)) && props !== null && props !== void 0 && props.disabled) {
84
+ if (typeof restProps.value === 'number') {
85
+ var _restProps$value3, _restProps$value3$toS;
86
+ restProps.value = restProps === null || restProps === void 0 || (_restProps$value3 = restProps.value) === null || _restProps$value3 === void 0 || (_restProps$value3$toS = _restProps$value3.toString) === null || _restProps$value3$toS === void 0 ? void 0 : _restProps$value3$toS.call(_restProps$value3);
87
+ }
88
+ var maskedInput = /*#__PURE__*/_react.default.cloneElement(_ComInput, _objectSpread(_objectSpread(_objectSpread({
89
+ allowClear: true,
90
+ autoComplete: 'off',
91
+ placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}`
92
+ }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), inputPropsWithFlex), {}, {
93
+ value: (0, _valueType.maskStringRangeWithRegex)(restProps.value, desensitization)
94
+ }));
95
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
96
+ block: true,
97
+ className: "pro-form-input-space-compact",
98
+ children: [addonBefore ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
99
+ disabled: true,
100
+ children: addonBefore
101
+ }) : null, maskedInput, addonAfter ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
102
+ disabled: true,
103
+ children: addonAfter
104
+ }) : null]
105
+ });
106
+ }
107
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space.Compact, {
108
+ block: true,
109
+ className: "pro-form-input-space-compact",
110
+ children: [addonBefore ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
111
+ disabled: true,
112
+ children: addonBefore
113
+ }) : null, _ComInput, addonAfter ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, {
114
+ disabled: true,
115
+ children: addonAfter
116
+ }) : null]
117
+ });
118
+ }
119
+ var ComInput = buildInput(restProps);
63
120
 
64
121
  // 仅查看模式下进行数据脱敏
65
122
  if ((Array.isArray(desensitization) || (0, _lodash.isFunction)(desensitization)) && props !== null && props !== void 0 && props.disabled) {
66
- if (typeof rest.value === 'number') {
67
- var _rest$value3, _rest$value3$toString;
68
- rest.value = rest === null || rest === void 0 || (_rest$value3 = rest.value) === null || _rest$value3 === void 0 || (_rest$value3$toString = _rest$value3.toString) === null || _rest$value3$toString === void 0 ? void 0 : _rest$value3$toString.call(_rest$value3);
123
+ if (typeof restProps.value === 'number') {
124
+ var _restProps$value4, _restProps$value4$toS;
125
+ restProps.value = restProps === null || restProps === void 0 || (_restProps$value4 = restProps.value) === null || _restProps$value4 === void 0 || (_restProps$value4$toS = _restProps$value4.toString) === null || _restProps$value4$toS === void 0 ? void 0 : _restProps$value4$toS.call(_restProps$value4);
69
126
  }
70
127
  return /*#__PURE__*/_react.default.cloneElement(ComInput, _objectSpread(_objectSpread(_objectSpread({
71
128
  allowClear: true,
72
129
  autoComplete: 'off',
73
130
  placeholder: placeholder || `${_locale.default.ProForm.inputPlaceholder}`
74
- }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), rest), {}, {
75
- value: (0, _valueType.maskStringRangeWithRegex)(rest.value, desensitization)
131
+ }, (0, _lodash.omit)(initialConfig, ['trim', 'upperCase'])), restProps), {}, {
132
+ value: (0, _valueType.maskStringRangeWithRegex)(restProps.value, desensitization)
76
133
  }));
77
134
  }
78
135
  return ComInput;
@@ -55,7 +55,7 @@ var BlockFields = props => {
55
55
  // 左侧标题布局
56
56
  if (titlePosition === 'left') {
57
57
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
58
- direction: "vertical",
58
+ orientation: "vertical",
59
59
  className: cls,
60
60
  id: id,
61
61
  children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
@@ -106,7 +106,7 @@ var BlockFields = props => {
106
106
 
107
107
  // 默认顶部标题布局
108
108
  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
109
- direction: "vertical",
109
+ orientation: "vertical",
110
110
  className: cls,
111
111
  id: id,
112
112
  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_ProCollapse.default, {
@@ -75,58 +75,58 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
75
75
  confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
76
76
  show?: boolean | ReactiveFunction<any, boolean>;
77
77
  component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
78
+ id?: string;
78
79
  className?: string;
79
- trim?: boolean;
80
- normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
81
- children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
82
- isView?: boolean;
80
+ hidden?: boolean;
83
81
  style?: React.CSSProperties;
82
+ children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
83
+ onReset?: () => void;
84
84
  prefixCls?: string;
85
+ status?: "" | "warning" | "error" | "success" | "validating";
85
86
  rootClassName?: string;
86
- id?: string;
87
- vertical?: boolean;
88
- status?: "" | "error" | "success" | "warning" | "validating";
89
- hidden?: boolean;
90
- onReset?: () => void;
91
- htmlFor?: string;
92
- valueType?: import("../../../render/propsType").ProFormValueType;
93
- trigger?: string;
94
- viewRender?: (value: any, record: any, { form, index, namePath, }: {
95
- [key: string]: any;
96
- form: FormInstance<any>;
97
- index?: number;
98
- }) => string | React.ReactElement<any, any>;
99
- desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
100
- layout?: import("antd/es/form/Form").FormItemLayout;
101
- help?: React.ReactNode;
102
- preserve?: boolean;
103
- viewType?: import("../../../render/propsType").ViewType;
104
- validateTrigger?: string | false | string[];
87
+ isView?: boolean;
105
88
  colon?: boolean;
89
+ htmlFor?: string;
106
90
  labelAlign?: import("antd/es/form/interface").FormLabelAlign;
107
91
  labelCol?: import("antd").ColProps;
92
+ vertical?: boolean;
108
93
  getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
94
+ normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
109
95
  shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
96
+ trigger?: string;
97
+ validateTrigger?: string | false | string[];
110
98
  validateDebounce?: number;
111
99
  valuePropName?: string;
112
100
  getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
113
101
  messageVariables?: Record<string, string>;
114
102
  initialValue?: any;
115
103
  onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
104
+ preserve?: boolean;
116
105
  isListField?: boolean;
117
106
  isList?: boolean;
118
107
  noStyle?: boolean;
119
108
  hasFeedback?: boolean | {
120
109
  icons: import("antd/es/form/FormItem").FeedbackIcons;
121
110
  };
122
- validateStatus?: "" | "error" | "success" | "warning" | "validating";
111
+ validateStatus?: "" | "warning" | "error" | "success" | "validating";
112
+ layout?: import("antd/es/form/Form").FormItemLayout;
123
113
  wrapperCol?: import("antd").ColProps;
114
+ help?: React.ReactNode;
124
115
  fieldId?: string;
116
+ valueType?: import("../../../render/propsType").ProFormValueType;
125
117
  switchValue?: [any, any];
118
+ viewRender?: (value: any, record: any, { form, index, namePath, }: {
119
+ [key: string]: any;
120
+ form: FormInstance<any>;
121
+ index?: number;
122
+ }) => string | React.ReactElement<any, any>;
123
+ viewType?: import("../../../render/propsType").ViewType;
124
+ trim?: boolean;
126
125
  upperCase?: boolean;
127
126
  toISOString?: boolean;
128
127
  toCSTString?: boolean;
129
128
  clearNotShow?: boolean;
129
+ desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
130
130
  name: any;
131
131
  dependencies: any[];
132
132
  tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
141
141
  * 创建组件属性
142
142
  */
143
143
  export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
144
- componentProps: import("lodash").Omit<any, "format" | "valueType" | "precision" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
144
+ componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
145
145
  formItemTransform: {
146
146
  getValueProps: any;
147
147
  normalize: any;
@@ -95,8 +95,6 @@ var ChangedWrapper = props => {
95
95
  originalValues: isNestedField ? originalValues : undefined
96
96
  }, children.props), rest));
97
97
  }
98
-
99
- // eslint-disable-next-line react-hooks/rules-of-hooks
100
98
  var tipOpenCalc = () => {
101
99
  if (!toolTip) return false;
102
100
 
@@ -127,7 +125,7 @@ var ChangedWrapper = props => {
127
125
  placement: "topLeft",
128
126
  autoAdjustOverflow: false,
129
127
  title: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
130
- direction: "vertical",
128
+ orientation: "vertical",
131
129
  className: "changed-tooltip",
132
130
  children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
133
131
  align: "start",
@@ -177,6 +177,12 @@
177
177
  margin-left: @zaui-space-size-sm;
178
178
  }
179
179
 
180
+ .pro-form-input-space-compact{
181
+ .@{ant-prefix}-btn{
182
+ color: #333;
183
+ }
184
+ }
185
+
180
186
  .@{ant-prefix}-form-item-has-error {
181
187
  .group-separator {
182
188
  color: #ff4d4f;
@@ -186,6 +192,18 @@
186
192
  .site-input-split {
187
193
  border-color: @zaui-danger;
188
194
  }
195
+ .pro-form-input-space-compact{
196
+ .@{ant-prefix}-btn{
197
+ color: @zaui-danger;
198
+ border-color: @zaui-danger;
199
+ }
200
+ }
201
+ .pro-tree-modal{
202
+ .pro-enum-input-addonAfter{
203
+ border-color: @zaui-danger;
204
+ color: @zaui-danger;
205
+ }
206
+ }
189
207
  }
190
208
 
191
209
  .site-input-group-wrapper {