From 8a88e0dd1d41efb5b1bc008ac8aeddaefed4907f Mon Sep 17 00:00:00 2001
From: lzp <zpli@aidlab.hk>
Date: Mon, 30 Mar 2026 16:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E5=BA=A6=E7=94=BB=E5=B8=83=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                                   |  2 +-
 .../DepthCanvas/components/depth-header-tools.vue  |  4 ++--
 src/components/Canvas/DepthCanvas/depth-canvas.vue |  4 ++++
 src/components/Canvas/DepthCanvas/index.vue        |  8 +++++---
 .../DepthCanvas/manager/AISelectboxToolManager.ts  |  5 +++--
 .../Canvas/DepthCanvas/manager/CanvasManager.ts    | 14 ++++++++++++++
 6 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/.env.development b/.env.development
index f844c2d..8eca712 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 # VITE_APP_URL = http://192.168.31.82:8771
 VITE_APP_URL = http://18.167.251.121:10015
 # VITE_APP_URL = http://192.168.31.118:8080
-# VITE_APP_URL = http://192.168.31.82:8755
+VITE_APP_URL = http://192.168.31.82:8755
 VITE_GOOGLE_CLIENT_ID = 216037134725-7q8vqp0ohtmohlosltkfg7bd2v29rm5a.apps.googleusercontent.com
diff --git a/src/components/Canvas/DepthCanvas/components/depth-header-tools.vue b/src/components/Canvas/DepthCanvas/components/depth-header-tools.vue
index d6b8ec3..2926d68 100644
--- a/src/components/Canvas/DepthCanvas/components/depth-header-tools.vue
+++ b/src/components/Canvas/DepthCanvas/components/depth-header-tools.vue
@@ -38,10 +38,10 @@
 		<button class="export" @click="emit('import-local')">
 			<span class="text">本地导入</span>
 		</button> -->
-		<button class="workbench" @click="onWorkbench">
+		<!-- <button class="workbench" @click="onWorkbench">
 			<span class="icon"><svg-icon name="dc-workbench" size="20" /></span>
 			<span class="text">{{ $t('DepthCanvas.save') }}</span>
-		</button>
+		</button> -->
 	</div>
 </template>
 
diff --git a/src/components/Canvas/DepthCanvas/depth-canvas.vue b/src/components/Canvas/DepthCanvas/depth-canvas.vue
index 8bccf98..e4a1fe2 100644
--- a/src/components/Canvas/DepthCanvas/depth-canvas.vue
+++ b/src/components/Canvas/DepthCanvas/depth-canvas.vue
@@ -189,6 +189,10 @@
 		// const canvas = canvasManager.processCanvasDisUrlJSON(object)
 		// console.log(canvas)
 	}
+
+	defineExpose({
+		onWorkbench
+	})
 </script>
 <style lang="less">
 	@import '@vue-flow/core/dist/style.css';
diff --git a/src/components/Canvas/DepthCanvas/index.vue b/src/components/Canvas/DepthCanvas/index.vue
index 002b998..1d4f7d5 100644
--- a/src/components/Canvas/DepthCanvas/index.vue
+++ b/src/components/Canvas/DepthCanvas/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<fullscreen-dialog v-model="dialogVisible" @close="onClose" hide-destroy>
 		<div class="canvas-box">
-			<depth-canvas :config="config" @workbench="onWorkbench" />
+			<depth-canvas ref="depthCanvasRef" :config="config" @workbench="onWorkbench" />
 		</div>
 	</fullscreen-dialog>
 </template>
@@ -22,6 +22,7 @@
 		onWorkbench(options) {},
 		onClose() {}
 	})
+	const depthCanvasRef = ref(null)
 
 	const open = async (options) => {
 		config.value = options
@@ -61,8 +62,9 @@
 	}
 	// 关闭
 	const onClose = () => {
-		dialogVisible.value = false
-		config.value.onClose?.()
+		depthCanvasRef.value.onWorkbench()
+		// dialogVisible.value = false
+		// config.value.onClose?.()
 	}
 
 	defineExpose({
diff --git a/src/components/Canvas/DepthCanvas/manager/AISelectboxToolManager.ts b/src/components/Canvas/DepthCanvas/manager/AISelectboxToolManager.ts
index fda5d43..c757890 100644
--- a/src/components/Canvas/DepthCanvas/manager/AISelectboxToolManager.ts
+++ b/src/components/Canvas/DepthCanvas/manager/AISelectboxToolManager.ts
@@ -100,6 +100,7 @@ export class AISelectboxToolManager {
 		this.demoObject = null
 	}
 	createIndicatorObject() {
+		this.clearIndicatorObject()
 		const rect = new fabric.Rect({
 			left: this.startX,
 			top: this.startY,
@@ -198,8 +199,8 @@ export class AISelectboxToolManager {
 		if (!this.isDragging) return;
 		this.isDragging = false;
 		const object = this.indicatorObject.toJSON("evented")
-		if (object.width === 0) object.width = 100
-		if (object.height === 0) object.height = 100
+		// if (object.width === 0) object.width = 100
+		// if (object.height === 0) object.height = 100
 		this.clearIndicatorObject()
 		this.canvasManager.canvas.renderAll()
 
diff --git a/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts b/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts
index c73ac96..0039710 100644
--- a/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts
+++ b/src/components/Canvas/DepthCanvas/manager/CanvasManager.ts
@@ -153,6 +153,7 @@ export class CanvasManager {
 		this.canvas.add(obj)
 		const id = obj?.info?.id || ""
 		if (id) {
+			this.sortActiveObject(obj)
 			await this.layerManager.updateLayers(!!obj.info.parentId)
 			this.renderAll()
 			await this.layerManager.updateLayerThumbnailsById(id)
@@ -167,6 +168,19 @@ export class CanvasManager {
 			this.renderAll()
 		}
 	}
+	/** 根据激活对象排序当前对象 */
+	async sortActiveObject(object: any) {
+		const activeID = this.layerManager.activeID.value;
+		if (!activeID) return
+		const activeObject = this.getObjectById(activeID)
+		if (!activeObject) return
+		const parentId = activeObject.info?.parentId
+		if (!object.info.parentId) object.info.parentId = parentId
+		const index = this.getObjects().indexOf(activeObject)
+		this.canvas.moveTo(object, index + 1)
+		// await this.sortObjectByIds(ids, isRecord)
+	}
+
 
 	/** 更新子图层裁剪区域 */
 	async updateSubLayerClipPath() {