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

适配中文文件

Browse Source 
Merge pull request  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
stdiet-custom/src/main/java/com/stdiet/custom
domain
SysIngredentFile.java
service/impl
SysIngredientServiceImpl.java
stdiet-ui/src/views/custom/ingredient
index.vue

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

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

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

@ -40,7 +40,7 @@ public class SysIngredientServiceImpl implements ISysIngredientService {
List<SysIngredentFile> imgList = ingredient.getImgList();
if (StringUtils.isNotEmpty(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();
if (StringUtils.isNotEmpty(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

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