From 58e670d6f6bb071f5f63ff32f1684c3643558e18 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <zhengkun@fit2cloud.com>
Date: Thu, 23 Feb 2023 10:03:19 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/modules/zh.ts                     |  2 +-
 .../views/website/ssl/dns-account/create/index.vue  |  4 ++--
 .../website/config/basic/domain/create/index.vue    |  4 ++--
 .../website/website/config/basic/https/index.vue    | 13 +++----------
 .../website/config/basic/limit-conn/index.vue       | 11 ++---------
 .../website/website/config/basic/other/index.vue    | 13 +++----------
 .../website/website/config/resource/nginx/index.vue |  4 ++--
 .../website/website/config/safety/ccdeny/index.vue  | 13 +++----------
 .../website/website/nginx/performance/index.vue     |  4 ++--
 .../views/website/website/nginx/source/index.vue    |  6 +++---
 10 files changed, 23 insertions(+), 51 deletions(-)

diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts
index f289b034f..ee1f24dab 100644
--- a/frontend/src/lang/modules/zh.ts
+++ b/frontend/src/lang/modules/zh.ts
@@ -1073,7 +1073,7 @@ export default {
         connections: '活动连接(Active connections)',
         accepts: '总连接次数(accepts)',
         handled: '总握手次数(handled)',
-        requests: '总握手次数(requests)',
+        requests: '总请求数(requests)',
         reading: '请求数(Reading)',
         writing: '响应数(Writing)',
         waiting: '驻留进程(Waiting)',
diff --git a/frontend/src/views/website/ssl/dns-account/create/index.vue b/frontend/src/views/website/ssl/dns-account/create/index.vue
index 46fb7f4a9..1c828556a 100644
--- a/frontend/src/views/website/ssl/dns-account/create/index.vue
+++ b/frontend/src/views/website/ssl/dns-account/create/index.vue
@@ -53,7 +53,7 @@
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
-                <el-button type="primary" @click="submit(accountForm)" :loading="loading">
+                <el-button type="primary" @click="submit(accountForm)" :disabled="loading">
                     {{ $t('commons.button.confirm') }}
                 </el-button>
             </span>
@@ -96,7 +96,7 @@ const types = [
 let open = ref();
 let loading = ref(false);
 let accountForm = ref<FormInstance>();
-let rules = ref({
+let rules = ref<any>({
     name: [Rules.requiredInput, Rules.linuxName],
     type: [Rules.requiredSelect],
     authorization: {
diff --git a/frontend/src/views/website/website/config/basic/domain/create/index.vue b/frontend/src/views/website/website/config/basic/domain/create/index.vue
index e8086fab8..6ad40a3bc 100644
--- a/frontend/src/views/website/website/config/basic/domain/create/index.vue
+++ b/frontend/src/views/website/website/config/basic/domain/create/index.vue
@@ -10,7 +10,7 @@
             <DrawerHeader :header="$t('website.addDomain')" :back="handleClose" />
         </template>
 
-        <el-row>
+        <el-row v-loading="loading">
             <el-col :span="22" :offset="1">
                 <el-form ref="domainForm" label-position="top" :model="domain" :rules="rules">
                     <el-form-item :label="$t('website.domain')" prop="domain">
@@ -25,7 +25,7 @@
         <template #footer>
             <span class="dialog-footer">
                 <el-button @click="handleClose" :disabled="loading">{{ $t('commons.button.cancel') }}</el-button>
-                <el-button type="primary" @click="submit(domainForm)" :loading="loading">
+                <el-button type="primary" @click="submit(domainForm)" :disabled="loading">
                     {{ $t('commons.button.confirm') }}
                 </el-button>
             </span>
diff --git a/frontend/src/views/website/website/config/basic/https/index.vue b/frontend/src/views/website/website/config/basic/https/index.vue
index 23f39dfa8..bc053849a 100644
--- a/frontend/src/views/website/website/config/basic/https/index.vue
+++ b/frontend/src/views/website/website/config/basic/https/index.vue
@@ -1,14 +1,7 @@
 <template>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading">
         <el-col :span="14" :offset="1">
-            <el-form
-                ref="httpsForm"
-                label-position="left"
-                label-width="auto"
-                :model="form"
-                :rules="rules"
-                :loading="loading"
-            >
+            <el-form ref="httpsForm" label-position="left" label-width="auto" :model="form" :rules="rules">
                 <el-form-item prop="enable" :label="$t('website.enableHTTPS')">
                     <el-switch v-model="form.enable" @change="changeEnable"></el-switch>
                 </el-form-item>
@@ -100,7 +93,7 @@
                         ></el-input>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="submit(httpsForm)" :loading="loading">
+                        <el-button type="primary" @click="submit(httpsForm)">
                             {{ $t('commons.button.save') }}
                         </el-button>
                     </el-form-item>
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 770041c7a..039db6dd9 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
@@ -1,17 +1,10 @@
 <template>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading">
         <el-col :span="8" :offset="1">
             <el-form-item prop="enable" :label="$t('website.enableOrNot')">
                 <el-switch v-model="enable" @change="changeEnable"></el-switch>
             </el-form-item>
-            <el-form
-                ref="limitForm"
-                label-position="left"
-                :model="form"
-                :rules="rules"
-                :loading="loading"
-                label-width="100px"
-            >
+            <el-form ref="limitForm" label-position="left" :model="form" :rules="rules" label-width="100px">
                 <el-form-item :label="$t('website.limit')">
                     <el-select v-model="ruleKey" @change="changeRule(ruleKey)">
                         <el-option
diff --git a/frontend/src/views/website/website/config/basic/other/index.vue b/frontend/src/views/website/website/config/basic/other/index.vue
index c34606373..0b9195c76 100644
--- a/frontend/src/views/website/website/config/basic/other/index.vue
+++ b/frontend/src/views/website/website/config/basic/other/index.vue
@@ -1,14 +1,7 @@
 <template>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading">
         <el-col :span="8" :offset="1">
-            <el-form
-                ref="websiteForm"
-                label-position="right"
-                label-width="130px"
-                :model="form"
-                :rules="rules"
-                :loading="loading"
-            >
+            <el-form ref="websiteForm" label-position="left" label-width="80px" :model="form" :rules="rules">
                 <el-form-item :label="$t('website.primaryDomain')" prop="primaryDomain">
                     <el-input v-model="form.primaryDomain" disabled></el-input>
                 </el-form-item>
@@ -26,7 +19,7 @@
                     <el-input v-model="form.remark"></el-input>
                 </el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="submit(websiteForm)" :loading="loading">
+                    <el-button type="primary" @click="submit(websiteForm)" :disabled="loading">
                         {{ $t('commons.button.save') }}
                     </el-button>
                 </el-form-item>
diff --git a/frontend/src/views/website/website/config/resource/nginx/index.vue b/frontend/src/views/website/website/config/resource/nginx/index.vue
index 6cc7d2616..1d2b6d1fc 100644
--- a/frontend/src/views/website/website/config/resource/nginx/index.vue
+++ b/frontend/src/views/website/website/config/resource/nginx/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading="loading">
         <codemirror
             :autofocus="true"
             placeholder="None data"
@@ -15,7 +15,7 @@
             :readOnly="true"
         />
         <div style="margin-top: 10px">
-            <el-button type="primary" @click="submit()" :loading="loading">
+            <el-button type="primary" @click="submit()">
                 {{ $t('nginx.saveAndReload') }}
             </el-button>
         </div>
diff --git a/frontend/src/views/website/website/config/safety/ccdeny/index.vue b/frontend/src/views/website/website/config/safety/ccdeny/index.vue
index 97597038d..b8443e041 100644
--- a/frontend/src/views/website/website/config/safety/ccdeny/index.vue
+++ b/frontend/src/views/website/website/config/safety/ccdeny/index.vue
@@ -1,14 +1,7 @@
 <template>
-    <el-row :gutter="20">
+    <el-row :gutter="20" v-loading="loading">
         <el-col :span="10" :offset="1">
-            <el-form
-                ref="wafForm"
-                label-position="left"
-                label-width="auto"
-                :model="form"
-                :rules="rules"
-                :loading="loading"
-            >
+            <el-form ref="wafForm" label-position="left" label-width="auto" :model="form" :rules="rules">
                 <el-form-item prop="enable" :label="$t('website.enable')">
                     <el-switch v-model="form.enable" @change="updateEnable"></el-switch>
                 </el-form-item>
@@ -29,7 +22,7 @@
                 ></el-alert>
                 <el-form-item></el-form-item>
                 <el-form-item>
-                    <el-button type="primary" @click="submit(wafForm)" :loading="loading">
+                    <el-button type="primary" @click="submit(wafForm)">
                         {{ $t('commons.button.save') }}
                     </el-button>
                 </el-form-item>
diff --git a/frontend/src/views/website/website/nginx/performance/index.vue b/frontend/src/views/website/website/nginx/performance/index.vue
index e1e3ebd03..d2e67e5e0 100644
--- a/frontend/src/views/website/website/nginx/performance/index.vue
+++ b/frontend/src/views/website/website/nginx/performance/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-form :model="form" :rules="variablesRules" ref="nginxFormRef" label-position="top">
-            <el-row>
+            <el-row v-loading="loading">
                 <el-col :span="1"><br /></el-col>
                 <el-col :span="9">
                     <el-form-item label="server_names_hash_bucket_size" prop="server_names_hash_bucket_size">
@@ -25,7 +25,7 @@
                         <span class="input-help">{{ $t('nginx.keepaliveTimeoutHelper') }}</span>
                     </el-form-item>
                     <el-form-item>
-                        <el-button type="primary" @click="submit(nginxFormRef)" :loading="loading">
+                        <el-button type="primary" @click="submit(nginxFormRef)">
                             {{ $t('commons.button.save') }}
                         </el-button>
                     </el-form-item>
diff --git a/frontend/src/views/website/website/nginx/source/index.vue b/frontend/src/views/website/website/nginx/source/index.vue
index aad01fc84..d4cd4e95f 100644
--- a/frontend/src/views/website/website/nginx/source/index.vue
+++ b/frontend/src/views/website/website/nginx/source/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div v-loading="loading">
         <codemirror
             :autofocus="true"
             placeholder="None data"
@@ -16,10 +16,10 @@
             :readOnly="true"
         />
         <div style="margin-top: 10px">
-            <el-button @click="getDefaultConfig()" :loading="loading">
+            <el-button @click="getDefaultConfig()" :disabled="loading">
                 {{ $t('app.defaultConfig') }}
             </el-button>
-            <el-button type="primary" @click="submit()" :loading="loading">
+            <el-button type="primary" @click="submit()" :disabled="loading">
                 {{ $t('commons.button.save') }}
             </el-button>
         </div>