fmui-base 2.2.62 → 2.2.64

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.64: 移动端提醒支持强制选中，移动端必提醒
+- 2.2.63: 再次发起回调参数
 - 2.2.62: 单选和多选支持选项后允许填空
 - 2.2.61: 我的流程支持再次发起
 - 2.2.60: 数据表字段关联值支持关联日期字段带出星期几，数据表字段关联值可以关联其他字段，进行赋值，批量办理支持CA批示意见的加签和验签

package/lib/process_info/processInfo.js

@@ -926,6 +926,8 @@ var PageHome = function (_React$Component) {
 
                     var markValue = getSysMarkConfigValue('approve');
                     var markValueJson = JSON.parse(markValue);
+                    var forceSelect = getSystemInfo().forceSelect;
+
                     messageType = content.message;
                     t.setState({
                         messageType: messageType
@@ -946,7 +948,10 @@ var PageHome = function (_React$Component) {
                             readShortMessageList.push({ value: "1", checked: false, content: '短信提醒', disable: false });
                         }
                     }
-                    if (evoRemind && (evoRemind == '1' || evoRemind == '2')) {
+                    if (forceSelect && forceSelect == '1') {
+                        shortMessageList.push({ value: "2", checked: true, content: '移动端提醒', disable: true });
+                        readShortMessageList.push({ value: "2", checked: true, content: '移动端提醒', disable: true });
+                    } else if (evoRemind && (evoRemind == '1' || evoRemind == '2')) {
 
                         if (evoRemind == '2') {
                             //中联
@@ -966,7 +971,7 @@ var PageHome = function (_React$Component) {
                             readShortMessageList.push({ value: "2", checked: false, content: '移动端提醒', disable: false });
                         }
                     }
-                    if (sysSMSsetting && sysSMSsetting == '2' && evoRemind && evoRemind == '2') {
+                    if (sysSMSsetting && sysSMSsetting == '2' && (evoRemind && evoRemind == '2' || forceSelect && forceSelect == '1')) {
                         t.setState({
                             sendShortMessage: '1,2',
                             circulateShortMessage: '1,2',
@@ -986,7 +991,7 @@ var PageHome = function (_React$Component) {
                             handleInvalidShortMessage: '1',
                             endShortMessage: '1'
                         });
-                    } else if (evoRemind && evoRemind == '2') {
+                    } else if (evoRemind && evoRemind == '2' || forceSelect && forceSelect == '1') {
                         t.setState({
                             sendShortMessage: '2',
                             circulateShortMessage: '2',
@@ -4970,8 +4975,8 @@ var PageHome = function (_React$Component) {
 
                 //操作回调
                 var type = 6;
-                if (t.state.isStart && t.state.dataId == '') {
-                    //是不是起始节点
+                if (t.state.isStart && (t.state.dataId == '' || t.state.isSub == '2')) {
+                    //是不是起始节点 或再次发起
                     type = 4;
                 }
                 if (t.state.isEnd) {
@@ -4979,7 +4984,7 @@ var PageHome = function (_React$Component) {
                     type = 1;
                 }
                 var dataId = t.state.dataId;
-                if (dataId == "") {
+                if (dataId == "" || t.state.isSub == '2') {
                     dataId = content.dataId;
                     t.setState({ dataId: dataId });
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fmui-base",
-  "version": "2.2.62",
+  "version": "2.2.64",
   "title": "fmui-base",
   "description": "fmui移动端组件",
   "main": "lib/index.js",