@zat-design/sisyphus-react 3.3.4 → 3.4.0-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.
- package/es/ProEnum/index.js +16 -2
- package/es/ProEnum/style/index.less +5 -1
- package/es/ProForm/components/render/Render.js +6 -5
- package/es/ProForm/components/render/RenderFields.js +7 -9
- package/es/ProForm/components/render/propsType.d.ts +1 -0
- package/es/ProThemeTools/component/PrdTools/index.js +3 -3
- package/es/ProThemeTools/index.d.ts +1 -1
- package/es/ProThemeTools/index.js +14 -3
- package/es/ProThemeTools/propsType.d.ts +1 -0
- package/lib/ProEnum/index.js +16 -2
- package/lib/ProEnum/style/index.less +5 -1
- package/lib/ProForm/components/render/Render.js +6 -5
- package/lib/ProForm/components/render/RenderFields.js +7 -9
- package/lib/ProForm/components/render/propsType.d.ts +1 -0
- package/lib/ProThemeTools/component/PrdTools/index.js +2 -2
- package/lib/ProThemeTools/index.d.ts +1 -1
- package/lib/ProThemeTools/index.js +13 -2
- package/lib/ProThemeTools/propsType.d.ts +1 -0
- package/package.json +1 -1
package/es/ProEnum/index.js
CHANGED
|
@@ -175,13 +175,27 @@ var ProEnum = function ProEnum(props) {
|
|
|
175
175
|
return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
|
|
176
176
|
options: list,
|
|
177
177
|
value: value,
|
|
178
|
-
onChange: onChange
|
|
178
|
+
onChange: onChange,
|
|
179
|
+
children: list.map(function (item) {
|
|
180
|
+
return _jsx(_Radio, {
|
|
181
|
+
value: item[fieldValue],
|
|
182
|
+
disabled: !!item.disabled,
|
|
183
|
+
children: item[label]
|
|
184
|
+
}, item[fieldValue]);
|
|
185
|
+
})
|
|
179
186
|
}));
|
|
180
187
|
case 'Checkbox':
|
|
181
188
|
return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
|
|
182
189
|
options: list,
|
|
183
190
|
value: value,
|
|
184
|
-
onChange: onChange
|
|
191
|
+
onChange: onChange,
|
|
192
|
+
children: list.map(function (item) {
|
|
193
|
+
return _jsx(_Checkbox, {
|
|
194
|
+
value: item[fieldValue],
|
|
195
|
+
disabled: !!item.disabled,
|
|
196
|
+
children: item[label]
|
|
197
|
+
}, item[fieldValue]);
|
|
198
|
+
})
|
|
185
199
|
}));
|
|
186
200
|
case 'Tag':
|
|
187
201
|
return _jsx(ProEnumTag, {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
align-items: center;
|
|
13
13
|
justify-content: center;
|
|
14
14
|
margin-right: var(--zaui-space-size-sm);
|
|
15
|
-
|
|
15
|
+
margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
|
|
16
16
|
padding: var(--zaui-space-size-xs) 10px;
|
|
17
17
|
background-color: #f5f5f5;
|
|
18
18
|
border-radius: var(--zaui-space-size-xs);
|
|
@@ -23,4 +23,8 @@
|
|
|
23
23
|
color: #fff;
|
|
24
24
|
background-color: var(--zaui-brand);
|
|
25
25
|
}
|
|
26
|
+
&-tag-item-disabled {
|
|
27
|
+
background-color: #f5f5f5;
|
|
28
|
+
pointer-events: none;
|
|
29
|
+
}
|
|
26
30
|
}
|
|
@@ -44,7 +44,8 @@ var Render = function Render(props) {
|
|
|
44
44
|
show = _props$show === void 0 ? true : _props$show,
|
|
45
45
|
fieldProps = props.fieldProps,
|
|
46
46
|
form = props.form,
|
|
47
|
-
|
|
47
|
+
disabled = props.disabled,
|
|
48
|
+
formDisabled = props.formDisabled,
|
|
48
49
|
type = props.type,
|
|
49
50
|
isSelect = props.isSelect,
|
|
50
51
|
originalValues = props.originalValues,
|
|
@@ -68,7 +69,7 @@ var Render = function Render(props) {
|
|
|
68
69
|
show: show,
|
|
69
70
|
formItemProps: formItemProps,
|
|
70
71
|
form: form,
|
|
71
|
-
disabled:
|
|
72
|
+
disabled: disabled,
|
|
72
73
|
rules: rules,
|
|
73
74
|
required: required,
|
|
74
75
|
fieldProps: fieldProps,
|
|
@@ -163,8 +164,8 @@ var Render = function Render(props) {
|
|
|
163
164
|
}
|
|
164
165
|
/** 移除多余参数,防止透传给formItem报错 */
|
|
165
166
|
var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
|
|
166
|
-
//
|
|
167
|
-
var lastDisabled =
|
|
167
|
+
// 优先级 column.disabled > fieldProps.disabled > formDisabled
|
|
168
|
+
var lastDisabled = (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
|
|
168
169
|
/**
|
|
169
170
|
* 最新fieldProps: 更新后的组件Props
|
|
170
171
|
*/
|
|
@@ -255,7 +256,7 @@ var Render = function Render(props) {
|
|
|
255
256
|
if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
|
|
256
257
|
setTimeout(function () {
|
|
257
258
|
form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
|
|
258
|
-
form.validateFields(
|
|
259
|
+
form.validateFields();
|
|
259
260
|
}, 60);
|
|
260
261
|
}
|
|
261
262
|
// ProTreeSelect返回option
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
2
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
3
|
-
var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "
|
|
3
|
+
var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required"];
|
|
4
4
|
import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
|
|
5
5
|
import React from 'react';
|
|
6
6
|
import { isBoolean, isFunction, union, isString } from 'lodash';
|
|
@@ -44,7 +44,7 @@ var RenderFields = function RenderFields(props) {
|
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
var comList = columns.flatMap(function (column, index) {
|
|
47
|
-
var
|
|
47
|
+
var _formItemProps$disabl;
|
|
48
48
|
if (!!expand && !openState) {
|
|
49
49
|
// expand为Number时 过滤掉大于expand 且 非fixed的column
|
|
50
50
|
if (typeof expand === 'number') {
|
|
@@ -67,7 +67,6 @@ var RenderFields = function RenderFields(props) {
|
|
|
67
67
|
formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
|
|
68
68
|
_column$fieldProps = column.fieldProps,
|
|
69
69
|
fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
|
|
70
|
-
disabled = column.disabled,
|
|
71
70
|
equalWith = column.equalWith,
|
|
72
71
|
_column$clearNotShow = column.clearNotShow,
|
|
73
72
|
clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
|
|
@@ -123,8 +122,7 @@ var RenderFields = function RenderFields(props) {
|
|
|
123
122
|
placeholder = formItemChildProps.placeholder,
|
|
124
123
|
dataSource = formItemChildProps.dataSource;
|
|
125
124
|
var formLabel = _formItemProps.label;
|
|
126
|
-
var comDisabled = (
|
|
127
|
-
var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
|
|
125
|
+
var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
|
|
128
126
|
// 当前组件是不是一个选择组件
|
|
129
127
|
var _isSelect = isSelect({
|
|
130
128
|
dataSource: dataSource,
|
|
@@ -141,10 +139,9 @@ var RenderFields = function RenderFields(props) {
|
|
|
141
139
|
_fieldProps.disabled = formDisabled;
|
|
142
140
|
}
|
|
143
141
|
var componentProps = _objectSpread(_objectSpread({
|
|
144
|
-
disabledStrictly: true,
|
|
145
142
|
placeholder: placeholderHandle()
|
|
146
143
|
}, _fieldProps), {}, {
|
|
147
|
-
disabled:
|
|
144
|
+
disabled: comDisabled
|
|
148
145
|
});
|
|
149
146
|
// 容器组件,额外处理show的问题
|
|
150
147
|
if (['ProCollapse', 'Container'].includes(_type)) {
|
|
@@ -168,7 +165,7 @@ var RenderFields = function RenderFields(props) {
|
|
|
168
165
|
var otherProps = {
|
|
169
166
|
label: _formItemProps.label,
|
|
170
167
|
name: _formItemProps.name,
|
|
171
|
-
disabled:
|
|
168
|
+
disabled: comDisabled,
|
|
172
169
|
isView: _isView,
|
|
173
170
|
viewEmpty: viewEmpty,
|
|
174
171
|
valueType: valueType,
|
|
@@ -189,8 +186,9 @@ var RenderFields = function RenderFields(props) {
|
|
|
189
186
|
value: otherProps,
|
|
190
187
|
children: _jsx(Render, {
|
|
191
188
|
show: show,
|
|
192
|
-
disabled: Boolean(formDisabled),
|
|
193
189
|
form: form,
|
|
190
|
+
disabled: column.disabled,
|
|
191
|
+
formDisabled: formDisabled,
|
|
194
192
|
type: _type,
|
|
195
193
|
originComponent: component,
|
|
196
194
|
component: TargetComponent,
|
|
@@ -230,6 +230,7 @@ export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T,
|
|
|
230
230
|
* 表单渲染类型
|
|
231
231
|
*/
|
|
232
232
|
export interface RenderProps<Values = any> {
|
|
233
|
+
formDisabled?: boolean;
|
|
233
234
|
component: any;
|
|
234
235
|
formItemProps: FormItemProps<Values> & {
|
|
235
236
|
labelWidth?: string | number;
|
|
@@ -11,7 +11,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
|
11
11
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
12
12
|
import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
|
|
13
13
|
import { useState, useEffect } from 'react';
|
|
14
|
-
import { setThemes
|
|
14
|
+
import { setThemes } from '../../utils/index';
|
|
15
15
|
import locale from '../../../locale';
|
|
16
16
|
var connect = function connect(Component) {
|
|
17
17
|
var ComponentWrapper = function ComponentWrapper(props) {
|
|
@@ -249,9 +249,9 @@ var PrdTools = function PrdTools(_ref) {
|
|
|
249
249
|
setState(_objectSpread(_objectSpread({}, state), {}, {
|
|
250
250
|
zauiStripe: value
|
|
251
251
|
}));
|
|
252
|
-
setTableNoStripe(value);
|
|
253
252
|
setThemes({
|
|
254
|
-
'zaui-stripe': value
|
|
253
|
+
'zaui-stripe': value,
|
|
254
|
+
'zaui-table-strip-bg': value ? '#fafafa' : '#ffffff'
|
|
255
255
|
});
|
|
256
256
|
}
|
|
257
257
|
})
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ProThemeToolsProps } from './propsType';
|
|
2
2
|
declare const ProThemeTools: {
|
|
3
|
-
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, ...props }: ProThemeToolsProps): JSX.Element;
|
|
3
|
+
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): JSX.Element;
|
|
4
4
|
defaultProps: {
|
|
5
5
|
size: number;
|
|
6
6
|
mode: string;
|
|
@@ -6,13 +6,15 @@ import _message from "antd/es/message";
|
|
|
6
6
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
7
7
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
8
8
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
9
|
-
var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
|
|
9
|
+
var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme", "onChange"];
|
|
10
10
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
11
11
|
/* eslint-disable prefer-const */
|
|
12
12
|
import { SettingOutlined } from '@ant-design/icons';
|
|
13
13
|
import { useEffect, useState } from 'react';
|
|
14
|
+
import { usePrevious, useUpdateEffect } from 'ahooks';
|
|
15
|
+
import { isEqual } from 'lodash';
|
|
14
16
|
import classnames from 'classnames';
|
|
15
|
-
import { getKebabCase, setThemes,
|
|
17
|
+
import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
|
|
16
18
|
import { PrdTools } from './component';
|
|
17
19
|
import locale from '../locale';
|
|
18
20
|
var defaultCacheTime = 1; // 配置保存时间为一天
|
|
@@ -46,6 +48,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
46
48
|
tableStripe = _ref$tableStripe === void 0 ? false : _ref$tableStripe,
|
|
47
49
|
_ref$theme = _ref.theme,
|
|
48
50
|
theme = _ref$theme === void 0 ? {} : _ref$theme,
|
|
51
|
+
onChange = _ref.onChange,
|
|
49
52
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
50
53
|
var _useState = useState(false),
|
|
51
54
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -55,6 +58,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
55
58
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
56
59
|
state = _useState4[0],
|
|
57
60
|
setState = _useState4[1];
|
|
61
|
+
var previousState = usePrevious(state);
|
|
58
62
|
var zauiBrand = state.zauiBrand,
|
|
59
63
|
zauiStripe = state.zauiStripe,
|
|
60
64
|
zauiTableBorder = state.zauiTableBorder;
|
|
@@ -149,7 +153,9 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
149
153
|
}, [zauiBrand]);
|
|
150
154
|
// 斑马纹设置
|
|
151
155
|
useEffect(function () {
|
|
152
|
-
|
|
156
|
+
setThemes({
|
|
157
|
+
'zaui-table-strip-bg': zauiStripe ? '#fafafa' : '#ffffff'
|
|
158
|
+
});
|
|
153
159
|
}, [zauiStripe]);
|
|
154
160
|
// 表格边框设置
|
|
155
161
|
useEffect(function () {
|
|
@@ -165,6 +171,11 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
165
171
|
localStorage.setItem('themeConfig', JSON.stringify(newThemeConfig));
|
|
166
172
|
}
|
|
167
173
|
}, [state, cacheTime]);
|
|
174
|
+
useUpdateEffect(function () {
|
|
175
|
+
if (!isEqual(state, previousState) && visible) {
|
|
176
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(state);
|
|
177
|
+
}
|
|
178
|
+
}, [state]);
|
|
168
179
|
var cls = classnames(_defineProperty({
|
|
169
180
|
'pro-theme-tools': true,
|
|
170
181
|
'pro-theme-tools-follow': iconFollowTheme
|
package/lib/ProEnum/index.js
CHANGED
|
@@ -176,13 +176,27 @@ var ProEnum = function ProEnum(props) {
|
|
|
176
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
|
-
onChange: onChange
|
|
179
|
+
onChange: onChange,
|
|
180
|
+
children: list.map(function (item) {
|
|
181
|
+
return (0, _jsxRuntime.jsx)(_antd.Radio, {
|
|
182
|
+
value: item[fieldValue],
|
|
183
|
+
disabled: !!item.disabled,
|
|
184
|
+
children: item[label]
|
|
185
|
+
}, item[fieldValue]);
|
|
186
|
+
})
|
|
180
187
|
}));
|
|
181
188
|
case 'Checkbox':
|
|
182
189
|
return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
|
|
183
190
|
options: list,
|
|
184
191
|
value: value,
|
|
185
|
-
onChange: onChange
|
|
192
|
+
onChange: onChange,
|
|
193
|
+
children: list.map(function (item) {
|
|
194
|
+
return (0, _jsxRuntime.jsx)(_antd.Checkbox, {
|
|
195
|
+
value: item[fieldValue],
|
|
196
|
+
disabled: !!item.disabled,
|
|
197
|
+
children: item[label]
|
|
198
|
+
}, item[fieldValue]);
|
|
199
|
+
})
|
|
186
200
|
}));
|
|
187
201
|
case 'Tag':
|
|
188
202
|
return (0, _jsxRuntime.jsx)(_Tag.default, {
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
align-items: center;
|
|
13
13
|
justify-content: center;
|
|
14
14
|
margin-right: var(--zaui-space-size-sm);
|
|
15
|
-
|
|
15
|
+
margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
|
|
16
16
|
padding: var(--zaui-space-size-xs) 10px;
|
|
17
17
|
background-color: #f5f5f5;
|
|
18
18
|
border-radius: var(--zaui-space-size-xs);
|
|
@@ -23,4 +23,8 @@
|
|
|
23
23
|
color: #fff;
|
|
24
24
|
background-color: var(--zaui-brand);
|
|
25
25
|
}
|
|
26
|
+
&-tag-item-disabled {
|
|
27
|
+
background-color: #f5f5f5;
|
|
28
|
+
pointer-events: none;
|
|
29
|
+
}
|
|
26
30
|
}
|
|
@@ -42,7 +42,8 @@ var Render = function Render(props) {
|
|
|
42
42
|
show = _props$show === void 0 ? true : _props$show,
|
|
43
43
|
fieldProps = props.fieldProps,
|
|
44
44
|
form = props.form,
|
|
45
|
-
|
|
45
|
+
disabled = props.disabled,
|
|
46
|
+
formDisabled = props.formDisabled,
|
|
46
47
|
type = props.type,
|
|
47
48
|
isSelect = props.isSelect,
|
|
48
49
|
originalValues = props.originalValues,
|
|
@@ -66,7 +67,7 @@ var Render = function Render(props) {
|
|
|
66
67
|
show: show,
|
|
67
68
|
formItemProps: formItemProps,
|
|
68
69
|
form: form,
|
|
69
|
-
disabled:
|
|
70
|
+
disabled: disabled,
|
|
70
71
|
rules: rules,
|
|
71
72
|
required: required,
|
|
72
73
|
fieldProps: fieldProps,
|
|
@@ -161,8 +162,8 @@ var Render = function Render(props) {
|
|
|
161
162
|
}
|
|
162
163
|
/** 移除多余参数,防止透传给formItem报错 */
|
|
163
164
|
var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
|
|
164
|
-
//
|
|
165
|
-
var lastDisabled =
|
|
165
|
+
// 优先级 column.disabled > fieldProps.disabled > formDisabled
|
|
166
|
+
var lastDisabled = (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
|
|
166
167
|
/**
|
|
167
168
|
* 最新fieldProps: 更新后的组件Props
|
|
168
169
|
*/
|
|
@@ -253,7 +254,7 @@ var Render = function Render(props) {
|
|
|
253
254
|
if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
|
|
254
255
|
setTimeout(function () {
|
|
255
256
|
form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
|
|
256
|
-
form.validateFields(
|
|
257
|
+
form.validateFields();
|
|
257
258
|
}, 60);
|
|
258
259
|
}
|
|
259
260
|
// ProTreeSelect返回option
|
|
@@ -16,7 +16,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
|
|
|
16
16
|
var _utils = require("../../utils");
|
|
17
17
|
var _useFieldProps = require("../../utils/useFieldProps");
|
|
18
18
|
var _locale = _interopRequireDefault(require("../../../locale"));
|
|
19
|
-
var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "
|
|
19
|
+
var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required"];
|
|
20
20
|
var RenderFields = function RenderFields(props) {
|
|
21
21
|
var isView = props.isView,
|
|
22
22
|
_props$columns = props.columns,
|
|
@@ -52,7 +52,7 @@ var RenderFields = function RenderFields(props) {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
var comList = columns.flatMap(function (column, index) {
|
|
55
|
-
var
|
|
55
|
+
var _formItemProps$disabl;
|
|
56
56
|
if (!!expand && !openState) {
|
|
57
57
|
// expand为Number时 过滤掉大于expand 且 非fixed的column
|
|
58
58
|
if (typeof expand === 'number') {
|
|
@@ -75,7 +75,6 @@ var RenderFields = function RenderFields(props) {
|
|
|
75
75
|
formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
|
|
76
76
|
_column$fieldProps = column.fieldProps,
|
|
77
77
|
fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
|
|
78
|
-
disabled = column.disabled,
|
|
79
78
|
equalWith = column.equalWith,
|
|
80
79
|
_column$clearNotShow = column.clearNotShow,
|
|
81
80
|
clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
|
|
@@ -131,8 +130,7 @@ var RenderFields = function RenderFields(props) {
|
|
|
131
130
|
placeholder = formItemChildProps.placeholder,
|
|
132
131
|
dataSource = formItemChildProps.dataSource;
|
|
133
132
|
var formLabel = _formItemProps.label;
|
|
134
|
-
var comDisabled = (
|
|
135
|
-
var _disabled = comDisabled === undefined ? formDisabled : comDisabled;
|
|
133
|
+
var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
|
|
136
134
|
// 当前组件是不是一个选择组件
|
|
137
135
|
var _isSelect = (0, _utils.isSelect)({
|
|
138
136
|
dataSource: dataSource,
|
|
@@ -149,10 +147,9 @@ var RenderFields = function RenderFields(props) {
|
|
|
149
147
|
_fieldProps.disabled = formDisabled;
|
|
150
148
|
}
|
|
151
149
|
var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
|
|
152
|
-
disabledStrictly: true,
|
|
153
150
|
placeholder: placeholderHandle()
|
|
154
151
|
}, _fieldProps), {}, {
|
|
155
|
-
disabled:
|
|
152
|
+
disabled: comDisabled
|
|
156
153
|
});
|
|
157
154
|
// 容器组件,额外处理show的问题
|
|
158
155
|
if (['ProCollapse', 'Container'].includes(_type)) {
|
|
@@ -176,7 +173,7 @@ var RenderFields = function RenderFields(props) {
|
|
|
176
173
|
var otherProps = {
|
|
177
174
|
label: _formItemProps.label,
|
|
178
175
|
name: _formItemProps.name,
|
|
179
|
-
disabled:
|
|
176
|
+
disabled: comDisabled,
|
|
180
177
|
isView: _isView,
|
|
181
178
|
viewEmpty: viewEmpty,
|
|
182
179
|
valueType: valueType,
|
|
@@ -197,8 +194,9 @@ var RenderFields = function RenderFields(props) {
|
|
|
197
194
|
value: otherProps,
|
|
198
195
|
children: (0, _jsxRuntime.jsx)(_Render.default, {
|
|
199
196
|
show: show,
|
|
200
|
-
disabled: Boolean(formDisabled),
|
|
201
197
|
form: form,
|
|
198
|
+
disabled: column.disabled,
|
|
199
|
+
formDisabled: formDisabled,
|
|
202
200
|
type: _type,
|
|
203
201
|
originComponent: component,
|
|
204
202
|
component: TargetComponent,
|
|
@@ -230,6 +230,7 @@ export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T,
|
|
|
230
230
|
* 表单渲染类型
|
|
231
231
|
*/
|
|
232
232
|
export interface RenderProps<Values = any> {
|
|
233
|
+
formDisabled?: boolean;
|
|
233
234
|
component: any;
|
|
234
235
|
formItemProps: FormItemProps<Values> & {
|
|
235
236
|
labelWidth?: string | number;
|
|
@@ -249,9 +249,9 @@ var PrdTools = function PrdTools(_ref) {
|
|
|
249
249
|
setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
|
|
250
250
|
zauiStripe: value
|
|
251
251
|
}));
|
|
252
|
-
(0, _index.setTableNoStripe)(value);
|
|
253
252
|
(0, _index.setThemes)({
|
|
254
|
-
'zaui-stripe': value
|
|
253
|
+
'zaui-stripe': value,
|
|
254
|
+
'zaui-table-strip-bg': value ? '#fafafa' : '#ffffff'
|
|
255
255
|
});
|
|
256
256
|
}
|
|
257
257
|
})
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ProThemeToolsProps } from './propsType';
|
|
2
2
|
declare const ProThemeTools: {
|
|
3
|
-
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, ...props }: ProThemeToolsProps): JSX.Element;
|
|
3
|
+
({ size, className, cacheTime, color, mode, iconFollowTheme, prefixCls, tableBorder, tableStripe, theme, onChange, ...props }: ProThemeToolsProps): JSX.Element;
|
|
4
4
|
defaultProps: {
|
|
5
5
|
size: number;
|
|
6
6
|
mode: string;
|
|
@@ -13,11 +13,13 @@ var _jsxRuntime = require("react/jsx-runtime");
|
|
|
13
13
|
var _icons = require("@ant-design/icons");
|
|
14
14
|
var _antd = require("antd");
|
|
15
15
|
var _react = require("react");
|
|
16
|
+
var _ahooks = require("ahooks");
|
|
17
|
+
var _lodash = require("lodash");
|
|
16
18
|
var _classnames2 = _interopRequireDefault(require("classnames"));
|
|
17
19
|
var _index = require("./utils/index");
|
|
18
20
|
var _component = require("./component");
|
|
19
21
|
var _locale = _interopRequireDefault(require("../locale"));
|
|
20
|
-
var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
|
|
22
|
+
var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme", "onChange"];
|
|
21
23
|
/* eslint-disable prefer-const */
|
|
22
24
|
var defaultCacheTime = 1; // 配置保存时间为一天
|
|
23
25
|
var defaultThemeConfig = {
|
|
@@ -50,6 +52,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
50
52
|
tableStripe = _ref$tableStripe === void 0 ? false : _ref$tableStripe,
|
|
51
53
|
_ref$theme = _ref.theme,
|
|
52
54
|
theme = _ref$theme === void 0 ? {} : _ref$theme,
|
|
55
|
+
onChange = _ref.onChange,
|
|
53
56
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
54
57
|
var _useState = (0, _react.useState)(false),
|
|
55
58
|
_useState2 = (0, _slicedToArray2.default)(_useState, 2),
|
|
@@ -59,6 +62,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
59
62
|
_useState4 = (0, _slicedToArray2.default)(_useState3, 2),
|
|
60
63
|
state = _useState4[0],
|
|
61
64
|
setState = _useState4[1];
|
|
65
|
+
var previousState = (0, _ahooks.usePrevious)(state);
|
|
62
66
|
var zauiBrand = state.zauiBrand,
|
|
63
67
|
zauiStripe = state.zauiStripe,
|
|
64
68
|
zauiTableBorder = state.zauiTableBorder;
|
|
@@ -153,7 +157,9 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
153
157
|
}, [zauiBrand]);
|
|
154
158
|
// 斑马纹设置
|
|
155
159
|
(0, _react.useEffect)(function () {
|
|
156
|
-
(0, _index.
|
|
160
|
+
(0, _index.setThemes)({
|
|
161
|
+
'zaui-table-strip-bg': zauiStripe ? '#fafafa' : '#ffffff'
|
|
162
|
+
});
|
|
157
163
|
}, [zauiStripe]);
|
|
158
164
|
// 表格边框设置
|
|
159
165
|
(0, _react.useEffect)(function () {
|
|
@@ -169,6 +175,11 @@ var ProThemeTools = function ProThemeTools(_ref) {
|
|
|
169
175
|
localStorage.setItem('themeConfig', JSON.stringify(newThemeConfig));
|
|
170
176
|
}
|
|
171
177
|
}, [state, cacheTime]);
|
|
178
|
+
(0, _ahooks.useUpdateEffect)(function () {
|
|
179
|
+
if (!(0, _lodash.isEqual)(state, previousState) && visible) {
|
|
180
|
+
onChange === null || onChange === void 0 ? void 0 : onChange(state);
|
|
181
|
+
}
|
|
182
|
+
}, [state]);
|
|
172
183
|
var cls = (0, _classnames2.default)((0, _defineProperty2.default)({
|
|
173
184
|
'pro-theme-tools': true,
|
|
174
185
|
'pro-theme-tools-follow': iconFollowTheme
|