@liujitcn/kratos-admin-system 0.0.31 → 0.0.32

package/dist/package/src/views/base/menu/index.vue

@@ -66,9 +66,9 @@ import type {
 } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import SelectIcon from "@liujitcn/kratos-admin-core/components/SelectIcon/index.vue";
-import { defBaseMenuService } from "@liujitcn/kratos-admin-system/api/system/base_menu";
-import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/base_language";
-import { defBaseApiService } from "@liujitcn/kratos-admin-system/api/system/base_api";
+import { defBaseMenuService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_menu";
+import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
+import { defBaseApiService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_api";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import type { BaseApi } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_api";
 import type {
@@ -96,7 +96,7 @@ defineOptions({
   inheritAttrs: false
 });
 
-const APP_MENU_ROOT_ID = 999;
+const APP_MENU_ROOT_ID = 99000000;
 
 /**
  * 菜单表单状态，统一补齐 meta 字段，便于 ProForm 直接双向绑定。
@@ -113,7 +113,7 @@ const menuOptions = ref<ProFormOption[]>([]);
 const parentMenuTypeMap = ref(new Map<number, BaseMenuType>());
 const appMenuIds = ref(new Set<number>([APP_MENU_ROOT_ID]));
 const apiList = ref<BaseApi[]>([]);
-const i18nValues = ref<DynamicI18nValue[]>(normalizeDynamicI18ns(undefined, "title"));
+const i18nValues = ref<DynamicI18nValue[]>(normalizeDynamicI18ns(undefined));
 
 const dialog = reactive({
   editing: false,
@@ -192,21 +192,21 @@ function isAppTab(parentId?: number) {
   return parentId === APP_MENU_ROOT_ID;
 }
 
-/** 根据三、五、七、九位编号识别菜单层级。 */
+/** 根据固定八位编号中的非零层级槽位识别菜单层级。 */
 function getMenuLevel(menuId: number) {
-  if (menuId >= 100 && menuId <= 999) return 1;
-  if (menuId >= 10000 && menuId <= 99999) return 2;
-  if (menuId >= 1000000 && menuId <= 9999999) return 3;
-  if (menuId >= 100000000 && menuId <= 999999999) return 4;
-  return 0;
+  if (menuId < 10000000 || menuId > 99999999) return 0;
+  if (menuId % 1000000 === 0) return 1;
+  if (menuId % 10000 === 0) return 2;
+  if (menuId % 100 === 0) return 3;
+  return 4;
 }
 
 /** 判断当前菜单是否还能继续新增下级节点。 */
 function canCreateChild(menu: BaseMenu) {
   const level = getMenuLevel(menu.id);
   if (menu.id === APP_MENU_ROOT_ID || isAppMenu(menu.parent_id)) return level >= 1 && level < 4;
-  if (menu.type === BaseMenuType.BASE_MENU_TYPE_FOLDER) return level === 1 || level === 2;
-  if (menu.type === BaseMenuType.BASE_MENU_TYPE_MENU) return level === 2 || level === 3;
+  if (menu.type === BaseMenuType.BASE_MENU_TYPE_FOLDER) return level === 1 || level === 2 || level === 3;
+  if (menu.type === BaseMenuType.BASE_MENU_TYPE_MENU) return level === 2 || level === 3 || level === 4;
   return false;
 }
 
@@ -219,18 +219,18 @@ const availableMenuTypeOptions = computed(() => {
   if (isAppMenu(formData.parent_id)) return menuTypeOptions.value.filter(item => item.value === BaseMenuType.BASE_MENU_TYPE_MENU);
   if (formData.id > 0 && parentLevel === 0)
     return menuTypeOptions.value.filter(item => item.value === BaseMenuType.BASE_MENU_TYPE_FOLDER);
-  if (dialog.parentType === BaseMenuType.BASE_MENU_TYPE_FOLDER && parentLevel === 1)
+  if (dialog.parentType === BaseMenuType.BASE_MENU_TYPE_FOLDER && (parentLevel === 1 || parentLevel === 2))
     return menuTypeOptions.value.filter(
       item =>
         item.value === BaseMenuType.BASE_MENU_TYPE_FOLDER ||
         item.value === BaseMenuType.BASE_MENU_TYPE_MENU ||
         item.value === BaseMenuType.BASE_MENU_TYPE_EXT_LINK
     );
-  if (dialog.parentType === BaseMenuType.BASE_MENU_TYPE_FOLDER && parentLevel === 2)
+  if (dialog.parentType === BaseMenuType.BASE_MENU_TYPE_FOLDER && parentLevel === 3)
     return menuTypeOptions.value.filter(
       item => item.value === BaseMenuType.BASE_MENU_TYPE_MENU || item.value === BaseMenuType.BASE_MENU_TYPE_EXT_LINK
     );
-  if (dialog.parentType === BaseMenuType.BASE_MENU_TYPE_MENU && (parentLevel === 2 || parentLevel === 3))
+  if (dialog.parentType === BaseMenuType.BASE_MENU_TYPE_MENU && (parentLevel === 2 || parentLevel === 3 || parentLevel === 4))
     return menuTypeOptions.value.filter(item => item.value === BaseMenuType.BASE_MENU_TYPE_BUTTON);
   return [];
 });
@@ -1145,7 +1145,7 @@ function resetForm(data?: Partial<BaseMenuForm>) {
   formDialogRef.value?.resetFields();
   formDialogRef.value?.clearValidate();
   Object.assign(formData, normalizeMenuForm(data));
-  i18nValues.value = normalizeDynamicI18ns(data?.i18ns as DynamicI18nRecord[] | undefined, "title");
+	i18nValues.value = normalizeDynamicI18ns(data?.i18ns as DynamicI18nRecord[] | undefined);
 }
 
 /** 提交菜单表单，并在成功后关闭弹窗、刷新表格。 */

package/dist/package/src/views/base/message/index.vue

@@ -6,11 +6,12 @@
       ref="formDialogRef"
       :title="t(dialog.titleKey)"
       width="900px"
+      destroy-on-close
       :model="formState"
       :fields="formFields"
       :rules="rules"
       @confirm="handleSubmit"
-      @close="handleClose"
+      @closed="handleClose"
     >
       <template #audiences>
         <div class="audiences-editor">
@@ -45,24 +46,72 @@
         </div>
       </template>
     </FormDialog>
-    <el-dialog v-model="detail.visible" :title="t('system.base.message.detail.title')" width="900px">
+    <ProDialog
+      v-model="content.visible"
+      :title="content.data?.base_message?.title || t('system.base.message.content.title')"
+      width="760px"
+      destroy-on-close
+      :show-footer="false"
+    >
+      <el-skeleton v-if="content.loading" :rows="8" animated />
+      <template v-else-if="content.data">
+        <div class="message-content-meta">
+          <span>{{ content.data.base_message?.category_name || "-" }}</span>
+          <span>{{ content.data.base_message?.created_at || "-" }}</span>
+        </div>
+        <RichTextPreview
+          v-if="content.data.form?.content_format === MessageContentFormat.MESSAGE_CONTENT_FORMAT_RICH_TEXT"
+          class="message-content-body"
+          :model-value="content.data.form?.content ?? ''"
+        />
+        <pre v-else class="message-content-body">{{ content.data.form?.content ?? "" }}</pre>
+      </template>
+    </ProDialog>
+    <ProDialog
+      v-model="detail.visible"
+      :title="t('system.base.message.send_detail.title')"
+      width="min(1200px, calc(100vw - 32px))"
+      :show-footer="false"
+    >
       <template v-if="detail.data">
         <el-descriptions :column="2" border>
           <el-descriptions-item :label="t('system.base.message.field.title')">{{
             detail.data.base_message?.title
           }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.message.field.category')">{{
+            detail.data.base_message?.category_name
+          }}</el-descriptions-item>
           <el-descriptions-item :label="t('common.field.status')">{{
             optionLabel(statusOptions, detail.data.base_message?.status)
           }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.message.field.sender')">{{
+            detail.data.base_message?.sender_name
+          }}</el-descriptions-item>
           <el-descriptions-item :label="t('system.base.message.field.delivered_total')">{{
             detail.data.base_message?.delivered_total
           }}</el-descriptions-item>
           <el-descriptions-item :label="t('system.base.message.field.recipient_total')">{{
             detail.data.base_message?.recipient_total
           }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.message.field.failed_total')">{{
+            detail.data.base_message?.failed_total
+          }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.message.field.published_at')">{{
+            detail.data.base_message?.published_at || "-"
+          }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.message.field.scheduled_at')">{{
+            detail.data.base_message?.scheduled_at || "-"
+          }}</el-descriptions-item>
         </el-descriptions>
         <el-table :data="detail.data.dispatches" style="margin-top: 16px" size="small">
           <el-table-column prop="id" label="ID" width="90" />
