Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/store/slides.ts

@@ -47,7 +47,7 @@ export const useSlidesStore = defineStore('slides', {
     }], // 幻灯片页面数据 slides
     slideIndex: 0, // 当前页面索引
     viewportRatio: 0.7069, // 可视区域比例，默认16:9 0.5625
-    layoutSlides: slides, // 所有模版数据
+    layoutSlides: [], // 所有模版数据
   }),
 
   getters: {

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -128,7 +128,7 @@
     </div>
 
     <!-- 生成封面图 -->
-    <div style="opacity: 0;position: absolute;left: 100px;top: 0;bottom: 0;z-index: -1;" 
+    <div style="opacity: 0;position: fixed;left: 100px;top: 0;bottom: 0;overflow: auto;z-index: -1;" 
     v-if="model&&model==1&&slides.length>0&&slideIndex>=0">
         <div class="export-img-dialog">
           <div class="thumbnails-view">
@@ -187,7 +187,7 @@
 
     const coverImgStore = useScreenStore()
     const isCoverImgStore = useScreenStore()
-    const { model, ConfigId, TemplateDataSource, TemplateType, CoverImg, isCoverImg, TempId } = storeToRefs(useScreenStore())
+    const { model, ConfigId, TemplateDataSource, TemplateType, CoverImg, isCoverImg, TempId, SourceLoading } = storeToRefs(useScreenStore())
 
     const mainStore = useMainStore()
     const mainMenuVisible = ref(false)
@@ -316,8 +316,8 @@
     
     // 所有数据源
     const AllDataSource = () => {
-        setNewDatasList(datas.DataSource)
-        getPageType()
+        if(SourceLoading.value) setNewDatasList(datas.DataSource)
+        // getPageType()
         datas.DataSource.DataSourceOverlay = !datas.DataSource.DataSourceOverlay
         return
         if(slides.value.elements&&slides.value.elements.length==0){