From 8498b0786b0018e0b115756ac7947445ec0bfb70 Mon Sep 17 00:00:00 2001 From: pipipi-pikachu Date: Sun, 24 Sep 2023 21:02:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=BF=E6=8D=A2Divider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Editor/Canvas/Operate/LinkHandler.vue | 3 +-- src/views/Editor/CanvasTool/index.vue | 2 +- src/views/Editor/SearchPanel.vue | 2 +- src/views/Editor/Toolbar/ElementAnimationPanel.vue | 2 +- src/views/Editor/Toolbar/ElementPositionPanel.vue | 2 +- .../Toolbar/ElementStylePanel/ChartStylePanel/index.vue | 2 +- .../Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue | 2 +- .../Editor/Toolbar/ElementStylePanel/LatexStylePanel.vue | 2 +- .../Editor/Toolbar/ElementStylePanel/LineStylePanel.vue | 2 +- .../Editor/Toolbar/ElementStylePanel/MultiStylePanel.vue | 2 +- .../Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue | 4 ++-- .../Editor/Toolbar/ElementStylePanel/TableStylePanel.vue | 2 +- .../Editor/Toolbar/ElementStylePanel/TextStylePanel.vue | 4 ++-- src/views/Editor/Toolbar/MultiPositionPanel.vue | 2 +- src/views/Editor/Toolbar/SlideDesignPanel.vue | 2 +- src/views/Mobile/MobileEditor/ElementToolbar.vue | 2 +- src/views/Mobile/MobilePreview.vue | 2 +- src/views/Screen/PresenterView.vue | 5 ++--- 18 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/views/Editor/Canvas/Operate/LinkHandler.vue b/src/views/Editor/Canvas/Operate/LinkHandler.vue index f1d7749c..009f093d 100644 --- a/src/views/Editor/Canvas/Operate/LinkHandler.vue +++ b/src/views/Editor/Canvas/Operate/LinkHandler.vue @@ -16,8 +16,7 @@ import { storeToRefs } from 'pinia' import { useMainStore, useSlidesStore } from '@/store' import type { PPTElement, PPTElementLink } from '@/types/slides' import useLink from '@/hooks/useLink' - -import { Divider } from 'ant-design-vue' +import Divider from '@/components/Divider.vue' const props = defineProps<{ elementInfo: PPTElement diff --git a/src/views/Editor/CanvasTool/index.vue b/src/views/Editor/CanvasTool/index.vue index 7e50e39d..59971cb3 100644 --- a/src/views/Editor/CanvasTool/index.vue +++ b/src/views/Editor/CanvasTool/index.vue @@ -113,9 +113,9 @@ import MediaInput from './MediaInput.vue' import LaTeXEditor from '@/components/LaTeXEditor/index.vue' import FileInput from '@/components/FileInput.vue' import Modal from '@/components/Modal.vue' +import Divider from '@/components/Divider.vue' import { Popover, - Divider, } from 'ant-design-vue' const mainStore = useMainStore() diff --git a/src/views/Editor/SearchPanel.vue b/src/views/Editor/SearchPanel.vue index 12cdce19..33f000f4 100644 --- a/src/views/Editor/SearchPanel.vue +++ b/src/views/Editor/SearchPanel.vue @@ -36,10 +36,10 @@ import { useMainStore } from '@/store' import useSearch from '@/hooks/useSearch' import MoveablePanel from '@/components/MoveablePanel.vue' import Tabs from '@/components/Tabs.vue' +import Divider from '@/components/Divider.vue' import { Button, Input, - Divider, } from 'ant-design-vue' type TypeKey = 'search' | 'replace' diff --git a/src/views/Editor/Toolbar/ElementAnimationPanel.vue b/src/views/Editor/Toolbar/ElementAnimationPanel.vue index 86b079d1..74d125f8 100644 --- a/src/views/Editor/Toolbar/ElementAnimationPanel.vue +++ b/src/views/Editor/Toolbar/ElementAnimationPanel.vue @@ -126,10 +126,10 @@ import { ELEMENT_TYPE_ZH } from '@/configs/element' import useHistorySnapshot from '@/hooks/useHistorySnapshot' import Tabs from '@/components/Tabs.vue' +import Divider from '@/components/Divider.vue' import Draggable from 'vuedraggable' import { InputNumber, - Divider, Button, Popover, Select, diff --git a/src/views/Editor/Toolbar/ElementPositionPanel.vue b/src/views/Editor/Toolbar/ElementPositionPanel.vue index c1ce2f09..ba784ab4 100644 --- a/src/views/Editor/Toolbar/ElementPositionPanel.vue +++ b/src/views/Editor/Toolbar/ElementPositionPanel.vue @@ -106,10 +106,10 @@ import { SHAPE_PATH_FORMULAS } from '@/configs/shapes' import useOrderElement from '@/hooks/useOrderElement' import useAlignElementToCanvas from '@/hooks/useAlignElementToCanvas' import useHistorySnapshot from '@/hooks/useHistorySnapshot' +import Divider from '@/components/Divider.vue' import { InputNumber, - Divider, Button, } from 'ant-design-vue' const ButtonGroup = Button.Group diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue index 31eb04c9..909303a9 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/ChartStylePanel/index.vue @@ -158,8 +158,8 @@ import ColorButton from '../../common/ColorButton.vue' import ChartDataEditor from './ChartDataEditor.vue' import ColorPicker from '@/components/ColorPicker/index.vue' import Modal from '@/components/Modal.vue' +import Divider from '@/components/Divider.vue' import { - Divider, Button, Popover, Select, diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue index 9058603f..b2974c61 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue @@ -74,8 +74,8 @@ import ElementFlip from '../common/ElementFlip.vue' import ElementFilter from '../common/ElementFilter.vue' import ElementColorMask from '../common/ElementColorMask.vue' import FileInput from '@/components/FileInput.vue' +import Divider from '@/components/Divider.vue' import { - Divider, Button, Popover, } from 'ant-design-vue' diff --git a/src/views/Editor/Toolbar/ElementStylePanel/LatexStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/LatexStylePanel.vue index 2049617c..05473aed 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/LatexStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/LatexStylePanel.vue @@ -52,9 +52,9 @@ import ColorButton from '../common/ColorButton.vue' import LaTeXEditor from '@/components/LaTeXEditor/index.vue' import ColorPicker from '@/components/ColorPicker/index.vue' import Modal from '@/components/Modal.vue' +import Divider from '@/components/Divider.vue' import { InputNumber, - Divider, Button, Popover, } from 'ant-design-vue' diff --git a/src/views/Editor/Toolbar/ElementStylePanel/LineStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/LineStylePanel.vue index c24cf527..51ab8ebb 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/LineStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/LineStylePanel.vue @@ -72,9 +72,9 @@ import useHistorySnapshot from '@/hooks/useHistorySnapshot' import ElementShadow from '../common/ElementShadow.vue' import ColorButton from '../common/ColorButton.vue' import ColorPicker from '@/components/ColorPicker/index.vue' +import Divider from '@/components/Divider.vue' import { InputNumber, - Divider, Popover, Select, } from 'ant-design-vue' diff --git a/src/views/Editor/Toolbar/ElementStylePanel/MultiStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/MultiStylePanel.vue index 9724eaba..e3fc8c5a 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/MultiStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/MultiStylePanel.vue @@ -139,9 +139,9 @@ import useHistorySnapshot from '@/hooks/useHistorySnapshot' import ColorButton from '../common/ColorButton.vue' import TextColorButton from '../common/TextColorButton.vue' import ColorPicker from '@/components/ColorPicker/index.vue' +import Divider from '@/components/Divider.vue' import { InputNumber, - Divider, Button, Popover, Select, diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue index 1a2d94c4..680407a5 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/ShapeStylePanel.vue @@ -254,12 +254,12 @@ import ElementShadow from '../common/ElementShadow.vue' import ElementFlip from '../common/ElementFlip.vue' import ColorButton from '../common/ColorButton.vue' import TextColorButton from '../common/TextColorButton.vue' +import ShapeItemThumbnail from '@/views/Editor/CanvasTool/ShapeItemThumbnail.vue' import CheckboxButton from '@/components/CheckboxButton.vue' import CheckboxButtonGroup from '@/components/ButtonGroup.vue' import ColorPicker from '@/components/ColorPicker/index.vue' -import ShapeItemThumbnail from '@/views/Editor/CanvasTool/ShapeItemThumbnail.vue' +import Divider from '@/components/Divider.vue' import { - Divider, Button, Popover, Slider, diff --git a/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue index 3073b078..affcc6a8 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/TableStylePanel.vue @@ -184,8 +184,8 @@ import TextColorButton from '../common/TextColorButton.vue' import CheckboxButton from '@/components/CheckboxButton.vue' import CheckboxButtonGroup from '@/components/ButtonGroup.vue' import ColorPicker from '@/components/ColorPicker/index.vue' +import Divider from '@/components/Divider.vue' import { - Divider, Button, Popover, Select, diff --git a/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue index dbe76ec2..14e36eaf 100644 --- a/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue +++ b/src/views/Editor/Toolbar/ElementStylePanel/TextStylePanel.vue @@ -119,7 +119,7 @@ :checked="richTextAttrs.subscript" v-tooltip="'下标'" @click="emitRichTextCommand('subscript')" - >A₂> + >A₂ void diff --git a/src/views/Screen/PresenterView.vue b/src/views/Screen/PresenterView.vue index 6187a083..36df0571 100644 --- a/src/views/Screen/PresenterView.vue +++ b/src/views/Screen/PresenterView.vue @@ -93,7 +93,7 @@ import ThumbnailSlide from '@/views/components/ThumbnailSlide/index.vue' import ScreenSlideList from './ScreenSlideList.vue' import WritingBoardTool from './WritingBoardTool.vue' import CountdownTimer from './CountdownTimer.vue' -import { Divider } from 'ant-design-vue' +import Divider from '@/components/Divider.vue' const props = defineProps<{ changeViewMode: (mode: 'base' | 'presenter') => void @@ -226,8 +226,7 @@ const contextmenus = (): ContextmenuItem[] => { .divider { width: 70%; - min-width: 70%; - margin: 24px 15%; + margin: 24px 15% !important; } .tool-icon {