fmui-base 2.1.25 → 2.1.27
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 +2 -0
- package/lib/form/subForm.js +13 -0
- package/lib/process_list/processList.js +3 -1
- package/lib/selectMember/select.js +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
package/lib/form/subForm.js
CHANGED
|
@@ -136,6 +136,7 @@ var PageHome = function (_React$Component) {
|
|
|
136
136
|
}, {
|
|
137
137
|
key: 'loadComponet',
|
|
138
138
|
value: function loadComponet() {
|
|
139
|
+
console.log("sub===loadComponet===");
|
|
139
140
|
var t = this;
|
|
140
141
|
var module = this.props.module;
|
|
141
142
|
var formKey = this.props.formKey; //表单code
|
|
@@ -224,6 +225,18 @@ var PageHome = function (_React$Component) {
|
|
|
224
225
|
console.log("===dealwithSubForm===");
|
|
225
226
|
var subFormList = [];
|
|
226
227
|
var itemCode = itemParam.key;
|
|
228
|
+
var fieldControll = itemParam.fieldControll;
|
|
229
|
+
var mustFields = "";
|
|
230
|
+
if (fieldControll) {
|
|
231
|
+
mustFields = fieldControll.mustFields;
|
|
232
|
+
if (mustFields && mustFields != "") {
|
|
233
|
+
for (var i = 0; i < subForm.length; i++) {
|
|
234
|
+
if (mustFields.split(",").indexOf(subForm[i].uniqueName) != -1) {
|
|
235
|
+
subForm[i].valid = "true";
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
227
240
|
var value = [];
|
|
228
241
|
if (relatedTbl && relatedTbl.length > 0) {
|
|
229
242
|
for (var i = 0; i < relatedTbl.length; i++) {
|
|
@@ -142,7 +142,9 @@ var ListItem = function (_React$Component) {
|
|
|
142
142
|
fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetcost/").split('?_')[0].split('/approval/all')[0];
|
|
143
143
|
} else if (module == 'bud_project') {
|
|
144
144
|
fullUrl = fullUrl.replace("/" + projectPath + "/", "/budget/budgetproject/").split('?_')[0].split('/approval/all')[0];
|
|
145
|
-
} else if (module.indexOf("
|
|
145
|
+
} else if (module.indexOf("dj_") != '-1' || module.indexOf("jj_") != '-1' || module.indexOf("zdh_") != '-1' || module.indexOf("gh_") != '-1') {
|
|
146
|
+
fullUrl = fullUrl.split('?_')[0].split('/approval/all')[0];
|
|
147
|
+
} else if (module.indexOf("hoa_") != '-1') {
|
|
146
148
|
var category = module.split("_")[0];
|
|
147
149
|
mobilePath = module.substring(module.indexOf("_") + 1);
|
|
148
150
|
fullUrl = fullUrl.replace("/" + projectPath + "/", "/" + category + "/" + mobilePath + "/").split('?_')[0].split('/approval/all')[0];
|
|
@@ -672,7 +672,7 @@ var Page = function (_React$Component) {
|
|
|
672
672
|
} else if (chooseObj.indexOf("politicalOutlook") >= 0) {
|
|
673
673
|
chooseType += ",politicalOutlook";
|
|
674
674
|
}
|
|
675
|
-
} else {
|
|
675
|
+
} else if (chooseType == "") {
|
|
676
676
|
// code = this.props.code;
|
|
677
677
|
if (code.indexOf("user") >= 0 && code.indexOf("org") >= 0) {
|
|
678
678
|
chooseType = "userAndOrg";
|