diff --git a/package.json b/package.json index b0c5045b..17be7dc9 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "mitt": "^2.1.0", "store2": "^2.12.0", "vue": "^3.0.0", - "vue-router": "^4.0.0-0", "vuedraggable": "^4.0.1", "vuex": "^4.0.0-0" }, @@ -31,7 +30,6 @@ "@typescript-eslint/parser": "^2.33.0", "@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.0", - "@vue/cli-plugin-router": "~4.5.0", "@vue/cli-plugin-typescript": "~4.5.0", "@vue/cli-plugin-unit-jest": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", diff --git a/src/App.vue b/src/App.vue index 12eee552..ecef2c80 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,5 +1,5 @@ @@ -40,6 +62,7 @@ export default defineComponent({ justify-content: space-between; padding: 0 10px; font-size: 13px; + user-select: none; } .left-handler { display: flex; @@ -59,6 +82,11 @@ export default defineComponent({ display: flex; align-items: center; + .text { + width: 40px; + text-align: center; + } + .viewport-size { font-size: 12px; margin-top: -1px; diff --git a/src/views/Editor/Thumbnails/index.vue b/src/views/Editor/Thumbnails/index.vue index 77ef7ab2..269c77aa 100644 --- a/src/views/Editor/Thumbnails/index.vue +++ b/src/views/Editor/Thumbnails/index.vue @@ -5,7 +5,7 @@ v-click-outside="() => setThumbnailsFocus(false)" >
- + 添加幻灯片 + + 添加幻灯片
import { computed, defineComponent, PropType } from 'vue' +import { useStore } from 'vuex' +import { State } from '@/store' import { PPTElement, PPTTextElement, PPTImageElement, PPTShapeElement, PPTLineElement } from '@/types/slides' import { ContextmenuItem } from '@/components/Contextmenu/types' @@ -42,10 +44,6 @@ import TextElement from './TextElement/index.vue' export default defineComponent({ name: 'editable-element', props: { - canvasScale: { - type: Number, - required: true, - }, elementInfo: { type: Object as PropType, required: true, @@ -88,6 +86,9 @@ export default defineComponent({ }, }, setup(props) { + const store = useStore() + const canvasScale = computed(() => store.state.canvasScale) + const currentElementComponent = computed(() => { const elementTypeMap = { 'image': ImageElement, @@ -180,6 +181,7 @@ export default defineComponent({ } return { + canvasScale, currentElementComponent, contextmenus, }