From 288aa2c29b597ec2d36d248cb9206607fa991676 Mon Sep 17 00:00:00 2001
From: zhangzhanwei <zhanwei.zhang@fit2cloud.com>
Date: Fri, 27 Feb 2026 17:07:17 +0800
Subject: [PATCH] feat: Document List - Tag Optimization

---
 apps/knowledge/serializers/document.py        |  18 ++
 apps/knowledge/sql/list_document.sql          |  27 ++-
 apps/knowledge/views/document.py              |   4 +
 ui/src/locales/lang/en-US/views/document.ts   |   1 +
 ui/src/locales/lang/zh-CN/views/document.ts   |   1 +
 ui/src/locales/lang/zh-Hant/views/document.ts |   1 +
 ui/src/views/document/index.vue               | 220 ++++++++++++------
 ui/src/views/document/tag/MulAddTagDialog.vue |   9 +-
 ui/src/views/document/tag/TagDrawer.vue       |  22 +-
 .../views/document/tag/TagSettingDrawer.vue   |   3 +
 10 files changed, 218 insertions(+), 88 deletions(-)

diff --git a/apps/knowledge/serializers/document.py b/apps/knowledge/serializers/document.py
index 540cf65c5ca..5aa7d806244 100644
--- a/apps/knowledge/serializers/document.py
+++ b/apps/knowledge/serializers/document.py
@@ -392,16 +392,34 @@ class Query(serializers.Serializer):
         status = serializers.CharField(required=False, label=_('status'), allow_null=True, allow_blank=True)
         order_by = serializers.CharField(required=False, label=_('order by'), allow_null=True, allow_blank=True)
         tag = serializers.CharField(required=False, label=_('tag'), allow_null=True, allow_blank=True)
+        tag_ids = serializers.ListField(child=serializers.UUIDField(),allow_null=True,required=False,allow_empty=True)
+        no_tag = serializers.BooleanField(required=False,default=False, allow_null=True)
 
         def get_query_set(self):
             query_set = QuerySet(model=Document)
             query_set = query_set.filter(**{'knowledge_id': self.data.get("knowledge_id")})
+
+            tag_ids = self.data.get('tag_ids')
+            no_tag = self.data.get('no_tag')
             if 'name' in self.data and self.data.get('name') is not None:
                 query_set = query_set.filter(**{'name__icontains': self.data.get('name')})
             if 'hit_handling_method' in self.data and self.data.get('hit_handling_method') not in [None, '']:
                 query_set = query_set.filter(**{'hit_handling_method': self.data.get('hit_handling_method')})
             if 'is_active' in self.data and self.data.get('is_active') is not None:
                 query_set = query_set.filter(**{'is_active': self.data.get('is_active')})
+            if no_tag and tag_ids:
+                matched_doc_ids = QuerySet(DocumentTag).filter(tag_id__in=tag_ids).values_list('document_id', flat=True)
+                tagged_doc_ids = QuerySet(DocumentTag).values_list('document_id', flat=True)
+                query_set = query_set.filter(
+                    Q(id__in=matched_doc_ids) | ~Q(id__in=tagged_doc_ids)
+                )
+            elif no_tag:
+                tagged_doc_ids = QuerySet(DocumentTag).values_list('document_id', flat=True)
+                query_set = query_set.exclude(id__in=tagged_doc_ids)
+            elif tag_ids:
+                matched_doc_ids = QuerySet(DocumentTag).filter(tag_id__in=tag_ids).values_list('document_id', flat=True)
+                query_set = query_set.filter(id__in=matched_doc_ids)
+
             if 'status' in self.data and self.data.get('status') is not None:
                 task_type = self.data.get('task_type')
                 status = self.data.get('status')
