From 6ce51878f43ea95e4b00ba2c27917d8941e7ed4a Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 3 Feb 2025 13:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=83=A8=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=92=8C=E9=83=A8=E5=88=86=E5=BF=AB=E6=8D=B7=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Account/frontPage/cancelRenewal.vue       |  9 +++--
 src/component/DetailCopy/designDetail.vue     | 11 +++---
 src/component/DetailCopy/model/index.vue      |  2 ++
 .../DetailCopy/model/modelPosition.vue        |  6 ++--
 src/component/HomePage/ExportModel.vue        | 36 +++++++++----------
 src/lang/cn.ts                                |  3 +-
 src/lang/en.ts                                |  3 +-
 7 files changed, 39 insertions(+), 31 deletions(-)

diff --git a/src/component/Account/frontPage/cancelRenewal.vue b/src/component/Account/frontPage/cancelRenewal.vue
index b822754c..d78ea3f9 100644
--- a/src/component/Account/frontPage/cancelRenewal.vue
+++ b/src/component/Account/frontPage/cancelRenewal.vue
@@ -14,7 +14,7 @@
 				</div>
 			</div>
 			<div class="cancel_box_item cancel_box_item2">
-				<div class="modal_title_text">
+				<!-- <div class="modal_title_text">
 					<div>{{ $t('cancelRenewal.subscription') }}</div>
 					<div>
 						<i class="fi fi-sr-circle-xmark"></i>
@@ -28,7 +28,7 @@
 				<div class="tips">
 					<i class="fi fi-sr-triangle-warning"></i>
 					<div>{{ $t('cancelRenewal.DonWorry') }}</div>
-				</div>
+				</div> -->
 				<div class="button_box">
 					<div class="gallery_btn white" @click="subscribe">{{ $t('cancelRenewal.Continue') }}</div>
 					<div class="gallery_btn" @click="cancelSubscription">{{ $t('cancelRenewal.cancel') }}</div>
@@ -166,8 +166,13 @@ export default defineComponent({
 		>.cause_list{
 			> .cause_item{
 				display: flex;
+				align-items: center;
+				font-size: 1.6rem;
+				font-weight: 600;
 				input{
 					margin-right: 1rem;
+					width: 2.2rem;
+					height: 2.2rem;
 				}
 			}
 			>textarea{
diff --git a/src/component/DetailCopy/designDetail.vue b/src/component/DetailCopy/designDetail.vue
index a44841b1..0e5842e9 100644
--- a/src/component/DetailCopy/designDetail.vue
+++ b/src/component/DetailCopy/designDetail.vue
@@ -58,7 +58,7 @@
     
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,provide,nextTick,createVNode,toRefs, reactive} from 'vue'
+import { defineComponent,computed,onBeforeUnmount,provide,nextTick,createVNode,toRefs, reactive} from 'vue'
 import sketchLeft from './sketchLeft.vue'
 import model from './model/index.vue'
 
@@ -86,10 +86,10 @@ export default defineComponent({
 		})
 		const detailData = reactive({
 			designDetail:null,
-			designDetailShow:true,
+			designDetailShow:false,
 			loadingShow:false,
 		})
-		provide('designDetail',detailData.designDetail)
+		provide('designDetailData',detailData)
 		const closeModal = ()=>{
 			detailData.designDetailShow = false
 		}
@@ -118,9 +118,7 @@ export default defineComponent({
 							}
 						});
 					})
-					setTimeout(() => {
 					detailData.designDetail = rv
-					}, 2000);
 					detailData.designDetailShow = true
                     // this.store.commit('setDesignItemDetail',rv)
 					// this.deleteShow = false
