diff --git a/src/components/business/moveable/Moveable.vue b/src/components/business/moveable/Moveable.vue index ddafa77..3f748cf 100644 --- a/src/components/business/moveable/Moveable.vue +++ b/src/components/business/moveable/Moveable.vue @@ -22,13 +22,13 @@ import { useCanvasStore, useControlStore } from '@/pinia' const { dSelectWidgets, dActiveElement, activeMouseEvent, - showRotatable, dWidgets, + dWidgets, updateRect, updateSelect, -} = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect']) +} = useSetupMapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'dWidgets', 'updateRect', 'updateSelect']) const store = useStore() const controlStore = useControlStore() const { guidelines } = storeToRefs(useCanvasStore()) -const { showMoveable } = storeToRefs(controlStore) +const { showMoveable, showRotatable } = storeToRefs(controlStore) // computed: mapGetters(['dSelectWidgets', 'dActiveElement', 'activeMouseEvent', 'showMoveable', 'showRotatable', 'dWidgets', 'updateRect', 'updateSelect', 'guidelines']) let _target: string = "" diff --git a/src/components/modules/layout/designBoard/index.vue b/src/components/modules/layout/designBoard/index.vue index f2be71a..c86b748 100644 --- a/src/components/modules/layout/designBoard/index.vue +++ b/src/components/modules/layout/designBoard/index.vue @@ -95,11 +95,11 @@ const { pageDesignCanvasId } = defineProps() const { dWidgets, dActiveElement, dSelectWidgets, dAltDown, - dHoverUuid, showRotatable -} = useSetupMapGetters(['dWidgets', 'dActiveElement', 'dHoverUuid', 'dSelectWidgets', 'dAltDown', 'showRotatable']) + dHoverUuid +} = useSetupMapGetters(['dWidgets', 'dActiveElement', 'dHoverUuid', 'dSelectWidgets', 'dAltDown']) const { dPage } = storeToRefs(usePageStore()) const { dZoom, dPaddingTop, dScreen } = storeToRefs(useCanvasStore()) -const { dDraging } = storeToRefs(useControlStore()) +const { dDraging, showRotatable } = storeToRefs(useControlStore()) let _dropIn: string | null = '' diff --git a/src/components/modules/widgets/wImage/wImageStyle.vue b/src/components/modules/widgets/wImage/wImageStyle.vue index a44fce4..a4ad6d0 100644 --- a/src/components/modules/widgets/wImage/wImageStyle.vue +++ b/src/components/modules/widgets/wImage/wImageStyle.vue @@ -136,7 +136,8 @@ const store = useStore() const { dActiveElement, dWidgets } = useSetupMapGetters(['dActiveElement', 'dWidgets']) -const { dMoving } = storeToRefs(useControlStore()) +const controlStore = useControlStore() +const { dMoving } = storeToRefs(controlStore) // computed: { // ...mapGetters(['dActiveElement', 'dMoving', 'dWidgets']), // }, @@ -319,7 +320,10 @@ function imgCrop(val: boolean) { const { left, top } = el.getBoundingClientRect() toolBarStyle = { left: left + 'px', top: top + 'px' } state.innerElement.cropEdit = val - store.commit('setShowRotatable', !val) + + // store.commit('setShowRotatable', !val) + controlStore.setShowRotatable(!val) + } diff --git a/src/store/modules/design/index.ts b/src/store/modules/design/index.ts index c688fbc..f27eb3f 100644 --- a/src/store/modules/design/index.ts +++ b/src/store/modules/design/index.ts @@ -76,7 +76,7 @@ const all = { selectItem: { data: null }, // 记录当前选择的元素, data activeMouseEvent: null, // 正在活动的鼠标事件 // showMoveable: false, // 全局控制选择框的显示 - showRotatable: true, // 是否显示moveable的旋转按钮 + // showRotatable: true, // 是否显示moveable的旋转按钮 zoomScreenChange: null, // 画布强制刷新适应度 updateRect: null, // 强制刷新操作框 updateSelect: null, // 强制设置选择元素 @@ -150,9 +150,9 @@ const all = { // showMoveable(state: any) { // return state.showMoveable // }, - showRotatable(state: any) { - return state.showRotatable - }, + // showRotatable(state: any) { + // return state.showRotatable + // }, zoomScreenChange(state: any) { return state.zoomScreenChange }, diff --git a/src/store/modules/design/mutations.ts b/src/store/modules/design/mutations.ts index 5b2a290..867ebbd 100644 --- a/src/store/modules/design/mutations.ts +++ b/src/store/modules/design/mutations.ts @@ -48,9 +48,9 @@ export default { // // state.dActiveElement = state.dPage // // } // }, - setShowRotatable(state: Type.Object, e: any) { - state.showRotatable = e - }, + // setShowRotatable(state: Type.Object, e: any) { + // state.showRotatable = e + // }, zoomScreenChange(state: Type.Object, e: any) { // 画布尺寸适应度强制刷新 state.zoomScreenChange = Math.random()