+          <el-table-column prop="audience_type" :label="t('system.base.message.field.audience_type')" width="120">
+            <template #default="scope">{{ optionLabel(audienceOptions, scope.row.audience_type) }}</template>
+          </el-table-column>
+          <el-table-column prop="audience_id" :label="t('system.base.message.field.audience_id')" width="110" />
+          <el-table-column prop="include_children" :label="t('system.base.message.field.include_children')" width="120">
+            <template #default="scope">{{ scope.row.include_children ? t("common.value.yes") : t("common.value.no") }}</template>
+          </el-table-column>
           <el-table-column prop="status" :label="t('common.field.status')" width="120" />
           <el-table-column prop="matched_total" :label="t('system.base.message.field.matched_total')" width="110" />
           <el-table-column prop="inserted_total" :label="t('system.base.message.field.inserted_total')" width="110" />
@@ -87,14 +136,16 @@
           </el-table-column>
         </el-table>
       </template>
-    </el-dialog>
+    </ProDialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref, watch } from "vue";
+import { computed, h, onMounted, reactive, ref, watch } from "vue";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import ProDialog from "@liujitcn/kratos-admin-core/components/Dialog/ProDialog.vue";
 import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
+import RichTextPreview from "@liujitcn/kratos-admin-core/components/RichTextPreview/index.vue";
 import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
