fmui-base 2.0.5 → 2.0.7

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志
+- 2.0.7: 上传组件结构调整
+- 2.0.6: 政治面貌全选问题修改
 - 2.0.5: 流程功能优化
 - 2.0.4: 表单组件错误优化；政治面貌全选问题修改
 - 2.0.3: 增加流程图；表单按钮功能扩展

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/lib/upload/upload.js

@@ -604,6 +604,7 @@ var PageHome = function (_React$Component) {
                         //     <i  className={t.state.canDel?'iconfont icon-minus t-BC04 t-WH25 t-R50 t-ML10 t-FCf t-LH1 t-MT10':'t-DN'}  onClick={this.del.bind(this,i)}></i>
                         // </div>
 
+
                         /* 4.0修改 */
                         _react2.default.createElement(
                             'div',
@@ -617,18 +618,27 @@ var PageHome = function (_React$Component) {
                                     _react2.default.createElement(
                                         'div',
                                         { className: 'upload-list-item-content' },
-                                        _react2.default.createElement('i', { className: 'iconfont icon-PDF' }),
                                         _react2.default.createElement(
                                             'div',
-                                            { className: 't-list-title t-omit t-LH1_4' },
-                                            typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
+                                            { className: 'upload-name-icon' },
+                                            _react2.default.createElement('i', { className: 'iconfont icon-PDF' }),
+                                            _react2.default.createElement(
+                                                'div',
+                                                { className: 't-list-title t-omit t-LH1_4' },
+                                                typeof item.fileDisplayName == 'undefined' ? item.name : item.fileDisplayName
+                                            )
                                         ),
-                                        _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-delete' : 't-DN', onClick: _this3.del.bind(_this3, i) })
+                                        _react2.default.createElement(
+                                            'div',
+                                            { className: 'dd-t-list-time t-FBAC' },
+                                            calculate(typeof item.fileSize == 'undefined' ? item.size : item.fileSize)
+                                        )
                                     ),
                                     _react2.default.createElement(
                                         'div',
-                                        { className: 'dd-t-list-time t-FBAC' },
-                                        calculate(typeof item.fileSize == 'undefined' ? item.size : item.fileSize)
+                                        { className: 'upload-icon' },
+                                        _react2.default.createElement('i', { className: t.props.canDownload ? 'iconfont icon-download1' : 't-DN', onClick: _this3.downloadFile.bind(_this3, item) }),
+                                        _react2.default.createElement('i', { className: t.state.canDel ? 'iconfont icon-delete' : 't-DN', onClick: _this3.del.bind(_this3, i) })
                                     )
                                 )
                             )

package/package.json

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