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

# Conflicts:
#	src/views/dashboard-kettle/components/designer/modules/node_menu.vue

src/api/kettle/link.js

@@ -158,6 +158,40 @@ export function inputOutputFields(data){
 
 
 
+//内容编码
+export function availableCharsets(data){
+  return request({
+    url: 'etlweb/system/availableCharsets',
+    data,
+    method: 'post'
+  })
+}
+
+
+
+
+
+//字段格式
+export function valueFormat(data){
+  return request({
+    url: 'etlweb/system/valueFormat',
+    data,
+    method: 'post'
+  })
+}
+
+
+//字段类型
+export function valueMeta(data){
+  return request({
+    url: 'etlweb/system/valueMeta',
+    data,
+    method: 'post'
+  })
+}
+
+
+
 
 
 

src/views/kettle/home.vue

@@ -1310,7 +1310,7 @@ export default {
           type: nodeMenu.type, //节点类型
           left: left + 'px', //坐标
           top: top + 'px', //坐标
-          ico: this.prefix+nodeMenu.icon, //图标
+          ico: nodeMenu.icon, //图标
         }
         console.log(node);