diff --git a/ui/src/components/COMPONENT_README.md b/ui/src/components/COMPONENT_README.md
index c92401ae7ee..30657d83045 100644
--- a/ui/src/components/COMPONENT_README.md
+++ b/ui/src/components/COMPONENT_README.md
@@ -712,7 +712,10 @@ Model 配置器的默认模型也使用 `SelectModel`，仅展示已选的可选
 启停成功后刷新，失败保留原状态。查询与列表操作共用 loading，编辑抽屉单独管理保存状态。
 密钥默认隐藏，翻页或刷新恢复隐藏，复制始终使用完整值，隐藏状态不通过 Tooltip 暴露明文。
 
-`EditApiKeyDrawer` 是本功能内部抽屉，按永不过期、预设有效期或自定义日期编辑，预设有效期
+创建入口与结果 Dialog 封装在内部 `create-api-key/index.vue`（`ButtonCreateApiKey`），接收完整 API、
+可选 `applicationId`、共享 `v-model:loading` 和异步 `refresh` 回调；创建成功展示密钥，并等待列表回到第一页刷新后释放 loading。
+编辑入口与 Drawer 封装在内部 `edit-api-key/index.vue`（`ButtonEditApiKey`），接收完整 API、可选 `applicationId`
+和当前 `record`，保存成功通过 `refresh` 事件通知列表。按永不过期、预设有效期或自定义日期编辑，预设有效期
 从保存时起算；跨域地址逐行去空白后提交数组。保存失败保留草稿，成功刷新列表。
 备注按 `remark` 预留，当前后端尚未持久化。Base URL 或 API 文档地址由调用方在列表外展示。
 
diff --git a/ui/src/components/business/api-key-list/create-api-key/index.vue b/ui/src/components/business/api-key-list/create-api-key/index.vue
new file mode 100644
index 00000000000..18a73f47113
--- /dev/null
+++ b/ui/src/components/business/api-key-list/create-api-key/index.vue
@@ -0,0 +1,61 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+import type ApplicationApiKeyApi from '@/api/admin/workspace/application/api-key'
+import type SystemResourceApiKeyApi from '@/api/admin/system/resource-management/application/api-key'
+import type SystemApiKeyApi from '@/api/admin/system/api-key'
+import { copyText } from '@/utils/clipboard'
+
+defineOptions({ name: 'ButtonCreateApiKey' })
+
+const props = defineProps<{
+  api: typeof ApplicationApiKeyApi | typeof SystemResourceApiKeyApi | typeof SystemApiKeyApi
+  applicationId?: string
+  refresh: () => Promise<void>
+}>()
+const loading = defineModel<boolean>('loading', { required: true })
+
+/* 创建 API Key 与结果弹窗 */
+const createdApiKey = ref('')
+const createdDialogVisible = ref(false)
+
+function handleCreate() {
+  if (loading.value) return
+  loading.value = true
+  const request =
+    props.applicationId !== undefined
+      ? (props.api as typeof ApplicationApiKeyApi | typeof SystemResourceApiKeyApi).postApiKey(props.applicationId)
+      : (props.api as typeof SystemApiKeyApi).postApiKey()
+  return request
+    .then((record) => {
+      createdApiKey.value = record.secret_key
+      createdDialogVisible.value = true
+      return props.refresh()
+    })
+    .finally(() => {
+      loading.value = false
+    })
+}
+</script>
+
+<template>
+  <!-- 创建 API Key -->
+  <el-button type="primary" @click="handleCreate">
+    <MkIcon name="icon_add_outlined" />
+    <span>创建</span>
+  </el-button>
+  <MkDialog v-model="createdDialogVisible" title="API Key" @closed="createdApiKey = ''">
+    <template #subtitle>请安全保存此密钥，不要泄露。</template>
+    <el-input :model-value="createdApiKey" readonly>
+      <template #suffix>
+        <!-- 复制新建的完整 API Key -->
+        <el-button text @click="copyText(createdApiKey)" class="-mr-1">
+          <MkIcon name="icon_copy_outlined" />
+        </el-button>
+      </template>
+    </el-input>
+    <template #footer>
+      <!-- 关闭创建结果弹窗 -->
+      <el-button plain @click="createdDialogVisible = false">知道了</el-button>
+    </template>
+  </MkDialog>
+</template>
diff --git a/ui/src/components/business/api-key-list/EditApiKeyDrawer.vue b/ui/src/components/business/api-key-list/edit-api-key/index.vue
similarity index 91%
rename from ui/src/components/business/api-key-list/EditApiKeyDrawer.vue
rename to ui/src/components/business/api-key-list/edit-api-key/index.vue
index d6116b4a49a..c272a34265d 100644
--- a/ui/src/components/business/api-key-list/EditApiKeyDrawer.vue
+++ b/ui/src/components/business/api-key-list/edit-api-key/index.vue
@@ -5,17 +5,19 @@ import type { ApiKeyPayload, ApiKeyRecord } from '@/api/types'
 import type ApplicationApiKeyApi from '@/api/admin/workspace/application/api-key'
 import type SystemResourceApiKeyApi from '@/api/admin/system/resource-management/application/api-key'
 import type SystemApiKeyApi from '@/api/admin/system/api-key'
-import { expirationOptions, getApiKeyExpireTime, type ExpirationType } from './expiration'
+import { expirationOptions, getApiKeyExpireTime, type ExpirationType } from '../expiration'
 import { copyText } from '@/utils/clipboard'
 import { MsgSuccess } from '@/utils/message'
 
-defineOptions({ name: 'EditApiKeyDrawer' })
+defineOptions({ name: 'ButtonEditApiKey' })
 
 const props = defineProps<{
   api: typeof ApplicationApiKeyApi | typeof SystemResourceApiKeyApi | typeof SystemApiKeyApi
   applicationId?: string
+  record: ApiKeyRecord
 }>()
 const emit = defineEmits<{ refresh: [] }>()
