From 518e8903a3473f900cbade3fd55a15304395f3c0 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sat, 17 Sep 2022 22:50:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9Modal=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |   2 +-
 src/layouts/index.less                |   4 -
 src/layouts/index.tsx                 |  11 +-
 src/pages/crontab/detail.tsx          |   2 +-
 src/pages/crontab/logModal.tsx        |   2 +-
 src/pages/crontab/modal.tsx           |   4 +-
 src/pages/crontab/viewCreateModal.tsx |   2 +-
 src/pages/crontab/viewManageModal.tsx |   2 +-
 src/pages/dependence/index.tsx        |  29 ++++--
 src/pages/dependence/logModal.tsx     |   2 +-
 src/pages/dependence/modal.tsx        |   2 +-
 src/pages/env/editNameModal.tsx       |   2 +-
 src/pages/env/modal.tsx               |   2 +-
 src/pages/script/editModal.tsx        |   2 +-
 src/pages/script/editNameModal.tsx    |   2 +-
 src/pages/script/saveModal.tsx        |   2 +-
 src/pages/script/setting.tsx          |   2 +-
 src/pages/setting/appModal.tsx        |   2 +-
 src/pages/setting/index.tsx           | 143 ++++++++++++++------------
 src/pages/subscription/logModal.tsx   |   2 +-
 src/pages/subscription/modal.tsx      |   2 +-
 21 files changed, 122 insertions(+), 101 deletions(-)

diff --git a/package.json b/package.json
index c22b54bb..71f9e640 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
   "devDependencies": {
     "@ant-design/icons": "^4.7.0",
     "@ant-design/pro-layout": "^6.33.1",
-    "@monaco-editor/react": "^4.3.1",
+    "@monaco-editor/react": "4.2.1",
     "@sentry/react": "^7.12.1",
     "@types/body-parser": "^1.19.2",
     "@types/cors": "^2.8.12",
diff --git a/src/layouts/index.less b/src/layouts/index.less
index b8926978..02bebc34 100644
--- a/src/layouts/index.less
+++ b/src/layouts/index.less
@@ -326,10 +326,6 @@
   background-color: #373739;
 }
 
