fmui-base 2.2.38 → 2.2.40

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.2.40: 流程结束环节提交需要弹窗进行确认
+- 2.2.39: 转交批示意见不必填
 - 2.2.38: 选人组件扩展页签
 - 2.2.37: 北京ca加签验签修改
 - 2.2.36: 流程增加ca开关

package/lib/process_info/processInfo.js

@@ -1638,7 +1638,7 @@ var PageHome = function (_React$Component) {
                 for (var b = 0; b < buttonArray.length; b++) {
                     var buttonCode = buttonArray[b];
                     //PAGE_SAVE保存按钮只有当新建时才有，HELP_ADDLOTS加签只有在会签和串签才有,RADOM_FINISH随机流程完成按钮去掉
-                    if (buttonCode == 'OTHER_RELATION' || buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && (participantMode == '0' || participantMode == '3')) {
+                    if (buttonCode == 'OTHER_RELATION' || buttonCode == 'FLOW_REVOKE' || buttonCode == 'RADOM_FINISH' || buttonCode == 'FLOW_CANCEL' || buttonCode == 'FLOW_RECOVER' || buttonCode == 'PAGE_PRINT' || buttonCode == 'PAGE_URGE' || buttonCode == 'PAGE_REDSET' || buttonCode == 'PAGE_FEEDBACK' || buttonCode == 'RECORD' || buttonCode == 'HELP_ADDLOTS' && participantMode == '0') {
                         continue;
                     } else {
                         if (isStart == true && permissionCode == 'start' || isDraft == '1') {
@@ -2145,11 +2145,11 @@ var PageHome = function (_React$Component) {
                         if (documentId) {
                             this.scrollToAnchor(documentId);
                         }
-                        _Toast2.default.show({
-                            type: 'error',
-                            content: '意见不能为空！'
-                        });
-                        return false;
+                        // Toast.show({
+                        //     type: 'error',
+                        //     content: '意见不能为空！',
+                        // });
+                        // return false;
                     }
                 }
             }
@@ -2476,7 +2476,7 @@ var PageHome = function (_React$Component) {
                                 return 0;
                             }
                         });
-                        if (nextList.length == 1 && nextList[0]['end']) {
+                        if (nextList.length == 1 && nextList[0]['end'] && !hasCirculate) {
                             //下一个后继活动是结束
                             isEnd = true;
 
@@ -3043,7 +3043,8 @@ var PageHome = function (_React$Component) {
                 t.setState({
                     pageStatus: '1',
                     backShortMessage: '0',
-                    operate: operate
+                    operate: operate,
+                    addSignComment: ''
                 }, function () {
                     $(window).scrollTop(0);
                 });
@@ -5660,7 +5661,8 @@ var PageHome = function (_React$Component) {
                 formId: t.state.formId,
                 processInstanceId: t.state.processInstanceId,
                 shortMessage: shortMessage,
-                automaticReturn: addlotsAutomaticReturn
+                automaticReturn: addlotsAutomaticReturn,
+                addSignComment: t.state.addSignComment
             }).then(function (content) {
                 _Toast2.default.show({
                     type: 'success',
@@ -6898,6 +6900,22 @@ var PageHome = function (_React$Component) {
                 backReasonText: newValue
             });
         }
+    }, {
+        key: 'changeAddSignComment',
+        value: function changeAddSignComment(newValue) {
+            var regRule = /(\ud83c[\udf00-\udfff])|(\ud83d[\udc00-\ude4f\ude80-\udeff])|[\u2600-\u2B55]/g;
+            if (newValue.match(regRule)) {
+                _Toast2.default.show({
+                    type: 'error',
+                    content: '请输入非表情字符'
+                });
+                return false;
+            }
+
+            this.setState({
+                addSignComment: newValue
+            });
+        }
     }, {
         key: 'handleChangePic',
         value: function handleChangePic(value) {
@@ -8229,6 +8247,14 @@ var PageHome = function (_React$Component) {
                             ),
                             _react2.default.createElement(_Switch2.default, { on: this.state.addlotsAutomaticReturn, onChange: this.handleAddlotsAutomaticReturnChange.bind(this) })
                         ),
+                        _react2.default.createElement(_TextareaField2.default, {
+                            readOnly: false,
+                            label: '加签意见',
+                            required: false,
+                            minRows: 5, maxRows: 10,
+                            placeholder: '请输入加签意见',
+                            value: this.state.addSignComment,
+                            onChange: this.changeAddSignComment.bind(this) }),
                         _react2.default.createElement(_CheckboxField2.default, {
                             data: this.state.shortMessageList,
                             className: '',

package/package.json

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