Merge branch 'dev' of github.com:chat2db/Chat2DB into dev

CodePhiliaX · Oct 22, 2023 · c8efaf0 · c8efaf0
2 parents d541c2f + 9bd8922
commit c8efaf0
Show file tree

Hide file tree

Showing 29 changed files with 715 additions and 136 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,6 +11,7 @@
     "bgcolor",
     "blockmap",
     "cascader",
+    "charsets",
     "chmod",
     "CLOB",
     "datasource",
@@ -40,6 +41,7 @@
     "pgsql",
     "pnpm",
     "Popconfirm",
+    "redownload",
     "remaininguses",
     "RESTAI",
     "samuelmeuli",

diff --git a/chat2db-client/.umirc.prod.desktop.ts b/chat2db-client/.umirc.prod.desktop.ts
@@ -10,7 +10,6 @@ const chainWebpack = (config: any, { webpack }: any) => {
       languages: ['mysql', 'pgsql', 'sql'],
     },
   ]);
-  config.output.filename(`[name].${yarn_config.app_version || new Date().getTime()}.js`);
 };
 
 export default defineConfig({

diff --git a/chat2db-client/.umirc.prod.ts b/chat2db-client/.umirc.prod.ts
@@ -10,7 +10,6 @@ const chainWebpack = (config: any, { webpack }: any) => {
       languages: ['mysql', 'pgsql', 'sql'],
     },
   ]);
-  config.output.filename(`[name].${yarn_config.app_version || new Date().getTime()}.js`);
 };
 
 export default defineConfig({

diff --git a/chat2db-client/.umirc.ts b/chat2db-client/.umirc.ts
@@ -12,14 +12,13 @@ const chainWebpack = (config: any, { webpack }: any) => {
       languages: ['mysql', 'pgsql', 'sql'],
     },
   ]);
