lex 10 月之前
父節點
當前提交
a65474f6bd

+ 101 - 0
dev-dist/sw.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 /**
  * Copyright 2018 Google Inc. All Rights Reserved.
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -107,3 +108,103 @@ define(['./workbox-bb0550c6'], function (workbox) {
     'GET'
   );
 });
+=======
+/**
+ * Copyright 2018 Google Inc. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// If the loader is already loaded, just stop.
+if (!self.define) {
+  let registry = {};
+
+  // Used for `eval` and `importScripts` where we can't get script URL by other means.
+  // In both cases, it's safe to use a global var because those functions are synchronous.
+  let nextDefineUri;
+
+  const singleRequire = (uri, parentUri) => {
+    uri = new URL(uri + ".js", parentUri).href;
+    return registry[uri] || (
+      
+        new Promise(resolve => {
+          if ("document" in self) {
+            const script = document.createElement("script");
+            script.src = uri;
+            script.onload = resolve;
+            document.head.appendChild(script);
+          } else {
+            nextDefineUri = uri;
+            importScripts(uri);
+            resolve();
+          }
+        })
+      
+      .then(() => {
+        let promise = registry[uri];
+        if (!promise) {
+          throw new Error(`Module ${uri} didn’t register its module`);
+        }
+        return promise;
+      })
+    );
+  };
+
+  self.define = (depsNames, factory) => {
+    const uri = nextDefineUri || ("document" in self ? document.currentScript.src : "") || location.href;
+    if (registry[uri]) {
+      // Module is already loading or loaded.
+      return;
+    }
+    let exports = {};
+    const require = depUri => singleRequire(depUri, uri);
+    const specialDeps = {
+      module: { uri },
+      exports,
+      require
+    };
+    registry[uri] = Promise.all(depsNames.map(
+      depName => specialDeps[depName] || require(depName)
+    )).then(deps => {
+      factory(...deps);
+      return exports;
+    });
+  };
+}
+define(['./workbox-bb0550c6'], (function (workbox) { 'use strict';
+
+  self.skipWaiting();
+  workbox.clientsClaim();
+
+  /**
+   * The precacheAndRoute() method efficiently caches and responds to
+   * requests for URLs in the manifest.
+   * See https://goo.gl/S9QRab
+   */
+  workbox.precacheAndRoute([{
+    "url": "registerSW.js",
+    "revision": "3ca0b8505b4bec776b69afdba2768812"
+  }, {
+    "url": "index.html",
+    "revision": "0.83pmts8nfoo"
+  }], {});
+  workbox.cleanupOutdatedCaches();
+  workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {
+    allowlist: [/^\/$/]
+  }));
+  workbox.registerRoute(({
+    url
+  }) => url.origin === "https://dev.kt.colexiu.com", new workbox.NetworkFirst({
+    "cacheName": "api-cache",
+    plugins: []
+  }), 'GET');
+
+}));
+>>>>>>> iteration-20240607-small

+ 5 - 1
public/version.json

@@ -1 +1,5 @@
-{"version":1719196227388}
+<<<<<<< HEAD
+{"version":1719196227388}
+=======
+{"version":1719224884179}
+>>>>>>> iteration-20240607-small

+ 2 - 0
src/components/layout/layoutTop.tsx

