Merge branch 'iteration-upload-0327' into iteration-20240417-subject

src/views/natural-resources/components/my-resources/save-modal/index.tsx

@@ -88,24 +88,26 @@ export default defineComponent({
     const uploadList = ref([] as any);
 
     // 获取文件后缀名
-    // function getFileExtension(filename: string) {
-    //   return filename.slice(((filename.lastIndexOf('.') - 1) >>> 0) + 2);
-    // }
+    function getFileExtension(filename: string) {
+      return filename.slice(((filename.lastIndexOf('.') - 1) >>> 0) + 2);
+    }
 
-    // // 判断是否是允许的文件类型
-    // function isAllowedFileType(filename: string, allowedExtensions: any) {
-    //   const extension = getFileExtension(filename).toLowerCase();
-    //   return allowedExtensions.includes(extension);
-    // }
+    // 判断是否是允许的文件类型
+    function isAllowedFileType(filename: string, allowedExtensions: any) {
+      const extension = getFileExtension(filename).toLowerCase();
+      return allowedExtensions.includes(extension);
+    }
 
     const onBeforeUpload = async (options: any) => {
       const file = options.file;
       // 文件大小
       let isLt2M = true;
 
-      // JPG、PNG、MP3、MP4、PPT
-      // const filename = 'example.jpg';
-      // const allowedExtensions = ['jpg', 'jpeg', 'png', 'mp4', 'ppt'];
+      const allowedExtensions = ['jpg', 'jpeg', 'png', 'mp4', 'ppt', 'pptx'];
+      if (!isAllowedFileType(file.file.name, allowedExtensions)) {
+        message.error('文件格式不支持');
+        return false;
+      }
 
       const type = file.type.includes('image')
         ? NaturalTypeEnum.IMG

src/views/studentList/components/baseInfo.tsx

@@ -274,7 +274,7 @@ export default defineComponent({
                 class={styles.btn}
                 strong
                 color="#f24433"
-                disabled={historyClassStudent.value}
+                disabled={historyClassStudent.value ? true : false}
                 onClick={() => (data.disabled = false)}>
                 修改信息
               </NButton>

src/views/studentList/index.tsx

@@ -110,7 +110,7 @@ export default defineComponent({
         gradeLevel: ''
       };
       if (state.popSelectYearList.length > 1) {
-        state.searchForm.gradeYear = state.popSelectYearList[0].id;
+        state.searchForm.gradeYear = state.popSelectYearList[1].id;
       }
       search();
       setCache({ current: state.searchForm, saveKey: route.path });