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']+"'}",
       };