fmui-base 2.0.4 → 2.0.5

package/README.md

@@ -3,6 +3,7 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.5: 流程功能优化
 - 2.0.4: 表单组件错误优化；政治面貌全选问题修改
 - 2.0.3: 增加流程图；表单按钮功能扩展
 - 2.0.2: 时间字段增加“xxxx年xx月xx日”中文显示

package/lib/form/form.js

@@ -1040,14 +1040,15 @@ var PageHome = function (_React$Component) {
             if (form.popuserMap.chooseScope == 5) {
               itemParam.queryLimit = form.popuserMap.chooseScope;
               itemParam.limitData = getLoginUserInfo().orgId;
-            } else if (form.popuserMap.chooseScope == "4") {
-              //查上级
-              itemParam.queryLimit = "3";
-              itemParam.limitData = form.popuserMap.chooseScopeVal;
             } else if (form.popuserMap.chooseScope == "all") {} else {
               itemParam.queryLimit = 5;
               itemParam.limitData = form.popuserMap.chooseScope;
             }
+            // else if(form.popuserMap.chooseScope == "4"){//查上级
+            //   itemParam.queryLimit = "3";
+            //   itemParam.limitData = form.popuserMap.chooseScopeVal;
+            // }
+
           }
           scopeTable = form.popuserMap.scopeTable;
         } else {

package/lib/process_info/processInfo.js

@@ -422,13 +422,10 @@ var PageHome = function (_React$Component) {
             preCaFields: "", //上一个办理节点ca验签字段
             formRelaField: "", //流程关联字段
             commentBackAlert: [], //退回批示意见弹出
-            showCommentBackAlert: true //显示退回批示意见弹出
+            showCommentBackAlert: true, //显示退回批示意见弹出
+            endSelect: false
         };
-        try {
-            FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
-        } catch (error) {
-            alert("流程缺少扩展js，" + error);
-        }
+        FlowCommon = require('pages/flow_common/' + module).default ? require('pages/flow_common/' + module).default : require('pages/flow_common/' + module);
 
         //处理特有参数
         if (typeof FlowCommon.dealwithCommonParam === "function") {
@@ -2126,10 +2123,11 @@ var PageHome = function (_React$Component) {
                         //后继活动
                         var urgentSelectList = [];
                         var urgentList = [];
+                        var endSelect = false;
                         if (nextList.length == 1 && nextList[0]['end']) {
                             //结束
                             //urgentHidden = true;
-
+                            endSelect = true;
                             var endItem = nextList[0];
                             var checkedItem = {};
                             checkedItem.value = endItem.id;
@@ -2428,7 +2426,8 @@ var PageHome = function (_React$Component) {
                             urgentList: urgentList,
                             urgentHidden: urgentHidden,
                             isEnd: isEnd,
-                            nextActivityName: nextActivityName
+                            nextActivityName: nextActivityName,
+                            endSelect: endSelect
                         }, function () {
                             for (var i = 0; i < nextActivityList.length; i++) {
                                 if (nextActivityList[i].personValue.length > 0 || nextActivityList[i].commonUsedData.length > 0) {
@@ -6018,11 +6017,13 @@ var PageHome = function (_React$Component) {
             var isRadio = item.isRadio;
             if (item.end && !checked) {
                 this.setState({
-                    urgentHidden: true
+                    urgentHidden: true,
+                    endSelect: false
                 });
             } else {
                 this.setState({
-                    urgentHidden: false
+                    urgentHidden: false,
+                    endSelect: true
                 });
             }
             var maxOutgoing = item.maxOutgoing; //1代表是排他单选，0代表多选
@@ -6789,7 +6790,7 @@ var PageHome = function (_React$Component) {
                     }.bind(this)),
                     _react2.default.createElement(_CheckboxField2.default, {
                         data: this.state.shortMessageList,
-                        className: this.state.nextActivityList.length == 0 ? 't-DN' : '',
+                        className: this.state.nextActivityList.length == 0 || this.state.endSelect ? 't-DN' : '',
                         mode: 'list',
                         onChange: this.changeSendShortMessage.bind(this),
                         required: false }),

package/package.json

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