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

Dev 1.10.0 webank #698

Merged
merged 13 commits into from
Dec 31, 2024
Merged

Dev 1.10.0 webank #698

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
80665ce
chore: 1.9.0
mayinrain Nov 19, 2024
c5f9729
feat: 1.10.0
mayinrain Dec 19, 2024
7557192
fix
mayinrain Dec 19, 2024
817c450
handle conflict
mayinrain Dec 19, 2024
aecbf02
upd: 新增loading展示
mayinrain Dec 23, 2024
dce4bf5
fix: udf类型判断条件修复
mayinrain Dec 27, 2024
6fcbd04
Merge branch 'dev-1.10.0-webank' of github.com:WeDataSphere/linkis in…
mayinrain Dec 27, 2024
ea4002b
fix: 注册函数展示逻辑修复
mayinrain Dec 27, 2024
df44801
upd: 函数管理新增/编辑支持kill引擎
mayinrain Dec 27, 2024
f239a46
upd: license缩进调整
mayinrain Dec 27, 2024
83f64e5
upd: 函数管理交互更新
mayinrain Dec 31, 2024
cafe863
fix
mayinrain Dec 31, 2024
f721255
handle conflict
mayinrain Dec 31, 2024
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
8 changes: 4 additions & 4 deletions linkis-web/src/apps/URM/module/functionManagement/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ export default {
this.isLoading = false
this.loading = false
if (data.defaultLoad) {
this.confirmKillIdle(data)
this.confirmKillIdle()
}
})
.catch(() => {
Expand Down Expand Up @@ -426,7 +426,7 @@ export default {
this.search()
this.$Message.success(this.$t('message.linkis.udf.success'));
if (data.defaultLoad) {
this.confirmKillIdle(data)
this.confirmKillIdle()
}
})
.catch(() => {
Expand Down Expand Up @@ -669,15 +669,15 @@ export default {
})
}
},
confirmKillIdle(data) {
confirmKillIdle() {
this.$Modal.confirm({
title: this.$t('message.linkis.setting.killEngineTitle'),
content: this.$t('message.linkis.setting.killEngine'),
onOk: async () => {
try {
api.fetch("/linkisManager/rm/killEngineByCreatorEngineType", {
creator: '*',
engineType: [1, 2].includes(data.udfType) ? 'spark' : '*'
engineType: 'spark'
})
} catch (err) {
window.console.warn(err)
Expand Down
Loading