@@ -102,9 +153,9 @@ import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-c
 import { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
 import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
 import { t } from "@liujitcn/kratos-admin-core";
-import { defBaseMessageService } from "@liujitcn/kratos-admin-system/api/system/base_message";
-import { defBaseMessageCategoryService } from "@liujitcn/kratos-admin-system/api/system/base_message_category";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/base_tenant";
+import { defBaseMessageService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_message";
+import { defBaseMessageCategoryService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_message_category";
+import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
 import type {
   BaseMessage,
   BaseMessageDetail,
@@ -145,6 +196,7 @@ const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const categoryOptions = ref<ProFormOption[]>([]);
 const tenantOptions = ref<ProFormOption[]>([]);
 const dialog = reactive({ visible: false, titleKey: "common.action.create" });
+const content = reactive<{ visible: boolean; loading: boolean; data?: BaseMessageDetail }>({ visible: false, loading: false });
 const detail = reactive<{ visible: boolean; data?: BaseMessageDetail }>({ visible: false });
 const formState = reactive<MessageFormState>(defaultForm());
 
@@ -171,7 +223,10 @@ const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("system.base.message.status.published"), value: MessageStatus.MESSAGE_STATUS_PUBLISHED },
   { label: t("system.base.message.status.revoked"), value: MessageStatus.MESSAGE_STATUS_REVOKED }
 ]);
-onMounted(() => void loadTenantOptions());
+onMounted(() => {
+  void loadCategoryOptions();
+  void loadTenantOptions();
+});
 watch(
   () => formState.action_type,
   value => {
@@ -244,7 +299,11 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.base.message.field.content"),
     labelTooltip: t("system.base.message.tooltip.content"),
     component: "rich-text",
-    props: { height: "320px", editorConfig: { placeholder: t("system.base.message.placeholder.content") } },
+    props: {
+      height: "320px",
+      uploadType: "message",
+      editorConfig: { placeholder: t("system.base.message.placeholder.content") }
+    },
     colSpan: 24
   },
   {
@@ -310,8 +369,42 @@ const columns = computed<ColumnProps[]>(() => [
         }
       ] satisfies ColumnProps[])
     : []),
-  { prop: "title", label: t("system.base.message.field.title"), minWidth: 220, search: { el: "input" } },
-  { prop: "category_name", label: t("system.base.message.field.category"), minWidth: 130 },
+  {
+    prop: "title",
+    label: t("system.base.message.field.title"),
+    minWidth: 220,
+    search: { el: "input" },
+    render: scope => {
+      const row = scope.row as BaseMessage;
+      return h(
+        "a",
+        {
+          href: "#",
+          title: row.title,
+          style: {
+            display: "block",
+            maxWidth: "100%",
+            overflow: "hidden",
+            color: "var(--el-color-primary)",
+            textDecoration: "none",
+            textOverflow: "ellipsis",
+            whiteSpace: "nowrap"
+          },
+          onClick: (event: MouseEvent) => {
+            event.preventDefault();
+            void openContent(row.id);
+          }
+        },
+        row.title
+      );
+    }
+  },
+  {
+    prop: "category_name",
+    label: t("system.base.message.field.category"),
+    minWidth: 130,
+    search: { el: "select", key: "category_id", enum: categoryOptions.value }
+  },
   {
     prop: "priority",
     label: t("system.base.message.field.priority"),
@@ -330,7 +423,8 @@ const columns = computed<ColumnProps[]>(() => [
   {
     prop: "operation",
     label: t("common.field.operation"),
-    width: 260,
+    width: 380,
+    className: "message-operation-column",
     fixed: "right",
     cellType: "actions",
     actions: [
@@ -343,7 +437,7 @@ const columns = computed<ColumnProps[]>(() => [
         onClick: scope => openDialog((scope.row as BaseMessage).id)
       },
       {
-        label: t("system.base.message.detail.action"),
+        label: t("system.base.message.send_detail.action"),
         link: true,
         icon: View,
         onClick: scope => openDetail((scope.row as BaseMessage).id)
@@ -399,7 +493,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
     onClick: () => openDialog()
   },
   {
-    label: t("common.action.batch_delete"),
+    label: t("common.action.delete"),
     type: "danger",
     icon: Delete,
     hidden: !BUTTONS.value["base:message:delete"],
@@ -465,7 +559,6 @@ async function loadTenantOptions() {
   if (!isDefaultTenant.value) return;
   const result = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
   tenantOptions.value = result.list.map(item => ({ label: item.label, value: item.value }));
-  await loadCategoryOptions();
 }
 
 /** 加载消息分类选项。 */
@@ -505,12 +598,26 @@ async function handleSubmit() {
   proTable.value?.getTableList();
 }
 
-/** 打开消息详情并加载投递进度。 */
+/** 打开发送详情并加载投递进度。 */
 async function openDetail(id: number) {
   detail.data = await defBaseMessageService.GetBaseMessage({ id });
   detail.visible = true;
 }
 
+/** 打开消息正文并单独展示内容。 */
+async function openContent(id: number) {
+  content.visible = true;
+  content.loading = true;
+  content.data = undefined;
+  try {
+    content.data = await defBaseMessageService.GetBaseMessage({ id });
+  } catch {
+    content.visible = false;
+  } finally {
+    content.loading = false;
+  }
+}
+
 /** 重试失败的消息投递任务并刷新详情。 */
 async function retryDispatch(id: number) {
   await defBaseMessageService.RetryBaseMessageDispatch({ id });
@@ -522,7 +629,7 @@ async function retryDispatch(id: number) {
 /** 删除草稿消息。 */
 async function handleDelete(value: BaseMessage | BaseMessage[] | number | number[]) {
   const ids = normalizeSelectedIds(value as Parameters<typeof normalizeSelectedIds>[0]);
-  await ElMessageBox.confirm(t("common.confirm.delete"), t("common.tips"), { type: "warning" });
+  await ElMessageBox.confirm(t("common.confirm.delete"), t("common.title.warning"), { type: "warning" });
   await defBaseMessageService.DeleteBaseMessage({ id: ids.join(",") });
   ElMessage.success(t("common.message.operation_success"));
   proTable.value?.getTableList();
@@ -530,7 +637,7 @@ async function handleDelete(value: BaseMessage | BaseMessage[] | number | number
 
 /** 发布消息。 */
 async function publishMessage(row: BaseMessage) {
-  await ElMessageBox.confirm(t("system.base.message.confirm.publish"), t("common.tips"), { type: "warning" });
+  await ElMessageBox.confirm(t("system.base.message.confirm.publish"), t("common.title.warning"), { type: "warning" });
   await defBaseMessageService.PublishBaseMessage({ id: row.id });
   proTable.value?.getTableList();
 }
@@ -543,7 +650,7 @@ async function cancelSchedule(row: BaseMessage) {
 
 /** 撤回消息。 */
 async function revokeMessage(row: BaseMessage) {
-  await ElMessageBox.confirm(t("system.base.message.confirm.revoke"), t("common.tips"), { type: "warning" });
+  await ElMessageBox.confirm(t("system.base.message.confirm.revoke"), t("common.title.warning"), { type: "warning" });
   await defBaseMessageService.RevokeBaseMessage({ id: row.id });
   proTable.value?.getTableList();
 }
@@ -579,4 +686,27 @@ function optionLabel(options: ProFormOption[], value: unknown) {
 .audience-id {
   width: 160px;
 }
+
+.message-content-meta {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 16px;
+  color: var(--el-text-color-secondary);
+  font-size: 13px;
+}
+
+.message-content-body {
+  max-height: 60vh;
+  margin: 0;
+  overflow: auto;
+  padding: 12px;
+  border: 1px solid var(--el-border-color-lighter);
+  color: var(--el-text-color-primary);
+  overflow-wrap: anywhere;
+}
+
+pre.message-content-body {
+  white-space: pre-wrap;
+}
 </style>

package/dist/package/src/views/base/message-category/index.vue

@@ -26,7 +26,7 @@ import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-c
 import { DEFAULT_TENANT_CODE } from "@liujitcn/kratos-admin-core/tenant";
 import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
 import { t } from "@liujitcn/kratos-admin-core";
-import { defBaseMessageCategoryService } from "@liujitcn/kratos-admin-system/api/system/base_message_category";
+import { defBaseMessageCategoryService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_message_category";
 import type {
   BaseMessageCategory,
   BaseMessageCategoryForm,
@@ -207,7 +207,7 @@ const columns = computed<ColumnProps[]>(() => [
           display: "inline-block",
           width: "18px",
           height: "18px",
-          borderRadius: "4px",
+          borderRadius: "var(--admin-page-radius)",
           backgroundColor: (scope.row as BaseMessageCategory).color || "var(--el-fill-color-light)"
         }
       })
@@ -270,7 +270,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
     onClick: () => openDialog()
   },
   {
-    label: t("common.action.batch_delete"),
+    label: t("common.action.delete"),
     type: "danger",
     icon: Delete,
     hidden: !isDefaultTenant.value || !BUTTONS.value["base:message-category:delete"],
@@ -324,18 +324,49 @@ async function handleSubmit() {
 
 /** 删除消息分类。 */
 async function handleDelete(value: BaseMessageCategory | BaseMessageCategory[] | number | number[]) {
-  const ids = normalizeSelectedIds(value as Parameters<typeof normalizeSelectedIds>[0]);
-  await ElMessageBox.confirm(t("common.confirm.delete"), t("common.tips"), { type: "warning" });
-  await defBaseMessageCategoryService.DeleteBaseMessageCategory({ id: ids.join(",") });
+  const idList = Array.isArray(value)
+    ? value.map(item => (typeof item === "object" ? item.id : item))
+    : typeof value === "object"
+      ? [value.id]
+      : normalizeSelectedIds(value);
+  const ids = idList.join(",");
+  if (!ids) {
+    ElMessage.warning(t("common.message.select_delete_item"));
+    return;
+  }
+  await ElMessageBox.confirm(t("common.confirm.delete"), t("common.title.warning"), { type: "warning" });
+  await defBaseMessageCategoryService.DeleteBaseMessageCategory({ id: ids });
+  await proTable.value?.getTableList();
   ElMessage.success(t("common.message.operation_success"));
-  proTable.value?.getTableList();
 }
 
 /** 设置消息分类状态。 */
 async function handleSetStatus(row: BaseMessageCategory) {
   const status = row.status === Status.STATUS_ENABLE ? Status.STATUS_DISABLE : Status.STATUS_ENABLE;
-  await defBaseMessageCategoryService.SetBaseMessageCategoryStatus({ id: row.id, status });
-  return true;
+  const action = t(status === Status.STATUS_ENABLE ? "common.status.enabled" : "common.status.disabled");
+  const name = row.name || row.code || `ID:${row.id}`;
+  try {
+    await ElMessageBox.confirm(
+      t("common.dialog.status_change", {
+        action,
+        resource: t("system.base.message_category.resource"),
+        field: t("system.base.message_category.field.name"),
+        value: name
+      }),
+      t("common.title.notice"),
+      {
+        confirmButtonText: t("common.action.confirm"),
+        cancelButtonText: t("common.action.cancel"),
+        type: "warning"
+      }
+    );
+    await defBaseMessageCategoryService.SetBaseMessageCategoryStatus({ id: row.id, status });
+    ElMessage.success(t("common.message.status_success", { action }));
+    await proTable.value?.getTableList();
+    return true;
+  } catch {
+    return false;
+  }
 }
 
 /** 关闭消息分类表单。 */
@@ -349,7 +380,7 @@ function priorityLabel(priority: MessagePriority) {
   return priorityOptions.value.find(item => item.value === priority)?.label ?? "";
 }
 
-/** 解析消息分类图标，兼容历史数据中的未知图标名。 */
+/** 解析消息分类图标，未知图标使用默认图标。 */
 function resolveCategoryIcon(icon: string) {
   return categoryIcons[icon] ?? CollectionTag;
 }

package/dist/package/src/views/base/migration/index.vue

@@ -180,7 +180,7 @@ import { CopyDocument, Document, DocumentAdd, DocumentRemove, Files, Refresh, Se
 import MarkdownPreview from "@liujitcn/kratos-admin-core/components/MarkdownPreview/index.vue";
 import { useGlobalStore } from "@liujitcn/kratos-admin-core/stores/runtime";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
-import { defBaseMigrationService } from "@liujitcn/kratos-admin-system/api/system/base_migration";
+import { defBaseMigrationService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_migration";
 import type {
   BaseMigration,
   BaseMigrationListItem,
@@ -643,7 +643,7 @@ onMounted(() => {
   font-weight: 500;
   color: var(--admin-page-text-secondary);
   background: var(--admin-page-card-bg-muted);
-  border-radius: 4px;
+  border-radius: var(--admin-page-radius);
 }
 
 .sql-panel {

package/dist/package/src/views/base/oauth-client/index.vue

@@ -33,8 +33,8 @@ import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
 import { copyText } from "@liujitcn/kratos-admin-core/security";
-import { defOauthClientService } from "@liujitcn/kratos-admin-system/api/system/oauth_client";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/base_tenant";
+import { defOauthClientService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/oauth_client";
+import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
 import type { BaseApi } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_api";
 import {
   OauthClientCryptoType,
@@ -47,6 +47,12 @@ import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
 import { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
 
+/** 开放授权客户端表单状态，新增时租户保持未选择。 */
+type OauthClientFormState = Omit<OauthClientForm, "tenant_id"> & {
+  /** 绑定租户ID。 */
+  tenant_id?: number;
+};
+
 defineOptions({
   name: "OauthClient",
   inheritAttrs: false
@@ -65,9 +71,9 @@ const dialog = reactive({
   visible: false
 });
 
-const formData = reactive<OauthClientForm>({
+const formData = reactive<OauthClientFormState>({
   id: 0,
-  tenant_id: 0,
+  tenant_id: undefined,
   client_name: "",
   crypto_type: OauthClientCryptoType.OAUTH_CLIENT_CRYPTO_TYPE_SM4,
   ip_whitelist: "",
@@ -102,7 +108,7 @@ const rules = computed(() => ({
   tenant_id: [
     {
       required: isDefaultTenant.value,
-      message: t("common.validation.required_select", { field: t("system.base.oauth_client.field.tenant") }),
+      message: t("common.validation.required_select", { field: t("common.field.tenant") }),
       trigger: "change"
     }
   ],
@@ -133,9 +139,13 @@ const rules = computed(() => ({
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "tenant_id",
-    label: t("system.base.oauth_client.field.tenant"),
+    label: t("common.field.tenant"),
     component: "select",
-    props: { filterable: true, disabled: Boolean(formData.id) },
+    props: {
+      filterable: true,
+      disabled: Boolean(formData.id),
+      placeholder: t("common.placeholder.select")
+    },
     options: tenantOptions.value,
     visible: () => isDefaultTenant.value
   },
@@ -178,7 +188,7 @@ const columns = computed<ColumnProps[]>(() => [
     ? ([
         {
           prop: "tenant_id",
-          label: t("system.base.oauth_client.field.tenant"),
+          label: t("common.field.tenant"),
           minWidth: 130,
           search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
           enum: requestTenantOptions,
@@ -304,7 +314,7 @@ function resetForm() {
   formDialogRef.value?.clearValidate();
   Object.assign(formData, {
     id: 0,
-    tenant_id: 0,
+    tenant_id: undefined,
     client_name: "",
     crypto_type: OauthClientCryptoType.OAUTH_CLIENT_CRYPTO_TYPE_SM4,
     ip_whitelist: "",