@@ -151,6 +149,9 @@ export default defineComponent({
 		const setRevocation = (designItemDetail:any,data:any)=>{//设置撤销
 
 		}
+		onBeforeUnmount(()=>{
+			detailData.designDetail = null
+		})
         return{
 			...toRefs(detailData),
             closeModal,
diff --git a/src/component/DetailCopy/model/index.vue b/src/component/DetailCopy/model/index.vue
index f25b9c27..6c35de8e 100644
--- a/src/component/DetailCopy/model/index.vue
+++ b/src/component/DetailCopy/model/index.vue
@@ -39,6 +39,7 @@ export default defineComponent({
 			total:0,
 			pageSize:10,
 			currentPage:1,
+			designDetailData:inject('designDetailData') as any//父组件传过来的数据
 		})
 		const getDetailListDom = reactive({
 			libraryList:null as any,
@@ -73,5 +74,6 @@ export default defineComponent({
 		display: flex;
 		flex-direction: column;
 		padding-top: 3rem;
+		overflow: hidden;
 	}
 </style>
\ No newline at end of file
diff --git a/src/component/DetailCopy/model/modelPosition.vue b/src/component/DetailCopy/model/modelPosition.vue
index 5ee459fd..266d3055 100644
--- a/src/component/DetailCopy/model/modelPosition.vue
+++ b/src/component/DetailCopy/model/modelPosition.vue
@@ -8,7 +8,6 @@
 			<div class="detail_modal_item_front" v-for="item,index in frontBack.front"  @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))" @click="setpitch(item,index)"  :style="item.style">
 				<img :src="item.imageUrl" alt="">
 			</div>
-		{{ designDetail }}
 			<div class="designOpenrtion_btn">
 				<ul v-for="item,index in frontBack.front" :key="item" :class="{active:item.designOpenrtionBtn}" class="designOpenrtion_btn" :style="item.style" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))">
 					<li class="designOpenrtion_btn_top" @mousedown.stop="itemSizeMousedown('top',getMousePosition($event,false))" @touchstart.passive="itemSizeMousedown('top',getMousePosition($event,true))"></li>
@@ -40,14 +39,13 @@ export default defineComponent({
 				back:{},
 				body:{},
 			},
-			designDetail:inject('designDetail') as any//父组件传过来的数据
+			designDetailData:inject('designDetailData') as any//父组件传过来的数据
 		})
-		console.log(detailData.designDetail);
 		
 		const getDetailListDom = reactive({
 			libraryList:null as any,
 		})
-		watch(detailData.designDetail,(newValue,oldValue)=>{
+		watch(detailData.designDetailData.designDetail,(newValue,oldValue)=>{
 			console.log(123123);
 			
 		})
diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue
index 9738d8e3..ac49c9b3 100644
--- a/src/component/HomePage/ExportModel.vue
+++ b/src/component/HomePage/ExportModel.vue
@@ -188,10 +188,10 @@
 					<div class="exportCanvasBox_left_tool_item">
 						<i class="icon iconfont icon-chehui" @click="historyState('')" :title="isWindow?'Ctrl+Z':'Command+Z'"></i>
 						<i class="icon iconfont icon-fanchehui" @click="historyState('reverse')" :title="isWindow?'Ctrl+Shift+Z':'Command+Ctrl+Z'"></i>
-						<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:operation == 'pencil'}" :title="isWindow?'~':'~'"></i>
-						<i class="icon iconfont icon-caizhi" @click="setOperation('texture')" :class="{active:operation == 'texture'}"></i>
 						<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}" :title="isWindow?'M':'M'"></i>
-						<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}" :title="isWindow?'~':'~'"></i>
+						<i class="icon iconfont icon-bianji" @click="setOperation('pencil')" :class="{active:operation == 'pencil'}" :title="isWindow?'B':'B'"></i>
+						<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}" :title="isWindow?'E':'E'"></i>
+						<i class="icon iconfont icon-caizhi" @click="setOperation('texture')" :class="{active:operation == 'texture'}"></i>
 						
 						<label class="uploadImage" :title="isWindow?'Ctrl+O':'Command+O'">
 							<i class="fi fi-br-upload" ></i>
@@ -1217,9 +1217,13 @@ export default defineComponent({
 		let keyDown = []
 		const keysList = [
 			{
-				name:useI18.t('exportModel.PaintingEraser'),
-				winDowKey:'~',
-				macKey:'~',
+				name:useI18.t('exportModel.Painting'),
+				winDowKey:'B',
+				macKey:'B',
+			},{
+				name:useI18.t('exportModel.Eraser'),
+				winDowKey:'E',
+				macKey:'E',
 			},{
 				name:useI18.t('exportModel.Uncheck'),
 				winDowKey:'Ctrl + D',
@@ -1258,9 +1262,8 @@ export default defineComponent({
 				macKey:'Command + O',
 			},
 		]
-		let oldOperation = ''
 		let canvasKeyDown = (event) => {
-			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote','MetaLeft']
+			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','KeyE','KeyB','MetaLeft']
 			if(keys.indexOf(event.code) > -1){
 				event.preventDefault(); 
 			}
@@ -1297,12 +1300,13 @@ export default defineComponent({
 				}else if((keyDown.indexOf('ControlLeft') > -1 || keyDown.indexOf('MetaLeft') > -1) && event.code == 'KeyO'){
 					let input = document.querySelector('.uploadImage input')
 					input.click()
-				}else if(keyDown.indexOf('Backquote') > -1){
+				}else if(keyDown.indexOf('KeyB') > -1){
 					// if(operation.value == 'pencil' || operation.value == 'texture'){
-					let str = 'pencil'
-					if(operation.value == 'pencil')str = 'eraser'
-					oldOperation = operation.value
-					setOperation(str)
+					setOperation('pencil')
+					// }
+				}else if(keyDown.indexOf('KeyE') > -1){
+					// if(operation.value == 'pencil' || operation.value == 'texture'){
+					setOperation('eraser')
 					// }
 				}
 			}
@@ -1323,17 +1327,13 @@ export default defineComponent({
 			}
 		}
 		let canvasKeyUp = (event) =>{
-			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','Backquote','MetaLeft']
+			let keys = ['Enter','Delete','ControlLeft','KeyZ','ShiftLeft','KeyC','KeyV','BracketLeft','BracketRight','KeyI','KeyD','KeyO','KeyE','KeyB','MetaLeft']
 			if(keys.indexOf(event.code) > -1){
 				event.preventDefault(); 
 			}
 				keyDown = keyDown.filter(function(item) {
 					return event.code !== item;
 				})
-				if(event.code == 'Backquote' && oldOperation){
-					// setOperation(oldOperation)
-					oldOperation  = ''
-				}
 			}
 		let setCanvasKeyDown = (event)=>{
 			// let e = event || window.event
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 88738867..aba1932e 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -73,7 +73,8 @@ export default {
 		size:'区域',
 		density:'强度',
 		ShortcutKeys:'快捷键',
-		PaintingEraser:'绘图/橡皮',
+		Painting:'绘图',
+		Eraser:'橡皮',
 		Uncheck:'取消选择',
 		Revoke:'撤回',
 		Retreat:'反撤回',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index ab455113..1440dd52 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -73,7 +73,8 @@ export default {
 		size:'Size',
 		density:'Density',
 		ShortcutKeys:'Shortcut keys',
-		PaintingEraser:'Painting/Eraser',
+		Painting:'Painting',
+		Eraser:'Eraser',
 		Uncheck:'Uncheck',
 		Revoke:'Revoke',
 		Retreat:'Retreat',