add: 选择分配人

editor-app/configuration/properties-assignment-controller.js

@@ -56,6 +56,7 @@ angular.module('flowableModeler').controller('FlowableAssignmentPopupCtrl',
             },
             static: {
                 assignee: undefined,
+                selectassignee: undefined,
                 candidateUsers: [],
                 candidateGroups: []
             }
@@ -79,6 +80,28 @@ angular.module('flowableModeler').controller('FlowableAssignmentPopupCtrl',
         }
     }
 
+    $scope.assignmentOptionsStatic = [
+        {
+            title: $translate.instant('PROPERTY.ASSIGNMENT.MYSELF'),
+            value: false,
+        },
+        {
+            title: $translate.instant('PROPERTY.ASSIGNMENT.DEPARTLEADER'),
+            value: false,
+        },
+        {
+            title: $translate.instant('PROPERTY.ASSIGNMENT.CHARGEMANAGER'),
+            value: false,
+        },
+        {
+            title: $translate.instant('PROPERTY.ASSIGNMENT.FINANCE'),
+            value: false,
+        },
+        {
+            title: $translate.instant('PROPERTY.ASSIGNMENT.PERSONNEL'),
+            value: false,
+        }
+    ]
     // fill the IDM area
     if (!$scope.assignmentOption) {
         // Default, first time opening the popup
@@ -107,12 +130,20 @@ angular.module('flowableModeler').controller('FlowableAssignmentPopupCtrl',
             }
         }
     }
-    
     //fill the static area
+    let selectAssignFlag = false
     if ($scope.assignment.assignee) {
-        $scope.popup.assignmentObject.static.assignee = $scope.assignment.assignee;
+        $scope.assignmentOptionsStatic.forEach((item)=>{
+            if ($scope.assignment.assignee === item.title) {
+                item.value = true
+                selectAssignFlag = true
+            }
+        })
     }
 
+    $scope.popup.assignmentObject.static.selectassignee = selectAssignFlag ? $scope.assignment.assignee : ""
+    $scope.popup.assignmentObject.static.assignee = selectAssignFlag ? "" : $scope.assignment.assignee
+
     if ($scope.assignment.candidateUsers && $scope.assignment.candidateUsers.length > 0) {
         for (var i = 0; i < $scope.assignment.candidateUsers.length; i++) {
             $scope.popup.assignmentObject.static.candidateUsers.push($scope.assignment.candidateUsers[i]);
@@ -395,7 +426,7 @@ angular.module('flowableModeler').controller('FlowableAssignmentPopupCtrl',
     $scope.allSteps = EDITOR.UTIL.collectSortedElementsFromPrecedingElements($scope.selectedShape);
 
     $scope.save = function () {
-
+        console.log($scope.popup.assignmentObject.static)
         handleAssignmentInput($scope.popup.assignmentObject.static);
 
         $scope.assignment.type = $scope.popup.assignmentObject.type;
@@ -428,7 +459,9 @@ angular.module('flowableModeler').controller('FlowableAssignmentPopupCtrl',
         if ('static' === $scope.popup.assignmentObject.type) { // IDM
             $scope.popup.assignmentObject.idm = undefined;
             $scope.assignment.idm = undefined;
-            $scope.assignment.assignee = $scope.popup.assignmentObject.static.assignee;
+            $scope.assignment.assignee = $scope.popup.assignmentObject.static.selectassignee || $scope.popup.assignmentObject.static.assignee;
+            // $scope.assignment.assignee = $scope.popup.assignmentObject.static.assignee;
+            $scope.assignment.selectassignee = $scope.popup.assignmentObject.static.selectassignee;
             $scope.assignment.candidateUsers = $scope.popup.assignmentObject.static.candidateUsers;
             $scope.assignment.candidateGroups = $scope.popup.assignmentObject.static.candidateGroups;
         }

editor-app/configuration/properties/assignment-popup.html

@@ -41,6 +41,23 @@
                         </div>
                     </div>
 
+                    <div class="form-group clearfix" ng-show="popup.assignmentObject.type != 'idm'">
+                        <div class="col-xs-12">
+                            <label>{{'PROPERTY.ASSIGNMENT.SELECTASSIGNEE' | translate}}</label>
+                        </div>
+                        <div class="col-xs-12">
+                            <select ng-model="popup.assignmentObject.static.selectassignee" id="assigneeFieldselect" class="form-control"
+                            placeholder="{{'PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER' | translate}}">
+                                <option value="">
+                                <option ng-selected="{{option.value}}"
+                                    ng-repeat="option in assignmentOptionsStatic" value="{{option.title}}">
+                                    {{option.title | translate}}
+                                </option>
+                            </select>
+                            
+                        </div>
+                    </div>
+
                     <div class="form-group clearfix" ng-show="popup.assignmentObject.type != 'idm'">
                         <div class="col-xs-12">
                             <label>{{'PROPERTY.ASSIGNMENT.CANDIDATE_USERS' | translate}}</label>

i18n/en.json

@@ -2689,8 +2689,14 @@
     "PROPERTY.ASSIGNMENT.TYPE.IDENTITYSTORE" : "Identity store",
     "PROPERTY.ASSIGNMENT.TYPE.STATIC" : "Fixed values",
     "PROPERTY.ASSIGNMENT.ASSIGNEE" : "Assignee",
+    "PROPERTY.ASSIGNMENT.SELECTASSIGNEE" : "Select Role",
     "PROPERTY.ASSIGNMENT.MATCHING" : "Use ↑ and ↓ to select and press Enter to confirm or use the mouse",
     "PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER" : "Enter an assignee",
+    "PROPERTY.ASSIGNMENT.MYSELF" : "Myself",
+    "PROPERTY.ASSIGNMENT.DEPARTLEADER" : "DEPARTLEADER",
+    "PROPERTY.ASSIGNMENT.CHARGEMANAGER" : "CHARGEMANAGER",
+    "PROPERTY.ASSIGNMENT.FINANCE" : "FINANCE",
+    "PROPERTY.ASSIGNMENT.PERSONNEL" : "PERSONNEL",
     "PROPERTY.ASSIGNMENT.EMPTY" : "No assignment selected",
     "PROPERTY.ASSIGNMENT.NONE" : "None ...",
     "PROPERTY.ASSIGNMENT.PLACEHOLDER-SEARCHUSER": "Search user",

i18n/zh-CN.json

@@ -64,13 +64,13 @@
       },
       "NAMEPACKAGE" : {
         "NAME" : {
-          "TITLE" : "名称",
+          "TITLE" : "流程名称",
           "DESCRIPTION" : "BPMN元素的描述名称."
         }
       },
       "DOCUMENTATIONPACKAGE" : {
         "DOCUMENTATION" : {
-          "TITLE" : "描述信息",
+          "TITLE" : "流程描述",
           "DESCRIPTION" : "BPMN元素的描述信息"
         }
       },
@@ -88,7 +88,7 @@
       },
       "PROCESS_VERSIONPACKAGE" : {
         "PROCESS_VERSION" : {
-          "TITLE" : "流程版本字符串（仅备注）",
+          "TITLE" : "备注流程版本",
           "DESCRIPTION" : "文档的目的为版本标识"
         }
       },
@@ -130,7 +130,7 @@
       },
       "ASYNCHRONOUSDEFINITIONPACKAGE" : {
         "ASYNCHRONOUSDEFINITION" : {
-          "TITLE" : "异步",
+          "TITLE" : "是否异步",
           "DESCRIPTION" : "定义异步的活动"
         }
       },
@@ -142,7 +142,7 @@
       },
       "EXCLUSIVEDEFINITIONPACKAGE" : {
         "EXCLUSIVEDEFINITION" : {
-          "TITLE" : "独占任务",
+          "TITLE" : "是否独占任务",
           "DESCRIPTION" : "定义排它的活动"
         }
       },
@@ -196,10 +196,16 @@
       },
       "PRIORITYDEFINITIONPACKAGE" : {
         "PRIORITYDEFINITION" : {
-          "TITLE" : "优先级",
+          "TITLE" : "任务优先级",
           "DESCRIPTION" : "用户任务的优先级"
         }
       },
