From b4c36872c65a32e7e1a6a06db915aee1ffb898a7 Mon Sep 17 00:00:00 2001
From: wangdan-fit2cloud <dan.wang@fit2cloud.com>
Date: Fri, 23 Oct 2026 11:44:16 +0800
Subject: [PATCH] fix: resource auth

---
 .../components/content-list/index.vue         |  82 ++++-----
 .../components/content/items/question.vue     |   4 +-
 .../components/log-message-list/index.vue     |  67 ++++----
 .../components/message-list/index.vue         | 156 +++++++++---------
 ui/src/conversation-panel/index.scss          |   6 +-
 ui/src/layout/sidebar/SystemSidebar.vue       |   4 +-
 ui/src/router/ROUTE_README.md                 |   4 +-
 ui/src/router/admin/system/index.ts           |   1 +
 .../chat-log/ChatLogDetailDrawer.vue          |   4 +-
 .../identity/resource-authorization/index.vue |   1 +
 .../dialog/OperateLogDetailDialog.vue         |   6 +-
 ui/src/views/system/operate-logs/index.vue    |  10 +-
 12 files changed, 170 insertions(+), 175 deletions(-)

diff --git a/ui/src/conversation-panel/components/content-list/index.vue b/ui/src/conversation-panel/components/content-list/index.vue
index 23570ddcf20..06793d55ffa 100644
--- a/ui/src/conversation-panel/components/content-list/index.vue
+++ b/ui/src/conversation-panel/components/content-list/index.vue
@@ -1,60 +1,60 @@
-<template>
-  <div class="content-list">
-    <div v-for="(content, index) in contents" :key="`${content.type}:${content.id ?? index}`" class="content-item">
-      <Content :type="content.type" :content="content" />
-    </div>
-  </div>
-</template>
-
 <script setup lang="ts">
 import { computed } from 'vue'
 import Content from '@/conversation-panel/components/content/index.vue'
 
-const props = defineProps<{ contentList: Array<any> }>()
+defineOptions({ name: 'ConversationContentList' })
+
+interface ContentItem {
+  type: string
+  id?: string
+  content?: unknown
+  children?: ContentItem[]
+  [key: string]: unknown
+}
+
+const props = defineProps<{ contentList: ContentItem[] }>()
 
