浏览代码

fix 回评查找bug

Michael Wang 4 年之前
父节点
当前提交
83cc151334
共有 1 个文件被更改,包括 32 次插入34 次删除
  1. 32 34
      src/features/mark/MarkHistory.vue

+ 32 - 34
src/features/mark/MarkHistory.vue

@@ -13,10 +13,11 @@
         <template #icon><CloseOutlined /></template>
       </a-button>
     </div>
+    <!-- :value="secretNumberInput"
+        @change="updateSecretNumber" -->
     <div class="tw-mt-1 tw-mb-1 tw-flex">
       <input
-        :value="secretNumberInput"
-        @input="updateSecretNumber"
+        v-model="secretNumberInput"
         type="text"
         placeholder="查找试卷"
         class="
@@ -29,11 +30,15 @@
           tw-pl-1
           tw-pr-8
         "
-        @keyup.enter="updateHistoryTask({ secretNumber: secretNumberInput })"
+        @keyup.enter="
+          updateHistoryTask({ secretNumber: secretNumberInput, currentPage: 1 })
+        "
       />
       <SearchOutlined
         style="margin-left: -30px; font-size: 24px; padding: 3px"
-        @click="updateHistoryTask({ secretNumber: secretNumberInput })"
+        @click="
+          updateHistoryTask({ secretNumber: secretNumberInput, currentPage: 1 })
+        "
       />
     </div>
     <div class="tw-flex tw-justify-between">
@@ -130,21 +135,24 @@ export default defineComponent({
     const order = ref("markerTime" as MarkHistoryOrderBy);
     const sort = ref("DESC" as MarkHistorySortField);
 
-    watchEffect(async () => {
-      if (store.historyOpen) {
-        replaceCurrentTask(undefined);
-        await updateHistoryTask({
-          secretNumber: secretNumberInput.value,
-          order: order.value,
-          sort: sort.value,
-          pageNumber: currentPage.value,
-        });
-        replaceCurrentTask(store.historyTasks[0]);
-      } else {
-        replaceCurrentTask(store.tasks[0]);
-        store.historyTasks.splice(0);
+    watch(
+      () => [store.historyOpen, order, sort, currentPage],
+      async () => {
+        if (store.historyOpen) {
+          replaceCurrentTask(undefined);
+          await updateHistoryTask({
+            secretNumber: secretNumberInput.value,
+            order: order.value,
+            sort: sort.value,
+            pageNumber: currentPage.value,
+          });
+          replaceCurrentTask(store.historyTasks[0]);
+        } else {
+          replaceCurrentTask(store.tasks[0]);
+          store.historyTasks.splice(0);
+        }
       }
-    });
+    );
 
     watch(
       () => props.shouldReload,
@@ -216,21 +224,11 @@ export default defineComponent({
     function previousPage() {
       if (currentPage.value > 1) {
         currentPage.value -= 1;
-        // updateHistoryTask({
-        //   order: order.value,
-        //   sort: sort.value,
-        //   pageNumber: currentPage.value,
-        // });
       }
     }
     function nextPage() {
       if (store.historyTasks.length >= 10) {
         currentPage.value += 1;
-        // updateHistoryTask({
-        //   // order: order.value,
-        //   // sort: sort.value,
-        //   pageNumber: currentPage.value,
-        // });
       }
     }
 
@@ -242,11 +240,11 @@ export default defineComponent({
       }
     }
 
-    function _updateSecretNumber(event: Event) {
-      const inputEle = event.target as HTMLInputElement;
-      secretNumberInput.value = inputEle.value ?? "";
-    }
-    const updateSecretNumber = throttle(_updateSecretNumber, 1500);
+    // function _updateSecretNumber(event: Event) {
+    //   const inputEle = event.target as HTMLInputElement;
+    //   secretNumberInput.value = inputEle.value ?? "";
+    // }
+    // const updateSecretNumber = throttle(_updateSecretNumber, 100);
 
     return {
       store,
@@ -260,7 +258,7 @@ export default defineComponent({
       sort,
       order,
       toggleOrderBy,
-      updateSecretNumber,
+      // updateSecretNumber,
     };
   },
 });