Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/home/design/tools.vue

@@ -54,6 +54,7 @@
 					<div class="canvas" ref="canvasBox">
 						<editCanvas 
 							@changeCanvas="changeCanvas" 
+							@trigger-library="triggerLibrary"
 							:canvasJSON="canvasJSON"
 							ref="editCanvas">
 							<template #existsImageList>
@@ -76,6 +77,12 @@
 			<a-spin size="large" />
 		</div>
 	</a-modal>
+	<SelectImages 
+	ref="selectImages"
+	@select="handleImageSelect"
+	:api="Https.httpUrls.queryLibraryPage"
+	isLibrary
+	/>
 </template>
 <script lang="ts">
 import { defineComponent,computed,ref,provide,nextTick,inject,toRefs, reactive, onBeforeMount} from 'vue'
@@ -92,11 +99,12 @@ import ExistsImageList from "@/component/Canvas/ExistsImageList/index.vue";
 import JSZip, { forEach } from "jszip";
 import publish from "@/component/WorksPage/publish.vue";
 import canvasAA from '@/component/Canvas/canvasExample.vue'
+import SelectImages from '@/component/common/SelectImages.vue'
 
 
 export default defineComponent({
 	components:{
-		toProductRelight,poseTransfer,editCanvas,ExistsImageList,publish,canvasAA
+		toProductRelight,poseTransfer,editCanvas,ExistsImageList,publish,canvasAA,SelectImages
 	},
 	props:{
 		source:{
@@ -303,6 +311,10 @@ export default defineComponent({
 				data.canvasSelectList.push(obj)
 			}
 		}
+		const selectImages = ref(null)
+		const triggerLibrary = ()=>{
+			selectImages.value.init()
+		}
 		const handleImageSelect = (list:any)=>{
 			list.forEach(item => {
 				dataDom.editCanvas.addImageToLayer(item)
@@ -445,6 +457,9 @@ export default defineComponent({
 			share,
 			setPublish,
 			unLike,
+			triggerLibrary,
+			Https,
+			selectImages
 		}
 	},
 	provide() {

src/component/home/newProject/workspace.vue

@@ -106,6 +106,7 @@ import { position } from 'html2canvas/dist/types/css/property-descriptors/positi
 import { id } from 'element-plus/es/locale';
 import { message } from 'ant-design-vue';
 import {projectList} from '@/tool/listData'
+import { formatTime } from "@/tool/util";
 export default defineComponent({
     components:{
 		habitSetStyle,generalMenu,setBrandDNA
@@ -202,7 +203,7 @@ export default defineComponent({
 			// }
 			console.log(data.selectObject)
 			let value = {
-				name:data.selectObject.name,
+				name:data.selectObject.name ? data.selectObject.name : formatTime(new Date().getTime() / 1000, 'YYYY-MM-DD hh:mm:ss'),
 				process:props.httpWorkflowType,
 				styleId:data.show.style?data.selectObject.styleId:null,
 				id:data.selectObject.id == -1?'':data.selectObject.id,