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

src/component/Canvas/CanvasEditor/fabric-canvas-events.text

@@ -0,0 +1,23 @@
+1. 初始化事件
+object:added：当新对象被添加到画布上时触发。
+object:removed：当对象从画布上移除时触发。
+selection:created：当选择对象时触发。
+selection:updated：当选择的对象被更新时触发。
+selection:cleared：当所有对象都被取消选择时触发。
+
+2. 鼠标事件
+mouse:down：鼠标按下时触发。
+mouse:move：鼠标移动时触发。
+mouse:up：鼠标释放时触发。
+mouse:over：鼠标移到画布上时触发。
+mouse:out：鼠标移出画布时触发。
+mouse:wheel：鼠标滚轮滚动时触发。
+
+3. 触摸事件（在触摸屏设备上）
+touch:start：触摸开始时触发。
+touch:move：触摸移动时触发。
+touch:end：触摸结束时触发。
+
+4. 键盘事件
+key:down：键盘按键按下时触发。
+key:up：键盘按键释放时触发。

src/component/Detail/detailLeft/module/currentList.vue

@@ -57,7 +57,8 @@ export default defineComponent({
 		const getDetailListData = reactive({
 			
 		})
-		const selectImgItem = (file:any)=>{
+		const selectImgItem = (data:any)=>{
+			let file = JSON.parse(JSON.stringify(data))
 			if(props.type != 'models'){
 				if(!file.resData?.minIOPath){
 					file.minIOPath = getMinioUrl(file?.imgUrl || file?.resData?.url)

src/component/Detail/model/modelNav.vue

@@ -12,6 +12,7 @@
 				<i class="fi fi-rr-trash" @click.stop="deleteDetailItem(item?.id)"></i>
 			</div>
 			<img :src="item.path" alt="">
+			<div class="type">{{ getTypeLang(item.type) }}</div>
 		</div>
     </div>
 	<div v-show="singleOveral.value == 'overall'" v-if="(currentDetailType == 'sketch' || currentDetailType == '') && designDetail.clothes.length < 5 && !isEditPattern.value" :class="{active:!selectDetail?.id && currentDetailType == 'sketch'}" class="add" @click="addSketch">
@@ -263,6 +264,11 @@ export default defineComponent({
 				emit('sketchSysToLibrary')
 			})
 		}
+		const getTypeLang = (type:any)=>{
+			// return navTypeList.find((item:any)=>item.value == type)?.label || type
+			let allPostition = store.state.Workspace.workspaceAllPosition
+			return allPostition.find(item => item.value === type)?.name
+		}
 		let observers = null as any
 		onMounted(()=>{
 			observers = new ResizeObserver(entries => {
@@ -284,6 +290,7 @@ export default defineComponent({
 			addSketch,
 			getMousePosition,
 			sketchSystemToLibrary,
+			getTypeLang,
         }
     },
 
@@ -310,6 +317,19 @@ export default defineComponent({
 			position: absolute;
 			background: #fff;
 			transition: top .3s;
+			overflow: hidden;
+			> .type{
+				position: absolute;
+				bottom: 0rem;
+				left: 0rem;
+				font-size: 1.2rem;
+				width: 100%;
+				text-align: center;
+				line-height: 2.4rem;
+				font-size: 1.4rem;
+				color: #fff;
+				background: #666666CC;
+			}
 			> .iconList{
 				position: absolute;
 				top: 1rem;
@@ -377,6 +397,5 @@ export default defineComponent({
     .modelNav{
 		position: relative;
 		width: 12rem;
-		
 	}
 </style>

src/component/HomePage/renew.vue

@@ -265,17 +265,17 @@
 	  @completePayment="cancelDsign"
 	  type="renew"
 	></payMethod>
-</template>
+  </template>
   
-<script lang="ts">
-import { defineComponent, computed, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
-import { message } from "ant-design-vue";
-import payMethod from "@/component/Pay/payMethod.vue";
-import { useStore } from "vuex";
-import { useI18n } from "vue-i18n";
-import { Https } from "@/tool/https";
-import md5 from "md5";
-export default defineComponent({
+  <script lang="ts">
+  import { defineComponent, computed, reactive, toRefs, onMounted, onBeforeUnmount } from "vue";
+  import { message } from "ant-design-vue";
+  import payMethod from "@/component/Pay/payMethod.vue";
+  import { useStore } from "vuex";
+  import { useI18n } from "vue-i18n";
+  import { Https } from "@/tool/https";
+  import md5 from "md5";
+  export default defineComponent({
 	components: {
 	  payMethod,
 	},
@@ -547,10 +547,10 @@ export default defineComponent({
 		window.open(url);
 	  },
 	},
-});
-</script>
-<style lang="less" scoped>
-.renew {
+  });
+  </script>
+  <style lang="less" scoped>
+  .renew {
 	:deep(.ant-modal-body) {
 	  padding: 0;
 	}
@@ -958,5 +958,6 @@ export default defineComponent({
 		background: rgba(0, 0, 0, 0);
 	  }
 	}
-}
-</style>
+  }
+  </style>
+  

src/component/WorksPage/newScaleImage.vue

@@ -452,7 +452,7 @@ export default defineComponent({
 				return message.info(t('newScaleImage.jsContent2'))
 			}
 			let id = await getWorks(imgData.scaleImageData.id)
-        	router.push(`/home?history=${id}`)
+        	router.push(`/home/history/${id}`)
         	// router.push({name:'home',params: {id:imgData.scaleImageData.id,type:'Works'}})
 			store.commit('setChooseIsDesign',false)
         	// router.push({name:'homePage',params: {id:imgData.scaleImageData.userLikeGroupSourceId,type:'Works'}})