fmui-base 2.0.4 → 2.0.6

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.6: 政治面貌全选问题修改
+- 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/lib/selectMember/select.js

@@ -1523,12 +1523,40 @@ var Page = function (_React$Component) {
                 total++;
                 selectPoliticalOutlookUserNum++;
               }
+              var flag = true;
+              for (var j = 0; j < selectUsers.length; j++) {
+                if (selectUsers[j].id == politicalOutlookUserList[i].id) {
+                  flag = false;
+                  break;
+                }
+              }
+              if (flag) {
+                var scope = {
+                  "scopeType": "user",
+                  "scopeName": politicalOutlookUserList[i].userName,
+                  "scopeValue": politicalOutlookUserList[i].id
+                };
+                scopeList.push(scope);
+                selectUsers.push(politicalOutlookUserList[i]);
+              }
             } else {
               if (politicalOutlookUserList[i].checked) {
                 politicalOutlookUserList[i].checked = false;
                 total--;
                 selectPoliticalOutlookUserNum--;
               }
+              for (var j = 0; j < selectUsers.length; j++) {
+                if (selectUsers[j].id == politicalOutlookUserList[i].id) {
+                  selectUsers.splice(j, 1);
+                  break;
+                }
+              }
+              for (var j = 0; j < scopeList.length; j++) {
+                if (scopeList[j].scopeValue == politicalOutlookUserList[i].id) {
+                  scopeList.splice(j, 1);
+                  break;
+                }
+              }
             }
             // if (!politicalOutlookUserList[i].checked) {
             //   politicalOutlookUserList[i].checked = true;
@@ -1540,22 +1568,6 @@ var Page = function (_React$Component) {
             //   selectPoliticalOutlookUserNum--;
             // }
 
-            var flag = true;
-            for (var j = 0; j < selectUsers.length; j++) {
-              if (selectUsers[j].id == politicalOutlookUserList[i].id) {
-                flag = false;
-                break;
-              }
-            }
-            if (flag) {
-              var scope = {
-                "scopeType": "user",
-                "scopeName": politicalOutlookUserList[i].userName,
-                "scopeValue": politicalOutlookUserList[i].id
-              };
-              scopeList.push(scope);
-              selectUsers.push(politicalOutlookUserList[i]);
-            }
           }
         }
         selectedList.selectUsers = selectUsers;
@@ -2465,6 +2477,38 @@ var Page = function (_React$Component) {
       return selectNum;
     }
 
+    //修改获取的数据选中状态(当前组织和下级)
+
+  }, {
+    key: 'dataIsAllCheckedThisAndSub',
+    value: function dataIsAllCheckedThisAndSub(data, selectData) {
+      var checkType = this.props.checkType;
+      var isCheckedAll = false;
+      if (checkType == "radio") {} else {
+
+        var allSameNum = 0;
+        var allSameSelectedNUm = 0;
+        for (var j = 0; j < data.length; j++) {
+          var isSameOrg = data[j].isSameOrg;
+          if (isSameOrg == "1") {
+            allSameNum++;
+            for (var i = 0; i < selectData.length; i++) {
+              if (selectData[i].id == data[j].id) {
+                allSameSelectedNUm++;
+                break;
+              }
+            }
+          }
+        }
+        if (allSameNum > 0 && allSameNum == allSameSelectedNUm) {
+          isCheckedAll = true;
+        } else {
+          isCheckedAll = false;
+        }
+      }
+      return isCheckedAll;
+    }
+
     //用户tab页进入下一级组织
 
   }, {
@@ -3135,6 +3179,7 @@ var Page = function (_React$Component) {
           var userList = result.data.userList;
           var selectUserNum = 0;
           var checkAllUser = true;
+          var checkAllUserThisAndSub = true;
           if (userList == null || userList == undefined) {
             userList = [];
           } else {
@@ -3144,6 +3189,9 @@ var Page = function (_React$Component) {
               if (selectUserNum != userList.length) {
                 checkAllUser = false;
               }
+
+              //政治面貌本组织和下级
+              checkAllUserThisAndSub = t.dataIsAllCheckedThisAndSub(userList, selectUsers, selectUserNum);
             }
           }
           if (politicalOutlookList.length == noUsePoliticalOutlookNum && userList.length == 0) {
@@ -3155,6 +3203,10 @@ var Page = function (_React$Component) {
           if (checkAllPoliticalOutlook && checkAllUser) {
             navList[navList.length - 1].checkAll = true;
           }
+          //判断本组织和下级是否勾选
+          if (checkAllUserThisAndSub) {
+            navList[navList.length - 1].checkThisOrg = true;
+          }
 
           t.setState({
             politicalOutlookList: politicalOutlookList,

package/package.json

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