@zat-design/sisyphus-react 3.3.0-beta.6 → 3.3.0-beta.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.
- package/dist/index.esm.css +7 -0
- package/es/ProEnum/index.js +3 -3
- package/es/ProForm/components/combination/ProModalSelect/index.js +1 -1
- package/es/ProForm/components/render/Render.js +14 -23
- package/es/ProTable/style/index.less +6 -6
- package/es/ProTreeModal/style/index.less +85 -84
- package/lib/ProEnum/index.js +2 -2
- package/lib/ProForm/components/combination/ProModalSelect/index.js +1 -1
- package/lib/ProForm/components/render/Render.js +14 -23
- package/lib/ProTable/style/index.less +6 -6
- package/lib/ProTreeModal/style/index.less +85 -84
- package/package.json +1 -1
package/dist/index.esm.css
CHANGED
|
@@ -1629,6 +1629,12 @@
|
|
|
1629
1629
|
.pro-table .ant-table-tbody .ant-table-cell-fix-right {
|
|
1630
1630
|
background: unset !important;
|
|
1631
1631
|
}
|
|
1632
|
+
.pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell {
|
|
1633
|
+
background: #d2fff4 !important;
|
|
1634
|
+
}
|
|
1635
|
+
.pro-table .ant-table-body .ant-table-tbody .ant-table-row:nth-child(odd).new-cell td {
|
|
1636
|
+
background: #d2fff4 !important;
|
|
1637
|
+
}
|
|
1632
1638
|
.pro-table .ant-table-body .ant-table-cell .varied-cell {
|
|
1633
1639
|
margin-left: -8px;
|
|
1634
1640
|
background: var(--zaui-contract-bg, #fffaa1);
|
|
@@ -3324,6 +3330,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
|
|
|
3324
3330
|
}
|
|
3325
3331
|
.pro-tree-modal-checkbox-close {
|
|
3326
3332
|
padding-left: var(--zaui-space-size-sm, 8px);
|
|
3333
|
+
color: #c5c7cd;
|
|
3327
3334
|
font-size: var(--zaui-font-size-sm, 12px);
|
|
3328
3335
|
}
|
|
3329
3336
|
.pro-tree-modal-tree-node {
|
package/es/ProEnum/index.js
CHANGED
|
@@ -16,7 +16,7 @@ var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component
|
|
|
16
16
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
17
17
|
import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
|
|
18
18
|
import React, { useState, useEffect, useMemo } from 'react';
|
|
19
|
-
import { cloneDeep, isFunction, isString, isArray } from 'lodash';
|
|
19
|
+
import { cloneDeep, isFunction, isString, isArray, omit } from 'lodash';
|
|
20
20
|
import ProSelect from '../ProSelect';
|
|
21
21
|
import { useProConfig } from '../ProConfigProvider';
|
|
22
22
|
import ProEnumTag from './components/Tag';
|
|
@@ -172,13 +172,13 @@ var ProEnum = function ProEnum(props) {
|
|
|
172
172
|
onChange: onChange
|
|
173
173
|
}));
|
|
174
174
|
case 'Radio':
|
|
175
|
-
return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
|
|
175
|
+
return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
|
|
176
176
|
options: list,
|
|
177
177
|
value: value,
|
|
178
178
|
onChange: onChange
|
|
179
179
|
}));
|
|
180
180
|
case 'Checkbox':
|
|
181
|
-
return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, enumProps), {}, {
|
|
181
|
+
return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
|
|
182
182
|
options: list,
|
|
183
183
|
value: value,
|
|
184
184
|
onChange: onChange
|
|
@@ -642,6 +642,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
642
642
|
}
|
|
643
643
|
return defaultAddonAfter;
|
|
644
644
|
};
|
|
645
|
+
console.log(locale.ProModalSelect.select);
|
|
645
646
|
// 加个中间状态Input
|
|
646
647
|
var initRender = _jsxs(_Fragment, {
|
|
647
648
|
children: [_jsx(_Input, _objectSpread({
|
|
@@ -651,7 +652,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
651
652
|
onChange: handleChangeValue,
|
|
652
653
|
disabled: disabled,
|
|
653
654
|
addonAfter: forceAddonAfterRender(),
|
|
654
|
-
placeholder: locale.ProModalSelect.select,
|
|
655
655
|
autoComplete: "off"
|
|
656
656
|
}, restInputProps)), _jsx(_Input, {
|
|
657
657
|
type: "hidden",
|
|
@@ -363,9 +363,7 @@ var Render = function Render(props) {
|
|
|
363
363
|
};
|
|
364
364
|
}
|
|
365
365
|
// 需要过滤掉的form_item的key
|
|
366
|
-
var filterFormItemKey = ['onFieldChange',
|
|
367
|
-
// 'shouldUpdate',
|
|
368
|
-
'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
|
|
366
|
+
var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
|
|
369
367
|
if (type === 'FormList') {
|
|
370
368
|
lastComponentProps.disabled = lastDisabled;
|
|
371
369
|
var lessMode = lastComponentProps.mode === 'less';
|
|
@@ -389,31 +387,24 @@ var Render = function Render(props) {
|
|
|
389
387
|
span: 24 // 默认占一行
|
|
390
388
|
});
|
|
391
389
|
}
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
// return (
|
|
395
|
-
// <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
|
|
396
|
-
// {() => {
|
|
397
|
-
// return (
|
|
398
|
-
// <Form.Item
|
|
399
|
-
// {...omit(_otherFormItemProps, filterFormItemKey)}
|
|
400
|
-
// // @ts-ignore
|
|
401
|
-
// _internalItemRender={internalItemRender}
|
|
402
|
-
// className={_className}
|
|
403
|
-
// >
|
|
404
|
-
// {child}
|
|
405
|
-
// </Form.Item>
|
|
406
|
-
// );
|
|
407
|
-
// }}
|
|
408
|
-
// </Form.Item>
|
|
409
|
-
// );
|
|
410
|
-
// }
|
|
411
|
-
var formItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
|
|
390
|
+
|
|
391
|
+
var orgFormItem = _jsx(_Form.Item, _objectSpread(_objectSpread({}, omit(_otherFormItemProps, filterFormItemKey)), {}, {
|
|
412
392
|
// @ts-ignore
|
|
413
393
|
_internalItemRender: internalItemRender,
|
|
414
394
|
className: _className,
|
|
415
395
|
children: child
|
|
416
396
|
}));
|
|
397
|
+
var formItem = orgFormItem;
|
|
398
|
+
// 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
|
|
399
|
+
if (_otherFormItemProps.shouldUpdate) {
|
|
400
|
+
formItem = _jsx(_Form.Item, {
|
|
401
|
+
shouldUpdate: _otherFormItemProps.shouldUpdate,
|
|
402
|
+
noStyle: true,
|
|
403
|
+
children: function children() {
|
|
404
|
+
return orgFormItem;
|
|
405
|
+
}
|
|
406
|
+
});
|
|
407
|
+
}
|
|
417
408
|
// 不渲染tooltip
|
|
418
409
|
if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
|
|
419
410
|
return formItem;
|
|
@@ -64,13 +64,13 @@
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
.@{ant-prefix}-table-body {
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
.@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
|
|
68
|
+
background: #d2fff4 !important;
|
|
69
69
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
70
|
+
td {
|
|
71
|
+
background: #d2fff4 !important;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
74
|
|
|
75
75
|
.@{ant-prefix}-table-cell .varied-cell {
|
|
76
76
|
margin-left: -8px;
|
|
@@ -11,31 +11,31 @@
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
&-content {
|
|
14
|
-
display
|
|
14
|
+
display: flex;
|
|
15
15
|
flex-direction: row;
|
|
16
|
-
height
|
|
17
|
-
margin-bottom
|
|
16
|
+
height: 482px;
|
|
17
|
+
margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
|
|
18
18
|
|
|
19
19
|
.@{ant-prefix}-tree-checkbox {
|
|
20
20
|
margin-top: 2px;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
.@{ant-prefix}-tree-switcher {
|
|
24
|
-
width
|
|
24
|
+
width: 20px;
|
|
25
25
|
line-height: 20px;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
.@{ant-prefix}-tree-treenode {
|
|
29
|
-
width
|
|
30
|
-
padding
|
|
29
|
+
width: 100%;
|
|
30
|
+
padding: 0;
|
|
31
31
|
padding-bottom: var(--zaui-font-size-sm, 12px);
|
|
32
|
-
color
|
|
33
|
-
font-size
|
|
34
|
-
line-height
|
|
32
|
+
color: var(--zaui-text);
|
|
33
|
+
font-size: var(--zaui-font-size, 14px);
|
|
34
|
+
line-height: 20px;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
.@{ant-prefix}-tree-node-content-wrapper {
|
|
38
|
-
min-height
|
|
38
|
+
min-height: 20px;
|
|
39
39
|
line-height: 20px;
|
|
40
40
|
}
|
|
41
41
|
|
|
@@ -45,27 +45,27 @@
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
&-box {
|
|
48
|
-
display
|
|
48
|
+
display: flex;
|
|
49
49
|
flex-direction: column;
|
|
50
|
-
width
|
|
51
|
-
height
|
|
52
|
-
color
|
|
53
|
-
font-size
|
|
54
|
-
line-height
|
|
55
|
-
border
|
|
56
|
-
border-radius
|
|
50
|
+
width: 456px;
|
|
51
|
+
height: 100%;
|
|
52
|
+
color: var(--zaui-text);
|
|
53
|
+
font-size: var(--zaui-font-size, 14px);
|
|
54
|
+
line-height: 20px;
|
|
55
|
+
border: 1px solid #e6e6e6;
|
|
56
|
+
border-radius: var(--zaui-border-radius, 4px);
|
|
57
57
|
|
|
58
58
|
&:first-child {
|
|
59
59
|
margin-right: var(--zaui-space-size-md, 16px);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
.viewSvg>div {
|
|
62
|
+
.viewSvg > div {
|
|
63
63
|
display: flex;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
/* 修改滚动条样式 */
|
|
67
67
|
::-webkit-scrollbar {
|
|
68
|
-
width
|
|
68
|
+
width: 0;
|
|
69
69
|
height: 0;
|
|
70
70
|
}
|
|
71
71
|
}
|
|
@@ -79,38 +79,38 @@
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
&-search {
|
|
82
|
-
width
|
|
82
|
+
width: auto;
|
|
83
83
|
margin: var(--zaui-space-size-sm, 8px) var(--zaui-space-size-md, 16px) 0;
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
&-cascader-flex {
|
|
87
|
-
display
|
|
87
|
+
display: flex;
|
|
88
88
|
flex-direction: row;
|
|
89
|
-
height
|
|
90
|
-
overflow
|
|
89
|
+
height: 100%;
|
|
90
|
+
overflow: hidden;
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
&-cascader-warp {
|
|
94
|
-
display
|
|
94
|
+
display: flex;
|
|
95
95
|
flex-direction: column;
|
|
96
|
-
width
|
|
97
|
-
margin-left
|
|
98
|
-
overflow
|
|
96
|
+
width: 350px;
|
|
97
|
+
margin-left: var(--zaui-space-size-md, 16px);
|
|
98
|
+
overflow: auto;
|
|
99
99
|
|
|
100
100
|
&:first-child {
|
|
101
|
-
width
|
|
102
|
-
margin-left
|
|
101
|
+
width: 192px;
|
|
102
|
+
margin-left: 0;
|
|
103
103
|
border-right: 1px solid #e6e6e6;
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
&-box-header {
|
|
108
|
-
display
|
|
109
|
-
align-items
|
|
108
|
+
display: flex;
|
|
109
|
+
align-items: center;
|
|
110
110
|
justify-content: space-between;
|
|
111
|
-
height
|
|
112
|
-
padding
|
|
113
|
-
background
|
|
111
|
+
height: 40px;
|
|
112
|
+
padding: 0 var(--zaui-space-size-md, 16px);
|
|
113
|
+
background: #fafafa;
|
|
114
114
|
|
|
115
115
|
&:first-child {
|
|
116
116
|
color: #616161;
|
|
@@ -122,20 +122,20 @@
|
|
|
122
122
|
}
|
|
123
123
|
|
|
124
124
|
&-tree-warp {
|
|
125
|
-
flex
|
|
126
|
-
margin
|
|
125
|
+
flex: 1;
|
|
126
|
+
margin: 0 var(--zaui-space-size-md, 16px);
|
|
127
127
|
padding-top: var(--zaui-space-size-sm, 8px);
|
|
128
|
-
overflow-y
|
|
128
|
+
overflow-y: auto;
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
&-checkbox-content {
|
|
132
|
-
display
|
|
133
|
-
flex-direction
|
|
134
|
-
align-items
|
|
132
|
+
display: flex;
|
|
133
|
+
flex-direction: row;
|
|
134
|
+
align-items: center;
|
|
135
135
|
justify-content: space-between;
|
|
136
|
-
margin-bottom
|
|
137
|
-
line-height
|
|
138
|
-
cursor
|
|
136
|
+
margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
|
|
137
|
+
line-height: 20px;
|
|
138
|
+
cursor: pointer;
|
|
139
139
|
|
|
140
140
|
&-look {
|
|
141
141
|
color: #333;
|
|
@@ -148,16 +148,16 @@
|
|
|
148
148
|
|
|
149
149
|
&-cascader-content {
|
|
150
150
|
margin-bottom: 0;
|
|
151
|
-
padding
|
|
151
|
+
padding: 6px;
|
|
152
152
|
}
|
|
153
153
|
|
|
154
154
|
&-check-cascader-content {
|
|
155
|
-
color
|
|
155
|
+
color: var(--zaui-brand);
|
|
156
156
|
background: rgba(0, 106, 255, 0.1);
|
|
157
157
|
}
|
|
158
158
|
|
|
159
159
|
&-isView {
|
|
160
|
-
display
|
|
160
|
+
display: flex;
|
|
161
161
|
align-items: center;
|
|
162
162
|
|
|
163
163
|
.viewSvg {
|
|
@@ -175,11 +175,12 @@
|
|
|
175
175
|
|
|
176
176
|
&-checkbox-close {
|
|
177
177
|
padding-left: var(--zaui-space-size-sm, 8px);
|
|
178
|
-
|
|
178
|
+
color: #c5c7cd;
|
|
179
|
+
font-size: var(--zaui-font-size-sm, 12px);
|
|
179
180
|
}
|
|
180
181
|
|
|
181
182
|
&-tree-node {
|
|
182
|
-
display
|
|
183
|
+
display: flex;
|
|
183
184
|
flex-direction: row;
|
|
184
185
|
|
|
185
186
|
&:last-child {
|
|
@@ -188,34 +189,34 @@
|
|
|
188
189
|
}
|
|
189
190
|
|
|
190
191
|
&-tree-node-tag {
|
|
191
|
-
display
|
|
192
|
-
align-items
|
|
192
|
+
display: flex;
|
|
193
|
+
align-items: center;
|
|
193
194
|
justify-content: center;
|
|
194
|
-
height
|
|
195
|
-
margin-right
|
|
196
|
-
padding
|
|
197
|
-
font-weight
|
|
198
|
-
line-height
|
|
199
|
-
white-space
|
|
200
|
-
border-radius
|
|
195
|
+
height: 20px;
|
|
196
|
+
margin-right: var(--zaui-space-size-sm, 8px);
|
|
197
|
+
padding: 0 var(--zaui-space-size-xs);
|
|
198
|
+
font-weight: 400;
|
|
199
|
+
line-height: 24px;
|
|
200
|
+
white-space: nowrap;
|
|
201
|
+
border-radius: var(--zaui-border-radius-card);
|
|
201
202
|
|
|
202
203
|
span {
|
|
203
|
-
font-size
|
|
204
|
+
font-size: var(--zaui-font-size-sm, 12px);
|
|
204
205
|
line-height: 20px;
|
|
205
|
-
text-align
|
|
206
|
-
transform
|
|
206
|
+
text-align: center;
|
|
207
|
+
transform: scale(0.83, 0.83);
|
|
207
208
|
}
|
|
208
209
|
}
|
|
209
210
|
}
|
|
210
211
|
|
|
211
212
|
.pro-tree-modal-no-checks {
|
|
212
|
-
display
|
|
213
|
-
align-items
|
|
213
|
+
display: flex;
|
|
214
|
+
align-items: center;
|
|
214
215
|
justify-content: center;
|
|
215
|
-
height
|
|
216
|
-
color
|
|
217
|
-
font-weight
|
|
218
|
-
font-size
|
|
216
|
+
height: 100%;
|
|
217
|
+
color: #939599;
|
|
218
|
+
font-weight: 400;
|
|
219
|
+
font-size: var(--zaui-font-size, 14px);
|
|
219
220
|
}
|
|
220
221
|
|
|
221
222
|
.pro-transfer-right {
|
|
@@ -227,37 +228,37 @@
|
|
|
227
228
|
}
|
|
228
229
|
|
|
229
230
|
.@{ant-prefix}-tag {
|
|
230
|
-
display
|
|
231
|
-
align-items
|
|
231
|
+
display: flex;
|
|
232
|
+
align-items: center;
|
|
232
233
|
justify-content: space-between;
|
|
233
|
-
width
|
|
234
|
-
height
|
|
235
|
-
padding
|
|
236
|
-
color
|
|
237
|
-
font-size
|
|
238
|
-
background
|
|
239
|
-
border
|
|
240
|
-
border-radius
|
|
234
|
+
width: 100%;
|
|
235
|
+
height: 32px;
|
|
236
|
+
padding: 2px var(--zaui-space-size-sm, 8px);
|
|
237
|
+
color: var(--zaui-text, #343434);
|
|
238
|
+
font-size: var(--zaui-font-size, 14px);
|
|
239
|
+
background: #f2f2f2;
|
|
240
|
+
border: none;
|
|
241
|
+
border-radius: var(--zaui-border-radius, 4px);
|
|
241
242
|
|
|
242
243
|
.drag-icon {
|
|
243
|
-
height
|
|
244
|
+
height: 20px;
|
|
244
245
|
margin-right: var(--zaui-space-size-xs, 4px);
|
|
245
|
-
cursor
|
|
246
|
+
cursor: move;
|
|
246
247
|
}
|
|
247
248
|
|
|
248
249
|
.pro-tooltip {
|
|
249
|
-
flex
|
|
250
|
+
flex: 1;
|
|
250
251
|
max-width: calc(100% - 42px);
|
|
251
252
|
}
|
|
252
253
|
|
|
253
254
|
.disabled-icon {
|
|
254
|
-
height
|
|
255
|
+
height: 20px;
|
|
255
256
|
margin-right: var(--zaui-space-size-xs, 4px);
|
|
256
257
|
}
|
|
257
258
|
|
|
258
259
|
.anticon-close {
|
|
259
|
-
margin
|
|
260
|
-
color
|
|
260
|
+
margin: 0;
|
|
261
|
+
color: #999;
|
|
261
262
|
font-size: var(--zaui-font-size-sm, 12px);
|
|
262
263
|
}
|
|
263
264
|
}
|
|
@@ -265,7 +266,7 @@
|
|
|
265
266
|
&.dragable {
|
|
266
267
|
.anticon-close {
|
|
267
268
|
position: relative;
|
|
268
|
-
left
|
|
269
|
+
left: -4px;
|
|
269
270
|
}
|
|
270
271
|
}
|
|
271
272
|
|
package/lib/ProEnum/index.js
CHANGED
|
@@ -173,13 +173,13 @@ var ProEnum = function ProEnum(props) {
|
|
|
173
173
|
onChange: onChange
|
|
174
174
|
}));
|
|
175
175
|
case 'Radio':
|
|
176
|
-
return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
|
|
176
|
+
return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
|
|
177
177
|
options: list,
|
|
178
178
|
value: value,
|
|
179
179
|
onChange: onChange
|
|
180
180
|
}));
|
|
181
181
|
case 'Checkbox':
|
|
182
|
-
return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
|
|
182
|
+
return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
|
|
183
183
|
options: list,
|
|
184
184
|
value: value,
|
|
185
185
|
onChange: onChange
|
|
@@ -643,6 +643,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
643
643
|
}
|
|
644
644
|
return defaultAddonAfter;
|
|
645
645
|
};
|
|
646
|
+
console.log(_locale.default.ProModalSelect.select);
|
|
646
647
|
// 加个中间状态Input
|
|
647
648
|
var initRender = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
|
|
648
649
|
children: [(0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread2.default)({
|
|
@@ -652,7 +653,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
|
|
|
652
653
|
onChange: handleChangeValue,
|
|
653
654
|
disabled: disabled,
|
|
654
655
|
addonAfter: forceAddonAfterRender(),
|
|
655
|
-
placeholder: _locale.default.ProModalSelect.select,
|
|
656
656
|
autoComplete: "off"
|
|
657
657
|
}, restInputProps)), (0, _jsxRuntime.jsx)(_antd.Input, {
|
|
658
658
|
type: "hidden",
|
|
@@ -361,9 +361,7 @@ var Render = function Render(props) {
|
|
|
361
361
|
};
|
|
362
362
|
}
|
|
363
363
|
// 需要过滤掉的form_item的key
|
|
364
|
-
var filterFormItemKey = ['onFieldChange',
|
|
365
|
-
// 'shouldUpdate',
|
|
366
|
-
'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
|
|
364
|
+
var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
|
|
367
365
|
if (type === 'FormList') {
|
|
368
366
|
lastComponentProps.disabled = lastDisabled;
|
|
369
367
|
var lessMode = lastComponentProps.mode === 'less';
|
|
@@ -387,31 +385,24 @@ var Render = function Render(props) {
|
|
|
387
385
|
span: 24 // 默认占一行
|
|
388
386
|
});
|
|
389
387
|
}
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
// return (
|
|
393
|
-
// <Form.Item shouldUpdate={_otherFormItemProps.shouldUpdate} noStyle>
|
|
394
|
-
// {() => {
|
|
395
|
-
// return (
|
|
396
|
-
// <Form.Item
|
|
397
|
-
// {...omit(_otherFormItemProps, filterFormItemKey)}
|
|
398
|
-
// // @ts-ignore
|
|
399
|
-
// _internalItemRender={internalItemRender}
|
|
400
|
-
// className={_className}
|
|
401
|
-
// >
|
|
402
|
-
// {child}
|
|
403
|
-
// </Form.Item>
|
|
404
|
-
// );
|
|
405
|
-
// }}
|
|
406
|
-
// </Form.Item>
|
|
407
|
-
// );
|
|
408
|
-
// }
|
|
409
|
-
var formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
|
|
388
|
+
|
|
389
|
+
var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
|
|
410
390
|
// @ts-ignore
|
|
411
391
|
_internalItemRender: internalItemRender,
|
|
412
392
|
className: _className,
|
|
413
393
|
children: child
|
|
414
394
|
}));
|
|
395
|
+
var formItem = orgFormItem;
|
|
396
|
+
// 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
|
|
397
|
+
if (_otherFormItemProps.shouldUpdate) {
|
|
398
|
+
formItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, {
|
|
399
|
+
shouldUpdate: _otherFormItemProps.shouldUpdate,
|
|
400
|
+
noStyle: true,
|
|
401
|
+
children: function children() {
|
|
402
|
+
return orgFormItem;
|
|
403
|
+
}
|
|
404
|
+
});
|
|
405
|
+
}
|
|
415
406
|
// 不渲染tooltip
|
|
416
407
|
if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
|
|
417
408
|
return formItem;
|
|
@@ -64,13 +64,13 @@
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
.@{ant-prefix}-table-body {
|
|
67
|
-
|
|
68
|
-
|
|
67
|
+
.@{ant-prefix}-table-tbody .@{ant-prefix}-table-row:nth-child(odd).new-cell {
|
|
68
|
+
background: #d2fff4 !important;
|
|
69
69
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
70
|
+
td {
|
|
71
|
+
background: #d2fff4 !important;
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
74
|
|
|
75
75
|
.@{ant-prefix}-table-cell .varied-cell {
|
|
76
76
|
margin-left: -8px;
|
|
@@ -11,31 +11,31 @@
|
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
&-content {
|
|
14
|
-
display
|
|
14
|
+
display: flex;
|
|
15
15
|
flex-direction: row;
|
|
16
|
-
height
|
|
17
|
-
margin-bottom
|
|
16
|
+
height: 482px;
|
|
17
|
+
margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
|
|
18
18
|
|
|
19
19
|
.@{ant-prefix}-tree-checkbox {
|
|
20
20
|
margin-top: 2px;
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
.@{ant-prefix}-tree-switcher {
|
|
24
|
-
width
|
|
24
|
+
width: 20px;
|
|
25
25
|
line-height: 20px;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
28
|
.@{ant-prefix}-tree-treenode {
|
|
29
|
-
width
|
|
30
|
-
padding
|
|
29
|
+
width: 100%;
|
|
30
|
+
padding: 0;
|
|
31
31
|
padding-bottom: var(--zaui-font-size-sm, 12px);
|
|
32
|
-
color
|
|
33
|
-
font-size
|
|
34
|
-
line-height
|
|
32
|
+
color: var(--zaui-text);
|
|
33
|
+
font-size: var(--zaui-font-size, 14px);
|
|
34
|
+
line-height: 20px;
|
|
35
35
|
}
|
|
36
36
|
|
|
37
37
|
.@{ant-prefix}-tree-node-content-wrapper {
|
|
38
|
-
min-height
|
|
38
|
+
min-height: 20px;
|
|
39
39
|
line-height: 20px;
|
|
40
40
|
}
|
|
41
41
|
|
|
@@ -45,27 +45,27 @@
|
|
|
45
45
|
}
|
|
46
46
|
|
|
47
47
|
&-box {
|
|
48
|
-
display
|
|
48
|
+
display: flex;
|
|
49
49
|
flex-direction: column;
|
|
50
|
-
width
|
|
51
|
-
height
|
|
52
|
-
color
|
|
53
|
-
font-size
|
|
54
|
-
line-height
|
|
55
|
-
border
|
|
56
|
-
border-radius
|
|
50
|
+
width: 456px;
|
|
51
|
+
height: 100%;
|
|
52
|
+
color: var(--zaui-text);
|
|
53
|
+
font-size: var(--zaui-font-size, 14px);
|
|
54
|
+
line-height: 20px;
|
|
55
|
+
border: 1px solid #e6e6e6;
|
|
56
|
+
border-radius: var(--zaui-border-radius, 4px);
|
|
57
57
|
|
|
58
58
|
&:first-child {
|
|
59
59
|
margin-right: var(--zaui-space-size-md, 16px);
|
|
60
60
|
}
|
|
61
61
|
|
|
62
|
-
.viewSvg>div {
|
|
62
|
+
.viewSvg > div {
|
|
63
63
|
display: flex;
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
/* 修改滚动条样式 */
|
|
67
67
|
::-webkit-scrollbar {
|
|
68
|
-
width
|
|
68
|
+
width: 0;
|
|
69
69
|
height: 0;
|
|
70
70
|
}
|
|
71
71
|
}
|
|
@@ -79,38 +79,38 @@
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
&-search {
|
|
82
|
-
width
|
|
82
|
+
width: auto;
|
|
83
83
|
margin: var(--zaui-space-size-sm, 8px) var(--zaui-space-size-md, 16px) 0;
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
&-cascader-flex {
|
|
87
|
-
display
|
|
87
|
+
display: flex;
|
|
88
88
|
flex-direction: row;
|
|
89
|
-
height
|
|
90
|
-
overflow
|
|
89
|
+
height: 100%;
|
|
90
|
+
overflow: hidden;
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
&-cascader-warp {
|
|
94
|
-
display
|
|
94
|
+
display: flex;
|
|
95
95
|
flex-direction: column;
|
|
96
|
-
width
|
|
97
|
-
margin-left
|
|
98
|
-
overflow
|
|
96
|
+
width: 350px;
|
|
97
|
+
margin-left: var(--zaui-space-size-md, 16px);
|
|
98
|
+
overflow: auto;
|
|
99
99
|
|
|
100
100
|
&:first-child {
|
|
101
|
-
width
|
|
102
|
-
margin-left
|
|
101
|
+
width: 192px;
|
|
102
|
+
margin-left: 0;
|
|
103
103
|
border-right: 1px solid #e6e6e6;
|
|
104
104
|
}
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
&-box-header {
|
|
108
|
-
display
|
|
109
|
-
align-items
|
|
108
|
+
display: flex;
|
|
109
|
+
align-items: center;
|
|
110
110
|
justify-content: space-between;
|
|
111
|
-
height
|
|
112
|
-
padding
|
|
113
|
-
background
|
|
111
|
+
height: 40px;
|
|
112
|
+
padding: 0 var(--zaui-space-size-md, 16px);
|
|
113
|
+
background: #fafafa;
|
|
114
114
|
|
|
115
115
|
&:first-child {
|
|
116
116
|
color: #616161;
|
|
@@ -122,20 +122,20 @@
|
|
|
122
122
|
}
|
|
123
123
|
|
|
124
124
|
&-tree-warp {
|
|
125
|
-
flex
|
|
126
|
-
margin
|
|
125
|
+
flex: 1;
|
|
126
|
+
margin: 0 var(--zaui-space-size-md, 16px);
|
|
127
127
|
padding-top: var(--zaui-space-size-sm, 8px);
|
|
128
|
-
overflow-y
|
|
128
|
+
overflow-y: auto;
|
|
129
129
|
}
|
|
130
130
|
|
|
131
131
|
&-checkbox-content {
|
|
132
|
-
display
|
|
133
|
-
flex-direction
|
|
134
|
-
align-items
|
|
132
|
+
display: flex;
|
|
133
|
+
flex-direction: row;
|
|
134
|
+
align-items: center;
|
|
135
135
|
justify-content: space-between;
|
|
136
|
-
margin-bottom
|
|
137
|
-
line-height
|
|
138
|
-
cursor
|
|
136
|
+
margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
|
|
137
|
+
line-height: 20px;
|
|
138
|
+
cursor: pointer;
|
|
139
139
|
|
|
140
140
|
&-look {
|
|
141
141
|
color: #333;
|
|
@@ -148,16 +148,16 @@
|
|
|
148
148
|
|
|
149
149
|
&-cascader-content {
|
|
150
150
|
margin-bottom: 0;
|
|
151
|
-
padding
|
|
151
|
+
padding: 6px;
|
|
152
152
|
}
|
|
153
153
|
|
|
154
154
|
&-check-cascader-content {
|
|
155
|
-
color
|
|
155
|
+
color: var(--zaui-brand);
|
|
156
156
|
background: rgba(0, 106, 255, 0.1);
|
|
157
157
|
}
|
|
158
158
|
|
|
159
159
|
&-isView {
|
|
160
|
-
display
|
|
160
|
+
display: flex;
|
|
161
161
|
align-items: center;
|
|
162
162
|
|
|
163
163
|
.viewSvg {
|
|
@@ -175,11 +175,12 @@
|
|
|
175
175
|
|
|
176
176
|
&-checkbox-close {
|
|
177
177
|
padding-left: var(--zaui-space-size-sm, 8px);
|
|
178
|
-
|
|
178
|
+
color: #c5c7cd;
|
|
179
|
+
font-size: var(--zaui-font-size-sm, 12px);
|
|
179
180
|
}
|
|
180
181
|
|
|
181
182
|
&-tree-node {
|
|
182
|
-
display
|
|
183
|
+
display: flex;
|
|
183
184
|
flex-direction: row;
|
|
184
185
|
|
|
185
186
|
&:last-child {
|
|
@@ -188,34 +189,34 @@
|
|
|
188
189
|
}
|
|
189
190
|
|
|
190
191
|
&-tree-node-tag {
|
|
191
|
-
display
|
|
192
|
-
align-items
|
|
192
|
+
display: flex;
|
|
193
|
+
align-items: center;
|
|
193
194
|
justify-content: center;
|
|
194
|
-
height
|
|
195
|
-
margin-right
|
|
196
|
-
padding
|
|
197
|
-
font-weight
|
|
198
|
-
line-height
|
|
199
|
-
white-space
|
|
200
|
-
border-radius
|
|
195
|
+
height: 20px;
|
|
196
|
+
margin-right: var(--zaui-space-size-sm, 8px);
|
|
197
|
+
padding: 0 var(--zaui-space-size-xs);
|
|
198
|
+
font-weight: 400;
|
|
199
|
+
line-height: 24px;
|
|
200
|
+
white-space: nowrap;
|
|
201
|
+
border-radius: var(--zaui-border-radius-card);
|
|
201
202
|
|
|
202
203
|
span {
|
|
203
|
-
font-size
|
|
204
|
+
font-size: var(--zaui-font-size-sm, 12px);
|
|
204
205
|
line-height: 20px;
|
|
205
|
-
text-align
|
|
206
|
-
transform
|
|
206
|
+
text-align: center;
|
|
207
|
+
transform: scale(0.83, 0.83);
|
|
207
208
|
}
|
|
208
209
|
}
|
|
209
210
|
}
|
|
210
211
|
|
|
211
212
|
.pro-tree-modal-no-checks {
|
|
212
|
-
display
|
|
213
|
-
align-items
|
|
213
|
+
display: flex;
|
|
214
|
+
align-items: center;
|
|
214
215
|
justify-content: center;
|
|
215
|
-
height
|
|
216
|
-
color
|
|
217
|
-
font-weight
|
|
218
|
-
font-size
|
|
216
|
+
height: 100%;
|
|
217
|
+
color: #939599;
|
|
218
|
+
font-weight: 400;
|
|
219
|
+
font-size: var(--zaui-font-size, 14px);
|
|
219
220
|
}
|
|
220
221
|
|
|
221
222
|
.pro-transfer-right {
|
|
@@ -227,37 +228,37 @@
|
|
|
227
228
|
}
|
|
228
229
|
|
|
229
230
|
.@{ant-prefix}-tag {
|
|
230
|
-
display
|
|
231
|
-
align-items
|
|
231
|
+
display: flex;
|
|
232
|
+
align-items: center;
|
|
232
233
|
justify-content: space-between;
|
|
233
|
-
width
|
|
234
|
-
height
|
|
235
|
-
padding
|
|
236
|
-
color
|
|
237
|
-
font-size
|
|
238
|
-
background
|
|
239
|
-
border
|
|
240
|
-
border-radius
|
|
234
|
+
width: 100%;
|
|
235
|
+
height: 32px;
|
|
236
|
+
padding: 2px var(--zaui-space-size-sm, 8px);
|
|
237
|
+
color: var(--zaui-text, #343434);
|
|
238
|
+
font-size: var(--zaui-font-size, 14px);
|
|
239
|
+
background: #f2f2f2;
|
|
240
|
+
border: none;
|
|
241
|
+
border-radius: var(--zaui-border-radius, 4px);
|
|
241
242
|
|
|
242
243
|
.drag-icon {
|
|
243
|
-
height
|
|
244
|
+
height: 20px;
|
|
244
245
|
margin-right: var(--zaui-space-size-xs, 4px);
|
|
245
|
-
cursor
|
|
246
|
+
cursor: move;
|
|
246
247
|
}
|
|
247
248
|
|
|
248
249
|
.pro-tooltip {
|
|
249
|
-
flex
|
|
250
|
+
flex: 1;
|
|
250
251
|
max-width: calc(100% - 42px);
|
|
251
252
|
}
|
|
252
253
|
|
|
253
254
|
.disabled-icon {
|
|
254
|
-
height
|
|
255
|
+
height: 20px;
|
|
255
256
|
margin-right: var(--zaui-space-size-xs, 4px);
|
|
256
257
|
}
|
|
257
258
|
|
|
258
259
|
.anticon-close {
|
|
259
|
-
margin
|
|
260
|
-
color
|
|
260
|
+
margin: 0;
|
|
261
|
+
color: #999;
|
|
261
262
|
font-size: var(--zaui-font-size-sm, 12px);
|
|
262
263
|
}
|
|
263
264
|
}
|
|
@@ -265,7 +266,7 @@
|
|
|
265
266
|
&.dragable {
|
|
266
267
|
.anticon-close {
|
|
267
268
|
position: relative;
|
|
268
|
-
left
|
|
269
|
+
left: -4px;
|
|
269
270
|
}
|
|
270
271
|
}
|
|
271
272
|
|