Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!145 适配中文文件

Browse Source 
Merge pull request !145 from 德仔/develop
This commit is contained in:
德仔 2021-03-18 16:47:30 +08:00 committed by Gitee
commit e26a542987
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdiet-custom/src/main/java/com/stdiet/custom/domain/SysIngredentFile.java
View File

@ -13,6 +13,8 @@ public class SysIngredentFile {
String url; String url;
String previewUrl;
String name; String name;
Integer delFlag; Integer delFlag;

4
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysIngredientServiceImpl.java
View File

@ -40,7 +40,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
List<SysIngredentFile> imgList = ingredient.getImgList(); List<SysIngredentFile> imgList = ingredient.getImgList();
if (StringUtils.isNotEmpty(imgList)) { if (StringUtils.isNotEmpty(imgList)) {
for (SysIngredentFile file : imgList) { for (SysIngredentFile file : imgList) {
file.setUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl())); file.setPreviewUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl()));
} }
} }
} }
@ -61,7 +61,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
List<SysIngredentFile> imgList = ingredient.getImgList(); List<SysIngredentFile> imgList = ingredient.getImgList();
if (StringUtils.isNotEmpty(imgList)) { if (StringUtils.isNotEmpty(imgList)) {
for (SysIngredentFile file : imgList) { for (SysIngredentFile file : imgList) {
file.setUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl())); file.setPreviewUrl(AliyunOSSUtils.generatePresignedUrl(file.getUrl()));
} }
} }
} }

20
stdiet-ui/src/views/custom/ingredient/index.vue
View File

@ -592,6 +592,11 @@ export default {
).dictValue ).dictValue
) )
: []; : [];
this.form.imgList = this.form.imgList.map((obj) => ({
url: obj.previewUrl,
name: obj.name,
fileUrl: obj.url,
}));
this.open = true; this.open = true;
this.title = "修改食材"; this.title = "修改食材";
}); });
@ -604,7 +609,7 @@ export default {
params.imgList = params.imgList.reduce((arr, cur) => { params.imgList = params.imgList.reduce((arr, cur) => {
if (cur.url) { if (cur.url) {
arr.push({ arr.push({
url: cur.url.substring(0, cur.url.indexOf("?")), url: cur.fileUrl,
name: cur.name, name: cur.name,
}); });
} }
@ -668,11 +673,15 @@ export default {
}, },
handleOnUploadSuccess(res, file, fileList) { handleOnUploadSuccess(res, file, fileList) {
this.form.imgList = fileList.map((data) => { this.form.imgList = fileList.map((data) => {
const { name, url, response } = data; const { name, url, fileUrl, response } = data;
if (response) { if (response) {
return { url: response.previewUrl, name: response.fileName }; return {
url: response.previewUrl,
fileUrl: response.fileUrl,
name: response.fileName,
};
} }
return { url, name }; return { url, name, fileUrl };
}); });
// console.log({ // console.log({
// res, // res,
@ -682,9 +691,10 @@ export default {
// }); // });
}, },
handleOnUploadRemove(file, fileList) { handleOnUploadRemove(file, fileList) {
this.form.imgList = fileList.map(({ url, name }) => ({ this.form.imgList = fileList.map(({ url, fileUrl, name }) => ({
url, url,
name, name,
fileUrl,
})); }));
// console.log({ file, fileList, form: this.form }); // console.log({ file, fileList, form: this.form });
}, },