Merge pull request #559 from demonray/master

Fix JDBC node

Author: wushengyeyouya

web/package.json

@@ -74,6 +74,7 @@
         "svg-sprite-loader": "5.0.0",
         "vue-cli-plugin-mockjs": "0.1.3",
         "vue-template-compiler": "2.6.12",
+        "webpack": "4.46.0",
         "webpack-virtual-modules": "0.3.2"
     }
 }

web/src/apps/scriptis/module/workbench/container.vue

@@ -456,8 +456,8 @@ export default {
               const methodName = 'Workbench:add';
               const supportModes = this.getSupportModes();
               const model = this.node.modelType;
-              const match = supportModes.find((s) => s.flowType && s.flowType.toLowerCase() == model);
-              const name = `${this.node.name || this.node.key}${match.ext}`;
+              const match = supportModes.find((s) => (s.flowType || s.scriptType || '').toLowerCase() == model) || {};
+              const name = `${this.node.name || this.node.key}${match.ext||''}`;
               this[methodName]({
                 id: this.node.key,
                 filename: this.node.jobContent && this.node.jobContent.script ? this.node.jobContent.script : name,

web/src/apps/workflows/service/nodeType.js

@@ -55,15 +55,17 @@ const NODETYPE = {
   EXCHANGE: 'linkis.data.exchange',
   QUALITIS: 'linkis.appconn.qualitis',
   PROJECTNODE: 'projectNode',
-  MLSS: 'linkis.appconn.mlss'
+  MLSS: 'linkis.appconn.mlss',
+  JDBC: 'linkis.jdbc.jdbc',
 }
 const ext = {
   [NODETYPE.SHELL]: 'shell',
   [NODETYPE.HQL]: 'hql',
   [NODETYPE.SPARKSQL]: 'sql',
   [NODETYPE.SPARKPY]: 'pyspark',
   [NODETYPE.SCALA]: 'scala',
-  [NODETYPE.PYTHON]: 'python'
+  [NODETYPE.PYTHON]: 'python',
+  [NODETYPE.JDBC]: 'jdbc'
 }
 const NODEICON = {
   [NODETYPE.SHELL]: {

web/vue.config.js

@@ -107,6 +107,8 @@ function resolve(dir) {
 module.exports = {
   publicPath: './',
   outputDir: 'dist/dist',
+  lintOnSave: process.env.NODE_ENV !== "production", // build无需eslint
+  productionSourceMap: process.env.NODE_ENV === "dev", // 生产环境无需source map加速构建
   chainWebpack: (config) => {
     // set svg-sprite-loader
     config.module
@@ -168,4 +170,4 @@ module.exports = {
       }
     }
   }
-}
+}