From c0b4a70aa02ee7ceffee66741412a5561b1733c5 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Sat, 18 Sep 2021 15:08:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=80loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/index.tsx          |  6 ++++--
 src/pages/config/index.tsx     | 10 +++++++++-
 src/pages/script/index.tsx     | 35 ++++++++++++++++++----------------
 src/pages/setting/security.tsx |  5 +++--
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 8eb1e9db..a56146b5 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import ProLayout from '@ant-design/pro-layout';
+import ProLayout, { PageLoading } from '@ant-design/pro-layout';
 import {
   enable as enableDarkMode,
   disable as disableDarkMode,
@@ -89,7 +89,9 @@ export default function (props: any) {
     !navigator.userAgent.includes('Chrome');
   const isQQBrowser = navigator.userAgent.includes('QQBrowser');
 
-  return (
+  return loading ? (
+    <PageLoading />
+  ) : (
     <ProLayout
       selectedKeys={[props.location.pathname]}
       loading={loading}
diff --git a/src/pages/config/index.tsx b/src/pages/config/index.tsx
index 7fef7e5c..002a2419 100644
--- a/src/pages/config/index.tsx
+++ b/src/pages/config/index.tsx
@@ -19,6 +19,7 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
   const [select, setSelect] = useState('config.sh');
   const [data, setData] = useState<any[]>([]);
   const editorRef = useRef<any>(null);
+  const [confirmLoading, setConfirmLoading] = useState(false);
 
   const getConfig = (name: string) => {
     request.get(`${config.apiPrefix}configs/${name}`).then((data: any) => {
@@ -37,6 +38,7 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
   };
 
   const updateConfig = () => {
+    setConfirmLoading(true);
     const content = editorRef.current
       ? editorRef.current.getValue().replace(/\r\n/g, '\n')
       : value;
@@ -47,6 +49,7 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
       })
       .then((data: any) => {
         message.success(data.message);
+        setConfirmLoading(false);
       });
   };
 
@@ -76,7 +79,12 @@ const Config = ({ headerStyle, isPhone, theme }: any) => {
           defaultValue="config.sh"
           onSelect={onSelect}
         />,
-        <Button key="1" type="primary" onClick={updateConfig}>
+        <Button
+          key="1"
+          loading={confirmLoading}
+          type="primary"
+          onClick={updateConfig}
+        >
           保存
         </Button>,
       ]}
diff --git a/src/pages/script/index.tsx b/src/pages/script/index.tsx
index e51e52c4..0c017769 100644
--- a/src/pages/script/index.tsx
+++ b/src/pages/script/index.tsx
@@ -141,22 +141,25 @@ const Script = ({ headerStyle, isPhone, theme }: any) => {
         const content = editorRef.current
           ? editorRef.current.getValue().replace(/\r\n/g, '\n')
           : value;
-        request
-          .put(`${config.apiPrefix}scripts`, {
-            data: {
-              filename: select,
-              content,
-            },
-          })
-          .then((_data: any) => {
-            if (_data.code === 200) {
-              message.success(`保存成功`);
-              setValue(content);
-              setIsEditing(false);
-            } else {
-              message.error(_data);
-            }
-          });
+        return new Promise((resolve) => {
+          request
+            .put(`${config.apiPrefix}scripts`, {
+              data: {
+                filename: select,
+                content,
+              },
+            })
+            .then((_data: any) => {
+              if (_data.code === 200) {
+                message.success(`保存成功`);
+                setValue(content);
+                setIsEditing(false);
+              } else {
+                message.error(_data);
+              }
+              resolve(null);
+            });
+        });
       },
       onCancel() {
         console.log('Cancel');
diff --git a/src/pages/setting/security.tsx b/src/pages/setting/security.tsx
index ebf9074d..06455ea0 100644
--- a/src/pages/setting/security.tsx
+++ b/src/pages/setting/security.tsx
@@ -1,9 +1,10 @@
 import React, { useEffect, useState } from 'react';
-import { Typography, Input, Form, Button, Spin, message } from 'antd';
+import { Typography, Input, Form, Button, message } from 'antd';
 import { request } from '@/utils/http';
 import config from '@/utils/config';
 import { history } from 'umi';
 import QRCode from 'qrcode.react';
+import { PageLoading } from '@ant-design/pro-layout';
 
 const { Title, Link } = Typography;
 
@@ -146,7 +147,7 @@ const SecuritySettings = ({ user, userChange }: any) => {
           </Button>
         </div>
       ) : (
-        <Spin />
+        <PageLoading />
       )}
     </>
   ) : (