fmui-base 2.3.15 → 2.3.17

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.3.17：流程提交保存时增加表单的乐观锁校验功能，用来校验该表单数据在办理时有无被其他人修改过
+- 2.3.16：选人组件：常用类型增加用户全选功能
 - 2.3.15：时分字段保存丢失值，子表删除时页面空白
 - 2.3.14：表单切换组织增加开关
 - 2.3.13：子表字段带$时计算不生效，表单切换组织时，表单赋值的宏值实时更新

package/lib/process_info/processInfo.js

@@ -1474,7 +1474,7 @@ var PageHome = function (_React$Component) {
                     // }
                     t.setState({
                         editFormData: formData,
-                        formDataOptlock: formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : '',
+                        formDataOptlock: formData && formData.optlock !== undefined && formData.optlock !== null && formData.optlock !== '' ? String(formData.optlock) : content.optlock !== undefined && content.optlock !== null && content.optlock !== '' ? String(content.optlock) : '',
                         //formDataNew:content.formDataNew,
                         // formData: formData,
                         // fileContent: fileContent,
@@ -4683,9 +4683,6 @@ var PageHome = function (_React$Component) {
                 formType: "4",
                 editType: editType
             }, _defineProperty(_param2, 'module', t.state.module), _defineProperty(_param2, 'comment', newComment), _defineProperty(_param2, 'commentType', 'text'), _defineProperty(_param2, 'commentId', t.state.commentId), _defineProperty(_param2, 'commentAttitude', t.getSelectedCommentAttitude()), _defineProperty(_param2, 'attachId', t.state.commentAttachId), _defineProperty(_param2, 'sealId', t.state.commentSealId), _defineProperty(_param2, 'permissionCode', t.state.permissionCode), _defineProperty(_param2, 'hasCommentField', t.state.hasCommentField), _defineProperty(_param2, 'dataId', dataId), _param2);
-            if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null && typeof t.state.formDataOptlock !== 'undefined') {
-                param.optlock = t.state.formDataOptlock;
-            }
             var commentbizSn = t.guid2();
             if (param.commentId && param.commentId != "" && param.commentId != null && typeof param.commentId != "undefined") {
                 commentbizSn = param.commentId;
@@ -4699,13 +4696,6 @@ var PageHome = function (_React$Component) {
                         type: 'success',
                         content: '保存成功'
                     });
-                    if (t.state.formDataOptlock !== '' && t.state.formDataOptlock !== null) {
-                        var ol = parseInt(t.state.formDataOptlock, 10);
-                        if (!isNaN(ol)) {
-                            t.setState({ formDataOptlock: String(ol + 1) });
-                        }
-                    }
-
                     var dataId = content.dataId;
                     //操作回调
                     if (typeof FlowCommon.operateCallBack === "function") {

package/lib/selectMember/select.js

@@ -951,7 +951,127 @@ var Page = function (_React$Component) {
       var t = this;
       var scopeList = this.state.scopeList;
       var chooseType = this.getChooseType();
-      if ("user" == type) {
+      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) {
         var navList = t.state.navUserList;
         var index = navList.length - 1;
         navList[index].checkAll = !navList[index].checkAll;
@@ -2141,10 +2261,13 @@ 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
@@ -3924,9 +4047,12 @@ 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
@@ -4148,7 +4274,7 @@ var Page = function (_React$Component) {
         }
         var result = t.checkOneCommonItem(commonUsedData[index].checked, selectData, commonUsedData, selectedData, checkType, total, selectCommonNum, index, scopeList);
         total = result.total;
-        selectUserNum = result.selectNum;
+        selectCommonNum = result.selectNum;
         if (common.scopeType == "user") {
           selectedList.selectUsers = selectData;
         } else if (common.scopeType == "org") {
@@ -4160,10 +4286,12 @@ 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: selectUserNum,
+          selectCommonNum: commonCheckState.selectCommonNum,
+          commonCheckAll: commonCheckState.commonCheckAll,
           selectedList: selectedList,
           scopeList: scopeList
         }, function () {
@@ -5698,6 +5826,23 @@ 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 };
+    }
+
     //修改获取的常用数据选中状态
 
   }, {
@@ -5799,10 +5944,10 @@ var Page = function (_React$Component) {
               commonTreeData.push(data);
             }
           }
-          selectCommonNum = t.commonDataChecked(commonUsedData);
-          if (selectCommonNum == commonUsedData.length) {
-            commonCheckAll = true;
-          }
+          t.commonDataChecked(commonUsedData);
+          var commonCheckState = t.syncCommonCheckState(commonUsedData);
+          selectCommonNum = commonCheckState.selectCommonNum;
+          commonCheckAll = commonCheckState.commonCheckAll;
         }
 
         if (commonUsedDataSearch != null && commonUsedDataSearch != undefined && commonUsedDataSearch.length > 0) {
@@ -6383,23 +6528,19 @@ 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: selectCommonNum,
+          selectCommonNum: commonCheckState.selectCommonNum,
           isShowCheckAll: isShowCheckAll,
-          commonCheckAll: commonCheckAll,
+          commonCheckAll: commonCheckState.commonCheckAll,
           isShowNav: false,
           activeKey: obj.activeKey
         }, function () {
@@ -7413,20 +7554,16 @@ var Page = function (_React$Component) {
 
         }
 
-        var selectCommonNum = 0;
         if (commonSearchData.length > 0) {
-          selectCommonNum = t.commonDataChecked(commonSearchData);
-        }
-        var commonCheckAll = false;
-        if (commonSearchData != null && commonSearchData != undefined && selectCommonNum == commonSearchData.length) {
-          commonCheckAll = true;
+          t.commonDataChecked(commonSearchData);
         }
+        var commonCheckState = t.syncCommonCheckState(commonSearchData);
         t.setState({
           commonUsedData: commonSearchData,
           commonTreeData: commonTreeData,
-          selectCommonNum: selectCommonNum,
+          selectCommonNum: commonCheckState.selectCommonNum,
           isShowCheckAll: isShowCheckAll,
-          commonCheckAll: commonCheckAll,
+          commonCheckAll: commonCheckState.commonCheckAll,
           commonName: value,
           isShowNav: false,
           activeKey: type
@@ -8577,6 +8714,34 @@ 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/package.json

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