zhuhao_dev #33

Merged
zhuhao merged 8 commits from zhuhao_dev into main 2024-07-17 21:25:06 +08:00
2 changed files with 16 additions and 8 deletions
Showing only changes of commit f7ca6079ae - Show all commits

View File

@ -50,7 +50,12 @@
</div> </div>
</template> </template>
<template #reference> <template #reference>
<div class="talk-uploader-wrap" draggable="true" style="margin: auto"> <div
v-show="uploaderStore.uploadList && uploaderStore.uploadList.length > 0"
class="talk-uploader-wrap"
draggable="true"
style="margin: auto"
>
<svg class="icon" aria-hidden="true" font-size="50px"> <svg class="icon" aria-hidden="true" font-size="50px">
<use xlink:href="#icon-yunwenjian-"></use> <use xlink:href="#icon-yunwenjian-"></use>
</svg> </svg>
@ -70,8 +75,7 @@ export default {
data() { data() {
return { return {
timer: null, timer: null,
uploadDatas: { uploadDatas: {},
},
uploadUrl: import.meta.env.VITE_APP_BASE_API + '/smarttalk/file/upload', uploadUrl: import.meta.env.VITE_APP_BASE_API + '/smarttalk/file/upload',
headers: { headers: {
Authorization: 'Bearer ' + getToken() Authorization: 'Bearer ' + getToken()
@ -95,9 +99,9 @@ export default {
}, 1000) }, 1000)
}, },
mounted() { mounted() {
ipcRenderer.send('get-root-file-path'); ipcRenderer.send('get-root-file-path')
ipcRenderer.once('get-root-file-path-reply', (e, path) => { ipcRenderer.once('get-root-file-path-reply', (e, path) => {
window.rootTalkFilePath = path; window.rootTalkFilePath = path
}) })
}, },
methods: { methods: {
@ -120,7 +124,10 @@ export default {
}, },
onSuccess(res, file, files) { onSuccess(res, file, files) {
this.removeUploadFile(file.uid) this.removeUploadFile(file.uid)
ipcRenderer.send('copy-file-default',{ source:file.raw.path, destination:res.resData.fileNewName}) ipcRenderer.send('copy-file-default', {
source: file.raw.path,
destination: res.resData.fileNewName
})
file.callback(res) file.callback(res)
}, },
beforeUpload(file) { beforeUpload(file) {

View File

@ -284,6 +284,7 @@ export default {
res.resData.levelSecondId == _this.uploadData.levelSecondId && res.resData.levelSecondId == _this.uploadData.levelSecondId &&
res.resData.levelThirdId == _this.uploadData.levelThirdId res.resData.levelThirdId == _this.uploadData.levelThirdId
) { ) {
res.resData.async = true;
_this.currentFileList.unshift(res.resData) _this.currentFileList.unshift(res.resData)
ElMessage({ ElMessage({
type: 'success', type: 'success',