Skip to content

Commit

Permalink
fix: url中文问题
Browse files Browse the repository at this point in the history
  • Loading branch information
@BQXBQX
BQXBQX committed Apr 5, 2024
1 parent b434ca5 commit f367c6b
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 42 deletions.
26 changes: 13 additions & 13 deletions src/pages/workDetail/component/Uploader/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ function Uploader(props: any) {
onChange(info: any) {
console.log('onChange', info)
},
// customRequest(options: any) {
// console.log('options', options)
// const { onSuccess, onError, file, onProgress } = options
// uploadWork(Number(props.competitionId), props.inputName, file, onProgress).then((res) => {
// console.log(res)
// if (res.data.errCode === null) {
// onSuccess(res, file)
// message.success({
// content: file.name + ' 上传成功',
// })
// }
// })
// },
customRequest(options: any) {
console.log('options', options)
const { onSuccess, onError, file, onProgress } = options
uploadWork(Number(props.competitionId), props.inputName, file, onProgress).then((res) => {
console.log(res)
if (res.data.errCode === null) {
onSuccess(res, file)
message.success({
content: file.name + ' 上传成功',
})
}
})
},
headers: { Token: localStorage.getItem('approval-system-token') },
}
return (
Expand Down
75 changes: 47 additions & 28 deletions src/pages/workDetail/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,7 @@ function WorkDetail() {

const getFileName = (url: string) => {
const nameList = url.split('/')
const fileName = nameList[nameList.length - 1].split('-').slice(2).join('-')
// console.log(fileName)
const fileName = decodeURIComponent(nameList[nameList.length - 1].split('-').slice(2).join('-').split("?")[0])
return fileName
}

Expand Down Expand Up @@ -186,6 +185,7 @@ function WorkDetail() {
}, 20000)
getWorkInfo(Number(id)).then((res) => {
setWorkData(res.data.data)
console.log("test3", res.data.data);
if (res.data.data === null) {
if (res.data.errMsg === '您还未上传作品' && JSON.stringify(remoteSchema) !== '{}') {
setLoading(false)
Expand Down Expand Up @@ -242,6 +242,19 @@ function WorkDetail() {
}
})
}
const onRemove = (inputName: string) => {
form.setValueByPath(inputName, null)
setFileList((prev) => {
return {
...prev,
[inputName]: [],
}
})
}
const handleDownload = (file: string) => {
console.log(file)
// downloadFile()
}
const localProps: any = {
accept: props.accept,
maxCount: '1',
Expand Down Expand Up @@ -276,26 +289,32 @@ function WorkDetail() {
form.setValueByPath(props.inputName, null)
}
},
// customRequest(options: any) {
// console.log('options', options)
// const { onSuccess, onError, file, onProgress } = options
// uploadWork(Number(id), props.inputName, file, onProgress).then((res) => {
// console.log('upload res: ', res)
// if (res.data.errCode === null) {
// onSuccess(res, file)
// message.success({
// content: file.name + ' 上传成功',
// })
// setFileList((prev) => {
// return {
// ...prev,
// [props.inputName]: [{ ...prev[props.inputName][0], url: res.data.data.url, status: 'done' }],
// }
// })
// form.setValueByPath(props.inputName, res.data.data.url)
// }
// })
// },
customRequest(options: any) {
const temp = options.file as File
getLicense(temp.name, props.inputName, id as unknown as number).then(res => {
console.log(res);
const { onSuccess, file } = options
console.log(res.data.data.url);
fetch(res.data.data.url, {
method: "put",
body: temp
}).then(_ => {
onSuccess && onSuccess(res)
message.success({
content: (file as File).name + ' 上传成功',
})
form.setValueByPath(props.inputName, res)
setFileList((prev) => {
return {
...prev,
[props.inputName]: [{ ...prev[props.inputName][0], url: res.data.data.url, status: 'done' }],
}
})
})
}).catch(err => {
console.log(err);
})
},
headers: { Token: localStorage.getItem('approval-system-token') },
fileList: localFileList,
showUploadList: { showDownloadIcon: true },
Expand Down Expand Up @@ -331,33 +350,33 @@ function WorkDetail() {
[props.inputName]: [{ ...prev[props.inputName][0], url: res.data.data.url, status: 'done' }],
}
})
console.log("test", res.data.data.url);
form.setValueByPath(props.inputName, res.data.data.clearUrl)
})
}).catch(err => {
console.log(err);
})
// console.log('options', options)
// const { onSuccess, onError, file, onProgress } = options
// uploadWork(Number(id), props.inputName, file as File, onProgress).then((res) => {
// console.log('upload res: ', res)
// if (res.data.errCode === null) {
// if (onSuccess)
// onSuccess(res)
// message.success({
// content: (file as File).name + ' 上传成功',
// })
// setFileList((prev) => {
// return {
// ...prev,
// [props.inputName]: [{ ...prev[props.inputName][0], url: res.data.data.url, status: 'done' }],
// }
// })
// console.log("test2", res.data.data.url);
// form.setValueByPath(props.inputName, res.data.data.url)
// }
// })
}}
onDownload={(file) => {
console.log(file)
if (file.url !== undefined) {
console.log(file.url);
downloadFile(file.url)
}
}}
Expand Down Expand Up @@ -417,9 +436,10 @@ function WorkDetail() {
const formDataList = Object.entries(formData)
console.log(formDataList)
for (const [key, value] of formDataList) {
const tempValue: string = value as string
submitReadyData.push({
input: key,
content: value,
content: tempValue.split("?")[0],
})
}
uploadWorkSchema(Number(id), submitReadyData).then((res) => {
Expand Down Expand Up @@ -511,7 +531,6 @@ function WorkDetail() {
）代表该选项必填，为了保证您顺利参赛，请按照比赛举办方要求仔细填写本表单提交项目信息
</div>
<FormRender
// debug
widgets={{ customUpload: Uploader }}
form={form}
disabled={loading}
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"target": "es2015",
"target": "es5",
"lib": ["dom", "dom.iterable", "esnext"],
"sourceMap": true,
"inlineSources": true,
Expand Down

0 comments on commit f367c6b

Please sign in to comment.