diff --git a/src/components/ListenerDrawer/ListenerDrawer.vue b/src/components/ListenerDrawer/ListenerDrawer.vue index 7ebb5634a..4ac821870 100644 --- a/src/components/ListenerDrawer/ListenerDrawer.vue +++ b/src/components/ListenerDrawer/ListenerDrawer.vue @@ -10,8 +10,8 @@ destroy-on-close > @@ -137,7 +136,6 @@ @@ -146,7 +144,6 @@ @@ -155,7 +152,6 @@ @@ -68,44 +68,31 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +

{{ mechanismDesc }}

-
- - {{ $t('Base.cancel') }} - - - {{ $t('Base.nextStep') }} - -
@@ -114,18 +106,6 @@ }) }}

-
- - {{ $t('Base.backStep') }} - - - {{ $t('Base.nextStep') }} - -
@@ -168,23 +148,45 @@ {{ isWork ? $t('Auth.testSuccess') : $t('Auth.testFailed') }}
-
- - - {{ $t('Base.backStep') }} - - - {{ $t('Base.create') }} - -
- + + {{ $t('Base.backStep') }} + + + {{ $t('Base.create') }} + + diff --git a/src/views/Auth/AuthnDetails.vue b/src/views/Auth/AuthnDetails.vue index 438d65a35..a207b3323 100644 --- a/src/views/Auth/AuthnDetails.vue +++ b/src/views/Auth/AuthnDetails.vue @@ -106,6 +106,11 @@ ref="formCom" /> + + + {{ $t('Base.cancel') }} @@ -117,9 +122,6 @@ > {{ $t('Base.update') }} - -
- - {{ $t('Base.cancel') }} - - - {{ $t('Base.nextStep') }} - -
@@ -69,21 +61,31 @@ :database="type" auth-type="authz" /> -
- - {{ $t('Base.backStep') }} - - - {{ $t('Base.create') }} - -
+ + + + diff --git a/src/views/Auth/AuthzDetails.vue b/src/views/Auth/AuthzDetails.vue index 288a44141..18c821715 100644 --- a/src/views/Auth/AuthzDetails.vue +++ b/src/views/Auth/AuthzDetails.vue @@ -80,6 +80,11 @@ v-model="configData" ref="formCom" /> + + + {{ $t('Base.cancel') }} @@ -91,9 +96,6 @@ > {{ $t('Base.update') }} -
diff --git a/src/views/Auth/components/AuthnManager.vue b/src/views/Auth/components/AuthnManager.vue index c47ee6749..3c9a2a7d6 100644 --- a/src/views/Auth/components/AuthnManager.vue +++ b/src/views/Auth/components/AuthnManager.vue @@ -88,8 +88,8 @@ ref="recordForm" :model="record" :rules="getRules()" - label-position="top" - require-asterisk-position="right" + class="tong-form" + label-width="120px" > @@ -360,9 +360,6 @@ const resetIsSuperuser = () => { width: 260px; } } - .border-checkbox { - margin-top: 16px; - } .add-funcs-container { display: flex; diff --git a/src/views/Auth/components/BuiltInConfig.vue b/src/views/Auth/components/BuiltInConfig.vue index 233cd7130..b2ceb71b3 100644 --- a/src/views/Auth/components/BuiltInConfig.vue +++ b/src/views/Auth/components/BuiltInConfig.vue @@ -5,9 +5,8 @@ ref="formCom" :model="builtConfig" :rules="rules" - class="create-form" - label-position="top" - require-asterisk-position="right" + class="create-form tong-form" + label-width="200px" > diff --git a/src/views/Auth/components/CInfoConfig.vue b/src/views/Auth/components/CInfoConfig.vue index 66ce64013..74c136036 100644 --- a/src/views/Auth/components/CInfoConfig.vue +++ b/src/views/Auth/components/CInfoConfig.vue @@ -4,8 +4,8 @@ ref="formCom" :model="cinfoConfig" :rules="rules" - class="create-form" - label-position="top" + class="create-form tong-form" + label-width="200px" > diff --git a/src/views/Auth/components/DatabaseConfig.vue b/src/views/Auth/components/DatabaseConfig.vue index 6aafa1f45..9984dc210 100644 --- a/src/views/Auth/components/DatabaseConfig.vue +++ b/src/views/Auth/components/DatabaseConfig.vue @@ -3,9 +3,8 @@ @@ -154,17 +153,17 @@ + + {{ $t('Auth.setDefault') }} + + + {{ $t('Base.help') }} +
@@ -180,17 +179,17 @@ + + {{ $t('Auth.setDefault') }} + + + {{ $t('Base.help') }} +
@@ -211,17 +210,17 @@ + + {{ $t('Auth.setDefault') }} + + + {{ $t('Base.help') }} +
diff --git a/src/views/Auth/components/HttpConfig.vue b/src/views/Auth/components/HttpConfig.vue index bdec10952..38dd72516 100644 --- a/src/views/Auth/components/HttpConfig.vue +++ b/src/views/Auth/components/HttpConfig.vue @@ -2,9 +2,8 @@
@@ -27,11 +26,13 @@ - + @@ -61,13 +62,13 @@ :desc="tl('httpBodyTip')" desc-marked /> - - {{ $t('Auth.setDefault') }} - - - {{ $t('Base.help') }} - + + {{ $t('Auth.setDefault') }} + + + {{ $t('Base.help') }} +
diff --git a/src/views/Auth/components/JwtConfig.vue b/src/views/Auth/components/JwtConfig.vue index e5d5d4ef3..0e72ceb75 100644 --- a/src/views/Auth/components/JwtConfig.vue +++ b/src/views/Auth/components/JwtConfig.vue @@ -8,9 +8,8 @@ ref="formCom" :model="jwtConfig" :rules="rules" - class="create-form" - label-position="top" - require-asterisk-position="right" + class="create-form tong-form" + label-width="200px" > diff --git a/src/views/Auth/components/KerberosConfig.vue b/src/views/Auth/components/KerberosConfig.vue index 7f5c064f4..0701d7d78 100644 --- a/src/views/Auth/components/KerberosConfig.vue +++ b/src/views/Auth/components/KerberosConfig.vue @@ -4,9 +4,8 @@ ref="formCom" :model="kerberosConfig" :rules="rules" - class="create-form" - label-position="top" - require-asterisk-position="right" + class="create-form tong-form" + label-width="200px" > diff --git a/src/views/Auth/components/LdapConfig.vue b/src/views/Auth/components/LdapConfig.vue index f7014cee7..0aa569bdd 100644 --- a/src/views/Auth/components/LdapConfig.vue +++ b/src/views/Auth/components/LdapConfig.vue @@ -2,9 +2,8 @@
diff --git a/src/views/Auth/style/auth.scss b/src/views/Auth/style/auth.scss index 58c8cee82..39950b037 100644 --- a/src/views/Auth/style/auth.scss +++ b/src/views/Auth/style/auth.scss @@ -26,9 +26,6 @@ margin-bottom: 32px; } } - .step-btn { - margin-top: 24px; - } .result-block { .result-title { font-size: 16px; diff --git a/src/views/Auth/style/authConfig.scss b/src/views/Auth/style/authConfig.scss index 735eb910e..07ce0cb94 100644 --- a/src/views/Auth/style/authConfig.scss +++ b/src/views/Auth/style/authConfig.scss @@ -1,34 +1,36 @@ .config { + .el-form{ + margin-bottom: -16px; + } .create-form { .el-form-item { position: relative; } .button-in-label-line { position: absolute; - top: 50%; + top: -32px; right: 0; - transform: translateY(-50%); } .el-upload-list { display: none; } } - .config-sub-block { + .config-sub-block:not(:last-child) { margin-bottom: 16px; } .help-btn { position: absolute; right: 80px; - top: -1px; + top: -32px; } .help-container { width: 100%; - margin-top: 12px; + margin-bottom: 16px; } .help-block { padding: 24px; background: var(--color-bg-split); - margin-bottom: 22px; + margin-bottom: 0; line-height: 1.6; .help-bock__code { background: #1c2a28; @@ -56,7 +58,6 @@ } .viewer-container { border: 1px solid var(--color-border-primary); - margin-top: 12px; width: 100%; height: 280px; } diff --git a/src/views/Clients/components/CreateSubscribe.vue b/src/views/Clients/components/CreateSubscribe.vue index 57fd934d8..289b9867a 100644 --- a/src/views/Clients/components/CreateSubscribe.vue +++ b/src/views/Clients/components/CreateSubscribe.vue @@ -7,13 +7,7 @@ @close="close" @open="open" > - + diff --git a/src/views/Config/ClusterLinking/ClusterLinkingCreate.vue b/src/views/Config/ClusterLinking/ClusterLinkingCreate.vue index 393ed8b8c..2b78e312e 100644 --- a/src/views/Config/ClusterLinking/ClusterLinkingCreate.vue +++ b/src/views/Config/ClusterLinking/ClusterLinkingCreate.vue @@ -5,19 +5,19 @@ /> -
- - {{ t('Base.cancel') }} - - - {{ t('Base.create') }} - -
+
+ + + {{ t('Base.cancel') }} + + + {{ t('Base.create') }} +
diff --git a/src/views/Config/ClusterLinking/ClusterLinkingDetail.vue b/src/views/Config/ClusterLinking/ClusterLinkingDetail.vue index 323a310ec..8e6049624 100644 --- a/src/views/Config/ClusterLinking/ClusterLinkingDetail.vue +++ b/src/views/Config/ClusterLinking/ClusterLinkingDetail.vue @@ -46,6 +46,8 @@ :edit-data-topic-length="editDataTopicLength" is-edit /> + + diff --git a/src/views/Diagnose/LogTrace/LogTrace.vue b/src/views/Diagnose/LogTrace/LogTrace.vue index 55cb750d7..9d5362f55 100644 --- a/src/views/Diagnose/LogTrace/LogTrace.vue +++ b/src/views/Diagnose/LogTrace/LogTrace.vue @@ -121,10 +121,10 @@ > @@ -188,11 +188,13 @@ - +
{{ $t('SlowSub.basicSettings') }}
@@ -237,6 +237,9 @@ getConfig() color: var(--color-title-primary); line-height: 25px; } +.slow-sub-form { + width: 70%; +} .type-desc { line-height: 1.5; } diff --git a/src/views/Diagnose/TopicMetrics.vue b/src/views/Diagnose/TopicMetrics.vue index 33c9ac864..4d2148104 100644 --- a/src/views/Diagnose/TopicMetrics.vue +++ b/src/views/Diagnose/TopicMetrics.vue @@ -148,9 +148,9 @@ diff --git a/src/views/Exhook/ExhookCreate.vue b/src/views/Exhook/ExhookCreate.vue index 8d08b2e93..4e4aaa6c3 100644 --- a/src/views/Exhook/ExhookCreate.vue +++ b/src/views/Exhook/ExhookCreate.vue @@ -3,19 +3,19 @@ -
- - {{ $t('Base.cancel') }} - - - {{ $t('Base.create') }} - -
+
+ + + {{ $t('Base.cancel') }} + + + {{ $t('Base.create') }} +
diff --git a/src/views/Exhook/ExhookDetail.vue b/src/views/Exhook/ExhookDetail.vue index b31f63246..662864fc1 100644 --- a/src/views/Exhook/ExhookDetail.vue +++ b/src/views/Exhook/ExhookDetail.vue @@ -67,6 +67,8 @@ + + @@ -64,7 +63,6 @@
- + diff --git a/src/views/Gateway/components/exprotoBasic.vue b/src/views/Gateway/components/exprotoBasic.vue index da85500e5..449453cb3 100644 --- a/src/views/Gateway/components/exprotoBasic.vue +++ b/src/views/Gateway/components/exprotoBasic.vue @@ -1,6 +1,6 @@