diff --git a/src/configs/shapes.ts b/src/configs/shapes.ts index e29a5da6..81dd8dda 100644 --- a/src/configs/shapes.ts +++ b/src/configs/shapes.ts @@ -77,6 +77,10 @@ export const SHAPE_LIST = [ viewBox: 200, path: 'M 50 0 L 200 0 L 150 200 L 0 200 L 50 0 Z' }, + { + viewBox: 200, + path: 'M 0 0 L 150 0 L 200 200 L 50 200 L 0 0 Z' + }, { viewBox: 200, path: 'M 50 0 L 150 0 L 200 200 L 0 200 L 50 0 Z' @@ -117,6 +121,10 @@ export const SHAPE_LIST = [ viewBox: 200, path: 'M 200 0 L 200 200 L 0 200 L 0 100 L 200 0 Z' }, + { + viewBox: 200, + path: 'M 0 0 L 200 100 L 200 200 L 0 200 L 0 0 Z' + }, { viewBox: 200, path: 'M 50 0 L 150 0 L 150 50 L 200 50 L 200 150 L 150 150 L 150 200 L 50 200 L 50 150 L 0 150 L 0 50 L 50 50 L 50 0 Z' diff --git a/src/hooks/usePasteTextClipboardData.ts b/src/hooks/usePasteTextClipboardData.ts index d0930669..755084bd 100644 --- a/src/hooks/usePasteTextClipboardData.ts +++ b/src/hooks/usePasteTextClipboardData.ts @@ -48,8 +48,10 @@ export default () => { } const pasteSlide = (slide: Slide) => { - const newSlide = { ...slide, id: createRandomCode() } - store.commit(MutationTypes.ADD_SLIDE, newSlide) + store.commit(MutationTypes.ADD_SLIDE, { + ...slide, + id: createRandomCode(8), + }) addHistorySnapshot() } diff --git a/src/hooks/useSlideHandler.ts b/src/hooks/useSlideHandler.ts index bd834622..5ebbcc99 100644 --- a/src/hooks/useSlideHandler.ts +++ b/src/hooks/useSlideHandler.ts @@ -61,11 +61,16 @@ export default () => { } const copyAndPasteSlide = () => { - store.commit(MutationTypes.ADD_SLIDE, currentSlide.value) + store.commit(MutationTypes.ADD_SLIDE, { + ...currentSlide.value, + id: createRandomCode(8), + }) addHistorySnapshot() } const deleteSlide = () => { + if(slidesLength.value === 1) return message.warning('无法继续删除') + store.commit(MutationTypes.DELETE_SLIDE, currentSlide.value.id) addHistorySnapshot() } diff --git a/src/mocks/index.ts b/src/mocks/index.ts index e6e3bc5f..d3e54e70 100644 --- a/src/mocks/index.ts +++ b/src/mocks/index.ts @@ -2,181 +2,7 @@ import { Slide } from '@/types/slides' export const slides: Slide[] = [ { - id: 'xsxa123', - elements: [ - { - id: 'sdasaxs', - type: 'chart', - left: 680, - top: 20, - width: 300, - height: 300, - chartType: 'line', - themeColor: '#d70206', - data: { - labels: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri'], - series: [ - [5, 2, 4, 2, 10], - ], - }, - }, - { - id: '1213asa', - type: 'table', - left: 20, - top: 20, - width: 400, - height: 108, - colWidths: [0.25, 0.25, 0.25, 0.25], - outline: { - width: 1, - style: 'solid', - color: '#999', - }, - data: [ - [ - { id: '1', colspan: 1, rowspan: 1, text: '1' }, - { id: '2', colspan: 1, rowspan: 1, text: '2' }, - { id: '3', colspan: 1, rowspan: 1, text: '3' }, - { id: '4', colspan: 1, rowspan: 1, text: '4' }, - ], - [ - { id: '6', colspan: 1, rowspan: 1, text: '6' }, - { id: '7', colspan: 1, rowspan: 1, text: '7' }, - { id: '8', colspan: 1, rowspan: 1, text: '8' }, - { id: '9', colspan: 1, rowspan: 1, text: '9' }, - ], - [ - { id: '11', colspan: 1, rowspan: 1, text: '11' }, - { id: '12', colspan: 1, rowspan: 1, text: '12' }, - { id: '13', colspan: 1, rowspan: 1, text: '13' }, - { id: '14', colspan: 1, rowspan: 1, text: '14' }, - ], - ], - }, - ], - }, - { - id: 'xxx1', - background: { - type: 'solid', - color: '#fff', - }, - elements: [ - { - id: 'xxx1', - type: 'text', - left: 190, - top: 50, - width: 320, - height: 104, - rotate: 0, - shadow: { - h: 1, - v: 1, - blur: 3, - color: 'rgba(10, 10, 10, .5)' - }, - opacity: 1, - lock: false, - content: '
一段测试文字,字号固定为28px
', - }, - { - id: 'xxx3', - type: 'image', - left: 80, - top: 250, - width: 180, - height: 180, - rotate: 0, - outline: { - width: 4, - style: 'solid', - color: '#333' - }, - clip: { - range: [[30, 0], [100, 70]], - shape: 'ellipse' - }, - fixedRatio: false, - lock: false, - src: 'https://img.lessonplan.cn/IMG/Show/ppt/3ab74e91-c34f-499d-9711-166e423d4dd6/1573622467064v2-7aa3ce420052983d91c6d01b47a7441d_hd.jpg', - }, - { - id: 'xxx2', - type: 'image', - left: 750, - top: 320, - width: 150, - height: 150, - rotate: 0, - fixedRatio: true, - lock: false, - src: 'https://img.lessonplan.cn/IMG/Show/ppt/3ab74e91-c34f-499d-9711-166e423d4dd6/62d9adb3-e7a6-4dc4-a352-095cffb49f08/b1be1a2f-f893-47d3-a8a3-eac7d04d395f/1596159381259v2-b2c69096d25ae16bf6ca09e30add3e65_hd.jpg', - }, - ], - animations: [ - { - elId: 'xxx1', - type: 'rotateIn', - duration: 1000, - }, - { - elId: 'xxx2', - type: 'zoomIn', - duration: 1000, - }, - ], - }, - { - id: 'sajd172', - elements: [ - { - id: 'yyx1', - type: 'text', - left: 590, - top: 90, - width: 220, - height: 188, - rotate: 0, - opacity: 1, - lock: false, - content: '