Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

electron-builder-prod.yml

@@ -1,7 +1,16 @@
 appId: com.electron.app
 productName: AIx
 directories:
+  output: dist
   buildResources: build
+win:
+  executableName: AIx
+  icon: resources/logo2.ico
+  extraFiles:
+    - from: ./node_modules/im_electron_sdk/lib/
+      to: ./resources
+      filter:
+        - '**/*'
 files:
   - '!**/.vscode/*'
   - '!src/*'
@@ -10,9 +19,6 @@ files:
   - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
 asarUnpack:
   - resources/**
-win:
-  executableName: AIx
-  icon: resources/logo2.ico
 nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true

electron-builder-test.yml

@@ -13,7 +13,12 @@ asarUnpack:
 win:
   executableName: AIx
   icon: resources/logo2.ico
-nsis: 
+  extraFiles:
+    - from: ./node_modules/im_electron_sdk/lib/
+      to: ./resources
+      filter:
+        - '**/*'
+nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
   artifactName: ${name}-${version}-setup.${ext}

electron-builder.yml

@@ -15,10 +15,10 @@ win:
   icon: resources/logo2.ico
   extraFiles:
     - from: ./node_modules/im_electron_sdk/lib/
-    - to: ./resources
-    - filter: 
-      - '**/*'
-nsis: 
+      to: ./resources
+      filter:
+        - '**/*'
+nsis:
   oneClick: false
   allowToChangeInstallationDirectory: true
   artifactName: ${name}-${version}-setup.${ext}

src/renderer/src/utils/tool.js

@@ -110,7 +110,7 @@ export const createWindow = async (type, data) => {
       wins_tool.setIgnoreMouseEvents(true, {forward: true}) // 忽略鼠标事件但是事件继续传递给窗口
       wins_tool.setAlwaysOnTop(true,'screen-saver') // 将窗口设置为顶层窗口
       wins_tool.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
-      // win.webContents.openDevTools() // 打开调试工具
+      // wins_tool.webContents.openDevTools() // 打开调试工具
       eventHandles(type, wins_tool) // 事件监听处理
       return wins_tool
     }