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

Merge branch 'StableVersion' of http://18.167.251.121:10003/aidlab/aida_front into StableVersion

Browse Source
This commit is contained in:
李志鹏
2025-11-05 16:33:21 +08:00
parent 4030f54334 430332481e
commit 8478c57c08
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
View File

@@ -75,7 +75,7 @@
</a-table> </a-table>
</div> </div>
<itemAffiliateDetail ref="itemAffiliateDetail"></itemAffiliateDetail> <itemAffiliateDetail ref="itemAffiliateDetail"></itemAffiliateDetail>
<editAudit ref="editAudit"></editAudit> <editAudit ref="editAudit" @searchHistoryList="searchHistoryList"></editAudit>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">

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

@@ -70,7 +70,7 @@ export class AddLayerCommand extends Command {
undo() { undo() {
// 从图层列表删除该图层 // 从图层列表删除该图层
this.layers.value = [...this.beforeLayers]; this.layers.value = [...this.beforeLayers];
// 恢复原活动图层 // 恢复原活动图层
this.activeLayerId.value = this.oldActiveLayerId; this.activeLayerId.value = this.oldActiveLayerId;
@@ -564,12 +564,11 @@ export class RemoveLayerCommand extends Command {
} }
} }
layer.fabricObjects?.forEach((fabric) => { layer.fabricObjects?.forEach((fabric) => {
const { object } = findObjectById(this.canvas, fabric.id); const { object } = findObjectById(this.canvas, fabric.id);
if (object && !allObjects.includes(object)) { if (object && !allObjects.includes(object)) {
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/Canvas/CanvasEditor/index.vue
View File

@@ -706,7 +706,7 @@ function removeLayer(layerId) {
return; return;
} }
layerManager.removeLayer(layerId); layerManager.removeLayer(layerId);
// 此处删除画布上内容导致撤回操作无效（多余） // 此处删除画布上内容导致撤回操作无效（多余）
// if (canvasManager && canvasManager.canvas) { // if (canvasManager && canvasManager.canvas) {
// const layerToRemove = layers.value.find((l) => l.id === layerId); // const layerToRemove = layers.value.find((l) => l.id === layerId);

2
src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js
View File

@@ -5,7 +5,7 @@
export class LiquifyCPUManager { export class LiquifyCPUManager {
constructor(options = {}) { constructor(options = {}) {
this.config = { this.config = {
gridSize: 8, // 稍微增大网格提高性能 gridSize: 100, // 稍微增大网格提高性能
maxStrength: 200, // 适度降低最大强度 maxStrength: 200, // 适度降低最大强度
smoothingIterations: 1, // 增加平滑处理 smoothingIterations: 1, // 增加平滑处理
relaxFactor: 0.05, // 适度松弛 relaxFactor: 0.05, // 适度松弛

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

@@ -391,7 +391,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,