更新样式

src/views/attend-class/model/train-type/index.tsx

@@ -74,7 +74,7 @@ export default defineComponent({
               src={props.item.trainingType === 'EVALUATION' ? eTag : pTag}
               class={styles['title-tag']}
             />
-            <NEllipsis class={styles['title-text']}>
+            <NEllipsis class={styles['title-text']} tooltip={false}>
               {props.item.musicName}
             </NEllipsis>
           </div>

src/views/prepare-lessons/components/directory-main/select-lessonware/index.module.less

@@ -25,10 +25,11 @@
 }
 
 .classList {
-  min-height: 50vh;
+  min-height: 60vh;
   max-height: 60vh;
 
   .content {
+    min-height: 60vh;
     padding: 32px 40px;
   }
 }

src/views/prepare-lessons/components/directory-main/select-lessonware/index.tsx

@@ -8,6 +8,7 @@ import {
   NScrollbar,
   NSelect,
   NSpace,
+  NSpin,
   useDialog,
   useMessage
 } from 'naive-ui';
@@ -16,34 +17,46 @@ import AddTeaching, {
 } from '/src/views/natural-resources/model/add-teaching';
 import { lessonCoursewarePage, lessonCoursewareRemove } from '../../../api';
 import iconUploadBg from '../images/icon-upload-bg.svg';
+import { useCatchStore } from '/src/store/modules/catchData';
+import { useThrottleFn } from '@vueuse/core';
 
 export default defineComponent({
   name: 'select-lessonware',
   emits: ['close', 'confirm'],
   setup(props, { emit }) {
+    const catchStore = useCatchStore();
     const dialog = useDialog();
     const message = useMessage();
     const forms = reactive({
-      currentGradeNum: null,
-      bookType: null,
+      loading: false,
       list: [] as any[],
       teachingStatus: false,
-      selectItem: {} as any
+      selectItem: {} as any,
+      bookVersionId: null,
+      keyword: null,
+      currentGradeNum: null,
+      bookType: null
     });
 
     const getLessonCourseware = async () => {
+      forms.loading = true;
       try {
         const { data } = await lessonCoursewarePage({
           page: 1,
           rows: 99,
           type: 'COURSEWARE',
-          enableFlag: 1
+          enableFlag: 1,
+          bookVersionId: forms.bookVersionId,
+          keyword: forms.keyword,
+          currentGradeNum: forms.currentGradeNum,
+          bookType: forms.bookType
         });
 
         forms.list = data.rows;
       } catch {
         //
       }
+      forms.loading = false;
     };
 
     // 删除教材
@@ -64,35 +77,47 @@ export default defineComponent({
       });
     };
 
+    const throttledFn = useThrottleFn(() => getLessonCourseware(), 500);
+
     const onDetail = (item: any) => {
       emit('confirm', item);
       emit('close');
     };
 
-    onMounted(() => {
+    onMounted(async () => {
+      // 获取教材分类列表
+      await catchStore.getMusicSheetCategory();
       getLessonCourseware();
     });
     return () => (
       <div class={styles.selectLessonware}>
         <div class={styles.attendClassSearch}>
-          <NInput placeholder="请输入班级名称" clearable>
+          <NInput
+            placeholder="请输入班级名称"
+            clearable
+            v-model:value={forms.keyword}
+            onKeyup={(e: KeyboardEvent) => {
+              if (e.code === 'Enter') {
+                throttledFn();
+              }
+            }}
+            onClear={() => throttledFn()}>
             {{
-              prefix: () => <span class="icon-search-input"></span>
+              prefix: () => (
+                <span
+                  class="icon-search-input"
+                  onClick={() => throttledFn()}></span>
+              )
             }}
           </NInput>
           <NSelect
             placeholder="版本"
             clearable
-            options={[
-              {
-                label: '一年级',
-                value: '1'
-              },
-              {
-                label: '二年级',
-                value: '2'
-              }
-            ]}
+            options={catchStore.getMusicCategories}
+            labelField="name"
+            valueField="id"
+            v-model:value={forms.bookVersionId}
+            onUpdate:value={() => throttledFn()}
           />
           <NSelect
             placeholder="请选择年级"
@@ -100,16 +125,18 @@ export default defineComponent({
             v-model:value={forms.currentGradeNum}
             clearable
             filterable
+            onUpdate:value={() => throttledFn()}
           />
           <NSelect
             placeholder="请选择册别"
             options={BOOK_DATA.bookTypes}
             v-model:value={forms.bookType}
             clearable
+            onUpdate:value={() => throttledFn()}
           />
         </div>
         <NScrollbar class={styles.classList}>
-          <div class={styles.content}>
+          <NSpin show={forms.loading} class={styles.content}>
             <NSpace size={[50, 40]}>
               <div
                 class={styles.item}
@@ -188,7 +215,7 @@ export default defineComponent({
                 );
               })}
             </NSpace>
-          </div>
+          </NSpin>
         </NScrollbar>
 
         {/* 添加自定义教材 */}

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

@@ -106,6 +106,11 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
+            if (forms.coursewareList.length <= 0) {
+              forms.drag = false;
+              message.success('编辑成功');
+              return;
+            }
             const temp: any = [];
             forms.coursewareList.forEach((item: any) => {
               temp.push({
@@ -170,6 +175,14 @@ export default defineComponent({
               <NButton
                 type="error"
                 onClick={() => {
+                  forms.drag = false;
+                  getList();
+                }}>
+                退出编辑
+              </NButton>
+              <NButton
+                type="error"
+                onClick={() => {
                   forms.coursewareList = [];
                   prepareStore.setCoursewareList([]);
                 }}>

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

@@ -50,6 +50,11 @@ export default defineComponent({
         negativeText: '取消',
         onPositiveClick: async () => {
           try {
+            if (forms.trainList.length <= 0) {
+              forms.drag = false;
+              message.success('编辑成功');
+              return;
+            }
             // 保存课件
             await lessonPreTrainingBatchSave(forms.trainList);
 
@@ -159,6 +164,14 @@ export default defineComponent({
               <NButton
                 type="error"
                 onClick={() => {
+                  forms.drag = false;
+                  getList();
+                }}>
+                退出编辑
+              </NButton>
+              <NButton
+                type="error"
+                onClick={() => {
                   forms.trainList = [];
                   prepareStore.setTrainList([]);
                 }}>

src/views/prepare-lessons/components/resource-main/components/resource-item/index.module.less

@@ -3,6 +3,14 @@
   max-height: calc(var(--window-page-lesson-height) - 224px - 20px);
   // overflow-x: auto;
 
+  &.listNoMusic {
+    max-height: calc(var(--window-page-lesson-height) - 224px - 20px + 60px);
+
+    .listSection {
+      min-height: calc(var(--window-page-lesson-height) - 224px - 20px + 60px);
+    }
+  }
+
   .listSection {
     min-height: calc(var(--window-page-lesson-height) - 224px - 20px);
   }

src/views/prepare-lessons/components/resource-main/components/resource-item/index.tsx

@@ -155,7 +155,10 @@ export default defineComponent({
           onSearch={(item: any) => onSearch(item)}
         />
         <NScrollbar
-          class={styles.listContainer}
+          class={[
+            styles.listContainer,
+            state.searchGroup.type !== 'MUSIC' ? styles.listNoMusic : ''
+          ]}
           onScroll={(e: any) => {
             const clientHeight = e.target?.clientHeight;
             const scrollTop = e.target?.scrollTop;

src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.module.less

@@ -2,7 +2,7 @@
   padding: 0 20px;
 
   .searchSelect {
-    padding: 20px 0;
+    padding: 20px 0 0;
     display: flex;
     justify-content: flex-start;
     gap: 0px 16px;
@@ -22,6 +22,8 @@
 }
 
 .inputSearch {
+  margin-top: 20px;
+
   :global {
     .n-input-wrapper {
       padding-left: 12px;

src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.tsx

@@ -67,19 +67,21 @@ export default defineComponent({
             ))}
           </NSpace>
 
-          <div class={styles.searchSelect}>
-            <NSelect
-              placeholder="教材"
-              options={catchStore.getMusicCategories}
-              clearable
-              labelField="name"
-              valueField="id"
-              v-model:value={forms.bookVersionId}
-              onUpdate:value={() => {
-                onSearch();
-              }}
-            />
-          </div>
+          {forms.type === 'MUSIC' && (
+            <div class={styles.searchSelect}>
+              <NSelect
+                placeholder="教材"
+                options={catchStore.getMusicCategories}
+                clearable
+                labelField="name"
+                valueField="id"
+                v-model:value={forms.bookVersionId}
+                onUpdate:value={() => {
+                  onSearch();
+                }}
+              />
+            </div>
+          )}
 
           <NInput
             type="text"