+      "TASKIDVARIABLENAMEPACKAGE": {
+        "TASKIDVARIABLENAME": {
+          "TITLE": "重新定义任务ID",
+          "DESCRIPTION": "重新定义任务ID，将以此任务ID覆盖之前默认的任务ID"
+        }
+      },
       "SERVICETASKCLASSPACKAGE" : {
         "SERVICETASKCLASS" : {
           "TITLE" : "类",
@@ -2468,9 +2474,15 @@
   "PROPERTY.ASSIGNMENT.TYPE" : "类型",
   "PROPERTY.ASSIGNMENT.TYPE.IDENTITYSTORE" : "身份存储",
   "PROPERTY.ASSIGNMENT.TYPE.STATIC" : "固定值",
-  "PROPERTY.ASSIGNMENT.ASSIGNEE" : "分配",
+  "PROPERTY.ASSIGNMENT.ASSIGNEE" : "输入分配人",
+  "PROPERTY.ASSIGNMENT.SELECTASSIGNEE" : "选择角色",
   "PROPERTY.ASSIGNMENT.MATCHING" : "使用 ↑ 和 ↓选择并按Enter确认或使用鼠标",
-  "PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER" : "输入分配人",
+  "PROPERTY.ASSIGNMENT.ASSIGNEE_PLACEHOLDER" : "选择分配人",
+  "PROPERTY.ASSIGNMENT.MYSELF" : "本人",
+  "PROPERTY.ASSIGNMENT.DEPARTLEADER" : "部门领导",
+  "PROPERTY.ASSIGNMENT.CHARGEMANAGER" : "中心负责人",
+  "PROPERTY.ASSIGNMENT.FINANCE" : "财务",
+  "PROPERTY.ASSIGNMENT.PERSONNEL" : "人事行政",
   "PROPERTY.ASSIGNMENT.EMPTY" : "点击选择分配人",
   "PROPERTY.ASSIGNMENT.NONE" : "未分配经办人",
   "PROPERTY.ASSIGNMENT.PLACEHOLDER-SEARCHUSER": "搜索用户",