@liujitcn/kratos-admin-system 0.0.49 → 0.0.51

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

@@ -9,6 +9,7 @@
       v-model="dialog.visible"
       :title="t(dialog.titleKey)"
       width="980px"
+      label-width="auto"
       :model="formData"
       :fields="formFields"
       :rules="formRules"
@@ -19,15 +20,34 @@
         <div class="rules-editor">
           <div v-for="(rule, index) in formData.rules" :key="rule.id || index" class="rule-row">
             <el-select v-model="rule.restriction_type" class="rule-type">
-              <el-option v-for="option in restrictionTypeOptions" :key="String(option.value)" :label="option.label" :value="option.value" />
+              <el-option
+                v-for="option in restrictionTypeOptions"
+                :key="String(option.value)"
+                :label="option.label"
+                :value="option.value"
+              />
             </el-select>
             <el-select v-model="rule.restriction_method" class="rule-method">
-              <el-option v-for="option in restrictionMethodOptions" :key="String(option.value)" :label="option.label" :value="option.value" />
+              <el-option
+                v-for="option in restrictionMethodOptions"
+                :key="String(option.value)"
+                :label="option.label"
+                :value="option.value"
+              />
             </el-select>
-            <el-input v-model="rule.restriction_value" class="rule-value" :placeholder="rulePlaceholder(rule.restriction_method)" />
+            <el-input
+              v-model="rule.restriction_value"
+              class="rule-value"
+              :placeholder="rulePlaceholder(rule.restriction_method)"
+            />
             <el-input v-model="rule.reason" class="rule-reason" :placeholder="t('system.base.login_policy.placeholder.reason')" />
             <el-select v-model="rule.status" class="rule-status">
-              <el-option v-for="option in statusOptions" :key="String(option.value)" :label="option.label" :value="option.value" />
+              <el-option
+                v-for="option in statusOptions"
+                :key="String(option.value)"
+                :label="option.label"
+                :value="option.value"
+              />
             </el-select>
             <el-button link type="danger" :icon="Delete" @click="removeRule(index)" />
           </div>
@@ -36,6 +56,9 @@
           </el-button>
         </div>
       </template>
+      <template #initialPasswordStrength>
+        <PasswordStrength :password="formData.initial_password" />
+      </template>
     </FormDialog>
   </div>
 </template>
@@ -46,14 +69,15 @@ import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
 import { ElButton, ElMessage, ElMessageBox, ElTag } from "element-plus";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
 import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
