fix

2025-07-24 09:26:27 +08:00
parent 53b4a15b92
commit 1dfb5a9d8f
12 changed files with 190 additions and 53 deletions
--- a/src/component/home/design/collection/ColorboardUpload.vue
+++ b/src/component/home/design/collection/ColorboardUpload.vue
@@ -254,29 +254,32 @@ export default defineComponent({
 		collectionStep:{
 			handler(newVal,oldVal){
 				if(newVal != 3)return
-				const backIcon = document.createElement('div');
-				if(backIcon.classList.contains('vc-sketch-color-wrap'))return
-				backIcon.classList.add('vc-sketch-color-wrap')
-				let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
-				dropperDom.appendChild(backIcon);
-				backIcon.addEventListener('click', async ()=>{
-					try {
-						const dropper = new EyeDropper();
-						const result = await dropper.open();
-						let hex = result.sRGBHex.replace("#", "");
-						// 将十六进制颜色码拆分成红、绿、蓝三个部分
-						const r = parseInt(hex.substring(0, 2), 16);
-						const g = parseInt(hex.substring(2, 4), 16);
-						const b = parseInt(hex.substring(4, 6), 16);
-						this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
-						// 返回RGB格式的字符串
-						// return `rgb(${r}, ${g}, ${b})`;
-						// box.style.backgroundColor = label.textContent = result.sRGBHex;
-					} catch (e) {
-						message.info(this.t('ColorboardUpload.jsContent1'))
-					}
+				nextTick(()=>{
+					const backIcon = document.createElement('div');
+					if(backIcon.classList.contains('vc-sketch-color-wrap'))return
+					backIcon.classList.add('vc-sketch-color-wrap')
+					let dropperDom = document.getElementsByClassName("colorboard_upload_modal")[0].getElementsByClassName('vc-chrome-fields-wrap')[0]
+					dropperDom.appendChild(backIcon);
+					backIcon.addEventListener('click', async ()=>{
+						try {
+							const dropper = new EyeDropper();
+							const result = await dropper.open();
+							let hex = result.sRGBHex.replace("#", "");
+							// 将十六进制颜色码拆分成红、绿、蓝三个部分
+							const r = parseInt(hex.substring(0, 2), 16);
+							const g = parseInt(hex.substring(2, 4), 16);
+							const b = parseInt(hex.substring(4, 6), 16);
+							this.selectColor = {rgba:{r:r,g:g,b:b,a:1},hex:result.sRGBHex}
+							// 返回RGB格式的字符串
+							// return `rgb(${r}, ${g}, ${b})`;
+							// box.style.backgroundColor = label.textContent = result.sRGBHex;
+						} catch (e) {
+							message.info(this.t('ColorboardUpload.jsContent1'))
+						}
+					})
 				})
-			}
+			},
+			immediate: true,
 		},
 		selectColor:{
 			handler(newVal,oldVal){
--- a/src/component/home/design/collection/PrintboardUpload.vue
+++ b/src/component/home/design/collection/PrintboardUpload.vue
@@ -152,7 +152,7 @@
 							</label>
 						</div>
 						<div class="moreBox" @click.stop> 
-							<more level1Type="Printboard" :moreList="['edit','down','enlargement','delete']" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
+							<more level1Type="Printboard" :moreList="['edit','down','enlargement','delete']" :list="printboardList" :item="item" :index="index" @deleteFile="deleteFile" @scaleImage="scaleImage"></more>
 						</div>
 					</div>
 				</div>
@@ -927,14 +927,26 @@ export default defineComponent({
 					position: relative;
 					cursor: pointer;
 					text-align: center;
+					&:hover{
+						.moreBox,.pin_block{
+							opacity: 1;
+						}
+						:deep(.operate_file_block){
+							opacity: 1;
+						}
+					}
+					:deep(.operate_file_block){
+						opacity: 0;
+						transition: all 0.2s ease-in-out;
+					}
 					.moreBox{
 						position: absolute;
 						right: 1rem;
 						top: 1rem;
-						// opacity: 0;
+						opacity: 0;
 						width: 3rem;
 						height: 3rem;
-						transition: all 0.3s ease-in-out;
+						transition: all 0.2s ease-in-out;
 					}
 					&.modal_imgItem:nth-child(even) {
 					}
@@ -953,6 +965,8 @@ export default defineComponent({
 						border-radius: 3rem;
 						background: rgba(0,0,0,.7);
 						color: #fff;
+						opacity: 0;
+						transition: all 0.2s ease-in-out;
 						>label{
 							width: 100%;
 							height: 100%;
@@ -978,8 +992,10 @@ export default defineComponent({
 							}
 						}
 						span{
-							font-size: 1.4rem;
+							font-size: 1.2rem;
 							font-weight: 600;
+							text-overflow: ellipsis;
+							white-space: nowrap;
 						}
 					}
 					&.active{
--- a/src/component/home/design/collection/SketchboardUpload.vue
+++ b/src/component/home/design/collection/SketchboardUpload.vue
@@ -879,14 +879,26 @@ export default defineComponent({
 					position: relative;
 					cursor: pointer;
 					text-align: center;
+					&:hover{
+						.moreBox,.pin_block{
+							opacity: 1;
+						}
+						:deep(.operate_file_block){
+							opacity: 1;
+						}
+					}
+					:deep(.operate_file_block){
+						opacity: 0;
+						transition: all 0.2s ease-in-out;
+					}
 					.moreBox{
 						position: absolute;
 						right: 1rem;
 						top: 1rem;
-						// opacity: 0;
+						opacity: 0;
 						width: 3rem;
 						height: 3rem;
-						transition: all 0.3s ease-in-out;
+						transition: all 0.2s ease-in-out;
 					}
 					&.modal_imgItem:nth-child(even) {
 						margin-right: 0;
@@ -909,6 +921,8 @@ export default defineComponent({
 						border-radius: 3rem;
 						background: rgba(0,0,0,.7);
 						color: #fff;
+						opacity: 0;
+						transition: all 0.2s ease-in-out;
 						>label{
 							width: 100%;
 							height: 100%;
--- a/src/component/home/design/collection/more.vue
+++ b/src/component/home/design/collection/more.vue
@@ -3,7 +3,8 @@
 		<i class="fi fi-br-menu-dots-vertical" @click.stop="openList"></i>
 		<div class="more_box" v-show="show">
 			<div class="item" v-if="moreList.includes('edit')" @click.stop="setMore('edit')">
-				<i class="fi fi-rr-edit"></i>
+				<!-- <i class="fi fi-rr-edit"></i> -->
+				<i class="fi fi-br-pen-swirl"></i>
 				<div class="text">{{ $t('more.edit') }}</div>
 			</div>
 			<div class="item" v-if="moreList.includes('enlargement')" @click.stop="setMore('enlargement')">
@@ -30,6 +31,7 @@ import { Https } from "@/tool/https";
 import { useStore } from "vuex";
 import { useI18n } from 'vue-i18n'
 import { downloadIamge } from "@/tool/util";
+import { Modal } from "ant-design-vue";
 import modalCanvas from "@/component/modules/generalModalCanvas.vue";

 export default defineComponent({
@@ -38,6 +40,7 @@ export default defineComponent({
    },
 	props:{
 		moreList:{type:Array,default:()=>[]},
+		list:{type:Array,default:()=>[]},
 		item:{type:Object,default:()=>{}},
 		index:{type:Number,default:0},
 		level1Type:{type:String,default:''},
@@ -45,6 +48,7 @@ export default defineComponent({
 	emits:['deleteFile','scaleImage'],
    setup(props,{emit}) {
        const store = useStore();
+		const {t} = useI18n()
 		const data = reactive({
 			show:false
 		})
@@ -73,9 +77,50 @@ export default defineComponent({
 			}
 			setShow()
 		}
-		const saveBase64Img = (rv)=>{
-			console.log(rv)
-			console.log(props.item)
+		const saveBase64Img = async (rv)=>{
+			let isOverlay = false
+			await new Promise<void>((resolve, reject) => {
+				Modal.confirm({
+					title: t('scaleImage.overlayOrNot'),
+					icon: createVNode(ExclamationCircleOutlined),
+					okText: 'Yes',
+					cancelText: 'No',
+					mask:false,
+					centered:true,
+					onOk() {
+						resolve()
+						isOverlay = true
+
+					},
+					onCancel(){
+						isOverlay = false
+						resolve()
+					}
+				});
+			})
+			let data = {
+				"base64": rv,
+				"category": props.item.categoryValue,
+				"gender": store.state.Workspace.probjects.sex,
+				"originalId":props.item.resData.id,
+				"isOverride":isOverlay,
+				originalIdSource:props.item.resData.designType,
+				type:props.level1Type,
+			}
+			Https.axiosPost(Https.httpUrls.modifySketch, data).then(
+				(rv) => {
+					rv.imgUrl = rv.url
+					rv.status = 'Success'
+					rv.resData = {
+						id:rv.id,
+						designType:props.item.resData.designType,
+					}
+					rv.category = props.item?.category
+					rv.categoryValue = props.item?.categoryValue
+					isOverlay?(props.list[props.index] = rv):(props.list.unshift(rv))
+				}
+			).catch(res=>{
+			});
 		}
        return{
 			...toRefs(dataDom),