fmui-base 2.0.82 → 2.0.84
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/table.js +19 -4
- package/lib/process_batch/processBatch.js +23 -3
- package/package.json +1 -1
- package/lib/css/react_grid.css +0 -1013
- package/lib/react_grid/react_grid copy 1.js +0 -1670
- package/lib/react_grid/react_grid copy 2.js +0 -722
- package/lib/react_grid/react_grid copy 3.js +0 -1502
- package/lib/react_grid/react_grid copy 4.js +0 -1421
- package/lib/react_grid/react_grid copy 5.js +0 -1670
- package/lib/react_grid/react_grid copy.js +0 -1811
package/README.md
CHANGED
package/lib/form/table.js
CHANGED
|
@@ -831,15 +831,21 @@ var PageHome = function (_React$Component) {
|
|
|
831
831
|
value: function dealwithRelaField(formRelaFieldMapsObj, data, itemKey) {
|
|
832
832
|
var t = this;
|
|
833
833
|
if (formRelaFieldMapsObj && formRelaFieldMapsObj.length > 0) {
|
|
834
|
+
//解决同一字段 关联字段 编辑方式相同时冲突
|
|
835
|
+
var hideFlag = false;
|
|
836
|
+
var mustFlag = false;
|
|
837
|
+
var editFlag = false;
|
|
834
838
|
formRelaFieldMapsObj.map(function (formRelaFieldMapsObjItem) {
|
|
835
839
|
var triggerFieldVal = formRelaFieldMapsObjItem.triggerFieldVal;
|
|
836
840
|
var relaFieldTblName = formRelaFieldMapsObjItem.relaFieldTblName;
|
|
837
841
|
var editType = formRelaFieldMapsObjItem.editType;
|
|
838
842
|
if (relaFieldTblName) {
|
|
839
843
|
if (relaFieldTblName) var relaFieldTblNameArray = relaFieldTblName.split(",");
|
|
844
|
+
|
|
840
845
|
relaFieldTblNameArray.map(function (relaFieldTblNameArrayItem, index) {
|
|
841
846
|
var nowValue = "";
|
|
842
847
|
var mainTblData = data.mainTblData;
|
|
848
|
+
|
|
843
849
|
mainTblData.map(function (item) {
|
|
844
850
|
if (item.key == itemKey) {
|
|
845
851
|
nowValue = item.value;
|
|
@@ -857,18 +863,24 @@ var PageHome = function (_React$Component) {
|
|
|
857
863
|
relaFieldMap["key"] = "isHidden";
|
|
858
864
|
if (triggerFieldVal == nowValue) {
|
|
859
865
|
relaFieldMap["value"] = true;
|
|
860
|
-
|
|
866
|
+
hideFlag = true;
|
|
867
|
+
} else if (!hideFlag) {
|
|
861
868
|
relaFieldMap["value"] = false;
|
|
869
|
+
} else {
|
|
870
|
+
relaFieldMap["value"] = true;
|
|
862
871
|
}
|
|
863
872
|
} else if (editType == 'must') {
|
|
864
873
|
relaFieldMap["key"] = "required";
|
|
865
|
-
var triggerFieldValBoolean =
|
|
874
|
+
var triggerFieldValBoolean = mustFlag;
|
|
866
875
|
if (triggerFieldVal == nowValue) {
|
|
867
876
|
relaFieldMap["value"] = true;
|
|
868
877
|
triggerFieldValBoolean = true;
|
|
869
|
-
|
|
878
|
+
mustFlag = true;
|
|
879
|
+
} else if (!mustFlag) {
|
|
870
880
|
relaFieldMap["value"] = false;
|
|
871
881
|
triggerFieldValBoolean = false;
|
|
882
|
+
} else {
|
|
883
|
+
relaFieldMap["value"] = true;
|
|
872
884
|
}
|
|
873
885
|
var relaFieldNameArray = formRelaFieldMapsObjItem.relaFieldName.split(",");
|
|
874
886
|
mainTblData.map(function (item) {
|
|
@@ -880,8 +892,11 @@ var PageHome = function (_React$Component) {
|
|
|
880
892
|
relaFieldMap["key"] = "readOnly";
|
|
881
893
|
if (triggerFieldVal == nowValue) {
|
|
882
894
|
relaFieldMap["value"] = false;
|
|
883
|
-
|
|
895
|
+
editFlag = true;
|
|
896
|
+
} else if (!editFlag) {
|
|
884
897
|
relaFieldMap["value"] = true;
|
|
898
|
+
} else {
|
|
899
|
+
relaFieldMap["value"] = false;
|
|
885
900
|
}
|
|
886
901
|
}
|
|
887
902
|
t.refs[relaFieldTblNameArrayItem].reloadItemParam([relaFieldMap]);
|
|
@@ -479,6 +479,7 @@ var PageHome = function (_React$Component) {
|
|
|
479
479
|
var checkedItem = {};
|
|
480
480
|
var selectUserReadOnly = false;
|
|
481
481
|
var personValue = []; //选中的人
|
|
482
|
+
var personValues = []; //备选的人
|
|
482
483
|
var participantMode = item.participantMode; //判断选人是单选还是多选
|
|
483
484
|
var commonUsedData = []; //自定义选人的范围,常用
|
|
484
485
|
var commonTreeData = [];
|
|
@@ -489,6 +490,7 @@ var PageHome = function (_React$Component) {
|
|
|
489
490
|
var commonHasUser = false; //常用是否有用户
|
|
490
491
|
var commonHasOrg = false; //常用是否有组织
|
|
491
492
|
var commonHasGroup = false; //常用是否有群组
|
|
493
|
+
var type3ParNum = 0;
|
|
492
494
|
if (item.type == 3) {
|
|
493
495
|
//指定人选择
|
|
494
496
|
selectUserReadOnly = true;
|
|
@@ -1178,9 +1180,27 @@ var PageHome = function (_React$Component) {
|
|
|
1178
1180
|
}
|
|
1179
1181
|
var barDataId = returnDataItem.dataId;
|
|
1180
1182
|
var barModules = returnDataItem.modules;
|
|
1181
|
-
var
|
|
1182
|
-
|
|
1183
|
-
|
|
1183
|
+
var formCode = returnDataItem.formCode;
|
|
1184
|
+
var FlowCommon;
|
|
1185
|
+
try {
|
|
1186
|
+
FlowCommon = require('pages/flow_common/' + barModules).default ? require('pages/flow_common/' + barModules).default : require('pages/flow_common/' + barModules);
|
|
1187
|
+
if (typeof FlowCommon !== 'undefined' && typeof FlowCommon.operateCallBack === "function") {
|
|
1188
|
+
FlowCommon.operateCallBack({ type: barStatus, dataId: barDataId, isBatch: 1 }, t.state);
|
|
1189
|
+
}
|
|
1190
|
+
} catch (e) {
|
|
1191
|
+
// alert("exception: "+e.message);
|
|
1192
|
+
}
|
|
1193
|
+
|
|
1194
|
+
var mobileExt;
|
|
1195
|
+
try {
|
|
1196
|
+
if (barModules) {
|
|
1197
|
+
mobileExt = typeof eval(barModules + "_" + formCode + "_mobileExt") !== 'undefined' ? eval(barModules + "_" + formCode + "_mobileExt") : null;
|
|
1198
|
+
}
|
|
1199
|
+
if (typeof mobileExt !== 'undefined' && typeof mobileExt["operateCallBack"] === "function") {
|
|
1200
|
+
mobileExt["operateCallBack"]({ type: barStatus, dataId: barDataId, isBatch: 1 }, t.state);
|
|
1201
|
+
}
|
|
1202
|
+
} catch (e) {
|
|
1203
|
+
// alert("exception: "+e.message);
|
|
1184
1204
|
}
|
|
1185
1205
|
}
|
|
1186
1206
|
}
|