Home Explore Help
Register Sign In
networkcar
/
control
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

增加热更新功能，移除less

Caner 2 years ago
parent
40d3a3b019
commit
27a2f9816d
13 changed files with 48 additions and 55 deletions
Split View Show Diff Stats
  1. 2 1
      .eslintignore
  2. 3 1
      .gitignore
  3. 8 19
      electron/main.js
  4. 2 2
      electron/preload.js
  5. 0 0
      env.d.ts
  6. 1 1
      index.html
  7. 7 9
      package.json
  8. 1 1
      src/components/battery.vue
  9. 1 1
      src/components/login.vue
  10. 1 1
      src/views/index/index.vue
  11. 16 18
      tsconfig.json
  12. 2 1
      tsconfig.node.json
  13. 4 0
      vite.config.ts

+ 2 - 1
.eslintignore
View File 

@@ -1,4 +1,5 @@
 
 # 排除eslint检查文件
 
 /dist
 
 /public
 
-/main.js
 
+/electron
 
+/dist-electron

+ 3 - 1
.gitignore
View File 

@@ -25,4 +25,6 @@ dist-ssr
 
 yarn.lock
 
 dist
 
 package-lock.json
 
-dist-ssr
 
+dist-ssr
 
+dist-electron
 
+out

+ 8 - 19
main.js → electron/main.js
View File 

@@ -1,20 +1,9 @@
 
-const {app, BrowserWindow, Menu, ipcMain, globalShortcut } = require('electron')// 引入electron
 
-const path = require('path')
 
+const { app, BrowserWindow, Menu, ipcMain, globalShortcut } = require('electron');// 引入electron
 
+const path = require('path');
 
 let win, loadingWin;
 
 Menu.setApplicationMenu(null) // 去掉菜单栏
 
 app.commandLine.appendSwitch('wm-window-animations-disabled') // 拖动闪屏
 
 
-// 消息通知
 
-function notifiction(title, options) {
 
-  const WebNotification = window.Notification || window.mozNotification || window.webkitNotification
 
-  const isTrue = WebNotification.requestPermission(result => {
 
-    return (result === 'granted') // granted（允许） || denied（拒绝）
 
-  })
 
-  const noti = new WebNotification(title, options)
 
-  noti.onclick = () => {
 
-    console.log('关闭')
 
-  }
 
-}
 
 
 // 创建loading 窗口
 
 const showLoading = () => {
 
@@ -44,7 +33,7 @@ const createWindow = () => {
 
       contextIsolation: true,
 
       nodeIntegration: true,
 
       webSecurity: false, // 去掉跨越
 
-      preload: path.join(__dirname, 'preload.js')
 
+      preload: path.join(__dirname, './preload.js')
 
     },
 
     show: false
 
   })// 创建一个窗口
 
@@ -55,7 +44,7 @@ const createWindow = () => {
 
   } else {
 
     win.loadURL('http://localhost:6547/')
 
   }
 
