From 9c52977825c86bbfc2c7e4be8beeb2d5d981c0a3 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Tue, 18 Apr 2023 16:02:58 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E4=BF=AE=E6=94=B9=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=20(#688)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../database/mysql/root-password/index.vue    |  1 +
 .../views/database/redis/password/index.vue   |  1 +
 .../config/basic/site-folder/index.vue        | 64 ++++++++++---------
 3 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/frontend/src/views/database/mysql/root-password/index.vue b/frontend/src/views/database/mysql/root-password/index.vue
index 9e7e2947a..f1c416b09 100644
--- a/frontend/src/views/database/mysql/root-password/index.vue
+++ b/frontend/src/views/database/mysql/root-password/index.vue
@@ -16,6 +16,7 @@
                     </el-form-item>
                     <el-form-item :label="$t('database.serviceName')" prop="serviceName">
                         <el-tag>{{ form.serviceName }}</el-tag>
+                        <el-button @click="copy(form.serviceName)" icon="DocumentCopy" link></el-button>
                         <span class="input-help">{{ $t('database.serviceNameHelper') }}</span>
                     </el-form-item>
                     <el-form-item :label="$t('database.containerConn')">
diff --git a/frontend/src/views/database/redis/password/index.vue b/frontend/src/views/database/redis/password/index.vue
index b995963f6..385c004d8 100644
--- a/frontend/src/views/database/redis/password/index.vue
+++ b/frontend/src/views/database/redis/password/index.vue
@@ -16,6 +16,7 @@
                     </el-form-item>
                     <el-form-item :label="$t('database.serviceName')" prop="serviceName">
                         <el-tag>{{ form.serviceName }}</el-tag>
+                        <el-button @click="copy(form.serviceName)" icon="DocumentCopy" link></el-button>
                         <span class="input-help">{{ $t('database.serviceNameHelper') }}</span>
                     </el-form-item>
                     <el-form-item :label="$t('database.containerConn')">
diff --git a/frontend/src/views/website/website/config/basic/site-folder/index.vue b/frontend/src/views/website/website/config/basic/site-folder/index.vue
index df7b330bb..f7cea452d 100644
--- a/frontend/src/views/website/website/config/basic/site-folder/index.vue
+++ b/frontend/src/views/website/website/config/basic/site-folder/index.vue
@@ -12,12 +12,34 @@
                         </el-button>
                     </el-descriptions-item>
                 </el-descriptions>
-                <br />
-                <el-alert :closable="false">
-                    <template #default>
-                        <span class="warnHelper">{{ $t('website.runUserHelper') }}</span>
-                    </template>
-                </el-alert>
+                <div v-if="configDir">
+                    <br />
+                    <el-form :inline="true" ref="siteForm" :model="update">
+                        <el-form-item :label="$t('website.runDir')" prop="runDir">
+                            <el-select v-model="update.siteDir">
+                                <el-option :label="'/'" :value="'/'"></el-option>
+                                <el-option
+                                    v-for="(item, index) in dirs"
+                                    :label="item"
+                                    :value="item"
+                                    :key="index"
+                                ></el-option>
+                            </el-select>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button type="primary" @click="submit(siteForm)">
+                                {{ $t('nginx.saveAndReload') }}
+                            </el-button>
+                        </el-form-item>
+                    </el-form>
+                    <el-form-item>
+                        <el-alert :closable="false">
+                            <template #default>
+                                <span class="warnHelper">{{ $t('website.runDirHelper') }}</span>
+                            </template>
+                        </el-alert>
+                    </el-form-item>
+                </div>
                 <br />
                 <el-descriptions :title="$t('website.folderTitle')" :column="1" border>
                     <el-descriptions-item label="waf">{{ $t('website.wafFolder') }}</el-descriptions-item>
@@ -25,32 +47,12 @@
                     <el-descriptions-item label="log">{{ $t('website.logFoler') }}</el-descriptions-item>
                     <el-descriptions-item label="index">{{ $t('website.indexFolder') }}</el-descriptions-item>
                 </el-descriptions>
-            </el-col>
-            <el-col :span="14" :offset="1" v-if="configDir">
                 <br />
-                <el-form :inline="true" ref="siteForm" :model="update">
-                    <el-form-item :label="$t('website.runDir')" prop="runDir">
-                        <el-select v-model="update.siteDir">
-                            <el-option :label="'/'" :value="'/'"></el-option>
-                            <el-option
-                                v-for="(item, index) in dirs"
-                                :label="item"
-                                :value="item"
-                                :key="index"
-                            ></el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item>
-                        <el-button type="primary" @click="submit(siteForm)">{{ $t('nginx.saveAndReload') }}</el-button>
-                    </el-form-item>
-                </el-form>
-                <el-form-item>
-                    <el-alert :closable="false">
-                        <template #default>
-                            <span class="warnHelper">{{ $t('website.runDirHelper') }}</span>
-                        </template>
-                    </el-alert>
-                </el-form-item>
+                <el-alert :closable="false">
+                    <template #default>
+                        <span class="warnHelper">{{ $t('website.runUserHelper') }}</span>
+                    </template>
+                </el-alert>
             </el-col>
         </el-row>
     </div>