Merge remote-tracking branch 'origin/StableVersion' into develop

src/views/HomeView/HomeView.vue

@@ -33,6 +33,9 @@
 									<div class="button_first button_margin" @click="recollection()">
 										{{ $t('HomeView.Edit') }}
 									</div>
+									<div class="button_first button_margin" @click="resetCollection()">
+										{{ $t('HomeView.Reset') }}
+									</div>
 								</div>
 								<div class="left_info_content scroll_style">
 									<div class="left_info_content_body" ref="collection_canvas">
@@ -556,6 +559,13 @@ export default defineComponent({
 			collectionModal.recollection();
 		},
 
+		resetCollection(){
+			this.store.commit("clearAllData");
+			this.store.commit("clearAllCollection");
+			this.store.commit("setAllBoardDataChoose",{});
+			this.store.commit("clearShowSketchboard",{});
+			
+		},
 		//完成设计
 		finishCollection() {
 			let _this = this;

src/views/HomeView/Works.vue

@@ -201,7 +201,6 @@ export default defineComponent({
 		let likeFile = (item:any,type:string) => {
 		}
 		let getImgScale = (index:any)=>{
-			console.log(newScaleImage.value);
 			newScaleImage.value.scaleImageMask = true
 			newScaleImage.value.init(filter.worksList,index)
 		}

src/views/HomeView/library.vue

@@ -875,7 +875,27 @@ export default defineComponent({
 						centered:true,
 						onOk() {
 							data.deleteModelConfirm = 1
-							
+							let id = _this.store.state.Workspace.workspace.id
+							Https.axiosGet(Https.httpUrls.workspaceDetail,{params:{id:id}}).then((rv: any) => {
+								if (rv) {
+									if(rv.position == "Overall"){
+										rv.overallSingle = false
+									}else{
+										rv.overallSingle = true
+									}
+									if(rv.sexEnum.name == 'Female'){
+										rv.mannequinUrl = rv.femalePresignedUrl
+										rv.mannequinType = rv.mannequinFemaleType
+										rv.mannequinId = rv.mannequinFemaleId
+									}else if(rv.sexEnum.name == 'Male'){
+										rv.mannequinUrl = rv.malePresignedUrl
+										rv.mannequinType = rv.mannequinMaleType
+										rv.mannequinId = rv.mannequinMaleId
+									}
+									
+									_this.store.commit("setWorkspace", rv);
+								}
+							})
 							_this.confirmDeletePic(data,index)
 						},
 						onCancel(){
@@ -1052,7 +1072,7 @@ export default defineComponent({
 		ifMaximumLength(){
 			clearTimeout(this.inputTime)
 			this.inputTime = setTimeout(()=>{
-				if(this.captionGeneration?.split(/\s+/).length > 75){
+				if(this.captionGeneration?.split(/\s+/).length > 250){
 					(this.$refs.inputShowText as any).innerHTML = this.t('LibraryPage.maximumLength')
 					this.inputShow = true
 				}else{

src/views/LoginPage.vue

@@ -529,6 +529,7 @@ export default defineComponent({
 			this.store.commit("clearAllData");
 			this.store.commit("clearAllCollection");
 			this.store.commit("setAllBoardDataChoose",{});
+			this.store.commit("clearShowSketchboard",{});
 			this.$router.push("/home");
         },
 		//获取当前语言