add: btn

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

@@ -24,7 +24,7 @@ window.share && window.share.event.on("editCurrentNodeForm", (params)=> {
 })
 
 window.share && window.share.event.on("editCurrentNodeId", (paramsId)=>{
-    // console.log(paramsId)
+    // console.log(nodeIdParams, "nodeIdParams---上面")
     nodeIdParams = paramsId
 })
 
@@ -130,18 +130,16 @@ angular.module('flowableModeler').controller('FlowableTextPropertyPopupCtrl', ['
         $scope.$hide();
     };
 }]);
-
 angular.module('flowableModeler').controller('FieldReadConfigPopupCtrl', ['$rootScope','$scope', '$http', function($rootScope, $scope, $http) {
-
     window.share && window.share.event.on("editCurrentNodeId", (params)=>{
-        // console.log(params)
+        // console.log(params, "editCurrentNodeId----下面")
         nodeIdParams = params
     })
 
     if (nodeIdParams && shareformKey) {
+        // console.log("properties-default-control---GetColumnConfig")
         $http.get(FLOWABLE.APP_URL.GetColumnConfig(nodeIdParams, shareformKey))
         .success((res)=>{
-            
             if (res.FieldConfigList && res.FieldConfigList.length > 0) {
 
                 var result = [];

editor-app/configuration/properties-form-reference-controller.js

@@ -103,6 +103,8 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl',
    	 	        
                 const formKey = $scope.selectedForm.TableName
                 const nodeId = $rootScope.currentReadResourceId || $rootScope.resourceId
+                // console.log("properties-form-reference-controller-----GetTableFieldConfig")
+                if (formKey) {
                     $http.get(FLOWABLE.APP_URL.GetTableFieldConfig(formKey))
                     .success((res)=>{
                         let formArr = []
@@ -138,6 +140,9 @@ angular.module('flowableModeler').controller('FlowableFormReferencePopupCtrl',
                             }
                         })
                     })
+                } else {
+                    $scope.close();
+                }
             })
    	 	} else {
             $scope.property.value = null; 

editor-app/configuration/properties/form-reference-popup.html

@@ -29,7 +29,7 @@
                     <div class="col-xs-12 editor-item-picker">
                         <div ng-if="!state.loadingForms && !state.formError" class="col-xs-4 editor-item-picker-component" ng-repeat="form in forms" ng-class="{'selected' : form.formId == selectedForm.formId}" ng-click="selectForm(form, $event)">
                             <div class="controls" style="margin-right: 5px;">
-                                <input type="checkbox" value="option1" ng-click="selectForm(form, $event)" ng-checked="form.id == selectedForm.id" />
+                                <input type="checkbox" value="option1" ng-click="selectForm(form, $event)" ng-checked="form.key == selectedForm.key" />
                             </div>
                             <h4>{{form.name}}</h4>
                             <!-- <img ng-src="{{getModelThumbnailUrl(form.id)}}" /> -->

editor-app/toolbar-controller.js

@@ -52,7 +52,30 @@ angular.module('flowableModeler')
 
         // Click handler for toolbar buttons
         $scope.toolbarButtonClicked = function(buttonIndex) {
+            // buttonIndex===0是保存按钮
+            if (buttonIndex === 0) {
+                $http.get(FLOWABLE.APP_URL.checkDeployState(editorManager.modelId))
+                .success((response)=>{
+                    // console.log(response, "response")
+                    if (response.statusCode === "0000") {
+                        // Default behaviour
+                        var buttonClicked = $scope.items[buttonIndex];
+                        var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager};
+                        executeFunctionByName(buttonClicked.action, window, services);
 
+                        // Other events
+                        var event = {
+                            type : FLOWABLE.eventBus.EVENT_TYPE_TOOLBAR_BUTTON_CLICKED,
+                            toolbarItem : buttonClicked
+                        };
+                        FLOWABLE.eventBus.dispatch(event.type, event);
+                    } else if (response.statusCode === "1001"){
+                        window.alert(response.errMsg)
+                    } else {
+                        window.alert("保存失败！流程出错或者系统出错，请联系管理员。")
+                    }
+                })
+            } else {
                 // Default behaviour
                 var buttonClicked = $scope.items[buttonIndex];
                 var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager};
@@ -64,6 +87,18 @@ angular.module('flowableModeler')
                     toolbarItem : buttonClicked
                 };
                 FLOWABLE.eventBus.dispatch(event.type, event);
+            }
+
+            // var buttonClicked = $scope.items[buttonIndex];
+            // var services = { '$scope' : $scope, '$rootScope' : $rootScope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, 'editorManager' : editorManager};
+            // executeFunctionByName(buttonClicked.action, window, services);
+
+            // // Other events
+            // var event = {
+            //     type : FLOWABLE.eventBus.EVENT_TYPE_TOOLBAR_BUTTON_CLICKED,
+            //     toolbarItem : buttonClicked
+            // };
+            // FLOWABLE.eventBus.dispatch(event.type, event);
         };
         
         // Click handler for secondary toolbar buttons

scripts/app-cfg.js

@@ -19,7 +19,7 @@ var FLOWABLE = FLOWABLE || {};
 
 var pathname = window.location.pathname.replace(/^(\/[^\/]*)(\/.*)?modeler\/?$/, '$1').replace(/\/$/, '');
 
-console.log(pathname)
+// console.log(pathname)
 
 // FLOWABLE.CONFIG = {
 // 	'onPremise' : true,

scripts/configuration/url-config.js

@@ -196,6 +196,9 @@ FLOWABLE.APP_URL = {
 
     /* FORM MODEL URLS */
     // 获取模型列表
+    checkDeployState: function (modelId) {
+        return `${window.API_ADDRESS}/CheckDeployState?modelId=${modelId}`;
+    },
     getFormModelsUrl: function (FormName) {
         return `${window.API_ADDRESS}/GetFormListInfo_WithoutForm?FormName=${FormName}&pageIndex=1&pageSize=999&sortFields=id`;
     },