From caaece6b4fe607ff5cec1ec941d322689386b168 Mon Sep 17 00:00:00 2001
From: Azure <983547216@qq.com>
Date: Thu, 28 Aug 2025 08:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/core/XSystem.ts                          | 19 +++++++-
 src/core/desktop/DesktopProcess.ts           |  1 +
 src/core/desktop/ui/DesktopComponent.vue     | 16 ++++--
 src/core/process/IProcess.ts                 |  5 +-
 src/core/process/impl/ProcessImpl.ts         |  9 ++--
 src/core/state/impl/ObservableWeakRefImpl.ts |  2 +-
 src/core/state/store/GlobalStore.ts          |  0
 src/core/system/BasicSystemProcess.ts        |  2 +-
 src/core/window/IWindowForm.ts               |  6 +++
 src/core/window/WindowForm.ts                | 22 ---------
 src/core/window/impl/WindowFormImpl.ts       | 51 ++++++++++++++++++++
 src/core/window/types/IWindowFormConfig.ts   |  2 +-
 src/core/window/types/WindowFormTypes.ts     |  7 +++
 tsconfig.app.json                            |  1 +
 14 files changed, 107 insertions(+), 36 deletions(-)
 create mode 100644 src/core/state/store/GlobalStore.ts
 create mode 100644 src/core/window/IWindowForm.ts
 delete mode 100644 src/core/window/WindowForm.ts
 create mode 100644 src/core/window/impl/WindowFormImpl.ts
 create mode 100644 src/core/window/types/WindowFormTypes.ts

diff --git a/src/core/XSystem.ts b/src/core/XSystem.ts
index f84db82..5bc4901 100644
--- a/src/core/XSystem.ts
+++ b/src/core/XSystem.ts
@@ -1,6 +1,5 @@
 import ProcessManageImpl from './process/impl/ProcessManageImpl.ts'
 import ProcessImpl from './process/impl/ProcessImpl.ts'
-import type { ProcessInfoImpl } from '@/core/process/impl/ProcessInfoImpl.ts'
 import { isUndefined } from 'lodash'
 import { BasicSystemProcess } from '@/core/system/BasicSystemProcess.ts'
 import { DesktopProcess } from '@/core/desktop/DesktopProcess.ts'
@@ -10,12 +9,22 @@ import { EventBuilderImpl } from '@/core/events/impl/EventBuilderImpl.ts'
 import type { IProcessManage } from '@/core/process/IProcessManage.ts'
 import type { IProcess } from '@/core/process/IProcess.ts'
 import type { IProcessInfo } from '@/core/process/IProcessInfo.ts'
