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()]) }) 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)
- + @@ -322,6 +321,7 @@ onMounted(loadPermissions)