@liujitcn/kratos-admin-system 0.0.55 → 0.0.57

package/dist/package/src/rpc/system/admin/v1/base_redact_storage_policy.ts

@@ -20,6 +20,10 @@ export interface PageBaseRedactStoragePolicyRequest {
     | undefined;
   /** 数据源名称 */
   source_name: string;
+  /** 租户ID */
+  tenant_id?:
+    | number
+    | undefined;
   /** 状态 */
   status?:
     | Status
@@ -57,6 +61,8 @@ export interface BaseRedactStoragePolicyForm {
   rule_params: string;
   /** 数据源名称 */
   source_name: string;
+  /** 租户ID */
+  tenant_id: number;
   /** 状态 */
   status: Status;
   /** 备注 */
@@ -108,6 +114,8 @@ export interface BaseRedactStoragePolicy {
   rule_params: string;
   /** 数据源名称 */
   source_name: string;
+  /** 租户ID */
+  tenant_id: number;
   /** 状态 */
   status: Status;
   /** 备注 */
@@ -118,6 +126,26 @@ export interface BaseRedactStoragePolicy {
   updated_at: string;
 }
 
+/** 可入库脱敏数据表查询条件。 */
+export interface ListBaseRedactStorageTableRequest {
+  /** 数据源名称 */
+  source_name: string;
+}
+
+/** 可入库脱敏数据表。 */
+export interface BaseRedactStorageTable {
+  /** 数据库表名 */
+  name: string;
+  /** 数据表注释 */
+  comment: string;
+}
+
+/** 可入库脱敏数据表列表响应。 */
+export interface ListBaseRedactStorageTableResponse {
+  /** 包含租户ID字段的数据表列表 */
+  tables: BaseRedactStorageTable[];
+}
+
 /** 查询可入库脱敏字段请求。 */
 export interface ListBaseRedactStorageColumnRequest {
   /** 数据源名称 */
@@ -150,6 +178,12 @@ export interface BaseRedactStoragePolicyService {
   PageBaseRedactStoragePolicy(
     request: PageBaseRedactStoragePolicyRequest,
   ): Promise<PageBaseRedactStoragePolicyResponse>;
+  /** 查询包含租户ID字段的数据表列表。 */
+  ListBaseRedactStorageTable(request: ListBaseRedactStorageTableRequest): Promise<ListBaseRedactStorageTableResponse>;
+  /** 查询可入库脱敏的字符串字段列表。 */
+  ListBaseRedactStorageColumn(
+    request: ListBaseRedactStorageColumnRequest,
+  ): Promise<ListBaseRedactStorageColumnResponse>;
   /** 查询入库脱敏策略详情。 */
   GetBaseRedactStoragePolicy(request: GetBaseRedactStoragePolicyRequest): Promise<BaseRedactStoragePolicyForm>;
   /** 批量创建入库脱敏策略。 */
@@ -160,8 +194,4 @@ export interface BaseRedactStoragePolicyService {
   DeleteBaseRedactStoragePolicy(request: DeleteBaseRedactStoragePolicyRequest): Promise<Empty>;
   /** 设置入库脱敏策略状态。 */
   SetBaseRedactStoragePolicyStatus(request: SetBaseRedactStoragePolicyStatusRequest): Promise<Empty>;
-  /** 查询可入库脱敏的字符串字段列表。 */
-  ListBaseRedactStorageColumn(
-    request: ListBaseRedactStorageColumnRequest,
-  ): Promise<ListBaseRedactStorageColumnResponse>;
 }

package/dist/package/src/rpc/system/admin/v1/base_table_source.ts

@@ -17,10 +17,24 @@ export interface OptionBaseTableRequest {
   source_name: string;
 }
 
+/** 数据库表选项。 */
+export interface BaseTableOption {
+  /** 数据库表名 */
+  name: string;
+  /** 数据表注释 */
+  comment: string;
+}
+
+/** 数据库表选项响应。 */
+export interface OptionBaseTableResponse {
+  /** 数据库表选项列表 */
+  tables: BaseTableOption[];
+}
+
 /** Admin数据源元数据服务，提供数据备份、数据归档和代码生成共用的数据源信息。 */
 export interface BaseTableSourceService {
   /** 查询已初始化的数据源名称。 */
   OptionBaseTableSource(request: OptionBaseTableSourceRequest): Promise<StringValues>;
-  /** 查询指定数据源中的数据库表名称。 */
-  OptionBaseTable(request: OptionBaseTableRequest): Promise<StringValues>;
+  /** 查询指定数据源中的数据库表选项。 */
+  OptionBaseTable(request: OptionBaseTableRequest): Promise<OptionBaseTableResponse>;
 }

package/dist/package/src/rpc/system/admin/v1/base_tenant_project_grant.ts

@@ -113,7 +113,7 @@ export interface DeleteBaseTenantProjectGrantRequest {
   subject_id: number;
 }
 
-/** BaseTenantProjectGrantService 管理岗位、角色、部门和用户在目标租户下的项目授权。 */
+/** Admin项目授权服务 */
 export interface BaseTenantProjectGrantService {
   /** 查询项目授权分页列表。 */
   PageBaseTenantProjectGrant(request: PageBaseTenantProjectGrantRequest): Promise<PageBaseTenantProjectGrantResponse>;

package/dist/package/src/rpc/system/admin/v1/base_third_account.ts

@@ -18,6 +18,8 @@ export interface GetBaseThirdAccountIdentifierRequest {
 export interface GetBaseThirdAccountIdentifierResponse {
   /** 三方账号唯一标识 */
   identifier: string;
+  /** 租户ID */
+  tenant_id: number;
 }
 
 /** Admin用户三方账号服务 */

package/dist/package/src/rpc/system/admin/v1/oauth_client.ts

@@ -143,6 +143,8 @@ export interface OauthClient {
 export interface OauthClientCredentials {
   /** 客户端标识 */
   client_id: string;
+  /** 绑定租户ID */
+  tenant_id: number;
   /** 客户端密钥 */
   client_secret: string;
   /** 协议加密类型 */

package/dist/package/src/views/ai/chat/message.ts

@@ -44,6 +44,7 @@ export function resolveTimestamp(timestamp?: { seconds?: number; nanos?: number
 export function normalizeSession(session?: Partial<AiSession> | null): AiSession {
   return {
     id: String(session?.id ?? ""),
+    tenant_id: Number(session?.tenant_id ?? 0),
     title: resolveSessionText(session?.title, true),
     summary: resolveSessionText(session?.summary, false),
     updated_at: session?.updated_at,
@@ -210,6 +211,7 @@ export function createLocalUserMessage(payload: { text: string; attachments: AiA
   const message = mapMessageItem(
     {
       id: `${LOCAL_USER_MESSAGE_ID_PREFIX}-${now.getTime()}`,
+      tenant_id: 0,
       input_content: {
         kind: "text",
         content: payload.text
@@ -244,6 +246,7 @@ export function createThinkingMessage(options?: { sessionID?: string; messageID?
   const message = mapMessageItem(
     {
       id: streamKey || `${THINKING_MESSAGE_ID_PREFIX}-${now.getTime()}`,
+      tenant_id: 0,
       input_content: undefined,
       output_content: {
         kind: "text",

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

@@ -119,7 +119,8 @@
       v-model="editDialog.visible"
       ref="editDialogRef"
       :title="t('system.base.api.title.edit')"
-      width="760px"
+      width="min(960px, calc(100vw - 32px))"
+      label-width="150px"
       :model="editForm"
       :fields="editFields"
       @confirm="handleSubmitEdit"

package/dist/package/src/views/base/api-log/index.vue

@@ -3,11 +3,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { ColumnProps } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import { t } from "@liujitcn/kratos-admin-core";
 import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/log/LogTable.vue";
 import {
   createLogEnumOptions,
@@ -26,6 +27,9 @@ import type { BaseApiLog, PageBaseApiLogRequest } from "@liujitcn/kratos-admin-s
 defineOptions({ name: "BaseApiLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+
+onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() =>
   createLogEnumOptions([
     [BaseLogResult.BASE_LOG_RESULT_UNSPECIFIED, t("system.base.log.result.unspecified")],
@@ -35,6 +39,7 @@ const resultOptions = computed(() =>
   ])
 );
 const columns = computed<ColumnProps[]>(() => [
+  ...tenantColumns({ label: t("common.field.tenant") }),
   { prop: "operation", label: t("system.base.log.field.operation"), minWidth: 320, search: { el: "input", key: "keyword" } },
   { prop: "method", label: t("system.base.log.field.method"), minWidth: 90 },
   { prop: "status_code", label: t("system.base.log.field.status_code"), minWidth: 100, align: "right" },
@@ -58,7 +63,7 @@ const config = computed<LogTableConfig>(() => ({
   trace: requestLogTrace,
   detailFields: [
     { key: "id", label: t("system.base.log.field.id") },
-    { key: "tenant_id", label: t("system.base.log.field.tenant_id") },
+    { key: "tenant_id", label: t("common.field.tenant"), format: value => resolveTenantLabel({ tenant_id: value }) },
     { key: "tenant_code", label: t("system.base.log.field.tenant_code") },
     { key: "user_id", label: t("system.base.log.field.user_id") },
     { key: "user_name", label: t("system.base.log.field.user_name") },

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

@@ -143,12 +143,20 @@ const formFields = computed<ProFormField[]>(() => [
 /** 行政区域表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  { prop: "name", label: t("system.base.area.field.name"), align: "left", search: { el: "input" } },
+  { prop: "name", label: t("system.base.area.field.name"), search: { el: "input" } },
   {
     prop: "operation",
     label: t("common.field.operation"),
     cellType: "actions",
     actions: [
+      {
+        label: t("common.action.create"),
+        type: "primary",
+        link: true,
+        icon: CirclePlus,
+        hidden: () => !BUTTONS.value["base:area:create"],
+        onClick: scope => handleOpenDialog(undefined, scope.row as BaseArea)
+      },
       {
         label: t("common.action.edit"),
         type: "primary",
@@ -192,7 +200,11 @@ const headerActions = computed<HeaderActionProps[]>(() => [
  * 请求行政区域列表，并适配 ProTable 固定列表字段。
  */
 async function requestBaseAreaTable(params: TreeBaseAreaRequest) {
-  const data = await defBaseAreaService.TreeBaseArea({ ...params, parent_id: params.parent_id ?? 0 });
+  const data = await defBaseAreaService.TreeBaseArea({
+    ...params,
+    parent_id: params.parent_id ?? 0,
+    lazy: true
+  });
   return { data: data.base_areas ?? [] };
 }
 
@@ -216,32 +228,44 @@ function refreshTable() {
   proTable.value?.getTableList();
 }
 /** 加载表单选择项。 */
-async function loadFormOptions() {
+async function loadFormOptions(selectedParent?: BaseArea) {
   const parentIdFormResponse = await defBaseAreaService.OptionBaseArea({ parent_id: 0, lazy: true } as Parameters<
     typeof defBaseAreaService.OptionBaseArea
   >[0]);
+  const options = normalizeLazyTreeOptions((parentIdFormResponse.list ?? []) as GeneratedTreeOption[]).filter(
+    option => Number(option.value) !== 0
+  );
+  if (selectedParent && !options.some(option => Number(option.value) === selectedParent.id)) {
+    options.push({
+      label: selectedParent.name,
+      value: selectedParent.id,
+      isLeaf: !selectedParent.has_children
+    });
+  }
   return [
     { label: t("system.base.area.value.root"), value: 0 },
-    ...normalizeLazyTreeOptions((parentIdFormResponse.list ?? []) as GeneratedTreeOption[]).filter(
-      option => Number(option.value) !== 0
-    )
+    ...options
   ];
 }
 
 /**
  * 打开行政区域弹窗。
  */
-async function handleOpenDialog(id?: number) {
+async function handleOpenDialog(id?: number, selectedParent?: BaseArea) {
   resetForm();
   dialog.titleKey = id ? "system.base.area.action.edit" : "system.base.area.action.create";
   await formDialogRef.value?.open({
     load: async () => ({
-      options: await loadFormOptions(),
+      options: await loadFormOptions(selectedParent),
       data: id ? await defBaseAreaService.GetBaseArea({ id }) : undefined
     }),
     commit: ({ options, data }) => {
       parentIdFormOptions.value = options;
-      if (data) Object.assign(formData, data);
+      if (data) {
+        Object.assign(formData, data);
+      } else {
+        formData.parent_id = selectedParent?.id ?? 0;
+      }
     }
   });
 }

package/dist/package/src/views/base/backup-management/archive-config/index.vue

@@ -4,6 +4,9 @@
     <FormDialog
       ref="formDialogRef"
       v-model="dialog.visible"
+      width="min(900px, calc(100vw - 32px))"
+      label-width="140px"
+      :col-span="12"
       :title="t(dialog.editing ? 'common.action.edit_resource' : 'common.action.create_resource', { resource: t('system.backup.archive.config') })"
       :model="formData"
       :fields="formFields"
@@ -124,7 +127,7 @@ async function requestTableOptions(sourceName: string) {
   loadingTables.value = true;
   try {
     const data = await defBaseTableSourceService.OptionBaseTable({ source_name: sourceName });
-    return (data.value ?? []).map(value => ({ label: value, value }));
+    return (data.tables ?? []).map(item => ({ label: tableOptionLabel(item.name, item.comment), value: item.name }));
   } finally {
     loadingTables.value = false;
   }
@@ -151,8 +154,8 @@ async function setStatus(row: BaseTableArchiveForm) {
       }
     );
     await defBaseTableArchiveService.SetBaseTableArchiveStatus({ id: row.id, status });
+    row.status = status;
     ElMessage.success(t("common.message.status_success", { action }));
-    await proTable.value?.getTableList();
     return true;
   } catch {
     return false;
@@ -160,4 +163,6 @@ async function setStatus(row: BaseTableArchiveForm) {
 }
 async function remove(selected: number | number[] | BaseTableArchiveForm) { let ids: number[]; if (Array.isArray(selected)) ids = selected.map(Number); else if (typeof selected === "object") ids = [selected.id]; else ids = normalizeSelectedIds(selected).map(Number); if (!ids.length) return; await ElMessageBox.confirm(t("common.dialog.delete_selected", { resource: t("system.backup.archive.config") }), t("common.title.warning"), { type: "warning" }); await defBaseTableArchiveService.DeleteBaseTableArchive({ id: ids.join(",") }); ElMessage.success(t("common.message.delete_success", { resource: t("system.backup.archive.config") })); refresh(); }
 function modeLabel(value: BaseTableArchiveMode) { return modeOptions.value.find(item => item.value === value)?.label ?? String(value); }
+/** 格式化数据表选项，优先显示中文注释并保留物理表名。 */
+function tableOptionLabel(name: string, comment: string) { return comment && comment !== name ? `${comment}（${name}）` : name; }
 </script>

package/dist/package/src/views/base/data-access-log/index.vue

@@ -3,11 +3,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { ColumnProps } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import { t } from "@liujitcn/kratos-admin-core";
 import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/log/LogTable.vue";
 import {
   createLogEnumOptions,
@@ -26,6 +27,9 @@ import type { BaseDataAccessLog, PageBaseDataAccessLogRequest } from "@liujitcn/
 defineOptions({ name: "BaseDataAccessLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+
+onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() => createLogEnumOptions([
   [BaseLogResult.BASE_LOG_RESULT_UNSPECIFIED, t("system.base.log.result.unspecified")],
   [BaseLogResult.BASE_LOG_RESULT_SUCCESS, t("system.base.log.result.success")],
@@ -42,6 +46,7 @@ const accessTypeOptions = computed(() => createLogEnumOptions([
   [BaseDataAccessType.BASE_DATA_ACCESS_TYPE_IMPORT, t("system.base.log.access_type.import")]
 ]));
 const columns = computed<ColumnProps[]>(() => [
+  ...tenantColumns({ label: t("common.field.tenant") }),
   { prop: "resource_type", label: t("system.base.log.field.resource_type"), minWidth: 150, search: { el: "input" } },
   { prop: "table_name", label: t("system.base.log.field.table_name"), minWidth: 150 },
   { prop: "access_type", label: t("system.base.log.field.access_type"), minWidth: 120, search: { el: "select", enum: accessTypeOptions.value }, render: scope => logEnumLabel(accessTypeOptions.value, (scope.row as BaseDataAccessLog).access_type) },
@@ -59,12 +64,12 @@ const config = computed<LogTableConfig>(() => ({
   trace: requestLogTrace,
   detailFields: [
     { key: "id", label: t("system.base.log.field.id") },
-    { key: "tenant_id", label: t("system.base.log.field.tenant_id") },
+    { key: "tenant_id", label: t("common.field.tenant"), format: value => resolveTenantLabel({ tenant_id: value }) },
     { key: "tenant_code", label: t("system.base.log.field.tenant_code") },
     { key: "user_id", label: t("system.base.log.field.user_id") },
     { key: "user_name", label: t("system.base.log.field.user_name") },
     { key: "resource_type", label: t("system.base.log.field.resource_type") },
-    { key: "resource_id", label: t("system.base.log.field.resource_id"), align: "left" },
+    { key: "resource_id", label: t("system.base.log.field.resource_id") },
     { key: "access_type", label: t("system.base.log.field.access_type"), enum: accessTypeOptions.value },
     { key: "data_source", label: t("system.base.log.field.data_source") },
     { key: "table_name", label: t("system.base.log.field.table_name") },

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

@@ -113,12 +113,12 @@ onMounted(() => {
 });
 
 const columns = computed<ColumnProps[]>(() => [
+  ...tenantColumns({ label: t("common.field.tenant"), minWidth: 100 }),
   { prop: "file_name", label: t("system.base.file.field.name"), minWidth: 220, search: { el: "input" } },
   { prop: "extension", label: t("system.base.file.field.extension"), width: 100, search: { el: "input" } },
   { prop: "mime_type", label: t("system.base.file.field.mime"), minWidth: 180 },
   { prop: "size", label: t("system.base.file.field.size"), width: 120, align: "right", render: scope => formatFileSize((scope.row as BaseFile).size) },
   { prop: "content_hash", label: t("system.base.file.field.hash"), minWidth: 220 },
-  ...tenantColumns({ label: t("system.base.file.field.tenant"), minWidth: 100 }),
   { prop: "created_at", align: "center", label: t("common.field.created_at"), minWidth: 180 },
   {
     prop: "operation",

package/dist/package/src/views/base/i18n-custom/index.vue

@@ -3,6 +3,7 @@
   <div class="table-box">
     <ProTable
       ref="proTable"
+      :key="isDefaultTenant ? 'default-tenant' : 'normal-tenant'"
       row-key="id"
       :columns="columns"
       :header-actions="headerActions"
@@ -24,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
 import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
@@ -33,6 +34,7 @@ import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import {
   getCurrentLocale,
   getDefaultLocaleText,
@@ -52,13 +54,20 @@ import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 
 defineOptions({ name: "BaseI18nCustom", inheritAttrs: false });
 
+/** 自定义翻译表单状态，平台管理员新增时选择目标租户。 */
+type BaseI18nCustomFormState = Omit<BaseI18nCustomForm, "tenant_id"> & {
+  /** 租户ID。 */
+  tenant_id?: number;
+};
+
 const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const enabledLanguages = ref<Array<{ language_code: string; native_name?: string; language_name?: string }>>([]);
 const dialog = reactive({ editing: false, visible: false });
-const formData = reactive<BaseI18nCustomForm>({
+const formData = reactive<BaseI18nCustomFormState>({
   id: 0,
+  tenant_id: undefined,
   site: BaseConfigSite.BASE_CONFIG_SITE_ADMIN,
   key: "",
   locale: getCurrentLocale(),
@@ -86,13 +95,26 @@ const statusOptions = computed<ProFormOption[]>(() => [
 ]);
 
 const rules = computed(() => ({
+  tenant_id: [
+    {
+      required: true,
+      message: t("common.validation.required_select", { field: t("common.field.tenant") }),
+      trigger: "change"
+    }
+  ],
   site: [{ required: true, message: t("system.base.i18n_custom.placeholder.site"), trigger: "change" }],
   key: [{ required: true, message: t("system.base.i18n_custom.placeholder.key"), trigger: "blur" }],
   locale: [{ required: true, message: t("system.base.i18n_custom.placeholder.locale"), trigger: "change" }],
   value: [{ required: true, message: t("system.base.i18n_custom.placeholder.value"), trigger: "blur" }]
 }));
 
+const { isDefaultTenant, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
+onMounted(() => {
+  if (isDefaultTenant.value) void loadTenantOptions();
+});
+
 const formFields = computed<ProFormField[]>(() => [
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true }),
   {
     prop: "site",
     label: t("system.base.i18n_custom.field.site"),
@@ -130,6 +152,7 @@ const formFields = computed<ProFormField[]>(() => [
 
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "key", label: t("system.base.i18n_custom.field.key"), minWidth: 250, search: { el: "input" } },
   {
     prop: "site",
@@ -214,7 +237,10 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 /** 请求国际化自定义翻译分页列表。 */
 async function requestBaseI18nCustomTable(params: PageBaseI18nCustomRequest) {
   enabledLanguages.value = await loadLanguages();
-  const data = await defBaseI18nCustomService.PageBaseI18nCustom(buildPageRequest(params));
+  const data = await defBaseI18nCustomService.PageBaseI18nCustom({
+    ...buildPageRequest(params),
+    tenant_id: toRequestTenantId(params.tenant_id)
+  });
   return { data: { list: data.items ?? [], total: data.total } };
 }
 
@@ -236,7 +262,8 @@ async function handleOpenDialog(id?: number) {
   await formDialogRef.value?.open({
     load: async () => ({
       languages: await loadLanguages(),
-      data: id ? await defBaseI18nCustomService.GetBaseI18nCustom({ id }) : undefined
+      data: id ? await defBaseI18nCustomService.GetBaseI18nCustom({ id }) : undefined,
+      tenants: await loadTenantOptions()
     }),
     commit: ({ languages, data }) => {
       enabledLanguages.value = languages;
@@ -257,6 +284,7 @@ function resetForm() {
   formDialogRef.value?.clearValidate();
   Object.assign(formData, {
     id: 0,
+    tenant_id: undefined,
     site: BaseConfigSite.BASE_CONFIG_SITE_ADMIN,
     key: "",
     locale: getCurrentLocale(),

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

@@ -7,7 +7,8 @@
       v-model="dialog.visible"
       ref="formDialogRef"
       :title="t(dialog.editing ? 'system.base.job.action.edit' : 'system.base.job.action.create')"
-      width="1000px"
+      width="min(1200px, calc(100vw - 32px))"
+      top="4vh"
       :model="formData"
       :fields="formFields"
       :rules="rules"

package/dist/package/src/views/base/job/log.vue

@@ -97,7 +97,6 @@ const columns = computed<ColumnProps[]>(() => [
     prop: "job_id",
     label: t("system.base.job.field.name"),
     minWidth: 180,
-    align: "left",
     search: {
       el: "select",
       defaultValue: initialJobID > 0 ? initialJobID : undefined,

package/dist/package/src/views/base/login-log/index.vue

@@ -3,9 +3,9 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { ColumnProps } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
-import { requestTenantCodeOptions, useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
@@ -19,7 +19,9 @@ import type { BaseLoginLog, PageBaseLoginLogRequest } from "@liujitcn/kratos-adm
 defineOptions({ name: "BaseLoginLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
-const { tenantColumns } = useTenantScope();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+
+onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() =>
   createLogEnumOptions([
     [BaseLogResult.BASE_LOG_RESULT_UNSPECIFIED, t("system.base.log.result.unspecified")],
@@ -40,15 +42,8 @@ const loginTypeOptions = computed(() =>
 );
 
 const columns = computed<ColumnProps[]>(() => [
+  ...tenantColumns({ label: t("common.field.tenant"), minWidth: 140 }),
   { prop: "user_name", label: t("system.base.log.field.user_name"), minWidth: 130 },
-  ...tenantColumns({
-    prop: "tenant_code",
-    label: t("system.base.log.field.tenant_code"),
-    minWidth: 120,
-    searchEl: "select",
-    enum: requestTenantCodeOptions,
-    render: scope => String((scope.row as BaseLoginLog).tenant_code ?? "")
-  }),
   {
     prop: "login_type",
     label: t("system.base.log.field.login_type"),
@@ -75,7 +70,7 @@ const config = computed<LogTableConfig>(() => ({
   trace: requestLogTrace,
   detailFields: [
     { key: "id", label: t("system.base.log.field.id") },
-    { key: "tenant_id", label: t("system.base.log.field.tenant_id") },
+    { key: "tenant_id", label: t("common.field.tenant"), format: value => resolveTenantLabel({ tenant_id: value }) },
     { key: "tenant_code", label: t("system.base.log.field.tenant_code") },
     { key: "user_id", label: t("system.base.log.field.user_id") },
     { key: "user_name", label: t("system.base.log.field.user_name") },