Bläddra i källkod

Merge branch 'iteration-20250110-last' into dev

lex-xin 5 månader sedan
förälder
incheckning
12940a2f19

+ 1 - 1
public/version.json

@@ -1 +1 @@
-{"version":1737368742213}
+{"version":1737410576396}

+ 5 - 1
src/components/card-preview/video-modal/index.tsx

@@ -188,7 +188,6 @@ export default defineComponent({
     };
     const onFullScreen = () => {
       const el: any = document.querySelector('#' + videoId);
-
       //   //进入全屏
       if (el) {
         if (isElementFullscreen(el)) {
@@ -259,6 +258,11 @@ export default defineComponent({
               e.stopPropagation();
               emit('reset');
               setModelOpen();
+            }}
+            onTouchstart={(e: any) => {
+              e.stopPropagation();
+              emit('reset');
+              setModelOpen();
             }}>
             <div class={styles.actions}>
               <div class={styles.actionWrap}>

+ 6 - 1
src/components/layout/guide-section/guide-drag.ts

@@ -180,8 +180,12 @@ export default function useDrag(
       // 初始化pos值
       window.addEventListener('resize', refreshPos);
       window.addEventListener('fullscreenchange', onFullscreenchange);
-      console.log('first - show', boxClass);
       nextTick(() => {
+        document
+          .querySelectorAll(`.${boxClass} .dragDirectionPoint`)
+          .forEach((value: Element) => {
+            value.remove();
+          });
         const layoutTopHeight =
           document.querySelector('.layoutTop')?.clientHeight || 0;
         baseSize.layoutTopHeight = Math.ceil(layoutTopHeight);
@@ -396,6 +400,7 @@ export default function useDrag(
     baseSize.defaultWidth = initSize?.width || 400;
     baseSize.defaultHeight = initSize?.height || 640;
     isResizeBlocked = false;
+
     dragShow.value = false;
   }
 

+ 2 - 2
src/components/layout/guide-section/index.tsx

@@ -61,8 +61,8 @@ export default defineComponent({
       previewShow,
       {
         resizeDirection: [true, true, true, true, true, true, true, true],
-        minHeight: 400,
-        minWidth: 400,
+        minHeight: 391.5,
+        minWidth: 600,
         defaultPosition: 'center',
         width: 1000,
         height: 640

+ 2 - 2
src/views/prepare-lessons/model/courseware-type/index.module.less

@@ -227,7 +227,7 @@
     align-items: center;
     justify-content: space-between;
     color: #777777;
-    font-size: max(13px, 11Px);
+    font-size: max(13px, 12Px);
     padding-top: 8px;
     .authorName {
       max-width: 50%;
@@ -270,7 +270,7 @@
 
     .name {
       font-weight: 600;
-      font-size: max(14px, 13Px);
+      font-size: max(14px, 14Px);
       color: #000000;
       display: flex;
       align-items: center;

+ 1 - 11
vite.config.ts

@@ -67,18 +67,8 @@ export default defineConfig(() => {
         registerType: 'prompt',
         includeAssets: ['./logo.png'],
         workbox: {
-          skipWaiting: false, // 强制跳过等待
+          skipWaiting: true, // 强制跳过等待
           clientsClaim: false
-          // runtimeCaching: [
-          //   {
-          //     urlPattern: ({ url }) =>
-          //       url.origin === 'https://dev.kt.colexiu.com',
-          //     handler: 'NetworkFirst',
-          //     options: {
-          //       cacheName: 'api-cache'
-          //     }
-          //   }
-          // ]
         },
         manifest: {
           name: '酷乐秀-音乐数字课堂',