diff --git a/frontend/components.d.ts b/frontend/components.d.ts index c50a25e..54c8dee 100644 --- a/frontend/components.d.ts +++ b/frontend/components.d.ts @@ -114,6 +114,7 @@ declare module 'vue' { LockDesktop: typeof import('./src/components/desktop/LockDesktop.vue')['default'] Magnet: typeof import('./src/components/taskbar/Magnet.vue')['default'] MenuBar: typeof import('./src/components/window/MenuBar.vue')['default'] + MenuFooter: typeof import('./src/components/window/MenuFooter.vue')['default'] MenuList: typeof import('./src/components/taskbar/MenuList.vue')['default'] MessageCenterPop: typeof import('./src/components/taskbar/MessageCenterPop.vue')['default'] MessageIcon: typeof import('./src/components/taskbar/MessageIcon.vue')['default'] diff --git a/frontend/src/components.d.ts b/frontend/src/components.d.ts index f8e16d6..a679a71 100644 --- a/frontend/src/components.d.ts +++ b/frontend/src/components.d.ts @@ -41,6 +41,7 @@ declare module 'vue' { LockDesktop: typeof import('./components/desktop/LockDesktop.vue')['default'] Magnet: typeof import('./components/taskbar/startMenu/components/Magnet.vue')['default'] MenuBar: typeof import('./components/window/components/MenuBar.vue')['default'] + MenuFooter: typeof import('./components/window/components/MenuFooter.vue')['default'] MenuList: typeof import('./components/taskbar/startMenu/components/MenuList.vue')['default'] MessageCenterPop: typeof import('./components/taskbar/popover/MessageCenterPop.vue')['default'] MessageIcon: typeof import('./components/taskbar/barUnit/MessageIcon.vue')['default'] diff --git a/frontend/src/components/window/IframeFile.vue b/frontend/src/components/window/IframeFile.vue index f7daa3e..aa1874a 100644 --- a/frontend/src/components/window/IframeFile.vue +++ b/frontend/src/components/window/IframeFile.vue @@ -9,6 +9,7 @@ import { base64ToBuffer, isBase64 } from "@/util/file"; import { isShareFile } from "@/util/sharePath.ts"; import { inject, onMounted, onUnmounted, ref, toRaw } from "vue"; import { askAi } from "@/hook/useAi"; +import { useChooseStore } from "@/stores/choose"; const SP = getSplit(); const sys: any = inject("system"); @@ -34,9 +35,10 @@ const props = defineProps({ // let currentPath = ref('') const storeRef = ref(null); let hasInit = false; + +const choose = useChooseStore(); const eventHandler = async (e: MessageEvent) => { const eventData = e.data; - if (eventData.type == props.eventType) { let data = JSON.parse(eventData.data); let title = data.title; @@ -51,10 +53,9 @@ const eventHandler = async (e: MessageEvent) => { if (title.indexOf('.' + ext) > -1) { title = title.replace('.' + ext, ""); } - // console.log(ext) - // console.log(data) if (win.config && win.config.path) { path = win.config.path; + //去除重复文件名后的(1) let fileTitleArr = path.split(SP).pop().split("."); let oldExt = fileTitleArr.pop(); @@ -66,6 +67,7 @@ const eventHandler = async (e: MessageEvent) => { path = path.replace("." + oldExt, "." + ext); } } else { + choose.saveFile('选择地址','*') path = `${SP}C${SP}Users${SP}Desktop${SP}${title}.${ext}`; } //判断是否共享文件,以及编辑权限 @@ -219,15 +221,6 @@ const eventHandler = async (e: MessageEvent) => { "*" ); } - // else if (eventData.type == 'aiReciver') { - // storeRef.value?.contentWindow?.postMessage( - // { - // type: eventData.type, - // data: '----经过AI处理后的数据-----', - // }, - // "*" - // ); - // } }; //删除本地暂存的文件密码 const delFileInputPwd = async () => { diff --git a/frontend/src/components/window/MenuFooter.vue b/frontend/src/components/window/MenuFooter.vue new file mode 100644 index 0000000..e4083b8 --- /dev/null +++ b/frontend/src/components/window/MenuFooter.vue @@ -0,0 +1,54 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/components/window/WindowTemplate.vue b/frontend/src/components/window/WindowTemplate.vue index 4c0c297..a15f824 100644 --- a/frontend/src/components/window/WindowTemplate.vue +++ b/frontend/src/components/window/WindowTemplate.vue @@ -51,11 +51,14 @@ @mousedown.stop.prevent="startScale($event, border.type)" @touchstart.stop.passive="startScale($event, border.type)" > +