diff --git a/src/store/design/canvas/d.ts b/src/store/design/canvas/d.ts index e5a3245..3271ecf 100644 --- a/src/store/design/canvas/d.ts +++ b/src/store/design/canvas/d.ts @@ -3,7 +3,7 @@ * @Date: 2024-04-05 06:23:23 * @Description: * @LastEditors: ShawnPhang - * @LastEditTime: 2024-04-16 12:13:54 + * @LastEditTime: 2024-05-06 11:59:28 */ export type TScreeData = { /** 记录编辑界面的宽度 */ @@ -53,7 +53,7 @@ export type TStoreAction = { value: TPageState[T] pushHistory?: boolean }): void - getDPage(data: TPageState): void + getDPage(data: TPageState): () => TPageState /** 设置dPage */ setDPage(data: TPageState): void /** 更新 Page(从layouts获取)*/ diff --git a/src/store/design/canvas/index.ts b/src/store/design/canvas/index.ts index c22e535..2810294 100644 --- a/src/store/design/canvas/index.ts +++ b/src/store/design/canvas/index.ts @@ -4,7 +4,7 @@ * @Date: 2024-03-18 21:00:00 * @Description: 画布全局配置 * @LastEditors: ShawnPhang - * @LastEditTime: 2024-04-18 15:02:09 + * @LastEditTime: 2024-05-06 12:05:02 */ import { Store, defineStore } from 'pinia' @@ -32,10 +32,10 @@ const CanvasStore = defineStore<"canvasStore", TCanvasState, {}, TStoreAction>(" dPage: pageDefault }), getters: { - getDPage() { - const widgetStore = useWidgetStore() - return widgetStore.dLayouts[this.dCurrentPage].global - }, + // getDPage() { + // const widgetStore = useWidgetStore() + // return widgetStore.dLayouts[this.dCurrentPage].global + // }, }, actions: { /** 更新画布缩放百分比 */ @@ -67,6 +67,11 @@ const CanvasStore = defineStore<"canvasStore", TCanvasState, {}, TStoreAction>(" data[key] = value } }, + /** 获取 Page */ + getDPage() { + const widgetStore = useWidgetStore() + return widgetStore.dLayouts[this.dCurrentPage].global + }, /** 设置 Page */ setDPage(data: TPageState) { this.dPage = data diff --git a/src/views/components/HeaderOptions.vue b/src/views/components/HeaderOptions.vue index 0780441..1f8f16f 100644 --- a/src/views/components/HeaderOptions.vue +++ b/src/views/components/HeaderOptions.vue @@ -3,7 +3,7 @@ * @Date: 2022-01-12 11:26:53 * @Description: 顶部操作按钮组 * @LastEditors: ShawnPhang - * @LastEditTime: 2024-04-19 11:22:40 + * @LastEditTime: 2024-05-06 12:07:43 -->