diff --git a/apps/application/api/application_chat.py b/apps/application/api/application_chat.py
index e8e57c65362..5ace76513aa 100644
--- a/apps/application/api/application_chat.py
+++ b/apps/application/api/application_chat.py
@@ -1,17 +1,21 @@
 # coding=utf-8
 """
-    @project: MaxKB
-    @Author：虎虎
-    @file： application_chat.py
-    @date：2025/6/10 13:54
-    @desc:
+@project: MaxKB
+@Author：虎虎
+@file： application_chat.py
+@date：2025/6/10 13:54
+@desc:
 """
+
 from django.utils.translation import gettext_lazy as _
 from drf_spectacular.types import OpenApiTypes
 from drf_spectacular.utils import OpenApiParameter
 
-from application.serializers.application_chat import ApplicationChatQuerySerializers, \
-    ApplicationChatResponseSerializers, ApplicationChatRecordExportRequest
+from application.serializers.application_chat import (
+    ApplicationChatQuerySerializers,
+    ApplicationChatResponseSerializers,
+    ApplicationChatRecordExportRequest,
+)
 from common.mixins.api_mixin import APIMixin
 from common.result import ResultSerializer, ResultPageSerializer
 
@@ -38,16 +42,17 @@ def get_parameters():
                 name="workspace_id",
                 description="工作空间id",
                 type=OpenApiTypes.STR,
-                location='path',
+                location="path",
                 required=True,
             ),
             OpenApiParameter(
                 name="application_id",
                 description="application ID",
                 type=OpenApiTypes.STR,
-                location='path',
+                location="path",
                 required=True,
-            ), OpenApiParameter(
+            ),
+            OpenApiParameter(
                 name="start_time",
                 description="start Time",
                 type=OpenApiTypes.STR,
@@ -71,6 +76,12 @@ def get_parameters():
                 type=OpenApiTypes.STR,
                 required=False,
             ),
+            OpenApiParameter(
+                name="source",
+                description="source",
+                type=OpenApiTypes.STR,
+                required=False,
+            ),
             OpenApiParameter(
                 name="min_star",
                 description=_("Minimum number of likes"),
@@ -109,17 +120,16 @@ def get_parameters():
                 name="current_page",
                 description=_("Current page"),
                 type=OpenApiTypes.INT,
-                location='path',
+                location="path",
                 required=True,
             ),
             OpenApiParameter(
                 name="page_size",
                 description=_("Page size"),
                 type=OpenApiTypes.INT,
-                location='path',
+                location="path",
                 required=True,
             ),
-
         ]
 
     @staticmethod
diff --git a/apps/application/serializers/application.py b/apps/application/serializers/application.py
index e0edf3e8a70..e78a21f5d12 100644
--- a/apps/application/serializers/application.py
+++ b/apps/application/serializers/application.py
@@ -547,6 +547,16 @@ class ApplicationQueryRequest(serializers.Serializer):
         label=_("Publish status"),
         choices=[("published", _("Published")), ("unpublished", _("Unpublished"))],
     )
+    status = serializers.ChoiceField(
+        required=False,
+        label=_("Publish status"),
+        choices=[
+            ("published", _("Published")),
+            ("unpublished", _("Unpublished")),
+            ("on_portal", _("On portal")),
+        ],
+    )
+    type = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("Application type"))
     user_id = serializers.UUIDField(required=False, label=_("User ID"))
     create_user = serializers.CharField(required=False, allow_null=True, allow_blank=True, label=_("create user"))
 
