2023-11-8-dist

src/assets/style/style.css

@@ -344,6 +344,12 @@ li {
   width: 0.57142857rem;
   height: 0.91428571rem;
 }
+.ant-checkbox {
+  font-size: 1.4rem;
+}
+.ant-checkbox-checked::after {
+  border: 1px solid rgba(0, 0, 0, 0.65);
+}
 .ant-select-multiple .ant-select-selection-search {
   height: 100%;
 }

src/assets/style/style.less

@@ -395,6 +395,12 @@ ul,li{
 		}
 	}
 }
+.ant-checkbox{
+	font-size: 1.4rem;
+}
+.ant-checkbox-checked::after{
+	border: 1px solid rgba(0,0,0,.65);
+}
 .ant-select-multiple .ant-select-selection-search{
 	height: 100%;
 }

src/component/Detail/DesignDetail.vue

@@ -230,7 +230,7 @@ export default defineComponent({
 		},
 		designDetailShow:{
 			handler: function(newval) {
-				this.removeRevocation()
+				// this.removeRevocation()
 			}
 		}
 	},
@@ -319,8 +319,8 @@ export default defineComponent({
 							item.printObject.prints = [{}]
 						}
 					})
-					
                     this.store.commit('setDesignItemDetail',rv)
+					this.removeRevocation()
 					this.setRevocation(rv,'')
 					if(rv.others[0].layersObject.length != 0){
 						this.body = false
@@ -441,9 +441,9 @@ export default defineComponent({
 		setRevocation(designItemDetail:any,data:any){//设置撤销
 			let itemDetail = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designItemDetail))
 			// let data = JSON.parse(JSON.stringify(this.store.state.DesignDetailModule.designPreviewData))
-			let revocation = JSON.parse((sessionStorage.getItem("revocation") as any))
+			let revocation:any = JSON.parse((sessionStorage.getItem("revocation") as any))
 			let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any))
