diff --git a/frontend/src/views/components/UserManagement/UserManagement.js b/frontend/src/views/components/UserManagement/UserManagement.js index 75071a63..ba1ea436 100644 --- a/frontend/src/views/components/UserManagement/UserManagement.js +++ b/frontend/src/views/components/UserManagement/UserManagement.js @@ -18,10 +18,7 @@ export function recoveryCodeMeta(configured) { : { label: '未开启', type: 'info' } } -export function externalEmailMeta(enabled, configured) { - if (!enabled) { - return { label: '已关闭', type: 'warning' } - } +export function externalEmailMeta(configured) { return configured ? { label: '已绑定', type: 'success' } : { label: '未绑定', type: 'info' } diff --git a/frontend/src/views/components/UserManagement/UserManagement.vue b/frontend/src/views/components/UserManagement/UserManagement.vue index 4ba7397e..6ff01e17 100644 --- a/frontend/src/views/components/UserManagement/UserManagement.vue +++ b/frontend/src/views/components/UserManagement/UserManagement.vue @@ -37,12 +37,12 @@ @@ -165,7 +165,6 @@ 外部邮箱 {{ externalEmailMeta( - selectedUser?.ExternalEmailEnabled, selectedUser?.ExternalEmailConfigured ).label }} diff --git a/test/frontend/user-management.test.mjs b/test/frontend/user-management.test.mjs index 4012b1d4..63df1671 100644 --- a/test/frontend/user-management.test.mjs +++ b/test/frontend/user-management.test.mjs @@ -33,9 +33,8 @@ test('用户管理状态映射使用明确的中文文案', () => { assert.equal(roleMeta('').label, '未知权限') assert.equal(recoveryCodeMeta(true).label, '已开启') assert.equal(recoveryCodeMeta(false).label, '未开启') - assert.equal(externalEmailMeta(true, true).label, '已绑定') - assert.equal(externalEmailMeta(true, false).label, '未绑定') - assert.equal(externalEmailMeta(false, true).label, '已关闭') + assert.equal(externalEmailMeta(true).label, '已绑定') + assert.equal(externalEmailMeta(false).label, '未绑定') assert.equal(accountStatusMeta(0).label, '正常') assert.equal(accountStatusMeta(1).label, '已禁用') }) @@ -50,8 +49,9 @@ test('用户管理页面可编译并展示权限与安全状态列', () => { } assert.match(source, /scope\.row\.Role/) assert.match(source, /scope\.row\.RecoveryCodeConfigured/) - assert.match(source, /scope\.row\.ExternalEmailEnabled/) + assert.doesNotMatch(source, /ExternalEmailEnabled/) assert.match(source, /scope\.row\.ExternalEmailConfigured/) + assert.match(source, /selectedUser\?\.ExternalEmailConfigured/) assert.match(source, /管理安全码/) assert.match(source, /编辑外部邮箱/) assert.match(source, /RecoveryCodeDialog/)