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/25 06:11:27 UTC
[incubator-linkis] branch dev-1.3.1 updated: Fix console display issues and request parameter issues (#2986)
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 6569e8c75 Fix console display issues and request parameter issues (#2986)
6569e8c75 is described below
commit 6569e8c7569d4eb1a9b82f6f67e837070d4736c1
Author: mayinrain <73...@users.noreply.github.com>
AuthorDate: Thu Aug 25 14:11:21 2022 +0800
Fix console display issues and request parameter issues (#2986)
* fix: Keep uppercase and lowercase the same
* fix: Adjust the task progress bar to the center
* fix: Omit if the status panel engine name is too long
* fix: Change request parameters while switching creators
---
.../src/apps/linkis/components/progress/index.vue | 6 +-
.../linkis/module/resourceManagement/index.vue | 6 +-
linkis-web/src/common/i18n/en.json | 4 +-
linkis-web/src/components/virtualTable/index.scss | 3 +-
.../src/dss/module/resourceSimple/engine.vue | 96 ++++++++++++----------
5 files changed, 65 insertions(+), 50 deletions(-)
diff --git a/linkis-web/src/apps/linkis/components/progress/index.vue b/linkis-web/src/apps/linkis/components/progress/index.vue
index e324f5faf..c26cfcae0 100644
--- a/linkis-web/src/apps/linkis/components/progress/index.vue
+++ b/linkis-web/src/apps/linkis/components/progress/index.vue
@@ -44,6 +44,10 @@ export default {
children: {
type: Boolean,
default: false
+ },
+ parentData: {
+ type: Object,
+ default: () => {}
}
},
data() {
@@ -55,7 +59,7 @@ export default {
expandChange() {
// 返回父组件更改展开状态
if(!this.children) this.progressData.expand = !this.progressData.expand;
- this.$emit('expandChange', this.progressData, this.children)
+ this.$emit('expandChange', this.progressData, this.children, this.parentData)
}
}
}
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index e47b827c7..20efce49d 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -87,7 +87,7 @@
<WbProgress @expandChange="expandChange" :progressData="item">
</WbProgress>
<template v-for="subItem in item.engineTypes">
- <WbProgress v-if="item.expand" :key="subItem.id" @expandChange="expandChange" :progressData="subItem" :children="true"></WbProgress>
+ <WbProgress v-if="item.expand" :key="subItem.id" @expandChange="expandChange" :progressData="subItem" :children="true" :parentData="item"></WbProgress>
</template>
</div>
</template>
@@ -465,7 +465,7 @@ export default {
}
},
// 展开和关闭
- async expandChange(item, isChildren = false) {
+ async expandChange(item, isChildren = false, parentData = {},) {
// 显示表格
this.isShowTable = true;
this.isChildren = isChildren;
@@ -484,7 +484,7 @@ export default {
this.tagTitle = Object.assign(this.tagTitle, [this.currentParentsData.userCreator, item.engineType])
}
let parameter = {
- userCreator: this.currentParentsData.userCreator,
+ userCreator: isChildren ? parentData.userCreator : this.currentParentsData.userCreator,
engineType: isChildren ? this.currentEngineData.engineType : undefined
};
try {
diff --git a/linkis-web/src/common/i18n/en.json b/linkis-web/src/common/i18n/en.json
index 1c77857b1..84b285c0d 100644
--- a/linkis-web/src/common/i18n/en.json
+++ b/linkis-web/src/common/i18n/en.json
@@ -203,8 +203,8 @@
"QDYQWFJS": "Cannot shut down an engine with starting status!",
"WXZYQ": "No engine selected!",
"RWGLQ": "Task Management",
- "YQGLQ": "Engine management",
- "DLGLQ": "Queue management",
+ "YQGLQ": "Engine Management",
+ "DLGLQ": "Queue Management",
"SX": "Refresh",
"JSRW": "Cancel task",
"JSYQ": "Shut down engine",
diff --git a/linkis-web/src/components/virtualTable/index.scss b/linkis-web/src/components/virtualTable/index.scss
index ec508b6aa..5bc010d8d 100644
--- a/linkis-web/src/components/virtualTable/index.scss
+++ b/linkis-web/src/components/virtualTable/index.scss
@@ -179,8 +179,7 @@ $border-color: #e0e0e0;
vertical-align: middle;
.we-table-row-label {
line-height: 20px;
- padding-left: 18px;
- padding-right: 18px;
+ padding-left: 3px;
overflow: hidden;
text-overflow: ellipsis;
white-space: normal;
diff --git a/linkis-web/src/dss/module/resourceSimple/engine.vue b/linkis-web/src/dss/module/resourceSimple/engine.vue
index dcc8e24ae..7f2c00d8e 100644
--- a/linkis-web/src/dss/module/resourceSimple/engine.vue
+++ b/linkis-web/src/dss/module/resourceSimple/engine.vue
@@ -44,20 +44,22 @@
<ul class="engine-ul">
<template
v-for="(subitem, index) in ideEngineList">
- <li
- class="engine-li"
- :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
- v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
- :key="index"
- @click="subitem.isActive = !subitem.isActive">
- <span>{{ calssifyName(subitem.engineType) }}</span>
- <!-- <SvgIcon class='engine-icon job-content-icon' :class="supportIcon(subitem).className" icon-class="common" style='font-size: 30px;' :color="supportIcon(subitem).color === 'yellow' ? '#f4cf2a': supportIcon(subitem).color"/> -->
- <Icon
- v-show="subitem.isActive"
- class="engine-right"
- :class="supportColor(subitem.engineStatus)"
- type="md-checkmark"></Icon>
- </li>
+ <Tooltip :key="index" :content="calssifyName(subitem.engineType)" placement="left" :disabled="calssifyName(subitem.engineType).length < 8">
+ <li
+ class="engine-li"
+ :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
+ v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
+ :key="index"
+ @click="subitem.isActive = !subitem.isActive">
+ <span class="ellipsis">{{ calssifyName(subitem.engineType) }}</span>
+ <!-- <SvgIcon class='engine-icon job-content-icon' :class="supportIcon(subitem).className" icon-class="common" style='font-size: 30px;' :color="supportIcon(subitem).color === 'yellow' ? '#f4cf2a': supportIcon(subitem).color"/> -->
+ <Icon
+ v-show="subitem.isActive"
+ class="engine-right"
+ :class="supportColor(subitem.engineStatus)"
+ type="md-checkmark"></Icon>
+ </li>
+ </Tooltip>
</template>
</ul>
</div>
@@ -85,20 +87,22 @@
<ul class="engine-ul">
<template
v-for="(subitem, index) in boardEngineList">
- <li
- class="engine-li"
- :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
- v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
- :key="index"
- @click="subitem.isActive = !subitem.isActive">
- <span>{{ calssifyName(subitem.engineType) }}</span>
- <!-- <SvgIcon class='engine-icon job-content-icon' :class="supportIcon(subitem).className" icon-class="common" style='font-size: 30px;' :color="supportIcon(subitem).color === 'yellow' ? '#f4cf2a': supportIcon(subitem).color"/>-->
- <Icon
- v-show="subitem.isActive"
- class="engine-right"
- :class="supportColor(subitem.engineStatus)"
- type="md-checkmark"></Icon>
- </li>
+ <Tooltip :key="index" :content="calssifyName(subitem.engineType)" placement="left" :disabled="calssifyName(subitem.engineType).length < 8">
+ <li
+ class="engine-li"
+ :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
+ v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
+ :key="index"
+ @click="subitem.isActive = !subitem.isActive">
+ <span class="ellipsis">{{ calssifyName(subitem.engineType) }}</span>
+ <!-- <SvgIcon class='engine-icon job-content-icon' :class="supportIcon(subitem).className" icon-class="common" style='font-size: 30px;' :color="supportIcon(subitem).color === 'yellow' ? '#f4cf2a': supportIcon(subitem).color"/>-->
+ <Icon
+ v-show="subitem.isActive"
+ class="engine-right"
+ :class="supportColor(subitem.engineStatus)"
+ type="md-checkmark"></Icon>
+ </li>
+ </Tooltip>
</template>
</ul>
</div>
@@ -126,20 +130,22 @@
<ul class="engine-ul">
<template
v-for="(subitem, index) in otherEngineList">
- <li
- class="engine-li"
- :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
- v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
- :key="index"
- @click="subitem.isActive = !subitem.isActive">
- <span>{{ calssifyName(subitem.engineType) }}</span>
- <!-- <SvgIcon class='engine-icon job-content-icon' :class="supportIcon(subitem).className" icon-class="common" style='font-size: 30px;' :color="supportIcon(subitem).color === 'yellow' ? '#f4cf2a': supportIcon(subitem).color"/>-->
- <Icon
- v-show="subitem.isActive"
- class="engine-right"
- :class="supportColor(subitem.engineStatus)"
- type="md-checkmark"></Icon>
- </li>
+ <Tooltip :key="index" :content="calssifyName(subitem.engineType)" placement="left" :disabled="calssifyName(subitem.engineType).length < 8">
+ <li
+ class="engine-li"
+ :class="[{'active': subitem.isActive}, supportColor(subitem.engineStatus)]"
+ v-if="subitem.engineType === item || subitem.engineStatus === item || (item === 'Idle' && (subitem.engineStatus === 'Error' || subitem.engineStatus === 'ShuttingDown' || subitem.engineStatus === 'Dead'))"
+ :key="index"
+ @click="subitem.isActive = !subitem.isActive">
+ <span class="ellipsis">{{ calssifyName(subitem.engineType) }}</span>
+ <!-- <SvgIcon class='engine-icon job-content-icon' :class="supportIcon(subitem).className" icon-class="common" style='font-size: 30px;' :color="supportIcon(subitem).color === 'yellow' ? '#f4cf2a': supportIcon(subitem).color"/>-->
+ <Icon
+ v-show="subitem.isActive"
+ class="engine-right"
+ :class="supportColor(subitem.engineStatus)"
+ type="md-checkmark"></Icon>
+ </li>
+ </Tooltip>
</template>
</ul>
</div>
@@ -392,5 +398,11 @@ export default {
.blue {
color: #2d8cf0;
}
+ .ellipsis {
+ overflow: hidden;
+ text-overflow:ellipsis;
+ display: inline-block;
+ white-space: nowrap;
+ }
</style>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org