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/09/28 05:19:36 UTC
[incubator-linkis] branch dev-1.3.0 updated: Omit if the status panel engine name is too long (#3547)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.0 by this push:
new 7a60b8790 Omit if the status panel engine name is too long (#3547)
7a60b8790 is described below
commit 7a60b87903767fbee85df3e8b4dec28a8742ba3e
Author: Yonghao Mei <73...@users.noreply.github.com>
AuthorDate: Wed Sep 28 13:19:29 2022 +0800
Omit if the status panel engine name is too long (#3547)
* modify version layout
* fix: Omit if the status panel engine name is too long
* Close the engine material management portal
---
linkis-web/src/apps/linkis/view/linkis/index.vue | 2 +-
.../src/dss/module/resourceSimple/engine.vue | 56 +++++++++++++++++++++-
2 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/linkis-web/src/apps/linkis/view/linkis/index.vue b/linkis-web/src/apps/linkis/view/linkis/index.vue
index a5e275755..d74a386a5 100644
--- a/linkis-web/src/apps/linkis/view/linkis/index.vue
+++ b/linkis-web/src/apps/linkis/view/linkis/index.vue
@@ -103,7 +103,7 @@ export default {
{ key: '1-7', name: this.$t('message.linkis.sideNavList.function.children.microserviceManage'), path: '/console/microService' },
{ key: '1-9', name: this.$t('message.linkis.sideNavList.function.children.udfFunctionTitle'), path: '/console/urm/udfManagement'},
{ key: '1-8', name: this.$t('message.linkis.sideNavList.function.children.dataSourceManage'), path: '/console/dataSource' },
- { key: '1-10', name: this.$t('message.linkis.sideNavList.function.children.EnginePluginManagement'), path: '/console/EnginePluginManagement' },
+ // { key: '1-10', name: this.$t('message.linkis.sideNavList.function.children.EnginePluginManagement'), path: '/console/EnginePluginManagement' },
],
},
urmSideNavList: {
diff --git a/linkis-web/src/dss/module/resourceSimple/engine.vue b/linkis-web/src/dss/module/resourceSimple/engine.vue
index dcc8e24ae..c613932aa 100644
--- a/linkis-web/src/dss/module/resourceSimple/engine.vue
+++ b/linkis-web/src/dss/module/resourceSimple/engine.vue
@@ -14,7 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
<template>
<div class="engine-box">
<Spin
@@ -58,6 +58,22 @@
: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>
@@ -99,6 +115,22 @@
: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>
@@ -140,6 +172,22 @@
: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 +440,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