rebuilt: store to pinia control store

This commit is contained in:
IchliebedichZhu 2024-03-26 20:09:30 +00:00
parent 4b1e9e4108
commit d6b66fe938
5 changed files with 19 additions and 15 deletions

View File

@ -22,13 +22,13 @@ import { useCanvasStore, useControlStore } from '@/pinia'
const { const {
dSelectWidgets, dActiveElement, activeMouseEvent, dSelectWidgets, dActiveElement, activeMouseEvent,
showRotatable, dWidgets, dWidgets,
updateRect, updateSelect, updateRect, updateSelect,
} = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect']) } = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'dWidgets', 'updateRect', 'updateSelect'])
const store = useStore() const store = useStore()
const controlStore = useControlStore() const controlStore = useControlStore()
const { guidelines } = storeToRefs(useCanvasStore()) const { guidelines } = storeToRefs(useCanvasStore())
const { showMoveable } = storeToRefs(controlStore) const { showMoveable, showRotatable } = storeToRefs(controlStore)
// computed: mapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines']) // computed: mapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines'])
let _target: string = "" let _target: string = ""

View File

@ -95,11 +95,11 @@ const { pageDesignCanvasId } = defineProps<TProps>()
const { const {
dWidgets, dWidgets,
dActiveElement, dSelectWidgets, dAltDown, dActiveElement, dSelectWidgets, dAltDown,
dHoverUuid, showRotatable dHoverUuid
} = useSetupMapGetters(['dWidgets', 'dActiveElement', 'dHoverUuid', 'dSelectWidgets', 'dAltDown', 'showRotatable']) } = useSetupMapGetters(['dWidgets', 'dActiveElement', 'dHoverUuid', 'dSelectWidgets', 'dAltDown'])
const { dPage } = storeToRefs(usePageStore()) const { dPage } = storeToRefs(usePageStore())
const { dZoom, dPaddingTop, dScreen } = storeToRefs(useCanvasStore()) const { dZoom, dPaddingTop, dScreen } = storeToRefs(useCanvasStore())
const { dDraging } = storeToRefs(useControlStore()) const { dDraging, showRotatable } = storeToRefs(useControlStore())
let _dropIn: string | null = '' let _dropIn: string | null = ''

View File

@ -136,7 +136,8 @@ const store = useStore()
const { const {
dActiveElement, dWidgets dActiveElement, dWidgets
} = useSetupMapGetters(['dActiveElement', 'dWidgets']) } = useSetupMapGetters(['dActiveElement', 'dWidgets'])
const { dMoving } = storeToRefs(useControlStore()) const controlStore = useControlStore()
const { dMoving } = storeToRefs(controlStore)
// computed: { // computed: {
// ...mapGetters(['dActiveElement', 'dMoving', 'dWidgets']), // ...mapGetters(['dActiveElement', 'dMoving', 'dWidgets']),
// }, // },
@ -319,7 +320,10 @@ function imgCrop(val: boolean) {
const { left, top } = el.getBoundingClientRect() const { left, top } = el.getBoundingClientRect()
toolBarStyle = { left: left + 'px', top: top + 'px' } toolBarStyle = { left: left + 'px', top: top + 'px' }
state.innerElement.cropEdit = val state.innerElement.cropEdit = val
store.commit('setShowRotatable', !val)
// store.commit('setShowRotatable', !val)
controlStore.setShowRotatable(!val)
} }

View File

@ -76,7 +76,7 @@ const all = {
selectItem: { data: null }, // 记录当前选择的元素, data selectItem: { data: null }, // 记录当前选择的元素, data
activeMouseEvent: null, // 正在活动的鼠标事件 activeMouseEvent: null, // 正在活动的鼠标事件
// showMoveable: false, // 全局控制选择框的显示 // showMoveable: false, // 全局控制选择框的显示
showRotatable: true, // 是否显示moveable的旋转按钮 // showRotatable: true, // 是否显示moveable的旋转按钮
zoomScreenChange: null, // 画布强制刷新适应度 zoomScreenChange: null, // 画布强制刷新适应度
updateRect: null, // 强制刷新操作框 updateRect: null, // 强制刷新操作框
updateSelect: null, // 强制设置选择元素 updateSelect: null, // 强制设置选择元素
@ -150,9 +150,9 @@ const all = {
// showMoveable(state: any) { // showMoveable(state: any) {
// return state.showMoveable // return state.showMoveable
// }, // },
showRotatable(state: any) { // showRotatable(state: any) {
return state.showRotatable // return state.showRotatable
}, // },
zoomScreenChange(state: any) { zoomScreenChange(state: any) {
return state.zoomScreenChange return state.zoomScreenChange
}, },

View File

@ -48,9 +48,9 @@ export default {
// // state.dActiveElement = state.dPage // // state.dActiveElement = state.dPage
// // } // // }
// }, // },
setShowRotatable(state: Type.Object, e: any) { // setShowRotatable(state: Type.Object, e: any) {
state.showRotatable = e // state.showRotatable = e
}, // },
zoomScreenChange(state: Type.Object, e: any) { zoomScreenChange(state: Type.Object, e: any) {
// 画布尺寸适应度强制刷新 // 画布尺寸适应度强制刷新
state.zoomScreenChange = Math.random() state.zoomScreenChange = Math.random()