-			if(revocation?.[0]?.designItemDetail.designItemId != itemDetail.designItemId || sessionStorage.getItem("revocation") == null){
+			if(revocation?.[0]?.designItemDetail.designItemId != itemDetail.designItemId || revocation?.[0]?.designItemDetail.designItemId == undefined){
 				// sessionStorage.setItem('revocation', JSON.stringify([]));
 				// sessionStorage.setItem('oppositeRevocation',JSON.stringify([]));
 				revocation = []
@@ -453,6 +453,7 @@ export default defineComponent({
 				data:data?data:''
 			}
 			revocation.push(detail)
+			
 			this.revocationShow = revocation?.length
 			this.oppositeRevocationShow = 0
 			sessionStorage.setItem('revocation', JSON.stringify(revocation));

src/component/LibraryPage/setLabel.vue

@@ -8,16 +8,27 @@
 		:centered="true"
 		@onCancel="clearSetLabel"
 	>
-		<div>
-			<ul>
-				<li></li>
+		<div class="setLabel_centent">
+			<ul class="setLabel_label1" v-for="item1 in options" :key="item1.id">
+				<li class="label1_title">
+					<a-checkbox
+						v-model:checked="item1.checkAll"
+						:indeterminate="indeterminate"
+						@change="onCheckAllChange(item1.children,$event)"
+						>
+						{{ item1.label }}
+					</a-checkbox>
+					<ul class="setLabel_label2" >
+						<a-checkbox-group v-model:value="checkedList" :options="item1.children" />
+					</ul>
+				</li>
 			</ul>
 		</div>
 	</a-modal>
     
 </template>
 <script lang="ts">
-import { defineComponent,ref,createVNode} from 'vue'
+import { defineComponent,ref,createVNode,watch,reactive} from 'vue'
 import { Https } from "@/tool/https";
 import {dataURLtoFile,base64toFile} from "@/tool/util"
 import { getCookie } from "@/tool/cookie";
@@ -34,10 +45,12 @@ export default defineComponent({
     setup() {
 		let cropperTime:any = ref()
 		let multiple = ref(false)
+		let indeterminate = ref(true)
 		const options: CascaderProps['options'] = [
 			{
 				label: 'Light',
 				value: 'light',
+				checkAll:false,
 				children: new Array(20)
 				.fill(null)
 				.map((_, index) => ({ label: `Number ${index}`, value: index })),
@@ -45,9 +58,11 @@ export default defineComponent({
 			{
 				label: 'Bamboo',
 				value: 'bamboo',
+				checkAll:false,
 				children: [
 				{
 					label: 'Little',
+					checkAll:false,
 					value: 'little',
 					children: [
 					{
@@ -67,12 +82,15 @@ export default defineComponent({
 				],
 			},
 		];
+		let checkedList = ref([])
+
 		let {t} = useI18n()
         return {
 			multiple,
+			indeterminate,
 			value: ref<string[]>([]),
 			options,
-
+			checkedList,
 			t
         }
     },
@@ -84,20 +102,7 @@ export default defineComponent({
 	mounted(){
 	},
 	watch: {
-		sex:{
-			handler(newVal:any,oldVal:any){
-				// let imgbox:any = this.$refs.imgbox
-				// let imgBoxSizeBG = imgbox?.getElementsByClassName('cropper-view-box-BG')?.[0]
-				// if(imgBoxSizeBG){
-				// 	if(newVal == 'Male'){
-				// 		imgBoxSizeBG.style.background = `url(./image/maleBG.png) no-repeat 0 0 / 100% 100%`
-				// 	}else{
-				// 		imgBoxSizeBG.style.background = `url(./image/femaleBG.png) no-repeat 0 0 / 100% 100%`
-				// 	}
-				// }
-
-			},
-		},
+		
 	},
     methods:{
       init(str:any){
@@ -111,6 +116,15 @@ export default defineComponent({
 	  },
 	  clearSetLabel(){
 		this.setLabelShow = false
+	  },
+	  onCheckAllChange(item:any,e:any){
+			console.log(this.checkedList);
+			this.checkedList = item
+			// this.checkedList.forEach((item)=>{
+			// 	item.
+			// })
+			this.checkedList= e.target.checked ? item : [];
+			this.indeterminate= false;
 	  }
     
     }
@@ -118,7 +132,20 @@ export default defineComponent({
 </script>
 <style lang="less">
 .library_setLabel{
-
+	.setLabel_centent{
+		display: flex;
+		flex-direction: column;
+		ul{
+			display: flex;
+			li{
+				width: 100%;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+			}
+		}
+	}
 }
 
 </style>

src/views/HomeView.vue

@@ -557,7 +557,7 @@ export default defineComponent({
 					
 				}
 				if (this.showDesignMark) {
-					this.designProgress = rv * 100;
+					this.designProgress = rv;
 					if(rv == 100){
 						setTimeout(() => {
 							this.showDesignMark = false 

src/views/LibraryPage.vue

@@ -1004,12 +1004,12 @@ export default defineComponent({
 					button2.classList.add('started_btn','cascader_btn2')
 					let divMax:any = document.createElement("div")
 					divMax.classList.add('cascader_btn_max')
-					button1.textContent = '新增'
-					button2.textContent = '删除'
+					button1.textContent = 'redact'
+					// button2.textContent = '删除'
 					button1.addEventListener('click',this.addLabel,false)
-					button2.addEventListener('click',this.removeLabel,false)
+					// button2.addEventListener('click',this.removeLabel,false)
 					divMax.appendChild(button1)
-					divMax.appendChild(button2)
+					// divMax.appendChild(button2)
 					cascaderChild?.insertAdjacentElement("afterbegin", divMax);
 					
 					// cascader.addEventListener('click',this.cascaderClick)
@@ -1020,10 +1020,7 @@ export default defineComponent({
 		// 	console.log(e.target)
 		// },
 		setLabel1(value:any,selectedOptions:any){
-			console.log(value,selectedOptions);
 			let myCascader:any = this.$refs.cascader
-			console.log(myCascader);
-			
 		},
 		setClick(){
 			this.labelOpen = false
@@ -1036,11 +1033,11 @@ export default defineComponent({
 			setLabel.init('add')
 			this.labelOpen = false
 		},
-		removeLabel(){
-			let setLabel:any = this.$refs.setLabel
-			setLabel.init('remove')
-			this.labelOpen = false
-		}
+		// removeLabel(){
+		// 	let setLabel:any = this.$refs.setLabel
+		// 	setLabel.init('remove')
+		// 	this.labelOpen = false
+		// }
     }
 })
 </script>