发布 0.1.0:通知渠道、告警规则与多项体验修复

src/components/tenant/UserFormModal.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { NCheckbox, NInput, useMessage } from 'naive-ui'
+import { NCheckbox, NInput } from 'naive-ui'
 import { computed, reactive, ref, watch } from 'vue'
 
 import {
@@ -12,12 +12,13 @@ import {
 import FormField from '@/components/FormField.vue'
 import FormModal from '@/components/FormModal.vue'
 import type { IamUser, IamUserDetail } from '@/types/api'
+import { useToast } from '@/composables/useToast'
 
 // user 非空即编辑模式：打开时拉取域档案预填充，提交只发送与原值不同的字段
-const props = defineProps<{ show: boolean; cfgId: number; user?: IamUser | null }>()
+const props = defineProps<{ show: boolean; cfgId: number; domainId?: string; user?: IamUser | null }>()
 const emit = defineEmits<{ 'update:show': [boolean]; created: [] }>()
 
-const message = useMessage()
+const message = useToast()
 const submitting = ref(false)
 // 域开启「用户需要提供主电子邮件地址」时邮箱必填
 const emailRequired = ref(false)
@@ -57,7 +58,7 @@ watch(
 
 async function loadIdentitySetting() {
   try {
-    emailRequired.value = (await getIdentitySetting(props.cfgId)).primaryEmailRequired
+    emailRequired.value = (await getIdentitySetting(props.cfgId, props.domainId)).primaryEmailRequired
   } catch {
     emailRequired.value = false
   }
@@ -67,7 +68,7 @@ async function loadIdentitySetting() {
 async function loadDetail(userId: string) {
   detailLoading.value = true
   try {
-    const d = await getUserDetail(props.cfgId, userId)
+    const d = await getUserDetail(props.cfgId, userId, props.domainId)
     if (props.user?.id !== userId) return
     detail.value = d
     if (!d.inDomain) return
@@ -139,20 +140,24 @@ async function submitEdit(u: IamUser) {
     emit('update:show', false)
     return
   }
-  await updateUser(props.cfgId, u.id, body)
+  await updateUser(props.cfgId, u.id, body, props.domainId)
   message.success(`用户「${u.name}」已更新`)
 }
 
 async function submitCreate() {
-  const created = await createUser(props.cfgId, {
-    name: form.name.trim(),
-    givenName: form.givenName.trim(),
-    familyName: form.familyName.trim(),
-    email: form.email.trim() || undefined,
-    description: form.description.trim() || undefined,
-    grantDomainAdmin: form.grantDomainAdmin,
-    addToAdminGroup: form.addToAdminGroup,
-  })
+  const created = await createUser(
+    props.cfgId,
+    {
+      name: form.name.trim(),
+      givenName: form.givenName.trim(),
+      familyName: form.familyName.trim(),
+      email: form.email.trim() || undefined,
+      description: form.description.trim() || undefined,
+      grantDomainAdmin: form.grantDomainAdmin,
+      addToAdminGroup: form.addToAdminGroup,
+    },
+    props.domainId,
+  )
   message.success(`用户「${created.name}」已创建，可再执行「重置密码」下发初始密码`)
 }
 
@@ -225,7 +230,7 @@ async function submit() {
         {{ editing ? '身份域管理员' : '添加到身份域管理员' }}
       </NCheckbox>
       <NCheckbox v-model:checked="form.addToAdminGroup" :disabled="classicUser || detailLoading">
-        {{ editing ? '管理员组（Administrators）成员' : '添加到管理员组（Administrators）' }}
+        {{ editing ? '租户管理员组成员' : '添加到租户管理员组' }}
       </NCheckbox>
       <div v-if="adminHint" class="text-xs text-ink-3">{{ adminHint }}</div>
     </div>