修复CurrentProject的bug
This commit is contained in:
@@ -629,6 +629,7 @@ export default defineComponent({
|
|||||||
collItemSize.collValue = Math.floor(parentWidth / collItemSize.widthValue.value)
|
collItemSize.collValue = Math.floor(parentWidth / collItemSize.widthValue.value)
|
||||||
collItemSize.padding = Math.floor(parentWidth - (collItemSize.collValue * collItemSize.widthValue.value))
|
collItemSize.padding = Math.floor(parentWidth - (collItemSize.collValue * collItemSize.widthValue.value))
|
||||||
let value = collItemSize.collValue
|
let value = collItemSize.collValue
|
||||||
|
console.log(parentWidth,collItemSize,value)
|
||||||
|
|
||||||
collItemSize.itemStyle.width = (parentWidth - collItemSize.padding - (value * 10)) / value
|
collItemSize.itemStyle.width = (parentWidth - collItemSize.padding - (value * 10)) / value
|
||||||
collItemSize.itemStyle.height = collItemSize.itemStyle.width * 1.54
|
collItemSize.itemStyle.height = collItemSize.itemStyle.width * 1.54
|
||||||
@@ -1076,7 +1077,6 @@ export default defineComponent({
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
const upDataSort = (generateCourseItem:any,likeIndex:number)=>{
|
const upDataSort = (generateCourseItem:any,likeIndex:number)=>{
|
||||||
console.log(generateCourseItem.sort)
|
|
||||||
let list = likeDesignCollectionList.value
|
let list = likeDesignCollectionList.value
|
||||||
if(list[likeIndex].childList.length == 0)return
|
if(list[likeIndex].childList.length == 0)return
|
||||||
list[likeIndex].childList.forEach((likeItem:any,index:any)=>{
|
list[likeIndex].childList.forEach((likeItem:any,index:any)=>{
|
||||||
@@ -1085,7 +1085,6 @@ export default defineComponent({
|
|||||||
}
|
}
|
||||||
// if(generateCourseItem.sort >= likeItem.sort && str == 'batch'){
|
// if(generateCourseItem.sort >= likeItem.sort && str == 'batch'){
|
||||||
// likeItem.sort += 1
|
// likeItem.sort += 1
|
||||||
// console.log(likeItem.sort)
|
|
||||||
// }
|
// }
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -1155,7 +1154,6 @@ export default defineComponent({
|
|||||||
|
|
||||||
await nextTick().then(()=>{
|
await nextTick().then(()=>{
|
||||||
designData.isUnfold = true
|
designData.isUnfold = true
|
||||||
console.log('111s')
|
|
||||||
uploadLikeDom()
|
uploadLikeDom()
|
||||||
})
|
})
|
||||||
setPrductimgAll()
|
setPrductimgAll()
|
||||||
@@ -1469,56 +1467,12 @@ export default defineComponent({
|
|||||||
// window.removeEventListener('resize', this.setItemPosition)
|
// window.removeEventListener('resize', this.setItemPosition)
|
||||||
if(this.observerData?.observer)this.observerData.observer.unobserve(this.$refs.rightContentBlockBox);
|
if(this.observerData?.observer)this.observerData.observer.unobserve(this.$refs.rightContentBlockBox);
|
||||||
},
|
},
|
||||||
|
|
||||||
async mounted() {
|
async mounted() {
|
||||||
// if(window.innerWidth < 1200){
|
// window.addEventListener('beforeunload', (event)=>{
|
||||||
// this.widthList = [
|
// this.store.commit("clearAllCollection");
|
||||||
// {
|
// });
|
||||||
// label:'Medium',
|
this.init()
|
||||||
// value:70,
|
|
||||||
// },{
|
|
||||||
// label:'Large',
|
|
||||||
// value:150,
|
|
||||||
// },{
|
|
||||||
// label:'Extra-large',
|
|
||||||
// value:200,
|
|
||||||
// }
|
|
||||||
// ]
|
|
||||||
// this.widthValue = {
|
|
||||||
// label:'Medium',
|
|
||||||
// value:70,
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
window.addEventListener('beforeunload', (event)=>{
|
|
||||||
this.store.commit("clearAllCollection");
|
|
||||||
});
|
|
||||||
// window.addEventListener('resize', this.setItemPosition)
|
|
||||||
|
|
||||||
this.$refs.rightContentBlockBox
|
|
||||||
this.observerData.observer = new ResizeObserver(entries => {
|
|
||||||
for (let entry of entries) {
|
|
||||||
clearTimeout(this.observerData.time)
|
|
||||||
if(entries[0].contentRect.width > 800){
|
|
||||||
this.likeDesignTools = true
|
|
||||||
}else{
|
|
||||||
this.likeDesignTools = false
|
|
||||||
}
|
|
||||||
this.observerData.time = setTimeout(()=>{
|
|
||||||
|
|
||||||
this.setSystemDesigner(0)
|
|
||||||
this.setDesignItemStyle()
|
|
||||||
},100)
|
|
||||||
// const { width } = entry.contentRect;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.observerData.observer.observe(this.$refs.rightContentBlockBox);
|
|
||||||
if(this.designCollectionList?.length > 0){
|
|
||||||
nextTick(()=>{
|
|
||||||
this.setDesignItemStyle()
|
|
||||||
this.setShowHide('recycleDomHidden')
|
|
||||||
})
|
|
||||||
}
|
|
||||||
this.isUnfold = true
|
|
||||||
this.setUnfold()
|
|
||||||
},
|
},
|
||||||
directives:{
|
directives:{
|
||||||
mousewheel:{
|
mousewheel:{
|
||||||
@@ -1554,7 +1508,9 @@ export default defineComponent({
|
|||||||
// this.likeDesignCollectionList.push(team)
|
// this.likeDesignCollectionList.push(team)
|
||||||
// },
|
// },
|
||||||
openSetData(){
|
openSetData(){
|
||||||
this.setItemPosition()
|
nextTick(()=>{
|
||||||
|
this.setItemPosition()
|
||||||
|
})
|
||||||
},
|
},
|
||||||
setItemPosition(){
|
setItemPosition(){
|
||||||
this.setSystemDesigner(0)
|
this.setSystemDesigner(0)
|
||||||
@@ -1566,7 +1522,36 @@ export default defineComponent({
|
|||||||
affiche.init(text)
|
affiche.init(text)
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
init(){
|
||||||
|
|
||||||
|
this.$refs.rightContentBlockBox
|
||||||
|
this.observerData.observer = new ResizeObserver(entries => {
|
||||||
|
for (let entry of entries) {
|
||||||
|
if(entries[0].contentRect.width == 0)return
|
||||||
|
clearTimeout(this.observerData.time)
|
||||||
|
if(entries[0].contentRect.width > 800){
|
||||||
|
this.likeDesignTools = true
|
||||||
|
}else{
|
||||||
|
this.likeDesignTools = false
|
||||||
|
}
|
||||||
|
this.observerData.time = setTimeout(()=>{
|
||||||
|
|
||||||
|
this.setSystemDesigner(0)
|
||||||
|
this.setDesignItemStyle()
|
||||||
|
},100)
|
||||||
|
// const { width } = entry.contentRect;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.observerData.observer.observe(this.$refs.rightContentBlockBox);
|
||||||
|
if(this.designCollectionList?.length > 0){
|
||||||
|
nextTick(()=>{
|
||||||
|
this.setDesignItemStyle()
|
||||||
|
this.setShowHide('recycleDomHidden')
|
||||||
|
})
|
||||||
|
}
|
||||||
|
this.isUnfold = true
|
||||||
|
this.setUnfold()
|
||||||
|
},
|
||||||
//判断模特和当前start的sketch是否匹配
|
//判断模特和当前start的sketch是否匹配
|
||||||
isMannequin(){
|
isMannequin(){
|
||||||
this.isMannequinShow = false
|
this.isMannequinShow = false
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ export default defineComponent({
|
|||||||
data.routeQuery = query
|
data.routeQuery = query
|
||||||
if(query.history)data.componentKey = query.history
|
if(query.history)data.componentKey = query.history
|
||||||
const key = Object.keys(query)?.[0]
|
const key = Object.keys(query)?.[0]
|
||||||
|
console.log(key)
|
||||||
if(key){
|
if(key){
|
||||||
data.openType = Object.keys(query)[0]
|
data.openType = Object.keys(query)[0]
|
||||||
}else{
|
}else{
|
||||||
@@ -98,6 +99,11 @@ export default defineComponent({
|
|||||||
// 如果是同一个项目且openType为history,跳过重新初始化
|
// 如果是同一个项目且openType为history,跳过重新初始化
|
||||||
if(isSameProject){
|
if(isSameProject){
|
||||||
data.dataLoad = false
|
data.dataLoad = false
|
||||||
|
console.log(dataDom.design)
|
||||||
|
// dataDom.design?.init()
|
||||||
|
if(query.history){
|
||||||
|
dataDom.design.openSetData()
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user