修复部分bug部分页面的调整
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
<router-view v-if="(openType && openType != 'history' && !routeQuery.id) || $route.path != '/home'" @setTask="setTask">
|
||||
</router-view>
|
||||
<div v-else-if="routeQuery.id || openType == 'history'" class="function">
|
||||
<design ref="design"></design>
|
||||
<design :key="componentKey" ref="design"></design>
|
||||
</div>
|
||||
<div v-else class="function">
|
||||
<newPorject ref="newPorject" @newProject=newProject></newPorject>
|
||||
@@ -38,6 +38,7 @@ export default defineComponent({
|
||||
const route = useRoute()
|
||||
const data = reactive({
|
||||
openType:'',
|
||||
componentKey:null,
|
||||
isShowMark:false,
|
||||
routeQuery:{} as any,
|
||||
selectObject:computed(()=>store.state.Workspace.probjects) as any,//选择的项目
|
||||
@@ -57,6 +58,7 @@ export default defineComponent({
|
||||
watch(() => route.query,
|
||||
(query:any, oldQuery:any) => {
|
||||
data.routeQuery = query
|
||||
if(query.history)data.componentKey = query.history
|
||||
const key = Object.keys(query)?.[0]
|
||||
if(key){
|
||||
data.openType = Object.keys(query)[0]
|
||||
@@ -66,11 +68,14 @@ export default defineComponent({
|
||||
}
|
||||
// if((query.history || query.id) != (oldQuery.history || oldQuery.id)){
|
||||
// }
|
||||
if(query.history && query.history != query.history){
|
||||
|
||||
}
|
||||
nextTick(()=>{
|
||||
if(query.history || query.id){
|
||||
if(data.openType == 'tools')data.isShowMark = true
|
||||
data.dataLoad = true
|
||||
createData()
|
||||
if(query?.source != 'batch')createData()
|
||||
if(query.type == 'Works'){
|
||||
getWorks(query.id || query.history)
|
||||
}else{
|
||||
@@ -268,6 +273,9 @@ export default defineComponent({
|
||||
dataDom.design.openSetData()
|
||||
})
|
||||
}
|
||||
}).catch(()=>{
|
||||
data.isShowMark = false
|
||||
data.dataLoad = false
|
||||
})
|
||||
}
|
||||
const getCanvasData = (str:any)=>{
|
||||
|
||||
Reference in New Issue
Block a user