From e367de089a9441cc259f138737be1ea52552eade Mon Sep 17 00:00:00 2001
From: IchliebedichZhu <54796446@qq.com>
Date: Wed, 27 Mar 2024 22:26:34 +0000
Subject: [PATCH] Merge: main branch

---
 src/components/business/moveable/Moveable.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/business/moveable/Moveable.vue b/src/components/business/moveable/Moveable.vue
index 67bb6a3..6b75966 100644
--- a/src/components/business/moveable/Moveable.vue
+++ b/src/components/business/moveable/Moveable.vue
@@ -17,17 +17,20 @@ import { mapGetters, mapActions, useStore } from 'vuex'
 // import { setTransformAttribute } from '@/common/methods/handleTransform'
 import useSelecto from './Selecto'
 import { useSetupMapGetters } from '@/common/hooks/mapGetters'
+import { storeToRefs } from 'pinia'
+import { useCanvasStore, useControlStore } from '@/pinia'
 
 const store = useStore()
 //  computed: mapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines']),
 const {
-  dSelectWidgets, dActiveElement, activeMouseEvent, showMoveable, showRotatable, dWidgets, updateRect, updateSelect, guidelines
-} = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines'])
+  dSelectWidgets, dActiveElement, activeMouseEvent, dWidgets, updateRect, updateSelect
+} = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'dWidgets', 'updateRect', 'updateSelect'])
+const controlStore = useControlStore()
+const { guidelines } = storeToRefs(useCanvasStore())
+const { showMoveable, showRotatable } = storeToRefs(controlStore)
 
 let _target: string | null = null
 
-
-
 watch(
   () => dActiveElement.value,
   async (val) => {