Merge pull request #1083 from chat2db/refactor-electron

Refactor electron
chat2db · Jan 9, 2024 · dc1f376 · dc1f376
2 parents 76cea50 + 94483bd
commit dc1f376
Show file tree

Hide file tree

Showing 17 changed files with 278 additions and 2,304 deletions.
diff --git a/chat2db-client/.umirc.ts b/chat2db-client/.umirc.ts
@@ -83,7 +83,7 @@ export default defineConfig({
       localStorage.clear();
       localStorage.setItem('app-local-storage-versions', 'v4');
     }`,
-    `if (window.electronApi) { window.electronApi.startServerForSpawn() }`,
+    // `if (window.electronApi) { window.electronApi.startServerForSpawn() }`,
     // `if ("serviceWorker" in navigator) {
     //   window.addEventListener("load", function () {
     //     navigator.serviceWorker

diff --git a/chat2db-client/src/assets/font/demo_index.html b/chat2db-client/src/assets/font/demo_index.html
@@ -54,6 +54,42 @@ <h1 class="logo"><a href="https://www.iconfont.cn/" title="iconfont 首页" targ
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+              <span class="icon iconfont">&#xe671;</span>
+                <div class="name">minimize21</div>
+                <div class="code-name">&amp;#xe671;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe66b;</span>
+                <div class="name">restore</div>
+                <div class="code-name">&amp;#xe66b;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe66e;</span>
+                <div class="name">resize</div>
+                <div class="code-name">&amp;#xe66e;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe66f;</span>
+                <div class="name">close</div>
+                <div class="code-name">&amp;#xe66f;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe66a;</span>
+                <div class="name">筛选</div>
+                <div class="code-name">&amp;#xe66a;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe69a;</span>
+                <div class="name">排序</div>
+                <div class="code-name">&amp;#xe69a;</div>
+              </li>
+
             <li class="dib">
               <span class="icon iconfont">&#xe8e8;</span>
                 <div class="name">305信息-线性圆框</div>
@@ -1236,9 +1272,9 @@ <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</co
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1703676613329') format('woff2'),
-       url('iconfont.woff?t=1703676613329') format('woff'),
-       url('iconfont.ttf?t=1703676613329') format('truetype');
+  src: url('iconfont.woff2?t=1704776684062') format('woff2'),
+       url('iconfont.woff?t=1704776684062') format('woff'),
+       url('iconfont.ttf?t=1704776684062') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1264,6 +1300,60 @@ <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面
       <div class="content font-class">
         <ul class="icon_lists dib-box">
 
+          <li class="dib">
+            <span class="icon iconfont icon-minimize21"></span>
+            <div class="name">
+              minimize21
+            </div>
+            <div class="code-name">.icon-minimize21
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-restore_button2"></span>
+            <div class="name">
+              restore
+            </div>
+            <div class="code-name">.icon-restore_button2
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-resize_button2"></span>
+            <div class="name">
+              resize
+            </div>
+            <div class="code-name">.icon-resize_button2
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-close_button2"></span>
+            <div class="name">
+              close
+            </div>
+            <div class="code-name">.icon-close_button2
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-shaixuan"></span>
+            <div class="name">
+              筛选
+            </div>
+            <div class="code-name">.icon-shaixuan
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-a-44tubiao-122"></span>
+            <div class="name">
+              排序
+            </div>
+            <div class="code-name">.icon-a-44tubiao-122
+            </div>
+          </li>
+
           <li class="dib">
             <span class="icon iconfont icon-xinxi-xianxingyuankuang"></span>
             <div class="name">
@@ -3037,6 +3127,54 @@ <h3 id="-">第二步：挑选相应图标并获取类名，应用于页面：</h
       <div class="content symbol">
           <ul class="icon_lists dib-box">
 
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-minimize21"></use>
+                </svg>
+                <div class="name">minimize21</div>
+                <div class="code-name">#icon-minimize21</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-restore_button2"></use>
+                </svg>
+                <div class="name">restore</div>
+                <div class="code-name">#icon-restore_button2</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-resize_button2"></use>
+                </svg>
+                <div class="name">resize</div>
+                <div class="code-name">#icon-resize_button2</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-close_button2"></use>
+                </svg>
+                <div class="name">close</div>
+                <div class="code-name">#icon-close_button2</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shaixuan"></use>
+                </svg>
+                <div class="name">筛选</div>
+                <div class="code-name">#icon-shaixuan</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-44tubiao-122"></use>
+                </svg>
+                <div class="name">排序</div>
+                <div class="code-name">#icon-a-44tubiao-122</div>
+            </li>
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-xinxi-xianxingyuankuang"></use>

diff --git a/chat2db-client/src/assets/font/iconfont.css b/chat2db-client/src/assets/font/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3633546 */
-  src: url('iconfont.woff2?t=1703676613329') format('woff2'),
-       url('iconfont.woff?t=1703676613329') format('woff'),
-       url('iconfont.ttf?t=1703676613329') format('truetype');
+  src: url('iconfont.woff2?t=1704776684062') format('woff2'),
+       url('iconfont.woff?t=1704776684062') format('woff'),
+       url('iconfont.ttf?t=1704776684062') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-minimize21:before {
+  content: "\e671";
+}
+
+.icon-restore_button2:before {
+  content: "\e66b";
+}
+
+.icon-resize_button2:before {
+  content: "\e66e";
+}
+
+.icon-close_button2:before {
+  content: "\e66f";
+}
+
+.icon-shaixuan:before {
+  content: "\e66a";
+}
+
+.icon-a-44tubiao-122:before {
+  content: "\e69a";
+}
+
 .icon-xinxi-xianxingyuankuang:before {
   content: "\e8e8";
 }

diff --git a/chat2db-client/src/assets/font/iconfont.js b/chat2db-client/src/assets/font/iconfont.js
diff --git a/chat2db-client/src/assets/font/iconfont.json b/chat2db-client/src/assets/font/iconfont.json
@@ -5,6 +5,48 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "38873585",
+      "name": "minimize21",
+      "font_class": "minimize21",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "38872025",
+      "name": "restore",
+      "font_class": "restore_button2",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "38872027",
+      "name": "resize",
+      "font_class": "resize_button2",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "38872028",
+      "name": "close",
+      "font_class": "close_button2",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "8721198",
+      "name": "筛选",
+      "font_class": "shaixuan",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "38644725",
+      "name": "排序",
+      "font_class": "a-44tubiao-122",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
     {
       "icon_id": "1727525",
       "name": "305信息-线性圆框",

diff --git a/chat2db-client/src/assets/font/iconfont.ttf b/chat2db-client/src/assets/font/iconfont.ttf
diff --git a/chat2db-client/src/assets/font/iconfont.woff b/chat2db-client/src/assets/font/iconfont.woff
diff --git a/chat2db-client/src/assets/font/iconfont.woff2 b/chat2db-client/src/assets/font/iconfont.woff2
diff --git a/chat2db-client/src/blocks/AppTitleBar/index.tsx b/chat2db-client/src/blocks/AppTitleBar/index.tsx
@@ -1,4 +1,4 @@
-import React, { memo, useMemo } from 'react';
+import React, { memo, useState, useMemo } from 'react';
 import styles from './index.less';
 import classnames from 'classnames';
 import { useCommonStore } from '@/store/common';
@@ -10,6 +10,7 @@ interface IProps {
 
 export default memo<IProps>((props) => {
   const { className } = props;
+  const [isMaximized, setIsMaximize] = useState(window.electronApi?.isMaximized());
 
   const { appTitleBarRightComponent } = useCommonStore((state) => {
     return {
@@ -25,11 +26,24 @@ export default memo<IProps>((props) => {
 
   const handleDoubleClick = () => {
     window.electronApi?.setMaximize();
+    setIsMaximize(!isMaximized);
   };
 
-  const handelMaximize = () => {
+  const handelMinimizeWindow = (e) => {
+    e.stopPropagation();
+    window.electronApi?.minimizeWindow();
+  };
+
+  const handelMaximize = (e) => {
+    e.stopPropagation();
     window.electronApi?.setMaximize();
-  }
+    setIsMaximize(!isMaximized);
+  };
+
+  const handelCloseWindow = (e) => {
+    e.stopPropagation();
+    window.electronApi?.closeWindow();
+  };
 
   return (
     <div className={classnames(styles.appTitleBar, className)} onDoubleClick={handleDoubleClick}>
@@ -40,14 +54,14 @@ export default memo<IProps>((props) => {
       </div>
       {isWin && (
         <div className={styles.windowsCloseBar}>
-          <div className={styles.windowsCloseBarItem}>
-            <Iconfont code="&#xeb78;" />
+          <div className={styles.windowsCloseBarItem} onClick={handelMinimizeWindow}>
+            <Iconfont code="&#xe671;" />
           </div>
           <div className={styles.windowsCloseBarItem} onClick={handelMaximize}>
-            <Iconfont code="&#xeb78;" />
+            {isMaximized ? <Iconfont code="&#xe66e;" /> : <Iconfont code="&#xe66b;" />}
           </div>
-          <div className={styles.windowsCloseBarItem}>
-            <Iconfont code="&#xeb78;" />
+          <div className={styles.windowsCloseBarItem} onClick={handelCloseWindow}>
+            <Iconfont code="&#xe66f;" />
           </div>
         </div>
       )}

diff --git a/chat2db-client/src/components/Iconfont/index.tsx b/chat2db-client/src/components/Iconfont/index.tsx
@@ -9,9 +9,9 @@ if (__ENV__ === 'local') {
   /* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
   @font-face {
     font-family: 'iconfont';  /* Project id 3633546 */
-    src: url('//at.alicdn.com/t/c/font_3633546_yr9ay65j0fs.woff2?t=1703837870848') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3633546_yr9ay65j0fs.woff?t=1703837870848') format('woff'),
-         url('//at.alicdn.com/t/c/font_3633546_yr9ay65j0fs.ttf?t=1703837870848') format('truetype');
+    src: url('//at.alicdn.com/t/c/font_3633546_ahqjb5vaa0m.woff2?t=1704776615855') format('woff2'),
+         url('//at.alicdn.com/t/c/font_3633546_ahqjb5vaa0m.woff?t=1704776615855') format('woff'),
+         url('//at.alicdn.com/t/c/font_3633546_ahqjb5vaa0m.ttf?t=1704776615855') format('truetype');
   }
   `;
   const style = document.createElement('style');

diff --git a/chat2db-client/src/hooks/usePollRequestService.ts b/chat2db-client/src/hooks/usePollRequestService.ts
@@ -45,6 +45,10 @@ const usePollRequestService = ({ maxAttempts = 200, interval = 200, loopService
     serviceFn();
 
     if (serviceStatus !== ServiceStatus.SUCCESS) {
+      // 第一次请求失败，启动服务
+      if (attempts === 1) {
+        window.electronApi?.startServerForSpawn();
+      }
       intervalId = setInterval(serviceFn, interval);
     }