Merge pull request #8902 from dataease/pr@dev-v2@fix_embedded_iframe_panel_open_dataset

fix: iframe嵌入式编辑仪表板页面无法打开数据集页面
This commit is contained in:
fit2cloud-chenyw 2024-04-02 20:20:51 +08:00 committed by GitHub
commit 6b633fe178
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -573,10 +573,8 @@ const getTableName = async (datasourceId, tableName) => {
searchTable.value = tableName searchTable.value = tableName
} }
} }
let p = null
const XpackLoaded = () => p(true) const initEdite = () => {
const initEdite = async () => {
await new Promise(r => (p = r))
const { id, datasourceId, tableName } = route.query const { id, datasourceId, tableName } = route.query
const { id: copyId } = route.params const { id: copyId } = route.params
if (datasourceId) { if (datasourceId) {
@ -610,8 +608,6 @@ const initEdite = async () => {
}) })
} }
initEdite()
const joinEditor = (arr: []) => { const joinEditor = (arr: []) => {
state.editArr = cloneDeep(arr) state.editArr = cloneDeep(arr)
editUnion.value = true editUnion.value = true
@ -853,7 +849,12 @@ const saveAndBack = () => {
pushDataset() pushDataset()
} }
onMounted(() => { let p = null
const XpackLoaded = () => p(true)
onMounted(async () => {
await new Promise(r => (p = r))
initEdite()
getDatasource()
useEmitt({ useEmitt({
name: 'onDatasetSave', name: 'onDatasetSave',
callback: saveAndBack callback: saveAndBack
@ -880,8 +881,6 @@ const getDatasource = () => {
}) })
} }
getDatasource()
const resetDfsFields = (arr, idMap) => { const resetDfsFields = (arr, idMap) => {
for (let i in arr) { for (let i in arr) {
const id = guid() const id = guid()