Browse Source

新增html监听

zdd 3 years ago
parent
commit
fc6eb35fc5

BIN
src/main/docker/windows/simhei.ttf


+ 26 - 0
src/main/java/com/activiti6/controller/ModelerController.java

@@ -105,6 +105,32 @@ public class ModelerController extends BaseController {
         logger.info("创建模型结束,返回模型ID:{}", model.getId());
     }
 
+    /**
+     * 创建模型
+     *
+     * @param response
+     * @param name     模型名称
+     * @param key      模型key
+     */
+    @RequestMapping("/create/ajax")
+    @ResponseBody
+    public AjaxEntityVo createajax(HttpServletResponse response, String name, String key, String description) throws IOException {
+        logger.info("创建模型入参name:{},key:{}", name, key);
+        Model model = repositoryService.newModel();
+        ObjectNode modelNode = objectMapper.createObjectNode();
+        //模型名称
+        modelNode.put(ModelDataJsonConstants.MODEL_NAME, name);
+        //模型备注
+        modelNode.put(ModelDataJsonConstants.MODEL_DESCRIPTION, description);
+        modelNode.put(ModelDataJsonConstants.MODEL_REVISION, 1);
+        model.setName(name);
+        model.setKey(key);
+        model.setMetaInfo(modelNode.toString());
+        repositoryService.saveModel(model);
+        createObjectNode(model.getId());
+        return success();
+    }
+
     /**
      * 创建模型时完善ModelEditorSource
      *

+ 3 - 0
src/main/resources/static/editor-app/configuration/toolbar-default-actions.js

@@ -327,6 +327,9 @@ var SaveModelCtrl = [ '$rootScope', '$scope', '$http', '$route', '$location',
     $scope.saveAndClose = function () {
     	$scope.save(function() {
     		window.location.href = "./";
+            window.parent.postMessage({
+                clickType: 'toolbarSecondaryButtonClicked'
+            }, '*');
     	});
     };
     $scope.save = function (successCallback) {

+ 3 - 0
src/main/resources/static/editor-app/toolbar-controller.js

@@ -58,6 +58,9 @@ angular.module('activitiModeler')
         $scope.toolbarSecondaryButtonClicked = function(buttonIndex) {
             var buttonClicked = $scope.secondaryItems[buttonIndex];
             var services = { '$scope' : $scope, '$http' : $http, '$modal' : $modal, '$q' : $q, '$translate' : $translate, '$location': $location};
+            window.parent.postMessage({
+                clickType: 'toolbarSecondaryButtonClicked'
+            }, '*');
             executeFunctionByName(buttonClicked.action, window, services);
         };
         

+ 0 - 1
src/main/resources/templates/modeler.ftl

@@ -137,6 +137,5 @@
 	
 	<script src="editor-app/configuration/properties.js" type="text/javascript"></script>
 	<script src="editor-app/configuration/properties-custom-controllers.js" type="text/javascript"></script>
-
 </body>
 </html>