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

.env.development

@@ -4,8 +4,8 @@ VUE_APP_BASE_API  = 'http://192.168.0.2:9888/'
 VUE_APP_WS_API = 'ws://192.168.0.2:9888/'
 VUE_APP_WS_API = 'ws://192.168.0.2:9888/'
 
 
 
 
-# VUE_APP_BASE_API  = 'http://192.168.0.44:9888/'
-# VUE_APP_WS_API = 'ws://192.168.0.44:9888/'
+#VUE_APP_BASE_API  = 'http://192.168.0.44:9888/'
+#VUE_APP_WS_API = 'ws://192.168.0.44:9888/'
 
 
 
 
 
 

package.json

@@ -51,6 +51,7 @@
     "jszip": "3.1.5",
     "jszip": "3.1.5",
     "mavon-editor": "^2.9.0",
     "mavon-editor": "^2.9.0",
     "moment": "^2.29.1",
     "moment": "^2.29.1",
+    "mxgraph": "^4.2.2",
     "node-sass": "^5.0.0",
     "node-sass": "^5.0.0",
     "normalize.css": "7.0.0",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",
     "nprogress": "0.2.0",

src/api/kettle/link.js

@@ -116,6 +116,45 @@ export function drop(data){
 
 
 
 
 
 
+//etl工具列表
+export function steps(data){
+  return request({
+    url: 'etlweb/system/steps',
+    data,
+    method: 'post'
+  })
+}
+
+
+
+//表格类型
+export function excelSheetType(data){
+  return request({
+    url: 'etlweb/system/excelSheetType',
+    data,
+    method: 'post'
+  })
+}
+
+
+//从哪个步骤读文件名
+export function previousSteps(data){
+  return request({
+    url: 'etlweb/trans/previousSteps',
+    data,
+    method: 'post'
+  })
+}
+
+
+//保存文件名的字段
+export function inputOutputFields(data){
+  return request({
+    url: 'etlweb/trans/inputOutputFields',
+    data,
+    method: 'post'
+  })
+}
 
 
 
 
 
 

src/views/dashboard-kettle/components/designer/modules/index.js

+import mx from 'mxgraph';
+const mxgraph = mx({
+ mximagebasepath: './src/images',
+ mxbasepath: './src'
+});
+// decode bug https://github.com/jgraph/mxgraph/issues/49
+window.mxgraph = mxgraph.mxgraph;
+window.mxgraphmodel = mxgraph.mxgraphmodel;
+window.mxeditor = mxgraph.mxeditor;
+window.mxgeometry = mxgraph.mxgeometry;
+window.mxdefaultkeyhandler = mxgraph.mxdefaultkeyhandler;
+window.mxdefaultpopupmenu = mxgraph.mxdefaultpopupmenu;
+window.mxstylesheet = mxgraph.mxstylesheet;
+window.mxdefaulttoolbar = mxgraph.mxdefaulttoolbar;
+export default mxgraph;
\ No newline at end of file

src/views/dashboard-kettle/components/designer/modules/node.vue

@@ -10,7 +10,8 @@
         <!-- <div class="ef-node-left"></div> -->
         <!-- <div class="ef-node-left"></div> -->
         <!-- 节点类型的图标 -->
         <!-- 节点类型的图标 -->
         <div class="el-node-icon ef-node-left-ico flow-node-drag">
         <div class="el-node-icon ef-node-left-ico flow-node-drag">
-            <i :class="nodeIcoClass"></i>
+            <img :src="node.ico" alt="" class=" flow-node-drag">
+            <!-- <i :class="nodeIcoClass"></i> -->
         </div>
         </div>
         <!-- 节点名称 -->
         <!-- 节点名称 -->
         <div class="ef-node-text" :show-overflow-tooltip="true">
         <div class="ef-node-text" :show-overflow-tooltip="true">

src/views/kettle/home.vue

@@ -79,6 +79,7 @@
 
 
                             <span class="custom-tree-node" slot-scope="{node,data}">
                             <span class="custom-tree-node" slot-scope="{node,data}">
                                 <span>
                                 <span>
+                                    
                                     <i class="el-icon-folder"></i>{{ node.label }}
                                     <i class="el-icon-folder"></i>{{ node.label }}
                                 </span> 
                                 </span> 
                             </span>
                             </span>
@@ -482,6 +483,7 @@
 
 
                     <span class="custom-tree-node" slot-scope="{node,data}">
                     <span class="custom-tree-node" slot-scope="{node,data}">
                         <span>
                         <span>
+                            
                             <i class="el-icon-folder"></i>{{ node.label }}
                             <i class="el-icon-folder"></i>{{ node.label }}
                         </span> 
                         </span> 
                     </span>
                     </span>
@@ -546,6 +548,9 @@ import {
   loginRepository,//连接数据库
   loginRepository,//连接数据库
   addRepository,//资源库信息
   addRepository,//资源库信息
 } from "@/api/kettle/link";
 } from "@/api/kettle/link";
+
+
+
 export default {
 export default {
     components: {
     components: {
         FlowDesigner,
         FlowDesigner,
@@ -728,6 +733,14 @@ export default {
         // this.test();
         // this.test();
     },
     },
     methods: {
     methods: {
+
+
+      
+
+
+
+
+
         // 左边文件夹和右边画布的宽度可以拖拽调整
         // 左边文件夹和右边画布的宽度可以拖拽调整
         dragControllerDiv: function () {
         dragControllerDiv: function () {
                var resize = document.getElementsByClassName('resize');
                var resize = document.getElementsByClassName('resize');
@@ -1175,6 +1188,7 @@ export default {
           console.log('天加evt==',evt);
           console.log('天加evt==',evt);
           console.log('天加nodeMenu==',draggingNode.data);
           console.log('天加nodeMenu==',draggingNode.data);
           var nodeMenu=draggingNode.data;
           var nodeMenu=draggingNode.data;
+        
         // var screenX = evt.originalEvent.clientX, screenY = evt.originalEvent.clientY
         // var screenX = evt.originalEvent.clientX, screenY = evt.originalEvent.clientY
         // let efContainer = this.$refs.efContainer
         // let efContainer = this.$refs.efContainer
         var screenX = evt.clientX, screenY = evt.clientY
         var screenX = evt.clientX, screenY = evt.clientY
@@ -1203,12 +1217,13 @@ export default {
         console.log('-------003',nodeMenu.type);
         console.log('-------003',nodeMenu.type);
         var node = {
         var node = {
           id: nodeId, //节点id--前端唯一的
           id: nodeId, //节点id--前端唯一的
-          name: nodeName, //节点名称
+          name: nodeMenu.text, //节点名称
           type: nodeMenu.type, //节点类型
           type: nodeMenu.type, //节点类型
           left: left + 'px', //坐标
           left: left + 'px', //坐标
           top: top + 'px', //坐标
           top: top + 'px', //坐标
-          ico: nodeMenu.ico, //图标
+          ico: this.prefix+nodeMenu.icon, //图标
         }
         }
+        console.log(node);
         
         
         /**
         /**
          * 这里可以进行业务判断、是否能够添加该节点
          * 这里可以进行业务判断、是否能够添加该节点