add: 修改字符

editor-app/configuration/properties-default-controllers.js

@@ -46,6 +46,8 @@ angular.module('flowableModeler').controller('FlowableStringPropertyCtrl', [ '$s
     	}
     });
 
+    console.log($scope)
+
 }]);
 
 /*
@@ -107,6 +109,39 @@ angular.module('flowableModeler').controller('FlowableTextPropertyCtrl', [ '$sco
 angular.module('flowableModeler').controller('FlowableTextPropertyPopupCtrl', ['$scope', function($scope) {
 
     $scope.save = function() {
+        console.log($scope.property)
+        $scope.updatePropertyInModel($scope.property);
+        $scope.close();
+    };
+    
+    $scope.close = function() {
+        $scope.property.mode = 'read';
+        $scope.$hide();
+    };
+}]);
+
+angular.module('flowableModeler').controller('HuiqianPopupCtrl', ['$scope','$http', function($scope, $http) {
+
+    $http.get(FLOWABLE.APP_URL.getStaffList())
+    .success(function(res){
+        console.log(res.data.getMe)
+        let arr = []
+        res.data.getMe.forEach((item,index)=>{
+            if (item.LevelCode.indexOf('1-24')) {
+                item.userList.forEach((childItem)=>{
+                    arr.push({
+                        loginName: childItem.loginName,
+                        userName: childItem.userName,
+                        userID: childItem.userID
+                    })
+                })
+            }
+        })
+        $scope.userList = arr
+    })
+
+    $scope.save = function() {
+        console.log($scope.property)
         $scope.updatePropertyInModel($scope.property);
         $scope.close();
     };

editor-app/configuration/properties.js

@@ -199,5 +199,9 @@ FLOWABLE.PROPERTY_CONFIG =
     "flowable-channeltype" : {
         "readModeTemplateUrl": "editor-app/configuration/properties/default-value-display-template.html",
         "writeModeTemplateUrl": "editor-app/configuration/properties/event-channel-type-property-write-template.html"
+    },
+    "huiqian" : {
+        "readModeTemplateUrl": "editor-app/configuration/properties/huiqian-read-template.html",
+        "writeModeTemplateUrl": "editor-app/configuration/properties/huiqian-write-template.html"
     }
 };

editor-app/configuration/properties/boolean-property-template.html

 
-<div ng-controller="FlowableBooleanPropertyCtrl">
+<div ng-controller="FlowableBooleanPropertyCtrl" style="line-height: 38px;">
     <input type="checkbox" ng-model="property.value" ng-change="changeValue()"/>
 </div>
\ No newline at end of file

editor-app/configuration/properties/huiqian-read-template.html

+<button class="btn btn-inverse">click me huiqian</button>
\ No newline at end of file

editor-app/configuration/properties/huiqian-write-template.html

+
+<div class="modal" ng-controller="HuiqianPopupCtrl">
+    <div class="modal-dialog">
+        <div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true" ng-click="close()">&times;</button>
+			    <h3>{{'PROPERTY.PROPERTY.EDIT.TITLE' | translate}} "{{property.title | translate}}"</h3>
+			</div>
+			<div class="modal-body">
+				<input type="checkbox" ng-repeat="" class="checkbox" ng-model="selectedListener.rethrowEvent" ng-checked="" ng-change="listenerDetailsChanged()" style="display:inline-block;"/>
+			</div>
+			<div class="modal-footer">
+				<button ng-click="save()" class="btn btn-primary" translate >ACTION.SAVE</button>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file

editor-app/configuration/properties/multiinstance-property-write-template.html

 
 <div ng-controller="FlowableMultiInstanceCtrl">
     <select ng-model="property.value" ng-change="multiInstanceChanged()" style="width: 100%;height: 25px;line-height: 25px;border: none;">
-    	<option>None</option>
-    	<option>Parallel</option>
-    	<option>Sequential</option>
+    	<option value="None">{{'MULTIINSTANCECOOLECTIONTYPE.NO_HUIQIAN' | translate}}</option>
+    	<option value="Parallel">{{'MULTIINSTANCECOOLECTIONTYPE.PARALLEL' | translate}}</option>
+    	<option value="Sequential">{{'MULTIINSTANCECOOLECTIONTYPE.SEQUEENTIAL' | translate}}</option>
     </select>
 </div>
\ No newline at end of file

editor-app/stencil-controller.js

@@ -286,6 +286,7 @@ angular.module('flowableModeler')
 
                     // Gather properties of selected item
                     var properties = stencil.properties();
+                    console.log(properties)
                     for (var i = 0; i < properties.length; i++) {
                         var property = properties[i];
                         if (property.popular() == false) continue;
@@ -307,6 +308,7 @@ angular.module('flowableModeler')
 
                             if (selectedShape.properties.get(key) === 'true') {
                                 selectedShape.properties.set(key, true);
+                                console.log(selectedShape)
                             }
                             
                             if (FLOWABLE.UI_CONFIG.showRemovedProperties == false && property.isHidden())
@@ -628,9 +630,11 @@ angular.module('flowableModeler')
 
         /* Click handler for clicking a property */
         $scope.propertyClicked = function (index) {
+
             if (!$scope.selectedItem.properties[index].hidden) {
                 $scope.selectedItem.properties[index].mode = "write";
             }
+            console.log($scope.selectedItem.properties)
         };
 
         /* Helper method to retrieve the template url for a property */

