fmui-base 2.1.69 → 2.1.71

package/README.md

@@ -3,6 +3,8 @@
 ---npm publish
 
 ## 更新日志 
+- 2.1.71：传阅支持选择到组织、职务、群组
+- 2.1.70：移动端流程发起推送标题实时更新
 - 2.1.69：移动端流程办理推送标题
 - 2.1.68：移动端流程办理推送标题
 - 2.1.67：移动端流程记录增加退回的意见显示

package/lib/process_info/processInfo.js

@@ -2294,7 +2294,7 @@ var PageHome = function (_React$Component) {
                     editType: editType,
                     module: this.state.module,
                     lock: this.state.lock,
-                    reminderContent: "",
+                    reminderContent: this.state.reminderContent,
                     processInstanceId: this.state.processInstanceId
                 };
                 var dealActionName = "";
@@ -2320,7 +2320,8 @@ var PageHome = function (_React$Component) {
                     if (content.title && content.title != "") {
                         var reminderContent = content.title;
                         t.setState({
-                            reminderContent: reminderContent
+                            reminderContent: reminderContent,
+                            dealReminderContent: reminderContent
                         });
                         param.reminderContent = reminderContent;
                     }
@@ -4719,32 +4720,15 @@ var PageHome = function (_React$Component) {
             param.nextTaskId = nextTaskId;
             if (circulatePersonValue.length > 0) {
                 circulatePersonValue.map(function (item, index) {
-                    if (item.scopeType == 'org') {
-                        orgIds += item.scopeValue + ',';
-                    } else if (item.scopeType == 'user') {
-                        assignId += item.scopeValue + ',';
-                        assignName += item.scopeName + ',';
-                    }
+                    assignName += item.scopeName + ',';
                 });
-                if (orgIds != '') {
-                    orgIds = orgIds.substring(0, orgIds.length - 1);
-                    var orgUserList = getUsersByOrgIDs(orgIds);
-                    var orgUserids = '';
-                    var orgUsernames = '';
-                    for (var j = 0; j < orgUserList.length; j++) {
-                        if (assignId.indexOf(orgUserList[j].id) < 0) {
-                            orgUserids += orgUserList[j].id + ",";
-                            orgUsernames += orgUserList[j].userName + ",";
-                        }
-                    }
-                    assignId += orgUserids;
-                    assignName += orgUsernames;
-                }
-                if (assignId) {
-                    assignId = assignId.substring(0, assignId.length - 1);
+
+                if (assignName && assignName != '') {
                     assignName = assignName.substring(0, assignName.length - 1);
                 }
             }
+            param.scopeJsonData = JSON.stringify(circulatePersonValue);
+            console.log(JSON.stringify(circulatePersonValue));
             param.circulateIds = assignId;
             param.circulateNames = assignName;
             param.dealReminderContent = dealReminderContent;
@@ -5544,39 +5528,29 @@ var PageHome = function (_React$Component) {
             var orgIds = "";
             var isPush = t.state.isPush;
             for (var i = 0; i < value.length; i++) {
-                if (value[i].scopeType == 'org') {
-                    orgIds += value[i].scopeValue + ',';
-                } else if (value[i].scopeType == 'user') {
-                    targetUserIds += value[i].scopeValue + ',';
-                    targetUserNames += value[i].scopeName + ',';
-                }
-            }
-            if (orgIds != '') {
-                orgIds = orgIds.substring(0, orgIds.length - 1);
-                var orgUserList = getUsersByOrgIDs(orgIds);
-                var orgUserids = '';
-                var orgUsernames = '';
-                for (var j = 0; j < orgUserList.length; j++) {
-                    if (targetUserIds.indexOf(orgUserList[j].id) < 0) {
-                        orgUserids += orgUserList[j].id + ",";
-                        orgUsernames += orgUserList[j].userName + ",";
-                    }
-                }
-                targetUserIds += orgUserids;
-                targetUserNames += orgUsernames;
+                targetUserNames += value[i].scopeName + ',';
             }
-            if (targetUserIds) {
-                targetUserIds = targetUserIds.substring(0, targetUserIds.length - 1);
+
+            if (targetUserNames && targetUserNames != '') {
+                // targetUserIds = targetUserIds.substring(0,targetUserIds.length-1);
                 targetUserNames = targetUserNames.substring(0, targetUserNames.length - 1);
             }
 
-            if (targetUserIds == '') {
+            // if(targetUserIds == ''){
+            //     Toast.show({
+            //         type: 'error',
+            //         content: '请选择传阅人',
+            //     });
+            //     return false;
+            // }
+            if (value.length == 0) {
                 _Toast2.default.show({
                     type: 'error',
                     content: '请选择传阅人'
                 });
                 return false;
             }
+
             var shortMessage = '0';
             var circulateShortMessage = t.state.circulateShortMessage;
             /* if(circulateShortMessage.length>0){
@@ -5598,6 +5572,7 @@ var PageHome = function (_React$Component) {
                 taskId: t.state.taskId,
                 targetUserIds: targetUserIds,
                 targetUserNames: targetUserNames,
+                scopeJsonData: JSON.stringify(value),
                 module: t.state.module,
                 formId: t.state.formId,
                 permissionCode: t.state.permissionCode,
@@ -7741,8 +7716,8 @@ var PageHome = function (_React$Component) {
                             readOnly: false,
                             label: '传阅人',
                             placeholder: '\u8BF7\u9009\u62E9',
-                            code: 'user,org,group',
-                            chooseType: 'userNotOrg,userNotGroup',
+                            code: 'user,org,group,duty,politicalOutlook,station,personGroup',
+                            chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
                             checkType: 'checkbox',
                             defaultValue: this.state.readScopeList,
                             ref: "selectMember_circulate1",
@@ -7969,8 +7944,8 @@ var PageHome = function (_React$Component) {
                             readOnly: false,
                             label: '传阅人',
                             placeholder: '\u8BF7\u9009\u62E9',
-                            code: 'user,org,group',
-                            chooseType: 'userNotOrg,userNotGroup',
+                            code: 'user,org,group,duty,politicalOutlook,station,personGroup',
+                            chooseType: 'userAndOrg,userAndGroup,userAndDuty,userNotPoliticalOutlook,userAndStation,userAndPersonGroup',
                             checkType: 'checkbox',
                             defaultValue: this.state.readScopeList,
                             ref: "selectMember_circulate",

package/package.json

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