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

src/components/Canvas/DepthCanvas/components/details-panel/fill-repeat.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="fill-repeat">
+	<div class="fill-repeat h">
 		<div>
 			<div class="title">Image</div>
 			<div class="content">
@@ -99,6 +99,8 @@
 <script setup lang="ts">
 	import { ref, inject, computed, nextTick, onBeforeUnmount } from 'vue'
 	import DepthOffsetTool from '../tools/depth-offset-tool.vue'
+	import DepthSlider from '../tools/depth-slider.vue'
+	import DepthInput from '../tools/depth-input.vue'
 	import { getTransformScaleAngle } from '../../manager/ObjectManager'
 	const objectManager = inject('objectManager') as any
 	const stateManager = inject('stateManager') as any
@@ -159,7 +161,7 @@
 		const options = {
 			opacity: opacity.value / 100
 		}
-		objectManager.updateOpacity(id.value, options, isRecord)
+		objectManager.updateProperty(id.value, options, isRecord)
 	}
 
 	stateManager.event.add('canvas:undo', updateData)

src/components/Canvas/DepthCanvas/components/details-panel/index.vue

@@ -10,6 +10,7 @@
 		<div class="content" v-if="isShow" v-show="show">
 			<!-- <basic-info :object="activeObject" /> -->
 			<fill-repeat :object="activeObject" v-if="isRepeat" />
+			<!-- <shape-setting :object="activeObject" v-if="isShape && !isRepeat" /> -->
 		</div>
 	</div>
 </template>
@@ -17,6 +18,7 @@
 <script setup lang="ts">
 	import { ref, inject, computed, watch, onMounted } from 'vue'
 	import FillRepeat from './fill-repeat.vue'
+	import ShapeSetting from './shape-setting.vue'
 	const props = defineProps({})
 	const layerManager = inject('layerManager') as any
 	const canvasManager = inject('canvasManager') as any
@@ -25,6 +27,8 @@
 	const layers = computed(() => layerManager.layers.value)
 	const activeObject = ref(null)
 
+	// const shapes = ['rect', 'line', 'path', 'triangle', 'polygon', 'ellipse']
+	// const isShape = computed(() => shapes.includes(activeObject.value?.type))
 	const isRepeat = computed(() => activeObject.value?.fill?.repeat === 'repeat')
 	const isShow = computed(() => isRepeat.value)
 
@@ -85,7 +89,12 @@
 			overflow-y: auto;
 			&:deep(> div) {
 				> div {
-					margin-bottom: 1.6rem;
+					margin-bottom: var(--details-item-margin-bottom, 1.6rem);
+					&:last-child {
+						margin-bottom: 0;
+					}
+				}
+				&.h > div {
 					> .title {
 						font-size: 1.4rem;
 						color: #000;
@@ -97,6 +106,20 @@
 						padding: 0 1.4rem;
 					}
 				}
+				&.v > div {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					> .label {
+						min-width: 6rem;
+						margin-right: 0.8rem;
+						font-size: 1.2rem;
+						text-align: right;
+					}
+					> .value {
+						flex: 1;
+					}
+				}
 			}
 		}
 	}

src/components/Canvas/DepthCanvas/components/details-panel/shape-setting.vue

