fmui-base 2.2.99 → 2.3.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/README.md +1 -0
- package/lib/process_info/processInfo.js +12 -6
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -2697,10 +2697,11 @@ var PageHome = function (_React$Component) {
|
|
|
2697
2697
|
if (participantList[i].type != "user") {
|
|
2698
2698
|
var children = participantList[i];
|
|
2699
2699
|
for (var j = 0; j < children.length; j++) {
|
|
2700
|
+
var personValueItem = { scopeType: "user", scopeValue: children[j].id, scopeName: children[j].userName || children[j].name, imageId: "", orgNamePath: children[j].orgPath };
|
|
2700
2701
|
if (commonUsedId.split(",").indexOf(children[j].id) == -1) {
|
|
2701
2702
|
commonUsedId += children[j].id + ',';
|
|
2702
2703
|
commonUsedData.push(personValueItem);
|
|
2703
|
-
if (item.partType == '1') {
|
|
2704
|
+
if (item.partType == '1' || item.nodeType == 'readtask') {
|
|
2704
2705
|
personValue.push(personValueItem);
|
|
2705
2706
|
}
|
|
2706
2707
|
}
|
|
@@ -2710,7 +2711,7 @@ var PageHome = function (_React$Component) {
|
|
|
2710
2711
|
if (commonUsedId.split(",").indexOf(participantList[i].id) == -1) {
|
|
2711
2712
|
commonUsedId += participantList[i].id + ',';
|
|
2712
2713
|
commonUsedData.push(personValueItem);
|
|
2713
|
-
if (item.partType == '1') {
|
|
2714
|
+
if (item.partType == '1' || item.nodeType == 'readtask') {
|
|
2714
2715
|
personValue.push(personValueItem);
|
|
2715
2716
|
}
|
|
2716
2717
|
}
|
|
@@ -2720,7 +2721,7 @@ var PageHome = function (_React$Component) {
|
|
|
2720
2721
|
popCode = "common,org,group";
|
|
2721
2722
|
popCode = "common,org,group,duty,politicalOutlook";
|
|
2722
2723
|
chooseType = "userNotOrg,userNotGroup,userNotDuty,userNotPoliticalOutlook";
|
|
2723
|
-
if (commonUsedData.length == 1) {
|
|
2724
|
+
if (commonUsedData.length == 1 || item.nodeType == 'readtask') {
|
|
2724
2725
|
personValue = commonUsedData;
|
|
2725
2726
|
}
|
|
2726
2727
|
} else {
|
|
@@ -2763,13 +2764,13 @@ var PageHome = function (_React$Component) {
|
|
|
2763
2764
|
if (commonUsedId.split(",").indexOf(participantList[i].id) == -1) {
|
|
2764
2765
|
commonUsedId += participantList[i].id + ',';
|
|
2765
2766
|
commonUsedData.push(personValueItem);
|
|
2766
|
-
if (item.partType == '1') {
|
|
2767
|
+
if (item.partType == '1' || item.nodeType == 'readtask') {
|
|
2767
2768
|
personValue.push(personValueItem);
|
|
2768
2769
|
}
|
|
2769
2770
|
}
|
|
2770
2771
|
}
|
|
2771
2772
|
}
|
|
2772
|
-
if (commonUsedData.length == 1) {
|
|
2773
|
+
if (commonUsedData.length == 1 || item.nodeType == 'readtask') {
|
|
2773
2774
|
personValue = commonUsedData;
|
|
2774
2775
|
}
|
|
2775
2776
|
} else {
|
|
@@ -2787,8 +2788,13 @@ var PageHome = function (_React$Component) {
|
|
|
2787
2788
|
chooseType = '';
|
|
2788
2789
|
}
|
|
2789
2790
|
if (item.nodeType == 'readtask') {
|
|
2790
|
-
|
|
2791
|
+
//如果是传阅节点，默认选中配置的全部用户
|
|
2791
2792
|
t.state.isHideRead = true;
|
|
2793
|
+
if (commonUsedData.length > 0) {
|
|
2794
|
+
personValue = commonUsedData.slice();
|
|
2795
|
+
} else if (personValues.length > 0) {
|
|
2796
|
+
personValue = personValues.slice();
|
|
2797
|
+
}
|
|
2792
2798
|
}
|
|
2793
2799
|
checkedItem.code = popCode;
|
|
2794
2800
|
checkedItem.chooseType = chooseType;
|