diff --git a/apps/knowledge/sql/list_document.sql b/apps/knowledge/sql/list_document.sql
index 8b7891bf6e6..7ba7d741051 100644
--- a/apps/knowledge/sql/list_document.sql
+++ b/apps/knowledge/sql/list_document.sql
@@ -1,11 +1,28 @@
 SELECT * from (
 SELECT
-	"document".* ,
-	to_json("document"."meta") as meta,
-	to_json("document"."status_meta") as status_meta,
-	 (SELECT "count"("id") FROM "paragraph" WHERE document_id="document"."id") as "paragraph_count"
+    "document".*,
+    to_json("document"."meta") as meta,
+    to_json("document"."status_meta") as status_meta,
+    (SELECT "count"("id") FROM "paragraph" WHERE document_id = "document"."id") as "paragraph_count",
+    tag_agg.tag_count as "tag_count",
+    COALESCE(tag_agg.tags, '[]'::json) as "tags"
 FROM
-	"document" "document"
+    "document" "document"
+LEFT JOIN LATERAL (
+    SELECT
+        COUNT(*)::int as tag_count,
+        json_agg(
+            json_build_object(
+                'id', "tag"."id",
+                'key', "tag"."key",
+                'value', "tag"."value"
+            )
+            ORDER BY "tag"."key", "tag"."value"
+        ) as tags
+    FROM "document_tag" "document_tag"
+    INNER JOIN "tag" "tag" ON "tag"."id" = "document_tag"."tag_id"
+    WHERE "document_tag"."document_id" = "document"."id"
+) tag_agg ON TRUE
 ${document_custom_sql}
 ) temp
 ${order_by_query}
\ No newline at end of file
diff --git a/apps/knowledge/views/document.py b/apps/knowledge/views/document.py
index b87565bd40e..757e9fdb35e 100644
--- a/apps/knowledge/views/document.py
+++ b/apps/knowledge/views/document.py
@@ -639,6 +639,8 @@ class Page(APIView):
                            [PermissionConstants.KNOWLEDGE.get_workspace_knowledge_permission()], CompareConstants.AND),
         )
         def get(self, request: Request, workspace_id: str, knowledge_id: str, current_page: int, page_size: int):
