Merge pull request #25 from zwx-master/master

New python node
WeBankFinTech · Dec 13, 2019 · 88c5ab0 · 88c5ab0
2 parents 363bea2 + 9a30c82
commit 88c5ab0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/web/src/js/module/process/images/newIcon/python.svg b/web/src/js/module/process/images/newIcon/python.svg
diff --git a/web/src/js/module/process/index.vue b/web/src/js/module/process/index.vue
@@ -208,7 +208,7 @@ export default {
           }
         }
       }
-      if ([NODETYPE.SPARKSQL, NODETYPE.HQL, NODETYPE.SPARKPY, NODETYPE.SHELL, NODETYPE.SCALA].indexOf(node.type) !== -1) {
+      if ([NODETYPE.SPARKSQL, NODETYPE.HQL, NODETYPE.SPARKPY, NODETYPE.SHELL, NODETYPE.SCALA, NODETYPE.PYTHON].indexOf(node.type) !== -1) {
         const len = node.resources ? node.resources.length : 0;
         if (len && node.jobContent && node.jobContent.script) { // 判断是否有保存过脚本
           const resourceId = node.resources[0].resourceId;

diff --git a/web/src/js/module/process/shape.js b/web/src/js/module/process/shape.js
@@ -66,6 +66,13 @@ export default [
       image: NODEICON[NODETYPE.SCALA].icon,
       editParam: false,
       editBaseInfo: false,
+    },
+    {
+      type: NODETYPE.PYTHON,
+      title: 'python',
+      image: NODEICON[NODETYPE.PYTHON].icon,
+      editParam: false,
+      editBaseInfo: false,
     }],
   },
   {

diff --git a/web/src/js/service/mixin.js b/web/src/js/service/mixin.js
@@ -31,7 +31,7 @@ export default {
         { rule: /\.scala$/i, lang: 'java', executable: true, application: 'spark', runType: 'scala', ext: '.scala', scriptType: 'scala', abbr: 'scala', logo: 'fi-scala', isCanBeNew: true, label: 'Scala', isCanBeOpen: true, flowType: 'scala' },
         { rule: /\.scala$/i, lang: 'java', executable: true, application: 'spark', runType: 'function.mdq', ext: '.scala', scriptType: 'scala', abbr: 'scala', logo: 'fi-scala', isCanBeNew: false, label: 'Scala', isCanBeOpen: true },
         { rule: /\.jdbc$/i, lang: 'hql', executable: true, application: 'jdbc', runType: 'jdbc', ext: '.jdbc', scriptType: 'jdbc', abbr: 'jdbc', logo: 'fi-jdbc', isCanBeNew: true, label: 'JDBC', isCanBeOpen: true },
-        { rule: /\.python$/i, lang: 'python', executable: true, application: 'python', runType: 'python', ext: '.python', scriptType: 'python', abbr: 'py', logo: 'fi-python', isCanBeNew: true, label: 'Python', isCanBeOpen: true },
+        { rule: /\.python$/i, lang: 'python', executable: true, application: 'python', runType: 'python', ext: '.python', scriptType: 'python', abbr: 'py', logo: 'fi-python', isCanBeNew: true, label: 'Python', isCanBeOpen: true, flowType: 'python' },
         { rule: /\.py$/i, lang: 'python', executable: true, application: 'spark', runType: 'python', ext: '.py', scriptType: 'pythonSpark', abbr: 'py', logo: 'fi-spark-python', isCanBeNew: true, label: 'PythonSpark', isCanBeOpen: true, flowType: 'pyspark' },
         { rule: /\.r$/i, lang: 'r', executable: true, application: 'spark', runType: 'r', ext: '.r', scriptType: 'r', abbr: 'r', logo: 'fi-r', isCanBeNew: true, label: 'R', isCanBeOpen: true },
         { rule: /\.sh$/i, lang: 'sh', executable: true, application: 'shell', runType: 'shell', ext: '.sh', scriptType: 'shell', abbr: 'shell', logo: 'fi-r', isCanBeNew: false, label: 'Shell', isCanBeOpen: true, flowType: 'shell' },

diff --git a/web/src/js/service/nodeType.js b/web/src/js/service/nodeType.js
@@ -18,7 +18,7 @@
 import shell from '../module/process/images/shell.svg';
 import flow from '../module/process/images/newIcon/flow.svg';
 import eventchecker from '../module/process/images/newIcon/eventcheckerf.svg';
-import Python from '../module/process/images/pyspark.svg';
+import sparkPython from '../module/process/images/pyspark.svg';
 import sql from '../module/process/images/newIcon/spark.svg';
 import hivesql from '../module/process/images/newIcon/hive.svg';
 import veceive from '../module/process/images/newIcon/eventcheckerw.svg';
@@ -31,12 +31,14 @@ import sendmail from '../module/process/images/newIcon/email.svg';
 import scala from '../module/process/images/scala.svg';
 import exchange from '../module/process/images/newIcon/exchange.svg';
 import qualitis from '../module/process/images/newIcon/qualitis.svg';
+import python from '../module/process/images/newIcon/python.svg';
 const NODETYPE = {
   SHELL: 'azkaban.shell',
   HQL: 'linkis.hive.hql',
   SPARKSQL: 'linkis.spark.sql',
   SPARKPY: 'linkis.spark.py',
   SCALA: 'linkis.spark.scala',
+  PYTHON: 'linkis.python.python',
   CONNECTOR: 'linkis.control.empty',
   DISPLAY: 'linkis.appjoint.visualis.display',
   DASHBOARD: 'linkis.appjoint.visualis.dashboard',
@@ -54,7 +56,8 @@ const ext = {
   [NODETYPE.HQL]: 'hql',
   [NODETYPE.SPARKSQL]: 'sparksql',
   [NODETYPE.SPARKPY]: 'pyspark',
-  [NODETYPE.SCALA]: 'scala'
+  [NODETYPE.SCALA]: 'scala',
+  [NODETYPE.PYTHON]: 'python'
 }
 const NODEICON = {
   [NODETYPE.SHELL]: {
@@ -70,13 +73,17 @@ const NODEICON = {
     class: {'sql': true}
   },
   [NODETYPE.SPARKPY]: {
-    icon: Python,
-    class: {'Python': true}
+    icon: sparkPython,
+    class: {'sparkPython': true}
   },
   [NODETYPE.SCALA]: {
     icon: scala,
     class: {'scala': true}
   },
+  [NODETYPE.PYTHON]: {
+    icon: python,
+    class: {'python': true}
+  },
   [NODETYPE.CONNECTOR]: {
     icon: connect,
     class: {'connect': true}