From fb0b297234cadf303974d63f03fa0dec460dabc9 Mon Sep 17 00:00:00 2001
From: RubyLiu <liulubingjava@163.com>
Date: Mon, 5 Feb 2024 16:19:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA&=E6=97=A0=E9=A1=B9=E7=9B=AE=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/App.vue                              |  4 +++-
 .../components/pure/ms-advance-filter/index.vue   | 15 ++++++++-------
 frontend/src/views/bug-management/index.vue       |  5 ++---
 frontend/src/views/bug-management/recycle.vue     |  2 ++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index ede3e8e7b8..50ac3ae5bc 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -79,7 +79,9 @@
         const res = await getProjectInfo(appStore.currentProjectId);
         if (res && (res.deleted || !res.enable)) {
           // 如果项目被删除或者被禁用，跳转到无项目页面
-          router.push(NO_PROJECT_ROUTE_NAME);
+          router.push({
+            name: NO_PROJECT_ROUTE_NAME,
+          });
           return;
         }
         appStore.setCurrentMenuConfig(res?.moduleIds || []);
diff --git a/frontend/src/components/pure/ms-advance-filter/index.vue b/frontend/src/components/pure/ms-advance-filter/index.vue
index d72fb02f93..07ef59fd8d 100644
--- a/frontend/src/components/pure/ms-advance-filter/index.vue
+++ b/frontend/src/components/pure/ms-advance-filter/index.vue
@@ -3,14 +3,14 @@
     <slot name="left"></slot>
     <div class="flex flex-row gap-[8px]">
       <a-input-search
-        v-model="innerKeyword"
+        v-model:modelValue="innerKeyword"
         size="small"
         :placeholder="props.searchPlaceholder"
         class="w-[240px]"
         allow-clear
         @press-enter="emit('keywordSearch', innerKeyword, filterResult)"
         @search="emit('keywordSearch', innerKeyword, filterResult)"
-        @clear="emit('keywordSearch', innerKeyword, filterResult)"
+        @clear="handleClear"
       ></a-input-search>
       <MsTag
         :type="visible ? 'primary' : 'default'"
@@ -49,8 +49,6 @@
 </template>
 
 <script setup lang="ts">
-  import { useVModel } from '@vueuse/core';
-
   import MsIcon from '@/components/pure/ms-icon-font/index.vue';
   import MsTag from '../ms-tag/ms-tag.vue';
   import FilterForm from './FilterForm.vue';
@@ -64,11 +62,9 @@
     filterConfigList: FilterFormItem[]; // 系统字段
     customFieldsConfigList?: FilterFormItem[]; // 自定义字段
     searchPlaceholder?: string;
-    keyword?: string;
   }>();
 
   const emit = defineEmits<{
-    (e: 'update:keyword', value: string): void;
     (e: 'keywordSearch', value: string | undefined, combine: FilterResult): void; // innerKeyword 搜索 TODO:可以去除，父组件通过 v-model:keyword 获取关键字
     (e: 'advSearch', value: FilterResult): void; // 高级搜索
     (e: 'dataIndexChange', value: string): void; // 高级搜索选项变更
@@ -76,7 +72,7 @@
   }>();
 
   const { t } = useI18n();
-  const innerKeyword = useVModel(props, 'keyword', emit);
+  const innerKeyword = defineModel<string>('keyword', { default: '' });
   const visible = ref(false);
   const filterCount = ref(0);
   const defaultFilterResult: FilterResult = { accordBelow: 'AND', combine: {} };
@@ -100,6 +96,11 @@
     emit('dataIndexChange', dataIndex);
   };
 
+  const handleClear = () => {
+    innerKeyword.value = '';
+    emit('keywordSearch', '', filterResult.value);
+  };
+
   const handleOpenFilter = () => {
     visible.value = !visible.value;
   };
diff --git a/frontend/src/views/bug-management/index.vue b/frontend/src/views/bug-management/index.vue
index 59c40cff4f..2018ec2a15 100644
--- a/frontend/src/views/bug-management/index.vue
+++ b/frontend/src/views/bug-management/index.vue
@@ -1,6 +1,7 @@
 <template>
   <MsCard simple>
     <MsAdvanceFilter
+      v-model:keyword="keyword"
       :filter-config-list="filterConfigList"
       :row-count="filterRowCount"
       @keyword-search="fetchData"
@@ -173,7 +174,7 @@
 
   import { BugEditCustomField, BugListItem } from '@/models/bug-management';
   import { RouteEnum } from '@/enums/routeEnum';
-  import { ColumnEditTypeEnum, TableKeyEnum } from '@/enums/tableEnum';
+  import { TableKeyEnum } from '@/enums/tableEnum';
 
   import { useRequest } from 'ahooks-vue';
 
@@ -278,7 +279,6 @@
     },
     {
       title: 'bugManagement.bugName',
-      editType: ColumnEditTypeEnum.INPUT,
       dataIndex: 'title',
       width: 300,
       showTooltip: true,
@@ -409,7 +409,6 @@
 
   const fetchData = async (v = '') => {
     setKeyword(v);
-    keyword.value = v;
     await loadList();
   };
 
diff --git a/frontend/src/views/bug-management/recycle.vue b/frontend/src/views/bug-management/recycle.vue
index 3985202521..adf174aa5e 100644
--- a/frontend/src/views/bug-management/recycle.vue
+++ b/frontend/src/views/bug-management/recycle.vue
@@ -1,6 +1,7 @@
 <template>
   <MsCard simple>
     <MsAdvanceFilter
+      v-model:keyword="keyword"
       :search-placeholder="t('bugManagement.recycle.searchPlaceholder')"
       :filter-config-list="filterConfigList"
       :row-count="filterRowCount"
@@ -65,6 +66,7 @@
   const projectId = computed(() => appStore.currentProjectId);
   const filterVisible = ref(false);
   const filterRowCount = ref(0);
+  const keyword = ref('');
   const filterConfigList = reactive<FilterFormItem[]>([
     {
       title: 'bugManagement.ID',