@tmagic/editor 1.5.3 → 1.5.4

package/src/utils/idle-task.ts

@@ -2,8 +2,14 @@ import { EventEmitter } from 'events';
 
 export interface IdleTaskEvents {
   finish: [];
+  'hight-level-finish': [];
 }
 
+type TaskList<T> = {
+  handler: (data: T) => void;
+  data: T;
+}[];
+
 globalThis.requestIdleCallback =
   globalThis.requestIdleCallback ||
   function (cb) {
@@ -19,10 +25,9 @@ globalThis.requestIdleCallback =
   };
 
 export class IdleTask<T = any> extends EventEmitter {
-  private taskList: {
-    handler: (data: T) => void;
-    data: T;
-  }[] = [];
+  private taskList: TaskList<T> = [];
+
+  private hightLevelTaskList: TaskList<T> = [];
 
   private taskHandle: number | null = null;
 
@@ -31,8 +36,8 @@ export class IdleTask<T = any> extends EventEmitter {
     this.setMaxListeners(1000);
   }
 
-  public enqueueTask(taskHandler: (data: T) => void, taskData: T) {
-    this.taskList.push({
+  public enqueueTask(taskHandler: (data: T) => void, taskData: T, isHightLevel = false) {
+    (isHightLevel ? this.hightLevelTaskList : this.taskList).push({
       handler: taskHandler,
       data: taskData,
     });
@@ -43,6 +48,11 @@ export class IdleTask<T = any> extends EventEmitter {
   }
 
   public clearTasks() {
+    if (this.taskHandle) {
+      globalThis.cancelIdleCallback(this.taskHandle);
+    }
+
+    this.hightLevelTaskList = [];
     this.taskList = [];
   }
 
@@ -65,10 +75,12 @@ export class IdleTask<T = any> extends EventEmitter {
   }
 
   private runTaskQueue(deadline: IdleDeadline) {
+    const { hightLevelTaskList, taskList } = this;
+
     // 动画会占用空闲时间,当任务一直无法执行时，看看是否有动画正在播放
     // 根据空闲时间的多少来决定执行的任务数，保证页面不卡死的情况下尽量多执行任务，不然当任务数巨大时，执行时间会很久
     // 执行不完不会影响配置，但是会影响画布渲染
-    while (deadline.timeRemaining() > 0 && this.taskList.length) {
+    while (deadline.timeRemaining() > 0 && taskList.length) {
       const timeRemaining = deadline.timeRemaining();
       let times = 0;
       if (timeRemaining <= 5) {
@@ -82,18 +94,22 @@ export class IdleTask<T = any> extends EventEmitter {
       }
 
       for (let i = 0; i < times; i++) {
-        const task = this.taskList.shift();
+        const task = hightLevelTaskList.length > 0 ? hightLevelTaskList.shift() : taskList.shift();
         if (task) {
           task.handler(task.data);
         }
 
-        if (this.taskList.length === 0) {
+        if (hightLevelTaskList.length === 0 && taskList.length === 0) {
           break;
         }
       }
     }
 
-    if (this.taskList.length) {
+    if (!hightLevelTaskList.length) {
+      this.emit('hight-level-finish');
+    }
+
+    if (hightLevelTaskList.length || taskList.length) {
       this.taskHandle = globalThis.requestIdleCallback(this.runTaskQueue.bind(this), { timeout: 300 });
     } else {
       this.taskHandle = 0;

package/types/index.d.ts

@@ -296,6 +296,7 @@ interface DepEvents {
     'add-target': [target: Target];
     'remove-target': [id: string | number];
     collected: [nodes: MNode[], deep: boolean];
+    'ds-collected': [nodes: MNode[], deep: boolean];
 }
 interface State$1 {
     collecting: boolean;
@@ -786,63 +787,7 @@ type AsyncMethodName = Writable<(typeof canUsePluginMethods)['async']>;
 declare class Ui extends export_default {
     constructor();
     set<K extends keyof UiState, T extends UiState[K]>(name: K, value: T): void;
-    get<K extends keyof UiState>(name: K): {
-        uiSelectMode: boolean;
-        showSrc: boolean;
-        showStylePanel: boolean;
-        zoom: number;
-        stageContainerRect: {
-            width: number;
-            height: number;
-        };
-        stageRect: {
-            width: number | string;
-            height: number | string;
-        };
-        columnWidth: {
-            left: number;
-            center: number;
-            right: number;
-        };
-        showGuides: boolean;
-        showRule: boolean;
-        propsPanelSize: "large" | "default" | "small";
-        showAddPageButton: boolean;
-        showPageListButton: boolean;
-        hideSlideBar: boolean;
-        sideBarItems: {
-            [x: string]: any;
-            text: string;
-            tabStyle?: (string | Record<string, any>) | undefined;
-            icon?: any;
-            $key: string;
-            draggable?: boolean | undefined;
-            beforeClick?: ((config: SideComponent) => boolean | Promise<boolean>) | undefined;
-            boxComponentConfig?: {
-                component?: any;
-                props?: Record<string, any> | undefined;
-            } | undefined;
-            type: "component";
-            component: any;
-            props?: Record<string, any> | undefined;
-            listeners?: Record<string, Function> | undefined;
-            slots?: Record<string, any> | undefined;
-            className?: string | undefined;
-            display?: (boolean | ((data?: Services) => Promise<boolean> | boolean)) | undefined;
-        }[];
-        navMenuRect: {
-            left: number;
-            top: number;
-            width: number;
-            height: number;
-        };
-        frameworkRect: {
-            left: number;
-            top: number;
-            width: number;
-            height: number;
-        };
-    }[K];
+    get<K extends keyof UiState>(name: K): vue.ShallowReactive<UiState>[K];
     zoom(zoom: number): Promise<void>;
     calcZoom(): Promise<number>;
     resetState(): void;
@@ -2299,12 +2244,14 @@ declare const removeDataSourceFieldPrefix: (id?: string) => string;
 
 interface IdleTaskEvents {
     finish: [];
+    'hight-level-finish': [];
 }
 declare class IdleTask<T = any> extends EventEmitter {
     private taskList;
+    private hightLevelTaskList;
     private taskHandle;
     constructor();
-    enqueueTask(taskHandler: (data: T) => void, taskData: T): void;
+    enqueueTask(taskHandler: (data: T) => void, taskData: T, isHightLevel?: boolean): void;
     clearTasks(): void;
     on<Name extends keyof IdleTaskEvents, Param extends IdleTaskEvents[Name]>(eventName: Name, listener: (...args: Param) => void | Promise<void>): this;
     once<Name extends keyof IdleTaskEvents, Param extends IdleTaskEvents[Name]>(eventName: Name, listener: (...args: Param) => void | Promise<void>): this;
@@ -5373,7 +5320,7 @@ declare function __VLS_template$4(): {
         right?(_: {}): any;
     };
     refs: {
-        el: HTMLDivElement;
+        target: HTMLDivElement;
     };
     rootEl: HTMLDivElement;
 };
@@ -5470,7 +5417,7 @@ declare function __VLS_template$2(): {
     };
     refs: {
         target: HTMLDivElement;
-        titleEl: HTMLDivElement;
+        title: HTMLDivElement;
     };
     rootEl: any;
 };