Compare commits

...

5 Commits
dev-v2 ... v2.5

Author SHA1 Message Date
dataeaseShu
b87b87f06a fix(移动端): 修复tab组件布局丢失问题 2024-04-10 19:24:25 +08:00
fit2cloud-chenyw
f6b53a6e66 fix: iframe嵌入式使用模版新建丢失token 2024-04-09 12:00:45 +08:00
fit2cloud-chenyw
13dc73efb7
Merge pull request #9001 from dataease/pr@v2.5@fix_iframe_embedded_template
fix: iframe嵌入式使用模版新建错误
2024-04-08 20:02:00 +08:00
fit2cloud-chenyw
d5f5af8d98 fix: iframe嵌入式使用模版新建错误 2024-04-08 20:00:48 +08:00
wisonic-s
1c9caad894
Merge pull request #8958 from dataease/dev-v2
fix(图表): 修复地图渲染异常
2024-04-04 10:09:00 +08:00
2 changed files with 28 additions and 2 deletions

View File

@ -25,6 +25,18 @@ const hanedleMessage = event => {
ele.y = my
ele.sizeX = mSizeX
ele.sizeY = mSizeY
if (ele.component === 'DeTabs') {
ele.propValue.forEach(tabItem => {
tabItem.componentData.forEach(tabComponent => {
const { mx: tx, my: ty, mSizeX: tSizeX, mSizeY: tSizeY } = tabComponent
tabComponent.x = tx
tabComponent.y = ty
tabComponent.sizeX = tSizeX
tabComponent.sizeY = tSizeY
})
})
}
})
dvMainStore.setComponentData(componentData)
dvMainStore.setMobileInPc(true)

View File

@ -157,6 +157,7 @@
</el-row>
</el-row>
</el-row>
<XpackComponent ref="openHandler" jsname="L2NvbXBvbmVudC9lbWJlZGRlZC1pZnJhbWUvT3BlbkhhbmRsZXI=" />
</template>
<script setup lang="ts">
@ -171,6 +172,7 @@ import MarketPreviewV2 from '@/views/template-market/component/MarketPreviewV2.v
import { imgUrlTrans } from '@/utils/imgUtils'
import CategoryTemplateV2 from '@/views/template-market/component/CategoryTemplateV2.vue'
import { interactiveStoreWithOut } from '@/store/modules/interactive'
import { XpackComponent } from '@/components/plugin'
const { t } = useI18n()
const { wsCache } = useCache()
@ -426,16 +428,28 @@ const apply = () => {
templateData.type === 'dataV'
? '#/dvCanvas?opt=create&createType=template'
: '#/dashboard?opt=create&createType=template'
let newWindow = null
if (state.pid) {
window.open(baseUrl + `&pid=${state.pid}`, '_blank')
newWindow = window.open(baseUrl + `&pid=${state.pid}`, '_blank')
} else {
window.open(baseUrl, '_blank')
newWindow = window.open(baseUrl, '_blank')
}
initOpenHandler(newWindow)
})
.catch(() => {
state.loading = false
})
}
const openHandler = ref(null)
const initOpenHandler = newWindow => {
if (openHandler?.value) {
const pm = {
methodName: 'initOpenHandler',
args: newWindow
}
openHandler.value.invokeMethod(pm)
}
}
const initTemplateShow = () => {
let tempHasResult = false