-const contents = computed(() => {
+// 隐藏审批和空正文；sort 为稳定排序，相同 id 的内容保留原始顺序。
+const displayContents = computed(() => {
   const sortedContents = props.contentList
-    .filter((item) => item.type !== 'APPROVAL')
-    .map((item, index) => ({ item, index }))
-    .sort((a, b) => {
-      const idA = a.item.id || ''
-      const idB = b.item.id || ''
-      if (idA !== idB) {
-        return idA.localeCompare(idB)
-      }
-      return a.index - b.index
+    .filter((content) => {
+      if (content.type === 'APPROVAL') return false
+      return !((content.type === 'TEXT' || content.type === 'HTML') && !content.content)
     })
-    .map(({ item }) => item)
-    .filter((item) => !((item.type === 'TEXT' || item.type === 'HTML') && !item.content))
+    .sort((leftContent, rightContent) => (leftContent.id || '').localeCompare(rightContent.id || ''))
+
   return foldToolGroups(sortedContents)
 })
 
 // 排序后相邻的 TOOL（2 个起）折叠为 GROUP_TOOL；仅为展示结构，不写回数据。
 // 分组 id 取首个工具 id，流式追加时保持不变，组件得以复用
-function foldToolGroups(contentItems: any[]) {
-  const foldedContents: any[] = []
-  for (const item of contentItems) {
-    const last = foldedContents[foldedContents.length - 1]
-    if (item.type === 'TOOL' && last?.type === 'GROUP_TOOL') {
-      last.children.push(item)
-    } else if (item.type === 'TOOL' && last?.type === 'TOOL') {
-      foldedContents[foldedContents.length - 1] = { type: 'GROUP_TOOL', id: `${last.id}_group`, children: [last, item] }
+function foldToolGroups(contentItems: ContentItem[]): ContentItem[] {
+  const foldedContents: ContentItem[] = []
+
+  for (const content of contentItems) {
+    const lastContent = foldedContents[foldedContents.length - 1]
+
+    if (content.type === 'TOOL' && lastContent?.type === 'GROUP_TOOL') {
+      lastContent.children!.push(content)
+    } else if (content.type === 'TOOL' && lastContent?.type === 'TOOL') {
+      foldedContents[foldedContents.length - 1] = {
+        type: 'GROUP_TOOL',
+        id: `${lastContent.id}_group`,
+        children: [lastContent, content],
+      }
     } else {
-      foldedContents.push(item)
+      foldedContents.push(content)
     }
   }
+
   return foldedContents
 }
 </script>
 
-<style scoped lang="scss">
-.content-list {
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-}
-
-.content-item {
-  width: 100%;
-}
-</style>
+<template>
+  <div class="w-full">
+    <template v-for="(content, index) in displayContents" :key="`${content.type}:${content.id ?? index}`">
+      <Content :content="content" />
+    </template>
+  </div>
+</template>
diff --git a/ui/src/conversation-panel/components/content/items/question.vue b/ui/src/conversation-panel/components/content/items/question.vue
index 3492d5d56d0..377dc19980b 100644
--- a/ui/src/conversation-panel/components/content/items/question.vue
+++ b/ui/src/conversation-panel/components/content/items/question.vue
@@ -46,7 +46,7 @@ function getAttachmentDescription(file: QuestionAttachment) {
 <template>
   <div class="mk-conversation-question-content space-y-3">
     <!-- 查看已发送附件，超出当前宽度时自动换行。 -->
-    <div v-if="attachments.length" class="flex max-w-full flex-wrap items-start justify-end gap-2">
+    <div v-if="attachments.length" class="flex max-w-full gap-2">
       <template v-for="file in attachments" :key="file.key">
         <div :class="file.field === 'image_list' ? 'shrink-0' : 'w-60 max-w-full'">
           <!-- 查看图片 -->
@@ -80,6 +80,6 @@ function getAttachmentDescription(file: QuestionAttachment) {
         </div>
       </template>
     </div>
-    <div v-if="content.content" class="mk-gray-card-lg ml-auto w-fit max-w-full py-3! whitespace-pre-wrap wrap-anywhere">{{ content.content }}</div>
+    <div v-if="content.content" class="mk-gray-card-lg max-w-full py-3! whitespace-pre-wrap wrap-anywhere">{{ content.content }}</div>
   </div>
 </template>
diff --git a/ui/src/conversation-panel/components/log-message-list/index.vue b/ui/src/conversation-panel/components/log-message-list/index.vue
index c1b1c0aacbc..69308559234 100644
--- a/ui/src/conversation-panel/components/log-message-list/index.vue
+++ b/ui/src/conversation-panel/components/log-message-list/index.vue
@@ -38,13 +38,13 @@ const onScroll = async () => {
 
 <template>
   <!-- 只读会话记录:首页加载整块遮罩,上滑加载更多时顶部小转圈 -->
-  <div ref="msgBoxRef" v-loading="fullLoading" class="log-message-list p-6" @scroll="onScroll">
+  <div ref="msgBoxRef" v-loading="fullLoading" @scroll="onScroll">
     <template v-if="messages.length > 0">
       <div v-if="loading" class="log-message-list__more">
         <el-icon class="is-loading" :size="18"><LoadingIcon /></el-icon>
       </div>
 
-      <div v-for="(msg, i) in messages" :key="msg.id || i" :class="['msg-row', msg.role === 'USER' ? 'user' : 'assistant']">
+      <div v-for="(msg, i) in messages" :key="msg.id || i" :class="[msg.role === 'USER' ? 'user' : 'assistant']">
         <ContentList :content-list="msg.content" />
         <!-- 助手消息底部信息栏(知识来源/执行详情/tokens/耗时) -->
         <MessageFooter v-if="msg.role === 'ASSISTANT' && msg.record" :message="msg" />
@@ -56,37 +56,38 @@ const onScroll = async () => {
 </template>
 
 <style scoped lang="scss">
-.log-message-list {
-  flex: 1;
-  min-height: 0;
-  overflow-y: auto;
-  scrollbar-width: thin;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
+// .log-message-list {
+//   flex: 1;
+//   min-height: 0;
+//   overflow-y: auto;
+//   scrollbar-width: thin;
+//   display: flex;
+//   flex-direction: column;
+//   align-items: center;
+// }
 
-.log-message-list__more {
-  display: flex;
-  justify-content: center;
-  padding: 4px 0 10px;
-  color: var(--t3, #909399);
-}
+// .log-message-list__more {
+//   display: flex;
+//   justify-content: center;
+//   padding: 4px 0 10px;
+//   color: var(--t3, #909399);
+// }
 
-.msg-row {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  margin-bottom: 10px;
-  max-width: 800px;
-  width: 100%;
-  box-sizing: border-box;
-}
-.msg-row.user {
-  align-items: flex-end;
-  flex-direction: row-reverse;
-}
-.msg-row.assistant {
-  align-items: flex-start;
-}
+// .msg-row {
+//   display: flex;
+//   flex-direction: column;
+//   gap: 6px;
+//   margin-bottom: 10px;
+//   max-width: 800px;
+//   width: 100%;
+//   box-sizing: border-box;
+// }
+// .msg-row.user {
+//   align-items: flex-end;
+//   flex-direction: row-reverse;
+//   max-width: 85%;
+// }
+// .msg-row.assistant {
+//   align-items: flex-start;
+// }
 </style>
diff --git a/ui/src/conversation-panel/components/message-list/index.vue b/ui/src/conversation-panel/components/message-list/index.vue
index 44265bc270e..fbf09917687 100644
--- a/ui/src/conversation-panel/components/message-list/index.vue
+++ b/ui/src/conversation-panel/components/message-list/index.vue
@@ -1,31 +1,3 @@
-<template>
-  <!-- 接口加载:无消息时(首页)整块遮罩,有消息时(加载更多)顶部小转圈;对话加载:底部小点 -->
-  <div ref="msgBoxRef" v-loading="fullLoading" class="message-list" @scroll="onScroll">
-    <template v-if="messages.length > 0">
-      <div v-if="loading" class="message-list__more">
-        <el-icon class="is-loading" :size="18"><LoadingIcon /></el-icon>
-      </div>
-
-      <div v-for="(msg, i) in messages" :key="msg.id || i" :class="['msg-row', msg.role === 'USER' ? 'user' : 'assistant']">
-        <ContentList :content-list="msg.content" />
-        <!-- 助手消息结束后显示底部信息栏(知识来源/执行详情/tokens/耗时) -->
-        <MessageFooter v-if="msg.role === 'ASSISTANT' && (msg.write_ed || msg.record)" :message="msg" />
-      </div>
-
-      <div v-if="streamLoading" class="msg-row assistant">
-        <Loading :size="18" />
-      </div>
-    </template>
-
-    <div v-else-if="!loading" class="welcome">
-      <slot name="welcome">
-        <p class="welcome-title">{{ appName }}</p>
-        <p class="welcome-sub">有什么可以帮你的？</p>
-      </slot>
-    </div>
-  </div>
-</template>
-
 <script setup lang="ts">
 import { ref, computed, onMounted, onBeforeUnmount, watch, nextTick } from 'vue'
 import { Loading as LoadingIcon } from '@element-plus/icons-vue'
@@ -65,60 +37,86 @@ const onScroll = () => {
   if (el && el.scrollTop <= 60 && hasMore.value) loadMore()
 }
 </script>
+<template>
+  <!-- 接口加载:无消息时(首页)整块遮罩,有消息时(加载更多)顶部小转圈;对话加载:底部小点 -->
+  <div ref="msgBoxRef" v-loading="fullLoading" @scroll="onScroll">
+    <template v-if="messages.length > 0">
+      <div v-if="loading" class="message-list__more">
+        <el-icon class="is-loading" :size="18"><LoadingIcon /></el-icon>
+      </div>
+
+      <div v-for="(msg, i) in messages" :key="msg.id || i" :class="[msg.role === 'USER' ? 'user' : 'assistant']">
+        <ContentList :content-list="msg.content" />
+        <!-- 助手消息结束后显示底部信息栏(知识来源/执行详情/tokens/耗时) -->
+        <MessageFooter v-if="msg.role === 'ASSISTANT' && (msg.write_ed || msg.record)" :message="msg" />
+      </div>
 
+      <div v-if="streamLoading" class="msg-row assistant">
+        <Loading :size="18" />
+      </div>
+    </template>
+
+    <div v-else-if="!loading" class="welcome">
+      <slot name="welcome">
+        <p class="welcome-title">{{ appName }}</p>
+        <p class="welcome-sub">有什么可以帮你的？</p>
+      </slot>
+    </div>
+  </div>
+</template>
 <style scoped lang="scss">
-.message-list {
-  flex: 1;
-  min-height: 0;
-  overflow-y: auto;
-  padding: 14px 12px;
-  scrollbar-width: thin;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
+// .message-list {
+//   flex: 1;
+//   min-height: 0;
+//   overflow-y: auto;
+//   padding: 14px 12px;
+//   scrollbar-width: thin;
+//   display: flex;
+//   flex-direction: column;
+//   align-items: center;
+// }
 
-.message-list__more {
-  display: flex;
-  justify-content: center;
-  padding: 4px 0 10px;
-  color: var(--t3, #909399);
-}
+// .message-list__more {
+//   display: flex;
+//   justify-content: center;
+//   padding: 4px 0 10px;
+//   color: var(--t3, #909399);
+// }
 
-.welcome {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  padding: 32px 16px;
-}
-.welcome-title {
-  font-size: 18px;
-  font-weight: 600;
-  color: var(--t1, #303133);
-  margin-bottom: 8px;
-}
-.welcome-sub {
-  font-size: 14px;
-  color: var(--t3, #909399);
-}
+// .welcome {
+//   flex: 1;
+//   display: flex;
+//   flex-direction: column;
+//   align-items: center;
+//   justify-content: center;
+//   text-align: center;
+//   padding: 32px 16px;
+// }
+// .welcome-title {
+//   font-size: 18px;
+//   font-weight: 600;
+//   color: var(--t1, #303133);
+//   margin-bottom: 8px;
+// }
+// .welcome-sub {
+//   font-size: 14px;
+//   color: var(--t3, #909399);
+// }
 
-.msg-row {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-  margin-bottom: 10px;
-  max-width: 800px;
-  width: 100%;
-  box-sizing: border-box;
-}
-.msg-row.user {
-  align-items: flex-end;
-  flex-direction: row-reverse;
-}
-.msg-row.assistant {
-  align-items: flex-start;
-}
+// .msg-row {
+//   display: flex;
+//   flex-direction: column;
+//   gap: 6px;
+//   margin-bottom: 10px;
+//   max-width: 800px;
+//   width: 100%;
+//   box-sizing: border-box;
+// }
+// .msg-row.user {
+//   align-items: flex-end;
+//   flex-direction: row-reverse;
+// }
+// .msg-row.assistant {
+//   align-items: flex-start;
+// }
 </style>
diff --git a/ui/src/conversation-panel/index.scss b/ui/src/conversation-panel/index.scss
index 26375218bbc..1a174976bd1 100644
--- a/ui/src/conversation-panel/index.scss
+++ b/ui/src/conversation-panel/index.scss
@@ -112,7 +112,7 @@
 
 /* 用户提问容器：随内容收缩并靠右排列。 */
 .mk-conversation-question-content {
-  // margin-left: auto;
-  // max-width: 85%;
-  // width: fit-content;
+  margin-left: auto;
+  max-width: 85%;
+  width: fit-content;
 }
diff --git a/ui/src/layout/sidebar/SystemSidebar.vue b/ui/src/layout/sidebar/SystemSidebar.vue
index ce293c5f17e..6623b2752cf 100644
--- a/ui/src/layout/sidebar/SystemSidebar.vue
+++ b/ui/src/layout/sidebar/SystemSidebar.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getChildRouteList } from '@/router/admin/utils'
 import type { LayoutMenuItem } from '../types'
@@ -10,6 +11,7 @@ const emit = defineEmits<{ toggle: [] }>()
 const route = useRoute()
 const router = useRouter()
 const systemMenuItems = getChildRouteList('system')
+const systemActiveMenuPath = computed(() => route.meta.activeMenu ?? route.path)
 
 const isSystemMenuActive = (systemMenuItem: LayoutMenuItem) => route.matched.some((matchedRoute) => matchedRoute.name === systemMenuItem.name)
 
@@ -24,7 +26,7 @@ const getSystemMenuIcon = (systemMenuItem: LayoutMenuItem) =>
         :class="props.collapsed ? 'px-3.5!' : 'px-4!'"
         :collapse="props.collapsed"
         :collapse-transition="false"
-        :default-active="route.path"
+        :default-active="systemActiveMenuPath"
         router
         :persistent="false"
       >
diff --git a/ui/src/router/ROUTE_README.md b/ui/src/router/ROUTE_README.md
index e20403d83b4..6ee80fbea0a 100644
--- a/ui/src/router/ROUTE_README.md
+++ b/ui/src/router/ROUTE_README.md
@@ -174,7 +174,9 @@ Chat 导航守卫（`chat/index.ts`）：
 `MkIcon` 的 `name` 属性渲染。需要在菜单激活后切换图标时，通过 `activeIcon` 配置激活状态
 的 Symbol ID；未配置时继续使用 `icon`。Router 目录禁止导入或传入 Element Plus 图标组件。
 
-System 侧栏默认使用当前页面的 `route.path` 匹配菜单激活项。Workspace 地址包含动态
+System 侧栏优先使用 `route.meta.activeMenu`，未配置时使用当前页面的 `route.path` 匹配菜单激活项。
+资源授权父路由配置 `activeMenu: '/system/identity/authorization'`，各资源类型子页面继承该配置，
+直接访问或刷新时保持“资源授权”菜单激活。Workspace 地址包含动态
 `workspaceId`，其侧栏使用路由名称匹配；详情、创建和编辑等子页面需要继续高亮所属一级菜单
 时，在一级父路由中把该菜单的路由名称配置为 `activeMenu`，由 Vue Router 合并到所有后代
 路由的 `meta`。个别子页面需要激活其他菜单时，可在子路由中覆盖 `activeMenu`。Workspace
diff --git a/ui/src/router/admin/system/index.ts b/ui/src/router/admin/system/index.ts
index d1733491bbe..d37118ce496 100644
--- a/ui/src/router/admin/system/index.ts
+++ b/ui/src/router/admin/system/index.ts
@@ -76,6 +76,7 @@ export const systemRoutes: RouteRecordRaw = {
           redirect: { name: 'system-authorization-applications' },
           meta: {
             title: '资源授权',
+            activeMenu: '/system/identity/authorization',
             order: 50,
             permission: () => {
               return (
diff --git a/ui/src/views/application-detail/chat-log/ChatLogDetailDrawer.vue b/ui/src/views/application-detail/chat-log/ChatLogDetailDrawer.vue
index a818fd8a7eb..dd0ed2668d9 100644
--- a/ui/src/views/application-detail/chat-log/ChatLogDetailDrawer.vue
+++ b/ui/src/views/application-detail/chat-log/ChatLogDetailDrawer.vue
@@ -39,11 +39,11 @@ defineExpose({ open, close })
 </script>
 
 <template>
-  <MkDrawer v-model="visible" size="840" content-class="h-full !p-0" @close="close" @closed="emit('closed')">
+  <MkDrawer v-model="visible" size="840" @close="close" @closed="emit('closed')">
     <template #header>
       <h4 class="min-w-0 truncate" :title="props.chatLog.abstract">{{ props.chatLog.abstract || '对话详情' }}</h4>
     </template>
-    <div v-loading="props.loading" class="h-full">
+    <div v-loading="props.loading">
       <!-- 只读会话面板:展示该日志的历史对话与执行详情,无输入框 -->
       <LogConversation :chat-id="props.chatLog.id" :application-id="applicationId" :chat-log-api="resourceApi.chatLog" />
     </div>
diff --git a/ui/src/views/system/identity/resource-authorization/index.vue b/ui/src/views/system/identity/resource-authorization/index.vue
index c9158f67a1f..d20bf3767ce 100644
--- a/ui/src/views/system/identity/resource-authorization/index.vue
+++ b/ui/src/views/system/identity/resource-authorization/index.vue
@@ -102,6 +102,7 @@ function loadResourcePermissions() {
 
   if (!targetId) {
     resourcePermissions.value = []
+    loadingPermissions.value = false
     return Promise.resolve()
   }
 
diff --git a/ui/src/views/system/operate-logs/dialog/OperateLogDetailDialog.vue b/ui/src/views/system/operate-logs/dialog/OperateLogDetailDialog.vue
index 26e27698d2d..a49f2323158 100644
--- a/ui/src/views/system/operate-logs/dialog/OperateLogDetailDialog.vue
+++ b/ui/src/views/system/operate-logs/dialog/OperateLogDetailDialog.vue
@@ -15,11 +15,7 @@ defineExpose({ open })
 </script>
 
 <template>
-  <MkDialog v-model="visible" title="API详情" width="800">
+  <MkDialog v-model="visible" title="API 详情" width="840">
     <pre class="whitespace-pre-wrap break-words p-4">{{ formattedDetails }}</pre>
-
-    <template #footer>
-      <el-button plain @click="visible = false">关闭</el-button>
-    </template>
   </MkDialog>
 </template>
diff --git a/ui/src/views/system/operate-logs/index.vue b/ui/src/views/system/operate-logs/index.vue
index 74bf6d68dbb..b080429aa59 100644
--- a/ui/src/views/system/operate-logs/index.vue
+++ b/ui/src/views/system/operate-logs/index.vue
@@ -199,13 +199,7 @@ onMounted(() => {
         </el-table-column>
         <el-table-column min-width="110">
           <template #header>
-            <MkTableFilter
-              mode="single"
-              v-model="selectedStatus"
-              label="状态"
-              :options="statusOptions"
-              @change="handleStatusChange"
-            />
+            <MkTableFilter mode="single" v-model="selectedStatus" label="状态" :options="statusOptions" @change="handleStatusChange" />
           </template>
           <template #default="{ row }">
             <span class="inline-flex items-center gap-2">
@@ -222,7 +216,7 @@ onMounted(() => {
         </el-table-column>
         <el-table-column label="操作" width="70" fixed="right">
           <template #default="{ row }">
-            <MkTooltip effect="dark" content="API详情" placement="top">
+            <MkTooltip effect="dark" content="API 详情" placement="top">
               <el-button type="primary" text @click.stop="handleOpenDetail(row)">
                 <MkIcon name="icon_describe_outlined" />
               </el-button>