From 96a7a0727150bd579a57f342b8a00a10146ad5f8 Mon Sep 17 00:00:00 2001
From: ouyangxq <775153912@qq.com>
Date: Mon, 10 Aug 2026 18:21:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/container-loading/pages/ContainersView.vue | 4 +++-
 src/modules/iam/pages/PermissionsView.test.ts          | 2 +-
 src/modules/iam/pages/PermissionsView.vue              | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/container-loading/pages/ContainersView.vue b/src/modules/container-loading/pages/ContainersView.vue
index 99f8a09c..5e15ac3c 100644
--- a/src/modules/container-loading/pages/ContainersView.vue
+++ b/src/modules/container-loading/pages/ContainersView.vue
@@ -176,7 +176,9 @@ async function save() {
 }
 function goWorkbench(source: object) { const row = source as ContainerBookingResource; void router.push({ name: 'smart-loading-workbench', params: { containerId: row.id } }) }
 
-watch([page, pageSize], ([nextPage], [previousPage]) => { if (nextPage !== previousPage || pageSize.value > 0) void loadRows() })
+watch([page, pageSize], ([nextPage, nextSize], [previousPage, previousSize]) => {
+  if (nextPage !== previousPage || nextSize !== previousSize) void loadRows()
+})
 onMounted(() => { void Promise.all([loadWarehouses(), loadRows()]) })
 </script>
 
diff --git a/src/modules/iam/pages/PermissionsView.test.ts b/src/modules/iam/pages/PermissionsView.test.ts
index 5959fa7a..ecafcc5f 100644
--- a/src/modules/iam/pages/PermissionsView.test.ts
+++ b/src/modules/iam/pages/PermissionsView.test.ts
@@ -108,7 +108,7 @@ describe('PermissionsView IAM mode', () => {
 
     const actions = wrapper.get('[data-row-id="5100010"]')
     expect(actions.text()).toContain('添加下级')
-    expect(actions.text()).toContain('系统内置')
+    expect(actions.text()).not.toContain('系统内置')
     expect(actions.text()).not.toContain('编辑')
     expect(actions.text()).not.toContain('停用')
     expect(actions.text()).not.toContain('删除')
diff --git a/src/modules/iam/pages/PermissionsView.vue b/src/modules/iam/pages/PermissionsView.vue
index b4e27290..b9bbc201 100644
--- a/src/modules/iam/pages/PermissionsView.vue
+++ b/src/modules/iam/pages/PermissionsView.vue
@@ -277,7 +277,7 @@ onMounted(loadPermissions)
 
       <section v-if="!loadError" class="surface-panel table-panel">
       <DataTable :key="tableRenderKey" v-model:page="page" v-model:page-size="pageSize" :data="pagedTreeRows" :columns="permissionColumns" preference-key="permissions-table" :loading="loading" :total="treeRows.length" row-key="id" :expand-row-keys="expandedRowKeys" :tree-props="{ children: 'children' }" empty-text="没有符合条件的权限资源">
-        <template #toolbar-start><div class="permission-tree-tools"><div class="legend-list"><span><i class="is-menu" />目录 / 菜单</span><span><i class="is-action" />操作</span><span><i class="is-api" />接口预留</span></div><div class="tree-view-actions"><el-button link type="primary" @click="expandAllRows">展开全部</el-button><el-button link @click="collapseActionRows">收起操作权限</el-button></div></div></template>
+        <template #toolbar-start><div class="permission-tree-tools"><div class="legend-list"><span><i class="is-menu" />目录 / 菜单</span><span><i class="is-action" />操作</span><span><i class="is-api" />接口预留</span><span class="permission-protection-hint">受保护资源不可编辑、停用或删除</span></div><div class="tree-view-actions"><el-button link type="primary" @click="expandAllRows">展开全部</el-button><el-button link @click="collapseActionRows">收起操作权限</el-button></div></div></template>
         <template #toolbar-actions><el-button v-if="canCreate" type="primary" @click="openCreate(null)"><Plus :size="16" />新增权限</el-button></template>
         <template #actions="{ row }">
           <div v-if="permissionActionCount(row as Permission) > 0 || (row as Permission).builtIn" class="table-actions">
@@ -289,7 +289,6 @@ onMounted(loadPermissions)
               <el-button link :aria-label="moreActionsLabel(row as Permission)" :title="moreActionsLabel(row as Permission)"><MoreHorizontal :size="16" /></el-button>
               <template #dropdown><el-dropdown-menu><el-dropdown-item command="delete" :disabled="rowActionId === (row as Permission).id" class="danger-menu-item"><Trash2 :size="15" />删除</el-dropdown-item></el-dropdown-menu></template>
             </el-dropdown>
-            <span v-if="(row as Permission).builtIn" class="secondary-text">系统内置</span>
           </div>
           <span v-else class="secondary-text">仅查看</span>
         </template>
@@ -322,6 +321,7 @@ onMounted(loadPermissions)
 
 <style scoped>
 .permission-tree-tools { display: flex; align-items: center; gap: 16px; }
+.permission-protection-hint { color: var(--cc-muted); }
 .tree-view-actions { display: flex; align-items: center; gap: 4px; white-space: nowrap; }
 .tree-view-actions .el-button + .el-button { margin-left: 0; }
 .permission-name > div { display: flex; min-width: 0; flex-direction: column; gap: 2px; }