i18n/zh-CN.json

@@ -724,14 +724,14 @@
       },
       "MULTIINSTANCE_TYPEPACKAGE" : {
         "MULTIINSTANCE_TYPE" : {
-          "TITLE" : "多实例类型",
+          "TITLE" : "会签类型",
           "DESCRIPTION" : "重复的活动执行（并行或顺序）可以通过不同的循环类型显示。"
         }
       },
       "MULTIINSTANCE_CARDINALITYPACKAGE" : {
         "MULTIINSTANCE_CARDINALITY" : {
-          "TITLE" : "基数(多实例)",
-          "DESCRIPTION" : "定义多实例的基数"
+          "TITLE" : "参与会签总人数",
+          "DESCRIPTION" : "参与会签的基数"
         }
       },
       "MULTIINSTANCE_COLLECTIONPACKAGE" : {
@@ -2470,6 +2470,11 @@
 
   "PROPERTY.FEEDBACK.TITLE" : "请填写您的反馈意见",
 
+
+  "MULTIINSTANCECOOLECTIONTYPE.NO_HUIQIAN" : "无",
+  "MULTIINSTANCECOOLECTIONTYPE.PARALLEL" : "并行",
+  "MULTIINSTANCECOOLECTIONTYPE.SEQUEENTIAL" : "串行",
+
   "PROPERTY.ASSIGNMENT.TITLE" : "分配",
   "PROPERTY.ASSIGNMENT.TYPE" : "类型",
   "PROPERTY.ASSIGNMENT.TYPE.IDENTITYSTORE" : "身份存储",

scripts/configuration/url-config.js

@@ -206,6 +206,10 @@ FLOWABLE.APP_URL = {
         return '/CityInterface/rest/services/PandaWorkflow.svc/GetModelDetail?ModelID=' + id + '&Model_key=' + key +'&Cookie=' + cookie
     },
 
+    getStaffList: function() {
+        return '/Cityinterface/rest/services/CountyProduct.svc/AccountManage/getUserListForRole?_version=9999'
+    },
+
     getFormModelValuesUrl: function (query) {
         return FLOWABLE.CONFIG.contextModelerRestRoot + '/rest/form-models/values?' + query;
     },

styles/common/style.css

@@ -3282,3 +3282,4 @@ ul#strength > li:last-child {
   height:auto;
 }
 
+