Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -144,6 +144,13 @@
           :disabled="simulationStatus"
           >保存模型</el-button
         >
+        <el-button
+          :size="headerButtonSize"
+          :type="headerButtonType"
+          icon="el-icon-back"
+          @click="$emit('close')"
+          >返回</el-button
+        >
       </template>
       <!-- 用于打开本地文件-->
       <input
@@ -267,7 +274,6 @@
     },
     computed: {
       additionalModules() {
-        console.log(2222222222222222222);
         const Modules = [];
         // 仅保留用户自定义扩展模块
         if (this.onlyCustomizeAddi) {

src/views/bpm/model/modelEditor.vue

@@ -4,7 +4,7 @@
     <!-- 流程设计器，负责绘制流程等 -->
     <my-process-designer v-if="xmlString !== undefined" :key="`designer-${reloadIndex}`" v-model="xmlString" v-bind="controlForm"
       keyboard ref="processDesigner" @init-finished="initModeler"
-      @save="save"/>
+      @save="save" @close="close"/>
 
     <!-- 流程属性器，负责编辑每个流程节点的属性 -->
     <my-properties-panel :key="`penal-${reloadIndex}`" :bpmn-modeler="modeler" :prefix="controlForm.prefix" class="process-panel"