@liujitcn/kratos-admin-system 0.0.87 → 0.0.89

package/dist/package/declarations/src/rpc/system/admin/v1/auth.d.ts

@@ -42,6 +42,8 @@ export interface UserInfoForm {
     tenant_code: string;
     /** 租户名称 */
     tenant_name: string;
+    /** 当前用户所属租户ID */
+    tenant_id: number;
 }
 /** 获取个人中心用户信息请求参数 */
 export interface GetUserProfileRequest {

package/dist/package/src/components/tenant-project/tenant-project-catalog.ts

@@ -119,7 +119,7 @@ export async function loadTenantProjectOptions(isDefaultTenant: boolean, force =
       sharedCatalog.treeOptions = response.list ?? [];
       indexTree(sharedCatalog.treeOptions);
     } else {
-      const response = await defBaseTenantProjectService.OptionBaseTenantProject({ tenant_id: 0 });
+      const response = await defBaseTenantProjectService.OptionBaseTenantProject({});
       sharedCatalog.projectOptions = response.list ?? [];
       for (const option of sharedCatalog.projectOptions) indexProject(0, Number(option.value), option.label, "");
       sharedCatalog.treeOptions = sharedCatalog.projectOptions.map(option => ({

package/dist/package/src/locales/en-US.json

@@ -862,7 +862,7 @@
   "system.base.message.field.title": "Title",
   "system.base.message.field.user_id": "User ID",
   "system.base.message.placeholder.action_target": "For example: system/base/user/index",
-  "system.base.message.placeholder.category": "Select a tenant first, then choose a category",
+  "system.base.message.placeholder.category": "Select a category",
   "system.base.message.placeholder.content": "Enter the notification body using rich text",
   "system.base.message.placeholder.expires_at": "Optional; the message expires after this time",
   "system.base.message.placeholder.scheduled_at": "Leave empty to publish immediately",

package/dist/package/src/locales/ja-JP.json

@@ -862,7 +862,7 @@
   "system.base.message.field.title": "タイトル",
   "system.base.message.field.user_id": "ユーザーID",
   "system.base.message.placeholder.action_target": "例: system/base/user/index",
-  "system.base.message.placeholder.category": "先にテナントを選択してからカテゴリを選択",
+  "system.base.message.placeholder.category": "カテゴリを選択",
   "system.base.message.placeholder.content": "リッチテキストで通知本文を入力",
   "system.base.message.placeholder.expires_at": "任意。指定時刻を過ぎると無効になります",
   "system.base.message.placeholder.scheduled_at": "空欄の場合はすぐに公開",

package/dist/package/src/locales/zh-CN.json

@@ -862,7 +862,7 @@
   "system.base.message.field.title": "消息标题",
   "system.base.message.field.user_id": "用户ID",
   "system.base.message.placeholder.action_target": "例如：system/base/user/index",
-  "system.base.message.placeholder.category": "请先选择租户，再选择消息分类",
+  "system.base.message.placeholder.category": "请选择消息分类",
   "system.base.message.placeholder.content": "请输入通知正文，可使用富文本格式",
   "system.base.message.placeholder.expires_at": "可选，超过时间后消息失效",
   "system.base.message.placeholder.scheduled_at": "不填写则立即发布",

package/dist/package/src/locales/zh-TW.json

@@ -862,7 +862,7 @@
   "system.base.message.field.title": "消息標題",
   "system.base.message.field.user_id": "使用者ID",
   "system.base.message.placeholder.action_target": "例如：system/base/user/index",
-  "system.base.message.placeholder.category": "請先選擇租戶，再選擇消息分類",
+  "system.base.message.placeholder.category": "請選擇消息分類",
   "system.base.message.placeholder.content": "請輸入通知正文，可使用富文字格式",
   "system.base.message.placeholder.expires_at": "可選，超過時間後消息失效",
   "system.base.message.placeholder.scheduled_at": "不填寫則立即發布",

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

@@ -54,6 +54,8 @@ export interface UserInfoForm {
   tenant_code: string;
   /** 租户名称 */
   tenant_name: string;
+  /** 当前用户所属租户ID */
+  tenant_id: number;
 }
 
 /** 获取个人中心用户信息请求参数 */

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

@@ -27,7 +27,7 @@ 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();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel, toRequestTenantId } = useTenantScope();
 
 onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() =>
@@ -90,7 +90,9 @@ const config = computed<LogTableConfig>(() => ({
 }));
 
 async function requestTable(params: Record<string, unknown>) {
-  const response = await defBaseApiLogService.PageBaseApiLog(buildPageRequest(params as unknown as PageBaseApiLogRequest));
+  const response = await defBaseApiLogService.PageBaseApiLog(
+    buildPageRequest({ ...params, tenant_id: toRequestTenantId(params.tenant_id) } as unknown as PageBaseApiLogRequest)
+  );
   return { list: response.base_api_logs as unknown as Record<string, unknown>[], total: response.total };
 }
 

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

@@ -27,7 +27,7 @@ import type { BaseDataAccessLog, PageBaseDataAccessLogRequest } from "@liujitcn/
 defineOptions({ name: "BaseDataAccessLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
-const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel, toRequestTenantId } = useTenantScope();
 
 onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() => createLogEnumOptions([
@@ -92,7 +92,9 @@ const config = computed<LogTableConfig>(() => ({
 }));
 
 async function requestTable(params: Record<string, unknown>) {
-  const response = await defBaseDataAccessLogService.PageBaseDataAccessLog(buildPageRequest(params as unknown as PageBaseDataAccessLogRequest));
+  const response = await defBaseDataAccessLogService.PageBaseDataAccessLog(
+    buildPageRequest({ ...params, tenant_id: toRequestTenantId(params.tenant_id) } as unknown as PageBaseDataAccessLogRequest)
+  );
   return { list: response.base_data_access_logs as unknown as Record<string, unknown>[], total: response.total };
 }
 

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

@@ -281,7 +281,7 @@ function filterDeptTree(deptList: BaseDept[], keywordMap: { name: string; remark
  * 请求部门树数据，并按搜索条件过滤树形结构。
  */
 async function requestBaseDeptTable(params: Record<string, string>) {
-  currentTenantId.value = params.tenant_id ? Number(params.tenant_id) : undefined;
+  currentTenantId.value = toRequestTenantId(params.tenant_id);
   const data = await defBaseDeptService.TreeBaseDept({ tenant_id: currentTenantId.value });
   const keywordMap = {
     name: params.name ?? "",

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

@@ -19,7 +19,7 @@ import type { BaseLoginLog, PageBaseLoginLogRequest } from "@liujitcn/kratos-adm
 defineOptions({ name: "BaseLoginLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
-const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel, toRequestTenantId } = useTenantScope();
 
 onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() =>
@@ -91,7 +91,9 @@ const config = computed<LogTableConfig>(() => ({
 }));
 
 async function requestTable(params: Record<string, unknown>) {
-  const response = await defBaseLoginLogService.PageBaseLoginLog(buildPageRequest(params as unknown as PageBaseLoginLogRequest));
+  const response = await defBaseLoginLogService.PageBaseLoginLog(
+    buildPageRequest({ ...params, tenant_id: toRequestTenantId(params.tenant_id) } as unknown as PageBaseLoginLogRequest)
+  );
   return { list: response.base_login_logs as unknown as Record<string, unknown>[], total: response.total };
 }
 

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

@@ -197,7 +197,7 @@ type MessageFormState = Omit<BaseMessageForm, "tenant_id" | "category_id"> & {
 };
 
 const { BUTTONS } = useAuthButtons();
-const { isDefaultTenant, tenantColumns, tenantFormField, loadTenantOptions } = useTenantScope();
+const { isDefaultTenant, tenantColumns, tenantFormField, loadTenantOptions, toRequestTenantId } = useTenantScope();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const contentDialogRef = ref<InstanceType<typeof ProDialog>>();
@@ -564,7 +564,10 @@ function onAudienceTypeChange(audience: BaseMessageAudienceForm) {
 /** 请求消息表格数据。 */
 async function requestTable(params: Record<string, unknown>) {
   const data = await defBaseMessageService.PageBaseMessage(
-    buildPageRequest<PageBaseMessageRequest>(params as unknown as PageBaseMessageRequest)
+    buildPageRequest<PageBaseMessageRequest>({
+      ...params,
+      tenant_id: toRequestTenantId(params.tenant_id)
+    } as unknown as PageBaseMessageRequest)
   );
   return { data: { list: data.base_messages ?? [], total: data.total } };
 }

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

@@ -19,7 +19,7 @@ import type { BaseOperationLog, PageBaseOperationLogRequest } from "@liujitcn/kr
 defineOptions({ name: "BaseOperationLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
-const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel, toRequestTenantId } = useTenantScope();
 
 onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() => createLogEnumOptions([
@@ -82,7 +82,9 @@ const config = computed<LogTableConfig>(() => ({
 }));
 
 async function requestTable(params: Record<string, unknown>) {
-  const response = await defBaseOperationLogService.PageBaseOperationLog(buildPageRequest(params as unknown as PageBaseOperationLogRequest));
+  const response = await defBaseOperationLogService.PageBaseOperationLog(
+    buildPageRequest({ ...params, tenant_id: toRequestTenantId(params.tenant_id) } as unknown as PageBaseOperationLogRequest)
+  );
   return { list: response.base_operation_logs as unknown as Record<string, unknown>[], total: response.total };
 }
 

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

@@ -19,7 +19,7 @@ import type { BasePermissionLog, PageBasePermissionLogRequest } from "@liujitcn/
 defineOptions({ name: "BasePermissionLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
-const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel, toRequestTenantId } = useTenantScope();
 
 onMounted(() => void loadTenantOptions(true));
 const resultOptions = computed(() => createLogEnumOptions([
@@ -86,7 +86,9 @@ const config = computed<LogTableConfig>(() => ({
 }));
 
 async function requestTable(params: Record<string, unknown>) {
-  const response = await defBasePermissionLogService.PageBasePermissionLog(buildPageRequest(params as unknown as PageBasePermissionLogRequest));
+  const response = await defBasePermissionLogService.PageBasePermissionLog(
+    buildPageRequest({ ...params, tenant_id: toRequestTenantId(params.tenant_id) } as unknown as PageBasePermissionLogRequest)
+  );
   return { list: response.base_permission_logs as unknown as Record<string, unknown>[], total: response.total };
 }
 

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

@@ -26,7 +26,7 @@ import type { BasePolicyEvaluationLog, PageBasePolicyEvaluationLogRequest } from
 defineOptions({ name: "BasePolicyEvaluationLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
-const { tenantColumns, loadTenantOptions, resolveTenantLabel } = useTenantScope();
+const { tenantColumns, loadTenantOptions, resolveTenantLabel, toRequestTenantId } = useTenantScope();
 
 onMounted(() => void loadTenantOptions(true));
 const decisionOptions = computed(() => createLogEnumOptions([
@@ -89,7 +89,9 @@ const config = computed<LogTableConfig>(() => ({
 }));
 
 async function requestTable(params: Record<string, unknown>) {
-  const response = await defBasePolicyEvaluationLogService.PageBasePolicyEvaluationLog(buildPageRequest(params as unknown as PageBasePolicyEvaluationLogRequest));
+  const response = await defBasePolicyEvaluationLogService.PageBasePolicyEvaluationLog(
+    buildPageRequest({ ...params, tenant_id: toRequestTenantId(params.tenant_id) } as unknown as PageBasePolicyEvaluationLogRequest)
+  );
   return { list: response.base_policy_evaluation_logs as unknown as Record<string, unknown>[], total: response.total };
 }
 

package/dist/package/src/views/base/tenant-project-grant/index.vue

@@ -65,7 +65,7 @@ type ProjectGrantFormState = {
 const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
-const { isDefaultTenant, tenantOptions, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
+const { isDefaultTenant, currentTenantId, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
 const projectOptions = ref<SelectOptionResponse_Option[]>([]);
 const subjectOptions = ref<ProFormOption[]>([]);
 const loading = ref(false);
@@ -215,11 +215,11 @@ async function handleOpenDialog(row?: BaseTenantProjectGrant) {
   try {
     await formDialogRef.value?.open({
       load: async () => {
-        await loadTenantOptions(true);
+        if (isDefaultTenant.value) await loadTenantOptions(true);
         // proto3 JSON 会省略空数组字段，行数据里的 project_id 可能为 undefined。
         const rowProjectIds = row?.project_id ?? [];
         const nextForm = {
-          tenant_id: row?.tenant_id ?? (isDefaultTenant.value ? undefined : Number(tenantOptions.value[0]?.value) || undefined),
+          tenant_id: row?.tenant_id ?? (isDefaultTenant.value ? undefined : currentTenantId.value),
           subject_type: row?.subject_type ?? DEFAULT_SUBJECT_TYPE,
           subject_id: row?.subject_id,
           project_id: row && !(rowProjectIds.length === 1 && rowProjectIds[0] === 0) ? [...rowProjectIds] : [],
@@ -264,15 +264,16 @@ async function loadSubjectOptions() {
 /** 请求指定租户和主体类型的主体选项。 */
 async function requestSubjectOptions(tenantId: number | undefined, subjectType: BaseTenantProjectGrantSubjectType) {
   if (!tenantId || subjectType === BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_UNSPECIFIED) return [];
+  const requestTenantId = toRequestTenantId(tenantId);
   switch (subjectType) {
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_POST:
-      return (await defBasePostService.OptionBasePost({ tenant_id: tenantId })).list ?? [];
+      return (await defBasePostService.OptionBasePost({ tenant_id: requestTenantId })).list ?? [];
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_ROLE:
-      return (await defBaseRoleService.OptionBaseRole({ tenant_id: tenantId })).list ?? [];
+      return (await defBaseRoleService.OptionBaseRole({ tenant_id: requestTenantId })).list ?? [];
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_DEPT:
-      return ((await defBaseDeptService.OptionBaseDept({ tenant_id: tenantId })).list ?? []) as unknown as ProFormOption[];
+      return ((await defBaseDeptService.OptionBaseDept({ tenant_id: requestTenantId })).list ?? []) as unknown as ProFormOption[];
     case BaseTenantProjectGrantSubjectType.BASE_TENANT_PROJECT_GRANT_SUBJECT_TYPE_USER:
-      return (await defBaseUserService.OptionBaseUser({ keyword: "", tenant_id: tenantId })).list ?? [];
+      return (await defBaseUserService.OptionBaseUser({ keyword: "", tenant_id: requestTenantId })).list ?? [];
   }
   return [];
 }
@@ -300,8 +301,8 @@ async function handleSubjectTypeChange(value: unknown) {
 function handleSubmit() {
   formDialogRef.value?.validate()?.then(valid => {
     if (!valid || !formData.tenant_id || !formData.subject_id || formData.subject_type === 0) return;
-    const grant: BaseTenantProjectGrant = {
-      tenant_id: formData.tenant_id,
+    const grant = {
+      ...(isDefaultTenant.value ? { tenant_id: formData.tenant_id } : {}),
       subject_type: formData.subject_type,
       subject_id: formData.subject_id,
       project_id: formData.all ? [0] : [...formData.project_id],
@@ -310,7 +311,7 @@ function handleSubmit() {
       subject_code: "",
       project_names: [],
       grant_key: ""
-    };
+    } as BaseTenantProjectGrant;
     loading.value = true;
     const request = dialog.editing
       ? defBaseTenantProjectGrantService.UpdateBaseTenantProjectGrant({ base_tenant_project_grant: grant })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.87",
+  "version": "0.0.89",
   "type": "module",
   "description": "kratos-admin system management module",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "sortablejs": "^1.15.2",
     "swagger-ui-dist": "^5.32.15",
     "vue-element-plus-x": "^2.0.3",
-    "@liujitcn/kratos-admin-core": "0.0.87"
+    "@liujitcn/kratos-admin-core": "0.0.89"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",