gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修复自动提示框粘贴保留原样式的问题

Browse Source
This commit is contained in:
wangwenrui
2020-10-21 16:06:50 +08:00
parent 6c5cf97a9f
commit a13cfa8736
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nezha-fronted/src/components/common/rightBox/locationCascader.vue
View File

@@ -143,7 +143,7 @@
if(!cabinet){ if(!cabinet){
return ; return ;
} }
console.log('load u',cabinet,isInit) // console.log('load u',cabinet,isInit)
this.selectedData.cabinet=cabinet; this.selectedData.cabinet=cabinet;
this.selectedData.u=null; this.selectedData.u=null;
let cabinetUKey='cabinet-'+this.selectedData.idc.id+'-'+cabinet.id let cabinetUKey='cabinet-'+this.selectedData.idc.id+'-'+cabinet.id
@@ -238,20 +238,20 @@
} }
} }
}else{ }else{
console.log('选中操作') // console.log('选中操作')
let checkValues=this.findUnoccupyU(data); let checkValues=this.findUnoccupyU(data);
let checkValue=data[data.length-1]; //当前选中的u let checkValue=data[data.length-1]; //当前选中的u
console.log('选中的',checkValues,'default usize',this.defaultModelUSize) // console.log('选中的',checkValues,'default usize',this.defaultModelUSize)
if(checkValues.length < this.defaultModelUSize){ //如果小于model 规定的大小，需要自动选择 if(checkValues.length < this.defaultModelUSize){ //如果小于model 规定的大小，需要自动选择
let suitU=this.findSuitableU(checkValue); let suitU=this.findSuitableU(checkValue);
console.log('u size 不够，需要补充,合适u位',suitU) // console.log('u size 不够，需要补充,合适u位',suitU)
if(suitU.length>0){ //有合适的u位 if(suitU.length>0){ //有合适的u位
while(this.uChecked.length - this.occupyU.length < this.defaultModelUSize){ while(this.uChecked.length - this.occupyU.length < this.defaultModelUSize){
let popU=suitU.splice(0,1)[0] let popU=suitU.splice(0,1)[0]
this.uChecked.push(popU); this.uChecked.push(popU);
} }
}else{ }else{
console.log('u size 不够，取消当前选中') // console.log('u size 不够，取消当前选中')
this.uChecked.splice(this.uChecked.length-1,1); this.uChecked.splice(this.uChecked.length-1,1);
} }
}else{//至少已经选择了defaultCabinetUsize 个u ，这里需要处理不连续选择的情况 }else{//至少已经选择了defaultCabinetUsize 个u ，这里需要处理不连续选择的情况
@@ -297,8 +297,8 @@
} }
} }
console.log('最终选择结果：') // console.log('最终选择结果：')
console.log(this.uChecked) // console.log(this.uChecked)
this.oldUChecked=this.uChecked; this.oldUChecked=this.uChecked;
this.selectedData.u=this.findOldCheckedMinMax(this.uChecked); this.selectedData.u=this.findOldCheckedMinMax(this.uChecked);
}, },
@@ -320,8 +320,8 @@
}, },
findUnoccupyU:function(arr){ findUnoccupyU:function(arr){
console.log('findUnoccupyU') // console.log('findUnoccupyU')
console.log(this.occupyU) // console.log(this.occupyU)
return arr.filter((item,index)=>{ return arr.filter((item,index)=>{
return !this.occupyU.includes(item); return !this.occupyU.includes(item);
}) })

12
nezha-fronted/src/components/page/dashboard/explore/editor.vue
View File

@@ -788,6 +788,18 @@
$temp.setContent(text); $temp.setContent(text);
$temp.quill.setSelection($temp.cursorIndex+text.length); $temp.quill.setSelection($temp.cursorIndex+text.length);
},200)//此值必须大于userChangeTimer的值*/ },200)//此值必须大于userChangeTimer的值*/
})
this.quill.clipboard.addMatcher(Node.ELEMENT_NODE, (node, delta) => {
let ops = []
delta.ops.forEach(op => {
if (op.insert && typeof op.insert === 'string') {
ops.push({
insert: op.insert
})
}
})
delta.ops = ops
return delta
}) })
this.quill.on('text-change',function(delta, oldDelta, source){ this.quill.on('text-change',function(delta, oldDelta, source){
if(source != 'silent'){ if(source != 'silent'){