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

web/src/components/gva-wfd/behavior/deleteItem.js

@@ -11,6 +11,7 @@ export default function(G6) {
         onKeydown(e) {
             const items = this.graph.get('selectedItems');
             const focus = this.graph.get('focusGraphWrapper');
+            console.log(e.keyCode)
             if (e.keyCode === 46 && items && items.length > 0 && focus) {
                 if (this.graph.executeCommand) {
                     this.graph.executeCommand('delete', {});
@@ -31,9 +32,19 @@ export default function(G6) {
                 if (this.graph.executeCommand) {
                     this.graph.executeCommand('redo', {});
                 }
-
             }
-
+            if (e.ctrlKey == true && e.keyCode == 67) { //Ctrl+c
+                e.returnvalue = false;
+                if (this.graph.executeCommand) {
+                    this.graph.executeCommand('copy', {});
+                }
+            }
+            if (e.ctrlKey == true && e.keyCode == 86) { //Ctrl+v
+                e.returnvalue = false;
+                if (this.graph.executeCommand) {
+                    this.graph.executeCommand('paste', {});
+                }
+            }
         },
         onCanvasLeave(e) {
             this.graph.set('focusGraphWrapper', false);

web/src/components/gva-wfd/components/DetailPanel/index.vue

@@ -2,11 +2,11 @@
     <div class="detailPanel" :style="{'height':height+'px'}">
         <UserTaskDetail v-if="model.clazz === 'userTask'" :model="model" :onChange="onChange" :readOnly="readOnly" :users="users" :authorities="authorities" :groups="groups" />
         <ScriptTaskDetail v-else-if="model.clazz === 'scriptTask'" :model="model" :onChange="onChange" :readOnly="readOnly" />
-        <JavaTaskDetail v-else-if="model.clazz === 'javaTask'" :model="model" :onChange="onChange" :readOnly="readOnly" />
+        <!-- <JavaTaskDetail v-else-if="model.clazz === 'javaTask'" :model="model" :onChange="onChange" :readOnly="readOnly" /> -->
         <ReceiveTaskDetail v-else-if="model.clazz === 'receiveTask'" :model="model" :onChange="onChange" :readOnly="readOnly" />
         <MailTaskDetail v-else-if="model.clazz === 'mailTask'" :model="model" :onChange="onChange" :readOnly="readOnly" />
         <TimerEventDetail v-else-if="model.clazz === 'timerStart' || model.clazz === 'timerCatch'" :model="model" :onChange="onChange" :readOnly="readOnly" />
-        <SignalEventDetail v-else-if="model.clazz === 'signalStart' || model.clazz === 'signalCatch'" :model="model" :onChange="onChange" :readOnly="readOnly" :signalDefs="signalDefs" />
+        <!-- <SignalEventDetail v-else-if="model.clazz === 'signalStart' || model.clazz === 'signalCatch'" :model="model" :onChange="onChange" :readOnly="readOnly" :signalDefs="signalDefs" /> -->
         <MessageEventDetail v-else-if="model.clazz === 'messageStart' || model.clazz === 'messageCatch'" :model="model" :onChange="onChange" :readOnly="readOnly" :messageDefs="messageDefs" />
         <GatewayDetail v-else-if="model.clazz === 'gateway' || model.clazz === 'exclusiveGateway' || model.clazz === 'parallelGateway' || model.clazz === 'inclusiveGateway'" :model="model" :onChange="onChange" :readOnly="readOnly" />
         <FlowDetail v-else-if="model.clazz === 'flow'" :model="model" :onChange="onChange" :readOnly="readOnly" />
@@ -17,13 +17,13 @@
 </template>
 <script>
   import UserTaskDetail from "./UserTaskDetail"
-  import JavaTaskDetail from "./JavaTaskDetail"
+  // import JavaTaskDetail from "./JavaTaskDetail"
   import ScriptTaskDetail from "./ScriptTaskDetail"
   import ReceiveTaskDetail from "./ReceiveTaskDetail"
   import MailTaskDetail from "./MailTaskDetail"
   import TimerEventDetail from "./TimerEventDetail"
-  import SignalEventDetail from "./SignalEventDetail"
-  import MessageEventDetail from "./MessageEventDetail"
+  // import SignalEventDetail from "./SignalEventDetail"
+  // import MessageEventDetail from "./MessageEventDetail"
   import GatewayDetail from "./GatewayDetail"
   import FlowDetail from "./FlowDetail"
   import StartEventDetail from "./StartEventDetail"
@@ -34,12 +34,12 @@
     components:{
       UserTaskDetail,
       ScriptTaskDetail,
-      JavaTaskDetail,
+      // JavaTaskDetail,
       ReceiveTaskDetail,
       MailTaskDetail,
       TimerEventDetail,
-      SignalEventDetail,
-      MessageEventDetail,
+      // SignalEventDetail,
+      // MessageEventDetail,
       GatewayDetail,
       FlowDetail,
       StartEventDetail,

web/src/components/gva-wfd/components/ItemPanel.vue

@@ -8,12 +8,12 @@
                 <img data-item="{clazz:'timerStart',size:'50*50',label:''}"
                      :src="require('../assets/flow/timer-start.svg')" style="width:42px;height:42px" />
                 <div>{{i18n['timerEvent']}}</div>
-                <img data-item="{clazz:'messageStart',size:'50*50',label:''}"
+                <!-- <img data-item="{clazz:'messageStart',size:'50*50',label:''}"
                      :src="require('../assets/flow/message-start.svg')" style="width:42px;height:42px" />
                 <div>{{i18n['messageEvent']}}</div>
                 <img data-item="{clazz:'signalStart',size:'50*50',label:''}"
                      :src="require('../assets/flow/signal-start.svg')" style="width:42px;height:42px" />
-                <div>{{i18n['signalEvent']}}</div>
+                <div>{{i18n['signalEvent']}}</div> -->
             </el-collapse-item>
             <el-collapse-item :title="i18n['task']" name="2">
                 <img :data-item="userTaskData"
@@ -22,9 +22,9 @@
                 <img :data-item="scriptTaskData"
                      :src="require('../assets/flow/script-task.svg')" style="width:80px;height:44px" />
                 <div>{{i18n['scriptTask']}}</div>
-                <img :data-item="javaTaskData"
+                <!-- <img :data-item="javaTaskData"
                      :src="require('../assets/flow/java-task.svg')" style="width:80px;height:44px" />
-                <div>{{i18n['javaTask']}}</div>
+                <div>{{i18n['javaTask']}}</div> -->
                 <img :data-item="mailTaskData"
                      :src="require('../assets/flow/mail-task.svg')" style="width:80px;height:44px" />
                 <div>{{i18n['mailTask']}}</div>
@@ -47,12 +47,12 @@
                 <img data-item="{clazz:'timerCatch',size:'60*35',label:''}"
                      :src="require('../assets/flow/timer-catch.svg')" style="width:58px;height:38px" />
                 <div>{{i18n['timerEvent']}}</div>
-                <img data-item="{clazz:'messageCatch',size:'60*35',label:''}"
+                <!-- <img data-item="{clazz:'messageCatch',size:'60*35',label:''}"
                      :src="require('../assets/flow/message-catch.svg')" style="width:58px;height:38px" />
                 <div>{{i18n['messageEvent']}}</div>
                 <img data-item="{clazz:'signalCatch',size:'60*35',label:''}"
                      :src="require('../assets/flow/signal-catch.svg')" style="width:58px;height:38px" />
-                <div>{{i18n['signalEvent']}}</div>
+                <div>{{i18n['signalEvent']}}</div> -->
             </el-collapse-item>
             <el-collapse-item :title="i18n['end']" name="5">
                 <img data-item="{clazz:'end',size:'50*50',label:''}"
@@ -76,7 +76,7 @@
         activeNames: [],
         userTaskData: "{clazz:'userTask',size:'80*44',label:'"+this.i18n['userTask']+"'}",
         scriptTaskData: "{clazz:'scriptTask',size:'80*44',label:'"+this.i18n['scriptTask']+"'}",
-        javaTaskData: "{clazz:'javaTask',size:'80*44',label:'"+this.i18n['javaTask']+"'}",
+        // javaTaskData: "{clazz:'javaTask',size:'80*44',label:'"+this.i18n['javaTask']+"'}",
         mailTaskData: "{clazz:'mailTask',size:'80*44',label:'"+this.i18n['mailTask']+"'}",
         receiveTaskData: "{clazz:'receiveTask',size:'80*44',label:'"+this.i18n['receiveTask']+"'}",
       };

web/src/view/workflow/workflowCreate/workflowCreate.vue

 <template>
   <div>
-    <el-button size="small" style="float:right;margin-top:6px;margin-right:6px;" @click="saveXML">导出XML</el-button>
-    <el-button size="small" style="float:right;margin-top:6px;margin-right:6px;" @click="saveImg">导出图片</el-button>
-    <el-button size="small" style="float:right;margin-top:6px;margin-right:6px;" @click="save">保存流程</el-button>
-    <gva-wfd ref="wfd" :data="demoData" :height="600" :users="users" :authorities="authorities" :groups="groups" :categorys="categorys" :lang="lang" />
+    <el-button
+      size="small"
+      style="float:right;margin-top:6px;margin-right:6px;"
+      @click="saveXML"
+    >导出XML</el-button>
+    <el-button
+      size="small"
+      style="float:right;margin-top:6px;margin-right:6px;"
+      @click="saveImg"
+    >导出图片</el-button>
+    <el-popover placement="bottom" width="160" v-model="visible">
+      <p>确认流程无误并保存吗</p>
+      <div style="text-align: right; margin: 0">
+        <el-button size="mini" type="text" @click="visible = false">取消</el-button>
+        <el-button type="primary" size="mini" @click="save">确定</el-button>
+      </div>
+      <el-button size="small" slot="reference" style="float:right;margin-top:6px;margin-right:6px;">保存流程</el-button>
+    </el-popover>
+
+    <gva-wfd
+      ref="wfd"
+      :data="demoData"
+      :height="600"
+      :users="users"
+      :authorities="authorities"
+      :groups="groups"
+      :categorys="categorys"
+      :lang="lang"
+    />
   </div>
 </template>
 <script>
-
-
-import gvaWfd from '@/components/gva-wfd'
-import   {getUserList}     from '@/api/user'
-import   {getAuthorityList}     from '@/api/authority'
+import gvaWfd from "@/components/gva-wfd";
+import { getUserList } from "@/api/user";
+import { getAuthorityList } from "@/api/authority";
 export default {
-  name: 'Workflow',
-  components:{
+  name: "Workflow",
+  components: {
     gvaWfd
   },
-  data () {
+  data() {
     return {
+      visible: false,
       lang: "zh",
-      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":[]},
+      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'}],
-      categorys:[{id:'1',name:'分类1'},{id:'2',name:'分类2'},{id:'3',name:'分类3'},{id:'4',分组:'分组4'}]
-    }
+      authorities: [],
+      groups: [
+        { id: "1", name: "组1" },
+        { id: "2", name: "组2" },
+        { id: "3", name: "组3" }
+      ],
+      categorys: [
+        { id: "1", name: "分类1" },
+        { id: "2", name: "分类2" },
+        { id: "3", name: "分类3" },
+        { id: "4", 分组: "分组4" }
+      ]
+    };
   },
-  methods:{
-    save(){
-      console.log(JSON.stringify(this.$refs['wfd'].graph.save()))
+  methods: {
+    save() {
+      this.visible = false;
+      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())
+    saveXML() {
+      console.log(this.$refs["wfd"].graph.saveXML());
     },
-    saveImg(){
-      console.log(this.$refs['wfd'].graph.saveImg())
+    saveImg() {
+      console.log(this.$refs["wfd"].graph.saveImg());
     }
   },
-  async created(){
-   const userRes = await getUserList({page:1,pageSize:9999999})
-   if(userRes.code == 0){
-     userRes.data.list.map(item=>{
-       this.users.push({id:item.ID,name:item.nickName})
-     })
-   }
-   const authorityRes = await getAuthorityList({page:1,pageSize:9999999})
-   if(authorityRes.code == 0){
-     authorityRes.data.list.map(item=>{
-       this.authorities.push({id:item.authorityId,name:item.authorityName})
-     })
-   }
-  },
-}
+  async created() {
+    const userRes = await getUserList({ page: 1, pageSize: 9999999 });
+    if (userRes.code == 0) {
+      userRes.data.list.map(item => {
+        this.users.push({ id: item.ID, name: item.nickName });
+      });
+    }
+    const authorityRes = await getAuthorityList({ page: 1, pageSize: 9999999 });
+    if (authorityRes.code == 0) {
+      authorityRes.data.list.map(item => {
+        this.authorities.push({
+          id: item.authorityId,
+          name: item.authorityName
+        });
+      });
+    }
+  }
+};
 </script>
\ No newline at end of file