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

src/views/Preview/PreviewCover.vue

@@ -5,21 +5,25 @@
       right: 0;
       top: 0;
       bottom: 0;
-      overflow: auto;
-    ">
+    "
+    :style="{'overflow':param.w?'':'auto'}">
+    <!-- :size="viewportRatio < 1
+                            ? VIEWPORT_SIZE.Value
+                            : VIEWPORT_VER_SIZE.Value
+                        "  -->
         <div class="export-img-dialog">
             <div class="thumbnails-view" ref="refThumbnails">
                 <div class="thumbnails" :style="{width:viewportRatio < 1
                             ? VIEWPORT_SIZE.Value
                             : VIEWPORT_VER_SIZE.Value+'px'}" v-for="slide in slides">
-                    <ThumbnailSlide class="thumbnail" :key="slide.id" :slide="slide" :size="viewportRatio < 1
-                            ? VIEWPORT_SIZE.Value
-                            : VIEWPORT_VER_SIZE.Value
-                        " />
+                    <ThumbnailSlide class="thumbnail" :key="slide.id" :slide="slide" 
+                    
+                        :size="param.w?param.w:(viewportRatio<1 ? VIEWPORT_SIZE.Value : VIEWPORT_VER_SIZE.Value )" />
                 </div>
             </div>
         </div>
     </div>
+    <!-- 获取行程颜色dom -->
     <div style="position: fixed;left: 200px;top: -100px;opacity: 0;">
       <canvas style="display: none" id="canvas"></canvas>
       <div
@@ -65,6 +69,19 @@ const colorList = ([] as any)
 const w = ref(0)
 const h = ref(0)
 
+const refThumbnails = ref(null)
+watch(() => refThumbnails.value, () => {
+  setTimeout(()=>{
+    getDomeWH()
+  },1000)
+})
+const getDomeWH = async () => {
+  if(refThumbnails.value){
+    let height = await refThumbnails.value.offsetHeight;
+    window.parent.postMessage(`行程特色高-${height}`, `${domainManager().notificationUrl}`);
+  }
+}
+
 const loadSliders = async ()=>{
   const loadingObj = ElLoading.service({text:'正在渲染数据',lock:true})
   let response = await ConfigService.GetTripTemplateSlide({TempId:parseInt(param.tempId.toString())})