From 24d6d5887f2dd1ae18dffb2a4bedaf9ed5e3b2f7 Mon Sep 17 00:00:00 2001 From: lyc Date: Mon, 9 Dec 2024 10:56:04 +0800 Subject: [PATCH] pptlist edit --- env.d.ts | 5 +++++ src/renderer/src/AixPPTist/src/plugins/icon.ts | 6 ++++-- .../views/Editor/CanvasTool/MaterialDialog.vue | 3 +-- .../src/views/Editor/CanvasTool/index.vue | 16 ++++++++++++---- src/renderer/src/components/ai-kolors/index.vue | 14 ++++++++++++-- 5 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 env.d.ts diff --git a/env.d.ts b/env.d.ts new file mode 100644 index 0000000..32b911d --- /dev/null +++ b/env.d.ts @@ -0,0 +1,5 @@ +declare module '*.vue' { + import { ComponentOptions } from 'vue' + const componentOptions: ComponentOptions + export default componentOptions +} \ No newline at end of file diff --git a/src/renderer/src/AixPPTist/src/plugins/icon.ts b/src/renderer/src/AixPPTist/src/plugins/icon.ts index 2bffc0e..bc6e035 100644 --- a/src/renderer/src/AixPPTist/src/plugins/icon.ts +++ b/src/renderer/src/AixPPTist/src/plugins/icon.ts @@ -125,7 +125,8 @@ import { User, Switch, More, - Material + Material, + AddPicture } from '@icon-park/vue-next' export interface Icons { @@ -256,7 +257,8 @@ export const icons: Icons = { IconUser: User, IconSwitch: Switch, IconMore: More, - IconMaterial: Material + IconMaterial: Material, + IconAddPicture: AddPicture } export default { diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue index 8295fe0..dd648a3 100644 --- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue +++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/MaterialDialog.vue @@ -11,6 +11,7 @@ 插入 + @@ -93,11 +94,9 @@ const GetUrlParameters = (parameters) => { } } } - return resData; } - const proxyToBase64 = (url)=> { const dourl = GetUrlParameters(url) console.log(dourl,'dourl') diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue index 1334688..6896137 100644 --- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue +++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue @@ -83,6 +83,7 @@ +
@@ -121,14 +122,18 @@ @update="data => { onhtml2canvas(data); classWorkTaskVisible = false }" /> - + - - + + + +
@@ -156,6 +161,7 @@ import Popover from '../../../components/Popover.vue' import PopoverMenuItem from '../../../components/PopoverMenuItem.vue' import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/index.vue' import MaterialDialog from './MaterialDialog.vue' +import TextCreateImg from '@/components/ai-kolors/index.vue' const mainStore = useMainStore() const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore) @@ -269,8 +275,10 @@ const insertMaterial = (item: MaterialParams) =>{ createImageElement(data) } materiaVisible.value = false - } + +// 文生图 +const imgVisible = ref(false)