Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -335,9 +335,22 @@ export default defineComponent({
|
||||
let canvasData = JSON.parse(canvasJSON)
|
||||
|
||||
if(!canvasData)return
|
||||
canvasData.canvas.objects.forEach((objectsItem:any) => {
|
||||
if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
|
||||
});
|
||||
function deepProcessObjects(data:any, callback:any) {
|
||||
if (!Array.isArray(data)) return data;
|
||||
return data.map(item => {
|
||||
callback(item)
|
||||
const processedItem = {...item};
|
||||
if (processedItem.objects &&
|
||||
Array.isArray(processedItem.objects) &&
|
||||
processedItem.objects.length > 0) {
|
||||
processedItem.objects = deepProcessObjects(processedItem.objects, callback);
|
||||
}
|
||||
return processedItem;
|
||||
});
|
||||
}
|
||||
canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
|
||||
if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
|
||||
})
|
||||
let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
|
||||
let formData = new FormData();
|
||||
formData.append("file", blob, "data.json");
|
||||
|
||||
@@ -206,11 +206,22 @@ export default defineComponent({
|
||||
if(!canvasJSON)return
|
||||
if(!store.state.Workspace.probjects?.id)return
|
||||
let canvasData = JSON.parse(canvasJSON)
|
||||
console.log(canvasData)
|
||||
canvasData.canvas.objects.forEach((objectsItem:any) => {
|
||||
if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
|
||||
|
||||
});
|
||||
function deepProcessObjects(data:any, callback:any) {
|
||||
if (!Array.isArray(data)) return data;
|
||||
return data.map(item => {
|
||||
callback(item)
|
||||
const processedItem = {...item};
|
||||
if (processedItem.objects &&
|
||||
Array.isArray(processedItem.objects) &&
|
||||
processedItem.objects.length > 0) {
|
||||
processedItem.objects = deepProcessObjects(processedItem.objects, callback);
|
||||
}
|
||||
return processedItem;
|
||||
});
|
||||
}
|
||||
canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
|
||||
if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
|
||||
})
|
||||
let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
|
||||
let formData = new FormData();
|
||||
formData.append("file", blob, "data.json");
|
||||
|
||||
Reference in New Issue
Block a user