fix race condition

CCU-Class · Jan 18, 2024 · b7c28eb · b7c28eb
1 parent eada47c
commit b7c28eb
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/components/pages/main/courseCard.vue b/src/components/pages/main/courseCard.vue
@@ -21,7 +21,7 @@
                     <!-- 反面 -->
                     <div v-else id="back">
                         <div>
-                            <commonOption @click.stop="delete_course_card(item), setConflictState(true)">刪除</commonOption>
+                            <commonOption @click.stop="delete_course_card(item)">刪除</commonOption>
                             <commonOption @click="openColorTemplate(item, 1)">修改顏色</commonOption>
                             <commonOption @click="openColorTemplate(item, 2)">文字樣式</commonOption>
                             <commonOption @click="show_comment(item.getId())">查看評價</commonOption>
@@ -101,8 +101,9 @@
         // if(color != )
     }
 
-    let delete_course_card = function(item){
-        console.log(item);
+    let delete_course_card = async function(item){
+        await setConflictState(1)
+        await setConflictState(2)
         if(item.getCredit() != null){
             decreaseCredit(item.getCredit())
         }

diff --git a/src/components/pages/main/inputArea.vue b/src/components/pages/main/inputArea.vue
@@ -60,7 +60,7 @@
                                 <td> {{ item.getStartTime() }} </td>
                                 <td>
                                     <button class = "bg-gray-700 py-2 my-1 px-6 rounded-lg text-white hover:bg-gray-500"
-                                        v-on:click="delete_course(item), setConflictState(true)">
+                                        v-on:click="delete_course(item)">
                                         刪除
                                     </button>
                                 </td>
@@ -148,9 +148,11 @@ watch(toggleActive1, (inputValue) => {
     }
 })
 
-var delete_course = function(item)
+var delete_course = async function(item)
 {
     // 刪除課程
+    await setConflictState(1);
+    await setConflictState(2);
     if(item.getCredit() != null){
         decreaseCredit(item.getCredit())
     }

diff --git a/src/components/pages/main/search_box.vue b/src/components/pages/main/search_box.vue
@@ -87,7 +87,7 @@ const setConflictState = (state) => store.dispatch("setrunConflictState", state)
 
 
 watch(runConflictState, async (state) => {
-    if(state){
+    if(state == 2){
         data.value = data.value.map(temp => {
             temp['conflict'] = classconflict(temp);
             return temp;

diff --git a/src/components/pages/main/serach_modes/department.vue b/src/components/pages/main/serach_modes/department.vue
@@ -86,7 +86,7 @@ const classClick = (item) => {
 };
 
 watch(runConflictState, async (state) => {
-    if(state){
+    if(state == 1){
         courseList.value = courseList.value.map(temp => {
             temp['conflict'] = classconflict(temp);
             temp['click'] = false;
@@ -123,7 +123,8 @@ async function clickDepartment()
     });
     let coursedata = await getCourseByDepartment(departmentInput.value);
     courseList.value = coursedata;
-    setConflictState(true);
+    // department 給 1
+    setConflictState(1)
     show_search_list.value = true;
 }
 

diff --git a/src/store/course.ts b/src/store/course.ts
@@ -18,7 +18,7 @@ interface State {
     searchTime_status: boolean;
     timeSearchMode: boolean;
     timeSearchArgument: Array<number>;
-    runConflict: boolean;
+    runConflict: number;
 }
 
 function Transfer(data : any)
@@ -58,7 +58,7 @@ const store: Module<State, any> = {
         searchTime_status: false,
         timeSearchMode: false,
         timeSearchArgument: [0, 0, 0],
-        runConflict: false
+        runConflict: 0
     },
     mutations: {
         display(state: State) {
@@ -172,7 +172,7 @@ const store: Module<State, any> = {
         settimeSearchArgument(state: State, arg: Array<number>){
             state.timeSearchArgument = arg;
         },
-        setrunConflictState(state: State, arg: boolean){
+        setrunConflictState(state: State, arg: number){
             state.runConflict = arg;
         }
     },
@@ -251,7 +251,7 @@ const store: Module<State, any> = {
         settimeSearchArgument(context: any, arg: Array<number>){
             context.commit("settimeSearchArgument", arg);
         },
-        setrunConflictState(context: any, arg: boolean){
+        setrunConflictState(context: any, arg: number){
             context.commit("setrunConflictState", arg);
         }
     }