aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/StableVersion' into dev_vite

Browse Source
This commit is contained in:
X1627315083
2025-11-06 16:13:51 +08:00
parent 787a9d5f29 2899f4d6fe
commit ef1378a1ad
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/component/Canvas/CanvasEditor/commands/LayerCommands.js
View File

@@ -569,7 +569,6 @@ export class RemoveLayerCommand extends Command {
allObjects.push(object); allObjects.push(object);
} }
}); });
// 递归收集子图层的对象 // 递归收集子图层的对象
if (layer.children && Array.isArray(layer.children)) { if (layer.children && Array.isArray(layer.children)) {
layer.children.forEach((childLayer) => { layer.children.forEach((childLayer) => {

2
src/component/Detail/DesignDetail.vue
View File

@@ -403,7 +403,7 @@ export default defineComponent({
rv:rv, rv:rv,
fun:setRevocation fun:setRevocation
} }
detailData.designDetail.oldModel = detailData.designDetail.newModel if(detailData?.designDetail?.newModel)detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel))
delete detailData.designDetail.newModel delete detailData.designDetail.newModel
store.commit('DesignDetail/setPraeview',value) store.commit('DesignDetail/setPraeview',value)
detailData.loadingShow = false detailData.loadingShow = false

1
src/component/home/design/collection/PrintboardUpload.vue
View File

@@ -1,6 +1,5 @@
<template> <template>
<div class="printboard_upload_modal" :class="[driver__.driver?'showEvents':'']"> <div class="printboard_upload_modal" :class="[driver__.driver?'showEvents':'']">
<div class="printboard_left_upload modal_left"> <div class="printboard_left_upload modal_left">
<div class="left_upload_header"> <div class="left_upload_header">
<div class="upload_header_item"> <div class="upload_header_item">

3
src/component/home/tools/toProduct/index.vue
View File

@@ -587,8 +587,9 @@ export default defineComponent({
toProductImageVOList:selectArr, toProductImageVOList:selectArr,
// userLikeGroupId:upload.value.userlikeGroupId, // userLikeGroupId:upload.value.userlikeGroupId,
projectId:productImgData.selectObject.id, projectId:productImgData.selectObject.id,
modelName:obj.elementType == 'Relight'?'flux':speed.speedData.value, modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value,
direction:RelightDirection.value, direction:RelightDirection.value,
ageGroup:store.state.Workspace.probjects.ageGroup,
brightenValue:productImgData.brightenValue, brightenValue:productImgData.brightenValue,
imageStrength:(100 - imageStrength)/100, imageStrength:(100 - imageStrength)/100,