You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2020/10/20 11:28:19 UTC
[shardingsphere-elasticjob-ui] branch master updated: Fixes ui
display style
This is an automated email from the ASF dual-hosted git repository.
menghaoran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 7cdd5f4 Fixes ui display style
new abf1189 Merge pull request #62 from menghaoranss/1020
7cdd5f4 is described below
commit 7cdd5f4b1dd21966849e8056b22455998fb4440b
Author: menghaoranss <lo...@163.com>
AuthorDate: Tue Oct 20 19:23:43 2020 +0800
Fixes ui display style
---
.../src/lang/en-US.js | 1 +
.../module/operationJobsDetail.vue | 17 ++++++-----------
.../src/views/operation-jobs/module/operationJobs.vue | 2 +-
.../module/operationServersDetail.vue | 9 +++------
4 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js
index f3c79d4..8253963 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/lang/en-US.js
@@ -226,6 +226,7 @@ export default {
labelInfo: {
serverIp: 'Server IP',
instancesNum: 'Instance count',
+ instanceCount: 'Instance count',
jobsNum: 'Job num',
disabledJobsNum: 'Disabled jobs num',
jobName: 'Job name',
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
index 06e5d58..2bbb4d9 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs-detail/module/operationJobsDetail.vue
@@ -71,7 +71,7 @@
</el-table-column>
<el-table-column
:label="$t('operationJobs.table.operate')"
- fixed="right" width="300">
+ fixed="right" width="100">
<template slot-scope="scope">
<el-button-group>
<el-button
@@ -108,28 +108,23 @@ export default {
column: [
{
label: this.$t('operationJobs').labelInfo.item,
- prop: 'item',
- width : 200
+ prop: 'item'
},
{
label: this.$t('operationJobs').labelInfo.serverIp,
- prop: 'serverIp',
- width : 140
+ prop: 'serverIp'
},
{
label: this.$t('operationJobs').labelInfo.instanceId,
- prop: 'instanceId',
- width : 100
+ prop: 'instanceId'
},
{
label: this.$t('operationJobs').labelInfo.status,
- prop: 'status',
- width : 120
+ prop: 'status'
},
{
label: this.$t('operationJobs').labelInfo.failover,
- prop: 'failover',
- width : 140
+ prop: 'failover'
}
],
statusColor: {
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
index 6f7c125..39e7182 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-jobs/module/operationJobs.vue
@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column
:label="$t('operationJobs.table.operate')"
- fixed="right" width="300">
+ fixed="right" width="380">
<template slot-scope="scope">
<el-button-group>
<el-button
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
index 4718ddc..02edac7 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/operation-servers-detail/module/operationServersDetail.vue
@@ -169,18 +169,15 @@ export default {
serverIp: "",
columnJobName: {
label: this.$t('operationServers').labelInfo.jobName,
- prop: 'jobName',
- width : 250
+ prop: 'jobName'
},
columnInstanceCount: {
label: this.$t('operationServers').labelInfo.instanceCount,
- prop: 'instanceCount',
- width : 250
+ prop: 'instanceCount'
},
columnStatus: {
label: this.$t('operationServers').labelInfo.status,
- prop: 'status',
- width : 200
+ prop: 'status'
},
statusColor: {
OK: 'success',