Merge pull request #1090 from chat2db/refactor-electron

Refactor electron
chat2db · Jan 9, 2024 · 23bf439 · 23bf439
2 parents c7d2364 + c64e2ec
commit 23bf439
Show file tree

Hide file tree

Showing 11 changed files with 151 additions and 15 deletions.
diff --git a/chat2db-client/src/assets/font/demo_index.html b/chat2db-client/src/assets/font/demo_index.html
@@ -54,6 +54,30 @@ <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">&#xe672;</span>
+                <div class="name">right_on_5</div>
+                <div class="code-name">&amp;#xe672;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe673;</span>
+                <div class="name">right_off_5-01</div>
+                <div class="code-name">&amp;#xe673;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe674;</span>
+                <div class="name">left_on_2</div>
+                <div class="code-name">&amp;#xe674;</div>
+              </li>
+
+            <li class="dib">
+              <span class="icon iconfont">&#xe670;</span>
+                <div class="name">left_off</div>
+                <div class="code-name">&amp;#xe670;</div>
+              </li>
+
             <li class="dib">
               <span class="icon iconfont">&#xe671;</span>
                 <div class="name">minimize21</div>
@@ -1272,9 +1296,9 @@ <h3 id="-font-face">第一步：拷贝项目下面生成的 <code>@font-face</co
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1704776684062') format('woff2'),
-       url('iconfont.woff?t=1704776684062') format('woff'),
-       url('iconfont.ttf?t=1704776684062') format('truetype');
+  src: url('iconfont.woff2?t=1704794525154') format('woff2'),
+       url('iconfont.woff?t=1704794525154') format('woff'),
+       url('iconfont.ttf?t=1704794525154') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -1300,6 +1324,42 @@ <h3 id="-">第三步：挑选相应图标并获取字体编码，应用于页面
       <div class="content font-class">
         <ul class="icon_lists dib-box">
 
+          <li class="dib">
+            <span class="icon iconfont icon-right_on_5"></span>
+            <div class="name">
+              right_on_5
+            </div>
+            <div class="code-name">.icon-right_on_5
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-right_off_5-01"></span>
+            <div class="name">
+              right_off_5-01
+            </div>
+            <div class="code-name">.icon-right_off_5-01
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-a-left_on_huaban11"></span>
+            <div class="name">
+              left_on_2
+            </div>
+            <div class="code-name">.icon-a-left_on_huaban11
+            </div>
+          </li>
+
+          <li class="dib">
+            <span class="icon iconfont icon-a-left_off_huaban1"></span>
+            <div class="name">
+              left_off
+            </div>
+            <div class="code-name">.icon-a-left_off_huaban1
+            </div>
+          </li>
+
           <li class="dib">
             <span class="icon iconfont icon-minimize21"></span>
             <div class="name">
@@ -3127,6 +3187,38 @@ <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-right_on_5"></use>
+                </svg>
+                <div class="name">right_on_5</div>
+                <div class="code-name">#icon-right_on_5</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-right_off_5-01"></use>
+                </svg>
+                <div class="name">right_off_5-01</div>
+                <div class="code-name">#icon-right_off_5-01</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-left_on_huaban11"></use>
+                </svg>
+                <div class="name">left_on_2</div>
+                <div class="code-name">#icon-a-left_on_huaban11</div>
+            </li>
+
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-left_off_huaban1"></use>
+                </svg>
+                <div class="name">left_off</div>
+                <div class="code-name">#icon-a-left_off_huaban1</div>
+            </li>
+
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-minimize21"></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=1704776684062') format('woff2'),
-       url('iconfont.woff?t=1704776684062') format('woff'),
-       url('iconfont.ttf?t=1704776684062') format('truetype');
+  src: url('iconfont.woff2?t=1704794525154') format('woff2'),
+       url('iconfont.woff?t=1704794525154') format('woff'),
+       url('iconfont.ttf?t=1704794525154') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-right_on_5:before {
+  content: "\e672";
+}
+
+.icon-right_off_5-01:before {
+  content: "\e673";
+}
+
+.icon-a-left_on_huaban11:before {
+  content: "\e674";
+}
+
+.icon-a-left_off_huaban1:before {
+  content: "\e670";
+}
+
 .icon-minimize21:before {
   content: "\e671";
 }

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,34 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "38884431",
+      "name": "right_on_5",
+      "font_class": "right_on_5",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "38884432",
+      "name": "right_off_5-01",
+      "font_class": "right_off_5-01",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "38883914",
+      "name": "left_on_2",
+      "font_class": "a-left_on_huaban11",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "38882655",
+      "name": "left_off",
+      "font_class": "a-left_off_huaban1",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
     {
       "icon_id": "38873585",
       "name": "minimize21",

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.less b/chat2db-client/src/blocks/AppTitleBar/index.less
@@ -8,7 +8,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
-  height: 34px;
+  height: 30px;
   .appTitleBarGlobal{
     flex: 1;
     display: flex;

diff --git a/chat2db-client/src/components/ConsoleEditor/components/SelectBoundInfo/index.tsx b/chat2db-client/src/components/ConsoleEditor/components/SelectBoundInfo/index.tsx
@@ -106,7 +106,7 @@ const SelectBoundInfo = memo((props: IProps) => {
     if (!supportSchema && boundInfo.databaseName) {
       getAllTableNameList(boundInfo.dataSourceId, boundInfo.databaseName);
     }
-  }, [boundInfo.databaseName, isActive]);
+  }, [boundInfo.databaseName, isActive, supportSchema]);
 
   useEffect(() => {
     if (!isActive || boundInfo.connectable === false) {
@@ -115,7 +115,7 @@ const SelectBoundInfo = memo((props: IProps) => {
     if (supportSchema && boundInfo.schemaName) {
       getAllTableNameList(boundInfo.dataSourceId, boundInfo.databaseName, boundInfo.schemaName);
     }
-  }, [boundInfo.schemaName, isActive]);
+  }, [boundInfo.schemaName, isActive, supportSchema]);
 
   // 获取数据库列表
   const getDatabaseList = () => {

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_n19od3mt6mo.woff2?t=1704792255884') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3633546_n19od3mt6mo.woff?t=1704792255884') format('woff'),
-         url('//at.alicdn.com/t/c/font_3633546_n19od3mt6mo.ttf?t=1704792255884') format('truetype');
+    src: url('//at.alicdn.com/t/c/font_3633546_n88tvocxfkj.woff2?t=1704794450779') format('woff2'),
+         url('//at.alicdn.com/t/c/font_3633546_n88tvocxfkj.woff?t=1704794450779') format('woff'),
+         url('//at.alicdn.com/t/c/font_3633546_n88tvocxfkj.ttf?t=1704794450779') format('truetype');
   }
   `;
   const style = document.createElement('style');

diff --git a/chat2db-client/src/main/preload.js b/chat2db-client/src/main/preload.js
@@ -2,7 +2,7 @@ const { contextBridge, ipcRenderer } = require('electron');
 const { spawn } = require('child_process');
 const { JAVA_APP_NAME, JAVA_PATH } = require('./constants');
 const path = require('path');
-const { readVersion, isLinux, isWin } = require('./utils');
+const { readVersion, isLinux, isWin, isMac } = require('./utils');
 
 contextBridge.exposeInMainWorld('electronApi', {
   startServerForSpawn: async () => {
@@ -74,7 +74,7 @@ contextBridge.exposeInMainWorld('electronApi', {
     return {
       isLinux,
       isWin,
-      isLinux,
+      isMac,
     };
   },
 });