Merge branch 'main' into lyc-dev

Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS
PPTist接入
2024-11-19 10:01:09 +08:00 · 2024-11-19 09:59:59 +08:00 · 2024-11-19 09:59:34 +08:00 · 2024-11-19 09:42:54 +08:00 · 2024-11-19 09:42:19 +08:00
324 changed files with 58 additions and 28 deletions
--- a/src/renderer/src/AixPPTist/public/favicon.ico
+++ b/src/renderer/src/AixPPTist/public/favicon.ico
--- a/src/renderer/src/AixPPTist/public/icons/android-chrome-192x192.png
+++ b/src/renderer/src/AixPPTist/public/icons/android-chrome-192x192.png
--- a/src/renderer/src/AixPPTist/public/icons/android-chrome-512x512.png
+++ b/src/renderer/src/AixPPTist/public/icons/android-chrome-512x512.png
--- a/src/renderer/src/AixPPTist/public/icons/android-chrome-maskable-192x192.png
+++ b/src/renderer/src/AixPPTist/public/icons/android-chrome-maskable-192x192.png
--- a/src/renderer/src/AixPPTist/public/icons/android-chrome-maskable-512x512.png
+++ b/src/renderer/src/AixPPTist/public/icons/android-chrome-maskable-512x512.png
--- a/src/renderer/src/AixPPTist/public/icons/apple-touch-icon-152x152.png
+++ b/src/renderer/src/AixPPTist/public/icons/apple-touch-icon-152x152.png
--- a/src/renderer/src/AixPPTist/public/icons/favicon-16x16.png
+++ b/src/renderer/src/AixPPTist/public/icons/favicon-16x16.png
--- a/src/renderer/src/AixPPTist/public/icons/favicon-32x32.png
+++ b/src/renderer/src/AixPPTist/public/icons/favicon-32x32.png
--- a/src/renderer/src/AixPPTist/src/App.vue
+++ b/src/renderer/src/AixPPTist/src/App.vue
--- a/src/renderer/src/AixPPTist/src/assets/fonts/仓耳小丸子.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/仓耳小丸子.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/优设标题黑.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/优设标题黑.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/字制区喜脉体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/字制区喜脉体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/峰广明锐体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/峰广明锐体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/得意黑.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/得意黑.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/摄图摩登小方体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/摄图摩登小方体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/站酷快乐体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/站酷快乐体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/素材集市康康体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/素材集市康康体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/素材集市酷方体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/素材集市酷方体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/途牛类圆体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/途牛类圆体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/fonts/锐字真言体.woff2
+++ b/src/renderer/src/AixPPTist/src/assets/fonts/锐字真言体.woff2
--- a/src/renderer/src/AixPPTist/src/assets/styles/font.scss
+++ b/src/renderer/src/AixPPTist/src/assets/styles/font.scss
--- a/src/renderer/src/AixPPTist/src/assets/styles/global.scss
+++ b/src/renderer/src/AixPPTist/src/assets/styles/global.scss
--- a/src/renderer/src/AixPPTist/src/assets/styles/mixin.scss
+++ b/src/renderer/src/AixPPTist/src/assets/styles/mixin.scss
--- a/src/renderer/src/AixPPTist/src/assets/styles/prosemirror.scss
+++ b/src/renderer/src/AixPPTist/src/assets/styles/prosemirror.scss
--- a/src/renderer/src/AixPPTist/src/assets/styles/variable.scss
+++ b/src/renderer/src/AixPPTist/src/assets/styles/variable.scss
--- a/src/renderer/src/AixPPTist/src/components.d.ts
+++ b/src/renderer/src/AixPPTist/src/components.d.ts
--- a/src/renderer/src/AixPPTist/src/components/Button.vue
+++ b/src/renderer/src/AixPPTist/src/components/Button.vue
--- a/src/renderer/src/AixPPTist/src/components/ButtonGroup.vue
+++ b/src/renderer/src/AixPPTist/src/components/ButtonGroup.vue
--- a/src/renderer/src/AixPPTist/src/components/Checkbox.vue
+++ b/src/renderer/src/AixPPTist/src/components/Checkbox.vue
--- a/src/renderer/src/AixPPTist/src/components/CheckboxButton.vue
+++ b/src/renderer/src/AixPPTist/src/components/CheckboxButton.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorButton.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorButton.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorPicker/Alpha.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorPicker/Alpha.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorPicker/Checkboard.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorPicker/Checkboard.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorPicker/EditableInput.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorPicker/EditableInput.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorPicker/Hue.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorPicker/Hue.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorPicker/Saturation.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorPicker/Saturation.vue
--- a/src/renderer/src/AixPPTist/src/components/ColorPicker/index.vue
+++ b/src/renderer/src/AixPPTist/src/components/ColorPicker/index.vue
--- a/src/renderer/src/AixPPTist/src/components/Contextmenu/MenuContent.vue
+++ b/src/renderer/src/AixPPTist/src/components/Contextmenu/MenuContent.vue
--- a/src/renderer/src/AixPPTist/src/components/Contextmenu/index.vue
+++ b/src/renderer/src/AixPPTist/src/components/Contextmenu/index.vue
--- a/src/renderer/src/AixPPTist/src/components/Contextmenu/types.ts
+++ b/src/renderer/src/AixPPTist/src/components/Contextmenu/types.ts
--- a/src/renderer/src/AixPPTist/src/components/Divider.vue
+++ b/src/renderer/src/AixPPTist/src/components/Divider.vue
--- a/src/renderer/src/AixPPTist/src/components/Drawer.vue
+++ b/src/renderer/src/AixPPTist/src/components/Drawer.vue
--- a/src/renderer/src/AixPPTist/src/components/FileInput.vue
+++ b/src/renderer/src/AixPPTist/src/components/FileInput.vue
--- a/src/renderer/src/AixPPTist/src/components/FullscreenSpin.vue
+++ b/src/renderer/src/AixPPTist/src/components/FullscreenSpin.vue
--- a/src/renderer/src/AixPPTist/src/components/GradientBar.vue
+++ b/src/renderer/src/AixPPTist/src/components/GradientBar.vue
--- a/src/renderer/src/AixPPTist/src/components/Input.vue
+++ b/src/renderer/src/AixPPTist/src/components/Input.vue
--- a/src/renderer/src/AixPPTist/src/components/LaTeXEditor/FormulaContent.vue
+++ b/src/renderer/src/AixPPTist/src/components/LaTeXEditor/FormulaContent.vue
--- a/src/renderer/src/AixPPTist/src/components/LaTeXEditor/SymbolContent.vue
+++ b/src/renderer/src/AixPPTist/src/components/LaTeXEditor/SymbolContent.vue
--- a/src/renderer/src/AixPPTist/src/components/LaTeXEditor/hfmath.ts
+++ b/src/renderer/src/AixPPTist/src/components/LaTeXEditor/hfmath.ts
--- a/src/renderer/src/AixPPTist/src/components/LaTeXEditor/index.vue
+++ b/src/renderer/src/AixPPTist/src/components/LaTeXEditor/index.vue
--- a/src/renderer/src/AixPPTist/src/components/Message.vue
+++ b/src/renderer/src/AixPPTist/src/components/Message.vue
--- a/src/renderer/src/AixPPTist/src/components/Modal.vue
+++ b/src/renderer/src/AixPPTist/src/components/Modal.vue
--- a/src/renderer/src/AixPPTist/src/components/MoveablePanel.vue
+++ b/src/renderer/src/AixPPTist/src/components/MoveablePanel.vue
--- a/src/renderer/src/AixPPTist/src/components/NumberInput.vue
+++ b/src/renderer/src/AixPPTist/src/components/NumberInput.vue
--- a/src/renderer/src/AixPPTist/src/components/Popover.vue
+++ b/src/renderer/src/AixPPTist/src/components/Popover.vue
--- a/src/renderer/src/AixPPTist/src/components/PopoverMenuItem.vue
+++ b/src/renderer/src/AixPPTist/src/components/PopoverMenuItem.vue
--- a/src/renderer/src/AixPPTist/src/components/RadioButton.vue
+++ b/src/renderer/src/AixPPTist/src/components/RadioButton.vue
--- a/src/renderer/src/AixPPTist/src/components/RadioGroup.vue
+++ b/src/renderer/src/AixPPTist/src/components/RadioGroup.vue
--- a/src/renderer/src/AixPPTist/src/components/Select.vue
+++ b/src/renderer/src/AixPPTist/src/components/Select.vue
--- a/src/renderer/src/AixPPTist/src/components/SelectGroup.vue
+++ b/src/renderer/src/AixPPTist/src/components/SelectGroup.vue
--- a/src/renderer/src/AixPPTist/src/components/Slider.vue
+++ b/src/renderer/src/AixPPTist/src/components/Slider.vue
--- a/src/renderer/src/AixPPTist/src/components/Switch.vue
+++ b/src/renderer/src/AixPPTist/src/components/Switch.vue
--- a/src/renderer/src/AixPPTist/src/components/Tabs.vue
+++ b/src/renderer/src/AixPPTist/src/components/Tabs.vue
--- a/src/renderer/src/AixPPTist/src/components/TextArea.vue
+++ b/src/renderer/src/AixPPTist/src/components/TextArea.vue
--- a/src/renderer/src/AixPPTist/src/components/TextColorButton.vue
+++ b/src/renderer/src/AixPPTist/src/components/TextColorButton.vue
--- a/src/renderer/src/AixPPTist/src/components/WritingBoard.vue
+++ b/src/renderer/src/AixPPTist/src/components/WritingBoard.vue
--- a/src/renderer/src/AixPPTist/src/configs/animation.ts
+++ b/src/renderer/src/AixPPTist/src/configs/animation.ts
--- a/src/renderer/src/AixPPTist/src/configs/chart.ts
+++ b/src/renderer/src/AixPPTist/src/configs/chart.ts
--- a/src/renderer/src/AixPPTist/src/configs/element.ts
+++ b/src/renderer/src/AixPPTist/src/configs/element.ts
--- a/src/renderer/src/AixPPTist/src/configs/font.ts
+++ b/src/renderer/src/AixPPTist/src/configs/font.ts
--- a/src/renderer/src/AixPPTist/src/configs/hotkey.ts
+++ b/src/renderer/src/AixPPTist/src/configs/hotkey.ts
--- a/src/renderer/src/AixPPTist/src/configs/imageClip.ts
+++ b/src/renderer/src/AixPPTist/src/configs/imageClip.ts
--- a/src/renderer/src/AixPPTist/src/configs/latex.ts
+++ b/src/renderer/src/AixPPTist/src/configs/latex.ts
--- a/src/renderer/src/AixPPTist/src/configs/lines.ts
+++ b/src/renderer/src/AixPPTist/src/configs/lines.ts
--- a/src/renderer/src/AixPPTist/src/configs/shapes.ts
+++ b/src/renderer/src/AixPPTist/src/configs/shapes.ts
--- a/src/renderer/src/AixPPTist/src/configs/storage.ts
+++ b/src/renderer/src/AixPPTist/src/configs/storage.ts
--- a/src/renderer/src/AixPPTist/src/configs/symbol.ts
+++ b/src/renderer/src/AixPPTist/src/configs/symbol.ts
--- a/src/renderer/src/AixPPTist/src/configs/theme.ts
+++ b/src/renderer/src/AixPPTist/src/configs/theme.ts
--- a/src/renderer/src/AixPPTist/src/global.d.ts
+++ b/src/renderer/src/AixPPTist/src/global.d.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useAddSlidesOrElements.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useAddSlidesOrElements.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useAlignActiveElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useAlignActiveElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useAlignElementToCanvas.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useAlignElementToCanvas.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useCombineElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useCombineElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useCopyAndPasteElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useCopyAndPasteElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useCreateElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useCreateElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useDeleteElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useDeleteElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useExport.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useExport.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useGlobalHotkey.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useGlobalHotkey.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useHideElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useHideElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useHistorySnapshot.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useHistorySnapshot.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useImport.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useImport.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useLink.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useLink.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useLoadSlides.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useLoadSlides.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useLockElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useLockElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useMoveElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useMoveElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useOrderElement.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useOrderElement.ts
--- a/src/renderer/src/AixPPTist/src/hooks/usePasteEvent.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/usePasteEvent.ts
--- a/src/renderer/src/AixPPTist/src/hooks/usePasteTextClipboardData.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/usePasteTextClipboardData.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useScaleCanvas.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useScaleCanvas.ts
--- a/src/renderer/src/AixPPTist/src/hooks/useScreening.ts
+++ b/src/renderer/src/AixPPTist/src/hooks/useScreening.ts
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
lyc	19283456d4	Merge branch 'main' into lyc-dev	2024-11-19 10:01:09 +08:00
朱浩	fd0499cefa	Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk_WS	2024-11-19 09:59:59 +08:00
朱浩	4baf9f0062	PPTist接入	2024-11-19 09:59:34 +08:00
yangws	c1ce87f640	Merge pull request 'fix：样式修改；' (#42 ) from yangws_ws into main Reviewed-on: #42	2024-11-19 09:42:54 +08:00
小杨	da83bcec5c	fix：样式修改；	2024-11-19 09:42:19 +08:00