fmui-base 2.3.12 → 2.3.13

package/lib/selectMember/select.js

@@ -951,127 +951,7 @@ var Page = function (_React$Component) {
       var t = this;
       var scopeList = this.state.scopeList;
       var chooseType = this.getChooseType();
-      if ("common" == type) {
-        var commonCheckAll = t.state.commonCheckAll;
-        commonCheckAll = !commonCheckAll;
-        var commonUsedData = t.state.commonUsedData;
-        var total = t.state.total;
-        var selectCommonNum = t.state.selectCommonNum;
-        var selectedList = t.state.selectedList;
-        var selectUsers = selectedList.selectUsers;
-        var selectOrgs = selectedList.selectOrgs;
-        var selectRoles = selectedList.selectRoles;
-        var selectStations = selectedList.selectStations;
-        var selectGroups = selectedList.selectGroups;
-        if (selectUsers == null || selectUsers == undefined) {
-          selectUsers = [];
-        }
-        if (selectOrgs == null || selectOrgs == undefined) {
-          selectOrgs = [];
-        }
-        if (selectRoles == null || selectRoles == undefined) {
-          selectRoles = [];
-        }
-        if (selectStations == null || selectStations == undefined) {
-          selectStations = [];
-        }
-        if (selectGroups == null || selectGroups == undefined) {
-          selectGroups = [];
-        }
-        if (commonCheckAll) {
-          for (var i = 0; i < commonUsedData.length; i++) {
-            var common = commonUsedData[i];
-            if (!common.checked) {
-              commonUsedData[i].checked = true;
-              total++;
-              selectCommonNum++;
-              var selectedData = { id: common.scopeValue };
-              var selectData = null;
-              if (common.scopeType == "user") {
-                selectedData.userName = common.scopeName;
-                selectedData.imageId = common.imageId;
-                selectData = selectUsers;
-              } else if (common.scopeType == "org") {
-                selectedData.orgName = common.scopeName;
-                selectData = selectOrgs;
-              } else if (common.scopeType == "role") {
-                selectedData.roleName = common.scopeName;
-                selectData = selectRoles;
-              } else if (common.scopeType == "station") {
-                selectedData.stationName = common.scopeName;
-                selectData = selectStations;
-              } else if (common.scopeType == "group") {
-                selectedData.groupName = common.scopeName;
-                selectData = selectGroups;
-              }
-              if (selectData != null) {
-                var flag = true;
-                for (var j = 0; j < selectData.length; j++) {
-                  if (selectData[j].id == common.scopeValue) {
-                    flag = false;
-                    break;
-                  }
-                }
-                if (flag) {
-                  selectData.push(selectedData);
-                  scopeList.push(commonUsedData[i]);
-                }
-              }
-            }
-          }
-        } else {
-          for (var i = 0; i < commonUsedData.length; i++) {
-            var common = commonUsedData[i];
-            if (common.checked) {
-              commonUsedData[i].checked = false;
-              total--;
-              selectCommonNum--;
-              var selectData = null;
-              if (common.scopeType == "user") {
-                selectData = selectUsers;
-              } else if (common.scopeType == "org") {
-                selectData = selectOrgs;
-              } else if (common.scopeType == "role") {
-                selectData = selectRoles;
-              } else if (common.scopeType == "station") {
-                selectData = selectStations;
-              } else if (common.scopeType == "group") {
-                selectData = selectGroups;
-              }
-              if (selectData != null) {
-                for (var j = 0; j < selectData.length; j++) {
-                  if (selectData[j].id == common.scopeValue) {
-                    selectData.splice(j, 1);
-                    break;
-                  }
-                }
-              }
-              for (var j = 0; j < scopeList.length; j++) {
-                if (scopeList[j].scopeValue == common.scopeValue) {
-                  scopeList.splice(j, 1);
-                  break;
-                }
-              }
-            }
-          }
-        }
-        selectedList.selectUsers = selectUsers;
-        selectedList.selectOrgs = selectOrgs;
-        selectedList.selectRoles = selectRoles;
-        selectedList.selectStations = selectStations;
-        selectedList.selectGroups = selectGroups;
-        var commonCheckState = t.syncCommonCheckState(commonUsedData);
-        t.setState({
-          commonUsedData: commonUsedData,
-          total: total,
-          selectCommonNum: commonCheckState.selectCommonNum,
-          commonCheckAll: commonCheckState.commonCheckAll,
-          selectedList: selectedList,
-          scopeList: scopeList
-        }, function () {
-          _this2.instance.update(_this2.getContent());
-        });
-      } else if ("user" == type) {
+      if ("user" == type) {
         var navList = t.state.navUserList;
         var index = navList.length - 1;
         navList[index].checkAll = !navList[index].checkAll;
@@ -2261,13 +2141,10 @@ var Page = function (_React$Component) {
               };
               commonUsedData.push(data);
             }
-            var commonCheckState = t.syncCommonCheckState(commonUsedData);
             t.setState({
               commonTreeData: commonTreeData,
               commonUsedData: commonUsedData,
               selectUserNum: selectUserNum,
-              selectCommonNum: commonCheckState.selectCommonNum,
-              commonCheckAll: commonCheckState.commonCheckAll,
               navCommonList: navList,
               isShowNav: isShowNav,
               isShowCheckAll: isShowCheckAll
@@ -4047,12 +3924,9 @@ var Page = function (_React$Component) {
             };
             commonUsedData.push(data);
           }
-          var commonCheckState = t.syncCommonCheckState(commonUsedData);
           stateParam = {
             commonTreeData: commonTreeData,
             commonUsedData: commonUsedData,
-            selectCommonNum: commonCheckState.selectCommonNum,
-            commonCheckAll: commonCheckState.commonCheckAll,
             navCommonList: navList,
             isShowNav: true,
             isShowCheckAll: isShowCheckAll
@@ -4274,7 +4148,7 @@ var Page = function (_React$Component) {
         }
         var result = t.checkOneCommonItem(commonUsedData[index].checked, selectData, commonUsedData, selectedData, checkType, total, selectCommonNum, index, scopeList);
         total = result.total;
-        selectCommonNum = result.selectNum;
+        selectUserNum = result.selectNum;
         if (common.scopeType == "user") {
           selectedList.selectUsers = selectData;
         } else if (common.scopeType == "org") {
@@ -4286,12 +4160,10 @@ var Page = function (_React$Component) {
         } else if (common.scopeType == "group") {
           selectedList.selectGroups = selectData;
         }
-        var commonCheckState = t.syncCommonCheckState(commonUsedData);
         t.setState({
           commonUsedData: commonUsedData,
           total: total,
-          selectCommonNum: commonCheckState.selectCommonNum,
-          commonCheckAll: commonCheckState.commonCheckAll,
+          selectCommonNum: selectUserNum,
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
@@ -5826,23 +5698,6 @@ var Page = function (_React$Component) {
       }
     }
 
-    // 根据 commonUsedData 实际选中状态同步全选（仿照 roleCheckAll 逻辑）
-
-  }, {
-    key: 'syncCommonCheckState',
-    value: function syncCommonCheckState(commonUsedData) {
-      var selectCommonNum = 0;
-      if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
-        for (var i = 0; i < commonUsedData.length; i++) {
-          if (commonUsedData[i].checked) {
-            selectCommonNum++;
-          }
-        }
-      }
-      var commonCheckAll = commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0 && selectCommonNum == commonUsedData.length;
-      return { selectCommonNum: selectCommonNum, commonCheckAll: commonCheckAll };
-    }
-
     //修改获取的常用数据选中状态
 
   }, {
@@ -5944,10 +5799,10 @@ var Page = function (_React$Component) {
               commonTreeData.push(data);
             }
           }
-          t.commonDataChecked(commonUsedData);
-          var commonCheckState = t.syncCommonCheckState(commonUsedData);
-          selectCommonNum = commonCheckState.selectCommonNum;
-          commonCheckAll = commonCheckState.commonCheckAll;
+          selectCommonNum = t.commonDataChecked(commonUsedData);
+          if (selectCommonNum == commonUsedData.length) {
+            commonCheckAll = true;
+          }
         }
 
         if (commonUsedDataSearch != null && commonUsedDataSearch != undefined && commonUsedDataSearch.length > 0) {
@@ -6528,19 +6383,23 @@ var Page = function (_React$Component) {
       var t = this;
       var chooseType = this.getChooseType();
       if (obj.activeKey == "common") {
+        var commonUsedData = t.state.commonUsedData;
+        var selectCommonNum = 0;
+        var commonCheckAll = false;
+        if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
+          selectCommonNum = t.commonDataChecked(commonUsedData);
+          if (selectCommonNum == commonUsedData.length) {
+            commonCheckAll = true;
+          }
+        }
         var isShowCheckAll = true;
         if (checkType == "radio") {
           isShowCheckAll = false;
         }
-        var commonUsedData = t.state.commonUsedData;
-        if (commonUsedData != null && commonUsedData != undefined && commonUsedData.length > 0) {
-          t.commonDataChecked(commonUsedData);
-        }
-        var commonCheckState = t.syncCommonCheckState(commonUsedData);
         t.setState({
-          selectCommonNum: commonCheckState.selectCommonNum,
+          selectCommonNum: selectCommonNum,
           isShowCheckAll: isShowCheckAll,
-          commonCheckAll: commonCheckState.commonCheckAll,
+          commonCheckAll: commonCheckAll,
           isShowNav: false,
           activeKey: obj.activeKey
         }, function () {
@@ -7554,16 +7413,20 @@ var Page = function (_React$Component) {
 
         }
 
+        var selectCommonNum = 0;
         if (commonSearchData.length > 0) {
-          t.commonDataChecked(commonSearchData);
+          selectCommonNum = t.commonDataChecked(commonSearchData);
+        }
+        var commonCheckAll = false;
+        if (commonSearchData != null && commonSearchData != undefined && selectCommonNum == commonSearchData.length) {
+          commonCheckAll = true;
         }
-        var commonCheckState = t.syncCommonCheckState(commonSearchData);
         t.setState({
           commonUsedData: commonSearchData,
           commonTreeData: commonTreeData,
-          selectCommonNum: commonCheckState.selectCommonNum,
+          selectCommonNum: selectCommonNum,
           isShowCheckAll: isShowCheckAll,
-          commonCheckAll: commonCheckState.commonCheckAll,
+          commonCheckAll: commonCheckAll,
           commonName: value,
           isShowNav: false,
           activeKey: type
@@ -8277,9 +8140,6 @@ var Page = function (_React$Component) {
       }
       if (navList != null && navList.length > 0) {
         currentNav = navList[navList.length - 1].id;
-        console.log("currentNav:" + currentNav);
-        console.log("currentCheck:" + JSON.stringify(navList[navList.length - 1]));
-        console.log("currentCheckAll:" + navList[navList.length - 1].checkAll);
         currentCheckAll = navList[navList.length - 1].checkAll;
         currentCheckThisOrg = navList[navList.length - 1].checkThisOrg;
         //是我的部门
@@ -8717,34 +8577,6 @@ var Page = function (_React$Component) {
                 tabContent = _react2.default.createElement(
                   'div',
                   { id: 'anchor', style: { overflow: "auto", height: '' + t.state.tabHeight }, className: 't-PB68 dd-top-border scrollHeight t-PR' },
-                  _react2.default.createElement(
-                    'div',
-                    { className: t.state.isShowCheckAll && t.state.commonUsedData.length > 0 ? "" : "t-DN" },
-                    _react2.default.createElement(
-                      'div',
-                      { className: 't-PL16 t-PR16 t-LH3 dd-bottom-border t-BCf', onClick: function onClick() {
-                          t.checkAllMember("common");
-                        } },
-                      _react2.default.createElement(
-                        HBox,
-                        { vAlign: 'center' },
-                        _react2.default.createElement(
-                          HBox,
-                          null,
-                          _react2.default.createElement(
-                            'div',
-                            { className: t.state.commonCheckAll ? 't-checkbox-field-icon-list checked' : 'un-checked t-checkbox-field-icon-list' },
-                            _react2.default.createElement('i', { className: 'iconfont icon-checked t-FCf t-FS14' })
-                          )
-                        ),
-                        _react2.default.createElement(
-                          Box,
-                          { flex: 1, className: 't-ML10' },
-                          '\u5168\u9009'
-                        )
-                      )
-                    )
-                  ),
                   _react2.default.createElement(
                     'div',
                     { className: t.state.commonName == "" && t.state.isShowNav ? "t-BCf7 t-OFA t-WSN dd-bottom-border" : "t-DN" },

package/lib/tblform/FlowCommentPane.js

@@ -49,8 +49,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; } /**
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                * 流程批示意见区块（默认意见、退回意见等），与 TblForm 纯表单分离使用
                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 */
 
 

package/package.json

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