Browse Source

Merge branch 'hotfix_v1.0.0_release' into release_1.3.8

chenhao 2 years ago
parent
commit
d090dde693

+ 5 - 1
.gitignore

@@ -30,4 +30,8 @@ quokka*.js
 
 devLoginParams.ts
 
-dist.zip
+dist.zip
+
+metadata.md
+
+paper.json

+ 1 - 1
src/components/QmButton.vue

@@ -27,7 +27,7 @@ let parentOnClick = attrs.onClick as (e: Event) => void;
 delete newAttrs["onClick"];
 
 let inInterval = $ref(false);
-const insideClick = (e: MouseEvent | PointerEvent) => {
+const insideClick = (e: PointerEvent | MouseEvent) => {
   // console.log(e.pointerType);
   // 不允许键盘触发按钮事件,因为全局监听键盘事件的太多了
   if (e instanceof PointerEvent && e.pointerType === "") return;

+ 7 - 4
src/features/admin/confirmPaper/ConfirmPaper.vue

@@ -47,10 +47,10 @@
 
     <div class="tw-flex" style="height: calc(100% - 56px)">
       <div
-        style="flex: 0 1 420px"
+        style="flex: 0 1 420px; overflow: auto"
         class="tw-flex tw-flex-col tw-justify-between"
       >
-        <div class="tw-m-2">
+        <div class="tw-m-2 tw-flex-1 tw-overflow-auto">
           <div v-if="pageType === 'DATA_CHECK'">
             是否缺考:
             <a-radio-group v-if="student" v-model:value="student.absent">
@@ -79,7 +79,7 @@
                   group.subs.length
                 }})
               </h2>
-              <div class="tw-flex tw-gap-4">
+              <div class="tw-flex tw-flex-wrap tw-gap-4">
                 <div v-for="question in group.subs" :key="question.subNumber">
                   <span>{{ question.subNumber }}. </span>
                   <a-input
@@ -265,7 +265,9 @@ async function getSetting() {
 
 async function getNextStudent() {
   const wantedIndex = allIds.indexOf(currentStudentId);
-  student = await getStudent(allIds[wantedIndex + 1]);
+  if (allIds[wantedIndex + 1]) {
+    student = await getStudent(allIds[wantedIndex + 1]);
+  }
 }
 
 async function getPreviousStudent() {
@@ -351,6 +353,7 @@ async function saveStudentAnswer() {
     void message.error("保存失败,请刷新页面。");
   } else {
     void message.success("保存成功");
+    await getNextStudent()
   }
 
   if (setting.studentIds.length === 0) {

+ 2 - 2
src/features/mark/MarkHistory.vue

@@ -13,8 +13,8 @@
         type="text"
         placeholder="查找试卷"
         class="tw-flex-1 tw-rounded tw-h-8 tw-pl-1 tw-pr-8"
-        @keydown.stop
-        @keypress.stop
+        @keydown.stop=""
+        @keypress.stop=""
         @keyup.enter="searchHistoryTask"
       />
       <SearchOutlined