|
@@ -1088,11 +1088,11 @@ const currentSlideHasIframe = computed(() => {
|
|
|
return elementList.value.some(element => element.type === ElementTypes.FRAME)
|
|
return elementList.value.some(element => element.type === ElementTypes.FRAME)
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
-// 当前幻灯片的所有 iframe 是否都已 isDone(含非 type=73,非 type=73 的 elementDone 跑完即设 true)
|
|
|
|
|
|
|
+// 当前幻灯片的所有 iframe 是否都已 isDone 且 frameloading 已结束
|
|
|
const currentSlideIframeReady = computed(() => {
|
|
const currentSlideIframeReady = computed(() => {
|
|
|
const frames = elementList.value.filter(element => element.type === ElementTypes.FRAME)
|
|
const frames = elementList.value.filter(element => element.type === ElementTypes.FRAME)
|
|
|
- if (frames.length === 0) return true // 没 iframe 视为 ready
|
|
|
|
|
- return frames.every(frame => frame.isDone === true)
|
|
|
|
|
|
|
+ if (frames.length === 0) return true
|
|
|
|
|
+ return frames.every(frame => frame.isDone === true && (frame as any).iframeLoading !== true)
|
|
|
})
|
|
})
|
|
|
|
|
|
|
|
const currentSlideToolType = computed(() => {
|
|
const currentSlideToolType = computed(() => {
|