-.ant-layout-sider {
-  border-right: 1px solid rgba(0, 0, 0, 0.06) !important;
-}
-
 .ant-pro-sider-logo {
   padding: 16px 8px !important;
 
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index b37f7a43..6c013d86 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -136,7 +136,7 @@ export default function (props: any) {
   }, []);
 
   useEffect(() => {
-    if (!user) return;
+    if (!user || !user.username) return;
     ws.current = new SockJS(
       `${location.origin}/api/ws?token=${localStorage.getItem(config.authKey)}`,
     );
@@ -146,9 +146,9 @@ export default function (props: any) {
         const data = JSON.parse(e.data);
         if (data.type === 'ping') {
           if (data && data.message === 'hanhh') {
-            console.log('websocket连接成功', e);
+            console.log('WS connection succeeded !!!');
           } else {
-            console.log('websocket连接失败', e);
+            console.log('WS connection Failed !!!', e);
           }
         }
         setSocketMessage(data);
@@ -186,8 +186,9 @@ export default function (props: any) {
   if (
     ['/login', '/initialization', '/error'].includes(props.location.pathname)
   ) {
-    document.title = `${(config.documentTitleMap as any)[props.location.pathname]
-      } - 控制面板`;
+    document.title = `${
+      (config.documentTitleMap as any)[props.location.pathname]
+    } - 控制面板`;
     if (
       systemInfo?.isInitialized &&
       props.location.pathname === '/initialization'
diff --git a/src/pages/crontab/detail.tsx b/src/pages/crontab/detail.tsx
index fc9f3d01..df9da0ed 100644
--- a/src/pages/crontab/detail.tsx
+++ b/src/pages/crontab/detail.tsx
@@ -445,7 +445,7 @@ const CronDetailModal = ({
         </div>
       }
       centered
-      visible={visible}
+      open={visible}
       forceRender
       footer={false}
       onCancel={() => handleCancel()}
diff --git a/src/pages/crontab/logModal.tsx b/src/pages/crontab/logModal.tsx
index 32ad1d54..6d595b89 100644
--- a/src/pages/crontab/logModal.tsx
+++ b/src/pages/crontab/logModal.tsx
@@ -119,7 +119,7 @@ const CronLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      visible={visible}
+      open={visible}
       centered
       className="log-modal"
       bodyStyle={{
diff --git a/src/pages/crontab/modal.tsx b/src/pages/crontab/modal.tsx
index cd5c04e4..1d913382 100644
--- a/src/pages/crontab/modal.tsx
+++ b/src/pages/crontab/modal.tsx
@@ -48,7 +48,7 @@ const CronModal = ({
   return (
     <Modal
       title={cron ? '编辑任务' : '新建任务'}
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
@@ -172,7 +172,7 @@ const CronLabelModal = ({
   return (
     <Modal
       title="批量修改标签"
-      visible={visible}
+      open={visible}
       footer={buttons}
       centered
       maskClosable={false}
diff --git a/src/pages/crontab/viewCreateModal.tsx b/src/pages/crontab/viewCreateModal.tsx
index 3a30d225..a796eccf 100644
--- a/src/pages/crontab/viewCreateModal.tsx
+++ b/src/pages/crontab/viewCreateModal.tsx
@@ -138,7 +138,7 @@ const ViewCreateModal = ({
   return (
     <Modal
       title={view ? '编辑视图' : '新建视图'}
-      visible={visible}
+      open={visible}
       forceRender
       width={580}
       centered
diff --git a/src/pages/crontab/viewManageModal.tsx b/src/pages/crontab/viewManageModal.tsx
index f4030f65..b39ef601 100644
--- a/src/pages/crontab/viewManageModal.tsx
+++ b/src/pages/crontab/viewManageModal.tsx
@@ -212,7 +212,7 @@ const ViewManageModal = ({
   return (
     <Modal
       title="视图管理"
-      visible={visible}
+      open={visible}
       centered
       width={620}
       onCancel={() => handleCancel()}
diff --git a/src/pages/dependence/index.tsx b/src/pages/dependence/index.tsx
index 6b39ed60..aab8e262 100644
--- a/src/pages/dependence/index.tsx
+++ b/src/pages/dependence/index.tsx
@@ -498,17 +498,24 @@ const Dependence = ({ headerStyle, isPhone, socketMessage }: any) => {
         size="small"
         tabPosition="top"
         onChange={onTabChange}
-      >
-        <Tabs.TabPane tab="NodeJs" key="nodejs">
-          {panelContent()}
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="Python3" key="python3">
-          {panelContent()}
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="Linux" key="linux">
-          {panelContent()}
-        </Tabs.TabPane>
-      </Tabs>
+        items={[
+          {
+            key: 'nodejs',
+            label: 'NodeJs',
+            children: panelContent(),
+          },
+          {
+            key: 'python3',
+            label: 'Python3',
+            children: panelContent(),
+          },
+          {
+            key: 'linux',
+            label: 'Linux',
+            children: panelContent(),
+          },
+        ]}
+      />
       <DependenceModal
         visible={isModalVisible}
         handleCancel={handleCancel}
diff --git a/src/pages/dependence/logModal.tsx b/src/pages/dependence/logModal.tsx
index 3cfa2473..f99368a7 100644
--- a/src/pages/dependence/logModal.tsx
+++ b/src/pages/dependence/logModal.tsx
@@ -112,7 +112,7 @@ const DependenceLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      visible={visible}
+      open={visible}
       centered
       className="log-modal"
       bodyStyle={{
diff --git a/src/pages/dependence/modal.tsx b/src/pages/dependence/modal.tsx
index f48ce2c4..7547958a 100644
--- a/src/pages/dependence/modal.tsx
+++ b/src/pages/dependence/modal.tsx
@@ -71,7 +71,7 @@ const DependenceModal = ({
   return (
     <Modal
       title={dependence ? '编辑依赖' : '新建依赖'}
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
diff --git a/src/pages/env/editNameModal.tsx b/src/pages/env/editNameModal.tsx
index c835f267..1984411a 100644
--- a/src/pages/env/editNameModal.tsx
+++ b/src/pages/env/editNameModal.tsx
@@ -44,7 +44,7 @@ const EditNameModal = ({
   return (
     <Modal
       title="修改环境变量名称"
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
diff --git a/src/pages/env/modal.tsx b/src/pages/env/modal.tsx
index 25a0c9c9..8e6cdd63 100644
--- a/src/pages/env/modal.tsx
+++ b/src/pages/env/modal.tsx
@@ -60,7 +60,7 @@ const EnvModal = ({
   return (
     <Modal
       title={env ? '编辑变量' : '新建变量'}
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
diff --git a/src/pages/script/editModal.tsx b/src/pages/script/editModal.tsx
index ae9d3508..cf233455 100644
--- a/src/pages/script/editModal.tsx
+++ b/src/pages/script/editModal.tsx
@@ -214,7 +214,7 @@ const EditModal = ({
       width={'100%'}
       headerStyle={{ padding: '11px 24px' }}
       onClose={cancel}
-      visible={visible}
+      open={visible}
     >
       <SplitPane
         split="vertical"
diff --git a/src/pages/script/editNameModal.tsx b/src/pages/script/editNameModal.tsx
index f0a36797..7986241c 100644
--- a/src/pages/script/editNameModal.tsx
+++ b/src/pages/script/editNameModal.tsx
@@ -101,7 +101,7 @@ const EditScriptNameModal = ({
   return (
     <Modal
       title="新建"
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
diff --git a/src/pages/script/saveModal.tsx b/src/pages/script/saveModal.tsx
index 1c73d406..64ee9b41 100644
--- a/src/pages/script/saveModal.tsx
+++ b/src/pages/script/saveModal.tsx
@@ -41,7 +41,7 @@ const SaveModal = ({
   return (
     <Modal
       title="保存文件"
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
diff --git a/src/pages/script/setting.tsx b/src/pages/script/setting.tsx
index d3ba2473..6ac84062 100644
--- a/src/pages/script/setting.tsx
+++ b/src/pages/script/setting.tsx
@@ -41,7 +41,7 @@ const SettingModal = ({
   return (
     <Modal
       title="运行设置"
-      visible={visible}
+      open={visible}
       forceRender
       centered
       onCancel={() => handleCancel()}
diff --git a/src/pages/setting/appModal.tsx b/src/pages/setting/appModal.tsx
index b21b6a8d..1fff2b0e 100644
--- a/src/pages/setting/appModal.tsx
+++ b/src/pages/setting/appModal.tsx
@@ -46,7 +46,7 @@ const AppModal = ({
   return (
     <Modal
       title={app ? '编辑应用' : '新建应用'}
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}
diff --git a/src/pages/setting/index.tsx b/src/pages/setting/index.tsx
index 41331c62..9109ff24 100644
--- a/src/pages/setting/index.tsx
+++ b/src/pages/setting/index.tsx
@@ -333,70 +333,87 @@ const Setting = ({
         size="small"
         tabPosition="top"
         onChange={tabChange}
-      >
-        <Tabs.TabPane tab="安全设置" key="security">
-          <SecuritySettings user={user} userChange={reloadUser} />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="应用设置" key="app">
-          <Table
-            columns={columns}
-            pagination={false}
-            dataSource={dataSource}
-            rowKey="id"
-            size="middle"
-            scroll={{ x: 768 }}
-            loading={loading}
-          />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="通知设置" key="notification">
-          <NotificationSetting data={notificationInfo} />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="登录日志" key="login">
-          <LoginLog data={loginLogData} />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="其他设置" key="other">
-          <Form layout="vertical" form={form}>
-            <Form.Item
-              label="主题设置"
-              name="theme"
-              initialValue={defaultTheme}
-            >
-              <Radio.Group
-                options={optionsWithDisabled}
-                onChange={themeChange}
-                value={defaultTheme}
-                optionType="button"
-                buttonStyle="solid"
+        items={[
+          {
+            key: 'security',
+            label: '安全设置',
+            children: <SecuritySettings user={user} userChange={reloadUser} />,
+          },
+          {
+            key: 'app',
+            label: '应用设置',
+            children: (
+              <Table
+                columns={columns}
+                pagination={false}
+                dataSource={dataSource}
+                rowKey="id"
+                size="middle"
+                scroll={{ x: 768 }}
+                loading={loading}
               />
-            </Form.Item>
-            <Form.Item
-              label="日志删除频率"
-              name="frequency"
-              tooltip="每x天自动删除x天以前的日志"
-            >
-              <Input.Group compact>
-                <InputNumber
-                  addonBefore="每"
-                  addonAfter="天"
-                  style={{ width: 150 }}
-                  min={0}
-                  value={logRemoveFrequency}
-                  onChange={(value) => setLogRemoveFrequency(value)}
-                />
-                <Button type="primary" onClick={updateRemoveLogFrequency}>
-                  确认
-                </Button>
-              </Input.Group>
-            </Form.Item>
-            <Form.Item label="检查更新" name="update">
-              <CheckUpdate socketMessage={socketMessage} />
-            </Form.Item>
-          </Form>
-        </Tabs.TabPane>
-        <Tabs.TabPane tab="关于" key="about">
-          <About />
-        </Tabs.TabPane>
-      </Tabs>
+            ),
+          },
+          {
+            key: 'notification',
+            label: '通知设置',
+            children: <NotificationSetting data={notificationInfo} />,
+          },
+          {
+            key: 'login',
+            label: '登录日志',
+            children: <LoginLog data={loginLogData} />,
+          },
+          {
+            key: 'other',
+            label: '其他设置',
+            children: (
+              <Form layout="vertical" form={form}>
+                <Form.Item
+                  label="主题设置"
+                  name="theme"
+                  initialValue={defaultTheme}
+                >
+                  <Radio.Group
+                    options={optionsWithDisabled}
+                    onChange={themeChange}
+                    value={defaultTheme}
+                    optionType="button"
+                    buttonStyle="solid"
+                  />
+                </Form.Item>
+                <Form.Item
+                  label="日志删除频率"
+                  name="frequency"
+                  tooltip="每x天自动删除x天以前的日志"
+                >
+                  <Input.Group compact>
+                    <InputNumber
+                      addonBefore="每"
+                      addonAfter="天"
+                      style={{ width: 150 }}
+                      min={0}
+                      value={logRemoveFrequency}
+                      onChange={(value) => setLogRemoveFrequency(value)}
+                    />
+                    <Button type="primary" onClick={updateRemoveLogFrequency}>
+                      确认
+                    </Button>
+                  </Input.Group>
+                </Form.Item>
+                <Form.Item label="检查更新" name="update">
+                  <CheckUpdate socketMessage={socketMessage} />
+                </Form.Item>
+              </Form>
+            ),
+          },
+          {
+            key: 'about',
+            label: '关于',
+            children: <About />,
+          },
+        ]}
+      ></Tabs>
       <AppModal
         visible={isModalVisible}
         handleCancel={handleCancel}
diff --git a/src/pages/subscription/logModal.tsx b/src/pages/subscription/logModal.tsx
index 301b640f..63c6ead1 100644
--- a/src/pages/subscription/logModal.tsx
+++ b/src/pages/subscription/logModal.tsx
@@ -93,7 +93,7 @@ const SubscriptionLogModal = ({
   return (
     <Modal
       title={titleElement()}
-      visible={visible}
+      open={visible}
       centered
       className="log-modal"
       bodyStyle={{
diff --git a/src/pages/subscription/modal.tsx b/src/pages/subscription/modal.tsx
index e03e7b37..73a8b578 100644
--- a/src/pages/subscription/modal.tsx
+++ b/src/pages/subscription/modal.tsx
@@ -272,7 +272,7 @@ const SubscriptionModal = ({
           </span>
         )
       }
-      visible={visible}
+      open={visible}
       forceRender
       centered
       maskClosable={false}