ucservice 2.5.2 → 2.5.4

package/dist/ucservice.umd.js

@@ -14180,6 +14180,18 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
     videoRotateSize(li, rotateIndex) {
       if (!li) return;
+      let isScale = video.classList.contains('scale-scene');
+
+      if (isScale) {
+        if (rotateIndex == 0 || rotateIndex == 2) {
+          $(video).css('height', '100%');
+          $(video).css('width', '100%');
+        } else if (rotateIndex == 1 || rotateIndex == 3) {
+          $(video).css('height', liWidth);
+          $(video).css('width', liHeight);
+        }
+      }
+
       let video = li.querySelector('video');
       let videoWidth = video.videoWidth;
       let videoHeight = video.videoHeight;
@@ -14187,13 +14199,15 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
       let vHeight = video.offsetHeight;
       let liWidth = li.offsetWidth;
       let liHeight = li.offsetHeight;
-      let isScale = video.classList.contains('scale-scene');
 
       if (rotateIndex == 0) {
         //0
         // $(video).attr('class', 'video-box');
-        $(video).css('height', 'auto');
-        $(video).css('width', 'auto');
+        if (!isScale) {
+          $(video).css('height', 'auto');
+          $(video).css('width', 'auto');
+        }
+
         $(video).css('max-height', '100%');
         $(video).css('max-width', '100%');
         video.style.position = 'absolute';
@@ -14201,11 +14215,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         $(video).css('top', '50%');
         if (videoWidth / videoHeight < liWidth / liHeight) $(video).css('height', '100%');else $(video).css('width', '100%');
         video.style.transform = 'translate(-50%, -50%)';
-
-        if (isScale) {
-          $(video).css('height', '100%');
-          $(video).css('width', '100%');
-        }
       } else if (rotateIndex == 3) {
         //3
         // $(video).attr('class', 'video-box');
@@ -14216,27 +14225,31 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         if (videoHeight * liHeight / videoWidth < liWidth) {
           //视频横向留白
-          $(video).css('width', liHeight);
-          $(video).css('height', 'auto');
+          if (!isScale) {
+            $(video).css('width', liHeight);
+            $(video).css('height', 'auto');
+          }
+
           $(video).css('left', 'calc(' + liWidth + 'px / 2' + ' - ' + liHeight + 'px / 2)');
           $(video).css('top', 'calc(-' + videoHeight * liHeight / videoWidth / 2 + 'px + ' + liHeight + 'px / 2)');
         } else {
           //视频纵向留白
-          $(video).css('width', 'auto');
-          $(video).css('height', liWidth);
+          if (!isScale) {
+            $(video).css('width', 'auto');
+            $(video).css('height', liWidth);
+          }
+
           $(video).css('left', 'calc(-' + videoWidth * liWidth / videoHeight / 2 + 'px + ' + liWidth + 'px / 2)');
           $(video).css('top', 'calc(' + liHeight + 'px / 2' + ' - ' + liWidth + 'px / 2)');
         }
-
-        if (isScale) {
-          $(video).css('height', liWidth);
-          $(video).css('width', liHeight);
-        }
       } else if (rotateIndex == 2) {
         //2
         // $(video).attr('class', 'video-box');
-        $(video).css('height', 'auto');
-        $(video).css('width', 'auto');
+        if (!isScale) {
+          $(video).css('height', 'auto');
+          $(video).css('width', 'auto');
+        }
+
         $(video).css('max-height', '100%');
         $(video).css('max-width', '100%');
         video.style.position = 'absolute';
@@ -14244,11 +14257,6 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
         $(video).css('top', '50%');
         if (videoWidth / videoHeight < liWidth / liHeight) $(video).css('height', '100%');else $(video).css('width', '100%');
         video.style.transform = 'translate(-50%, -50%) rotate(180deg)';
-
-        if (isScale) {
-          $(video).css('height', '100%');
-          $(video).css('width', '100%');
-        }
       } else if (rotateIndex == 1) {
         //1
         // $(video).attr('class', 'video-box');
@@ -14259,22 +14267,23 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
 
         if (videoHeight * liHeight / videoWidth < liWidth) {
           //视频横向留白
-          $(video).css('width', liHeight);
-          $(video).css('height', 'auto');
+          if (!isScale) {
+            $(video).css('width', liHeight);
+            $(video).css('height', 'auto');
+          }
+
           $(video).css('left', 'calc(' + liWidth + 'px / 2' + ' - ' + liHeight + 'px / 2)');
           $(video).css('top', 'calc(-' + videoHeight * liHeight / videoWidth / 2 + 'px + ' + liHeight + 'px / 2)');
         } else {
           //视频纵向留白
-          $(video).css('width', 'auto');
-          $(video).css('height', liWidth);
+          if (!isScale) {
+            $(video).css('width', 'auto');
+            $(video).css('height', liWidth);
+          }
+
           $(video).css('left', 'calc(-' + videoWidth * liWidth / videoHeight / 2 + 'px + ' + liWidth + 'px / 2)');
           $(video).css('top', 'calc(' + liHeight + 'px / 2' + ' - ' + liWidth + 'px / 2)');
         }
-
-        if (isScale) {
-          $(video).css('height', liWidth);
-          $(video).css('width', liHeight);
-        }
       }
     },
 
@@ -14353,7 +14362,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           $(this).attr('title', '视频画面铺满');
         }
 
-        me.videoRotateSize($(this).parent().parent(), $(this).parent().find('button[name=rotateVideo]').attr('rotate-index'));
+        me.videoRotateSize($(this).parent().parent()[0], $(this).parent().find('button[name=rotateVideo]').attr('rotate-index'));
         $(this).toggleClass("bggray"); //jquery方式阻止默认事件 & 冒泡事件
 
         return false;
@@ -14369,7 +14378,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
           $(this).attr('title', '全屏');
         }
 
-        me.videoRotateSize($(this).parent().parent(), $(this).parent().find('button[name=rotateVideo]').attr('rotate-index')); //jquery方式阻止默认事件 & 冒泡事件
+        me.videoRotateSize($(this).parent().parent()[0], $(this).parent().find('button[name=rotateVideo]').attr('rotate-index')); //jquery方式阻止默认事件 & 冒泡事件
         // return false;
       }); //接收音频事件