+import { ObservableWeakRefImpl } from '@/core/state/impl/ObservableWeakRefImpl.ts'
+import type { IObservable } from '@/core/state/IObservable.ts'
+
+interface IGlobalState {
+  isLogin: boolean
+}
 
 export default class XSystem {
   private static _instance: XSystem = new XSystem()
 
   private _processManage: IProcessManage = new ProcessManageImpl()
   private _eventManage: IEventBuilder<IAllEvent> = new EventBuilderImpl()
+  private _globalState: IObservable<IGlobalState> = new ObservableWeakRefImpl<IGlobalState>({
+    isLogin: false
+  })
+  private _desktopRootDom: HTMLElement;
 
   constructor() {
     console.log('XSystem')
@@ -30,11 +39,19 @@ export default class XSystem {
   public get eventManage() {
     return this._eventManage
   }
+  public get globalState() {
+    return this._globalState
+  }
+  public get desktopRootDom() {
+    return this._desktopRootDom
+  }
 
   public initialization(dom: HTMLDivElement) {
+    this._desktopRootDom = dom
     this.run('basic-system', BasicSystemProcess).then(() => {
       this.run('desktop', DesktopProcess).then((proc) => {
         proc.mount(dom)
+        // console.log(dom.querySelector('.desktop-root'))
       })
     })
   }
diff --git a/src/core/desktop/DesktopProcess.ts b/src/core/desktop/DesktopProcess.ts
index 389120b..4dcb7f7 100644
--- a/src/core/desktop/DesktopProcess.ts
+++ b/src/core/desktop/DesktopProcess.ts
@@ -88,6 +88,7 @@ export class DesktopProcess extends ProcessImpl {
     dom.style.zIndex = '0';
     dom.style.width = `${this._width}px`
     dom.style.height = `${this._height}px`
+    dom.style.position = 'relative'
     this._desktopRootDom = dom
 
     const app = createApp(DesktopComponent, { process: this })
diff --git a/src/core/desktop/ui/DesktopComponent.vue b/src/core/desktop/ui/DesktopComponent.vue
index 417823e..e7bf7e8 100644
--- a/src/core/desktop/ui/DesktopComponent.vue
+++ b/src/core/desktop/ui/DesktopComponent.vue
@@ -5,10 +5,13 @@
   >
     <div class="desktop-root" @contextmenu="onContextMenu">
       <div class="desktop-bg">
-        <div class="desktop-container"
+        <div class="desktop-icons-container"
              :style="gridStyle">
           <AppIcon v-for="(appIcon, i) in appIconsRef" :key="i"
-                   :iconInfo="appIcon" :gridTemplate="gridTemplate" />
+                   :iconInfo="appIcon" :gridTemplate="gridTemplate"
+                   @dblclick="runApp(appIcon)"
+          />
+          />
         </div>
       </div>
       <div class="task-bar"></div>
@@ -25,10 +28,11 @@ import { DesktopEventEnum } from '@/core/events/EventTypes.ts'
 import { useDesktopInit } from '@/core/desktop/ui/hooks/useDesktopInit.ts'
 import AppIcon from '@/core/desktop/ui/components/AppIcon.vue'
 import { watch } from 'vue'
+import type { IDesktopAppIcon } from '@/core/desktop/types/IDesktopAppIcon.ts'
 
 const props = defineProps<{ process: DesktopProcess }>()
 
-const { appIconsRef, gridStyle, gridTemplate } = useDesktopInit('.desktop-container')
+const { appIconsRef, gridStyle, gridTemplate } = useDesktopInit('.desktop-icons-container')
 
 XSystem.instance.eventManage.addEventListener(
   DesktopEventEnum.onDesktopRootDomResize,
@@ -45,6 +49,10 @@ XSystem.instance.eventManage.addEventListener(
 const onContextMenu = (e: MouseEvent) => {
   e.preventDefault()
 }
+
+const runApp = (appIcon: IDesktopAppIcon) => {
+  XSystem.instance.run(appIcon.name)
+}
 </script>
 
 <style lang="scss" scoped>
@@ -60,7 +68,7 @@ $taskBarHeight: 40px;
     height: calc(100% - #{$taskBarHeight});
   }
 
-  .desktop-container {
+  .desktop-icons-container {
     @apply w-full h-full flex-1 grid grid-auto-flow-col pos-relative;
   }
 
diff --git a/src/core/process/IProcess.ts b/src/core/process/IProcess.ts
index 77b62e5..602182a 100644
--- a/src/core/process/IProcess.ts
+++ b/src/core/process/IProcess.ts
@@ -1,6 +1,5 @@
-import type { ProcessInfoImpl } from '@/core/process/impl/ProcessInfoImpl.ts'
-import type WindowForm from '@/core/window/WindowForm.ts'
 import type { IProcessInfo } from '@/core/process/IProcessInfo.ts'
+import type { IWindowForm } from '@/core/window/IWindowForm.ts'
 
 /**
  * 进程接口
@@ -11,7 +10,7 @@ export interface IProcess {
   /** 进程信息 */
   get processInfo(): IProcessInfo;
   /** 进程的窗体列表 */
-  get windowForms(): Map<string, WindowForm>;
+  get windowForms(): Map<string, IWindowForm>;
   /**
    * 打开窗体
    * @param startName 窗体启动名
diff --git a/src/core/process/impl/ProcessImpl.ts b/src/core/process/impl/ProcessImpl.ts
index 4844f5f..07bc25f 100644
--- a/src/core/process/impl/ProcessImpl.ts
+++ b/src/core/process/impl/ProcessImpl.ts
@@ -1,8 +1,9 @@
 import { v4 as uuidV4 } from 'uuid';
 import XSystem from '../../XSystem.ts'
-import WindowForm from '../../window/WindowForm.ts'
+import WindowFormImpl from '../../window/impl/WindowFormImpl.ts'
 import type { IProcess } from '@/core/process/IProcess.ts'
 import type { IProcessInfo } from '@/core/process/IProcessInfo.ts'
+import type { IWindowForm } from '@/core/window/IWindowForm.ts'
 
 /**
  * 进程
@@ -11,7 +12,7 @@ export default class ProcessImpl implements IProcess {
   private readonly _id: string = uuidV4();
   private readonly _processInfo: IProcessInfo;
   // 当前进程的窗体集合
-  private _windowForms: Map<string, WindowForm> = new Map();
+  private _windowForms: Map<string, IWindowForm> = new Map();
 
   public get id() {
     return this._id;
@@ -37,7 +38,9 @@ export default class ProcessImpl implements IProcess {
   }
 
   public openWindowForm(startName: string) {
-    const window = new WindowForm(this, startName);
+    const info = this._processInfo.windowFormConfigs.find(item => item.name === startName);
+    if (!info) throw new Error(`未找到窗体：${startName}`);
+    const window = new WindowFormImpl(this, info);
     this._windowForms.set(window.id, window);
   }
 }
\ No newline at end of file
diff --git a/src/core/state/impl/ObservableWeakRefImpl.ts b/src/core/state/impl/ObservableWeakRefImpl.ts
index a3d3fc9..3a6bf1a 100644
--- a/src/core/state/impl/ObservableWeakRefImpl.ts
+++ b/src/core/state/impl/ObservableWeakRefImpl.ts
@@ -74,7 +74,7 @@ import type {
  * // 9️⃣ 销毁 ObservableImpl
  * obs.dispose()
  */
-export class ObservableImpl<T extends TNonFunctionProperties<T>> implements IObservable<T> {
+export class ObservableWeakRefImpl<T extends TNonFunctionProperties<T>> implements IObservable<T> {
   /** ObservableImpl 的状态对象，深层 Proxy */
   public readonly state: TObservableState<T>
 
diff --git a/src/core/state/store/GlobalStore.ts b/src/core/state/store/GlobalStore.ts
new file mode 100644
index 0000000..e69de29
diff --git a/src/core/system/BasicSystemProcess.ts b/src/core/system/BasicSystemProcess.ts
index 60c9a6c..eb948dd 100644
--- a/src/core/system/BasicSystemProcess.ts
+++ b/src/core/system/BasicSystemProcess.ts
@@ -5,7 +5,7 @@ import type { IProcessInfo } from '@/core/process/IProcessInfo.ts'
 /**
  * 基础系统进程
  */
-export class BasicSystemProcess extends ProcessImpl{
+export class BasicSystemProcess extends ProcessImpl {
   private _isMounted: boolean = false;
 
   public get isMounted() {
diff --git a/src/core/window/IWindowForm.ts b/src/core/window/IWindowForm.ts
new file mode 100644
index 0000000..9a85e2b
--- /dev/null
+++ b/src/core/window/IWindowForm.ts
@@ -0,0 +1,6 @@
+import type { IProcess } from '@/core/process/IProcess.ts'
+
+export interface IWindowForm {
+  get id(): string;
+  get proc(): IProcess | undefined;
+}
\ No newline at end of file
diff --git a/src/core/window/WindowForm.ts b/src/core/window/WindowForm.ts
deleted file mode 100644
index 1cf656f..0000000
--- a/src/core/window/WindowForm.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { v4 as uuidV4 } from 'uuid';
-import type ProcessImpl from '../process/impl/ProcessImpl.ts'
-import XSystem from '../XSystem.ts'
-import type { ProcessInfoImpl } from '../process/impl/ProcessInfoImpl.ts'
-
-export default class WindowForm {
-  private readonly _id: string = uuidV4();
-  private readonly _procId: string;
-
-  public get id() {
-    return this._id;
-  }
-  public get proc() {
-    return XSystem.instance.processManage.findProcessById(this._procId)
-  }
-
-  constructor(proc: ProcessImpl, startName: string) {
-    this._procId = proc.id;
-    console.log('WindowForm')
-  }
-
-}
\ No newline at end of file
diff --git a/src/core/window/impl/WindowFormImpl.ts b/src/core/window/impl/WindowFormImpl.ts
new file mode 100644
index 0000000..b72074d
--- /dev/null
+++ b/src/core/window/impl/WindowFormImpl.ts
@@ -0,0 +1,51 @@
+import { v4 as uuidV4 } from 'uuid';
+import XSystem from '../../XSystem.ts'
+import type { IProcess } from '@/core/process/IProcess.ts'
+import type { IWindowForm } from '@/core/window/IWindowForm.ts'
+import type { IWindowFormConfig } from '@/core/window/types/IWindowFormConfig.ts'
+import type { WindowFormPos } from '@/core/window/types/WindowFormTypes.ts'
+
+export default class WindowFormImpl implements IWindowForm {
+  private readonly _id: string = uuidV4();
+  private readonly _procId: string;
+  private pos: WindowFormPos = { x: 0, y: 0 };
+  private width: number = 0;
+  private height: number = 0;
+
+  public get id() {
+    return this._id;
+  }
+  public get proc() {
+    return XSystem.instance.processManage.findProcessById(this._procId)
+  }
+  private get desktopRootDom() {
+    return XSystem.instance.desktopRootDom;
+  }
+
+  constructor(proc: IProcess, config: IWindowFormConfig) {
+    this._procId = proc.id;
+    console.log('WindowForm')
+    this.pos = {
+      x: config.left ?? 0,
+      y: config.top ?? 0
+    }
+    this.width = config.width ?? 0;
+    this.height = config.height ?? 0;
+
+    this.createWindowFrom();
+  }
+
+  public createWindowFrom() {
+    const dom = document.createElement('div');
+    dom.style.position = 'absolute';
+    dom.style.left = `${this.pos.x}px`;
+    dom.style.top = `${this.pos.y}px`;
+    dom.style.width = `${this.width}px`;
+    dom.style.height = `${this.height}px`;
+    dom.style.zIndex = '100';
+    dom.style.backgroundColor = 'white';
+
+    this.desktopRootDom.appendChild(dom);
+  }
+
+}
\ No newline at end of file
diff --git a/src/core/window/types/IWindowFormConfig.ts b/src/core/window/types/IWindowFormConfig.ts
index e00e5da..34c95cf 100644
--- a/src/core/window/types/IWindowFormConfig.ts
+++ b/src/core/window/types/IWindowFormConfig.ts
@@ -1,5 +1,5 @@
 /**
- * 窗体配置
+ * 窗体配置信息
  */
 export interface IWindowFormConfig {
   /**
diff --git a/src/core/window/types/WindowFormTypes.ts b/src/core/window/types/WindowFormTypes.ts
new file mode 100644
index 0000000..a13792f
--- /dev/null
+++ b/src/core/window/types/WindowFormTypes.ts
@@ -0,0 +1,7 @@
+/**
+ * 窗体位置坐标 - 左上角
+ */
+export interface WindowFormPos {
+  x: number;
+  y: number;
+}
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 60a4dae..e285f71 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -12,6 +12,7 @@
     "target": "es2021",
     "lib": ["es2021", "dom"],
     "module": "ESNext",
+    "strict": true, // 严格模式检查
     "strictPropertyInitialization": false, // 严格属性初始化检查
     "noUnusedLocals": false,      // 检查未使用的局部变量
     "noUnusedParameters": false,  // 检查未使用的参数