Merge: main branch

This commit is contained in:
IchliebedichZhu 2024-03-27 22:26:34 +00:00
parent 503e182172
commit e367de089a

View File

@ -17,17 +17,20 @@ import { mapGetters, mapActions, useStore } from 'vuex'
// import { setTransformAttribute } from '@/common/methods/handleTransform' // import { setTransformAttribute } from '@/common/methods/handleTransform'
import useSelecto from './Selecto' import useSelecto from './Selecto'
import { useSetupMapGetters } from '@/common/hooks/mapGetters' import { useSetupMapGetters } from '@/common/hooks/mapGetters'
import { storeToRefs } from 'pinia'
import { useCanvasStore, useControlStore } from '@/pinia'
const store = useStore() const store = useStore()
// computed: mapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines']), // computed: mapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines']),
const { const {
dSelectWidgets, dActiveElement, activeMouseEvent, showMoveable, showRotatable, dWidgets, updateRect, updateSelect, guidelines dSelectWidgets, dActiveElement, activeMouseEvent, dWidgets, updateRect, updateSelect
} = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines']) } = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'dWidgets', 'updateRect', 'updateSelect'])
const controlStore = useControlStore()
const { guidelines } = storeToRefs(useCanvasStore())
const { showMoveable, showRotatable } = storeToRefs(controlStore)
let _target: string | null = null let _target: string | null = null
watch( watch(
() => dActiveElement.value, () => dActiveElement.value,
async (val) => { async (val) => {