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-ui.git
The following commit(s) were added to refs/heads/master by this push:
new 276918a Remove additional config center
new e368c05 Merge pull request #18 from menghaoranss/0915-2
276918a is described below
commit 276918abef372a8b9d6e095e07296715d91e4380
Author: menghaoranss <[email protected]>
AuthorDate: Tue Sep 15 16:46:35 2020 +0800
Remove additional config center
---
.../src/components/Head/index.vue | 5 ++-
shardingsphere-ui-frontend/src/lang/en-US.js | 8 ++--
shardingsphere-ui-frontend/src/lang/zh-CN.js | 6 ++-
.../registry-center/module/registryCenter.vue | 50 +---------------------
.../views/rule-config/module/authentication.vue | 13 +-----
.../src/views/rule-config/module/props.vue | 11 +----
.../src/views/rule-config/module/schema.vue | 21 ++-------
.../src/views/runtime-status/module/dataSource.vue | 2 +-
.../src/views/runtime-status/module/instance.vue | 2 +-
9 files changed, 22 insertions(+), 96 deletions(-)
diff --git a/shardingsphere-ui-frontend/src/components/Head/index.vue
b/shardingsphere-ui-frontend/src/components/Head/index.vue
index c83c4f3..2188293 100644
--- a/shardingsphere-ui-frontend/src/components/Head/index.vue
+++ b/shardingsphere-ui-frontend/src/components/Head/index.vue
@@ -48,7 +48,7 @@
<el-breadcrumb-item>
<a
style="font-weight: bold; color: #E17425;"
- >{{ $store.state.global.regCenterActivated || '' }}</a>
+ >{{currentRegistryCenter}}: {{
$store.state.global.regCenterActivated || '' }}</a>
</el-breadcrumb-item>
</el-breadcrumb>
</div>
@@ -63,7 +63,8 @@ export default {
username: '',
breadcrumbTxt: '',
dropdownList: this.$t('common').dropdownList,
- dropdownTitle: localStorage.getItem('language') === 'zh-CN' ?
this.$t('common').dropdownList[0].title :
this.$t('common').dropdownList[1].title
+ dropdownTitle: localStorage.getItem('language') === 'zh-CN' ?
this.$t('common').dropdownList[0].title :
this.$t('common').dropdownList[1].title,
+ currentRegistryCenter: this.$t('common').currentRegistryCenter
}
},
computed: {
diff --git a/shardingsphere-ui-frontend/src/lang/en-US.js
b/shardingsphere-ui-frontend/src/lang/en-US.js
index e38cf0c..ff719c4 100644
--- a/shardingsphere-ui-frontend/src/lang/en-US.js
+++ b/shardingsphere-ui-frontend/src/lang/en-US.js
@@ -56,6 +56,7 @@ export default {
updateFaildMessage: 'Update Faild',
confirmDelOperator: 'Confirm delete'
},
+ currentRegistryCenter: 'Connected Registry Center',
loginOut: 'Sign Out',
dropdownList: [
{
@@ -100,10 +101,10 @@ export default {
btnCancelTxt: 'Cancel'
},
table: {
- operate: 'Operate',
+ operate: 'Operation',
operateConnect: 'Connect',
operateConnected: 'Connected',
- operateDel: 'Del',
+ operateDel: 'Delete',
operateEdit: 'Edit'
},
rules: {
@@ -127,7 +128,8 @@ export default {
instance: {
instanceId: 'Instance Id',
serverIp: 'Server Ip'
- }
+ },
+ enabled: 'Enabled'
},
ruleConfig: {
form: {
diff --git a/shardingsphere-ui-frontend/src/lang/zh-CN.js
b/shardingsphere-ui-frontend/src/lang/zh-CN.js
index e237289..bec12a3 100644
--- a/shardingsphere-ui-frontend/src/lang/zh-CN.js
+++ b/shardingsphere-ui-frontend/src/lang/zh-CN.js
@@ -20,7 +20,7 @@ export default {
home: '主页',
menuData: [
{
- title: '治理',
+ title: '分布式治理',
child: [
{
title: '注册中心',
@@ -56,6 +56,7 @@ export default {
updateFaildMessage: '更新失败',
confirmDelOperator: '确认删除'
},
+ currentRegistryCenter: '已连接注册中心',
loginOut: '退出登录',
dropdownList: [
{
@@ -127,7 +128,8 @@ export default {
instance: {
instanceId: '节点标识',
serverIp: '服务ip'
- }
+ },
+ enabled: '是否启用'
},
ruleConfig: {
form: {
diff --git
a/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
b/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
index 02d5d70..c26b899 100644
---
a/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
+++
b/shardingsphere-ui-frontend/src/views/registry-center/module/registryCenter.vue
@@ -125,26 +125,6 @@
autocomplete="off"
/>
</el-form-item>
- <el-form-item
:label="$t('registryCenter.registDialog.additionalCenterType')"
prop="additionalConfigCenterType">
- <el-radio-group v-model="form.additionalConfigCenterType">
- <el-radio label="Zookeeper">Zookeeper</el-radio>
- <el-radio label="Etcd">Etcd</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item
:label="$t('registryCenter.registDialog.additionalAddress')"
prop="additionalConfigCenterServerList">
- <el-input
- :placeholder="$t('registryCenter.rules.additionalAddress')"
- v-model="form.additionalConfigCenterServerList"
- autocomplete="off"
- />
- </el-form-item>
- <el-form-item :label="$t('registryCenter.registDialog.digest')"
id="add-digest-additional" v-show="showAddDigestAdditional">
- <el-input
- :placeholder="$t('registryCenter.rules.digest')"
- v-model="form.additionalDigest"
- autocomplete="off"
- />
- </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="regustDialogVisible = false">{{
$t("registryCenter.registDialog.btnCancelTxt") }}</el-button>
@@ -190,26 +170,6 @@
autocomplete="off"
/>
</el-form-item>
- <el-form-item
:label="$t('registryCenter.registDialog.additionalCenterType')"
prop="additionalConfigCenterType">
- <el-radio-group v-model="editForm.additionalConfigCenterType">
- <el-radio label="Zookeeper">Zookeeper</el-radio>
- <el-radio label="Etcd">Etcd</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item
:label="$t('registryCenter.registDialog.additionalAddress')"
prop="additionalConfigCenterServerList">
- <el-input
- :placeholder="$t('registryCenter.rules.additionalAddress')"
- v-model="editForm.additionalConfigCenterServerList"
- autocomplete="off"
- />
- </el-form-item>
- <el-form-item :label="$t('registryCenter.registDialog.digest')"
v-show="showEditDigestAdditional">
- <el-input
- :placeholder="$t('registryCenter.rules.digest')"
- v-model="editForm.additionalDigest"
- autocomplete="off"
- />
- </el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelEdit">{{
$t("registryCenter.registDialog.btnCancelTxt") }}</el-button>
@@ -251,15 +211,7 @@ export default {
{
label: this.$t('registryCenter').registDialog.address,
prop: 'serverLists'
- },
- {
- label: this.$t('registryCenter').registDialog.additionalCenterType,
- prop: 'additionalConfigCenterType'
- },
- {
- label: this.$t('registryCenter').registDialog.additionalAddress,
- prop: 'additionalConfigCenterServerList'
- },
+ }
],
form: {
name: '',
diff --git
a/shardingsphere-ui-frontend/src/views/rule-config/module/authentication.vue
b/shardingsphere-ui-frontend/src/views/rule-config/module/authentication.vue
index db5666c..af47f74 100644
--- a/shardingsphere-ui-frontend/src/views/rule-config/module/authentication.vue
+++ b/shardingsphere-ui-frontend/src/views/rule-config/module/authentication.vue
@@ -18,18 +18,9 @@
<template>
<el-card class="box-card authentication">
<el-row :gutter="20">
- <el-col :span="12">
- <span
- style="font-size: 14px; color: #4a4a4a; margin-bottom: 10px;display:
inline-block;"
- >Edit source here:</span>
+ <el-col :span="24">
<el-input :rows="20" v-model="textarea" type="textarea"
class="edit-text"/>
</el-col>
- <el-col :span="12">
- <span
- style="font-size: 14px; color: #4a4a4a; margin-bottom: 10px;display:
inline-block;"
- >Result (JS object dump):</span>
- <el-input :rows="20" v-model="textarea2" type="textarea" readonly
class="show-text"/>
- </el-col>
</el-row>
<el-row>
<el-button class="auth-btn" type="primary" @click="onConfirm">{{
$t('btn.submit') }}</el-button>
@@ -87,7 +78,7 @@ export default {
}
}
</script>
-<style lang="scss" scoped>
+<style lang="scss">
.authentication {
margin-top: 20px;
.edit-text {
diff --git a/shardingsphere-ui-frontend/src/views/rule-config/module/props.vue
b/shardingsphere-ui-frontend/src/views/rule-config/module/props.vue
index f666f8f..90d1627 100644
--- a/shardingsphere-ui-frontend/src/views/rule-config/module/props.vue
+++ b/shardingsphere-ui-frontend/src/views/rule-config/module/props.vue
@@ -18,18 +18,9 @@
<template>
<el-card class="box-card props">
<el-row :gutter="20">
- <el-col :span="12">
- <span
- style="font-size: 14px; color: #4a4a4a; margin-bottom: 10px;display:
inline-block;"
- >Edit source here:</span>
+ <el-col :span="24">
<el-input :rows="20" v-model="textarea" type="textarea"
class="edit-text" />
</el-col>
- <el-col :span="12">
- <span
- style="font-size: 14px; color: #4a4a4a; margin-bottom: 10px;display:
inline-block;"
- >Result (JS object dump):</span>
- <el-input :rows="20" v-model="textarea2" type="textarea" readonly
class="show-text" />
- </el-col>
</el-row>
<el-row>
<el-button class="props-btn" type="primary" @click="onConfirm">{{
$t('btn.submit') }}</el-button>
diff --git a/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
b/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
index da5094a..0244b1d 100644
--- a/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
+++ b/shardingsphere-ui-frontend/src/views/rule-config/module/schema.vue
@@ -43,14 +43,13 @@
<el-row>
<el-button type="primary" icon="el-icon-plus" @click="add" />
</el-row>
- <el-dialog :visible.sync="showMetadataDialogVisible" :title="type"
width="80%" top="3vh">
+ <el-dialog :visible.sync="showMetadataDialogVisible" :title="type"
width="60%" top="3vh">
<el-row :gutter="20">
<el-col :span="24">
- <span style="font-size: 18px; font-weight: bold;">Result (JS object
dump):</span>
<el-input
:rows="20"
:placeholder="$t('ruleConfig.form.inputPlaceholder')"
- v-model="textarea2"
+ v-model="textarea"
type="textarea"
readonly
class="show-text"
@@ -61,10 +60,9 @@
<el-button @click="showMetadataDialogVisible = false">{{
$t('btn.cancel') }}</el-button>
</span>
</el-dialog>
- <el-dialog :visible.sync="centerDialogVisible" :title="type" width="80%"
top="3vh">
+ <el-dialog :visible.sync="centerDialogVisible" :title="type" width="60%"
top="3vh">
<el-row :gutter="20">
- <el-col :span="12">
- <span style="font-size: 18px; font-weight: bold;">Edit source
here:</span>
+ <el-col :span="24">
<el-input
:rows="20"
:placeholder="$t('ruleConfig.form.inputPlaceholder')"
@@ -73,17 +71,6 @@
class="edit-text"
/>
</el-col>
- <el-col :span="12">
- <span style="font-size: 18px; font-weight: bold;">Result (JS object
dump):</span>
- <el-input
- :rows="20"
- :placeholder="$t('ruleConfig.form.inputPlaceholder')"
- v-model="textarea2"
- type="textarea"
- readonly
- class="show-text"
- />
- </el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">{{ $t('btn.cancel')
}}</el-button>
diff --git
a/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
b/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
index 7b120c5..9f59e80 100644
--- a/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
+++ b/shardingsphere-ui-frontend/src/views/runtime-status/module/dataSource.vue
@@ -25,7 +25,7 @@
:label="item.label"
:width="item.width"
/>
- <el-table-column :label="$t('registryCenter.table.operate')"
fixed="right" width="80" align="center">
+ <el-table-column :label="$t('runtimeStatus.enabled')" fixed="right"
width="80" align="center">
<template slot-scope="scope">
<el-switch v-model="scope.row.enabled"
@change="handleChange(scope.row)" />
</template>
diff --git
a/shardingsphere-ui-frontend/src/views/runtime-status/module/instance.vue
b/shardingsphere-ui-frontend/src/views/runtime-status/module/instance.vue
index de662a1..f06f7b0 100644
--- a/shardingsphere-ui-frontend/src/views/runtime-status/module/instance.vue
+++ b/shardingsphere-ui-frontend/src/views/runtime-status/module/instance.vue
@@ -25,7 +25,7 @@
:label="item.label"
:width="item.width"
/>
- <el-table-column :label="$t('registryCenter.table.operate')"
fixed="right" width="80" align="center">
+ <el-table-column :label="$t('runtimeStatus.enabled')" fixed="right"
width="80" align="center">
<template slot-scope="scope">
<el-switch v-model="scope.row.enabled"
@change="handleChange(scope.row)" />
</template>
