Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix JDBC node #559

Merged
merged 2 commits into from
Apr 11, 2022
Merged

Fix JDBC node #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
facbf60
fix: add webpack pkg &change production config
demonray Apr 1, 2022
dd8e0a2
fix: open jdbc node
demonray Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
4 changes: 2 additions & 2 deletions web/src/apps/scriptis/module/workbench/container.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 4 additions & 2 deletions web/src/apps/workflows/service/nodeType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]: {
Expand Down
4 changes: 3 additions & 1 deletion web/vue.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -168,4 +170,4 @@ module.exports = {
}
}
}
}
}