+/* 编辑 API Key 与配置抽屉 */
 const visible = ref(false)
 const saving = ref(false)
 const apiKeyId = ref('')
@@ -54,10 +56,10 @@ const rules: FormRules<ApiKeyForm> = {
       trigger: 'change',
     },
   ],
-  remark: [{ max: 256, message: '备注最多 256 个字符', trigger: 'blur' }],
 }
 
-function open(record: ApiKeyRecord) {
+function handleOpenEdit() {
+  const record = props.record
   apiKeyId.value = record.id
   Object.assign(form, {
     secret_key: record.secret_key,
@@ -119,11 +121,15 @@ function handleClosed() {
   form.is_active = true
   formRef.value?.clearValidate()
 }
-
-defineExpose({ open })
 </script>
 
 <template>
+  <!-- 编辑 API Key -->
+  <MkTooltip content="编辑" placement="top">
+    <el-button type="primary" text @click.stop="handleOpenEdit">
+      <MkIcon name="icon_edit_outlined" />
+    </el-button>
+  </MkTooltip>
   <MkDrawer v-model="visible" title="编辑 API Key" @closed="handleClosed">
     <el-form ref="formRef" :model="form" :rules="rules" :inert="saving" label-position="top" require-asterisk-position="right" @submit.prevent>
       <el-form-item label="API KEY">
@@ -158,7 +164,7 @@ defineExpose({ open })
           v-model="form.cross_domain_list"
           type="textarea"
           :rows="8"
-          placeholder="请输入允许的跨域地址，开启后不输入跨域地址则不限制。&#10;跨域地址一行一个，如：&#10;http://127.0.0.1:5678&#10;https://dataease.io"
+          :placeholder="'请输入允许的跨域地址，开启后不输入跨域地址则不限制。\n跨域地址一行一个，如：\nhttp://127.0.0.1:5678\nhttps://dataease.io'"
         />
       </el-form-item>
       <el-form-item label="启用状态">
diff --git a/ui/src/components/business/api-key-list/index.vue b/ui/src/components/business/api-key-list/index.vue
index dd4b7e8d17e..e1803328e08 100644
--- a/ui/src/components/business/api-key-list/index.vue
+++ b/ui/src/components/business/api-key-list/index.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, useTemplateRef } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import type { ApiKeyRecord } from '@/api/types'
 import type ApplicationApiKeyApi from '@/api/admin/workspace/application/api-key'
 import type SystemResourceApiKeyApi from '@/api/admin/system/resource-management/application/api-key'
 import type SystemApiKeyApi from '@/api/admin/system/api-key'
-import EditApiKeyDrawer from './EditApiKeyDrawer.vue'
+import ButtonCreateApiKey from './create-api-key/index.vue'
+import ButtonEditApiKey from './edit-api-key/index.vue'
 import { getApiKeyExpiration } from './expiration'
 import { copyText } from '@/utils/clipboard'
 import { datetimeFormat } from '@/utils/time'
@@ -18,10 +19,7 @@ const props = defineProps<{
 }>()
 const loading = ref(false)
 const apiKeys = ref<ApiKeyRecord[]>([])
-const createdApiKey = ref('')
-const createdDialogVisible = ref(false)
 const pagination = ref({ currentPage: 1, pageSize: 20, total: 0 })
-const editDrawerRef = useTemplateRef<InstanceType<typeof EditApiKeyDrawer>>('editDrawerRef')
 const apiKeyRows = computed(() => apiKeys.value.map((record) => ({ ...record, expiration: getApiKeyExpiration(record) })))
 
 function fetchApiKeys() {
@@ -43,23 +41,9 @@ function loadApiKeys() {
   })
 }
 
-function handleCreate() {
-  if (loading.value) return
-  loading.value = true
-  const request =
-    props.applicationId !== undefined
-      ? (props.api as typeof ApplicationApiKeyApi | typeof SystemResourceApiKeyApi).postApiKey(props.applicationId)
-      : (props.api as typeof SystemApiKeyApi).postApiKey()
-  return request
-    .then((record) => {
-      createdApiKey.value = record.secret_key
-      createdDialogVisible.value = true
-      pagination.value.currentPage = 1
-      return fetchApiKeys()
-    })
-    .finally(() => {
-      loading.value = false
-    })
+function handleCreated() {
+  pagination.value.currentPage = 1
+  return fetchApiKeys()
 }
 
 function handleChangeActive(record: ApiKeyRecord) {
@@ -105,20 +89,16 @@ function handleDelete(record: ApiKeyRecord) {
   )
 }
 
-function handleOpenEdit(record: ApiKeyRecord) {
-  editDrawerRef.value?.open(record)
-}
-
 onMounted(loadApiKeys)
 </script>
 
 <template>
   <div v-loading="loading" :inert="loading">
-    <!-- 创建 API Key -->
-    <el-button type="primary" class="mb-4" @click="handleCreate">
-      <MkIcon name="icon_add_outlined" />
-      <span>创建</span>
-    </el-button>
+    <!-- 创建 API Key  -->
+    <div class="mb-4">
+      <ButtonCreateApiKey :api="props.api" :application-id="props.applicationId" v-model:loading="loading" :refresh="handleCreated" />
+    </div>
+
     <MkTable
       v-model:pagination-config="pagination"
       :data="apiKeyRows"
@@ -126,7 +106,7 @@ onMounted(loadApiKeys)
       @current-change="loadApiKeys"
       @size-change="loadApiKeys"
     >
-      <el-table-column label="API Key" min-width="160">
+      <el-table-column label="API Key" width="140">
         <template #default="{ row }">
           <div class="flex-align-center gap-2">
             <span>
@@ -151,7 +131,7 @@ onMounted(loadApiKeys)
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="到期时间" min-width="265">
+      <el-table-column label="到期时间" width="265">
         <template #default="{ row }">
           <span :class="{ 'text-danger': row.expiration.status === 'expired', 'text-warning': row.expiration.status === 'soon' }">
             {{ row.expiration.label }}
@@ -161,10 +141,10 @@ onMounted(loadApiKeys)
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" min-width="120" show-overflow-tooltip>
+      <el-table-column label="备注" show-overflow-tooltip>
         <template #default="{ row }">{{ row.remark || '—' }}</template>
       </el-table-column>
-      <el-table-column prop="create_time" label="创建时间" min-width="180">
+      <el-table-column prop="create_time" label="创建时间" width="180">
         <template #default="{ row }">{{ datetimeFormat(row.create_time) || '—' }}</template>
       </el-table-column>
       <el-table-column label="操作" width="140" fixed="right">
@@ -173,12 +153,8 @@ onMounted(loadApiKeys)
             <!-- 启用或禁用 API Key -->
             <el-switch :model-value="row.is_active" size="small" :before-change="() => handleChangeActive(row)" />
             <el-divider direction="vertical" />
-            <!-- 编辑 API Key -->
-            <MkTooltip content="编辑" placement="top">
-              <el-button type="primary" text @click.stop="handleOpenEdit(row)">
-                <MkIcon name="icon_edit_outlined" />
-              </el-button>
-            </MkTooltip>
+            <!-- 编辑API Key -->
+            <ButtonEditApiKey :api="props.api" :application-id="props.applicationId" :record="row" @refresh="loadApiKeys" />
             <!-- 删除 API Key -->
             <MkTooltip content="删除" placement="top">
               <el-button class="ml-0!" type="primary" text @click.stop="handleDelete(row)">
@@ -190,20 +166,4 @@ onMounted(loadApiKeys)
       </el-table-column>
     </MkTable>
   </div>
-  <MkDialog v-model="createdDialogVisible" title="API Key" @closed="createdApiKey = ''">
-    <template #subtitle>请安全保存此密钥，不要泄露。</template>
-    <el-input :model-value="createdApiKey" readonly>
-      <template #suffix>
-        <!-- 复制新建的完整 API Key -->
-        <el-button text @click="copyText(createdApiKey)" class="-mr-1">
-          <MkIcon name="icon_copy_outlined" />
-        </el-button>
-      </template>
-    </el-input>
-    <template #footer>
-      <!-- 关闭创建结果弹窗 -->
-      <el-button plain @click="createdDialogVisible = false">知道了</el-button>
-    </template>
-  </MkDialog>
-  <EditApiKeyDrawer v-bind="props" ref="editDrawerRef" @refresh="loadApiKeys" />
 </template>
diff --git a/ui/src/views/VIEW_README.md b/ui/src/views/VIEW_README.md
index 958c1c479df..a853b52e99e 100644
--- a/ui/src/views/VIEW_README.md
+++ b/ui/src/views/VIEW_README.md
@@ -365,7 +365,7 @@ View 负责路由、资源与模式、图加载、保存／发布／调试编排
   Xpack 版可用登录方式查询 `/chat_user/auth/types`，开启认证时至少选一种；账号登录的验证码阈值沿用 -1～10。
   默认登录方式从已勾选的登录方式中选择，取消对应登录方式时同步调整默认值；账号锁定次数与分钟数正常编辑。
   前端开放认证配置，不因字段缺失或旧版密码模式禁用；保留已有认证类型，字段生效能力由后台联调确认。
-  未取得完整配置时不提交保存，不提供失败空态或重试按钮；提交失败保留草稿。
+  查询与保存共用 loading，请求期间阻止重复提交；不提供失败空态或重试按钮，提交失败保留草稿。
   白名单逐行去空白，保存时保留原语言和其他认证字段。
   三类场景统一调用 `getMonitoring(workspaceId, range, applicationId)`；全部智能体使用空 ID，
   两类首页不提交智能体筛选，概览传当前智能体 ID。页面直接传入完整 API，不包装接口。
diff --git a/ui/src/views/application-detail/access/AccessSettingDrawer.vue b/ui/src/views/application-detail/access/AccessSettingDrawer.vue
index 264763d68a6..6a858e554e0 100644
--- a/ui/src/views/application-detail/access/AccessSettingDrawer.vue
+++ b/ui/src/views/application-detail/access/AccessSettingDrawer.vue
@@ -4,7 +4,7 @@ import { computed, onMounted, reactive, ref, useTemplateRef } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 
 import { APPLICATION_ACCESS_PLATFORM } from '@/api/enums'
-import type { ApplicationAccessConfig, Dict } from '@/api/types'
+import type { ApplicationAccessConfig } from '@/api/types'
 import { ADMIN_API_BASE_PATH } from '@/api/constants'
 import { copyText } from '@/utils/clipboard'
 import { MsgSuccess } from '@/utils/message'
@@ -18,15 +18,13 @@ const emit = defineEmits<{ refresh: []; closed: [] }>()
 const visible = ref(true)
 const loading = ref(false)
 const formRef = useTemplateRef<FormInstance>('formRef')
-const form = reactive<Dict<string>>({})
-const isCertification = ref(false)
-let savedConfig: ApplicationAccessConfig = {}
+const form = reactive<ApplicationAccessConfig>({})
 
 const isWechat = computed(() => props.platform.key === APPLICATION_ACCESS_PLATFORM.WECHAT)
 const modeField = computed(() => props.platform.modeField)
 // 表单字段随连接方式切换：长连接(ws)需要 bot_id/secret，URL 回调(callback)需要 token/encoding_aes_key。
 const activeFields = computed(() => {
-  const mode = form[modeField.value?.key ?? ''] ?? modeField.value?.default
+  const mode = String(form[modeField.value?.key ?? ''] ?? modeField.value?.default ?? '')
   return (modeField.value && mode ? modeField.value.fields?.[mode] : undefined) ?? props.platform.fields
 })
 // 智能机器人默认长连接(ws)，无需回调地址；切到 URL 回调时才展示回调地址。
@@ -47,12 +45,12 @@ function loadPlatformConfig() {
   return resourceApi.access
     .getPlatformConfig(props.applicationId, props.platform.key)
     .then((config) => {
-      savedConfig = config ?? {}
-      if (modeField.value) form[modeField.value.key] = String(savedConfig[modeField.value.key] ?? modeField.value.default)
+      Object.assign(form, config ?? {})
+      if (modeField.value) form[modeField.value.key] = String(form[modeField.value.key] ?? modeField.value.default)
       activeFields.value.forEach((field) => {
-        form[field.key] = String(savedConfig[field.key] ?? '')
+        form[field.key] = String(form[field.key] ?? '')
       })
-      isCertification.value = savedConfig.is_certification ?? false
+      if (isWechat.value) form.is_certification ??= false
     })
     .finally(() => {
       loading.value = false
@@ -65,8 +63,7 @@ function handleSave() {
   formRef.value?.validate((valid) => {
     if (!valid || loading.value) return
     loading.value = true
-    const payload: ApplicationAccessConfig = { ...savedConfig, ...form, callback_url: callbackUrl.value }
-    if (isWechat.value) payload.is_certification = isCertification.value
+    const payload: ApplicationAccessConfig = { ...form, callback_url: callbackUrl.value }
     resourceApi.access
       .postPlatformConfig(props.applicationId, props.platform.key, payload)
       .then(() => {
@@ -103,7 +100,7 @@ onMounted(loadPlatformConfig)
         <template v-for="field in activeFields" :key="field.key">
           <el-form-item :label="field.label" :prop="field.key">
             <el-input
-              v-model="form[field.key]"
+              v-model="form[field.key] as string"
               :type="field.secret ? 'password' : 'text'"
               :show-password="field.secret"
               :autocomplete="field.secret ? 'new-password' : 'off'"
@@ -113,7 +110,7 @@ onMounted(loadPlatformConfig)
         </template>
         <el-form-item v-if="isWechat" label="认证成功">
           <!-- 设置公众号认证状态 -->
-          <el-switch v-model="isCertification" />
+          <el-switch v-model="form.is_certification" />
         </el-form-item>
 
         <el-form-item v-if="showCallback" label="回调地址">
diff --git a/ui/src/views/application-detail/overview/access-restriction/AccessRestrictionDrawer.vue b/ui/src/views/application-detail/overview/access-restriction/AccessRestrictionDrawer.vue
index 9b226f0f6e1..61df35f8ac3 100644
--- a/ui/src/views/application-detail/overview/access-restriction/AccessRestrictionDrawer.vue
+++ b/ui/src/views/application-detail/overview/access-restriction/AccessRestrictionDrawer.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { onMounted, reactive, ref, useTemplateRef } from 'vue'
 import { cloneDeep } from 'lodash'
-import type { FormInstance, FormRules } from 'element-plus'
-import type { ApplicationAccessToken, ApplicationAccessTokenPayload } from '@/api/types'
+import type { FormInstance } from 'element-plus'
+import type { ApplicationAuthenticationConfig, ApplicationAccessTokenPayload } from '@/api/types'
 import { MsgSuccess } from '@/utils/message'
 import { useApplicationDetailContext } from '../../context'
 
@@ -12,20 +12,16 @@ const emit = defineEmits<{ closed: [] }>()
 const { applicationId, resourceApi } = useApplicationDetailContext()
 const visible = ref(true)
 const loading = ref(false)
-const saving = ref(false)
-const savedConfig = ref<ApplicationAccessToken>()
 const formRef = useTemplateRef<FormInstance>('formRef')
 const form = reactive({
+  language: undefined as string | undefined,
+  authentication_value: {} as ApplicationAuthenticationConfig,
   access_num: 100,
   authentication: false,
   white_active: false,
   white_list: '',
 })
 
-const rules: FormRules<typeof form> = {
-  access_num: [{ required: true, type: 'integer', min: 0, max: 10000000, message: '请输入 0～10000000 的整数', trigger: 'change' }],
-}
-
 function loadAccessRestriction() {
   if (loading.value) return
   loading.value = true
@@ -33,12 +29,13 @@ function loadAccessRestriction() {
     .getAccessToken(applicationId.value)
     .then((config) => {
       Object.assign(form, {
+        language: config.language,
+        authentication_value: cloneDeep(config.authentication_value ?? {}),
         access_num: config.access_num,
         authentication: config.authentication ?? false,
         white_active: config.white_active,
         white_list: config.white_list?.join('\n') ?? '',
       })
-      savedConfig.value = config
     })
     .finally(() => {
       loading.value = false
@@ -46,9 +43,9 @@ function loadAccessRestriction() {
 }
 
 function handleSave() {
-  if (!savedConfig.value || loading.value || saving.value) return
+  if (loading.value) return
   formRef.value?.validate((valid) => {
-    if (!valid || !savedConfig.value || loading.value || saving.value) return
+    if (!valid || loading.value) return
     const payload: ApplicationAccessTokenPayload = {
       access_num: form.access_num,
       white_active: form.white_active,
@@ -57,11 +54,11 @@ function handleSave() {
         .map((origin) => origin.trim())
         .filter(Boolean),
       // 后端省略 language 会清空配置，访问限制保存时保留原值。
-      language: savedConfig.value.language,
+      language: form.language,
       authentication: form.authentication,
-      authentication_value: cloneDeep(savedConfig.value.authentication_value ?? {}),
+      authentication_value: cloneDeep(form.authentication_value),
     }
-    saving.value = true
+    loading.value = true
     return resourceApi.application
       .putAccessToken(applicationId.value, payload)
       .then(() => {
@@ -69,7 +66,7 @@ function handleSave() {
         visible.value = false
       })
       .finally(() => {
-        saving.value = false
+        loading.value = false
       })
   })
 }
@@ -79,16 +76,17 @@ onMounted(loadAccessRestriction)
 
 <template>
   <MkDrawer v-model="visible" title="访问限制" @closed="emit('closed')">
-    <div v-loading="loading" class="h-full" :inert="saving">
-      <el-form ref="formRef" :model="form" :rules="rules" label-position="top" require-asterisk-position="right" @submit.prevent>
-        <el-form-item label="每个客户端提问限制" prop="access_num">
+    <div v-loading="loading">
+      <el-form ref="formRef" :model="form" label-position="top" require-asterisk-position="right" @submit.prevent>
+        <el-form-item label="每个客户端提问限制">
           <el-input-number
             v-model="form.access_num"
             class="w-32!"
             :min="0"
             :max="10000000"
-            :precision="0"
-            :value-on-clear="100"
+            :step="1"
+            :value-on-clear="0"
+            step-strictly
             controls-position="right"
             align="left"
           />
@@ -115,7 +113,7 @@ onMounted(loadAccessRestriction)
               v-model="form.white_list"
               type="textarea"
               :rows="8"
-              placeholder="请输入允许嵌入第三方的源地址，一行一个，如：&#10;http://127.0.0.1:5678&#10;https://dataease.io"
+              :placeholder="'请输入允许嵌入第三方的源地址，一行一个，如：\nhttp://127.0.0.1:5678\nhttps://dataease.io'"
             />
           </div>
         </el-form-item>
@@ -123,9 +121,9 @@ onMounted(loadAccessRestriction)
     </div>
     <template #footer>
       <!-- 取消访问限制设置 -->
-      <el-button plain :disabled="saving" @click="visible = false">取消</el-button>
+      <el-button plain :disabled="loading" @click="visible = false">取消</el-button>
       <!-- 保存访问限制设置 -->
-      <el-button type="primary" :loading="saving" :disabled="loading" @click="handleSave">保存</el-button>
+      <el-button type="primary" :loading="loading" @click="handleSave">保存</el-button>
     </template>
   </MkDrawer>
 </template>
diff --git a/ui/src/views/application-detail/overview/access-restriction/XpackAccessRestrictionDrawer.vue b/ui/src/views/application-detail/overview/access-restriction/XpackAccessRestrictionDrawer.vue
index e308187f905..4d153770696 100644
--- a/ui/src/views/application-detail/overview/access-restriction/XpackAccessRestrictionDrawer.vue
+++ b/ui/src/views/application-detail/overview/access-restriction/XpackAccessRestrictionDrawer.vue
@@ -4,7 +4,7 @@ import { cloneDeep } from 'lodash'
 import type { FormInstance, FormRules } from 'element-plus'
 import ChatUserAuthApi from '@/api/admin/system/chat-management/chat-user-auth'
 import { LOGIN_METHOD } from '@/api/enums'
-import type { ApplicationAccessToken, ApplicationAccessTokenPayload, LoginMethod, OptionItem } from '@/api/types'
+import type { ApplicationAccessTokenPayload, LoginMethod, OptionItem } from '@/api/types'
 import { LOGIN_METHOD_LABELS } from '@/constants/auth'
 import { MsgSuccess } from '@/utils/message'
 import { useApplicationDetailContext } from '../../context'
@@ -15,39 +15,41 @@ const emit = defineEmits<{ closed: [] }>()
 const { applicationId, resourceApi } = useApplicationDetailContext()
 const visible = ref(true)
 const loading = ref(false)
-const saving = ref(false)
-const savedConfig = ref<ApplicationAccessToken>()
 const loginMethodOptions = ref<OptionItem<string>[]>([])
 const formRef = useTemplateRef<FormInstance>('formRef')
 const form = reactive({
+  language: undefined as string | undefined,
+  authentication_value: {
+    login_value: [] as string[],
+    default_value: '',
+    max_attempts: 1,
+    failed_attempts: 5,
+    lock_time: 10,
+  },
   access_num: 100,
   authentication: false,
-  login_value: [] as string[],
-  default_value: '',
-  max_attempts: 1,
-  failed_attempts: 5,
-  lock_time: 10,
   white_active: false,
   white_list: '',
 })
 
-const defaultLoginMethodOptions = computed(() => loginMethodOptions.value.filter((option) => form.login_value.includes(option.value)))
+const defaultLoginMethodOptions = computed(() =>
+  loginMethodOptions.value.filter((option) => form.authentication_value.login_value.includes(option.value)),
+)
 const rules: FormRules<typeof form> = {
-  access_num: [{ required: true, type: 'integer', min: 0, max: 10000000, message: '请输入 0～10000000 的整数', trigger: 'change' }],
-  login_value: [{ required: true, type: 'array', min: 1, message: '请选择至少一种登录方式', trigger: 'change' }],
-  default_value: [{ required: true, message: '请选择默认登录方式', trigger: 'change' }],
-  max_attempts: [{ required: true, type: 'integer', min: -1, max: 10, message: '请输入 -1～10 的整数', trigger: 'change' }],
-  failed_attempts: [{ required: true, type: 'integer', min: 1, max: 100, message: '请输入 1～100 的整数', trigger: 'change' }],
-  lock_time: [{ required: true, type: 'integer', min: 1, max: 1440, message: '请输入 1～1440 的整数', trigger: 'change' }],
+  'authentication_value.login_value': [{ required: true, type: 'array', min: 1, message: '请选择至少一种登录方式', trigger: 'change' }],
+  'authentication_value.default_value': [{ required: true, message: '请选择默认登录方式', trigger: 'change' }],
+  'authentication_value.max_attempts': [{ required: true, type: 'integer', min: -1, max: 10, message: '请输入 -1～10 的整数', trigger: 'change' }],
+  'authentication_value.failed_attempts': [{ required: true, type: 'integer', min: 1, max: 100, message: '请输入 1～100 的整数', trigger: 'change' }],
+  'authentication_value.lock_time': [{ required: true, type: 'integer', min: 1, max: 1440, message: '请输入 1～1440 的整数', trigger: 'change' }],
 }
 
 function handleLoginMethodsChange() {
-  if (!form.login_value.includes(form.default_value)) {
-    form.default_value = form.login_value[0] ?? ''
+  if (!form.authentication_value.login_value.includes(form.authentication_value.default_value)) {
+    form.authentication_value.default_value = form.authentication_value.login_value[0] ?? ''
   }
 }
 
-// 每次挂载读取当前范围配置；登录方式加载成功后再允许保存。
+// 每次挂载读取当前范围配置与登录方式。
 function loadAccessRestriction() {
   if (loading.value) return
   loading.value = true
@@ -58,18 +60,24 @@ function loadAccessRestriction() {
       return ChatUserAuthApi.getChatUserAuthType().then((options) => {
         loginMethodOptions.value = options
         Object.assign(form, {
+          language: config.language,
           access_num: config.access_num,
           authentication: config.authentication ?? false,
-          login_value: [...(authConfig?.login_value ?? (options.some((option) => option.value === LOGIN_METHOD.LOCAL) ? [LOGIN_METHOD.LOCAL] : []))],
-          default_value: authConfig?.default_value ?? '',
-          max_attempts: authConfig?.max_attempts ?? 1,
-          failed_attempts: authConfig?.failed_attempts ?? 5,
-          lock_time: authConfig?.lock_time ?? 10,
+          authentication_value: {
+            ...cloneDeep(authConfig ?? {}),
+            type: authConfig?.type ?? 'login',
+            login_value: [
+              ...(authConfig?.login_value ?? (options.some((option) => option.value === LOGIN_METHOD.LOCAL) ? [LOGIN_METHOD.LOCAL] : [])),
+            ],
+            default_value: authConfig?.default_value ?? '',
+            max_attempts: authConfig?.max_attempts ?? 1,
+            failed_attempts: authConfig?.failed_attempts ?? 5,
+            lock_time: authConfig?.lock_time ?? 10,
+          },
           white_active: config.white_active,
           white_list: config.white_list?.join('\n') ?? '',
         })
         handleLoginMethodsChange()
-        savedConfig.value = config
       })
     })
     .finally(() => {
@@ -78,9 +86,9 @@ function loadAccessRestriction() {
 }
 
 function handleSave() {
-  if (!savedConfig.value || loading.value || saving.value) return
+  if (loading.value) return
   formRef.value?.validate((valid) => {
-    if (!valid || !savedConfig.value || loading.value || saving.value) return
+    if (!valid || loading.value) return
     const payload: ApplicationAccessTokenPayload = {
       access_num: form.access_num,
       white_active: form.white_active,
@@ -89,19 +97,11 @@ function handleSave() {
         .map((origin) => origin.trim())
         .filter(Boolean),
       // 后端省略 language 会清空配置，访问限制保存时保留原值。
-      language: savedConfig.value.language,
+      language: form.language,
       authentication: form.authentication,
-      authentication_value: {
-        ...cloneDeep(savedConfig.value.authentication_value ?? {}),
-        type: savedConfig.value.authentication_value?.type ?? 'login',
-        login_value: [...form.login_value],
-        default_value: form.default_value,
-        max_attempts: form.max_attempts,
-        failed_attempts: form.failed_attempts,
-        lock_time: form.lock_time,
-      },
+      authentication_value: cloneDeep(form.authentication_value),
     }
-    saving.value = true
+    loading.value = true
     return resourceApi.application
       .putAccessToken(applicationId.value, payload)
       .then(() => {
@@ -109,7 +109,7 @@ function handleSave() {
         visible.value = false
       })
       .finally(() => {
-        saving.value = false
+        loading.value = false
       })
   })
 }
@@ -119,16 +119,17 @@ onMounted(loadAccessRestriction)
 
 <template>
   <MkDrawer v-model="visible" title="访问限制" @closed="emit('closed')">
-    <div v-loading="loading" class="h-full" :inert="saving">
+    <div v-loading="loading">
       <el-form ref="formRef" :model="form" :rules="rules" label-position="top" require-asterisk-position="right" @submit.prevent>
-        <el-form-item label="每个客户端提问限制" prop="access_num">
+        <el-form-item label="每个客户端提问限制">
           <el-input-number
             v-model="form.access_num"
             class="w-32!"
             :min="0"
             :max="10000000"
-            :precision="0"
-            :value-on-clear="100"
+            :step="1"
+            :value-on-clear="0"
+            step-strictly
             controls-position="right"
             align="left"
           />
@@ -147,9 +148,9 @@ onMounted(loadAccessRestriction)
           <el-switch v-model="form.authentication" />
         </el-form-item>
         <template v-if="form.authentication">
-          <el-form-item label="登录方式" prop="login_value">
+          <el-form-item label="登录方式" prop="authentication_value.login_value">
             <!-- 选择允许的登录方式 -->
-            <el-checkbox-group v-model="form.login_value" class="flex-wrap gap-x-6" @change="handleLoginMethodsChange">
+            <el-checkbox-group v-model="form.authentication_value.login_value" class="flex-wrap gap-x-6" @change="handleLoginMethodsChange">
               <template v-for="option in loginMethodOptions" :key="option.value">
                 <el-checkbox :value="option.value" :disabled="option.disabled" class="w-32">
                   {{ LOGIN_METHOD_LABELS[option.value as LoginMethod] || option.label }}
@@ -157,30 +158,51 @@ onMounted(loadAccessRestriction)
               </template>
             </el-checkbox-group>
           </el-form-item>
-          <el-form-item label="默认登录方式" prop="default_value">
-            <el-select v-model="form.default_value" placeholder="请选择默认登录方式">
+          <el-form-item label="默认登录方式" prop="authentication_value.default_value">
+            <el-select v-model="form.authentication_value.default_value" placeholder="请选择默认登录方式">
               <template v-for="option in defaultLoginMethodOptions" :key="option.value">
                 <el-option :value="option.value" :label="LOGIN_METHOD_LABELS[option.value as LoginMethod] || option.label" />
               </template>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="form.login_value.includes(LOGIN_METHOD.LOCAL)" label="账号登录验证码设置" required>
+          <el-form-item v-if="form.authentication_value.login_value.includes(LOGIN_METHOD.LOCAL)" label="账号登录验证码设置" required>
             <div class="mk-gray-card-lg w-full space-y-4">
               <div class="flex-align-center gap-2">
                 <span class="shrink-0">登录失败</span>
-                <el-form-item prop="max_attempts" class="mb-0!">
-                  <el-input-number v-model="form.max_attempts" class="w-32!" :min="-1" :max="10" :precision="0" :value-on-clear="1" />
+                <el-form-item prop="authentication_value.max_attempts" class="mb-0!">
+                  <el-input-number
+                    v-model="form.authentication_value.max_attempts"
+                    class="w-32!"
+                    :min="-1"
+                    :max="10"
+                    :precision="0"
+                    :value-on-clear="1"
+                  />
                 </el-form-item>
                 <span class="shrink-0">次显示验证码</span>
               </div>
               <div class="flex-align-center gap-2">
                 <span class="shrink-0">登录失败</span>
-                <el-form-item prop="failed_attempts" class="mb-0!">
-                  <el-input-number v-model="form.failed_attempts" class="w-32!" :min="1" :max="100" :precision="0" :value-on-clear="5" />
+                <el-form-item prop="authentication_value.failed_attempts" class="mb-0!">
+                  <el-input-number
+                    v-model="form.authentication_value.failed_attempts"
+                    class="w-32!"
+                    :min="1"
+                    :max="100"
+                    :precision="0"
+                    :value-on-clear="5"
+                  />
                 </el-form-item>
                 <span class="shrink-0">次，锁定账号</span>
-                <el-form-item prop="lock_time" class="mb-0!">
-                  <el-input-number v-model="form.lock_time" class="w-32!" :min="1" :max="1440" :precision="0" :value-on-clear="10" />
+                <el-form-item prop="authentication_value.lock_time" class="mb-0!">
+                  <el-input-number
+                    v-model="form.authentication_value.lock_time"
+                    class="w-32!"
+                    :min="1"
+                    :max="1440"
+                    :precision="0"
+                    :value-on-clear="10"
+                  />
                 </el-form-item>
                 <span class="shrink-0">分钟</span>
               </div>
@@ -196,7 +218,7 @@ onMounted(loadAccessRestriction)
               v-model="form.white_list"
               type="textarea"
               :rows="8"
-              placeholder="请输入允许嵌入第三方的源地址，一行一个，如：&#10;http://127.0.0.1:5678&#10;https://dataease.io"
+              :placeholder="'请输入允许嵌入第三方的源地址，一行一个，如：\nhttp://127.0.0.1:5678\nhttps://dataease.io'"
             />
           </div>
         </el-form-item>
@@ -204,9 +226,9 @@ onMounted(loadAccessRestriction)
     </div>
     <template #footer>
       <!-- 取消访问限制设置 -->
-      <el-button plain :disabled="saving" @click="visible = false">取消</el-button>
+      <el-button plain :disabled="loading" @click="visible = false">取消</el-button>
       <!-- 保存访问限制设置 -->
-      <el-button type="primary" :loading="saving" :disabled="loading" @click="handleSave">保存</el-button>
+      <el-button type="primary" :loading="loading" @click="handleSave">保存</el-button>
     </template>
   </MkDrawer>
 </template>
diff --git a/ui/src/views/knowledge-detail/library/tags/index.vue b/ui/src/views/knowledge-detail/library/tags/index.vue
index be20334a9e4..69f85e13e6e 100644
--- a/ui/src/views/knowledge-detail/library/tags/index.vue
+++ b/ui/src/views/knowledge-detail/library/tags/index.vue
@@ -192,7 +192,7 @@ onMounted(() => {
     @cell-mouse-leave="handleCellLeave"
   >
     <el-table-column type="selection" width="40" v-if="!isWorkspaceSharedResource()" />
-    <el-table-column prop="key" label="标签" min-width="240">
+    <el-table-column prop="key" label="标签">
       <template #default="{ row }: { row: TagTableRow }">
         <div class="flex-align-center gap-1">
           <span class="min-w-0 truncate" :title="row.key">{{ row.key }}</span>
@@ -219,7 +219,7 @@ onMounted(() => {
         </div>
       </template>
     </el-table-column>
-    <el-table-column prop="value" label="标签值" min-width="180" class-name="border-l!" show-overflow-tooltip />
+    <el-table-column prop="value" label="标签值" class-name="border-l!" show-overflow-tooltip />
     <el-table-column prop="doc_count" label="已关联文档" min-width="140">
       <template #default="{ row }: { row: TagTableRow }">
         <!-- 查看标签关联文档 -->
diff --git a/ui/src/views/knowledge-detail/problem/index.vue b/ui/src/views/knowledge-detail/problem/index.vue
index a2bcea6cd84..4ea4128ca55 100644
--- a/ui/src/views/knowledge-detail/problem/index.vue
+++ b/ui/src/views/knowledge-detail/problem/index.vue
@@ -240,13 +240,13 @@ onMounted(() => loadProblems())
     <el-table-column prop="hit_num" label="召回次数" min-width="100" sortable>
       <template #default="{ row }: { row: ProblemItem }">{{ numberFormat(row.hit_num) }}</template>
     </el-table-column>
-    <el-table-column prop="last_hit_time" label="最近一次召回时间" min-width="180" sortable>
+    <el-table-column prop="last_hit_time" label="最近一次召回时间" width="200" sortable>
       <template #default="{ row }: { row: ProblemItem }">{{ datetimeFormat(row.last_hit_time) || '-' }}</template>
     </el-table-column>
-    <el-table-column prop="create_time" label="创建时间" min-width="180" sortable>
+    <el-table-column prop="create_time" label="创建时间" width="180" sortable>
       <template #default="{ row }: { row: ProblemItem }">{{ datetimeFormat(row.create_time) }}</template>
     </el-table-column>
-    <el-table-column prop="update_time" label="更新时间" min-width="180" sortable>
+    <el-table-column prop="update_time" label="更新时间" width="180" sortable>
       <template #default="{ row }: { row: ProblemItem }">{{ datetimeFormat(row.update_time) }}</template>
     </el-table-column>
     <el-table-column v-if="!isWorkspaceSharedResource()" label="操作" width="100" fixed="right">
diff --git a/ui/src/views/knowledge-detail/termbase/index.vue b/ui/src/views/knowledge-detail/termbase/index.vue
index 073a8741c65..e9d975f6e5b 100644
--- a/ui/src/views/knowledge-detail/termbase/index.vue
+++ b/ui/src/views/knowledge-detail/termbase/index.vue
@@ -186,13 +186,13 @@ onMounted(() => {
       />
     </template>
     <el-table-column type="selection" width="40" />
-    <el-table-column prop="content" label="词语" min-width="280" show-overflow-tooltip />
-    <el-table-column prop="create_time" label="创建时间" min-width="180">
+    <el-table-column prop="content" label="词语" show-overflow-tooltip />
+    <el-table-column prop="create_time" label="创建时间" width="180">
       <template #default="{ row }: { row: TermbaseItem }">
         {{ datetimeFormat(row.create_time) }}
       </template>
     </el-table-column>
-    <el-table-column prop="update_time" label="更新时间" min-width="180">
+    <el-table-column prop="update_time" label="更新时间" width="180">
       <template #default="{ row }: { row: TermbaseItem }">
         {{ datetimeFormat(row.update_time) }}
       </template>
diff --git a/ui/src/views/system/resource-management/application/index.vue b/ui/src/views/system/resource-management/application/index.vue
index 765b1de720b..02e4e1f9573 100644
--- a/ui/src/views/system/resource-management/application/index.vue
+++ b/ui/src/views/system/resource-management/application/index.vue
@@ -129,7 +129,7 @@ onMounted(() => {
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="type" label="类型" width="150">
+        <el-table-column prop="type" label="类型" width="100">
           <template #header>
             <MkTableFilter mode="single" v-model="selectedType" label="类型" :options="typeOptions" @change="handleFilterChange" />
           </template>
@@ -138,7 +138,7 @@ onMounted(() => {
             <el-tag v-else type="primary" class="default" size="small">简易</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="状态" width="150">
+        <el-table-column label="状态" width="100">
           <template #header>
             <MkTableFilter mode="single" v-model="selectedStatus" label="状态" :options="applicationStatusOptions" @change="handleFilterChange" />
           </template>
diff --git a/ui/src/views/system/resource-management/knowledge/index.vue b/ui/src/views/system/resource-management/knowledge/index.vue
index d5a98d61263..c7b0fec9db9 100644
--- a/ui/src/views/system/resource-management/knowledge/index.vue
+++ b/ui/src/views/system/resource-management/knowledge/index.vue
@@ -151,7 +151,7 @@ onMounted(() => {
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="type" label="类型" width="200">
+        <el-table-column prop="type" label="类型" width="180">
           <template #header>
             <MkTableFilter mode="single" v-model="selectedType" label="类型" :options="typeOptions" @change="handleFilterChange" />
           </template>
diff --git a/ui/src/views/system/resource-management/tool/index.vue b/ui/src/views/system/resource-management/tool/index.vue
index e0f082bea1a..a037a7dcb39 100644
--- a/ui/src/views/system/resource-management/tool/index.vue
+++ b/ui/src/views/system/resource-management/tool/index.vue
@@ -203,10 +203,23 @@ onMounted(() => {
           <template #default="{ row }">
             <div class="flex-align-center">
               <!-- 启用或禁用工具 -->
-              <ToolStatusSwitch v-model:loading="operationLoading" :api="SystemToolApi" :tool="row" :disabled="!perm.tool.system.switch() || operationLoading" @update="handleToolUpdate" />
+              <ToolStatusSwitch
+                v-model:loading="operationLoading"
+                :api="SystemToolApi"
+                :tool="row"
+                :disabled="!perm.tool.system.switch() || operationLoading"
+                @update="handleToolUpdate"
+              />
               <el-divider direction="vertical" class="ml-3! mr-2!" />
               <!-- 编辑工具配置 -->
-              <EditToolAction v-if="perm.tool.system.edit()" display="button" label="编辑" :api="SystemToolApi" :tool="row" @update="handleToolUpdate" />
+              <EditToolAction
+                v-if="perm.tool.system.edit()"
+                display="button"
+                label="编辑"
+                :api="SystemToolApi"
+                :tool="row"
+                @update="handleToolUpdate"
+              />
               <!-- 更多工具操作 -->
               <MkTableMoreDropdown>
                 <!-- 打开工具工作流 -->
@@ -253,7 +266,13 @@ onMounted(() => {
                   :tool="row"
                 />
                 <!-- 导出工具 -->
-                <ExportToolAction v-if="!row.template_id && perm.tool.system.export()" v-model:loading="operationLoading" label="导出" :api="SystemToolApi" :tool="row" />
+                <ExportToolAction
+                  v-if="!row.template_id && perm.tool.system.export()"
+                  v-model:loading="operationLoading"
+                  label="导出"
+                  :api="SystemToolApi"
+                  :tool="row"
+                />
                 <!-- 删除工具 -->
                 <MkDropdownItem divided @click="handleDeleteTool(row)" v-if="perm.tool.system.delete()">
                   <template #icon><MkIcon name="icon_delete-trash_outlined" /></template>
diff --git a/ui/src/views/trigger/index.vue b/ui/src/views/trigger/index.vue
index e1ca16dc6fe..d58c102422e 100644
--- a/ui/src/views/trigger/index.vue
+++ b/ui/src/views/trigger/index.vue
@@ -199,25 +199,13 @@ onMounted(() => loadTriggers())
         </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"
-            />
+            <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"
-            />
+            <MkTableFilter mode="single" v-model="selectedStatus" label="状态" :options="triggerStatusOptions" @change="handleFilterChange" />
           </template>
           <template #default="{ row }"><MkStatusLabel :active="row.is_active" /></template>
         </el-table-column>