mirror of
https://github.com/pipipi-pikachu/PPTist.git
synced 2025-04-15 02:20:00 +08:00
refactor: 类型安全的provide/inject
This commit is contained in:
parent
c0d860ae27
commit
73061c0e65
7
src/types/injectKey.ts
Normal file
7
src/types/injectKey.ts
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
import { InjectionKey, Ref } from 'vue'
|
||||||
|
|
||||||
|
export type SlideScale = Ref<number>
|
||||||
|
export type SlideId = Ref<string>
|
||||||
|
|
||||||
|
export const injectKeySlideScale: InjectionKey<SlideScale> = Symbol()
|
||||||
|
export const injectKeySlideId: InjectionKey<SlideId> = Symbol()
|
@ -94,6 +94,7 @@ import { useMainStore, useSlidesStore, useKeyboardStore } from '@/store'
|
|||||||
import { ContextmenuItem } from '@/components/Contextmenu/types'
|
import { ContextmenuItem } from '@/components/Contextmenu/types'
|
||||||
import { PPTElement } from '@/types/slides'
|
import { PPTElement } from '@/types/slides'
|
||||||
import { AlignmentLineProps } from '@/types/edit'
|
import { AlignmentLineProps } from '@/types/edit'
|
||||||
|
import { injectKeySlideScale } from '@/types/injectKey'
|
||||||
import { removeAllRanges } from '@/utils/selection'
|
import { removeAllRanges } from '@/utils/selection'
|
||||||
import { KEYS } from '@/configs/hotkey'
|
import { KEYS } from '@/configs/hotkey'
|
||||||
|
|
||||||
@ -255,7 +256,7 @@ export default defineComponent({
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
provide('slideScale', canvasScale)
|
provide(injectKeySlideScale, canvasScale)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
elementList,
|
elementList,
|
||||||
|
@ -25,6 +25,7 @@ import { computed, PropType, defineComponent, provide } from 'vue'
|
|||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { useSlidesStore } from '@/store'
|
import { useSlidesStore } from '@/store'
|
||||||
import { Slide } from '@/types/slides'
|
import { Slide } from '@/types/slides'
|
||||||
|
import { injectKeySlideId } from '@/types/injectKey'
|
||||||
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
||||||
import useSlideBackgroundStyle from '@/hooks/useSlideBackgroundStyle'
|
import useSlideBackgroundStyle from '@/hooks/useSlideBackgroundStyle'
|
||||||
|
|
||||||
@ -64,7 +65,7 @@ export default defineComponent({
|
|||||||
const { backgroundStyle } = useSlideBackgroundStyle(background)
|
const { backgroundStyle } = useSlideBackgroundStyle(background)
|
||||||
|
|
||||||
const slideId = computed(() => props.slide.id)
|
const slideId = computed(() => props.slide.id)
|
||||||
provide('slideId', slideId)
|
provide(injectKeySlideId, slideId)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
backgroundStyle,
|
backgroundStyle,
|
||||||
|
@ -38,6 +38,7 @@
|
|||||||
import { computed, defineComponent, PropType, provide } from 'vue'
|
import { computed, defineComponent, PropType, provide } from 'vue'
|
||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { useSlidesStore } from '@/store'
|
import { useSlidesStore } from '@/store'
|
||||||
|
import { injectKeySlideScale } from '@/types/injectKey'
|
||||||
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
||||||
|
|
||||||
import ScreenSlide from './ScreenSlide.vue'
|
import ScreenSlide from './ScreenSlide.vue'
|
||||||
@ -73,7 +74,7 @@ export default defineComponent({
|
|||||||
const { slides, slideIndex, currentSlide } = storeToRefs(useSlidesStore())
|
const { slides, slideIndex, currentSlide } = storeToRefs(useSlidesStore())
|
||||||
|
|
||||||
const scale = computed(() => props.slideWidth / VIEWPORT_SIZE)
|
const scale = computed(() => props.slideWidth / VIEWPORT_SIZE)
|
||||||
provide('slideScale', scale)
|
provide(injectKeySlideScale, scale)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
slides,
|
slides,
|
||||||
|
@ -31,6 +31,7 @@ import { computed, PropType, defineComponent, provide } from 'vue'
|
|||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { useSlidesStore } from '@/store'
|
import { useSlidesStore } from '@/store'
|
||||||
import { Slide } from '@/types/slides'
|
import { Slide } from '@/types/slides'
|
||||||
|
import { injectKeySlideScale } from '@/types/injectKey'
|
||||||
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
||||||
import useSlideBackgroundStyle from '@/hooks/useSlideBackgroundStyle'
|
import useSlideBackgroundStyle from '@/hooks/useSlideBackgroundStyle'
|
||||||
|
|
||||||
@ -62,7 +63,7 @@ export default defineComponent({
|
|||||||
const { backgroundStyle } = useSlideBackgroundStyle(background)
|
const { backgroundStyle } = useSlideBackgroundStyle(background)
|
||||||
|
|
||||||
const scale = computed(() => props.size / VIEWPORT_SIZE)
|
const scale = computed(() => props.size / VIEWPORT_SIZE)
|
||||||
provide('slideScale', scale)
|
provide(injectKeySlideScale, scale)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
scale,
|
scale,
|
||||||
|
@ -36,10 +36,11 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { computed, defineComponent, inject, PropType, ref, Ref } from 'vue'
|
import { computed, defineComponent, inject, PropType, ref } from 'vue'
|
||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { useSlidesStore } from '@/store'
|
import { useSlidesStore } from '@/store'
|
||||||
import { PPTAudioElement } from '@/types/slides'
|
import { PPTAudioElement } from '@/types/slides'
|
||||||
|
import { injectKeySlideId, injectKeySlideScale } from '@/types/injectKey'
|
||||||
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
import { VIEWPORT_SIZE } from '@/configs/canvas'
|
||||||
|
|
||||||
import AudioPlayer from './AudioPlayer.vue'
|
import AudioPlayer from './AudioPlayer.vue'
|
||||||
@ -58,8 +59,8 @@ export default defineComponent({
|
|||||||
setup(props) {
|
setup(props) {
|
||||||
const { viewportRatio, currentSlide } = storeToRefs(useSlidesStore())
|
const { viewportRatio, currentSlide } = storeToRefs(useSlidesStore())
|
||||||
|
|
||||||
const scale: Ref<number> = inject('slideScale') || ref(1)
|
const scale = inject(injectKeySlideScale) || ref(1)
|
||||||
const slideId: Ref<string> = inject('slideId') || ref('')
|
const slideId = inject(injectKeySlideId) || ref('')
|
||||||
|
|
||||||
const inCurrentSlide = computed(() => currentSlide.value.id === slideId.value)
|
const inCurrentSlide = computed(() => currentSlide.value.id === slideId.value)
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { computed, defineComponent, inject, onMounted, PropType, ref, Ref, watch } from 'vue'
|
import { computed, defineComponent, inject, onMounted, PropType, ref, watch } from 'vue'
|
||||||
import { upperFirst } from 'lodash'
|
import { upperFirst } from 'lodash'
|
||||||
import tinycolor from 'tinycolor2'
|
import tinycolor from 'tinycolor2'
|
||||||
import Chartist, {
|
import Chartist, {
|
||||||
@ -39,6 +39,7 @@ import Chartist, {
|
|||||||
IPieChartOptions,
|
IPieChartOptions,
|
||||||
} from 'chartist'
|
} from 'chartist'
|
||||||
import { ChartData, ChartType } from '@/types/slides'
|
import { ChartData, ChartType } from '@/types/slides'
|
||||||
|
import { injectKeySlideScale } from '@/types/injectKey'
|
||||||
|
|
||||||
import 'chartist/dist/scss/chartist.scss'
|
import 'chartist/dist/scss/chartist.scss'
|
||||||
|
|
||||||
@ -81,7 +82,7 @@ export default defineComponent({
|
|||||||
},
|
},
|
||||||
setup(props) {
|
setup(props) {
|
||||||
const chartRef = ref<HTMLElement>()
|
const chartRef = ref<HTMLElement>()
|
||||||
const slideScale: Ref<number> = inject('slideScale') || ref(1)
|
const slideScale = inject(injectKeySlideScale) || ref(1)
|
||||||
|
|
||||||
let chart: IChartistLineChart | IChartistBarChart | IChartistPieChart | undefined
|
let chart: IChartistLineChart | IChartistBarChart | IChartistPieChart | undefined
|
||||||
|
|
||||||
|
@ -30,6 +30,7 @@ import { computed, defineComponent, inject, PropType, Ref, ref } from 'vue'
|
|||||||
import { storeToRefs } from 'pinia'
|
import { storeToRefs } from 'pinia'
|
||||||
import { useSlidesStore } from '@/store'
|
import { useSlidesStore } from '@/store'
|
||||||
import { PPTVideoElement } from '@/types/slides'
|
import { PPTVideoElement } from '@/types/slides'
|
||||||
|
import { injectKeySlideId, injectKeySlideScale } from '@/types/injectKey'
|
||||||
|
|
||||||
import VideoPlayer from './VideoPlayer/index.vue'
|
import VideoPlayer from './VideoPlayer/index.vue'
|
||||||
|
|
||||||
@ -47,8 +48,8 @@ export default defineComponent({
|
|||||||
setup() {
|
setup() {
|
||||||
const { currentSlide } = storeToRefs(useSlidesStore())
|
const { currentSlide } = storeToRefs(useSlidesStore())
|
||||||
|
|
||||||
const scale: Ref<number> = inject('slideScale') || ref(1)
|
const scale = inject(injectKeySlideScale) || ref(1)
|
||||||
const slideId: Ref<string> = inject('slideId') || ref('')
|
const slideId = inject(injectKeySlideId) || ref('')
|
||||||
|
|
||||||
const inCurrentSlide = computed(() => currentSlide.value.id === slideId.value)
|
const inCurrentSlide = computed(() => currentSlide.value.id === slideId.value)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user