保存一下

src/core/desktop/DesktopProcess.ts

@@ -7,6 +7,7 @@ import DesktopComponent from '@/core/desktop/ui/DesktopComponent.vue'
 import { naiveUi } from '@/core/common/naive-ui/components.ts'
 import { DesktopEventEnum } from '@/core/events/EventTypes.ts'
 import { debounce } from 'lodash'
+import type { IProcessInfo } from '@/core/process/IProcessInfo.ts'
 
 export class DesktopProcess extends ProcessImpl {
   private _desktopRootDom: HTMLElement;
@@ -66,7 +67,7 @@ export class DesktopProcess extends ProcessImpl {
     return XSystem.instance.eventManage;
   }
 
-  constructor(info: ProcessInfoImpl) {
+  constructor(info: IProcessInfo) {
     super(info)
     console.log('DesktopProcess')
   }

src/core/desktop/ui/hooks/useDesktopInit.ts

@@ -79,10 +79,14 @@ export function useDesktopInit(containerStr: string) {
   })
 
   const appIconsRef = ref(appIcons)
+  const exceedApp = ref<IDesktopAppIcon[]>([])
 
-  watch(() => [gridTemplate.rowCount, gridTemplate.colCount], ([nRows, nCols], [oRows, oCols]) => {
-    if (oCols == 1 && oRows == 1) return
-    appIconsRef.value = rearrangeIcons(toRaw(appIconsRef.value), nCols, nRows, oCols, oRows)
+  watch(() => [gridTemplate.colCount, gridTemplate.rowCount], ([nCols, nRows], [oCols, oRows]) => {
+    // if (oCols == 1 && oRows == 1) return
+    if (oCols === nCols && oRows === nRows)  return
+    const { appIcons, hideAppIcons } = rearrangeIcons(toRaw(appIconsRef.value), nCols, nRows)
+    appIconsRef.value = appIcons
+    exceedApp.value = hideAppIcons
   })
 
   XSystem.instance.eventManage.addEventListener(DesktopEventEnum.onDesktopAppIconPos, (iconInfo) => {
@@ -98,59 +102,69 @@ export function useDesktopInit(containerStr: string) {
 
 /**
  * 重新安排图标位置
- * @param appIcons 图标信息
- * @param newCols 新的列数
- * @param newRows 新的行数
- * @param oldCols 旧的列数
- * @param oldRows 旧的行数
+ * @param appIconInfos 图标信息
+ * @param maxCol 列数
+ * @param maxRow 行数
  */
 function rearrangeIcons(
-  appIcons: IDesktopAppIcon[],
-  newCols: number,
-  newRows: number,
-  oldCols: number,
-  oldRows: number
-): IDesktopAppIcon[] {
-  if (oldCols === newCols && oldRows === newRows) {
-    return appIcons;
-  }
+  appIconInfos: IDesktopAppIcon[],
+  maxCol: number,
+  maxRow: number
+): IRearrangeInfo {
   const occupied = new Set<string>();
 
   function key(x: number, y: number) {
     return `${x},${y}`;
   }
 
-  const result: IDesktopAppIcon[] = []
-  const exceed: IDesktopAppIcon[] = []
+  const appIcons: IDesktopAppIcon[] = []
+  const hideAppIcons: IDesktopAppIcon[] = []
+  const temp: IDesktopAppIcon[] = []
 
-  for (const appIcon of appIcons) {
+  for (const appIcon of appIconInfos) {
     const { x, y } = appIcon;
 
-    if (x <= newCols && y <= newRows) {
+    if (x <= maxCol && y <= maxRow) {
       if (!occupied.has(key(x, y))) {
         occupied.add(key(x, y))
-        result.push({ ...appIcon, x, y })
+        appIcons.push({ ...appIcon, x, y })
       }
     } else {
-      exceed.push(appIcon)
+      temp.push(appIcon)
     }
   }
 
-  for (const appIcon of exceed) {
-    // 最后格子也被占 → 从 (1,1) 开始找空位
-    let placed = false;
-    for (let c = 1; c <= newCols; c++) {
-      for (let r = 1; r <= newRows; r++) {
-        if (!occupied.has(key(c, r))) {
-          occupied.add(key(c, r));
-          result.push({ ...appIcon, x: c, y: r });
-          placed = true;
-          break;
+  const max = maxCol * maxRow
+  for (const appIcon of temp) {
+    if (appIcons.length < max) {
+      // 最后格子也被占 → 从 (1,1) 开始找空位
+      let placed = false;
+      for (let c = 1; c <= maxCol; c++) {
+        for (let r = 1; r <= maxRow; r++) {
+          if (!occupied.has(key(c, r))) {
+            occupied.add(key(c, r));
+            appIcons.push({ ...appIcon, x: c, y: r });
+            placed = true;
+            break;
+          }
         }
+        if (placed) break;
       }
-      if (placed) break;
+    } else {
+      // 放不下了
+      hideAppIcons.push(appIcon)
     }
   }
 
-  return result;
+  return {
+    appIcons,
+    hideAppIcons
+  };
+}
+
+interface IRearrangeInfo {
+  /** 正常的桌面图标信息 */
+  appIcons: IDesktopAppIcon[];
+  /** 隐藏的桌面图标信息(超出屏幕显示的) */
+  hideAppIcons: IDesktopAppIcon[];
 }