@@ -64,6 +64,7 @@ export default defineComponent({
     });
 
     const oncheckEditStatus = (callBack: any) => {
+      showHeadFlag.value = false;
       if (prepareStore.getIsEditResource) {
         eventGlobal.emit('pageBeforeLeave', () => callBack());
       } else {
@@ -79,6 +80,7 @@ export default defineComponent({
     };
     const suggestionOptionRef = ref();
     const resetPwd = () => {
+      showHeadFlag.value = false;
       showWord.value = true;
       userInfoStatus.value = false;
     };

+ 5 - 5
src/views/attend-class/index.tsx

@@ -1261,16 +1261,16 @@ export default defineComponent({
         id: 12
       },
       {
-        name: '切换章节',
-        icon: bottomIconSwitch,
-        id: 13
-      },
-      {
         name: '资源列表',
         icon: bottomIconResource,
         id: 14
       },
       {
+        name: '切换章节',
+        icon: bottomIconSwitch,
+        id: 13
+      },
+      {
         name: '曲目资源',
         icon: rightIconMusic,
         id: 9

+ 2 - 1
src/views/prepare-lessons/components/lesson-main/courseware-presets/index.module.less

@@ -88,6 +88,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
+      z-index: 99;
 
       svg {
         transform: rotate(180deg);
@@ -260,7 +261,7 @@
   justify-content: flex-start;
   padding: 10px 20px 12px;
   // padding: 0 20px 0px;
-  gap: 10px 0;
+  gap: 20px 0;
   margin: 0 -10px 0;
   // height: 313px;
 

+ 6 - 1
src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -605,7 +605,12 @@ export default defineComponent({
         </div>
 
         <div class={styles.presetsRight} id="presetsRightRef">
-          <NTooltip showArrow={false} animated={false} duration={0} delay={0}>
+          <NTooltip
+            showArrow={false}
+            show={false}
+            animated={false}
+            duration={0}
+            delay={0}>
             {{
               trigger: () => (
                 <div

+ 1 - 0
src/views/prepare-lessons/components/lesson-main/courseware/index.tsx

@@ -274,6 +274,7 @@ export default defineComponent({
           content: '该资源已下架,是否删除?',
           positiveText: '确定',
           negativeText: '取消',
+          maskClosable: false,
           onPositiveClick: async () => {
             forms.removeIds.push(item.id);
             await teacherKnowledgeMaterialDelete({ ids: item.id });

+ 1 - 0
src/views/prepare-lessons/components/lesson-main/train/index.tsx

@@ -178,6 +178,7 @@ export default defineComponent({
           content: '该训练已下架,是否删除?',
           positiveText: '确定',
           negativeText: '取消',
+          maskClosable: false,
           onPositiveClick: async () => {
             forms.removeIds.push(item.id);
             await lessonPreTrainingDelete({ ids: item.id });

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

@@ -7,7 +7,7 @@
 
   &:hover {
     // background: #FFFFFF;
-    box-shadow: 0 2px 15px 0 rgba(0, 0, 0, 0.1);
+    // box-shadow: 0 2px 15px 0 rgba(0, 0, 0, 0.1);
     border-radius: 15px;
     transition: all .2s ease;
 

+ 17 - 15
src/views/prepare-lessons/model/select-resources/index.tsx

@@ -1,5 +1,5 @@
 import { NTabPane, NTabs } from 'naive-ui';
-import { defineComponent, onMounted, ref, toRefs } from 'vue';
+import { defineComponent, nextTick, onMounted, ref, toRefs } from 'vue';
 import styles from './index.module.less';
 import SelectItem from './select-item';
 import { useResizeObserver } from '@vueuse/core';
@@ -25,20 +25,22 @@ export default defineComponent({
     const catchStore = useCatchStore();
 
     onMounted(async () => {
-      useResizeObserver(
-        document.querySelector(
-          '.select-resource .n-tabs-nav--top'
-        ) as HTMLElement,
-        (entries: any) => {
-          const entry = entries[0];
-          const { height } = entry.contentRect;
-          console.log(height, 'height - 11');
-          document.documentElement.style.setProperty(
-            '--modal-lesson-tab-height',
-            height + 'px'
-          );
-        }
-      );
+      nextTick(() => {
+        useResizeObserver(
+          document.querySelector(
+            '.select-resource .n-tabs-nav--top'
+          ) as HTMLElement,
+          (entries: any) => {
+            const entry = entries[0];
+            const { height } = entry.contentRect;
+            console.log(height, 'height - 11');
+            document.documentElement.style.setProperty(
+              '--modal-lesson-tab-height',
+              height + 'px'
+            );
+          }
+        );
+      });
       // 获取教材分类列表
       await catchStore.getMusicSheetCategory(true);
     });

+ 1 - 0
src/views/setting/components/schoolInfo/index.tsx

@@ -233,6 +233,7 @@ export default defineComponent({
         content: `是否${statuStr}"${row.nickname}"?`,
         positiveText: '确定',
         negativeText: '取消',
+        maskClosable: false,
         onPositiveClick: async () => {
           await api_tenantInfoUpdateStatus({
             ids: [row.id],