@@ -0,0 +1,68 @@
+<template>
+	<div class="shape-setting v">
+		<!-- <div>
+			<div class="label">填充颜色</div>
+			<div class="value">
+				<el-color-picker
+					v-model="data.fill"
+					show-alpha
+					:predefine="['transparent', '#000', '#f00', '#0f0', '#00f']"
+					@change="onChange"
+				/>
+			</div>
+		</div> -->
+	</div>
+</template>
+
+<script setup lang="ts">
+	import { ref, inject, computed, nextTick, onBeforeUnmount, reactive } from 'vue'
+	import { ElColorPicker } from 'element-plus'
+	import { getTransformScaleAngle } from '../../manager/ObjectManager'
+	import DepthOffsetTool from '../tools/depth-offset-tool.vue'
+	import DepthSlider from '../tools/depth-slider.vue'
+	import DepthInput from '../tools/depth-input.vue'
+	const objectManager = inject('objectManager') as any
+	const stateManager = inject('stateManager') as any
+	const props = defineProps({
+		object: {
+			type: Object,
+			default: () => ({})
+		}
+	})
+	const id = computed(() => props.object.info.id)
+
+	const data = reactive({
+		fill: '',
+		stroke: '',
+		strokeWidth: 0
+	})
+	const updateData = async () => {
+		await nextTick()
+		data.fill = props.object.fill
+		data.stroke = props.object.stroke
+		data.strokeWidth = props.object.strokeWidth
+	}
+	updateData()
+
+	const onInpot = () => setPriority(false)
+	const onChange = () => setPriority(true)
+	const setPriority = (isRecord: boolean) => {
+		const options = { ...data }
+		objectManager.updateProperty(id.value, options, isRecord)
+	}
+
+	stateManager.event.add('canvas:undo', updateData)
+	stateManager.event.add('canvas:redo', updateData)
+	onBeforeUnmount(() => {
+		stateManager.event.remove('canvas:undo', updateData)
+		stateManager.event.remove('canvas:redo', updateData)
+	})
+</script>
+
+<style lang="less" scoped>
+	.shape-setting {
+		--details-item-margin-bottom: 1rem;
+		> div {
+		}
+	}
+</style>

src/components/Canvas/DepthCanvas/depth-canvas.vue

@@ -158,12 +158,16 @@
 
 	const exportCanvas = () => {
 		// 导出图片
-		exportCanvasToImage(canvasManager.canvas).then((url) => {
-			const a = document.createElement('a')
-			a.href = url
-			a.download = 'canvas.png'
-			a.click()
-		})
+		// exportCanvasToImage(canvasManager.canvas).then((url) => {
+		// 	const a = document.createElement('a')
+		// 	a.href = url
+		// 	a.download = 'canvas.png'
+		// 	a.click()
+		// })
+		const object = canvasManager.getCanvasDisUrlJSON()
+		console.log(object)
+		const canvas = canvasManager.processCanvasDisUrlJSON(object)
+		console.log(canvas)
 	}
 	// 导出到本地存储
 	const exportCanvasToLocalStorage = () => {

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

@@ -121,21 +121,12 @@ export class CanvasManager {
 		this.setupBrushEvents()
 
 		/** 测试-开始 */
-		// this.stateManager.setIsRecord(false)
-		// // 创建矩形
-		// const rect = await this.layerManager.createRectLayer({
-		// 	left: 400,
-		// 	top: 100,
-		// })
-		// //创建圆形
-		// const circle = await this.layerManager.createCircleLayer({
-		// 	left: 200,
-		// 	top: 200,
-		// })
-		// // 文字
-		// const text = await this.layerManager.createTextLayer('Hello World');
-		// this.layerManager.setActiveID(text.info.id)
-		// this.stateManager.setIsRecord(true)
+		this.stateManager.setIsRecord(false)
+		const rect = await this.layerManager.createRectLayer({ left: 200 })
+		await this.layerManager.createStarLayer({ left: 400 })
+		await this.layerManager.createArrowLayer({ left: 600 })
+		this.layerManager.setActiveID(rect.info.id)
+		this.stateManager.setIsRecord(true)
 		/** 测试-结束 */
 
 		this.resetZoom(false, true)// 画布居中
@@ -289,6 +280,39 @@ export class CanvasManager {
 			callback?.(true)
 		})
 	}
