From 29c8a2180fe9cda313cb3b3e2d0b8bba6341e28b Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Wed, 28 Dec 2022 14:25:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=B5=81=E9=87=8F?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/modules/zh.ts                     |  1 +
 .../website/config/basic/limit-conn/index.vue       | 13 ++++++++-----
 .../website/config/basic/site-folder/index.vue      |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index bdb7c879e..f6ae1149b 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -920,6 +920,7 @@ export default {
         indexFolder: '静态网站root目录',
         logFoler: '网站日志',
         sslFolder: '网站证书',
+        enableOrNot: '是否启用',
     },
     nginx: {
         serverNamesHashBucketSizeHelper: '服务器名字的hash表大小',
diff --git a/frontend/src/views/website/website/config/basic/limit-conn/index.vue b/frontend/src/views/website/website/config/basic/limit-conn/index.vue
index 7c320dbdb..a577aa367 100644
--- a/frontend/src/views/website/website/config/basic/limit-conn/index.vue
+++ b/frontend/src/views/website/website/config/basic/limit-conn/index.vue
@@ -9,10 +9,8 @@
                 :loading="loading"
                 label-width="100px"
             >
-                <el-form-item>
-                    <el-checkbox v-model="enable" @change="changeEnable">
-                        {{ $t('website.limtHelper') }}
-                    </el-checkbox>
+                <el-form-item prop="enable" :label="$t('website.enableOrNot')">
+                    <el-switch v-model="enable" @change="changeEnable"></el-switch>
                 </el-form-item>
                 <el-form-item :label="$t('website.limit')">
                     <el-select v-model="ruleKey" @change="changeRule(ruleKey)">
@@ -38,7 +36,8 @@
                 </el-form-item>
             </el-form>
             <el-button type="primary" @click="submit(limitForm)" :loading="loading">
-                {{ $t('commons.button.save') }}
+                <span v-if="enable">{{ $t('commons.button.save') }}</span>
+                <span v-else>{{ $t('commons.button.saveAndEnable') }}</span>
             </el-button>
         </el-col>
     </el-row>
@@ -146,6 +145,9 @@ const submit = async (formEl: FormInstance | undefined) => {
             },
         ];
         req.params = params;
+        if (req.operate === 'add') {
+            enable.value = true;
+        }
         UpdateNginxConfig(req)
             .then(() => {
                 ElMessage.success(i18n.global.t('commons.msg.updateSuccess'));
@@ -163,6 +165,7 @@ const changeEnable = () => {
     } else {
         req.operate = 'add';
     }
+    submit(limitForm.value);
 };
 
 const changeRule = (key: string) => {
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 40d986bd7..ad1274c9c 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
@@ -1,6 +1,6 @@
 <template>
     <el-row :gutter="20">
-        <el-col :span="8" :offset="1">
+        <el-col :span="14" :offset="1">
             <br />
             <el-descriptions :column="1" border v-loading="loading">
                 <el-descriptions-item :label="$t('website.siteAlias')">{{ website.alias }}</el-descriptions-item>