fan-standard-comp 3.1.7 → 3.1.9
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/fan-standard-comp.umd.js +2 -2
- package/es/FormComp/FieldComponent/RefactorTreeSelect.js +1 -1
- package/es/FormComp/FieldComponent/style/index.less +1 -1
- package/es/FormComp/RenderItemGroup/index.d.ts +1 -1
- package/es/FormComp/RenderItemGroup/index.js +3 -3
- package/es/StandardFilter/index.js +7 -4
- package/es/StandardFilter/style/index.less +3 -1
- package/es/StandardModal/index.d.ts +4 -4
- package/es/StandardModal/index.js +50 -9
- package/es/StandardModal/style/index.less +25 -0
- package/es/utils/getParentNodes.js +11 -1
- package/lib/FormComp/FieldComponent/RefactorTreeSelect.js +1 -1
- package/lib/FormComp/FieldComponent/style/index.less +1 -1
- package/lib/FormComp/RenderItemGroup/index.d.ts +1 -1
- package/lib/FormComp/RenderItemGroup/index.js +3 -3
- package/lib/StandardFilter/index.js +7 -4
- package/lib/StandardFilter/style/index.less +3 -1
- package/lib/StandardModal/index.d.ts +4 -4
- package/lib/StandardModal/index.js +54 -11
- package/lib/StandardModal/style/index.less +25 -0
- package/lib/utils/getParentNodes.js +11 -1
- package/package.json +1 -1
|
@@ -145,7 +145,7 @@ var RefactorTreeSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
|
|
|
145
145
|
|
|
146
146
|
if (Array.isArray(value)) {
|
|
147
147
|
return selectNodeInfo.matchNode.length > 0 ? selectNodeInfo.matchNode.map(function (item) {
|
|
148
|
-
return item[treeOptionName.title];
|
|
148
|
+
return item[treeOptionName.title] || item[treeOptionName.value];
|
|
149
149
|
}).join(',') : null;
|
|
150
150
|
}
|
|
151
151
|
|
|
@@ -26,7 +26,7 @@ interface displayLayoutProps extends layoutProps {
|
|
|
26
26
|
interface ItemGroupProps {
|
|
27
27
|
itemGroup: any | FieldsItemProps[];
|
|
28
28
|
size?: string;
|
|
29
|
-
fieldStatus?: 'default' | 'viewOnly' | 'disabled';
|
|
29
|
+
fieldStatus?: 'default' | 'viewOnly' | 'disabled' | string;
|
|
30
30
|
fieldSize?: 'large' | 'middle' | 'small' | any;
|
|
31
31
|
displayLayout?: displayLayoutProps;
|
|
32
32
|
form?: any;
|
|
@@ -193,9 +193,9 @@ var RenderItemGroup = function RenderItemGroup(props) {
|
|
|
193
193
|
|
|
194
194
|
return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? /*#__PURE__*/React.createElement(_Col, {
|
|
195
195
|
span: item.colSpan || 24
|
|
196
|
-
}, type === 'title' ? /*#__PURE__*/React.createElement("h3", Object.assign({
|
|
197
|
-
className: "modalPanelTitle ".concat((_a = item === null || item === void 0 ? void 0 : item.protoConfig) === null || _a === void 0 ? void 0 : _a.className)
|
|
198
|
-
}
|
|
196
|
+
}, type === 'title' ? /*#__PURE__*/React.createElement("h3", Object.assign({}, item.protoConfig, {
|
|
197
|
+
className: "modalPanelTitle ".concat(((_a = item === null || item === void 0 ? void 0 : item.protoConfig) === null || _a === void 0 ? void 0 : _a.className) || '')
|
|
198
|
+
}), label) : label) : /*#__PURE__*/React.createElement(React.Fragment, null, null);
|
|
199
199
|
});
|
|
200
200
|
} // 判断是否强制重新渲染表单
|
|
201
201
|
|
|
@@ -125,8 +125,6 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
|
|
|
125
125
|
itemGroup: reFormItemGroup,
|
|
126
126
|
layout: "inline",
|
|
127
127
|
form: _this.filterFormRef,
|
|
128
|
-
// fieldSize={fieldSize}
|
|
129
|
-
// displayLayout={displayLayout}
|
|
130
128
|
doUpdateFormFields: function doUpdateFormFields() {
|
|
131
129
|
return _this.forceUpdateForm();
|
|
132
130
|
}
|
|
@@ -202,7 +200,8 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
|
|
|
202
200
|
codes = _this$props2.codes,
|
|
203
201
|
permissionCodes = _this$props2.permissionCodes,
|
|
204
202
|
confirmText = _this$props2.confirmText,
|
|
205
|
-
cancelText = _this$props2.cancelText
|
|
203
|
+
cancelText = _this$props2.cancelText,
|
|
204
|
+
onFilterSearch = _this$props2.onFilterSearch; // const { recombinationGroup } = this.state;
|
|
206
205
|
|
|
207
206
|
return /*#__PURE__*/React.createElement(_Form, {
|
|
208
207
|
name: "standard-filter-form",
|
|
@@ -215,7 +214,11 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
|
|
|
215
214
|
className: "filter-grid"
|
|
216
215
|
}, /*#__PURE__*/React.createElement("div", {
|
|
217
216
|
className: "filter-form"
|
|
218
|
-
}, this.state.reFormItemGroup ? /*#__PURE__*/React.createElement(React.Fragment, null, this.renderFormItemGroup(), /*#__PURE__*/React.createElement(FormItem,
|
|
217
|
+
}, this.state.reFormItemGroup ? /*#__PURE__*/React.createElement(React.Fragment, null, this.renderFormItemGroup(), /*#__PURE__*/React.createElement(FormItem, {
|
|
218
|
+
style: {
|
|
219
|
+
display: !onFilterSearch && !onFilterReset ? 'none' : 'inline-block'
|
|
220
|
+
}
|
|
221
|
+
}, onFilterSearch && /*#__PURE__*/React.createElement(_Button, {
|
|
219
222
|
type: "primary",
|
|
220
223
|
htmlType: "submit"
|
|
221
224
|
}, " ", confirmText || '查询'), onFilterReset && /*#__PURE__*/React.createElement(_Button, {
|
|
@@ -7,19 +7,19 @@ import 'ant-design-draggable-modal/dist/index.css';
|
|
|
7
7
|
export interface StandardModalProps extends ModalProps {
|
|
8
8
|
children?: React.ReactNode;
|
|
9
9
|
title?: String;
|
|
10
|
-
type?: String;
|
|
10
|
+
type?: 'form' | 'tabForm' | 'gridForm' | String;
|
|
11
11
|
size?: any;
|
|
12
12
|
formItemGroup?: ItemGroupProps[];
|
|
13
13
|
formPrefix?: (modalForm?: any, props?: StandardModalProps, forceUpdateForm?: () => void) => React.ReactNode;
|
|
14
14
|
formPostfix?: (modalForm?: any, props?: StandardModalProps, forceUpdateForm?: () => void) => React.ReactNode;
|
|
15
15
|
onSubmit?: (values?: any) => void;
|
|
16
|
-
confirmText?:
|
|
17
|
-
cancelText?:
|
|
16
|
+
confirmText?: string;
|
|
17
|
+
cancelText?: string;
|
|
18
18
|
onCancel?: () => void;
|
|
19
19
|
afterClose?: () => void;
|
|
20
20
|
initialValues?: object;
|
|
21
21
|
getFormFields?: (fields: any, form: any) => void;
|
|
22
|
-
fieldStatus?: 'default' | 'viewOnly' | 'disabled';
|
|
22
|
+
fieldStatus?: 'default' | 'viewOnly' | 'disabled' | string;
|
|
23
23
|
formLayout?: 'horizontal' | 'vertical' | 'inline';
|
|
24
24
|
tabsConfig?: any;
|
|
25
25
|
stepsConfig?: any;
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import "antd/es/modal/style";
|
|
2
2
|
import _Modal from "antd/es/modal";
|
|
3
|
-
import "antd/es/row/style";
|
|
4
|
-
import _Row from "antd/es/row";
|
|
5
3
|
import "antd/es/button/style";
|
|
6
4
|
import _Button from "antd/es/button";
|
|
5
|
+
import "antd/es/col/style";
|
|
6
|
+
import _Col from "antd/es/col";
|
|
7
|
+
import "antd/es/row/style";
|
|
8
|
+
import _Row from "antd/es/row";
|
|
7
9
|
import "antd/es/form/style";
|
|
8
10
|
import _Form from "antd/es/form";
|
|
9
11
|
|
|
@@ -115,7 +117,13 @@ var StandardModal = function StandardModal(props) {
|
|
|
115
117
|
}
|
|
116
118
|
|
|
117
119
|
if (fieldStatus && fieldStatus !== 'default') {
|
|
118
|
-
|
|
120
|
+
if (props.hasOwnProperty('footerButtonGroup')) {
|
|
121
|
+
// 如果有配置按钮组件,则还是要显示按钮
|
|
122
|
+
return true;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
openLog && console.log('rule 2'); // disabled/viewOnly都不显示按钮
|
|
126
|
+
|
|
119
127
|
return false;
|
|
120
128
|
}
|
|
121
129
|
|
|
@@ -151,7 +159,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
151
159
|
var initBodyMaxHeight = function initBodyMaxHeight() {
|
|
152
160
|
var title = props.title;
|
|
153
161
|
var bodyHeight = document.body.offsetHeight;
|
|
154
|
-
var baseReduce =
|
|
162
|
+
var baseReduce = 80 + 32; // 默认需要减去的高度(上下空白间距150及内部内容间距16*2
|
|
155
163
|
// console.log('弹窗是否有按钮:', hasFooterBar ? '是' : '否')
|
|
156
164
|
|
|
157
165
|
setBodyMaxHeight("".concat(bodyHeight - (title ? 55 : 0) - (hasFooterBar ? 55 : 0) - baseReduce, "px")); // setBodyMaxHeight(`${bodyHeight - (title ? 55 : 0) - ((footer || footerButtonGroup) ? 55 : 0) - baseReduce +
|
|
@@ -206,7 +214,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
206
214
|
} // console.error('表单填写有误', errorInfo, '第一条数据',errorInfo.errorFields[0].name[0])
|
|
207
215
|
|
|
208
216
|
});
|
|
209
|
-
} else if (type === 'stepForm' || type === 'tabForm') {
|
|
217
|
+
} else if (type === 'stepForm' || type === 'tabForm' || type === 'gridForm') {
|
|
210
218
|
// onSubmit && onSubmit()
|
|
211
219
|
formChild.validateFields().then(function (values) {
|
|
212
220
|
// console.log(values)
|
|
@@ -262,9 +270,42 @@ var StandardModal = function StandardModal(props) {
|
|
|
262
270
|
var fieldStatus = props.fieldStatus,
|
|
263
271
|
formItemGroup = props.formItemGroup,
|
|
264
272
|
_props$size2 = props.size,
|
|
265
|
-
size = _props$size2 === void 0 ? 'md' : _props$size2
|
|
273
|
+
size = _props$size2 === void 0 ? 'md' : _props$size2,
|
|
274
|
+
type = props.type;
|
|
266
275
|
|
|
267
276
|
if (Array.isArray(formItemGroup)) {
|
|
277
|
+
if (type === 'gridForm') {
|
|
278
|
+
// 栅格组
|
|
279
|
+
return /*#__PURE__*/React.createElement(_Row, {
|
|
280
|
+
gutter: 20
|
|
281
|
+
}, formItemGroup.map(function (item, index) {
|
|
282
|
+
var childrenFields = item.fields || [];
|
|
283
|
+
|
|
284
|
+
if (item.label) {
|
|
285
|
+
childrenFields = [{
|
|
286
|
+
type: item.type,
|
|
287
|
+
label: item.label,
|
|
288
|
+
protoConfig: Object.assign({}, item.protoConfig)
|
|
289
|
+
}].concat(childrenFields);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
return /*#__PURE__*/React.createElement(_Col, {
|
|
293
|
+
key: index,
|
|
294
|
+
span: item.gridSpan || 24
|
|
295
|
+
}, /*#__PURE__*/React.createElement(RenderItemGroup, {
|
|
296
|
+
size: size,
|
|
297
|
+
layout: formLayout,
|
|
298
|
+
doUpdateFormFields: function doUpdateFormFields() {
|
|
299
|
+
return forceUpdateForm();
|
|
300
|
+
},
|
|
301
|
+
displayLayout: item.displayLayout || displayLayout,
|
|
302
|
+
itemGroup: childrenFields,
|
|
303
|
+
fieldStatus: fieldStatus,
|
|
304
|
+
form: modalForm
|
|
305
|
+
}));
|
|
306
|
+
}));
|
|
307
|
+
}
|
|
308
|
+
|
|
268
309
|
return /*#__PURE__*/React.createElement(RenderItemGroup, {
|
|
269
310
|
size: size,
|
|
270
311
|
layout: formLayout,
|
|
@@ -372,7 +413,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
372
413
|
if (footer) return footer;
|
|
373
414
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, Object.assign({
|
|
374
415
|
key: "submit",
|
|
375
|
-
type:
|
|
416
|
+
type: 'primary',
|
|
376
417
|
loading: confirmLoading,
|
|
377
418
|
onClick: handleSubmit
|
|
378
419
|
}, confirmButtonProps, okButtonProps), confirmText || okText || '确定'), /*#__PURE__*/React.createElement(_Button, Object.assign({
|
|
@@ -410,7 +451,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
410
451
|
|
|
411
452
|
|
|
412
453
|
var renderChildrenNodes = function renderChildrenNodes() {
|
|
413
|
-
return /*#__PURE__*/React.createElement(React.Fragment, null, children, type === 'form' && /*#__PURE__*/React.createElement(_Form, {
|
|
454
|
+
return /*#__PURE__*/React.createElement(React.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/React.createElement(_Form, {
|
|
414
455
|
layout: formLayout,
|
|
415
456
|
ref: setModalFormRef,
|
|
416
457
|
form: modalForm,
|
|
@@ -475,7 +516,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
475
516
|
maskClosable: false,
|
|
476
517
|
width: general.modalSize[size].width
|
|
477
518
|
}, otherProps, {
|
|
478
|
-
|
|
519
|
+
open: visible,
|
|
479
520
|
title: title,
|
|
480
521
|
footer: renderFooter(),
|
|
481
522
|
className: "standardModal ".concat(className || '', " ").concat(fieldStatus === 'viewOnly' ? 'is-view' : ''),
|
|
@@ -48,3 +48,28 @@
|
|
|
48
48
|
.ant-picker-range-separator {
|
|
49
49
|
padding: 0 2px;
|
|
50
50
|
}
|
|
51
|
+
.modalGridTitle,
|
|
52
|
+
.modal-grid-title{
|
|
53
|
+
height: 32px;
|
|
54
|
+
margin: 0 0 @padding-md 0;
|
|
55
|
+
padding-bottom: @padding-xs;
|
|
56
|
+
padding-left: @padding-xs;
|
|
57
|
+
color: @text-color;
|
|
58
|
+
font-size: @font-size-base + 1;
|
|
59
|
+
font-weight: bold;
|
|
60
|
+
line-height: 32px;
|
|
61
|
+
position: relative;
|
|
62
|
+
&.modalPanelTitle {
|
|
63
|
+
border-bottom: 0;
|
|
64
|
+
}
|
|
65
|
+
&:before {
|
|
66
|
+
content: '';
|
|
67
|
+
display: inline-block;
|
|
68
|
+
position: absolute;
|
|
69
|
+
left:0;
|
|
70
|
+
top: 50%;
|
|
71
|
+
transform: translateY(-50%);
|
|
72
|
+
height: 18px;
|
|
73
|
+
border-left: 4px solid @primary-color;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
@@ -130,7 +130,17 @@ var getParentNodes = function getParentNodes(list, nodeKey) {
|
|
|
130
130
|
parentKeys: parentKeys,
|
|
131
131
|
matchNode: matchNode
|
|
132
132
|
}; // 最终查找到的父节点数组 // nodeParent.concat(result || []);
|
|
133
|
-
};
|
|
133
|
+
};
|
|
134
|
+
/**
|
|
135
|
+
* @description 递归查找指定ID所有的子菜单与子功能集合
|
|
136
|
+
* @params {Array} childNode 当前需要过滤查看的数据集合、
|
|
137
|
+
* @params {Object} params 指定当前数据中,筛选对应子集合字段名及匹配标识值字段名
|
|
138
|
+
* (childrenParam:指当前子集合数据字段名(字符串表示单个,数组表示当前多个子集合字段名),keyParam: 指当前匹配标识值字段名)
|
|
139
|
+
* @params {Object} extra
|
|
140
|
+
*
|
|
141
|
+
* @result {Array} childKeys 所有子项的id
|
|
142
|
+
* @result {Array} nodeChildren 当前传入nodeKey值所在的数据对象集合
|
|
143
|
+
* */
|
|
134
144
|
|
|
135
145
|
|
|
136
146
|
var getChildrenNodes = function getChildrenNodes(childNode) {
|
|
@@ -166,7 +166,7 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
|
|
|
166
166
|
|
|
167
167
|
if (Array.isArray(value)) {
|
|
168
168
|
return selectNodeInfo.matchNode.length > 0 ? selectNodeInfo.matchNode.map(function (item) {
|
|
169
|
-
return item[treeOptionName.title];
|
|
169
|
+
return item[treeOptionName.title] || item[treeOptionName.value];
|
|
170
170
|
}).join(',') : null;
|
|
171
171
|
}
|
|
172
172
|
|
|
@@ -26,7 +26,7 @@ interface displayLayoutProps extends layoutProps {
|
|
|
26
26
|
interface ItemGroupProps {
|
|
27
27
|
itemGroup: any | FieldsItemProps[];
|
|
28
28
|
size?: string;
|
|
29
|
-
fieldStatus?: 'default' | 'viewOnly' | 'disabled';
|
|
29
|
+
fieldStatus?: 'default' | 'viewOnly' | 'disabled' | string;
|
|
30
30
|
fieldSize?: 'large' | 'middle' | 'small' | any;
|
|
31
31
|
displayLayout?: displayLayoutProps;
|
|
32
32
|
form?: any;
|
|
@@ -213,9 +213,9 @@ var RenderItemGroup = function RenderItemGroup(props) {
|
|
|
213
213
|
|
|
214
214
|
return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? /*#__PURE__*/_react.default.createElement(_col.default, {
|
|
215
215
|
span: item.colSpan || 24
|
|
216
|
-
}, type === 'title' ? /*#__PURE__*/_react.default.createElement("h3", Object.assign({
|
|
217
|
-
className: "modalPanelTitle ".concat((_a = item === null || item === void 0 ? void 0 : item.protoConfig) === null || _a === void 0 ? void 0 : _a.className)
|
|
218
|
-
}
|
|
216
|
+
}, type === 'title' ? /*#__PURE__*/_react.default.createElement("h3", Object.assign({}, item.protoConfig, {
|
|
217
|
+
className: "modalPanelTitle ".concat(((_a = item === null || item === void 0 ? void 0 : item.protoConfig) === null || _a === void 0 ? void 0 : _a.className) || '')
|
|
218
|
+
}), label) : label) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, null);
|
|
219
219
|
});
|
|
220
220
|
} // 判断是否强制重新渲染表单
|
|
221
221
|
|
|
@@ -141,8 +141,6 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
|
|
|
141
141
|
itemGroup: reFormItemGroup,
|
|
142
142
|
layout: "inline",
|
|
143
143
|
form: _this.filterFormRef,
|
|
144
|
-
// fieldSize={fieldSize}
|
|
145
|
-
// displayLayout={displayLayout}
|
|
146
144
|
doUpdateFormFields: function doUpdateFormFields() {
|
|
147
145
|
return _this.forceUpdateForm();
|
|
148
146
|
}
|
|
@@ -218,7 +216,8 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
|
|
|
218
216
|
codes = _this$props2.codes,
|
|
219
217
|
permissionCodes = _this$props2.permissionCodes,
|
|
220
218
|
confirmText = _this$props2.confirmText,
|
|
221
|
-
cancelText = _this$props2.cancelText
|
|
219
|
+
cancelText = _this$props2.cancelText,
|
|
220
|
+
onFilterSearch = _this$props2.onFilterSearch; // const { recombinationGroup } = this.state;
|
|
222
221
|
|
|
223
222
|
return /*#__PURE__*/_react.default.createElement(_form.default, {
|
|
224
223
|
name: "standard-filter-form",
|
|
@@ -231,7 +230,11 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
|
|
|
231
230
|
className: "filter-grid"
|
|
232
231
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
233
232
|
className: "filter-form"
|
|
234
|
-
}, this.state.reFormItemGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, this.renderFormItemGroup(), /*#__PURE__*/_react.default.createElement(FormItem,
|
|
233
|
+
}, this.state.reFormItemGroup ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, this.renderFormItemGroup(), /*#__PURE__*/_react.default.createElement(FormItem, {
|
|
234
|
+
style: {
|
|
235
|
+
display: !onFilterSearch && !onFilterReset ? 'none' : 'inline-block'
|
|
236
|
+
}
|
|
237
|
+
}, onFilterSearch && /*#__PURE__*/_react.default.createElement(_button.default, {
|
|
235
238
|
type: "primary",
|
|
236
239
|
htmlType: "submit"
|
|
237
240
|
}, " ", confirmText || '查询'), onFilterReset && /*#__PURE__*/_react.default.createElement(_button.default, {
|
|
@@ -7,19 +7,19 @@ import 'ant-design-draggable-modal/dist/index.css';
|
|
|
7
7
|
export interface StandardModalProps extends ModalProps {
|
|
8
8
|
children?: React.ReactNode;
|
|
9
9
|
title?: String;
|
|
10
|
-
type?: String;
|
|
10
|
+
type?: 'form' | 'tabForm' | 'gridForm' | String;
|
|
11
11
|
size?: any;
|
|
12
12
|
formItemGroup?: ItemGroupProps[];
|
|
13
13
|
formPrefix?: (modalForm?: any, props?: StandardModalProps, forceUpdateForm?: () => void) => React.ReactNode;
|
|
14
14
|
formPostfix?: (modalForm?: any, props?: StandardModalProps, forceUpdateForm?: () => void) => React.ReactNode;
|
|
15
15
|
onSubmit?: (values?: any) => void;
|
|
16
|
-
confirmText?:
|
|
17
|
-
cancelText?:
|
|
16
|
+
confirmText?: string;
|
|
17
|
+
cancelText?: string;
|
|
18
18
|
onCancel?: () => void;
|
|
19
19
|
afterClose?: () => void;
|
|
20
20
|
initialValues?: object;
|
|
21
21
|
getFormFields?: (fields: any, form: any) => void;
|
|
22
|
-
fieldStatus?: 'default' | 'viewOnly' | 'disabled';
|
|
22
|
+
fieldStatus?: 'default' | 'viewOnly' | 'disabled' | string;
|
|
23
23
|
formLayout?: 'horizontal' | 'vertical' | 'inline';
|
|
24
24
|
tabsConfig?: any;
|
|
25
25
|
stepsConfig?: any;
|
|
@@ -9,14 +9,18 @@ require("antd/es/modal/style");
|
|
|
9
9
|
|
|
10
10
|
var _modal = _interopRequireDefault(require("antd/es/modal"));
|
|
11
11
|
|
|
12
|
-
require("antd/es/row/style");
|
|
13
|
-
|
|
14
|
-
var _row = _interopRequireDefault(require("antd/es/row"));
|
|
15
|
-
|
|
16
12
|
require("antd/es/button/style");
|
|
17
13
|
|
|
18
14
|
var _button = _interopRequireDefault(require("antd/es/button"));
|
|
19
15
|
|
|
16
|
+
require("antd/es/col/style");
|
|
17
|
+
|
|
18
|
+
var _col = _interopRequireDefault(require("antd/es/col"));
|
|
19
|
+
|
|
20
|
+
require("antd/es/row/style");
|
|
21
|
+
|
|
22
|
+
var _row = _interopRequireDefault(require("antd/es/row"));
|
|
23
|
+
|
|
20
24
|
require("antd/es/form/style");
|
|
21
25
|
|
|
22
26
|
var _form = _interopRequireDefault(require("antd/es/form"));
|
|
@@ -146,7 +150,13 @@ var StandardModal = function StandardModal(props) {
|
|
|
146
150
|
}
|
|
147
151
|
|
|
148
152
|
if (fieldStatus && fieldStatus !== 'default') {
|
|
149
|
-
|
|
153
|
+
if (props.hasOwnProperty('footerButtonGroup')) {
|
|
154
|
+
// 如果有配置按钮组件,则还是要显示按钮
|
|
155
|
+
return true;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
openLog && console.log('rule 2'); // disabled/viewOnly都不显示按钮
|
|
159
|
+
|
|
150
160
|
return false;
|
|
151
161
|
}
|
|
152
162
|
|
|
@@ -182,7 +192,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
182
192
|
var initBodyMaxHeight = function initBodyMaxHeight() {
|
|
183
193
|
var title = props.title;
|
|
184
194
|
var bodyHeight = document.body.offsetHeight;
|
|
185
|
-
var baseReduce =
|
|
195
|
+
var baseReduce = 80 + 32; // 默认需要减去的高度(上下空白间距150及内部内容间距16*2
|
|
186
196
|
// console.log('弹窗是否有按钮:', hasFooterBar ? '是' : '否')
|
|
187
197
|
|
|
188
198
|
setBodyMaxHeight("".concat(bodyHeight - (title ? 55 : 0) - (hasFooterBar ? 55 : 0) - baseReduce, "px")); // setBodyMaxHeight(`${bodyHeight - (title ? 55 : 0) - ((footer || footerButtonGroup) ? 55 : 0) - baseReduce +
|
|
@@ -237,7 +247,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
237
247
|
} // console.error('表单填写有误', errorInfo, '第一条数据',errorInfo.errorFields[0].name[0])
|
|
238
248
|
|
|
239
249
|
});
|
|
240
|
-
} else if (type === 'stepForm' || type === 'tabForm') {
|
|
250
|
+
} else if (type === 'stepForm' || type === 'tabForm' || type === 'gridForm') {
|
|
241
251
|
// onSubmit && onSubmit()
|
|
242
252
|
formChild.validateFields().then(function (values) {
|
|
243
253
|
// console.log(values)
|
|
@@ -293,9 +303,42 @@ var StandardModal = function StandardModal(props) {
|
|
|
293
303
|
var fieldStatus = props.fieldStatus,
|
|
294
304
|
formItemGroup = props.formItemGroup,
|
|
295
305
|
_props$size2 = props.size,
|
|
296
|
-
size = _props$size2 === void 0 ? 'md' : _props$size2
|
|
306
|
+
size = _props$size2 === void 0 ? 'md' : _props$size2,
|
|
307
|
+
type = props.type;
|
|
297
308
|
|
|
298
309
|
if (Array.isArray(formItemGroup)) {
|
|
310
|
+
if (type === 'gridForm') {
|
|
311
|
+
// 栅格组
|
|
312
|
+
return /*#__PURE__*/_react.default.createElement(_row.default, {
|
|
313
|
+
gutter: 20
|
|
314
|
+
}, formItemGroup.map(function (item, index) {
|
|
315
|
+
var childrenFields = item.fields || [];
|
|
316
|
+
|
|
317
|
+
if (item.label) {
|
|
318
|
+
childrenFields = [{
|
|
319
|
+
type: item.type,
|
|
320
|
+
label: item.label,
|
|
321
|
+
protoConfig: Object.assign({}, item.protoConfig)
|
|
322
|
+
}].concat(childrenFields);
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
return /*#__PURE__*/_react.default.createElement(_col.default, {
|
|
326
|
+
key: index,
|
|
327
|
+
span: item.gridSpan || 24
|
|
328
|
+
}, /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
|
|
329
|
+
size: size,
|
|
330
|
+
layout: formLayout,
|
|
331
|
+
doUpdateFormFields: function doUpdateFormFields() {
|
|
332
|
+
return forceUpdateForm();
|
|
333
|
+
},
|
|
334
|
+
displayLayout: item.displayLayout || displayLayout,
|
|
335
|
+
itemGroup: childrenFields,
|
|
336
|
+
fieldStatus: fieldStatus,
|
|
337
|
+
form: modalForm
|
|
338
|
+
}));
|
|
339
|
+
}));
|
|
340
|
+
}
|
|
341
|
+
|
|
299
342
|
return /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
|
|
300
343
|
size: size,
|
|
301
344
|
layout: formLayout,
|
|
@@ -401,7 +444,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
401
444
|
if (footer) return footer;
|
|
402
445
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
|
|
403
446
|
key: "submit",
|
|
404
|
-
type:
|
|
447
|
+
type: 'primary',
|
|
405
448
|
loading: confirmLoading,
|
|
406
449
|
onClick: handleSubmit
|
|
407
450
|
}, confirmButtonProps, okButtonProps), confirmText || okText || '确定'), /*#__PURE__*/_react.default.createElement(_button.default, Object.assign({
|
|
@@ -439,7 +482,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
439
482
|
|
|
440
483
|
|
|
441
484
|
var renderChildrenNodes = function renderChildrenNodes() {
|
|
442
|
-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, type === 'form' && /*#__PURE__*/_react.default.createElement(_form.default, {
|
|
485
|
+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, (type === 'form' || type === 'gridForm') && /*#__PURE__*/_react.default.createElement(_form.default, {
|
|
443
486
|
layout: formLayout,
|
|
444
487
|
ref: setModalFormRef,
|
|
445
488
|
form: modalForm,
|
|
@@ -504,7 +547,7 @@ var StandardModal = function StandardModal(props) {
|
|
|
504
547
|
maskClosable: false,
|
|
505
548
|
width: _data.general.modalSize[size].width
|
|
506
549
|
}, otherProps, {
|
|
507
|
-
|
|
550
|
+
open: visible,
|
|
508
551
|
title: title,
|
|
509
552
|
footer: renderFooter(),
|
|
510
553
|
className: "standardModal ".concat(className || '', " ").concat(fieldStatus === 'viewOnly' ? 'is-view' : ''),
|
|
@@ -48,3 +48,28 @@
|
|
|
48
48
|
.ant-picker-range-separator {
|
|
49
49
|
padding: 0 2px;
|
|
50
50
|
}
|
|
51
|
+
.modalGridTitle,
|
|
52
|
+
.modal-grid-title{
|
|
53
|
+
height: 32px;
|
|
54
|
+
margin: 0 0 @padding-md 0;
|
|
55
|
+
padding-bottom: @padding-xs;
|
|
56
|
+
padding-left: @padding-xs;
|
|
57
|
+
color: @text-color;
|
|
58
|
+
font-size: @font-size-base + 1;
|
|
59
|
+
font-weight: bold;
|
|
60
|
+
line-height: 32px;
|
|
61
|
+
position: relative;
|
|
62
|
+
&.modalPanelTitle {
|
|
63
|
+
border-bottom: 0;
|
|
64
|
+
}
|
|
65
|
+
&:before {
|
|
66
|
+
content: '';
|
|
67
|
+
display: inline-block;
|
|
68
|
+
position: absolute;
|
|
69
|
+
left:0;
|
|
70
|
+
top: 50%;
|
|
71
|
+
transform: translateY(-50%);
|
|
72
|
+
height: 18px;
|
|
73
|
+
border-left: 4px solid @primary-color;
|
|
74
|
+
}
|
|
75
|
+
}
|
|
@@ -137,7 +137,17 @@ var getParentNodes = function getParentNodes(list, nodeKey) {
|
|
|
137
137
|
parentKeys: parentKeys,
|
|
138
138
|
matchNode: matchNode
|
|
139
139
|
}; // 最终查找到的父节点数组 // nodeParent.concat(result || []);
|
|
140
|
-
};
|
|
140
|
+
};
|
|
141
|
+
/**
|
|
142
|
+
* @description 递归查找指定ID所有的子菜单与子功能集合
|
|
143
|
+
* @params {Array} childNode 当前需要过滤查看的数据集合、
|
|
144
|
+
* @params {Object} params 指定当前数据中,筛选对应子集合字段名及匹配标识值字段名
|
|
145
|
+
* (childrenParam:指当前子集合数据字段名(字符串表示单个,数组表示当前多个子集合字段名),keyParam: 指当前匹配标识值字段名)
|
|
146
|
+
* @params {Object} extra
|
|
147
|
+
*
|
|
148
|
+
* @result {Array} childKeys 所有子项的id
|
|
149
|
+
* @result {Array} nodeChildren 当前传入nodeKey值所在的数据对象集合
|
|
150
|
+
* */
|
|
141
151
|
|
|
142
152
|
|
|
143
153
|
exports.getParentNodes = getParentNodes;
|