Merge branch 'iteration-20250110-last' into jenkins

src/components/card-preview/video-modal/index.tsx

@@ -1,10 +1,4 @@
-import {
-  defineComponent,
-  onMounted,
-  onUnmounted,
-  reactive,
-  toRefs
-} from 'vue';
+import { defineComponent, onMounted, onUnmounted, reactive, toRefs } from 'vue';
 import { ref } from 'vue';
 import TCPlayer from 'tcplayer.js';
 import 'tcplayer.js/dist/tcplayer.min.css';
@@ -243,7 +237,8 @@ export default defineComponent({
       <div
         class={[styles.videoWrap, 'videoWrapModal']}
         id={videoId}
-        onClick={() => setModelOpen(!videoFroms.showBar)}>
+        onClick={() => setModelOpen(!videoFroms.showBar)}
+        onTouchstart={() => setModelOpen(!videoFroms.showBar)}>
         <div class={[styles.videoContent]}>
           <video
             style={{ width: '100%', height: '100%' }}

src/components/layout/guide-section/guide-drag.ts

@@ -386,7 +386,7 @@ export default function useDrag(
   }
   function refreshPos() {
     // 全屏切换的时候不做重置
-    if (isResizeBlocked) return;
+    if (isResizeBlocked || isFullscreen()) return;
 
     windowInfo.currentType = 'SMALL';
     windowInfo.windowType = 'SMALL';