From 4debe19f84bd83eb9d8f5e9e750cc86cb9c034e4 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Tue, 21 Jun 2022 20:50:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=90=8D=E7=A7=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/components/ProcessDesigner/index.vue   | 6 ++----
 ruoyi-ui/src/views/workflow/definition/designer.vue | 7 +++----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/components/ProcessDesigner/index.vue b/ruoyi-ui/src/components/ProcessDesigner/index.vue
index 57f2065e..7a5242d9 100644
--- a/ruoyi-ui/src/components/ProcessDesigner/index.vue
+++ b/ruoyi-ui/src/components/ProcessDesigner/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="process-design" :style="'display: flex; height:' + height">
     <bpmn-process-designer
-      :key="`designer-${reloadIndex}`"
       v-model="xmlString"
       v-bind="controlForm"
       keyboard
@@ -17,7 +16,7 @@
       @event="handlerEvent"
       @save="onSaveProcess"
     />
-    <bmpn-process-penal :key="`penal-${reloadIndex}`" :bpmn-modeler="modeler" :prefix="controlForm.prefix" class="process-panel" />
+    <bmpn-process-penal :bpmn-modeler="modeler" :prefix="controlForm.prefix" class="process-panel" />
   </div>
 </template>
 
@@ -52,11 +51,10 @@ export default {
   data () {
     return {
       height: document.documentElement.clientHeight - 94.5 + "px;",
-      reloadIndex: 0,
       xmlString: this.bpmnXml,
       modeler: null,
       controlForm: {
-        processId: this.designerForm.processId || '',
+        processId: this.designerForm.processKey || '',
         processName: this.designerForm.processName || '',
         simulation: false,
         labelEditing: false,
diff --git a/ruoyi-ui/src/views/workflow/definition/designer.vue b/ruoyi-ui/src/views/workflow/definition/designer.vue
index 16524283..7c905d89 100644
--- a/ruoyi-ui/src/views/workflow/definition/designer.vue
+++ b/ruoyi-ui/src/views/workflow/definition/designer.vue
@@ -25,7 +25,7 @@
         </el-row>
       </el-header>
       <el-main>
-        <div v-show="activeStep === 0">
+        <div v-if="activeStep === 0">
           <div class="app-container">
             <el-form size="small" label-width="80px">
               <el-form-item label="流程标识">
@@ -48,16 +48,15 @@
             </el-form>
           </div>
         </div>
-        <div v-show="activeStep === 1">
+        <div v-if="activeStep === 1">
           <process-designer
             ref="modelDesigner"
             v-loading="loading"
-            :key="`designer-${loadIndex}`"
             :bpmnXml="bpmnXml"
             :designerForm="designerForm"
           />
         </div>
-        <div v-show="activeStep === 2">
+        <div v-if="activeStep === 2">
           <el-result :icon="result.icon" :title="result.title" :subTitle="result.describe">
             <template slot="extra">
               <el-button type="primary" size="medium" @click="onClose()">关闭</el-button>