diff --git a/src/components/modules/widgets/wImage/wImageSetting.ts b/src/components/modules/widgets/wImage/wImageSetting.ts index 55d8f26..2c67740 100644 --- a/src/components/modules/widgets/wImage/wImageSetting.ts +++ b/src/components/modules/widgets/wImage/wImageSetting.ts @@ -29,6 +29,7 @@ export type TImageSetting = { ratio: number left: number } + cropEdit?: boolean } const setting: TImageSetting = { diff --git a/src/components/modules/widgets/wImage/wImageStyle.vue b/src/components/modules/widgets/wImage/wImageStyle.vue index 36de2e0..65061f9 100644 --- a/src/components/modules/widgets/wImage/wImageStyle.vue +++ b/src/components/modules/widgets/wImage/wImageStyle.vue @@ -89,6 +89,8 @@ import imageCutout from '@/components/business/image-cutout' import { useSetupMapGetters } from '@/common/hooks/mapGetters' import wImageSetting, { TImageSetting } from './wImageSetting' import { TGetImageListResult } from '@/api/material' +import { storeToRefs } from 'pinia' +import { useControlStore } from '@/pinia' type TState = { picBoxShow: boolean @@ -132,8 +134,9 @@ const imageCutoutRef = ref(null) const store = useStore() const { - dActiveElement, dMoving, dWidgets -} = useSetupMapGetters(['dActiveElement', 'dMoving', 'dWidgets']) + dActiveElement, dWidgets +} = useSetupMapGetters(['dActiveElement', 'dWidgets']) +const { dMoving } = storeToRefs(useControlStore()) // computed: { // ...mapGetters(['dActiveElement', 'dMoving', 'dWidgets']), // }, diff --git a/src/pinia/index.ts b/src/pinia/index.ts index d9aee5f..a4a64d0 100644 --- a/src/pinia/index.ts +++ b/src/pinia/index.ts @@ -10,10 +10,12 @@ import useBaseStore from "./base"; import useUserStore from "./base/user"; import usePageStore from "./design/page" import useCanvasStore from "./design/canvas" +import useControlStore from './design/control' export { useBaseStore, useUserStore, usePageStore, useCanvasStore, + useControlStore }