Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/FiDA_Front

src/components/Canvas/DepthCanvas/components/depth-header-tools.vue

@@ -13,10 +13,16 @@
 				>
 					<svg-icon :name="v.icon" :size="v.iconSize" />
 				</span>
-				<span class="more" v-if="v.child" @click="onClickMore(v)">
+				<span class="more" v-if="v.child" @click="onClickMore(v)" :bind-id="v.name">
 					<svg-icon name="dc-down_arrow2" size="7" />
 				</span>
-				<div v-if="v.child" class="child" v-show="v.showChild">
+				<div
+					v-if="v.child"
+					class="child"
+					v-show="v.showChild"
+					:bind-id="v.name"
+					v-clidk-besides="() => (v.showChild = false)"
+				>
 					<div v-for="(v_, i_) in v.child" :key="i_" @click="onClickTool(v_, v)">
 						<span v-show="tool === v_.name" class="dui">
 							<svg-icon name="dc-dui" size="9" />

src/components/Canvas/DepthCanvas/components/tools/depth-select.vue

@@ -1,7 +1,13 @@
 <template>
 	<div class="depth-select">
 		<el-select :model-value="modelValue" @change="onChange" v-bind="attrs">
-			<el-option v-for="v in list" :key="v.value" :label="v.label" :value="v.value" />
+			<el-option
+				v-for="v in list"
+				:key="v.value"
+				:label="v.label"
+				:value="v.value"
+				:disabled="modelValue === v.value"
+			/>
 		</el-select>
 	</div>
 </template>
@@ -22,6 +28,7 @@
 <style scoped lang="less">
 	.depth-select {
 		&:deep(.el-select) {
+			--el-input-text-color: #000;
 			--el-select-input-font-size: 1.2rem;
 			.el-select__wrapper {
 				font-size: 1.2rem;
@@ -46,6 +53,11 @@
 				height: 3rem;
 				line-height: 3rem;
 				font-size: 1.2rem;
+				color: #000;
+				font-weight: 400;
+				&.is-disabled {
+					color: #909399;
+				}
 			}
 		}
 	}

src/components/Canvas/DepthCanvas/manager/AISelectboxToolManager.ts

@@ -199,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.height === 0) return
+
 		this.clearIndicatorObject()
 		this.canvasManager.canvas.renderAll()