|
@@ -465,7 +465,7 @@ export const save = async (
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
//todo 传参数
|
|
//todo 传参数
|
|
- const file:any = await upload(blob, true, comData.name + '.' +dayjs().format('YYYYMMDDHHMMss'), `/大屏/组件/默认`,'new');
|
|
|
|
|
|
+ const file:any = await upload(blob, true, comData.name , `/大屏/组件/默认`,'new');
|
|
if (!file) {
|
|
if (!file) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
@@ -572,25 +572,31 @@ export const save = async (
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
let conflict = 'new';
|
|
let conflict = 'new';
|
|
- if (data.id && type === SaveType.Save) {
|
|
|
|
- // conflict = undefined
|
|
|
|
- if (data.image && !(await delImage(data.image))) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ // if (data.id && type === SaveType.Save) {
|
|
|
|
+ // // conflict = undefined
|
|
|
|
+ // if (data.image && !(await delImage(data.image))) {
|
|
|
|
+ // return;
|
|
|
|
+ // }
|
|
|
|
+ // }
|
|
|
|
|
|
const file:any = await upload(
|
|
const file:any = await upload(
|
|
blob,
|
|
blob,
|
|
true,
|
|
true,
|
|
// 更新是缩略图路径一般为/file/2023/1025/1/1/新建项目_dfa573a5
|
|
// 更新是缩略图路径一般为/file/2023/1025/1/1/新建项目_dfa573a5
|
|
// data.image?.split('/').pop()更新操作项目名不变
|
|
// data.image?.split('/').pop()更新操作项目名不变
|
|
- data.name + '.' + dayjs().format('YYYYMMDDHHMMss'),
|
|
|
|
|
|
+ data.name,// + '.' + dayjs().format('YYYYMMDDHHMMss'),
|
|
`/大屏/${thumbFolder}/${data.folder || '默认'}`,
|
|
`/大屏/${thumbFolder}/${data.folder || '默认'}`,
|
|
conflict
|
|
conflict
|
|
);
|
|
);
|
|
if (!file) {
|
|
if (!file) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ if (data.id && type === SaveType.Save) {
|
|
|
|
+ // conflict = undefined
|
|
|
|
+ if (data.image && !(await delImage(data.image))) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
// 缩略图
|
|
// 缩略图
|
|
data.image = file.url;
|
|
data.image = file.url;
|