diff --git a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue index 58b434a..98d4962 100644 --- a/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue +++ b/core/core-frontend/src/views/chart/components/editor/dataset-select/DatasetSelect.vue @@ -15,6 +15,8 @@ import { useCache } from '@/hooks/web/useCache' import { useUserStoreWithOut } from '@/store/modules/user' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import treeSort from '@/utils/treeSortUtils' +import router from '@/router' + const dvMainStore = dvMainStoreWithOut() const { wsCache } = useCache('localStorage') @@ -67,8 +69,9 @@ const sortTypeChange = arr => { const initDataset = () => { loadingDatasetTree.value = true + const appId:any = router.currentRoute.value.query.appId const method = props.sourceType === 'datasource' ? getDatasourceList : getDatasetTree - const params = props.sourceType === 'datasource' ? null : {} + const params:any = props.sourceType === 'datasource' ? null : {appId:appId} method(params) .then(res => { sortTypeChange((res as unknown as Tree[]) || []) @@ -370,13 +373,13 @@ onMounted(() => { - + diff --git a/core/core-frontend/src/views/dashboard/index.vue b/core/core-frontend/src/views/dashboard/index.vue index bf731bc..d2e69ce 100644 --- a/core/core-frontend/src/views/dashboard/index.vue +++ b/core/core-frontend/src/views/dashboard/index.vue @@ -76,7 +76,11 @@ const state = reactive({ }) const initDataset = () => { - getDatasetTree({}).then(res => { + if(router.currentRoute.value.query ==null){ + return + } + const appId:any = router.currentRoute.value.query.appId + getDatasetTree({appId:appId}).then(res => { state.datasetTree = (res as unknown as Tree[]) || [] }) } diff --git a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue index b0059e7..662c38a 100644 --- a/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue +++ b/core/core-frontend/src/viewsnew/application/module/Leftmenu/index.vue @@ -125,9 +125,9 @@ function moreClic(event:any ,data:any){ // 更多操作 function editClic(data:any){ console.log(data) if(data.type == '03'){ - window.open('/#/dvsCanvas?dvId=' +data.id, '_blank'); + window.open('/#/dvsCanvas?dvId=' +data.id+'&appId='+projectInfo.value.id , '_blank'); }else if(data.type == '0301'){ - window.open('/#/dashboard?resourceId=' + data.id, '_blank'); + window.open('/#/dashboard?resourceId=' + data.id+'&appId='+projectInfo.value.id, '_blank'); }else if(data.type == '09'){ window.open('/#/formcreatedesigner?moduleId=' +data.id, '_blank'); } diff --git a/core/core-frontend/src/viewsnew/common/FormCreate.vue b/core/core-frontend/src/viewsnew/common/FormCreate.vue index b83ad32..7547f1a 100644 --- a/core/core-frontend/src/viewsnew/common/FormCreate.vue +++ b/core/core-frontend/src/viewsnew/common/FormCreate.vue @@ -1,31 +1,3 @@ - - - -