Merge branch 'master' of http://139.159.239.83:9093/mxl/ETL-admin into master

src/api/kettle/file.js

@@ -245,6 +245,14 @@ export function doTrans(data) {
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+//删除资源库
+export function drop(data) {
+  return request({
+    url: 'etlweb/repository/drop',
+    data,
+    method: 'post'
+  })
+}
 
 
 
 
 
 

src/views/dashboard-kettle/components/designer/mxgraphDesigner.vue

@@ -1411,7 +1411,7 @@ export default {
           //更新
           //更新
           this.updateVisible = !this.updateVisible;
           this.updateVisible = !this.updateVisible;
           return;
           return;
-        } else if (cell.ids == "step14") {
+        } else if (cell.ids == "step15") {
           //文本文件输出
           //文本文件输出
           this.fileVisible = !this.fileVisible;
           this.fileVisible = !this.fileVisible;
           return;
           return;
@@ -1423,15 +1423,15 @@ export default {
           //插入、更新
           //插入、更新
           this.InsertOrUpdateVisible = !this.InsertOrUpdateVisible;
           this.InsertOrUpdateVisible = !this.InsertOrUpdateVisible;
           return;
           return;
-        } else if (cell.ids == "step11") {
+        } else if (cell.ids == "step10") {
           //删除
           //删除
           this.deleteVisible = !this.deleteVisible;
           this.deleteVisible = !this.deleteVisible;
           return;
           return;
-        } else if (cell.ids == "step10") {
+        } else if (cell.ids == "step11") {
           //SQL文件输出
           //SQL文件输出
           this.sqlVisible = !this.sqlVisible;
           this.sqlVisible = !this.sqlVisible;
           return;
           return;
-        } else if (cell.ids == "step9") {
+        } else if (cell.ids == "step9" || cell.ctype == "TextFileInput") {
           //Excel输出
           //Excel输出
           this.excelOutPutVisible = !this.excelOutPutVisible;
           this.excelOutPutVisible = !this.excelOutPutVisible;
           return;
           return;
@@ -1757,10 +1757,10 @@ export default {
       save(pamers).then((res) => {
       save(pamers).then((res) => {
         console.log(res);
         console.log(res);
         if (res.success) {
         if (res.success) {
-          that.$message.success("保存流程成功！暂时请查先看控制台。");
+          this.$message.success("保存流程成功！暂时请查先看控制台。");
           this.createGraph();
           this.createGraph();
         } else {
         } else {
-          that.$message.error(res.errMsg);
+          this.$message.error(res.errMsg);
         }
         }
       });
       });
     },
     },
@@ -1855,6 +1855,7 @@ export default {
     //输出组件保存************************
     //输出组件保存************************
     saveOutputDialog(params){
     saveOutputDialog(params){
       // var graph = getActiveGraph().getGraph();
       // var graph = getActiveGraph().getGraph();
+      
       var outPutForm=params;
       var outPutForm=params;
 			this.graph.getModel().beginUpdate();
 			this.graph.getModel().beginUpdate();
 	        try
 	        try
@@ -1868,6 +1869,7 @@ export default {
 	        {
 	        {
 	            this.graph.getModel().endUpdate();
 	            this.graph.getModel().endUpdate();
 	        }
 	        }
+          console.log('保存组件到画布===',this.graph);
     }
     }
     //输出组件保存******************/
     //输出组件保存******************/
   },
   },

src/views/kettle/home2.vue

@@ -28,6 +28,7 @@
                                         </template>
                                         </template>
                                     </el-dropdown-item>
                                     </el-dropdown-item>
                                     <el-dropdown-item style="text-align:right" @click.native="createFile()">新建目录</el-dropdown-item>
                                     <el-dropdown-item style="text-align:right" @click.native="createFile()">新建目录</el-dropdown-item>
+                                    <el-dropdown-item style="text-align:right" @click.native="deleteFile()">删除</el-dropdown-item>
                                     <el-dropdown-item class="text-center">打开</el-dropdown-item>
                                     <el-dropdown-item class="text-center">打开</el-dropdown-item>
                                 </el-dropdown-menu>
                                 </el-dropdown-menu>
                             </el-dropdown>
                             </el-dropdown>
@@ -344,7 +345,7 @@ import dialogRemind from '../dialogs-components/dialog-remind'//删除提示弹
 
 
 
 
 
 
-import {explorer,features,remove,checkInit} from "@/api/kettle/file";
+import {explorer,features,remove,checkInit,drop} from "@/api/kettle/file";
 import {
 import {
   types,
   types,
   getLinkList,
   getLinkList,
@@ -381,6 +382,7 @@ export default {
 props: ["dragItem"],
 props: ["dragItem"],
     data() {
     data() {
       return {
       return {
+          curNode:{},//删除资源库文件当前点击的节点
         curNodeText:'数据库名称',//当前点击选中的资源库节点
         curNodeText:'数据库名称',//当前点击选中的资源库节点
         blankCanvas:"",//空白画布xml
         blankCanvas:"",//空白画布xml
         graph:null,
         graph:null,
@@ -1218,8 +1220,31 @@ props: ["dragItem"],
         }
         }
 
 
     },
     },
+    // 删除资源库文件
+    deleteFile(){
+        console.log("删除当前节点==========",this.curNode);
+        var path=this.curNode.data.path;
+        var type=this.curNode.data.type;
+        if(type==null){
+            type=''
+        }
+
+        let pamer = new FormData(); // 创建form对象
+            pamer.append("path", path);
+            pamer.append("type", type);
+         drop(pamer).then(res=>{
+            if(res){
+                console.log('删除资源库文件==',res)
+                this.$message.success('删除成功');
+                // 刷新
+                this.explorer('');
+            }
+        })
+
+    },
     handleNodeClick(data,node){
     handleNodeClick(data,node){
         console.log('点击当前节点===',node);
         console.log('点击当前节点===',node);
+        this.curNode=node;//当前选中节点
         this.nodePath=data.path;//当前选择数
         this.nodePath=data.path;//当前选择数
         this.curNodeIconCls=data.iconCls;//当前选中节点
         this.curNodeIconCls=data.iconCls;//当前选中节点
         this.nodePath=data.path;
         this.nodePath=data.path;