|
@@ -1963,16 +1963,17 @@ export default {
|
|
|
return content.replace(/<[^>]*>/g, '')
|
|
return content.replace(/<[^>]*>/g, '')
|
|
|
}).join(' ')
|
|
}).join(' ')
|
|
|
}
|
|
}
|
|
|
- toolsArrayCont = slide.elements.filter((element) => element.toolsArray && element.toolsArray.length > 0)
|
|
|
|
|
- if (toolsArrayCont.length > 0) {
|
|
|
|
|
- // 有内容就弹出弹窗
|
|
|
|
|
- istoolsArray = true
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
|
|
pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
|
|
|
})
|
|
})
|
|
|
|
|
+ toolsArrayCont = _pptData2.slides.some(slide => slide.toolsArray && slide.toolsArray?.length > 0)
|
|
|
|
|
+ if (toolsArrayCont) {
|
|
|
|
|
+ // 有内容就弹出弹窗
|
|
|
|
|
+ istoolsArray = true
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- if(istoolsArray){
|
|
|
|
|
|
|
+
|
|
|
|
|
+ if(istoolsArray && type == 1){
|
|
|
const confirmed = await this.showToolsConfirmDialog();
|
|
const confirmed = await this.showToolsConfirmDialog();
|
|
|
if (!confirmed) {
|
|
if (!confirmed) {
|
|
|
this.uploadWorkLoading = false;
|
|
this.uploadWorkLoading = false;
|
|
@@ -2097,16 +2098,16 @@ export default {
|
|
|
return content.replace(/<[^>]*>/g, '')
|
|
return content.replace(/<[^>]*>/g, '')
|
|
|
}).join(' ')
|
|
}).join(' ')
|
|
|
}
|
|
}
|
|
|
- toolsArrayCont = slide.elements.filter((element) => element.toolsArray && element.toolsArray.length > 0)
|
|
|
|
|
- if (toolsArrayCont.length > 0) {
|
|
|
|
|
- // 有内容就弹出弹窗
|
|
|
|
|
- istoolsArray = true
|
|
|
|
|
- }
|
|
|
|
|
}
|
|
}
|
|
|
pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
|
|
pptContent.push(`第${index + 1}页: ${slideContent || '内容为空'}`)
|
|
|
})
|
|
})
|
|
|
|
|
+ toolsArrayCont = _pptData2.slides.some(slide => slide.toolsArray && slide.toolsArray?.length > 0)
|
|
|
|
|
+ if (toolsArrayCont) {
|
|
|
|
|
+ // 有内容就弹出弹窗
|
|
|
|
|
+ istoolsArray = true
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- if(istoolsArray){
|
|
|
|
|
|
|
+ if(istoolsArray && type == 1){
|
|
|
const confirmed = await this.showToolsConfirmDialog();
|
|
const confirmed = await this.showToolsConfirmDialog();
|
|
|
if (!confirmed) {
|
|
if (!confirmed) {
|
|
|
this.uploadWorkLoading = false;
|
|
this.uploadWorkLoading = false;
|