This commit is contained in:
X1627315083
2023-12-28 10:36:48 +08:00
parent e5c1b510bd
commit edf86ce906
16 changed files with 144 additions and 93 deletions

View File

@@ -235,7 +235,7 @@ export default defineComponent({
let printModel = ref({
num:'',
optype:false,
name:useI18n().t('Generate.Model')+'1'
name:useI18n().t('Generate.Model'+1)
})
let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
// let sketchCatecoryList:any = ref([])
@@ -435,7 +435,7 @@ export default defineComponent({
this.printModel = {
num : num,
optype:false,
name:this.t('Generate.Model')+num
name:this.t('Generate.Model'+num)
}
}
nextTick().then(()=>{
@@ -734,17 +734,21 @@ export default defineComponent({
}
.printModel{
>div{
width: 7rem;
display: flex;
width: 13rem;
// display: flex;
display: block;
justify-content: center;
border-radius: 1rem;
margin: 0;
border: 2px solid;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
ul{
position: absolute;
width: 7rem;
width: 13rem;
text-align: center;
margin-top: .3rem;
border-radius: 1rem;
@@ -753,6 +757,10 @@ export default defineComponent({
background: rgba(0,0,0,.2);
line-height: 2;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 0 1rem;
&.printModel_item:hover{
background: rgba(0,0,0,.4);
}

View File

@@ -105,7 +105,7 @@ export default defineComponent({
let newArr:any = []
oldVal.forEach((item:any,index:any) => {
oldArr.push(item.id?item.id:item.sketchBoardId)
newArr.push(newVal[index].id?newVal[index].id:newVal[index].sketchBoardIdd)
newArr.push(newVal?.[index]?.id?newVal?.[index]?.id:newVal?.[index]?.sketchBoardIdd)
});
if(JSON.stringify(newArr)!=JSON.stringify(oldArr)){
this.setSketch()

View File

@@ -41,7 +41,7 @@
<i @click.stop="putName(-1,'affirm','')" v-show="openType" class="fi fi-br-check"></i>
<div class="addLabel" v-show="!openType" @click.stop="newLabel('','')">+</div>
</div>
<div class="started_btn" @click="removeLabel(options)">Delete</div>
<div class="started_btn" :class="{active:labelBor}" @click="removeLabel(options)">Delete</div>
</li>
</ul>
</div>
@@ -73,6 +73,7 @@ export default defineComponent({
let openType = ref(false)
let itemName = ref('')
let {t} = useI18n()
let labelBor = ref(false)//判断是否选中标签
return {
multiple,
indeterminate,
@@ -82,7 +83,8 @@ export default defineComponent({
openType,
type,
itemName,
t
t,
labelBor
}
},
data(){
@@ -94,7 +96,6 @@ export default defineComponent({
this.clearOpenType()
},
watch: {
},
directives:{
mousewheel:{
@@ -136,8 +137,8 @@ export default defineComponent({
}else{
this.multiple = true
}
this.clearOpenType()
this.options = data
this.clearOpenType()
},
clearSetLabel(){
this.clearOpenType()
@@ -150,14 +151,16 @@ export default defineComponent({
item.checkAll = value.checkAll
});
}
this.deleteShow(this.options)
},
onCheckAllchildrenItem(value:any){
let boor = value?.childList.every( (item:any) => item.checkAll )
if(boor){
value.checkAll = true
// value.checkAll = true
}else{
value.checkAll = false
}
this.deleteShow(this.options)
},
clearOpenType(){
this.openType = false
@@ -324,6 +327,20 @@ export default defineComponent({
"userId": ''
}
return data
},
deleteShow(value:any){
// this.options
this.labelBor = false
for(let index = 0; index<value.length; index++){
if(value[index].checkAll){
this.labelBor = true
// break
return
}
if(value[index].childList != null){
this.deleteShow(value[index].childList)
}
}
}
}
})
@@ -520,6 +537,12 @@ export default defineComponent({
position: sticky;
top: 0;
z-index: 999;
opacity: .4;
pointer-events: none;
&.active{
pointer-events: auto;
opacity: 1;
}
// margin-right: auto;
}
}