+	/** 导出画布为处理图片的JSON */
+	getCanvasDisUrlJSON() {
+		const canvas = this.canvas.toJSON()
+		const images = [];
+		var i = 0;
+		const create = (url) => {
+			const logo = `xxxxxxxx_${i++}_xxxxxxxx`;
+			images.push({ index: logo, url })
+			return logo
+		}
+		canvas.objects.forEach((object: any) => {
+			if (object.thumbnail) {
+				object.thumbnail = create(object.thumbnail)
+			}
+			if (object.src) {
+				object.src = create(object.src)
+			}
+			if (object.fill?.source) {
+				object.fill.source = create(object.fill.source)
+			}
+			if (object.info?.fill?.source) {
+				object.info.fill.source = create(object.info.fill.source)
+			}
+		})
+		return { canvas: JSON.stringify(canvas), images }
+	}
+	/** 处理JSON为正常画布 */
+	processCanvasDisUrlJSON(obj: { canvas: string, images: Object[] }) {
+		var json = obj.canvas;
+		const images = obj.images || []
+		images.forEach((v: any) => json = json.replace(new RegExp(v.index), v.url))
+		return JSON.parse(json)
+	}
 	dispose() {
 		this.animationManager?.dispose()
 		this.eventManager?.dispose()

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

@@ -173,6 +173,7 @@ export class LayerManager {
 			width: 100,
 			height: 100,
 			fill: '#000',
+			strokeWidth: 0,
 			...(options || {}),
 			info: {
 				id: createId("rect"),
@@ -212,6 +213,7 @@ export class LayerManager {
 		const ellipseObject = new fabric.Ellipse({
 			radius: 50,
 			fill: '#000',
+			strokeWidth: 0,
 			...(options || {}),
 			info: {
 				id: createId("ellipse"),
@@ -230,6 +232,7 @@ export class LayerManager {
 			width: 100,
 			height: 100,
 			fill: '#000',
+			strokeWidth: 0,
 			...(options || {}),
 			info: {
 				id: createId("triangle"),
@@ -249,6 +252,7 @@ export class LayerManager {
 		delete options.points
 		const starObject = new fabric.Polygon(getStarArr(width, height), {
 			fill: '#000',
+			strokeWidth: 0,
 			...(options || {}),
 			info: {
 				id: createId("star"),

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

@@ -207,18 +207,15 @@ export class ObjectManager {
 		}
 	}
 
-
-	/** 修改透明度
+	/** 修改属性
 	 * @param id 目标对象ID
-	 * @param options 透明度参数
-	 * @param options.opacity 透明度
+	 * @param options 参数
 	 * @param isRecord 是否记录
 	 */
-	async updateOpacity(id: string, options: any, isRecord: boolean) {
-		const object = this.getFillRepeatObject(id)
+	async updateProperty(id: string, options: any, isRecord: boolean) {
+		const object = this.canvasManager.getObjectById(id)
 		if (!object) return null
-		const opacity = options.opacity
-		object.set("opacity", opacity);
+		object.set(options);
 		this.canvasManager.renderAll()
 		if (isRecord) {
 			this.stateManager.recordState()

src/components/Canvas/DepthCanvas/manager/ShapeToolManager copy.ts

@@ -1,67 +0,0 @@
-import { OperationType, OperationTypes } from "../tools/layerHelper";
-import { fabric } from 'fabric-with-all'
-/** 矩形工具管理器 */
-export class RectToolManager {
-	// 管理器	
-	canvasManager: any
-	stateManager: any
-	layerManager: any
-
-	isDragging: boolean = false
-	startX: number = 0
-	startY: number = 0
-	demoObject: any
-	tools = [
-		OperationType.RECTANGLE
-	]
-	constructor(options) {
-		this.canvasManager = options.canvasManager
-		this.stateManager = options.stateManager
-		this.layerManager = options.layerManager
-	}
-	mouseDownEvent(e) {
-		this.isDragging = true
-		this.startX = e.absolutePointer.x
-		this.startY = e.absolutePointer.y
-		const rect = new fabric.Rect({
-			left: this.startX,
-			top: this.startY,
-			width: 0,
-			height: 0,
-			fill: '#000',
-			evented: false,
-		})
-		this.demoObject = rect
-		this.canvasManager.canvas.add(rect)
-		this.canvasManager.canvas.renderAll()
-	}
-	mouseMoveEvent(e) {
-		if (!this.isDragging) return;
-		var width = e.absolutePointer.x - this.startX
-		var height = e.absolutePointer.y - this.startY
-		var left = this.startX
-		var top = this.startY
-		if (width < 0) {
-			left += width
-			width = -width
-		}
-		if (height < 0) {
-			top += height
-			height = -height
-		}
-		this.demoObject.set({ width, height, left, top })
-		this.canvasManager.canvas.renderAll()
-	}
-	mouseUpEvent(e) {
-		if (!this.isDragging) return;
-		this.isDragging = false;
-		const object = this.demoObject.toJSON("evented")
-		if (object.width === 0) object.width = 100
-		if (object.height === 0) object.height = 100
-		this.layerManager.createRectLayer(object, true)
-		this.canvasManager.canvas.remove(this.demoObject)
-		this.canvasManager.canvas.renderAll()
-
-	}
-	dispose() { }
-}

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

@@ -120,6 +120,7 @@ export class ShapeToolManager {
 			width: 0,
 			height: 0,
 			fill: '#000',
+			strokeWidth: 0,
 		})
 		return rect
 	}
@@ -159,6 +160,7 @@ export class ShapeToolManager {
 			left: this.startX,
 			top: this.startY,
 			fill: '#000',
+			strokeWidth: 0,
 		})
 		return circle
 	}
@@ -180,6 +182,7 @@ export class ShapeToolManager {
 			width: 0,
 			height: 0,
 			fill: '#000',
+			strokeWidth: 0,
 		})
 		return triangle
 	}
@@ -203,6 +206,7 @@ export class ShapeToolManager {
 			fill: '#000',
 			strokeLineJoin: 'round',    // 圆角连接
 			strokeLineCap: 'round',     // 圆角端点
+			strokeWidth: 0,
 		});
 
 		return star

src/views/home/agent/components/Agent.vue

@@ -109,7 +109,7 @@
 			handleSendMessage({
 				text: initialData.text,
 				images: initialData.images,
-				useReport:initialData.useReport,
+				useReport: initialData.useReport,
 				tempImages: initialData.tempImages
 			})
 			// 更新 configParams
@@ -131,7 +131,10 @@
 		isPaused.value = false
 		isGenerating.value = true
 		params.message = message.text
-		params.useReport = message.useReport
+		if (message.hasOwnProperty('useReport')) {
+			params.useReport = message.useReport
+		}
+
 		params.imageUrlList = message.images || []
 
 		// 如果不是重新生成模式，则添加用户消息到列表
@@ -241,13 +244,11 @@
 					for (let event of events) {
 						if (!event.trim()) continue
 
-						// 解析事件名称（从 event:xxx 行）
-						const eventName =
-							event
-								.split(/\n/)
-								.find((line) => line.startsWith('event:'))
-								?.replace(/^event:\s*/, '')
-								?.trim() || ''
+						const eventName = event
+							.split(/\n/)
+							.find((line) => line.startsWith('event:'))
+							?.replace(/^event:\s*/, '')
+							?.trim()
 
 						if (!hasReportStarted && eventName === 'report') {
 							isGeneratingReport.value = true
@@ -281,7 +282,7 @@
 							break
 						}
 						if (eventName === 'todo') {
-							break
+							continue
 						}
 
 						let isNodeIdEvent = eventName === 'nodeId'
@@ -295,9 +296,10 @@
 							.filter((content) => content.startsWith('{') || content.startsWith('['))
 						// console.log('dataLInes', dataLines)
 						if (isNodeIdEvent) {
-							const versionID = event.split(/\n/)
-							.filter((line) => line.startsWith('data:'))
-							.map((line) => line.replace(/^data:\s*/, ''))[0]
+							const versionID = event
+								.split(/\n/)
+								.filter((line) => line.startsWith('data:'))
+								.map((line) => line.replace(/^data:\s*/, ''))[0]
 							params.versionID = versionID
 							projectStore.setProject({ nodeId: versionID })
 						}

src/views/home/components/Input.vue

@@ -37,7 +37,7 @@
 				<div class="left flex align-center">
 					<div class="agent-operate flex flex-center">
 						<el-popover
-							placement="top-end"
+							placement="top"
 							trigger="click"
 							popper-class="agent-plus-popover"
 						>
@@ -684,9 +684,11 @@
 		const payload = {
 			text: inputValue.value.trim(),
 			images: imageUrlList,
-			useReport: reportTags.value.length > 0,
 			tempImages: uploadedImages.value
 		}
+		if (reportTags.value.length > 0) {
+			payload.useReport = true
+		}
 		emits('send', payload)
 		// 发送后清空图片列表
 		uploadedImages.value = []
@@ -1367,7 +1369,9 @@
 		border: none !important;
 		padding: 0 !important;
 		margin-bottom: -1rem;
-		pointer-events: none;
+		width: fit-content !important;
+		min-width: initial !important;
+		//pointer-events: none;
 		.el-popper__arrow:before {
 			display: none;
 		}