You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/08/22 06:16:28 UTC
[incubator-linkis] branch dev-1.3.1 updated: Fixed batch kill tasks - incorrect grouping caused some tasks to fail to kill (#2921)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 64c6bf739 Fixed batch kill tasks - incorrect grouping caused some tasks to fail to kill (#2921)
64c6bf739 is described below
commit 64c6bf739a9529120581a69881c364c502b12a23
Author: peacewong <wp...@gmail.com>
AuthorDate: Mon Aug 22 14:16:22 2022 +0800
Fixed batch kill tasks - incorrect grouping caused some tasks to fail to kill (#2921)
* fix: 287495, 287483
* fix: 288058
* add: license
* remove gitlab-ci file
Co-authored-by: liveipooli(李为) <li...@webank.com>
---
linkis-web/src/apps/linkis/module/ECM/search.vue | 8 ++++----
linkis-web/src/apps/linkis/module/datasource/index.vue | 1 +
.../src/apps/linkis/module/globalHistoryManagement/index.vue | 3 ++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/linkis-web/src/apps/linkis/module/ECM/search.vue b/linkis-web/src/apps/linkis/module/ECM/search.vue
index 09e89b7ca..3e4bfb063 100644
--- a/linkis-web/src/apps/linkis/module/ECM/search.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/search.vue
@@ -18,10 +18,10 @@
<template>
<Form :model="searchBar" :rules="ruleInline" inline @submit.native.prevent>
<FormItem prop="instance" :label="`${$t('message.linkis.instanceName')}`">
- <Input :maxlength="50" v-model="searchBar.instance" :placeholder="$t('message.linkis.instanceName')"/>
+ <Input :maxlength="50" v-model="searchBar.instance" style="width:80px" :placeholder="$t('message.linkis.instanceName')"/>
</FormItem>
<FormItem prop="nodeHealthy" :label="$t('message.linkis.formItems.status.label')">
- <Select v-model="searchBar.nodeHealthy" style="width:200px" clearable>
+ <Select v-model="searchBar.nodeHealthy" style="width:120px" clearable>
<Option
v-for="(item) in statusList"
:label="item"
@@ -30,7 +30,7 @@
</Select>
</FormItem>
<FormItem prop="owner" :label="$t('message.linkis.initiator')" >
- <Select v-model="searchBar.owner" style="width:200px" clearable>
+ <Select v-model="searchBar.owner" style="width:120px" clearable>
<Option
v-for="(item) in ownerList"
:label="item"
@@ -39,7 +39,7 @@
</Select>
</FormItem>
<FormItem v-if="engineTypes.length" prop="engineType" :label="$t('message.linkis.tableColumns.engineType')" >
- <Select v-model="searchBar.engineType" style="width:200px" clearable>
+ <Select v-model="searchBar.engineType" style="width:120px" clearable>
<Option
v-for="(item) in engineTypes"
:label="item"
diff --git a/linkis-web/src/apps/linkis/module/datasource/index.vue b/linkis-web/src/apps/linkis/module/datasource/index.vue
index f4fae6658..ab0892b6e 100644
--- a/linkis-web/src/apps/linkis/module/datasource/index.vue
+++ b/linkis-web/src/apps/linkis/module/datasource/index.vue
@@ -746,6 +746,7 @@ export default {
border: 0;
height: calc(100% - 110px);
width: 100%;
+ overflow-y: auto;
.ivu-table:before {
height: 0
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
index 218ba5aca..57f75ccbc 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -458,7 +458,8 @@ export default {
createdTime: item.createdTime,
progress: item.progress,
failedReason: getFailedReason(item),
- runType: item.runType
+ runType: item.runType,
+ instance: item.instance
}
})
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org