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

src/hooks/useExport.ts

@@ -49,7 +49,7 @@ export default () => {
         if (ignoreWebfont) config.fontEmbedCSS = ''
         toImage(domRef, config).then(dataUrl => {
           if (isCoverImg.value) {
-            coverImgStore.setCoverImg('')
+            // coverImgStore.setCoverImg('')
             resolve(dataUrl)
           }else{
             const obj = {

src/views/Editor/DataaSource/index.vue

@@ -87,6 +87,7 @@
     const sourceLoadingStore = useScreenStore()
     const { slides, slideIndex } = storeToRefs(slidesStore)
     const { setNewDatasList } = useEditor()
+    const { SourceLoading } = storeToRefs(useScreenStore())
     
     watch(() => datas.DataSource.DataSourceOverlay, (n,o) => {
         if(n){
@@ -132,7 +133,7 @@
 
     const OffDataSource = () =>{
         datas.DataSource.DataSourceOverlay = !datas.DataSource.DataSourceOverlay
-        setNewDatasList(datas.DataSource)
+        if(SourceLoading.value) setNewDatasList(datas.DataSource)
     }
   
     

src/views/Editor/Thumbnails/index.vue

@@ -159,12 +159,10 @@ queryObj.value = inject(injectKeyDataSource).queryObj
         let dataObj = datasRes.data.data
         let SlidesData = JSON.parse(dataObj.TempData)
         let newSlides = []
-        SlidesData.forEach((x,i)=>{
+        await SlidesData.forEach((x,i)=>{
           newSlides.push(x)
-          if(SlidesData.length-1==i){
-            slidesStore.setSlides(newSlides)
-          }
         })
+        slidesStore.setSlides(newSlides)
       }
   } catch (error) {
       

src/views/Editor/Toolbar/ElementTemplateData.vue

@@ -236,12 +236,9 @@
                                 Content: item.TemplateDataSource&&item.TemplateDataSource.Content?item.TemplateDataSource.Content:'',
                                 Name: item.TemplateDataSource&&item.TemplateDataSource.Name?item.TemplateDataSource.Name:'',
                                 Id: item.TemplateDataSource&&item.TemplateDataSource.Id?item.TemplateDataSource.Id:null as Number,
+                                index: item.TemplateDataSource&&item.TemplateDataSource.index>=0?item.TemplateDataSource.index:null as Number,
                             }
                         }
-                        if(slide.pageType!=1){
-                            let index = item.TemplateDataSource&&item.TemplateDataSource.index>=0?item.TemplateDataSource.index:null as Number
-                            Reflect.set(Obj.TemplateDataSource, 'index', index)
-                        }
                         if(Obj) datas.DataSource.DataSourceList.push(Obj)
                     }
                 })
@@ -285,6 +282,8 @@
 
     const setDialogForExport = async (type: DialogForExportTypes) => {
         // mainStore.setDialogForExport(type)
+        let CoverImgPath = CoverImg.value.split('/')
+        let namePath = ''
         queryObj.value.CoverImg = ''
         mainMenuVisible.value = false
         isCoverImgStore.setIsCoverImg(true)
@@ -293,14 +292,16 @@
         if(datas){
             let name = new Date().getTime()+".jpg"
             const file = dataURLtoFile(datas, name)
-            let result = AliyunUpload.UploadAsync(file,`Feature/${TempId.value}_CoverImg`)
-            result.then(res=>{
-                if(res) {
-                    coverImgStore.setCoverImg(res)
-                    isCoverImgStore.setIsCoverImg(false)
-                    queryObj.value.CoverImg = CoverImg.value
-                }
-            })
+            let url = ''
+            if(CoverImgPath[CoverImgPath.length-1].indexOf('CoverImg_')==-1){
+                namePath = `CoverImg_${name}`
+            }else {
+                namePath = CoverImgPath[CoverImgPath.length-1]
+            }
+            url = await AliyunUpload.UploadAsync(file,`Feature/${namePath}`)
+            coverImgStore.setCoverImg(url)
+            isCoverImgStore.setIsCoverImg(false)
+            queryObj.value.CoverImg = CoverImg.value
         }
     }
 

src/views/Editor/index.vue

 <template>
 
-  <div class="pptist-editor" v-if="model!=3">
+  <div class="pptist-editor" v-show="model!=3">
     <EditorHeader class="layout-header" />
     <div class="layout-content">
       <Thumbnails class="layout-content-left" />
@@ -29,7 +29,6 @@
   >
     <ExportDialog />
   </Modal>
-
   <div v-if="model&&model==3" 
   style="opacity: 1;position: fixed;left: 0;right: 0; top: 0;bottom: 0;overflow: auto;z-index: 99999999;">
     <div class="export-img-dialog">