+            raw_tags = request.query_params.getlist("tags[]")
+
             return result.success(DocumentSerializers.Query(
                 data={
                     'workspace_id': workspace_id,
@@ -646,6 +648,8 @@ def get(self, request: Request, workspace_id: str, knowledge_id: str, current_pa
                     'folder_id': request.query_params.get('folder_id'),
                     'name': request.query_params.get('name'),
                     'tag': request.query_params.get('tag'),
+                    'tag_ids': [tag for tag in raw_tags if tag != 'NO_TAG'],
+                    'no_tag': 'NO_TAG' in raw_tags,
                     'desc': request.query_params.get("desc"),
                     'user_id': request.query_params.get('user_id'),
                     'status': request.query_params.get('status'),
diff --git a/ui/src/locales/lang/en-US/views/document.ts b/ui/src/locales/lang/en-US/views/document.ts
index feb4bfcaa8e..9f8fa284abb 100644
--- a/ui/src/locales/lang/en-US/views/document.ts
+++ b/ui/src/locales/lang/en-US/views/document.ts
@@ -103,6 +103,7 @@ export default {
     key: 'Tag',
     value: 'Value',
     addTag: 'Add Tag',
+    noTag: 'No Tag',
     setting: 'Tag Settings',
     create: 'Create Tag',
     createValue: 'Create Tag Value',
diff --git a/ui/src/locales/lang/zh-CN/views/document.ts b/ui/src/locales/lang/zh-CN/views/document.ts
index 3ee22b21a28..ec8be3b642b 100644
--- a/ui/src/locales/lang/zh-CN/views/document.ts
+++ b/ui/src/locales/lang/zh-CN/views/document.ts
@@ -98,6 +98,7 @@ export default {
     key: '标签',
     value: '标签值',
     addTag: '添加标签',
+    noTag: '无标签',
     addValue: '添加标签值',
     setting: '标签设置',
     create: '创建标签',
diff --git a/ui/src/locales/lang/zh-Hant/views/document.ts b/ui/src/locales/lang/zh-Hant/views/document.ts
index 3209d3a96b2..9c737c2311e 100644
--- a/ui/src/locales/lang/zh-Hant/views/document.ts
+++ b/ui/src/locales/lang/zh-Hant/views/document.ts
@@ -99,6 +99,7 @@ export default {
     label: '標籤管理',
     key: '標籤',
     value: '標籤值',
+    noTag: '無標籤',
     addTag: '添加標籤',
     setting: '標籤設置',
     create: '創建標籤',
diff --git a/ui/src/views/document/index.vue b/ui/src/views/document/index.vue
index c9ed1f765dc..93ca7b74954 100644
--- a/ui/src/views/document/index.vue
+++ b/ui/src/views/document/index.vue
@@ -210,74 +210,6 @@
               :label="$t('views.document.fileStatus.label')"
               width="130"
             >
-              <template #header>
-                <div>
-                  <span>{{ $t('views.document.fileStatus.label') }}</span>
-                  <el-dropdown trigger="click" @command="dropdownHandle">
-                    <el-button
-                      style="margin-top: 1px"
-                      link
-                      :type="filterMethod['status'] ? 'primary' : ''"
-                    >
-                      <el-icon>
-                        <Filter />
-                      </el-icon>
-                    </el-button>
-                    <template #dropdown>
-                      <el-dropdown-menu style="width: 100px">
-                        <el-dropdown-item
-                          :class="filterMethod['status'] ? '' : 'is-active'"
-                          :command="beforeCommand('status', '')"
-                          class="justify-center"
-                          >{{ $t('common.status.all') }}
-                        </el-dropdown-item>
-                        <el-dropdown-item
-                          :class="filterMethod['status'] === State.SUCCESS ? 'is-active' : ''"
-                          class="justify-center"
-                          :command="beforeCommand('status', State.SUCCESS)"
-                          >{{ $t('common.status.success') }}
-                        </el-dropdown-item>
-                        <el-dropdown-item
-                          :class="filterMethod['status'] === State.FAILURE ? 'is-active' : ''"
-                          class="justify-center"
-                          :command="beforeCommand('status', State.FAILURE)"
-                          >{{ $t('common.status.fail') }}
-                        </el-dropdown-item>
-                        <el-dropdown-item
-                          :class="
-                            filterMethod['status'] === State.STARTED &&
-                            filterMethod['task_type'] == TaskType.EMBEDDING
-                              ? 'is-active'
-                              : ''
-                          "
-                          class="justify-center"
-                          :command="beforeCommand('status', State.STARTED, TaskType.EMBEDDING)"
-                          >{{ $t('views.document.fileStatus.EMBEDDING') }}
-                        </el-dropdown-item>
-                        <el-dropdown-item
-                          :class="filterMethod['status'] === State.PENDING ? 'is-active' : ''"
-                          class="justify-center"
-                          :command="beforeCommand('status', State.PENDING)"
-                          >{{ $t('views.document.fileStatus.PENDING') }}
-                        </el-dropdown-item>
-                        <el-dropdown-item
-                          :class="
-                            filterMethod['status'] === State.STARTED &&
-                            filterMethod['task_type'] === TaskType.GENERATE_PROBLEM
-                              ? 'is-active'
-                              : ''
-                          "
-                          class="justify-center"
-                          :command="
-                            beforeCommand('status', State.STARTED, TaskType.GENERATE_PROBLEM)
-                          "
-                          >{{ $t('views.document.fileStatus.GENERATE') }}
-                        </el-dropdown-item>
-                      </el-dropdown-menu>
-                    </template>
-                  </el-dropdown>
-                </div>
-              </template>
               <template #default="{ row }">
                 <StatusValue :status="row.status" :status-meta="row.status_meta"></StatusValue>
               </template>
@@ -357,6 +289,76 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column width="160">
+              <template #header>
+                <div>
+                  <span>{{ $t('views.document.tag.label') }}</span>
+                  <el-dropdown trigger="click" @visible-change="handleTagVisibleChange">
+                    <el-button
+                      style="margin-top: 1px"
+                      link
+                      :type="filterMethod['tags']?.length > 0 ? 'primary' : ''"
+                    >
+                      <el-icon>
+                        <Filter />
+                      </el-icon>
+                    </el-button>
+                    <template #dropdown>
+                      <div>
+                        <el-cascader-panel
+                          v-model="tagFilterValue"
+                          :options="tagFilterOptions"
+                          :props="{
+                            multiple: true,
+                            checkStrictly: true,
+                            emitPath: false,
+                            showPrefix: false,
+                          }"
+                          @change="(val: any) => dropdownHandle({ attr: 'tags', command: val })"
+                        />
+                      </div>
+                    </template>
+                  </el-dropdown>
+                </div>
+              </template>
+              <template #default="{ row }">
+                <el-popover
+                  trigger="hover"
+                  placement="bottom"
+                  :disabled="!row.tag_count"
+                  :width="160"
+                >
+                  <div v-for="tag in row.tags" :key="tag.id" flex class="pt-4">
+                    <span class="mr-8 color-input-placeholder">{{ tag.key }}</span
+                    >{{ tag.value }}
+                  </div>
+
+                  <template #reference>
+                    <el-space :size="4">
+                      <el-button
+                        size="small"
+                        style="padding: 1px 6px"
+                        @click.stop="openTagSettingDrawer(row)"
+                        :disabled="!permissionPrecise.doc_tag(id)"
+                      >
+                        <AppIcon iconName="app-tag"></AppIcon>
+                        <span>{{ row.tag_count || 0 }}</span>
+                      </el-button>
+                      <el-button
+                        size="small"
+                        plain
+                        style="padding: 1px 6px; border-style: dashed"
+                        :disabled="!permissionPrecise.doc_tag(id)"
+                        @click.stop="openAddTagDialog(row.id)"
+                      >
+                        <el-icon class="color-secondary"><Plus /></el-icon>
+                        <span class="color-secondary">{{ $t('views.document.tag.key') }}</span>
+                      </el-button>
+                    </el-space>
+                  </template>
+                </el-popover>
+              </template>
+            </el-table-column>
             <el-table-column width="170">
               <template #header>
                 <div>
@@ -734,15 +736,23 @@
       :workspaceId="knowledgeDetail?.workspace_id"
     />
     <GenerateRelatedDialog ref="GenerateRelatedDialogRef" @refresh="getList" :apiType="apiType" />
-    <TagDrawer ref="tagDrawerRef" />
-    <TagSettingDrawer ref="tagSettingDrawerRef" />
+    <TagDrawer ref="tagDrawerRef" @tag-changed="onTagChanged" />
+    <TagSettingDrawer
+      ref="tagSettingDrawerRef"
+      @refresh="
+        () => {
+          onTagChanged()
+          getList()
+        }
+      "
+    />
     <AddTagDialog ref="addTagDialogRef" @addTags="addTags" :apiType="apiType" />
     <!-- 执行详情 -->
     <ExecutionRecord ref="ListActionRef"></ExecutionRecord>
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount, computed } from 'vue'
+import { ref, onMounted, onBeforeUnmount, computed, reactive } from 'vue'
 import { useRouter, useRoute, onBeforeRouteLeave, onBeforeRouteUpdate } from 'vue-router'
 import type { ElTable } from 'element-plus'
 import ImportDocumentDialog from './component/ImportDocumentDialog.vue'
@@ -1359,6 +1369,61 @@ function openGenerateDialog(row?: any) {
   GenerateRelatedDialogRef.value.open(arr, 'document')
 }
 
+const tagFilterValue = ref<string[]>([])
+const tagFilterDirty = ref(false)
+const tagFilterOptions = ref<any[]>([])
+const tagFilterLoaded = ref(false)
+const tagFilterLoading = ref(false)
+
+function buildTagCascaderOptions(tags: any[]) {
+  const options = tags.map((group: any) => ({
+    label: group.key,
+    value: group.key,
+    children: (group.values || []).map((item: any) => ({
+      label: item.value,
+      value: item.id, // 叶子节点 tag.id
+    })),
+  }))
+
+  options.push({
+    label: t('views.document.tag.noTag'),
+    value: 'NO_TAG',
+    children: [],
+  })
+
+  return options
+}
+
+async function ensureTagFilterOptions(needRefresh = false) {
+  // 非刷新 && 已加载 && 非脏数据
+  if (!needRefresh && tagFilterLoaded.value && !tagFilterDirty.value) return
+
+  try {
+    tagFilterLoading.value = true
+    const params = {}
+    const res: any = await loadSharedApi({
+      type: 'knowledge',
+      systemType: apiType.value,
+      isShared: isShared.value,
+    }).getTags(id, params, tagFilterLoading)
+
+    tagFilterOptions.value = buildTagCascaderOptions(res?.data || [])
+    tagFilterLoaded.value = true
+    tagFilterDirty.value = false
+  } finally {
+    tagFilterLoading.value = false
+  }
+}
+
+async function handleTagVisibleChange(visible: boolean) {
+  if (!visible) return
+  await ensureTagFilterOptions()
+}
+
+function onTagChanged() {
+  tagFilterDirty.value = true
+}
+
 const tagDrawerRef = ref()
 function openTagDrawer() {
   tagDrawerRef.value.open()
@@ -1371,13 +1436,14 @@ function openTagSettingDrawer(doc: any) {
 
 const addTagDialogRef = ref()
 
-function openAddTagDialog() {
-  addTagDialogRef.value?.open()
+function openAddTagDialog(rowId?: string) {
+  addTagDialogRef.value?.open(rowId)
 }
 
-function addTags(tags: any) {
-  const arr: string[] = multipleSelection.value.map((v) => v.id)
-
+function addTags(tags: any, rowId?: string) {
+  const arr: string[] = multipleSelection.value.length
+    ? multipleSelection.value.map((v) => v.id)
+    : [rowId]
   loadSharedApi({ type: 'document', systemType: apiType.value })
     .postMulDocumentTags(id, { tag_ids: tags, document_ids: arr }, loading)
     .then(() => {
@@ -1399,7 +1465,7 @@ onMounted(() => {
   }
   getList()
   // 初始化定时任务
-  initInterval()
+  // initInterval()
 })
 
 onBeforeUnmount(() => {
diff --git a/ui/src/views/document/tag/MulAddTagDialog.vue b/ui/src/views/document/tag/MulAddTagDialog.vue
index f5bc859b0c0..2e00e4db628 100644
--- a/ui/src/views/document/tag/MulAddTagDialog.vue
+++ b/ui/src/views/document/tag/MulAddTagDialog.vue
@@ -168,6 +168,7 @@ const submit = () => {
     emit(
       'addTags',
       tagList.value.map((tag) => tag.value),
+      currentDocId.value,
     )
   })
 }
@@ -182,7 +183,9 @@ function getTags(Key?: string) {
 }
 
 function filterMethod(val: string) {
-  keyOptions.value = allKeyOptions.value.filter((item: any) => item.key.indexOf(val) > -1).slice(0, 100)
+  keyOptions.value = allKeyOptions.value
+    .filter((item: any) => item.key.indexOf(val) > -1)
+    .slice(0, 100)
 }
 
 const createTagDialogRef = ref()
@@ -191,8 +194,10 @@ function openCreateTagDialog(row?: any) {
   createTagDialogRef.value?.open(row)
 }
 
-const open = () => {
+const currentDocId = ref<string | undefined>()
+const open = (rowId?: string) => {
   getTags()
+  currentDocId.value = rowId
   dialogVisible.value = true
   tagList.value = [{}]
 }
diff --git a/ui/src/views/document/tag/TagDrawer.vue b/ui/src/views/document/tag/TagDrawer.vue
index c1e64cc01c3..df0daba0e74 100644
--- a/ui/src/views/document/tag/TagDrawer.vue
+++ b/ui/src/views/document/tag/TagDrawer.vue
@@ -126,8 +126,8 @@
       />
     </div>
   </el-drawer>
-  <CreateTagDialog ref="createTagDialogRef" @refresh="getList" />
-  <EditTagDialog ref="editTagDialogRef" @refresh="getList" />
+  <CreateTagDialog ref="createTagDialogRef" @refresh="handleDialogRefresh" />
+  <EditTagDialog ref="editTagDialogRef" @refresh="handleDialogRefresh" />
 </template>
 
 <script setup lang="ts">
@@ -140,7 +140,16 @@ import { t } from '@/locales'
 import EditTagDialog from '@/views/document/tag/EditTagDialog.vue'
 import permissionMap from '@/permission'
 
-const emit = defineEmits(['refresh'])
+const emit = defineEmits(['refresh', 'tag-changed'])
+
+function notifyTagChanged() {
+  emit('tag-changed')
+}
+
+function handleDialogRefresh() {
+  getList()
+  notifyTagChanged()
+}
 
 const route = useRoute()
 const {
@@ -270,7 +279,9 @@ const handleSelectionChange = async (val: any[]) => {
   // 以表格最终状态为准更新缓存（这里直接用传入 val 可能已过期）
   // 简化：重新从表格取 selection（Element Plus 有 store，没暴露就用 val\+补丁）
   multipleSelection.value = pagedTableData.value.filter((r) =>
-    tableRef.value?.getSelectionRows ? tableRef.value.getSelectionRows().some((s: any) => s.id === r.id) : selectedIds.has(r.id)
+    tableRef.value?.getSelectionRows
+      ? tableRef.value.getSelectionRows().some((s: any) => s.id === r.id)
+      : selectedIds.has(r.id),
   )
 }
 
@@ -291,6 +302,7 @@ function batchDelete() {
         .delMulTag(id, tagsToDelete)
         .then(() => {
           getList()
+          notifyTagChanged()
         })
     })
     .catch(() => {})
@@ -312,6 +324,7 @@ function delTag(row: any) {
         .delTag(id, row.id, 'key')
         .then(() => {
           getList()
+          notifyTagChanged()
         })
     })
     .catch(() => {})
@@ -331,6 +344,7 @@ function delTagValue(row: any) {
         .delTag(id, row.id, 'one')
         .then(() => {
           getList()
+          notifyTagChanged()
         })
     })
     .catch(() => {})
diff --git a/ui/src/views/document/tag/TagSettingDrawer.vue b/ui/src/views/document/tag/TagSettingDrawer.vue
index 62904d5c8c5..9349fd09ec5 100644
--- a/ui/src/views/document/tag/TagSettingDrawer.vue
+++ b/ui/src/views/document/tag/TagSettingDrawer.vue
@@ -143,6 +143,7 @@ function batchDelete() {
     .delMulDocumentTag(id, document_id.value, tagsToDelete, loading)
     .then(() => {
       getList()
+      emit('refresh')
     })
 }
 
@@ -151,6 +152,7 @@ function delTagValue(row: any) {
     .delMulDocumentTag(id, document_id.value, [row.id], loading)
     .then(() => {
       getList()
+      emit('refresh')
     })
 }
 
@@ -177,6 +179,7 @@ function addTags(tags: any) {
     .then(() => {
       addTagDialogRef.value?.close()
       getList()
+      emit('refresh')
     })
 }