You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/07/22 02:56:51 UTC
[shardingsphere-elasticjob-ui] branch master updated: add loss
dependency & for checkstyle
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 1a25b75 add loss dependency & for checkstyle
new 1841c7b Merge pull request #10 from menghaoranss/fix-loss-dependency
1a25b75 is described below
commit 1a25b75f26082a5a1f6554ca91993c1154506fcb
Author: menghaoranss <lo...@163.com>
AuthorDate: Wed Jul 22 10:37:41 2020 +0800
add loss dependency & for checkstyle
---
.../shardingsphere-elasticjob-lite-ui-frontend/package.json | 1 +
.../src/views/data-source/module/dataSource.vue | 8 ++++----
.../src/views/history-status/module/historyStatus.vue | 10 +++++++---
.../src/views/history-trace/module/historyTrace.vue | 10 +++++++---
.../src/views/registry-center/module/registryCenter.vue | 8 ++++----
5 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/package.json b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/package.json
index a81dfab..ba8e586 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/package.json
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/package.json
@@ -16,6 +16,7 @@
"axios": "^0.18.0",
"element-ui": "^2.4.9",
"lodash": "^4.17.11",
+ "normalize.css": "^8.0.1",
"vue": "^2.5.2",
"vue-i18n": "^8.4.0",
"vue-router": "^3.0.1",
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
index e64fd32..5caf9b4 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/data-source/module/dataSource.vue
@@ -19,10 +19,10 @@
<el-row class="box-card">
<div class="btn-group">
<el-button
+ :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
- :disabled="isGuest"
@click="add"
>{{ $t("dataSource.btnTxt") }}</el-button>
</div>
@@ -45,9 +45,9 @@
>
<el-button
:type="scope.row.activated ? 'success' : 'primary'"
+ :disabled="isGuest"
icon="el-icon-link"
size="small"
- :disabled="isGuest"
@click="handleConnect(scope.row)"
/>
</el-tooltip>
@@ -58,10 +58,10 @@
placement="top"
>
<el-button
+ :disabled="isGuest"
size="small"
type="danger"
icon="el-icon-delete"
- :disabled="isGuest"
@click="handlerDel(scope.row)"
/>
</el-tooltip>
@@ -140,7 +140,7 @@ export default {
data() {
return {
regustDialogVisible: false,
- isGuest: window.localStorage.getItem('isGuest') == 'true',
+ isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('dataSource').addDialog.name,
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
index 1ae0b25..70779ed 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-status/module/historyStatus.vue
@@ -24,18 +24,22 @@
clearable>
</el-input>
<el-date-picker
+ :placeholder="$t('historyStatus.searchForm.startTime')"
v-model="searchForm.start"
type="datetime"
- :placeholder="$t('historyStatus.searchForm.startTime')"
clearable>
</el-date-picker>
<el-date-picker
+ :placeholder="$t('historyStatus.searchForm.CompleteTime')"
v-model="searchForm.end"
type="datetime"
- :placeholder="$t('historyStatus.searchForm.CompleteTime')"
clearable>
</el-date-picker>
- <el-select v-model="searchForm.state" clearable :placeholder="$t('historyStatus.searchForm.state')">
+ <el-select
+ :placeholder="$t('historyStatus.searchForm.state')"
+ v-model="searchForm.state"
+ clearable
+ >
<el-option
v-for="item in stateItems"
:key="item.value"
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
index 89a67fd..797eb28 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/history-trace/module/historyTrace.vue
@@ -29,18 +29,22 @@
clearable>
</el-input>
<el-date-picker
+ :placeholder="$t('historyTrace.searchForm.startTime')"
v-model="searchForm.start"
type="datetime"
- :placeholder="$t('historyTrace.searchForm.startTime')"
clearable>
</el-date-picker>
<el-date-picker
+ :placeholder="$t('historyTrace.searchForm.CompleteTime')"
v-model="searchForm.end"
type="datetime"
- :placeholder="$t('historyTrace.searchForm.CompleteTime')"
clearable>
</el-date-picker>
- <el-select v-model="searchForm.isSuccess" clearable :placeholder="$t('historyTrace.searchForm.executeResult')">
+ <el-select
+ :placeholder="$t('historyTrace.searchForm.executeResult')"
+ v-model="searchForm.isSuccess"
+ clearable
+ >
<el-option
v-for="item in executeResultItems"
:key="item.value"
diff --git a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
index 2c308ba..ce9540f 100644
--- a/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
+++ b/shardingsphere-elasticjob-lite-ui/shardingsphere-elasticjob-lite-ui-frontend/src/views/registry-center/module/registryCenter.vue
@@ -19,10 +19,10 @@
<el-row class="box-card">
<div class="btn-group">
<el-button
+ :disabled="isGuest"
class="btn-plus"
type="primary"
icon="el-icon-plus"
- :disabled="isGuest"
@click="add"
>{{ $t("registryCenter.btnTxt") }}</el-button>
</div>
@@ -45,9 +45,9 @@
>
<el-button
:type="scope.row.activated ? 'success' : 'primary'"
+ :disabled="isGuest"
icon="el-icon-link"
size="small"
- :disabled="isGuest"
@click="handleConnect(scope.row)"
/>
</el-tooltip>
@@ -58,10 +58,10 @@
placement="top"
>
<el-button
+ :disabled="isGuest"
size="small"
type="danger"
icon="el-icon-delete"
- :disabled="isGuest"
@click="handlerDel(scope.row)"
/>
</el-tooltip>
@@ -128,7 +128,7 @@ export default {
data() {
return {
addDialogVisible: false,
- isGuest: window.localStorage.getItem('isGuest') == 'true',
+ isGuest: window.localStorage.getItem('isGuest') === 'true',
column: [
{
label: this.$t('registryCenter').registDialog.name,