fmui-base 2.3.45 → 2.3.46
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/README.md +1 -0
- package/lib/form/subForm.js +17 -8
- package/lib/form/table.js +2 -2
- package/lib/process_info/processInfo.js +5 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/subForm.js
CHANGED
|
@@ -83,10 +83,18 @@ var PageHome = function (_React$Component) {
|
|
|
83
83
|
return _this;
|
|
84
84
|
}
|
|
85
85
|
|
|
86
|
-
|
|
86
|
+
// 移动端子表默认展开态：1/缺省展开，0收起
|
|
87
87
|
|
|
88
88
|
|
|
89
89
|
_createClass(PageHome, [{
|
|
90
|
+
key: 'getDefaultShow',
|
|
91
|
+
value: function getDefaultShow() {
|
|
92
|
+
return this.props.mobileSubTblDefault !== '0';
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
//流程控制表单字段显示
|
|
96
|
+
|
|
97
|
+
}, {
|
|
90
98
|
key: 'fieldControllFormat',
|
|
91
99
|
value: function fieldControllFormat(field, fieldControll) {
|
|
92
100
|
// let isHidden = null;
|
|
@@ -190,7 +198,7 @@ var PageHome = function (_React$Component) {
|
|
|
190
198
|
var value = this.dealwithSubForm(subForm, itemParam, subTbl, relatedTbl);
|
|
191
199
|
data.subTbl = subTbl;
|
|
192
200
|
data.relatedTbl = relatedTbl;
|
|
193
|
-
itemParam.show =
|
|
201
|
+
itemParam.show = this.getDefaultShow();
|
|
194
202
|
itemParam.value = value;
|
|
195
203
|
itemParam.detailAction = form.detailAction; //添加事件名字
|
|
196
204
|
// 流程 flow_common / 纯表单 form_common + mobileExt（可设置 itemParam.subColumnCount 等）
|
|
@@ -225,6 +233,7 @@ var PageHome = function (_React$Component) {
|
|
|
225
233
|
var itemCode = itemParam.key;
|
|
226
234
|
var fieldControll = itemParam.fieldControll;
|
|
227
235
|
var subtableReadonly = itemParam.subtableReadonly === true;
|
|
236
|
+
var defaultShow = this.getDefaultShow();
|
|
228
237
|
var mustFields = "";
|
|
229
238
|
if (fieldControll) {
|
|
230
239
|
mustFields = fieldControll.mustFields;
|
|
@@ -249,11 +258,11 @@ var PageHome = function (_React$Component) {
|
|
|
249
258
|
if (subTblData.length > 0) {
|
|
250
259
|
for (var j = 0; j < subTblData.length; j++) {
|
|
251
260
|
value.push({ mainTblData: subTblData[j], mainTblName: itemCode });
|
|
252
|
-
var subForm1 = { show:
|
|
261
|
+
var subForm1 = { show: defaultShow, form: subForm };
|
|
253
262
|
subFormList.push(subForm1);
|
|
254
263
|
}
|
|
255
264
|
} else if (!subtableReadonly) {
|
|
256
|
-
var subForm2 = { show:
|
|
265
|
+
var subForm2 = { show: defaultShow, form: subForm };
|
|
257
266
|
value.push({ mainTblData: [], mainTblName: itemCode });
|
|
258
267
|
subFormList.push(subForm2);
|
|
259
268
|
}
|
|
@@ -271,11 +280,11 @@ var PageHome = function (_React$Component) {
|
|
|
271
280
|
if (subTblData.length > 0) {
|
|
272
281
|
for (var j = 0; j < subTblData.length; j++) {
|
|
273
282
|
value.push({ mainTblData: subTblData[j], mainTblName: itemCode });
|
|
274
|
-
var subForm1 = { show:
|
|
283
|
+
var subForm1 = { show: defaultShow, form: subForm };
|
|
275
284
|
subFormList.push(subForm1);
|
|
276
285
|
}
|
|
277
286
|
} else if (!subtableReadonly) {
|
|
278
|
-
var subForm2 = { show:
|
|
287
|
+
var subForm2 = { show: defaultShow, form: subForm };
|
|
279
288
|
value.push({ mainTblData: [], mainTblName: itemCode });
|
|
280
289
|
subFormList.push(subForm2);
|
|
281
290
|
}
|
|
@@ -292,7 +301,7 @@ var PageHome = function (_React$Component) {
|
|
|
292
301
|
subTbl.push({ subTblData: [], subTblName: itemCode });
|
|
293
302
|
}
|
|
294
303
|
} else if (relatedTbl && relatedTbl.length > 0) {
|
|
295
|
-
var subForm3 = { show:
|
|
304
|
+
var subForm3 = { show: defaultShow, form: subForm };
|
|
296
305
|
subFormList.push(subForm3);
|
|
297
306
|
itemParam.subForm = subFormList;
|
|
298
307
|
value.push({ mainTblData: [], mainTblName: itemCode });
|
|
@@ -310,7 +319,7 @@ var PageHome = function (_React$Component) {
|
|
|
310
319
|
subTbl.push({ subTblData: [], subTblName: itemCode });
|
|
311
320
|
}
|
|
312
321
|
} else {
|
|
313
|
-
var subForm3 = { show:
|
|
322
|
+
var subForm3 = { show: defaultShow, form: subForm };
|
|
314
323
|
subFormList.push(subForm3);
|
|
315
324
|
itemParam.subForm = subFormList;
|
|
316
325
|
value.push({ mainTblData: [], mainTblName: itemCode });
|
package/lib/form/table.js
CHANGED
|
@@ -2577,7 +2577,7 @@ var PageHome = function (_React$Component) {
|
|
|
2577
2577
|
}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
|
|
2578
2578
|
'div',
|
|
2579
2579
|
{ className: "subform_" + item.itemCode },
|
|
2580
|
-
_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this) })
|
|
2580
|
+
_react2.default.createElement(_subForm2.default, { keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), mobileSubTblDefault: t.props.mobileSubTblDefault, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentField: t.props.commentField, commentAttitude: t.props.commentAttitude, module: t.props.module, formKey: t.props.allForm.formcode, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, commentList: t.props.commentFieldList, defaultValue: t.props.defaultValue, data: t.props.data, fieldControll: t.props.fieldControll, caIsPrd: t.props.caIsPrd, preCaFields: t.props.preCaFields, formRelaFieldMaps: t.state.formRelaFieldMaps, linkFields: t.state.linkFields, isRemoveCommentFormHtml: t.props.isRemoveCommentFormHtml, inscriptionShow: t.props.inscriptionShow, onChange: this.change.bind(this) })
|
|
2581
2581
|
) : _react2.default.createElement(
|
|
2582
2582
|
'div',
|
|
2583
2583
|
{ className: "form_" + item.uniqueName },
|
|
@@ -2613,7 +2613,7 @@ var PageHome = function (_React$Component) {
|
|
|
2613
2613
|
}.bind(this)) : item.itemType == 'detail' ? _react2.default.createElement(
|
|
2614
2614
|
'div',
|
|
2615
2615
|
{ className: t.state.active == item.tabCode ? "" : "t-DN" },
|
|
2616
|
-
_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
|
|
2616
|
+
_react2.default.createElement(_subForm2.default, { className: "subform_" + item.itemCode, keyNo: i, ref: 'sub_' + item.itemCode, subColumnCount: t.getSubColumnCount(item), mobileSubTblDefault: t.props.mobileSubTblDefault, operate: t.props.operate, newspyj: t.props.newspyj, hasCommentField: t.props.hasCommentField, commentUpload: t.props.commentUpload, commentAttitude: t.props.commentAttitude, commentField: t.props.commentField, module: t.props.module, formKey: t.props.allForm.formcode, isCaUser: t.props.isCaUser, caFirm: t.props.caFirm, caESignatureName: t.props.caESignatureName, caFormSign: t.props.caFormSign, status: t.props.status, form: item, allForm: t.props.allForm, formStyle: t.props.formStyleObj, commentList: t.props.commentFieldList, inscriptionShow: t.props.inscriptionShow, data: t.props.data, fieldControll: t.props.fieldControll, onChange: this.change.bind(this) })
|
|
2617
2617
|
) : _react2.default.createElement(
|
|
2618
2618
|
'div',
|
|
2619
2619
|
{ className: t.state.active == item.tabCode ? "" : "t-DN" },
|
|
@@ -511,6 +511,7 @@ var PageHome = function (_React$Component) {
|
|
|
511
511
|
titleCommentBackAlert: '退回原因',
|
|
512
512
|
endSelect: false,
|
|
513
513
|
mobileFlowChar: '0', //是否开启流程图 1开启 0禁用
|
|
514
|
+
mobileSubTblDefault: '1', //移动端子表默认 1展开 0收起；未设置按展开
|
|
514
515
|
readScopeId: '',
|
|
515
516
|
readScopeList: [],
|
|
516
517
|
readRangeType: '', //传阅范围 0全部 2本组织及下属组织 4自定义
|
|
@@ -983,6 +984,8 @@ var PageHome = function (_React$Component) {
|
|
|
983
984
|
var formStyleObj = form.formStyle;
|
|
984
985
|
|
|
985
986
|
var mobileFlowChar = content.mobileFlowChar;
|
|
987
|
+
// 移动端子表默认：1展开 0收起；缺省按展开
|
|
988
|
+
var mobileSubTblDefault = content.mobileSubTblDefault != null && content.mobileSubTblDefault !== '' ? String(content.mobileSubTblDefault) : '1';
|
|
986
989
|
|
|
987
990
|
//项目开发模块统一扩展
|
|
988
991
|
var mobileModuleExt;
|
|
@@ -1604,6 +1607,7 @@ var PageHome = function (_React$Component) {
|
|
|
1604
1607
|
formRelaField: formRelaField,
|
|
1605
1608
|
dealReminderContent: dealReminderContent,
|
|
1606
1609
|
mobileFlowChar: mobileFlowChar,
|
|
1610
|
+
mobileSubTblDefault: mobileSubTblDefault,
|
|
1607
1611
|
readScopeId: readScopeId,
|
|
1608
1612
|
readScopeList: readScopeList,
|
|
1609
1613
|
readRangeType: readRangeType,
|
|
@@ -8828,7 +8832,7 @@ var PageHome = function (_React$Component) {
|
|
|
8828
8832
|
_react2.default.createElement(
|
|
8829
8833
|
_Group2.default.List,
|
|
8830
8834
|
null,
|
|
8831
|
-
this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { key: 'approveFormTable_' + this.state.formTableKey, ref: 'approveFormTable', module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, subColumnCount: t.state.subColumnCount, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
|
|
8835
|
+
this.state.tableStatus == '0' ? "" : _react2.default.createElement(_table2.default, { key: 'approveFormTable_' + this.state.formTableKey, ref: 'approveFormTable', module: this.state.module, operate: this.state.operate, editType: this.state.editType, dataId: this.state.dataId, hasCommentField: t.state.hasCommentField, newspyj: t.state.newspyj, commentField: t.state.commentField, commentAttitude: t.state.commentAttitude, status: t.state.status, form: t.state.formItem, formStyleObj: t.state.formStyleObj, subColumnCount: t.state.subColumnCount, mobileSubTblDefault: t.state.mobileSubTblDefault, allForm: t.state.form, data: t.state.editFormData, commentFieldList: t.state.commentFieldList, defaultValue: t.state.defaultValue, commentDefaultList: t.state.commentDefaultList, commentBackList: t.state.commentBackList, fieldControll: t.state.fieldControll, caIsPrd: t.state.caIsPrd, preCaFields: t.state.preCaFields, formRelaField: t.state.formRelaField, isRemoveCommentFormHtml: t.state.isRemoveCommentFormHtml, commentUpload: t.state.commentUpload, isCaUser: t.state.isCaUser, caFirm: t.state.caFirm, caESignatureName: t.state.caESignatureName, caFormSign: t.state.caFormSign, inscriptionShow: t.state.inscriptionShow, onChange: this.change.bind(this) })
|
|
8832
8836
|
)
|
|
8833
8837
|
)
|
|
8834
8838
|
)
|