@@ -584,6 +594,14 @@ def get_query_set(self, instance: Dict, workspace_manage: bool, is_x_pack_ee: bo
         if publish_status is not None:
             is_publish = True if publish_status == "published" else False
             application_query_set = application_query_set.filter(is_publish=is_publish)
+        status = instance.get("status")
+        if status is not None:
+            if status == "unpublished":
+                application_query_set = application_query_set.filter(is_publish=False)
+            elif status == "published":
+                application_query_set = application_query_set.filter(is_publish=True)
+            elif status == "on_portal":
+                application_query_set = application_query_set.filter(is_portal=True)
         if workspace_id is not None:
             folder_query_set = folder_query_set.filter(workspace_id=workspace_id)
             application_query_set = application_query_set.filter(workspace_id=workspace_id)
@@ -599,6 +617,9 @@ def get_query_set(self, instance: Dict, workspace_manage: bool, is_x_pack_ee: bo
             application_query_set = application_query_set.filter(desc__contains=desc)
         if create_user is not None:
             application_query_set = application_query_set.filter(user_id=create_user)
+        application_type = instance.get("type")
+        if application_type:
+            application_query_set = application_query_set.filter(type=application_type)
         application_custom_sql_query_set = application_query_set
         application_query_set = application_query_set.order_by("-create_time")
 
diff --git a/apps/application/serializers/application_chat.py b/apps/application/serializers/application_chat.py
index 0236b178eb5..28f01096796 100644
--- a/apps/application/serializers/application_chat.py
+++ b/apps/application/serializers/application_chat.py
@@ -58,6 +58,7 @@ class ApplicationChatQuerySerializers(serializers.Serializer):
     start_time = serializers.DateField(format="%Y-%m-%d", label=_("Start time"))
     end_time = serializers.DateField(format="%Y-%m-%d", label=_("End time"))
     application_id = serializers.UUIDField(required=True, label=_("Application ID"))
+    source = serializers.CharField(required=False, allow_blank=True, allow_null=True, label=_("Source"))
     min_star = serializers.IntegerField(required=False, min_value=0, label=_("Minimum number of likes"))
     min_trample = serializers.IntegerField(required=False, min_value=0, label=_("Minimum number of clicks"))
     comparer = serializers.CharField(
@@ -96,6 +97,7 @@ def get_query_set(self, select_ids=None):
                     "application_chat.application_id": models.CharField(),
                     "application_chat.abstract": models.CharField(),
                     "application_chat.asker": models.JSONField(),
+                    "application_chat.source": models.JSONField(),
                     "star_num": models.IntegerField(),
                     "trample_num": models.IntegerField(),
                     "comparer": models.CharField(),
@@ -113,6 +115,8 @@ def get_query_set(self, select_ids=None):
         }
         if "abstract" in self.data and self.data.get("abstract") is not None:
             base_query_dict["application_chat.abstract__icontains"] = self.data.get("abstract")
+        if "source" in self.data and self.data.get("source") is not None:
+            base_query_dict["application_chat.source__type"] = self.data.get("source")
         if select_ids is not None and len(select_ids) > 0:
             base_query_dict["application_chat.id__in"] = select_ids
         base_condition = Q(**base_query_dict)
diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py
index 0ab20ed9a6b..93e1c37cdd4 100644
--- a/apps/knowledge/serializers/knowledge.py
+++ b/apps/knowledge/serializers/knowledge.py
@@ -231,6 +231,7 @@ class Query(serializers.Serializer):
             max_length=256,
             min_length=1,
         )
+        type = serializers.IntegerField(required=False, label=_("knowledge type"), allow_null=True)
         user_id = serializers.UUIDField(required=False, label=_("user id"), allow_null=True)
         scope = serializers.CharField(required=False, label=_("knowledge scope"), allow_null=True)
         create_user = serializers.UUIDField(required=False, label=_("create user"), allow_null=True)
@@ -250,6 +251,7 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
                     {
                         "temp.name": models.CharField(),
                         "temp.desc": models.CharField(),
+                        "temp.type": models.IntegerField(),
                         "document_temp.char_length": models.IntegerField(),
                         "temp.create_time": models.DateTimeField(),
                         "temp.user_id": models.CharField(),
@@ -268,6 +270,8 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
             if "name" in self.data and self.data.get("name") is not None:
                 query_set = query_set.filter(**{"temp.name__icontains": self.data.get("name")})
                 folder_query_set = folder_query_set.filter(**{"name__icontains": self.data.get("name")})
+            if "type" in self.data and self.data.get("type") is not None:
+                query_set = query_set.filter(**{"temp.type": self.data.get("type")})
             if "workspace_id" in self.data and self.data.get("workspace_id") is not None:
                 query_set = query_set.filter(**{"temp.workspace_id": self.data.get("workspace_id")})
                 folder_query_set = folder_query_set.filter(**{"workspace_id": self.data.get("workspace_id")})
diff --git a/apps/knowledge/views/knowledge.py b/apps/knowledge/views/knowledge.py
index 3dc79210ec2..19b6668982d 100644
--- a/apps/knowledge/views/knowledge.py
+++ b/apps/knowledge/views/knowledge.py
@@ -301,6 +301,7 @@ def get(self, request: Request, workspace_id: str, current_page: int, page_size:
                         "folder_id": request.query_params.get("folder_id"),
                         "name": request.query_params.get("name"),
                         "desc": request.query_params.get("desc"),
+                        "type": request.query_params.get("type"),
                         "scope": KnowledgeScope.WORKSPACE,
                         "user_id": request.user.id,
                         "create_user": request.query_params.get("create_user"),
diff --git a/apps/tools/serializers/tool.py b/apps/tools/serializers/tool.py
index 095170ea508..946f70be341 100644
--- a/apps/tools/serializers/tool.py
+++ b/apps/tools/serializers/tool.py
@@ -623,7 +623,7 @@ def convert_value(name: str, value: str, _type: str, is_required: bool):
                 return None
             try:
                 return common_convert_value(_type, value)
-            except Exception as e:
+            except Exception:
                 raise AppApiException(
                     500,
                     _("Field: {name} Type: {type} Value: {value} Type conversion error").format(
@@ -1087,7 +1087,7 @@ def update_template_workflow(self, tool_id: str):
             tool_instance_bytes = self.data.get("file").read()
             try:
                 tool_instance = RestrictedUnpickler(io.BytesIO(tool_instance_bytes)).load()
-            except Exception as e:
+            except Exception:
                 raise AppApiException(1001, _("Unsupported file format"))
             tool = tool_instance.tool
             tool["id"] = tool_id
@@ -1109,7 +1109,7 @@ def import_(self, scope=ToolScope.WORKSPACE, name=None, source=None):
             tool_instance_bytes = self.data.get("file").read()
             try:
                 tool_instance = RestrictedUnpickler(io.BytesIO(tool_instance_bytes)).load()
-            except Exception as e:
+            except Exception:
                 raise AppApiException(1001, _("Unsupported file format"))
             if self.data.get("folder_id") is None:
                 folder_id = self.data.get("workspace_id")
@@ -1731,6 +1731,7 @@ class Query(serializers.Serializer):
             child=serializers.CharField(), required=False, label=_("tool type list"), allow_null=True, allow_empty=True
         )
         create_user = serializers.UUIDField(required=False, label=_("create user"), allow_null=True)
+        is_active = serializers.BooleanField(required=False, label=_("is active"), allow_null=True)
 
         def page_tool(self, current_page: int, page_size: int):
             self.is_valid(raise_exception=True)
@@ -1792,6 +1793,10 @@ def get_query_set(self, workspace_manage, is_x_pack_ee):
             if scope is not None:
                 tool_query_set = tool_query_set.filter(scope=scope)
 
+            is_active = self.data.get("is_active")
+            if is_active is not None:
+                tool_query_set = tool_query_set.filter(is_active=is_active)
+
             tool_type_list = self.data.get("tool_type_list")
             if tool_type_list:
                 tool_query_set = tool_query_set.filter(tool_type__in=tool_type_list)
diff --git a/apps/tools/views/tool.py b/apps/tools/views/tool.py
index 346ee7eeb31..3417c94335e 100644
--- a/apps/tools/views/tool.py
+++ b/apps/tools/views/tool.py
@@ -347,6 +347,7 @@ def get(self, request: Request, workspace_id: str, current_page: int, page_size:
                         "tool_type": request.query_params.get("tool_type"),
                         "user_id": request.user.id,
                         "create_user": request.query_params.get("create_user"),
+                        "is_active": request.query_params.get("is_active"),
                     }
                 ).page_tool_with_folders(current_page, page_size)
             )
diff --git a/ui/src/components/business/related-resources-drawer/index.vue b/ui/src/components/business/related-resources-drawer/index.vue
index 80025286c12..ae7cbb46d0f 100644
--- a/ui/src/components/business/related-resources-drawer/index.vue
+++ b/ui/src/components/business/related-resources-drawer/index.vue
@@ -33,7 +33,6 @@ const resourceTypeOptions = Object.entries(resourceLabels).map(([value, label])
 const searchFields = [
   { label: '名称', value: 'resource_name' },
   { label: '创建者', value: 'user_name' },
-  { label: '类型', value: 'resource_type', multiple: true, options: resourceTypeOptions },
 ]
 const relationTabs = [
   { value: 'dependency', label: '依赖' },
@@ -53,12 +52,13 @@ const resourceRows = computed(() =>
 )
 const pagination = ref({ currentPage: 1, pageSize: 20, total: 0 })
 const searchQuery = ref<Dict<unknown>>({})
+const selectedResourceType = ref<string | null>(null)
 
 function loadResources() {
   if (!visible.value || !targetResource.value) return
   const isDependency = relationDirection.value === 'dependency'
-  const { resource_type, ...query } = searchQuery.value
-  if (resource_type) query[isDependency ? 'target_type' : 'source_type'] = resource_type
+  const query: Dict<unknown> = { ...searchQuery.value }
+  if (selectedResourceType.value) query[isDependency ? 'target_type' : 'source_type'] = [selectedResourceType.value]
   if (showWorkspace.value && selectedWorkspaceIds.value.length) query.workspace_ids = JSON.stringify(selectedWorkspaceIds.value)
   const request = isDependency ? props.api.getUsingResources : props.api.getUsedByResources
   loading.value = true
@@ -80,16 +80,17 @@ function searchResources(query?: Dict<unknown>) {
 
 function changeDirection() {
   searchQuery.value = {}
+  selectedResourceType.value = null
   selectedWorkspaceIds.value = []
   relatedResources.value = []
   pagination.value = { currentPage: 1, pageSize: 20, total: 0 }
   loadResources()
 }
 
-/* 工作空间筛选：确认或重置后从第一页查询。 */
+/* 表头筛选：确认或重置后从第一页查询。 */
 const workspaceOptions = ref<OptionItem<string>[]>([])
 const selectedWorkspaceIds = ref<string[]>([])
-function handleWorkspaceFilterChange() {
+function handleFilterChange() {
   pagination.value.currentPage = 1
   loadResources()
 }
@@ -130,6 +131,7 @@ function resetData() {
   relatedResources.value = []
   pagination.value = { currentPage: 1, pageSize: 20, total: 0 }
   searchQuery.value = {}
+  selectedResourceType.value = null
   relationDirection.value = 'dependency'
   workspaceOptions.value = []
   selectedWorkspaceIds.value = []
@@ -183,6 +185,9 @@ defineExpose({ open, close })
         </el-table-column>
         <el-table-column prop="desc" label="描述" min-width="160" show-overflow-tooltip />
         <el-table-column label="类型" min-width="100">
+          <template #header>
+            <MkTableFilter mode="single" v-model="selectedResourceType" label="类型" :options="resourceTypeOptions" @change="handleFilterChange" />
+          </template>
           <template #default="{ row }">{{ resourceLabels[row.resourceType as ResourceType] }}</template>
         </el-table-column>
         <el-table-column v-if="showWorkspace" prop="workspace_name" label="工作空间" min-width="140" show-overflow-tooltip>
@@ -193,7 +198,7 @@ defineExpose({ open, close })
               v-model="selectedWorkspaceIds"
               label="工作空间"
               :options="workspaceOptions"
-              @change="handleWorkspaceFilterChange"
+              @change="handleFilterChange"
             />
           </template>
         </el-table-column>
diff --git a/ui/src/views/application-detail/chat-log/index.vue b/ui/src/views/application-detail/chat-log/index.vue
index 4890adaced9..225be333af1 100644
--- a/ui/src/views/application-detail/chat-log/index.vue
+++ b/ui/src/views/application-detail/chat-log/index.vue
@@ -25,9 +25,11 @@ const { application } = useApplicationDetailContext()
 const loading = ref(false)
 const chatLogs = ref<ChatLog[]>([])
 const paginationConfig = ref({ currentPage: 1, pageSize: 20, total: 0 })
+const sourceOptions: OptionItem<string>[] = Object.entries(CHAT_LOG_SOURCE_LABELS).map(([value, label]) => ({ value, label }))
 const searchFields: OptionItem<string>[] = [
   { label: '摘要', value: 'abstract' },
   { label: '用户', value: 'username' },
+  { label: '来源', value: 'source', options: sourceOptions },
 ]
 const chatLogSearchQuery = ref<Dict<unknown>>()
 const chatLogDateQuery = ref({ start_time: beforeDay(7), end_time: beforeDay(0) })
@@ -44,9 +46,12 @@ function handleDateFilterChange({ startTime, endTime }: MkDateRangeValue) {
   return loadChatLogs()
 }
 
-// 反馈筛选的草稿、重置和确认由 MkTableFilter 管理
-const feedbackResetValue = { min_star: 0, min_trample: 0 }
-const feedbackFilter = ref({ ...feedbackResetValue })
+// 表头用户反馈筛选，单选复用 min_star/min_trample 参数
+const selectedFeedback = ref<string | null>(null)
+const feedbackOptions: OptionItem<string>[] = [
+  { label: '赞同', value: 'star' },
+  { label: '反对', value: 'trample' },
+]
 
 function handleFeedbackChange() {
   paginationConfig.value.currentPage = 1
@@ -56,7 +61,8 @@ function handleFeedbackChange() {
 const chatLogQuery = computed<Dict<unknown>>(() => ({
   ...chatLogSearchQuery.value,
   ...chatLogDateQuery.value,
-  ...feedbackFilter.value,
+  ...(selectedFeedback.value === 'star' ? { min_star: 1 } : {}),
+  ...(selectedFeedback.value === 'trample' ? { min_trample: 1 } : {}),
   comparer: 'and',
 }))
 
@@ -184,45 +190,7 @@ onMounted(() => loadChatLogs())
     <el-table-column prop="chat_record_count" label="对话次数" width="100" />
     <el-table-column width="140">
       <template #header>
-        <MkTableFilter
-          v-model="feedbackFilter"
-          mode="custom"
-          label="用户反馈"
-          width="180"
-          :reset-value="feedbackResetValue"
-          @change="handleFeedbackChange"
-        >
-          <template #default="{ value }">
-            <div class="space-y-3">
-              <div class="flex-between gap-2">
-                <span>赞同 ≥</span>
-                <el-input-number
-                  v-model="value.min_star"
-                  class="w-25!"
-                  size="small"
-                  controls-position="right"
-                  align="left"
-                  :min="0"
-                  :value-on-clear="0"
-                  step-strictly
-                />
-              </div>
-              <div class="flex-between gap-2">
-                <span>反对 ≥</span>
-                <el-input-number
-                  v-model="value.min_trample"
-                  class="w-25!"
-                  size="small"
-                  controls-position="right"
-                  align="left"
-                  :min="0"
-                  :value-on-clear="0"
-                  step-strictly
-                />
-              </div>
-            </div>
-          </template>
-        </MkTableFilter>
+        <MkTableFilter v-model="selectedFeedback" mode="single" label="用户反馈" :options="feedbackOptions" @change="handleFeedbackChange" />
       </template>
       <template #default="{ row }">
         <span v-if="!row.star_num && !row.trample_num">-</span>
diff --git a/ui/src/views/application-detail/chat-user/index.vue b/ui/src/views/application-detail/chat-user/index.vue
index 5d21270e839..8462e2370bf 100644
--- a/ui/src/views/application-detail/chat-user/index.vue
+++ b/ui/src/views/application-detail/chat-user/index.vue
@@ -46,18 +46,24 @@ function handleSelectGroup(group: ChatUserAuthorizationGroup) {
 
 // 用户筛选与分页，仅维护当前页的授权勾选
 const chatUsers = ref<ChatUserAuthorization[]>([])
-const chatUserQuery = ref<Dict<unknown>>()
+const chatUserSearchQuery = ref<Dict<unknown>>()
 const paginationConfig = ref({ currentPage: 1, pageSize: 20, total: 0 })
 const searchFields: OptionItem<string>[] = [
-  { label: '用户名', value: 'username' },
   { label: '姓名', value: 'nick_name' },
-  {
-    label: '用户来源',
-    value: 'source',
-    options: Object.entries(LOGIN_METHOD_LABELS).map(([value, label]) => ({ value, label: value === LOGIN_METHOD.LOCAL ? '本地创建' : label })),
-  },
+  { label: '用户名', value: 'username' },
 ]
 
+// 表头用户来源筛选
+const selectedSource = ref<string | null>(null)
+const sourceOptions: OptionItem<string>[] = Object.entries(LOGIN_METHOD_LABELS).map(([value, label]) => ({
+  label: value === LOGIN_METHOD.LOCAL ? '本地创建' : label,
+  value,
+}))
+const chatUserQuery = computed<Dict<unknown>>(() => ({
+  ...chatUserSearchQuery.value,
+  ...(selectedSource.value !== null ? { source: selectedSource.value } : {}),
+}))
+
 function formatUserSource(source: string) {
   if (source === LOGIN_METHOD.LOCAL) return '本地创建'
   if (source === 'OAUTH2') return LOGIN_METHOD_LABELS[LOGIN_METHOD.OAUTH2]
@@ -80,7 +86,12 @@ function refreshChatUsers() {
 }
 
 function handleSearchChange(query?: Dict<unknown>) {
-  chatUserQuery.value = query
+  chatUserSearchQuery.value = query
+  paginationConfig.value.currentPage = 1
+  return refreshChatUsers()
+}
+
+function handleSourceChange() {
   paginationConfig.value.currentPage = 1
   return refreshChatUsers()
 }
@@ -180,6 +191,9 @@ onMounted(() => loadChatUserGroups())
           <el-table-column prop="nick_name" label="姓名" show-overflow-tooltip />
           <el-table-column prop="username" label="用户名" show-overflow-tooltip />
           <el-table-column prop="source" label="用户来源" show-overflow-tooltip>
+            <template #header>
+              <MkTableFilter mode="single" v-model="selectedSource" label="用户来源" :options="sourceOptions" @change="handleSourceChange" />
+            </template>
             <template #default="{ row }">{{ formatUserSource(row.source) }}</template>
           </el-table-column>
           <el-table-column :width="140" align="center">
diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue
index eb1bfb70ac1..63d873d209e 100644
--- a/ui/src/views/application/index.vue
+++ b/ui/src/views/application/index.vue
@@ -6,7 +6,7 @@ import ApplicationApi from '@/api/admin/workspace/application/application'
 import RelatedResourcesApi from '@/api/admin/workspace/related-resources'
 import ResourceTriggerApi from '@/api/admin/workspace/trigger/resource-trigger'
 import type { ApplicationDetail, Dict, FolderItem, OptionItem } from '@/api/types'
-import { RESOURCE_TYPE } from '@/api/enums'
+import { APPLICATION_TYPE, RESOURCE_TYPE } from '@/api/enums'
 import { FOLDER_ENTRIES, FOLDER_ENTRY_ID } from '@/constants'
 import FolderTree from '@/components/business/folder-tree/index.vue'
 import MoveToDialog from '@/components/business/folder-tree/MoveToDialog.vue'
@@ -59,15 +59,24 @@ const infiniteScrollRef = useTemplateRef<{ reset: () => Promise<void> }>('infini
 const creatorOptions = ref<OptionItem<string>[]>([])
 const searchFields = computed(() => [
   { label: '名称', value: 'name' },
-  { label: '创建者', value: 'create_user', options: creatorOptions.value, remoteMethod: loadCreatorOptions },
   {
-    label: '发布状态',
-    value: 'publish_status',
+    label: '状态',
+    value: 'status',
     options: [
-      { label: '已发布', value: 'published' },
       { label: '未发布', value: 'unpublished' },
+      { label: '已发布', value: 'published' },
+      { label: '已上架', value: 'on_portal' },
+    ],
+  },
+  {
+    label: '类型',
+    value: 'type',
+    options: [
+      { label: '简易', value: APPLICATION_TYPE.SIMPLE },
+      { label: '高级', value: APPLICATION_TYPE.WORK_FLOW },
     ],
   },
+  { label: '创建者', value: 'create_user', options: creatorOptions.value, remoteMethod: loadCreatorOptions },
 ])
 const applicationQuery = ref<Dict<unknown>>()
 
diff --git a/ui/src/views/knowledge-detail/library/tags/AssociatedDocumentDrawer.vue b/ui/src/views/knowledge-detail/library/tags/AssociatedDocumentDrawer.vue
index a77629e133f..d0f1148120d 100644
--- a/ui/src/views/knowledge-detail/library/tags/AssociatedDocumentDrawer.vue
+++ b/ui/src/views/knowledge-detail/library/tags/AssociatedDocumentDrawer.vue
@@ -149,8 +149,7 @@ defineExpose({ open })
           <MkIcon :name="activeTab === 'linked' ? 'icon_unlink_outlined' : 'icon_link-record_outlined'" />
           <span>{{ activeTab === 'linked' ? '取消关联' : '关联' }}</span>
         </el-button>
-        <MkSearchInput v-if="activeTab === 'linked'" v-model="searchName" class="w-60!" @change="handleDocumentFilterChange" />
-        <MkComplexSearch v-else :fields="[{ label: '名称', value: 'name' }]" @change="handleComplexSearchChange" />
+        <MkComplexSearch :key="activeTab" :fields="[{ label: '名称', value: 'name' }]" @change="handleComplexSearchChange" />
       </div>
       <MkTable
         ref="documentTableRef"
diff --git a/ui/src/views/knowledge-detail/library/tags/index.vue b/ui/src/views/knowledge-detail/library/tags/index.vue
index 9635df2ac97..673c27234de 100644
--- a/ui/src/views/knowledge-detail/library/tags/index.vue
+++ b/ui/src/views/knowledge-detail/library/tags/index.vue
@@ -6,7 +6,7 @@ import type { ResourceDetailPageProps } from '@/layout/ResourceDetailLayout.vue'
 import TagsApi from '@/api/admin/workspace/knowledge/tags'
 import KnowledgeApi from '@/api/admin/workspace/knowledge/knowledge'
 import DocumentApi from '@/api/admin/workspace/knowledge/document'
-import type { KnowledgeTagGroup, KnowledgeTagUpdatePayload } from '@/api/types'
+import type { Dict, KnowledgeTagGroup, KnowledgeTagUpdatePayload } from '@/api/types'
 import { MsgConfirm, MsgSuccess } from '@/utils/message'
 import CreateTagDialog from './components/CreateTagDialog.vue'
 import EditTagDialog from './components/EditTagDialog.vue'
@@ -74,7 +74,8 @@ function loadTags() {
     })
 }
 
-function handleSearchChange() {
+function handleSearchChange(query?: Dict<unknown>) {
+  searchText.value = typeof query?.name === 'string' ? query.name : ''
   tagPage.value.currentPage = 1
   clearSelection()
 }
@@ -178,7 +179,7 @@ onMounted(() => {
     <div class="flex-between gap-4">
       <h4>{{ title }}</h4>
       <div class="flex-align-center">
-        <MkSearchInput v-model="searchText" class="w-60! mr-3" :disabled="loading || operationLoading" @input="handleSearchChange" />
+        <MkComplexSearch :fields="[{ label: '名称', value: 'name' }]" class="mr-3" @change="handleSearchChange" />
         <!-- 导入标签，成功后刷新列表 -->
         <ButtonImportTags :api="TagsApi" :knowledge-id="knowledgeId" :disabled="loading || operationLoading" @refresh="loadTags" />
         <!-- 创建标签 -->
diff --git a/ui/src/views/knowledge/index.vue b/ui/src/views/knowledge/index.vue
index d621361cd6f..dc41564cc1d 100644
--- a/ui/src/views/knowledge/index.vue
+++ b/ui/src/views/knowledge/index.vue
@@ -75,6 +75,16 @@ const infiniteScrollRef = useTemplateRef<{ reset: () => Promise<void> }>('infini
 const creatorOptions = ref<OptionItem<string>[]>([])
 const searchFields = computed(() => [
   { label: '名称', value: 'name' },
+  {
+    label: '类型',
+    value: 'type',
+    options: [
+      { value: KNOWLEDGE_TYPE.BASE, label: '通用知识库' },
+      { value: KNOWLEDGE_TYPE.WEB, label: 'Web 知识库' },
+      { value: KNOWLEDGE_TYPE.LARK, label: '飞书知识库' },
+      { value: KNOWLEDGE_TYPE.WORKFLOW, label: '工作流知识库' },
+    ],
+  },
   { label: '创建者', value: 'create_user', options: creatorOptions.value, remoteMethod: loadCreatorOptions },
 ])
 const knowledgeQuery = ref<Dict<unknown>>()
diff --git a/ui/src/views/tool/index.vue b/ui/src/views/tool/index.vue
index 27685931f9f..5de84a334f7 100644
--- a/ui/src/views/tool/index.vue
+++ b/ui/src/views/tool/index.vue
@@ -60,6 +60,14 @@ const infiniteScrollRef = useTemplateRef<{ reset: () => Promise<void> }>('infini
 const creatorOptions = ref<OptionItem<string>[]>([])
 const searchFields = computed(() => [
   { label: '名称', value: 'name' },
+  {
+    label: '状态',
+    value: 'is_active',
+    options: [
+      { value: true, label: '已启用' },
+      { value: false, label: '已禁用' },
+    ],
+  },
   { label: '创建者', value: 'create_user', options: creatorOptions.value, remoteMethod: loadCreatorOptions },
 ])
 const toolQuery = ref<Dict<unknown>>()
diff --git a/ui/src/views/trigger/index.vue b/ui/src/views/trigger/index.vue
index f2d7a4b016a..4466caef7b9 100644
--- a/ui/src/views/trigger/index.vue
+++ b/ui/src/views/trigger/index.vue
@@ -15,30 +15,29 @@ import perm from '@/permission/index.ts'
 const loading = ref(false)
 const triggerData = ref<Trigger[]>([])
 const paginationConfig = ref({ currentPage: 1, pageSize: 20, total: 0 })
-const triggerQuery = ref<Dict<unknown>>({})
+const triggerSearchQuery = ref<Dict<unknown>>({})
 const triggerTypeLabels: Record<TriggerType, string> = {
   [TRIGGER_TYPE.SCHEDULED]: '定时触发',
   [TRIGGER_TYPE.EVENT]: '事件触发',
 }
+const triggerTypeOptions = Object.entries(triggerTypeLabels).map(([value, label]) => ({ value, label }))
+const triggerStatusOptions = [
+  { label: '已启用', value: true },
+  { label: '已禁用', value: false },
+]
 const creatorOptions = ref<OptionItem<string>[]>([])
 const searchFields = computed(() => [
   { label: '名称', value: 'name' },
-  {
-    label: '类型',
-    value: 'type',
-    options: Object.entries(triggerTypeLabels).map(([value, label]) => ({ value, label })),
-  },
   { label: '任务', value: 'task' },
-  {
-    label: '状态',
-    value: 'is_active',
-    options: [
-      { label: '已启用', value: 'true' },
-      { label: '已禁用', value: 'false' },
-    ],
-  },
   { label: '创建者', value: 'create_user', options: creatorOptions.value, remoteMethod: loadCreatorOptions },
 ])
+const selectedTriggerType = ref<string | null>(null)
+const selectedStatus = ref<boolean | null>(null)
+const triggerQuery = computed<Dict<unknown>>(() => ({
+  ...triggerSearchQuery.value,
+  ...(selectedTriggerType.value ? { type: selectedTriggerType.value } : {}),
+  ...(selectedStatus.value !== null ? { is_active: selectedStatus.value } : {}),
+}))
 
 function loadCreatorOptions(keyword: string) {
   return CommonApi.getAllUsers(keyword ? { nick_name: keyword } : undefined).then((users) => {
@@ -60,7 +59,13 @@ function loadTriggers(): Promise<void> {
 
 function handleSearchChange(query?: Dict<unknown>) {
   tableRef.value?.clearSelection()
-  triggerQuery.value = query ?? {}
+  triggerSearchQuery.value = query ?? {}
+  paginationConfig.value.currentPage = 1
+  loadTriggers()
+}
+
+function handleFilterChange() {
+  tableRef.value?.clearSelection()
   paginationConfig.value.currentPage = 1
   loadTriggers()
 }
@@ -183,9 +188,27 @@ onMounted(() => loadTriggers())
           </template>
         </el-table-column>
         <el-table-column prop="trigger_type" label="类型" width="120">
+          <template #header>
+            <MkTableFilter
+              mode="single"
+              v-model="selectedTriggerType"
+              label="类型"
+              :options="triggerTypeOptions"
+              @change="handleFilterChange"
+            />
+          </template>
           <template #default="{ row }">{{ triggerTypeLabels[row.trigger_type as TriggerType] || row.trigger_type }}</template>
         </el-table-column>
         <el-table-column prop="is_active" label="启用状态" width="120">
+          <template #header>
+            <MkTableFilter
+              mode="single"
+              v-model="selectedStatus"
+              label="状态"
+              :options="triggerStatusOptions"
+              @change="handleFilterChange"
+            />
+          </template>
           <template #default="{ row }"><MkStatusLabel :active="row.is_active" /></template>
         </el-table-column>
         <el-table-column prop="desc" label="描述" min-width="170" show-overflow-tooltip />
diff --git a/ui/src/views/workflow/tool/execution-record/ExecutionRecordDrawer.vue b/ui/src/views/workflow/tool/execution-record/ExecutionRecordDrawer.vue
index b69e0239a5b..fb7eadfe852 100644
--- a/ui/src/views/workflow/tool/execution-record/ExecutionRecordDrawer.vue
+++ b/ui/src/views/workflow/tool/execution-record/ExecutionRecordDrawer.vue
@@ -16,33 +16,30 @@ const visible = ref(false)
 const loading = ref(false)
 const recordData = ref<ToolExecutionRecord[]>([])
 const pagination = ref({ currentPage: 1, pageSize: 20, total: 0 })
-const searchQuery = ref<Dict<unknown>>()
+const searchInput = ref<Dict<unknown>>({})
 const sourceLabels = {
   [TOOL_RECORD_SOURCE.APPLICATION]: '智能体',
   [TOOL_RECORD_SOURCE.KNOWLEDGE]: '知识库',
   [TOOL_RECORD_SOURCE.TRIGGER]: '触发器',
 }
-const searchFields = [
-  { label: '触发来源', value: 'source_name' },
-  {
-    label: '状态',
-    value: 'state',
-    options: [
-      { label: EXECUTION_STATUS_OPTIONS[STATE_TYPES.SUCCESS].label, value: STATE_TYPES.SUCCESS },
-      { label: EXECUTION_STATUS_OPTIONS[STATE_TYPES.STARTED].label, value: STATE_TYPES.STARTED },
-      { label: EXECUTION_STATUS_OPTIONS[STATE_TYPES.FAILURE].label, value: STATE_TYPES.FAILURE },
-    ],
-  },
-  {
-    label: '资源类型',
-    value: 'source_type',
-    options: [
-      { label: sourceLabels[TOOL_RECORD_SOURCE.APPLICATION], value: TOOL_RECORD_SOURCE.APPLICATION },
-      { label: sourceLabels[TOOL_RECORD_SOURCE.KNOWLEDGE], value: TOOL_RECORD_SOURCE.KNOWLEDGE },
-      { label: sourceLabels[TOOL_RECORD_SOURCE.TRIGGER], value: TOOL_RECORD_SOURCE.TRIGGER },
-    ],
-  },
+const sourceTypeOptions = [
+  { label: sourceLabels[TOOL_RECORD_SOURCE.APPLICATION], value: TOOL_RECORD_SOURCE.APPLICATION },
+  { label: sourceLabels[TOOL_RECORD_SOURCE.KNOWLEDGE], value: TOOL_RECORD_SOURCE.KNOWLEDGE },
+  { label: sourceLabels[TOOL_RECORD_SOURCE.TRIGGER], value: TOOL_RECORD_SOURCE.TRIGGER },
 ]
+const stateOptions = [
+  { label: EXECUTION_STATUS_OPTIONS[STATE_TYPES.SUCCESS].label, value: STATE_TYPES.SUCCESS },
+  { label: EXECUTION_STATUS_OPTIONS[STATE_TYPES.STARTED].label, value: STATE_TYPES.STARTED },
+  { label: EXECUTION_STATUS_OPTIONS[STATE_TYPES.FAILURE].label, value: STATE_TYPES.FAILURE },
+]
+const searchFields = [{ label: '触发来源', value: 'source_name' }]
+const selectedSourceType = ref<string | null>(null)
+const selectedState = ref<string | null>(null)
+const searchQuery = computed<Dict<unknown>>(() => ({
+  ...searchInput.value,
+  ...(selectedSourceType.value ? { source_type: selectedSourceType.value } : {}),
+  ...(selectedState.value ? { state: selectedState.value } : {}),
+}))
 function loadRecords(page = pagination.value.currentPage): Promise<ToolExecutionRecord[]> {
   loading.value = true
   return props.api
@@ -58,13 +55,20 @@ function loadRecords(page = pagination.value.currentPage): Promise<ToolExecution
 }
 
 function searchRecords(query?: Dict<unknown>) {
-  searchQuery.value = query ?? {}
+  searchInput.value = query ?? {}
+  pagination.value.currentPage = 1
+  loadRecords()
+}
+
+function handleFilterChange() {
   pagination.value.currentPage = 1
   loadRecords()
 }
 
 function open() {
-  searchQuery.value = undefined
+  searchInput.value = {}
+  selectedSourceType.value = null
+  selectedState.value = null
   closeDetails()
   recordData.value = []
   pagination.value = { currentPage: 1, pageSize: 20, total: 0 }
@@ -140,9 +144,27 @@ defineExpose({ open })
         </template>
       </el-table-column>
       <el-table-column label="类型" width="90">
+        <template #header>
+          <MkTableFilter
+            mode="single"
+            v-model="selectedSourceType"
+            label="类型"
+            :options="sourceTypeOptions"
+            @change="handleFilterChange"
+          />
+        </template>
         <template #default="{ row }">{{ sourceLabels[row.source_type as keyof typeof sourceLabels] || '-' }}</template>
       </el-table-column>
       <el-table-column label="状态" width="100">
+        <template #header>
+          <MkTableFilter
+            mode="single"
+            v-model="selectedState"
+            label="状态"
+            :options="stateOptions"
+            @change="handleFilterChange"
+          />
+        </template>
         <template #default="{ row }: { row: ToolExecutionRecord }">
           <MkStatusLabel v-if="EXECUTION_STATUS_OPTIONS[row.state]" v-bind="EXECUTION_STATUS_OPTIONS[row.state]" />
           <span v-else>{{ row.state }}</span>