+import PasswordStrength from "@liujitcn/kratos-admin-core/components/PasswordStrength/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";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { PASSWORD_CRYPTO_SCENE, encryptPassword } from "@liujitcn/kratos-admin-core/security";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 import { defBaseLoginPolicyService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_login_policy";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
 import { defBaseUserService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_user";
 import type { SelectOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
@@ -70,7 +94,11 @@ import {
 } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_login_policy";
 
 /** 登录策略表单状态，初始化密码仅在提交时转换为一次性密码密文。 */
-interface BaseLoginPolicyFormState extends Omit<BaseLoginPolicyForm, "initial_password"> {
+interface BaseLoginPolicyFormState extends Omit<BaseLoginPolicyForm, "initial_password" | "tenant_id" | "user_id"> {
+  /** 租户作用域目标，未选择时保持未定义。 */
+  tenant_id?: number;
+  /** 用户作用域目标，未选择时保持未定义。 */
+  user_id?: number;
   /** 初始化密码明文只保留在当前表单，留空表示不修改已有值。 */
   initial_password: string;
 }
@@ -81,9 +109,9 @@ const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const dialog = reactive({ visible: false, titleKey: "common.action.create" });
-const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
 const userOptions = ref<SelectOptionResponse_Option[]>([]);
 const formData = reactive<BaseLoginPolicyFormState>(defaultForm());
+const { isDefaultTenant, tenantFormField, loadTenantOptions } = useTenantScope();
 
 const scopeTypeOptions = computed<ProFormOption[]>(() => [
   { label: t("system.base.login_policy.scope.global"), value: BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL },
@@ -91,15 +119,36 @@ const scopeTypeOptions = computed<ProFormOption[]>(() => [
   { label: t("common.field.user"), value: BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_USER }
 ]);
 const restrictionTypeOptions = computed<ProFormOption[]>(() => [
-  { label: t("system.base.login_policy.restriction.blacklist"), value: BaseLoginPolicyRestrictionType.BASE_LOGIN_POLICY_RESTRICTION_TYPE_BLACKLIST },
-  { label: t("system.base.login_policy.restriction.whitelist"), value: BaseLoginPolicyRestrictionType.BASE_LOGIN_POLICY_RESTRICTION_TYPE_WHITELIST }
+  {
+    label: t("system.base.login_policy.restriction.blacklist"),
+    value: BaseLoginPolicyRestrictionType.BASE_LOGIN_POLICY_RESTRICTION_TYPE_BLACKLIST
+  },
+  {
+    label: t("system.base.login_policy.restriction.whitelist"),
+    value: BaseLoginPolicyRestrictionType.BASE_LOGIN_POLICY_RESTRICTION_TYPE_WHITELIST
+  }
 ]);
 const restrictionMethodOptions = computed<ProFormOption[]>(() => [
-  { label: t("system.base.login_policy.method.ip"), value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_IP },
-  { label: t("system.base.login_policy.method.mac"), value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_MAC },
-  { label: t("system.base.login_policy.method.region"), value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_REGION },
-  { label: t("system.base.login_policy.method.time"), value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_TIME },
-  { label: t("system.base.login_policy.method.device"), value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_DEVICE }
+  {
+    label: t("system.base.login_policy.method.ip"),
+    value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_IP
+  },
+  {
+    label: t("system.base.login_policy.method.mac"),
+    value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_MAC
+  },
+  {
+    label: t("system.base.login_policy.method.region"),
+    value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_REGION
+  },
+  {
+    label: t("system.base.login_policy.method.time"),
+    value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_TIME
+  },
+  {
+    label: t("system.base.login_policy.method.device"),
+    value: BaseLoginPolicyRestrictionMethod.BASE_LOGIN_POLICY_RESTRICTION_METHOD_DEVICE
+  }
 ]);
 const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
@@ -107,14 +156,15 @@ const statusOptions = computed<ProFormOption[]>(() => [
 ]);
 
 const formFields = computed<ProFormField[]>(() => [
-  { prop: "scope_type", label: t("system.base.login_policy.field.scope_type"), component: "select", options: scopeTypeOptions.value },
   {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
+    prop: "scope_type",
+    label: t("system.base.login_policy.field.scope_type"),
     component: "select",
-    options: tenantOptions.value,
-    visible: model => model.scope_type !== BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL,
-    props: { filterable: true, clearable: true }
+    options: scopeTypeOptions.value
+  },
+  {
+    ...tenantFormField({ label: t("common.field.tenant"), props: { clearable: true } }),
+    visible: model => isDefaultTenant.value && model.scope_type !== BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL
   },
   {
     prop: "user_id",
@@ -178,6 +228,12 @@ const formFields = computed<ProFormField[]>(() => [
     component: "password",
     props: { placeholder: t("system.base.login_policy.placeholder.initial_password"), showPassword: true }
   },
+  {
+    prop: "initialPasswordStrength",
+    label: t("system.base.login_policy.field.password_strength"),
+    component: "slot",
+    slotName: "initialPasswordStrength"
+  },
   { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value },
   { prop: "rules", label: t("system.base.login_policy.field.rules"), component: "slot", slotName: "rules", colSpan: 24 }
 ]);
@@ -186,15 +242,25 @@ const formRules = computed(() => ({
   scope_type: [{ required: true, message: t("system.base.login_policy.validation.scope_type"), trigger: "change" }],
   tenant_id: [{ validator: validateTenant, trigger: "change" }],
   user_id: [{ validator: validateUser, trigger: "change" }],
-  max_failed_attempts: [{ required: true, message: t("system.base.login_policy.validation.max_failed_attempts"), trigger: "change" }],
-  lock_duration_minutes: [{ required: true, message: t("system.base.login_policy.validation.lock_duration_minutes"), trigger: "change" }],
-  password_min_length: [{ required: true, message: t("system.base.login_policy.validation.password_min_length"), trigger: "change" }],
-  password_history_count: [{ required: true, message: t("system.base.login_policy.validation.password_history_count"), trigger: "change" }],
+  max_failed_attempts: [
+    { required: true, message: t("system.base.login_policy.validation.max_failed_attempts"), trigger: "change" }
+  ],
+  lock_duration_minutes: [
+    { required: true, message: t("system.base.login_policy.validation.lock_duration_minutes"), trigger: "change" }
+  ],
+  password_min_length: [
+    { required: true, message: t("system.base.login_policy.validation.password_min_length"), trigger: "change" }
+  ],
+  password_history_count: [
+    { required: true, message: t("system.base.login_policy.validation.password_history_count"), trigger: "change" }
+  ],
   password_min_complexity_classes: [
     { required: true, message: t("system.base.login_policy.validation.password_min_complexity_classes"), trigger: "change" }
   ],
-  password_max_age_days: [{ required: true, message: t("system.base.login_policy.validation.password_max_age_days"), trigger: "change" }]
-  ,mfa_remember_days: [{ required: true, message: t("system.base.login_policy.validation.mfa_remember_days"), trigger: "change" }]
+  password_max_age_days: [
+    { required: true, message: t("system.base.login_policy.validation.password_max_age_days"), trigger: "change" }
+  ],
+  mfa_remember_days: [{ required: true, message: t("system.base.login_policy.validation.mfa_remember_days"), trigger: "change" }]
 }));
 
 const columns = computed<ColumnProps[]>(() => [
@@ -233,7 +299,12 @@ const columns = computed<ColumnProps[]>(() => [
     }
   },
   { prop: "password_min_length", label: t("system.base.login_policy.field.password_min_length"), width: 110, align: "right" },
-  { prop: "password_history_count", label: t("system.base.login_policy.field.password_history_count"), width: 110, align: "right" },
+  {
+    prop: "password_history_count",
+    label: t("system.base.login_policy.field.password_history_count"),
+    width: 110,
+    align: "right"
+  },
   {
     prop: "password_min_complexity_classes",
     label: t("system.base.login_policy.field.password_min_complexity_classes"),
@@ -303,13 +374,13 @@ watch(
   () => formData.scope_type,
   value => {
     if (value === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL) {
-      formData.tenant_id = 0;
-      formData.user_id = 0;
+      formData.tenant_id = undefined;
+      formData.user_id = undefined;
       userOptions.value = [];
       return;
     }
     if (value === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_TENANT) {
-      formData.user_id = 0;
+      formData.user_id = undefined;
       userOptions.value = [];
     }
   }
@@ -332,8 +403,8 @@ function defaultForm(): BaseLoginPolicyFormState {
   return {
     id: 0,
     scope_type: BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL,
-    tenant_id: 0,
-    user_id: 0,
+    tenant_id: undefined,
+    user_id: undefined,
     max_failed_attempts: 5,
     lock_duration_minutes: 15,
     allow_concurrent_login: false,
@@ -384,12 +455,6 @@ async function openDialog(id?: number) {
   dialog.visible = true;
 }
 
-/** 加载租户选项。 */
-async function loadTenantOptions() {
-  const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  tenantOptions.value = response.list ?? [];
-}
-
 /** 加载指定租户的用户选项。 */
 async function loadUserOptions(tenantId: number) {
   const response = await defBaseUserService.OptionBaseUser({ keyword: "", tenant_id: tenantId });
@@ -403,6 +468,8 @@ async function handleSubmit() {
 
   const baseLoginPolicy: BaseLoginPolicyForm = {
     ...formData,
+    tenant_id: formData.tenant_id ?? 0,
+    user_id: formData.user_id ?? 0,
     initial_password: formData.initial_password
       ? await encryptPassword(formData.initial_password, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_CONFIGURE_PASSWORD_POLICY)
       : undefined
@@ -472,7 +539,8 @@ function scopeTypeLabel(value: BaseLoginPolicyScopeType) {
 
 /** 输出策略目标名称。 */
 function targetLabel(row: BaseLoginPolicy) {
-  if (row.scope_type === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL) return t("system.base.login_policy.scope.global");
+  if (row.scope_type === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_GLOBAL)
+    return t("system.base.login_policy.scope.global");
   if (row.scope_type === BaseLoginPolicyScopeType.BASE_LOGIN_POLICY_SCOPE_TYPE_USER) return row.user_name || String(row.user_id);
   return row.tenant_name || String(row.tenant_id);
 }
@@ -488,7 +556,8 @@ function renderRules(row: BaseLoginPolicy) {
       h(
         ElTag,
         { key: `${rule.id || index}`, size: "small", class: "rule-tag" },
-        () => `${restrictionTypeLabel(rule.restriction_type)}/${restrictionMethodLabel(rule.restriction_method)}: ${rule.restriction_value}`
+        () =>
+          `${restrictionTypeLabel(rule.restriction_type)}/${restrictionMethodLabel(rule.restriction_method)}: ${rule.restriction_value}`
       )
     )
   );

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

@@ -79,14 +79,14 @@ import { BaseMenuType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/
 import { I18nTargetType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 import { normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
-import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/DynamicI18nEditor.vue";
-import DynamicI18nCell from "@liujitcn/kratos-admin-system/components/DynamicI18nCell.vue";
+import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nEditor.vue";
+import DynamicI18nCell from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nCell.vue";
 import {
   normalizeDynamicI18ns,
   serializeDynamicI18ns,
   type DynamicI18nRecord,
   type DynamicI18nValue
-} from "@liujitcn/kratos-admin-system/components/dynamicI18n";
+} from "@liujitcn/kratos-admin-system/components/i18n/dynamicI18n";
 
 defineOptions({
   name: "BaseMenu",

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";