-  
+
 
   // 事件监听
 
   win.on('close', () => {
 
     // 回收BrowserWindow对象
 
@@ -69,14 +58,14 @@ app.on('ready', async () => {
 
   createWindow()
 
   // 监听渲染进行
 
   ipcMain.once('close-loading', () => {
 
-    loadingWin.close()
 
-    win.show()
 
+    loadingWin?.close()
 
+    win?.show()
 
   })
 
   // 在BrowserWindow创建完成后，注册全局快捷键
 
   globalShortcut.register('Control+F12', () => {
 
-    win.webContents.toggleDevTools()
 
+    win?.webContents.toggleDevTools()
 
   })
 
-  
+
 
 })
 
 
 app.on('window-all-closed', () => {

+ 2 - 2
preload.js → electron/preload.js
View File 

@@ -1,4 +1,4 @@
 
-const { contextBridge, ipcRenderer } = require('electron')
 
+const { contextBridge, ipcRenderer } = require('electron');
 
 const HID = require('node-hid');
 
 const devices = HID.devices()
 
 const logitech = devices.filter(el => el.manufacturer == 'Logitech')
 
@@ -18,5 +18,5 @@ contextBridge.exposeInMainWorld('$electron', {
 
   send: (channel, args) => ipcRenderer.send(channel, args),
 
   once: (channel, listener) => ipcRenderer.once(channel, listener),
 
   on: (channel, listener) => ipcRenderer.on(channel, listener),
 
-  onContrl: (callBack) => data.on('data', db => callBack(db))
 
+  onContrl: (callBack) => data.on('data', (db) => callBack(db))
 
 })

+ 0 - 0
src/vite-env.d.ts → env.d.ts
View File


+ 1 - 1
index.html
View File 

@@ -23,7 +23,7 @@
 
 
 <body>
 
   <div id="app"></div>
 
-  <script type="module" src="./src/main.ts"></script>
 
+  <script type="module" src="/src/main.ts"></script>
 
 </body>
 
 
 </html>

+ 7 - 9
package.json
View File 

@@ -1,20 +1,17 @@
 
 {
 
   "name": "contrl-client",
 
   "version": "1.0.0",
 
-  "main": "main.js",
 
+  "main": "electron/main.js",
 
   "author": "Caner",
 
   "description": "控制端",
 
   "scripts": {
 
-    "dev": "concurrently -k \"yarn:dev_*\"",
 
+    "dev": "vite",
 
     "build": "vue-tsc --noEmit && vite build && yarn pmake",
 
-    "dev_vite": "vite",
 
-    "dev_electron": "electron .",
 
     "make": "electron-forge make",
 
     "pmake": "electron-forge package"
 
   },
 
   "dependencies": {
 
     "echarts": "^5.4.2",
 
-    "node-hid": "^2.1.2",
 
     "socket.io-client": "^4.6.1",
 
     "vue": "^3.3.2",
 
     "vue-router": "^4.2.0"
 
@@ -25,16 +22,17 @@
 
     "@types/node": "^18.15.3",
 
     "@typescript-eslint/parser": "^5.40.0",
 
     "@vitejs/plugin-vue": "^4.2.3",
 
-    "concurrently": "^8.1.0",
 
     "electron": "^23.1.2",
 
     "eslint": "^8.40.0",
 
     "eslint-config-airbnb-base": "^15.0.0",
 
     "eslint-plugin-import": "^2.27.5",
 
     "eslint-plugin-vue": "^9.13.0",
 
-    "less": "^4.1.3",
 
-    "typescript": "^5.0.4",
 
+    "node-hid": "^2.1.2",
 
+    "sass": "^1.63.3",
 
+    "typescript": "~5.0.4",
 
     "vite": "^4.3.6",
 
     "vite-plugin-compression": "^0.5.1",
 
+    "vite-plugin-electron": "^0.11.2",
 
     "vite-plugin-eslint": "^1.8.1",
 
     "vite-plugin-svg-icons": "^2.0.1",
 
     "vue-tsc": "^1.6.5"
 
@@ -43,7 +41,7 @@
 
     "forge": {
 
       "packagerConfig": {
 
         "asar": true,
 
-        "ignore": "(out|vite.config.ts|README.md|.env|.gitignore|.eslintrc.json|src|public|node_modules|package-lock.json)"
 
+        "ignore": "(dist-electron|out|vite.config.ts|README.md|.env|.gitignore|.eslintrc.json|src|public|node_modules|package-lock.json)"
 
       },
 
       "makers": [
 
         {

+ 1 - 1
src/components/battery.vue
View File 

@@ -33,7 +33,7 @@ const bgClass = computed(() => {
 
 })
 
 </script>
 
 
-<style scoped lang="less">
 
+<style scoped lang="scss">
 
 .electric {
 
   display: flex;
 
   justify-content: center;

+ 1 - 1
src/components/login.vue
View File 

@@ -52,7 +52,7 @@ function login() {
 
     </div>
 
   </div>
 
 </template>
 
-<style scoped lang="less">
 
+<style scoped lang="scss">
 
 .login {
 
   width: 100%;
 
   height: 100%;

+ 1 - 1
src/views/index/index.vue
View File 

@@ -298,7 +298,7 @@ onUnmounted(() => {
 
     @loginBack="login"
 
   />
 
 </template>
 
-<style scoped lang="less">
 
+<style scoped lang="scss">
 
 video {
 
   background: black;
 
   object-fit: fill;

+ 16 - 18
tsconfig.json
View File 

@@ -1,30 +1,28 @@
 
 {
 
   "compilerOptions": {
 
-    "target": "ESNext",
 
+    "target": "ES2020",
 
     "useDefineForClassFields": true,
 
-    "experimentalDecorators": true,
 
     "module": "ESNext",
 
-    "moduleResolution": "Node",
 
-    "strict": true,
 
-    "jsx": "preserve",
 
-    "sourceMap": true,
 
+    "lib": ["ES2020", "DOM", "DOM.Iterable"],
 
+    "skipLibCheck": true,
 
+
 
+    /* Bundler mode */
 
+    "moduleResolution": "bundler",
 
+    "allowImportingTsExtensions": true,
 
     "resolveJsonModule": true,
 
     "isolatedModules": true,
 
-    "esModuleInterop": true,
 
-    "lib": [
 
-      "ESNext",
 
-      "DOM"
 
-    ],
 
-    "skipLibCheck": true,
 
-    "baseUrl": "./",
 
-    "paths": {
 
-      "@/*": [
 
-        "src/*"
 
-      ]
 
-    },
 
+    "noEmit": true,
 
+    "jsx": "preserve",
 
+
 
+    /* Linting */
 
+    "strict": true,
 
+    "noUnusedLocals": true,
 
+    "noUnusedParameters": true,
 
+    "noFallthroughCasesInSwitch": true,
 
     "types": ["vite-plugin-svg-icons/client"]
 
   },
 
   "include": [
 
+    "*.d.ts",
 
     "src/**/*.ts",
 
     "src/**/*.d.ts",
 
     "src/**/*.tsx",

+ 2 - 1
tsconfig.node.json
View File 

@@ -1,8 +1,9 @@
 
 {
 
   "compilerOptions": {
 
     "composite": true,
 
+    "skipLibCheck": true,
 
     "module": "ESNext",
 
-    "moduleResolution": "Node",
 
+    "moduleResolution": "bundler",
 
     "allowSyntheticDefaultImports": true
 
   },
 
   "include": ["vite.config.ts"]

+ 4 - 0
vite.config.ts
View File 

@@ -4,6 +4,7 @@ import eslint from 'vite-plugin-eslint'
 
 import viteCompression from 'vite-plugin-compression'
 
 import { resolve } from 'path'
 
 import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
 
+import electron from 'vite-plugin-electron'
 
 
 export default () => defineConfig({
 
   base: './',
 
@@ -21,6 +22,9 @@ export default () => defineConfig({
 
       // Specify symbolId format
 
       symbolId: 'icon-[dir]-[name]'
 
     }),
 
+    electron({
 
+      entry: 'electron/main.js'
 
+    }),
 
   ],
 
   server: {
 
     host: '0.0.0.0',