Merge pull request #1092 from chat2db/dev

Dev

.github/workflows/release.yml

@@ -137,10 +137,13 @@ jobs:
       - name: Yarn install & build & copy
         run: |
           cd chat2db-client
-          yarn install 
+          yarn 
           yarn run build:web:prod --app_version=${{ steps.chat2db_version.outputs.substring }}
           cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
           cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
+          cd src/main
+          yarn
+          yarn run build
 
       # 编译服务端java版本
       - name: Build Java

.github/workflows/release_test.yml

@@ -100,10 +100,14 @@ jobs:
       - name: Build FE Static
         run: |
           cd chat2db-client
-          yarn install --frozen-lockfile
+          yarn
           yarn run build:web:prod --app_version=99.0.${{ github.run_id }} --app_port=10822
           cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
           cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
+          cd src/main
+          yarn
+          yarn run build
+
 
       # 打包后端工程 & 发送到前端
       - name: Build BE Static

.github/workflows/release_test_2.yml

@@ -100,10 +100,13 @@ jobs:
       - name: Build FE Static
         run: |
           cd chat2db-client
-          yarn install --frozen-lockfile
+          yarn
           yarn run build:web:prod --app_version=99.0.${{ github.run_id }} --app_port=10822
           cp -r dist ../chat2db-server/chat2db-server-start/src/main/resources/static/front
           cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
+          cd src/main
+          yarn
+          yarn run build
 
       # 打包后端工程 & 发送到前端
       - name: Build BE Static

CHANGELOG.md

@@ -1,12 +1,14 @@
 ## 3.1.19
 
-`2024-1-2`
+`2024-1-3`
 
 **Changelog**
 
 - ⭐【New Features】Open table supports filtering sort
 - ⚡️【Optimize】Optimize startup speed
 - 🐞【Fixed】SQL error generated by modifying the table structure
+- 🐞【Fixed】The problem of direct query table data error due to characters
+- 🐞【Fixed】null point error
 
 
 ## 3.1.18

CHANGELOG_CN.md

@@ -1,12 +1,14 @@
 ## 3.1.19
 
-`2024-1-2`
+`2024-1-3`
 
 **更新日志**
 
 - ⭐【新功能】打开表支持筛选排序
 - ⚡️【优化】优化启动速度
 - 🐞【修复】修改表结构生成SQL错误
+- 🐞【修复】直接查询表因字符导致数据错误的问题
+- 🐞【修复】null point error
 
 ## 3.1.18
 

chat2db-client/.gitignore

@@ -5,6 +5,8 @@
 /src/.umi
 /src/.umi-production
 /src/.umi-test
+/src/main/node_modules
+/src/main/dist
 /dist
 .swc
 ./yarn-error.log

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

chat2db-client/package.json

@@ -7,7 +7,7 @@
     "url": "https://github.com/chat2db/Chat2DB"
   },
   "author": "fjy, hexi",
-  "main": "src/main/index.js",
+  "main": "src/main/main.js",
   "scripts": {
     "build": "npm run build:web && npm run build:main",
     "build:desktop": "npm run build:web:desktop && npm run build:main:prod",
@@ -33,15 +33,13 @@
     "copy-to-clipboard": "^3.3.3",
     "echarts": "^5.4.2",
     "echarts-for-react": "^3.0.2",
-    "electron-log": "^4.4.8",
     "event-source-polyfill": "^1.0.31",
     "highlight.js": "^11.9.0",
     "lodash": "^4.17.21",
     "markdown-it-link-attributes": "^4.0.1",
     "monaco-editor": "^0.44.0",
     "monaco-editor-esm-webpack-plugin": "^2.1.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
-    "node-machine-id": "^1.1.12",
     "react-monaco-editor": "^0.54.0",
     "react-sortablejs": "^6.1.4",
     "sql-formatter": "^13.0.4",
@@ -65,7 +63,6 @@
     "electron": "^22.3.0",
     "electron-builder": "^23.6.0",
     "electron-debug": "^3.2.0",
-    "electron-reload": "^2.0.0-alpha.1",
     "eslint": "^8.49.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
@@ -98,14 +95,11 @@
     "asar": false,
     "files": [
       "dist/**/*",
-      "static/",
       "src/main",
+      "static/",
       "versions/**/*",
       "package.json",
-      "!node_modules/**/*",
-      "node_modules/uuid",
-      "node_modules/electron-log",
-      "node_modules/node-machine-id"
+      "!node_modules/**/*"
     ],
     "nsis": {
       "oneClick": false,