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 aa45808a8 Optimization of the linkis console for 1.3.1 (#2972)
aa45808a8 is described below
commit aa45808a8c1ec4ccd54f8e097a1dec34442c8257
Author: mayinrain <[email protected]>
AuthorDate: Wed Aug 24 18:02:41 2022 +0800
Optimization of the linkis console for 1.3.1 (#2972)
* upd: update title
* upd: without engine type
* upd: ECM Management adjust botton location
* fix: Modify the version number layout
* upd: search bar start time opening and closing and accuracy
* fix: Fix the problem that the time is empty when the data is cleared
* upd: Tips for job history result sets
* fix: use camel case
Co-authored-by: mayinrain<[email protected]>
---
linkis-web/src/apps/linkis/i18n/common/en.json | 2 +-
linkis-web/src/apps/linkis/i18n/common/zh.json | 2 +-
.../src/apps/linkis/module/ECM/engineConn.vue | 54 +++++++++++-----------
.../module/globalHistoryManagement/index.vue | 2 +-
.../linkis/module/resourceManagement/index.vue | 2 +-
.../linkis/module/resourceManagement/search.vue | 1 +
linkis-web/src/common/style/headerCommon.scss | 1 +
.../src/components/consoleComponent/result.vue | 46 +++++++++++-------
8 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/linkis-web/src/apps/linkis/i18n/common/en.json
b/linkis-web/src/apps/linkis/i18n/common/en.json
index 778c17057..211b868bc 100644
--- a/linkis-web/src/apps/linkis/i18n/common/en.json
+++ b/linkis-web/src/apps/linkis/i18n/common/en.json
@@ -147,7 +147,7 @@
"setting": "Settings",
"dateReport": "Global Variables",
"globalValiable": "Frequently Asked",
- "microserviceManage": "Microservice management",
+ "microserviceManage": "Microservice Management",
"ECMManage": "ECM Management",
"udfFunctionTitle": "UDF Function",
"udfFunctionManage": "UDF Management",
diff --git a/linkis-web/src/apps/linkis/i18n/common/zh.json
b/linkis-web/src/apps/linkis/i18n/common/zh.json
index e05663727..5524952f3 100644
--- a/linkis-web/src/apps/linkis/i18n/common/zh.json
+++ b/linkis-web/src/apps/linkis/i18n/common/zh.json
@@ -130,7 +130,7 @@
"engineTop": "引擎上限资源"
},
"logLoading": "日志请求中，请稍后",
- "title": "Linkis计算治理台",
+ "title": "Linkis管理台",
"info": "{num} 条新消息",
"hint": "请在跳转页面查看……",
"sideNavList": {
diff --git a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
index aeab81964..5fb1d28ef 100644
--- a/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
+++ b/linkis-web/src/apps/linkis/module/ECM/engineConn.vue
@@ -232,12 +232,37 @@ export default {
}, this.$t('message.linkis.viewlog')),
h('Button', {
props: {
- type: 'error',
+ type: 'primary',
size: 'small'
},
style: {
marginRight: '5px'
},
+ on: {
+ click: () => {
+ this.isTagEdit = true;
+ let obj = {};
+ obj.instance = params.row.instance;
+ let labels = params.row.labels || [];
+ // 将标签数据转换成组件可渲染格式
+ obj.labels = labels.map(item => {
+ return {
+ key: item.labelKey,
+ value: item.stringValue,
+ modifiable: item.modifiable || false,
+ }
+ })
+ obj.emStatus = params.row.nodeStatus;
+ obj.applicationName = params.row.applicationName;
+ this.formItem = Object.assign(this.formItem, obj)
+ }
+ }
+ }, this.$t('message.linkis.tagEdit')),
+ h('Button', {
+ props: {
+ type: 'error',
+ size: 'small'
+ },
on: {
click: () => {
this.$Modal.confirm({
@@ -262,32 +287,7 @@ export default {
})
}
}
- }, this.$t('message.linkis.stop')),
- h('Button', {
- props: {
- type: 'primary',
- size: 'small'
- },
- on: {
- click: () => {
- this.isTagEdit = true;
- let obj = {};
- obj.instance = params.row.instance;
- let labels = params.row.labels || [];
- // 将标签数据转换成组件可渲染格式
- obj.labels = labels.map(item => {
- return {
- key: item.labelKey,
- value: item.stringValue,
- modifiable: item.modifiable || false,
- }
- })
- obj.emStatus = params.row.nodeStatus;
- obj.applicationName = params.row.applicationName;
- this.formItem = Object.assign(this.formItem, obj)
- }
- }
- }, this.$t('message.linkis.tagEdit'))
+ }, this.$t('message.linkis.stop'))
]);
}
}
diff --git
a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
index 57f75ccbc..bb1bac2ad 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/index.vue
@@ -363,7 +363,7 @@ export default {
getParams(page) {
const startDate = this.searchBar.shortcut[0]
- const endDate = this.searchBar.shortcut[1]
+ const endDate = this.searchBar.shortcut[1] ? new
Date(this.searchBar.shortcut[1].getTime()+86399999) : this.searchBar.shortcut[1]
const params = {
taskID: this.searchBar.id,
creator: this.searchBar.creator,
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index 7338b6842..e47b827c7 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -118,7 +118,7 @@
</div>
<Table class="table-content" border :width="tableWidth"
:columns="columns" :data="tableData">
<template slot-scope="{row}" slot="engineInstance">
- <span>{{`${row.engineType}:${row.instance}`}}</span>
+ <span>{{`${row.instance}`}}</span>
</template>
<template slot-scope="{row}" slot="usedResource">
<span>{{`${calcCompany(row.resource.usedResource)}`}}</span>
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
b/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
index 88852ea76..497016aca 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/search.vue
@@ -131,6 +131,7 @@ export default {
methods: {
search(isChangingPage) {
if (!isChangingPage) this.page.pageNow = 1
+ this.searchBar.shortcut[1] = this.searchBar.shortcut[1] ? new
Date(this.searchBar.shortcut[1].getTime()+86399999) : this.searchBar.shortcut[1]
this.$emit("search", this.searchBar)
},
stop() {
diff --git a/linkis-web/src/common/style/headerCommon.scss
b/linkis-web/src/common/style/headerCommon.scss
index 802c22b14..7bcb774c4 100644
--- a/linkis-web/src/common/style/headerCommon.scss
+++ b/linkis-web/src/common/style/headerCommon.scss
@@ -58,6 +58,7 @@
.version {
position: absolute;
// right: -40px;
+ white-space: nowrap;
bottom: 10px;
font-size: $font-size-small;
height: 15px;
diff --git a/linkis-web/src/components/consoleComponent/result.vue
b/linkis-web/src/components/consoleComponent/result.vue
index e28045267..9cb4fa520 100644
--- a/linkis-web/src/components/consoleComponent/result.vue
+++ b/linkis-web/src/components/consoleComponent/result.vue
@@ -134,21 +134,24 @@
:list="script.resultList"
@change="changeSet">
</result-set-list>
- <Page
- :transfer="true"
- v-if="resultType === '2'"
- ref="page"
- :total="tableData.total"
- :page-size-opts="page.sizeOpts"
- :page-size="page.size"
- :current="page.current"
- class-name="page"
- size="small"
- show-total
- show-sizer
- :prev-text="$t('message.linkis.previousPage')"
:next-text="$t('message.linkis.nextPage')"
- @on-change="change"
- @on-page-size-change="changeSize" />
+ <div class="page-hint">
+ <Page
+ :transfer="true"
+ v-if="resultType === '2'"
+ ref="page"
+ :total="tableData.total"
+ :page-size-opts="page.sizeOpts"
+ :page-size="page.size"
+ :current="page.current"
+ class-name="page"
+ size="small"
+ show-total
+ show-sizer
+ :prev-text="$t('message.linkis.previousPage')"
:next-text="$t('message.linkis.nextPage')"
+ @on-change="change"
+ @on-page-size-change="changeSize" />
+ <span class="hint-text">{{tableData.total === 5000 ? '前端只展示5000条数据' :
''}}</span>
+ </div>
</div>
<we-menu
ref="contextMenu"
@@ -699,10 +702,19 @@ export default {
text-align: center;
padding-top: 10px;
padding-left: 10px;
- .page {
- display: inline-block;
+ .page-hint {
+ display: inline-flex;
margin: 0 auto;
+ align-items: center;
+ .page {
+ display: inline-block;
+ }
+ .hint-text {
+ display: inline-block;
+ margin-left: 5px;
+ }
}
+
.set {
width: 90px;
// padding-right: 20px;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
