fix bug

electron-builder.yml

@@ -1,5 +1,5 @@
-appId: com.electron.app
-productName: my-app
+appId: com.zephyr.app
+productName: zephyr
 directories:
     buildResources: build
 files:
@@ -12,7 +12,7 @@ files:
 asarUnpack:
     - resources/**
 win:
-    executableName: my-app
+    executableName: zephyr
 nsis:
     artifactName: ${name}-${version}-setup.${ext}
     shortcutName: ${productName}

electron.vite.config.ts

@@ -25,6 +25,7 @@ export default defineConfig({
         plugins: [externalizeDepsPlugin()],
     },
     renderer: {
+        root: resolve(__dirname, "./src/renderer"),
         resolve: {
             alias: {
                 config: resolve("config"),
@@ -43,7 +44,7 @@ export default defineConfig({
             rollupOptions: {
                 input: {
                     main: resolve(__dirname, "./src/renderer/index.html"),
-                    about: resolve(__dirname, "src/renderer/about.html"),
+                    about: resolve(__dirname, "./src/renderer/about.html"),
                 },
             },
         },

src/main/modules/updater/index.ts

@@ -1,8 +1,8 @@
 import pkg from "electron-updater"
 import { app, dialog } from "electron"
-import { injectable, inject } from "inversify"
+import { injectable } from "inversify"
 import BaseClass from "main/base/base"
-import { Setting } from "../setting"
+// import { Setting } from "../setting"
 import _debug from "debug"
 import EventEmitter from "events"
 
@@ -13,7 +13,9 @@ const { autoUpdater } = pkg
 export class Updater extends BaseClass {
     public events = new EventEmitter()
 
-    constructor(@inject(Setting) private _Setting: Setting) {
+    constructor(
+        // @inject(Setting) private _Setting: Setting
+    ) {
         super()
 
         // 配置自动更新

src/main/modules/zephyr/index.ts

@@ -1,6 +1,5 @@
 import { session, net } from "electron"
-import { inject, injectable } from "inversify"
-import IOC from "main/_ioc"
+import { injectable } from "inversify"
 import BaseClass from "main/base/base"
 import _debug from "debug"
 
@@ -8,10 +7,12 @@ const debug = _debug("app:zephyr")
 
 @injectable()
 class Zephyr extends BaseClass {
-    constructor(@inject(IOC) private _IOC: IOC) {
+    constructor(
+        // @inject(IOC) private _IOC: IOC
+    ) {
         super()
         this.interceptHandlerZephyr = this.interceptHandlerZephyr.bind(this)
-        debug("aaaaaaaaaaaaaaaaaaaaaa")
+        debug("zephyr init")
     }
 
     destroy() {

src/main/utils/index.ts

@@ -2,12 +2,12 @@ import { is } from "@electron-toolkit/utils"
 import { join } from "node:path"
 import { webContents } from "electron"
 
-export function getFileUrl(app: string, route: string = "") {
+export function getFileUrl(app: string) {
     let winURL = ""
     if (is.dev && process.env["ELECTRON_RENDERER_URL"]) {
-        winURL = process.env["ELECTRON_RENDERER_URL"] + `/${app}#/${route}`
+        winURL = process.env["ELECTRON_RENDERER_URL"] + `/${app}#/`
     } else {
-        winURL = join(__dirname, `../renderer/${app}#/${route}`)
+        winURL = join(__dirname, `../renderer/${app}#/`)
     }
     return winURL
 }

src/renderer/src/assets/libs/scrollbot.ts

@@ -8,14 +8,14 @@ class Scrollbot {
     private scrollSpeed: number = 200
     private parContent!: string
     private newPar!: HTMLDivElement
-    private sbContainer!: HTMLDivElement
+    // private sbContainer!: HTMLDivElement
     private scrollBarHolder!: HTMLDivElement
     private scrollBar!: HTMLDivElement
     private inP!: HTMLDivElement
     private sbHeight: number = 0
     private mdown: boolean = false
     private customHeight: boolean = false
-    private scrollElement!: HTMLElement
+    // private scrollElement!: HTMLElement
     private onScrollF?: () => void
     private sB: ScrollStyle = {}
     private sBH: ScrollStyle = {}
@@ -55,7 +55,7 @@ class Scrollbot {
 
     private setupElements(): void {
         this.newPar = document.createElement("div")
-        this.sbContainer = document.createElement("div")
+        // this.sbContainer = document.createElement("div")
         this.scrollBarHolder = document.createElement("div")
         this.scrollBar = document.createElement("div")
         this.inP = document.createElement("div")
@@ -84,7 +84,7 @@ class Scrollbot {
         }px;width:100%;box-sizing:content-box;`
 
         this.sbHeight = (this.inP.clientHeight * 100) / this.inP.scrollHeight
-        this.scrollElement = this.inP
+        // this.scrollElement = this.inP
 
         this.updateScrollbarStyles()
     }

src/renderer/src/components/AdjustLine.vue

@@ -63,34 +63,34 @@ const currentSize = ref(props.defaultSize || 0)
 // 使用computed优化方向判断
 const isHorizontal = computed(() => props.direction === "left" || props.direction === "right")
 
-// 使用computed获取光标样式
-const cursorStyle = computed(() => (isHorizontal.value ? "ew-resize" : "ns-resize"))
-
-// 保存状态到localStorage的优化
-const storageKey = computed(() => `adjust-line-${props.mid}`)
-
-function saveSize(size: number) {
-    if (props.mid) {
-        try {
-            localStorage.setItem(storageKey.value, String(size))
-        } catch (error) {
-            console.warn("Failed to save size to localStorage:", error)
-        }
-    }
-}
-
-function loadSavedSize(): number | null {
-    if (props.mid) {
-        try {
-            const saved = localStorage.getItem(storageKey.value)
-            return saved ? Number(saved) : null
-        } catch (error) {
-            console.warn("Failed to load size from localStorage:", error)
-            return null
-        }
-    }
-    return null
-}
+// // 使用computed获取光标样式
+// const cursorStyle = computed(() => (isHorizontal.value ? "ew-resize" : "ns-resize"))
+
+// // 保存状态到localStorage的优化
+// const storageKey = computed(() => `adjust-line-${props.mid}`)
+
+// function saveSize(size: number) {
+//     if (props.mid) {
+//         try {
+//             localStorage.setItem(storageKey.value, String(size))
+//         } catch (error) {
+//             console.warn("Failed to save size to localStorage:", error)
+//         }
+//     }
+// }
+
+// function loadSavedSize(): number | null {
+//     if (props.mid) {
+//         try {
+//             const saved = localStorage.getItem(storageKey.value)
+//             return saved ? Number(saved) : null
+//         } catch (error) {
+//             console.warn("Failed to load size from localStorage:", error)
+//             return null
+//         }
+//     }
+//     return null
+// }
 
 // 使用防抖优化resize事件
 const emitResize = useDebounceFn((size: number) => {
@@ -318,45 +318,45 @@ function handle(target: HTMLElement) {
     }
 }
 
-function handleDrag(e: MouseEvent, target: HTMLElement) {
-    const startPos = isHorizontal.value ? e.clientX : e.clientY
-    const startSize = isHorizontal.value ? target.clientWidth : target.clientHeight
-
-    const handleMouseMove = (e: MouseEvent) => {
-        const currentPos = isHorizontal.value ? e.clientX : e.clientY
-        const diff = props.direction === "right" || props.direction === "bottom" ? startPos - currentPos : currentPos - startPos
-
-        let newSize = startSize - diff
-
-        // 限制大小范围
-        newSize = Math.max(props.minSize, Math.min(props.maxSize, newSize))
-
-        // 应用新尺寸
-        if (isHorizontal.value) {
-            target.style.width = `${newSize}px`
-        } else {
-            target.style.height = `${newSize}px`
-        }
-
-        currentSize.value = newSize
-        emit("resize", newSize)
-    }
-
-    const handleMouseUp = () => {
-        document.removeEventListener("mousemove", handleMouseMove)
-        document.removeEventListener("mouseup", handleMouseUp)
-        document.body.style.userSelect = ""
-        isDragging.value = false
-        saveSize(currentSize.value)
-        emit("resizeEnd", currentSize.value)
-    }
-
-    document.addEventListener("mousemove", handleMouseMove)
-    document.addEventListener("mouseup", handleMouseUp)
-    document.body.style.userSelect = "none"
-    isDragging.value = true
-    emit("resizeStart")
-}
+// function handleDrag(e: MouseEvent, target: HTMLElement) {
+//     const startPos = isHorizontal.value ? e.clientX : e.clientY
+//     const startSize = isHorizontal.value ? target.clientWidth : target.clientHeight
+
+//     const handleMouseMove = (e: MouseEvent) => {
+//         const currentPos = isHorizontal.value ? e.clientX : e.clientY
+//         const diff = props.direction === "right" || props.direction === "bottom" ? startPos - currentPos : currentPos - startPos
+
+//         let newSize = startSize - diff
+
+//         // 限制大小范围
+//         newSize = Math.max(props.minSize, Math.min(props.maxSize, newSize))
+
+//         // 应用新尺寸
+//         if (isHorizontal.value) {
+//             target.style.width = `${newSize}px`
+//         } else {
+//             target.style.height = `${newSize}px`
+//         }
+
+//         currentSize.value = newSize
+//         emit("resize", newSize)
+//     }
+
+//     const handleMouseUp = () => {
+//         document.removeEventListener("mousemove", handleMouseMove)
+//         document.removeEventListener("mouseup", handleMouseUp)
+//         document.body.style.userSelect = ""
+//         isDragging.value = false
+//         saveSize(currentSize.value)
+//         emit("resizeEnd", currentSize.value)
+//     }
+
+//     document.addEventListener("mousemove", handleMouseMove)
+//     document.addEventListener("mouseup", handleMouseUp)
+//     document.body.style.userSelect = "none"
+//     isDragging.value = true
+//     emit("resizeStart")
+// }
 
 const debug = {
     log: (...args: any[]) => {
@@ -377,6 +377,7 @@ function handleError(error: Error, context: string) {
 // 错误边界处理
 onErrorCaptured((err, instance, info) => {
     handleError(err as Error, info)
+    console.log(instance);
     return false
 })
 </script>

src/renderer/src/components/NavBar.vue

@@ -30,6 +30,7 @@ import icon from "@res/icon.png"
 import config from "config"
 import { PopupMenu } from "@/bridge/PopupMenu"
 
+const router = useRouter()
 const isFullScreen = ref(false)
 onBeforeMount(async () => {
     isFullScreen.value = await api.call("BasicCommand.isFullscreen")
@@ -37,6 +38,12 @@ onBeforeMount(async () => {
 const onClickMenu = () => {
     const menu = new PopupMenu([
         {
+            label: "返回",
+            async click() {
+                router.back()
+            },
+        },
+        {
             label: isFullScreen.value ? "取消全屏" : "全屏",
             async click() {
                 isFullScreen.value = await api.call("BasicCommand.fullscreen")

src/renderer/src/pages/_ui/App.vue

@@ -1,3 +1,10 @@
+<script setup lang="ts">
+defineOptions({
+    title: "观山",
+    bg: "ty",
+})
+</script>
+
 <template>
     <div>
         <input type="text" />

src/renderer/src/pages/_ui/Browser.vue

@@ -2,6 +2,11 @@
 import { onBeforeMount, onBeforeUnmount, onMounted, ref, useTemplateRef, nextTick } from "vue"
 import { PopupMenu } from "@/bridge/PopupMenu"
 
+defineOptions({
+    title: "替你关于",
+    bg: "bg"
+})
+
 // const PlaceHolderRef = useTemplateRef("PlaceHolder")
 // function OnResize() {
 //     const el = PlaceHolderRef.value

src/renderer/src/pages/about/index.vue

@@ -0,0 +1,12 @@
+<script setup lang="ts">
+definePage({
+    name: "about",
+    meta: {
+        title: "听雨",
+        bg: "gs",
+    },
+})
+</script>
+<template>
+    <div>sad</div>
+</template>

src/renderer/src/pages/index.vue

@@ -1,40 +1,52 @@
 <script setup lang="ts">
-import { defineAsyncComponent } from "vue"
 import Simplebar from "simplebar-vue"
 import { getAssetsFile } from "@/utils"
 
-const active = ref()
-const allApp = [
-    { label: "浏览器", comp: defineAsyncComponent(() => import("./_ui/Browser.vue")) },
-    { label: "观山", bg: "gs", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "听雨", bg: "ty", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "赏月", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "抚琴", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "望云", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "踏雪", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "卧松", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "泛舟", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "弈星", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "垂钓", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "采菊", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "倚栏", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "望霞", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "枕风", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "沐泉", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "汲露", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "步竹", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "剪烛", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "拾阶", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "撷兰", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "访柳", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "谒梅", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "拨荷", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-    { label: "望鹤", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
-]
+const allModules: Record<string, any> = import.meta.glob("./_ui/**/*.vue", { eager: true })
+const allApp: any[] = []
+Object.keys(allModules).forEach(key => {
+    let [_1, p] = key.match("\.\/_ui\/(.*?)\.vue")!
+    p = p.replace(/\.vue$/, "")
+    const m = allModules[key]?.default || allModules[key]
+    allApp.push({
+        label: m.title,
+        bg: m.bg,
+        comp: m,
+    })
+})
+
+const active = ref(0)
+// const allApp = [
+//     { label: "浏览器", comp: defineAsyncComponent(() => import("./_ui/Browser.vue")) },
+//     { label: "观山", bg: "gs", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "听雨", bg: "ty", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "赏月", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "抚琴", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "望云", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "踏雪", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "卧松", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "泛舟", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "弈星", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "垂钓", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "采菊", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "倚栏", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "望霞", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "枕风", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "沐泉", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "汲露", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "步竹", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "剪烛", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "拾阶", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "撷兰", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "访柳", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "谒梅", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "拨荷", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+//     { label: "望鹤", comp: defineAsyncComponent(() => import("./_ui/App.vue")) },
+// ]
 
 const activeBg = computed(() => {
-    if (!active.value) return ""
-    const value = allApp[active.value].bg
+    if (active.value === undefined) return ""
+    const value = allApp[active.value]?.bg
     return value ? getAssetsFile(`@/assets/images/home/${value}.png`) : ""
 })
 
@@ -69,6 +81,7 @@ function onClick(index: number) {
         </div>
         <div class="content" relative b-l="1px solid #E5E5E5" flex-1 w-0 overflow-auto flex flex-col>
             <div v-if="activeBg" class="bg" :style="{ backgroundImage: activeBg ? `url(${activeBg})` : '' }"></div>
+            <div @click="$router.push('/about')">关于</div>
             <component :is="allApp[active].comp" v-if="allApp[active]"></component>
         </div>
     </div>

src/renderer/typed-router.d.ts

@@ -20,5 +20,6 @@ declare module 'vue-router/auto-routes' {
   export interface RouteNamedMap {
     '/': RouteRecordInfo<'/', '/', Record<never, never>, Record<never, never>>,
     '/[...all]': RouteRecordInfo<'/[...all]', '/:all(.*)', { all: ParamValue<true> }, { all: ParamValue<false> }>,
+    'about': RouteRecordInfo<'about', '/about', Record<never, never>, Record<never, never>>,
   }
 }