diff --git a/src/components/modules/layout/designBoard.vue b/src/components/modules/layout/designBoard.vue deleted file mode 100644 index d0d35d3..0000000 --- a/src/components/modules/layout/designBoard.vue +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/components/modules/layout/designBoard/index.vue b/src/components/modules/layout/designBoard/index.vue new file mode 100644 index 0000000..4764f21 --- /dev/null +++ b/src/components/modules/layout/designBoard/index.vue @@ -0,0 +1,363 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/modules/layout/sizeControl.vue b/src/components/modules/layout/sizeControl.vue index 80d2174..276dec5 100644 --- a/src/components/modules/layout/sizeControl.vue +++ b/src/components/modules/layout/sizeControl.vue @@ -1,7 +1,7 @@ diff --git a/src/mixins/move.ts b/src/mixins/move.ts index af4e5bf..1897bec 100644 --- a/src/mixins/move.ts +++ b/src/mixins/move.ts @@ -48,7 +48,7 @@ const move = { const moveInit = { methods: { - initmovement(e: any) { + initmovement(e: MouseEvent) { if (!store.getters.dAltDown) { // 设置mouseevent给moveable初始 // 在组合操作时排除 diff --git a/src/types/global.d.ts b/src/types/global.d.ts index 1cd3489..a3b3344 100644 --- a/src/types/global.d.ts +++ b/src/types/global.d.ts @@ -56,3 +56,9 @@ interface Window { } } } + + +interface MouseEvent { + layerX: number + layerY: number +} diff --git a/src/views/Draw.vue b/src/views/Draw.vue index aaec167..eea81f5 100644 --- a/src/views/Draw.vue +++ b/src/views/Draw.vue @@ -16,7 +16,7 @@ import wGroup from '@/components/modules/widgets/wGroup/wGroup.vue' import Preload from '@/utils/plugins/preload' import FontFaceObserver from 'fontfaceobserver' import { fontWithDraw, font2style } from '@/utils/widgets/loadFontRule' -import designBoard from '@/components/modules/layout/designBoard.vue' +import designBoard from '@/components/modules/layout/designBoard/index.vue' import zoomControl from '@/components/modules/layout/zoomControl/index.vue' export default defineComponent({ diff --git a/src/views/Index.vue b/src/views/Index.vue index 393037e..16eb594 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -58,7 +58,7 @@ import { defineComponent, reactive, toRefs } from 'vue' import { mapActions, mapGetters } from 'vuex' import RightClickMenu from '@/components/business/right-click-menu/RcMenu.vue' import Moveable from '@/components/business/moveable/Moveable.vue' -import designBoard from '@/components/modules/layout/designBoard.vue' +import designBoard from '@/components/modules/layout/designBoard/index.vue' import zoomControl from '@/components/modules/layout/zoomControl/index.vue' import lineGuides from '@/components/modules/layout/lineGuides.vue' diff --git a/src/views/Psd.vue b/src/views/Psd.vue index d3c71e3..e28cd2f 100644 --- a/src/views/Psd.vue +++ b/src/views/Psd.vue @@ -52,7 +52,7 @@ import wText from '@/components/modules/widgets/wText/wText.vue' import wImage from '@/components/modules/widgets/wImage/wImage.vue' import useLoading from '@/common/methods/loading' import uploader from '@/components/common/Uploader/index.vue' -import designBoard from '@/components/modules/layout/designBoard.vue' +import designBoard from '@/components/modules/layout/designBoard/index.vue' import zoomControl from '@/components/modules/layout/zoomControl/index.vue' import HeaderOptions from './components/UploadTemplate.vue' import ProgressLoading from '@/components/common/ProgressLoading/index.vue'