@liujitcn/kratos-admin-system 0.0.49 → 0.0.50

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

@@ -150,12 +150,10 @@ import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn
 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 { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 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,
@@ -189,12 +187,10 @@ type MessageFormState = Omit<BaseMessageForm, "tenant_id" | "category_id"> & {
 };
 
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant, tenantColumns, tenantFormField, loadTenantOptions } = useTenantScope();
 const proTable = ref<ProTableInstance>();
 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 });
@@ -270,13 +266,12 @@ const rules = computed(() => ({
 
 const formFields = computed<ProFormField[]>(() => [
   {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
-    labelTooltip: t("system.base.message.tooltip.tenant"),
-    component: "select",
-    visible: () => isDefaultTenant.value,
-    options: tenantOptions.value,
-    props: { filterable: true, disabled: Boolean(formState.id), placeholder: t("system.base.message.placeholder.tenant") }
+    ...tenantFormField({
+      label: t("common.field.tenant"),
+      disabledOnEdit: true,
+      props: { placeholder: t("system.base.message.placeholder.tenant") }
+    }),
+    labelTooltip: t("system.base.message.tooltip.tenant")
   },
   {
     prop: "category_id",
@@ -358,18 +353,7 @@ const formFields = computed<ProFormField[]>(() => [
 
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  ...(isDefaultTenant.value
-    ? ([
-        {
-          prop: "tenant_id",
-          label: t("common.field.tenant"),
-          minWidth: 120,
-          align: "left",
-          search: { el: "select" },
-          enum: requestTenantOptions
-        }
-      ] satisfies ColumnProps[])
-    : []),
+  ...tenantColumns({ label: t("common.field.tenant"), minWidth: 120 }),
   {
     prop: "title",
     label: t("system.base.message.field.title"),
@@ -553,13 +537,6 @@ async function requestTable(params: Record<string, unknown>) {
   return { data: { list: data.base_messages ?? [], total: data.total } };
 }
 
-/** 加载租户选项。 */
-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 }));
-}
-
 /** 加载消息分类选项。 */
 async function loadCategoryOptions() {
   const result = await defBaseMessageCategoryService.OptionBaseMessageCategory({});

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

@@ -23,8 +23,7 @@ import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn
 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 { DEFAULT_TENANT_CODE } from "@liujitcn/kratos-admin-core/tenant";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 import { defBaseMessageCategoryService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_message_category";
 import type {
@@ -39,8 +38,7 @@ defineOptions({ name: "BaseMessageCategory", inheritAttrs: false });
 
 /** 消息分类页面表单状态。 */
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant } = useTenantScope();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const dialog = reactive({ visible: false, titleKey: "common.action.create" });

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

@@ -34,7 +34,6 @@ import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-c
 import { t } from "@liujitcn/kratos-admin-core";
 import { copyText } from "@liujitcn/kratos-admin-core/security";
 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,
@@ -42,10 +41,8 @@ import {
   type OauthClientForm,
   type PageOauthClientRequest
 } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/oauth_client";
-import type { SelectOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
 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";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 
 /** 开放授权客户端表单状态，新增时租户保持未选择。 */
 type OauthClientFormState = Omit<OauthClientForm, "tenant_id"> & {
@@ -59,12 +56,10 @@ defineOptions({
 });
 
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant, tenantColumns, tenantFormField, loadTenantOptions } = useTenantScope();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const apiOptions = ref<BaseApi[]>([]);
-const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
 
 const dialog = reactive({
   titleKey: "common.action.create",
@@ -102,8 +97,6 @@ const transferOptions = computed<ProFormOption[]>(() =>
   }))
 );
 
-const tenantNameMap = computed(() => new Map(tenantOptions.value.map(item => [item.value, item.label])));
-
 const rules = computed(() => ({
   tenant_id: [
     {
@@ -137,18 +130,7 @@ const rules = computed(() => ({
 }));
 
 const formFields = computed<ProFormField[]>(() => [
-  {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
-    component: "select",
-    props: {
-      filterable: true,
-      disabled: Boolean(formData.id),
-      placeholder: t("common.placeholder.select")
-    },
-    options: tenantOptions.value,
-    visible: () => isDefaultTenant.value
-  },
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true, props: { placeholder: t("common.placeholder.select") } }),
   {
     prop: "client_name",
     label: t("system.base.oauth_client.field.client_name"),
@@ -184,20 +166,7 @@ const formFields = computed<ProFormField[]>(() => [
 
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  ...(isDefaultTenant.value
-    ? ([
-        {
-          prop: "tenant_id",
-          label: t("common.field.tenant"),
-          minWidth: 130,
-          align: "left",
-          search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
-          enum: requestTenantOptions,
-          render: scope =>
-            tenantNameMap.value.get((scope.row as OauthClient).tenant_id) ?? String((scope.row as OauthClient).tenant_id)
-        }
-      ] satisfies ColumnProps[])
-    : []),
+  ...tenantColumns({ label: t("common.field.tenant"), minWidth: 130, order: 1 }),
   { prop: "client_id", label: t("system.base.oauth_client.field.client_id"), minWidth: 220 },
   { prop: "client_name", label: t("system.base.oauth_client.field.client_name"), minWidth: 160, search: { el: "input" } },
   {
@@ -284,7 +253,10 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 ]);
 
 async function requestOauthClientTable(params: PageOauthClientRequest) {
-  const data = await defOauthClientService.PageOauthClient(buildPageRequest(params));
+  const data = await defOauthClientService.PageOauthClient({
+    ...buildPageRequest(params),
+    tenant_id: isDefaultTenant.value ? params.tenant_id : undefined
+  });
   return { data: { list: data.oauth_clients ?? [], total: data.total } };
 }
 
@@ -293,12 +265,6 @@ async function loadApiOptions() {
   apiOptions.value = data.base_apis ?? [];
 }
 
-async function loadTenantOptions() {
-  if (userStore.userInfo.tenant_code !== DEFAULT_TENANT_CODE || tenantOptions.value.length) return;
-  const data = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  tenantOptions.value = data.list ?? [];
-}
-
 async function handleOpenDialog(id?: number) {
   await loadTenantOptions();
   await loadApiOptions();

package/dist/package/src/views/base/online-session/index.vue

@@ -15,14 +15,12 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
-import type { ColumnProps, EnumProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
-import { DEFAULT_TENANT_CODE } from "@liujitcn/kratos-admin-core/tenant";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
+import type { ColumnProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import { requestTenantCodeOptions, useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
 import { formatDateTime } from "@liujitcn/kratos-admin-core/format";
 import { t } from "@liujitcn/kratos-admin-core";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
 import { defBaseSessionService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_session";
 import type { BaseSession, PageOnlineBaseSessionsRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_session";
 
@@ -30,18 +28,17 @@ defineOptions({ name: "BaseOnlineSession", inheritAttrs: false });
 
 const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
-const userStore = useUserStore();
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant, tenantColumns } = useTenantScope();
 
 const columns = computed<ColumnProps[]>(() => [
-  {
+  ...tenantColumns({
     prop: "tenant_code",
     label: t("common.field.tenant"),
     minWidth: 130,
-    align: "left",
-    search: isDefaultTenant.value ? { el: "select", props: { filterable: true }, order: 1 } : undefined,
-    enum: requestSessionTenantOptions
-  },
+    enum: requestTenantCodeOptions,
+    searchEl: "select",
+    render: scope => String((scope.row as BaseSession).tenant_code ?? "")
+  }),
   {
     prop: "user_name",
     label: t("system.base.online_session.field.user_name"),
@@ -75,22 +72,6 @@ const columns = computed<ColumnProps[]>(() => [
   }
 ]);
 
-/** 将租户名称映射到会话使用的租户编码，供下拉筛选与表格展示复用。 */
-async function requestSessionTenantOptions() {
-  if (!isDefaultTenant.value) {
-    return { data: [{ value: userStore.userInfo.tenant_code, label: userStore.userInfo.tenant_name }] };
-  }
-  const options: EnumProps[] = [];
-  const pageSize = 100;
-  for (let pageNum = 1; ; pageNum++) {
-    const response = await defBaseTenantService.PageBaseTenant({ code: "", name: "", page_num: pageNum, page_size: pageSize });
-    const tenants = response.base_tenants ?? [];
-    options.push(...tenants.map(tenant => ({ value: tenant.code, label: tenant.name })));
-    if (options.length >= response.total || tenants.length === 0) break;
-  }
-  return { data: options };
-}
-
 /** 查询在线用户会话列表。 */
 async function requestTable(params: Record<string, unknown>) {
   const response = await defBaseSessionService.PageOnlineBaseSessions(

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

@@ -6,10 +6,10 @@
 import { computed, 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";
+import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
-import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/LogTable.vue";
-import { logDateSearch, logDetailColumn, logEnumLabel, createLogEnumOptions, requestLogTrace } from "@liujitcn/kratos-admin-system/components/log";
+import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/log/LogTable.vue";
+import { logDateSearch, logDetailColumn, logEnumLabel, createLogEnumOptions, requestLogTrace } from "@liujitcn/kratos-admin-system/components/log/log";
 import { defBaseOperationLogService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_operation_log";
 import { BaseLogResult } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_log";
 import { BaseOperationAction } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_operation_log";

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

@@ -6,10 +6,10 @@
 import { computed, 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";
+import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
-import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/LogTable.vue";
-import { logDateSearch, logDetailColumn, logEnumLabel, createLogEnumOptions, requestLogTrace } from "@liujitcn/kratos-admin-system/components/log";
+import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/log/LogTable.vue";
+import { logDateSearch, logDetailColumn, logEnumLabel, createLogEnumOptions, requestLogTrace } from "@liujitcn/kratos-admin-system/components/log/log";
 import { defBasePermissionLogService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_permission_log";
 import { BaseLogResult } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_log";
 import { BasePermissionAction, BasePermissionTargetType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_permission_log";

package/dist/package/src/views/base/policy-evaluation-log/index.vue

@@ -6,9 +6,9 @@
 import { computed, 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";
+import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
-import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/LogTable.vue";
+import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/log/LogTable.vue";
 import {
   createLogEnumOptions,
   formatLogCount,
@@ -17,7 +17,7 @@ import {
   logDetailColumn,
   logEnumLabel,
   requestLogTrace
-} from "@liujitcn/kratos-admin-system/components/log";
+} from "@liujitcn/kratos-admin-system/components/log/log";
 import { defBasePolicyEvaluationLogService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_policy_evaluation_log";
 import { BasePolicyDecision, BasePolicyEvaluationType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_policy_evaluation_log";
 import type { BasePolicyEvaluationLog, PageBasePolicyEvaluationLogRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_policy_evaluation_log";

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

@@ -24,7 +24,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";
@@ -34,12 +34,9 @@ import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/co
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { defBasePostService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_post";
 import type { BasePost, BasePostForm, PageBasePostRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_post";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
-import type { SelectOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
-import { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 
 defineOptions({
@@ -54,7 +51,6 @@ type BasePostFormState = Omit<BasePostForm, "tenant_id"> & {
 };
 
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 
@@ -62,7 +58,6 @@ const dialog = reactive({
   titleKey: "common.action.create_resource",
   visible: false
 });
-const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
 const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
   { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
@@ -132,23 +127,14 @@ const rules = computed(() => ({
   ]
 }));
 
-/** 当前登录账号是否默认租户。 */
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
+onMounted(() => {
+  if (isDefaultTenant.value) void loadTenantOptions();
+});
 
 /** 岗位表单字段配置。 */
 const formFields = computed<ProFormField[]>(() => [
-  {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
-    component: "select",
-    props: {
-      placeholder: t("common.placeholder.select"),
-      filterable: true,
-      disabled: Boolean(formData.id)
-    },
-    visible: () => isDefaultTenant.value,
-    options: tenantOptions.value
-  },
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true }),
   {
     prop: "name",
     label: t("system.base.post.field.name"),
@@ -179,19 +165,7 @@ const formFields = computed<ProFormField[]>(() => [
 /** 岗位表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  ...(isDefaultTenant.value
-    ? ([
-        {
-          prop: "tenant_id",
-          label: t("common.field.tenant"),
-          minWidth: 140,
-          align: "left",
-          showOverflowTooltip: true,
-          search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
-          enum: requestTenantOptions
-        }
-      ] satisfies ColumnProps[])
-    : []),
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "name", label: t("system.base.post.field.name"), minWidth: 140, search: { el: "input" } },
   { prop: "code", label: t("system.base.post.field.code"), minWidth: 140, search: { el: "input" } },
   { prop: "sort", label: t("common.field.sort"), minWidth: 90, align: "right" },
@@ -262,7 +236,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 async function requestBasePostTable(params: PageBasePostRequest) {
   const data = await defBasePostService.PageBasePost({
     ...buildPageRequest(params),
-    tenant_id: isDefaultTenant.value ? params.tenant_id : undefined
+    tenant_id: toRequestTenantId(params.tenant_id)
   });
   return { data: { list: data.base_posts ?? [], total: data.total } };
 }
@@ -272,13 +246,6 @@ function refreshTable() {
   proTable.value?.getTableList();
 }
 
-/** 加载租户选项。 */
-async function loadTenantOptions() {
-  if (!isDefaultTenant.value || tenantOptions.value.length) return;
-  const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  tenantOptions.value = response.list ?? [];
-}
-
 /** 打开岗位编辑弹窗。 */
 async function handleOpenDialog(id?: number) {
   resetForm();