Merge branch 'gva_workflow' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

2020-10-26 20:45:28 +08:00
parent 6f63290e74 10b009bb7e
commit 840723c592
23 changed files with 138 additions and 217 deletions
@@ -110,4 +110,4 @@ export const setUserInfo = (data) => {
        method: 'put',
        data: data
    })
-}
+}
@@ -1,31 +1,45 @@
 /* eslint-disable */
-export default function(G6){
-  G6.registerBehavior('deleteItem', {
-    getEvents() {
-      return {
-        'keydown': 'onKeydown',
-        'canvas:mouseleave': 'onCanvasLeave',
-        'canvas:mouseenter': 'onCanvasFocus',
-      }
-    },
-    onKeydown(e){
-      const items = this.graph.get('selectedItems');
-      const focus = this.graph.get('focusGraphWrapper');
-      if(e.keyCode === 8 && items && items.length > 0 && focus){
-        if(this.graph.executeCommand) {
-          this.graph.executeCommand('delete', {});
-        }else{
-          this.graph.remove(items[0]);
+export default function(G6) {
+    G6.registerBehavior('deleteItem', {
+        getEvents() {
+            return {
+                'keydown': 'onKeydown',
+                'canvas:mouseleave': 'onCanvasLeave',
+                'canvas:mouseenter': 'onCanvasFocus',
+            }
+        },
+        onKeydown(e) {
+            const items = this.graph.get('selectedItems');
+            const focus = this.graph.get('focusGraphWrapper');
+            if (e.keyCode === 46 && items && items.length > 0 && focus) {
+                if (this.graph.executeCommand) {
+                    this.graph.executeCommand('delete', {});
+                } else {
+                    this.graph.remove(items[0]);
+                }
+                this.graph.set('selectedItems', []);
+                this.graph.emit('afteritemselected', []);
+            }
+            if (e.ctrlKey == true && e.keyCode == 90) { //Ctrl+z
+                e.returnvalue = false;
+                if (this.graph.executeCommand) {
+                    this.graph.executeCommand('undo', {});
+                }
+            }
+            if (e.ctrlKey == true && e.keyCode == 89) { //Ctrl+y
+                e.returnvalue = false;
+                if (this.graph.executeCommand) {
+                    this.graph.executeCommand('redo', {});
+                }
+
+            }
+
+        },
+        onCanvasLeave(e) {
+            this.graph.set('focusGraphWrapper', false);
+        },
+        onCanvasFocus() {
+            this.graph.set('focusGraphWrapper', true);
        }
-        this.graph.set('selectedItems',[]);
-        this.graph.emit('afteritemselected',[]);
-      }
-    },
-    onCanvasLeave(e){
-      this.graph.set('focusGraphWrapper',false);
-    },
-    onCanvasFocus(){
-      this.graph.set('focusGraphWrapper',true);
-    }
-  });
-}
+    });
+}
@@ -66,7 +66,7 @@ Vue.prototype.$echarts = echarts;

 console.log(`
       欢迎使用 Gin-Vue-Admin
-       当前版本:V2.3.3
+       当前版本:V2.3.4
       默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
       默认前端文件运行地址:http://127.0.0.1:8080
 `)
@@ -20,7 +20,7 @@ export default {
  data () {
    return {
      lang: "zh",
-      demoData: {},
+      demoData: {"nodes":[{"clazz":"start","label":"发起请假","type":"start-node","shape":"start-node","x":110,"y":195,"id":"start1603681292875","style":{}},{"clazz":"parallelGateway","label":"会签","type":"parallel-gateway-node","shape":"parallel-gateway-node","x":228,"y":195,"id":"parallelGateway1603681296419","style":{}},{"clazz":"userTask","label":"审批人1","type":"user-task-node","shape":"user-task-node","x":372,"y":84,"id":"userTask1603681299962","style":{},"assignValue":1,"assignType":"user"},{"clazz":"userTask","label":"审批人2","type":"user-task-node","shape":"user-task-node","x":370,"y":321,"id":"userTask1603681302372","style":{},"assignValue":2,"assignType":"user"},{"clazz":"parallelGateway","label":"会签结果检测","type":"parallel-gateway-node","shape":"parallel-gateway-node","x":519,"y":195,"id":"parallelGateway1603681338222","style":{}},{"clazz":"end","label":"请假失败","type":"end-node","shape":"end-node","x":704,"y":317,"id":"end1603681358043","style":{}},{"clazz":"end","label":"请假成功","type":"end-node","shape":"end-node","x":706.5,"y":55.5,"id":"end1603681360882","style":{}}],"edges":[{"id":"flow1603681320738","clazz":"flow","source":"parallelGateway1603681296419","target":"userTask1603681299962","sourceAnchor":0,"targetAnchor":3,"shape":"flow-polyline-round","style":{},"startPoint":{"x":228,"y":169,"index":0},"endPoint":{"x":321.5,"y":84,"index":3}},{"id":"flow1603681321969","clazz":"flow","source":"parallelGateway1603681296419","target":"userTask1603681302372","sourceAnchor":2,"targetAnchor":3,"shape":"flow-polyline-round","style":{},"startPoint":{"x":228,"y":221,"index":2},"endPoint":{"x":319.5,"y":321,"index":3}},{"id":"flow1603681323274","clazz":"flow","source":"start1603681292875","target":"parallelGateway1603681296419","sourceAnchor":1,"targetAnchor":3,"shape":"flow-polyline-round","style":{},"startPoint":{"x":138,"y":195,"index":1},"endPoint":{"x":202,"y":195,"index":3},"label":"发起","conditionExpression":"complete"},{"id":"flow1603681341777","clazz":"flow","source":"userTask1603681299962","target":"parallelGateway1603681338222","sourceAnchor":1,"targetAnchor":3,"shape":"flow-polyline-round","style":{},"startPoint":{"x":422.5,"y":84,"index":1},"endPoint":{"x":493,"y":195,"index":3}},{"id":"flow1603681343425","clazz":"flow","source":"userTask1603681302372","target":"parallelGateway1603681338222","sourceAnchor":1,"targetAnchor":3,"shape":"flow-polyline-round","style":{},"startPoint":{"x":420.5,"y":321,"index":1},"endPoint":{"x":493,"y":195,"index":3}},{"id":"flow1603681362913","clazz":"flow","source":"parallelGateway1603681338222","target":"end1603681360882","sourceAnchor":0,"targetAnchor":2,"shape":"flow-polyline-round","style":{},"startPoint":{"x":519,"y":169,"index":0},"endPoint":{"x":678.5,"y":55.5,"index":2},"conditionExpression":"complete","label":"所有人同意"},{"id":"flow1603681392729","clazz":"flow","source":"parallelGateway1603681338222","target":"end1603681358043","sourceAnchor":2,"targetAnchor":2,"shape":"flow-polyline-round","style":{},"startPoint":{"x":519,"y":221,"index":2},"endPoint":{"x":676,"y":317,"index":2},"conditionExpression":"reject","label":"任何一人拒绝"}],"combos":[],"groups":[]},
      users: [],
      authorities:[],
      groups: [{id:'1',name:'组1'},{id:'2',name:'组2'},{id:'3',name:'组3'}],
@@ -31,6 +31,7 @@ export default {
    save(){
      console.log(this.$refs['wfd'].graph.save())
      console.log(this.$refs['wfd'].processModel)
+      console.log(JSON.stringify(this.$refs['wfd'].graph.save()))
    },
    saveXML(){
      console.log(this.$refs['wfd'].graph.saveXML())