解决冲突

src/views/kettle/home2.vue

@@ -93,7 +93,8 @@
         <div class="resize" title="收缩侧边栏">...</div>
         <div class="mid">
             <el-tabs  v-if="tabShowFlag" style="margin-top:-5vh;margin-bottom:0;" v-model="picName" type="card"  closable @tab-remove="removeTab">
-                <el-tab-pane label="数据库名称" >
+                <!-- <el-tab-pane label="数据库名称" > -->
+                <el-tab-pane :label="curNodeText" >
                     <mxgraph-designer ref="pic"  v-if="mxGraphShow" :blankCanvas="blankCanvas"></mxgraph-designer>
                 </el-tab-pane>
             </el-tabs>
@@ -379,7 +380,8 @@ export default {
 props: ["dragItem"],
     data() {
       return {
-          blankCanvas:"",//空白画布xml
+        curNodeText:'数据库名称',//当前点击选中的资源库节点
+        blankCanvas:"",//空白画布xml
         graph:null,
         flowData:[],
 
@@ -1021,7 +1023,10 @@ props: ["dragItem"],
 
 
 
-      removeTab(){},
+      removeTab(){
+        //   this.tabShowFlag=false;//关闭画布
+        //   this.activeName="first";//关闭关闭资源库
+      },
     //选出要传给后台的参数集合便于编辑方法 check
     // chooseParams(objParams){
     //     var newObject={};
@@ -1200,16 +1205,18 @@ props: ["dragItem"],
     },
     handleNodeClick(data,node){
         console.log('点击当前节点===',node);
-        this.nodePath=data.path;//当前选择数
         this.curNodeIconCls=data.iconCls;//当前选中节点
         console.log('当前节点的文件夹路径:',this.nodePath);
-        // console.log(data,'当前节点的父节点:',node.parent.data);
-        let pamer = new FormData(); // 创建form对象
-         pamer.append("path", this.nodePath);
-          pamer.append("type", "transformation");
-        open(pamer).then(res=>{
-            // console.log(res,'返回画布xml');
-            this.blankCanvas = res
+        if(node.data.leaf){
+            this.curNodeText=node.data.text;//当前节点
+            let pamer = new FormData(); // 创建form对象
+            pamer.append("path", this.nodePath);
+            pamer.append("type", "transformation");
+            open(pamer).then(res=>{
+                console.log(res,'返回空白画布xml');
+                this.blankCanvas = res;
+                // this.tabShowFlag=true;//核心对象显项卡显示
+                this.activeName="second";
 
 
 
@@ -1221,11 +1228,20 @@ props: ["dragItem"],
 			// 			var graph = graphPanel.getGraph();
 			// 			decoder.decode(node, graph.getModel());
 
-            //             console.log(esponse.responseText);
+                //             console.log(esponse.responseText);
 
 
 
-        })
+            })
+        }
+        // else{
+        //      this.$message.error('请选择一个资源库！');
+        //     return;
+        // }
+        
+       
+        // console.log(data,'当前节点的父节点:',node.parent.data);
+        
 
     },
     //修改资源库