-  config.output.filename(`[name].${yarn_config.app_version || new Date().getTime()}.js`);
 };
 
 export default defineConfig({
   title: 'Chat2DB',
   base: '/',
   publicPath: '/',
-  hash: false,
+  hash: true,
   routes: [
     { path: '/demo', component: '@/pages/demo' },
     { path: '/connections', component: 'main' },
@@ -98,7 +97,7 @@ export default defineConfig({
   define: {
     __ENV__: process.env.UMI_ENV,
     __BUILD_TIME__: transitionTimezoneTimestamp(new Date().getTime()),
-    __APP_VERSION__: yarn_config.app_version || '0.0.0',
+    __APP_VERSION__: yarn_config.app_version || '9.9.9',
     __APP_PORT__: yarn_config.app_port,
   },
   esbuildMinifyIIFE: true

diff --git a/chat2db-client/.vscode/settings.json b/chat2db-client/.vscode/settings.json
@@ -84,6 +84,7 @@
     "uuidv",
     "VARCHAR",
     "VIEWCOLUMN",
+    "webp",
     "wireframe",
     "Wppk",
     "yapi"

diff --git a/chat2db-client/src/assets/logo/logo-introverted.webp b/chat2db-client/src/assets/logo/logo-introverted.webp
diff --git a/chat2db-client/src/assets/logo/logo.webp b/chat2db-client/src/assets/logo/logo.webp
diff --git a/chat2db-client/src/blocks/Setting/About/index.less b/chat2db-client/src/blocks/Setting/About/index.less
@@ -1,16 +1,55 @@
 .aboutUs {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .brief {
+  .versionsInfo {
     display: flex;
-    flex-direction: column;
     align-items: center;
-
+    padding-bottom: 10px;
+    border-bottom: 1px solid var(--color-border);
+    margin-bottom: 10px;
+  }
+  .brandLogo {
+    margin-right: 15px;
+  }
+  .currentVersion {
+    font-size: 20px;
+    line-height: 24px;
     .appName {
-      font-size: 20px;
+      margin-right: 10px;
+    }
+  }
+  .newVersion {
+    color: var(--color-text-tertiary);
+    font-size: 14px;
+    margin-top: 2px;
+  }
+  .updateButton {
+    margin-top: 10px;
+    button:nth-of-type(1) {
+      margin-right: 20px;
     }
+  }
+  .updateRule {
+    .updateRuleTitle {
+      font-size: 16px;
+      margin-bottom: 10px;
+    }
+    .updateRuleGroup {
+      display: flex;
+      flex-direction: column;
+      .updateRuleRadioContent {
+        display: flex;
+        align-items: center;
+        i {
+          margin-left: 4px;
+          color: var(--color-text-tertiary);
+          font-size: 12px;
+        }
+      }
+    }
+  }
+  .brief {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
 
     .env,
     .version {
@@ -28,4 +67,4 @@
       }
     }
   }
-}
+}
diff --git a/chat2db-client/src/blocks/Setting/About/index.tsx b/chat2db-client/src/blocks/Setting/About/index.tsx
@@ -1,16 +1,129 @@
+import React, { useEffect, useMemo } from 'react';
+import styles from './index.less';
+// import i18n from '@/i18n';
 import BrandLogo from '@/components/BrandLogo';
-import { APP_NAME, GITHUB_URL } from '@/constants/appConfig';
+import { APP_NAME, WEBSITE_DOC } from '@/constants/appConfig';
+// import { formatDate, getUserTimezoneTimestamp } from '@/utils/date';
+import { Button, Radio, Space } from 'antd';
+import configService from '@/service/config';
+import { DownloadOutlined,RedoOutlined } from '@ant-design/icons';
+import { IUpdateDetectionData } from '../index';
+import { IUpdateDetectionRef, UpdatedStatusEnum } from '../UpdateDetection';
 import i18n from '@/i18n';
-import React from 'react';
-import styles from './index.less';
-import { formatDate, getUserTimezoneTimestamp } from '@/utils/date';
+
+interface IProps {
+  updateDetectionData: IUpdateDetectionData | null;
+  updateDetectionRef: React.MutableRefObject<IUpdateDetectionRef> | null;
+}
 
 // 关于我们
-export default function AboutUs() {
+export default function AboutUs(props: IProps) {
+  const { updateDetectionData, updateDetectionRef } = props;
+  const [updateRule, setUpdateRule] = React.useState<'manual' | 'auto'>(updateDetectionData?.type || 'manual');
+
+  const onChangeUpdateRul = (e) => {
+    configService.setAppUpdateType(e.target.value).then(() => {
+      setUpdateRule(e.target.value);
+    });
+  };
+
+  useEffect(()=>{
+    setUpdateRule(updateDetectionData?.type || 'manual');
+  },[updateDetectionData?.type])
+
+  const jumpDoc = () => {
+    window.open(WEBSITE_DOC, '_blank');
+  };
+
+  const updateButton = useMemo(() => {
+    if (!updateDetectionData?.needUpdate) {
+      return false;
+    }
+    switch (updateDetectionData?.updatedStatusEnum) {
+      case UpdatedStatusEnum.NOT_UPDATED:
+        return (
+          <Button
+            onClick={() => {
+              updateDetectionRef?.current?.openDownload();
+            }}
+            icon={<DownloadOutlined />}
+            type="primary"
+          >
+            {i18n('setting.button.startDownloading')}
+          </Button>
+        );
+      case UpdatedStatusEnum.UPDATING:
+        return (
+          <Button type="primary" loading>
+            {i18n('setting.button.beDownloading')}
+          </Button>
+        );
+      // 超时后端如何处理 TODO:
+      case UpdatedStatusEnum.TIMEOUT:
+        return (
+          <Button
+            onClick={() => {
+              updateDetectionRef?.current?.openDownload();
+            }}
+            icon={<DownloadOutlined />}
+            type="primary"
+            loading
+          >
+            {i18n('setting.button.redownload')}
+          </Button>
+        );
+      // case UpdatedStatusEnum.UPDATED:
+      //   return (
+      //     <Button icon={<RedoOutlined />} type="primary">
+      //       {i18n('setting.button.restart')}
+      //     </Button>
+      //   );
+      default:
+        return false;
+    }
+  }, [updateDetectionData]);
+
   return (
     <div className={styles.aboutUs}>
-      <BrandLogo size={60} className={styles.brandLogo} />
-      <div className={styles.brief}>
+      <div className={styles.versionsInfo}>
+        <BrandLogo size={98} className={styles.brandLogo} />
+        <div>
+          <div className={styles.currentVersion}>
+            <span className={styles.appName}>{APP_NAME}</span>
+            <span>{__APP_VERSION__}</span>
+          </div>
+          <div className={styles.newVersion}>
+            {updateDetectionData?.needUpdate ? (
+              UpdatedStatusEnum.UPDATED === updateDetectionData?.updatedStatusEnum ?
+              <span>{i18n('setting.text.RestartingInstall')}</span>
+              :
+              <span>{i18n('setting.text.discoverNewVersion', updateDetectionData?.version)}</span>
+            ) : (
+              <span>{i18n('setting.text.isLatestVersion')}</span>
+            )}
+          </div>
+          {updateDetectionData?.desktop && (
+            <div className={styles.updateButton}>
+              {updateButton}
+              <Button onClick={jumpDoc}>{i18n('setting.button.changeLog')}</Button>
+            </div>
+          )}
+        </div>
+      </div>
+      <div className={styles.updateRule}>
+        <div className={styles.updateRuleTitle}>{i18n('setting.title.updateRule')}</div>
+        <Radio.Group className={styles.updateRuleGroup} onChange={onChangeUpdateRul} value={updateRule}>
+          <Space direction="vertical">
+            <Radio className={styles.updateRuleRadio} value="auto">
+              {i18n('setting.text.autoUpdate')}
+            </Radio>
+            <Radio className={styles.updateRuleRadio} value="manual">
+              {i18n('setting.text.manualUpdate')}
+            </Radio>
+          </Space>
+        </Radio.Group>
+      </div>
+      {/* <div className={styles.brief}>
         <div className={styles.appName}>{APP_NAME}</div>
         <div className={styles.env}>
           {i18n('setting.text.currentEnv')}:{__ENV__}
@@ -22,7 +135,7 @@ export default function AboutUs() {
         <a target="blank" href={GITHUB_URL} className={styles.log}>
           {i18n('setting.text.viewingUpdateLogs')}
         </a>
-      </div>
+      </div> */}
     </div>
   );
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,6 @@ const chainWebpack = (config: any, { webpack }: any) => { @@
           languages: ['mysql', 'pgsql', 'sql'],
         },
       ]);
-      config.output.filename(`[name].${yarn_config.app_version || new Date().getTime()}.js`);
     };
     export default defineConfig({
@@ Expand Down @@