fmui-base 2.2.63 → 2.2.64
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 +8 -3
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -926,6 +926,8 @@ var PageHome = function (_React$Component) {
|
|
|
926
926
|
|
|
927
927
|
var markValue = getSysMarkConfigValue('approve');
|
|
928
928
|
var markValueJson = JSON.parse(markValue);
|
|
929
|
+
var forceSelect = getSystemInfo().forceSelect;
|
|
930
|
+
|
|
929
931
|
messageType = content.message;
|
|
930
932
|
t.setState({
|
|
931
933
|
messageType: messageType
|
|
@@ -946,7 +948,10 @@ var PageHome = function (_React$Component) {
|
|
|
946
948
|
readShortMessageList.push({ value: "1", checked: false, content: '短信提醒', disable: false });
|
|
947
949
|
}
|
|
948
950
|
}
|
|
949
|
-
if (
|
|
951
|
+
if (forceSelect && forceSelect == '1') {
|
|
952
|
+
shortMessageList.push({ value: "2", checked: true, content: '移动端提醒', disable: true });
|
|
953
|
+
readShortMessageList.push({ value: "2", checked: true, content: '移动端提醒', disable: true });
|
|
954
|
+
} else if (evoRemind && (evoRemind == '1' || evoRemind == '2')) {
|
|
950
955
|
|
|
951
956
|
if (evoRemind == '2') {
|
|
952
957
|
//中联
|
|
@@ -966,7 +971,7 @@ var PageHome = function (_React$Component) {
|
|
|
966
971
|
readShortMessageList.push({ value: "2", checked: false, content: '移动端提醒', disable: false });
|
|
967
972
|
}
|
|
968
973
|
}
|
|
969
|
-
if (sysSMSsetting && sysSMSsetting == '2' && evoRemind && evoRemind == '2') {
|
|
974
|
+
if (sysSMSsetting && sysSMSsetting == '2' && (evoRemind && evoRemind == '2' || forceSelect && forceSelect == '1')) {
|
|
970
975
|
t.setState({
|
|
971
976
|
sendShortMessage: '1,2',
|
|
972
977
|
circulateShortMessage: '1,2',
|
|
@@ -986,7 +991,7 @@ var PageHome = function (_React$Component) {
|
|
|
986
991
|
handleInvalidShortMessage: '1',
|
|
987
992
|
endShortMessage: '1'
|
|
988
993
|
});
|
|
989
|
-
} else if (evoRemind && evoRemind == '2') {
|
|
994
|
+
} else if (evoRemind && evoRemind == '2' || forceSelect && forceSelect == '1') {
|
|
990
995
|
t.setState({
|
|
991
996
|
sendShortMessage: '2',
|
|
992
997
|
circulateShortMessage: '2',
|