@liujitcn/kratos-admin-system 0.0.38 → 0.0.39

package/dist/package/src/views/profile/components/login-log.vue

@@ -0,0 +1,123 @@
+<template>
+  <el-card class="login-log-card" shadow="never">
+    <template #header>
+      <div class="login-log-header">
+        <div>
+          <h3>{{ t("system.profile.login_log.title") }}</h3>
+          <p>{{ t("system.profile.login_log.description") }}</p>
+        </div>
+        <el-button :loading="loading" @click="refresh">
+          <el-icon><Refresh /></el-icon>
+          {{ t("system.profile.login_log.action.refresh") }}
+        </el-button>
+      </div>
+    </template>
+    <ProTable ref="proTable" row-key="id" :columns="columns" :request-api="requestTable" />
+  </el-card>
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import type { ColumnProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+import { t } from "@liujitcn/kratos-admin-core";
+import { defBaseLoginLogService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_login_log";
+import { BaseLogResult } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_log";
+import { BaseLoginLogType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_login_log";
+import type { BaseLoginLog } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_login_log";
+
+defineOptions({ name: "ProfileLoginLog", inheritAttrs: false });
+
+const proTable = ref<ProTableInstance>();
+const loading = ref(false);
+const loginTypeOptions = computed<Array<[number, string]>>(() => [
+  [BaseLoginLogType.BASE_LOGIN_LOG_TYPE_PASSWORD, t("system.base.log.login_type.password")],
+  [BaseLoginLogType.BASE_LOGIN_LOG_TYPE_OAUTH, t("system.base.log.login_type.oauth")],
+  [BaseLoginLogType.BASE_LOGIN_LOG_TYPE_MFA, t("system.base.log.login_type.mfa")],
+  [BaseLoginLogType.BASE_LOGIN_LOG_TYPE_TOKEN_REFRESH, t("system.base.log.login_type.token_refresh")],
+  [BaseLoginLogType.BASE_LOGIN_LOG_TYPE_LOGOUT, t("system.base.log.login_type.logout")]
+]);
+const resultOptions = computed<Array<[number, string]>>(() => [
+  [BaseLogResult.BASE_LOG_RESULT_SUCCESS, t("system.base.log.result.success")],
+  [BaseLogResult.BASE_LOG_RESULT_FAILURE, t("system.base.log.result.failure")],
+  [BaseLogResult.BASE_LOG_RESULT_ERROR, t("system.base.log.result.error")]
+]);
+const columns = computed<ColumnProps[]>(() => [
+  { prop: "occurred_at", label: t("system.profile.login_log.field.occurred_at"), minWidth: 180 },
+  {
+    prop: "login_type",
+    label: t("system.profile.login_log.field.login_type"),
+    minWidth: 130,
+    render: scope => enumLabel(loginTypeOptions.value, (scope.row as BaseLoginLog).login_type)
+  },
+  {
+    prop: "result",
+    label: t("system.profile.login_log.field.result"),
+    minWidth: 100,
+    render: scope => enumLabel(resultOptions.value, (scope.row as BaseLoginLog).result)
+  },
+  { prop: "client_ip", label: t("system.profile.login_log.field.client_ip"), minWidth: 140 },
+  { prop: "device_id", label: t("system.profile.login_log.field.device_id"), minWidth: 160 },
+  { prop: "reason", label: t("system.profile.login_log.field.reason"), minWidth: 180 }
+]);
+
+/** 查询当前用户的登录记录。 */
+async function requestTable(params: Record<string, unknown>) {
+  const response = await defBaseLoginLogService.PageCurrentUserLoginLog(
+    buildPageRequest({ page_num: Number(params.page_num ?? 1), page_size: Number(params.page_size ?? 10) })
+  );
+  return { data: { list: response.base_login_logs ?? [], total: response.total } };
+}
+
+/** 刷新当前用户的登录记录。 */
+async function refresh() {
+  loading.value = true;
+  try {
+    await proTable.value?.getTableList();
+  } finally {
+    loading.value = false;
+  }
+}
+
+/** 输出枚举显示文本。 */
+function enumLabel(options: Array<[number, string]>, value: number) {
+  return options.find(option => option[0] === value)?.[1] ?? String(value);
+}
+</script>
+
+<style scoped lang="scss">
+.login-log-card {
+  border: 1px solid var(--el-border-color-light);
+  border-radius: var(--admin-page-radius);
+}
+:deep(.login-log-card .el-card__header) {
+  padding: 18px 20px;
+  border-bottom: 1px solid var(--el-border-color-light);
+}
+:deep(.login-log-card .el-card__body) {
+  padding: 20px;
+}
+.login-log-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+}
+.login-log-header h3 {
+  margin: 0;
+  color: var(--el-text-color-primary);
+  font-size: 18px;
+}
+.login-log-header p {
+  margin: 6px 0 0;
+  color: var(--el-text-color-secondary);
+  font-size: 13px;
+}
+@media screen and (width <= 640px) {
+  .login-log-header {
+    align-items: flex-start;
+    flex-direction: column;
+  }
+}
+</style>

package/dist/package/src/views/profile/components/session.vue

@@ -13,43 +13,20 @@
       </div>
     </template>
 
-    <el-skeleton v-if="loading && !session" :rows="5" animated />
-    <el-empty v-else-if="!session" :description="t('system.profile.session.empty')" />
-    <div v-else class="session-details">
-      <div class="session-status">
-        <el-tag type="success" effect="plain">{{ t("system.profile.session.status.active") }}</el-tag>
-        <span>{{ session.user_name }} · {{ session.tenant_code }}</span>
-      </div>
-      <dl class="session-grid">
-        <div>
-          <dt>{{ t("system.profile.session.field.client_ip") }}</dt>
-          <dd>{{ session.client_ip || "-" }}</dd>
-        </div>
-        <div>
-          <dt>{{ t("system.profile.session.field.device") }}</dt>
-          <dd>{{ session.device || "-" }}</dd>
-        </div>
-        <div>
-          <dt>{{ t("system.profile.session.field.issued_at") }}</dt>
-          <dd>{{ session.issued_at || "-" }}</dd>
-        </div>
-        <div>
-          <dt>{{ t("system.profile.session.field.expires_in") }}</dt>
-          <dd>{{ formatExpires(session.expires_in) }}</dd>
-        </div>
-      </dl>
-      <div class="session-actions">
-        <el-button type="danger" plain @click="revokeAll">
-          <el-icon><SwitchButton /></el-icon>
-          {{ t("system.profile.session.action.revoke_all") }}
-        </el-button>
-      </div>
+    <ProTable ref="proTable" row-key="session_id" :columns="columns" :request-api="requestSessionTable" :pagination="false" />
+    <div class="session-actions">
+      <el-button type="danger" plain :disabled="!hasSessions" @click="revokeAll">
+        <el-icon><SwitchButton /></el-icon>
+        {{ t("system.profile.session.action.revoke_all") }}
+      </el-button>
     </div>
   </el-card>
 </template>
 
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { computed, ref } from "vue";
+import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import type { ColumnProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import { useRouter } from "vue-router";
 import { t } from "@liujitcn/kratos-admin-core";
 import { LOGIN_URL } from "@liujitcn/kratos-admin-core/config";
@@ -58,15 +35,47 @@ import { defBaseSessionService } from "@liujitcn/kratos-admin-system/api/system/
 import type { BaseSession } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_session";
 
 const loading = ref(false);
-const session = ref<BaseSession>();
+const proTable = ref<ProTableInstance>();
+const hasSessions = ref(false);
+const columns = computed<ColumnProps[]>(() => [
+  {
+    prop: "current",
+    label: t("system.profile.session.field.current"),
+    cellType: "status",
+    minWidth: 130,
+    statusProps: {
+      activeValue: true,
+      inactiveValue: false,
+      activeText: t("system.profile.session.status.current"),
+      inactiveText: t("system.profile.session.status.other")
+    }
+  },
+  { prop: "client_ip", label: t("system.profile.session.field.client_ip"), minWidth: 140 },
+  { prop: "device", label: t("system.profile.session.field.device"), minWidth: 200 },
+  { prop: "issued_at", label: t("system.profile.session.field.issued_at"), minWidth: 180 },
+  {
+    prop: "expires_in",
+    label: t("system.profile.session.field.expires_in"),
+    minWidth: 140,
+    render: scope => formatExpires((scope.row as BaseSession).expires_in)
+  }
+]);
+
+/** 查询本人全部有效会话。 */
+async function requestSessionTable() {
+  const response = await defBaseSessionService.ListCurrentBaseSessions({});
+  const sessions = response.sessions ?? [];
+  hasSessions.value = sessions.length > 0;
+  return { data: sessions };
+}
 const router = useRouter();
 const userStore = useUserStore();
 
-/** 拉取当前会话信息。 */
+/** 刷新本人会话列表。 */
 async function loadSession() {
   loading.value = true;
   try {
-    session.value = await defBaseSessionService.GetCurrentBaseSession({});
+    await proTable.value?.getTableList();
   } finally {
     loading.value = false;
   }
@@ -80,7 +89,7 @@ async function revokeAll() {
   await defBaseSessionService.RevokeAllBaseSessions({});
   userStore.clearAuthData();
   ElMessage.success(t("system.profile.session.message.revoked"));
-  session.value = undefined;
+  hasSessions.value = false;
   await router.replace(LOGIN_URL);
 }
 
@@ -92,8 +101,6 @@ function formatExpires(seconds: number) {
   if (hours > 0) return t("system.profile.session.value.hours_minutes", { hours, minutes });
   return t("system.profile.session.value.minutes", { minutes });
 }
-
-onMounted(loadSession);
 </script>
 
 <style scoped lang="scss">
@@ -126,36 +133,14 @@ onMounted(loadSession);
   color: var(--el-text-color-secondary);
   font-size: 13px;
 }
-.session-grid {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  gap: 16px;
-  margin: 24px 0;
-}
-.session-grid div {
-  padding: 14px;
-  background: var(--el-fill-color-light);
-  border-radius: var(--admin-page-radius);
-}
-.session-grid dt {
-  color: var(--el-text-color-secondary);
-  font-size: 12px;
-}
-.session-grid dd {
-  margin: 6px 0 0;
-  color: var(--el-text-color-primary);
-  overflow-wrap: anywhere;
-}
 .session-actions {
   justify-content: flex-end;
+  margin-top: 20px;
 }
 @media screen and (width <= 640px) {
   .session-header {
     align-items: flex-start;
     flex-direction: column;
   }
-  .session-grid {
-    grid-template-columns: 1fr;
-  }
 }
 </style>

package/dist/package/src/views/profile/index.vue

@@ -27,6 +27,7 @@
           @switch-tab="handleTabChange"
         />
         <ProfileSession v-else-if="activeTab === 'session'" />
+        <ProfileLoginLog v-else-if="activeTab === 'login-log'" />
         <ProfilePassword v-else />
       </main>
     </section>
@@ -49,9 +50,10 @@ import ProfileBase from "./components/base.vue";
 import ProfileSecurity from "./components/security.vue";
 import ProfilePassword from "./components/password.vue";
 import ProfileSession from "./components/session.vue";
+import ProfileLoginLog from "./components/login-log.vue";
 
 /** 个人中心标签页。 */
-type ProfileTab = "account" | "security" | "password" | "session";
+type ProfileTab = "account" | "security" | "password" | "session" | "login-log";
 
 /** 左侧导航项结构。 */
 interface ProfileTabOption {
@@ -84,13 +86,16 @@ const profileTabs = computed<ProfileTabOption[]>(() => {
       description: t("system.profile.password.nav_description")
     }
   ];
-  if (userStore.userInfo.role_code === "super") {
-    tabs.push({
-      value: "session",
-      label: t("system.profile.session.title"),
-      description: t("system.profile.session.nav_description")
-    });
-  }
+  tabs.push({
+    value: "session",
+    label: t("system.profile.session.title"),
+    description: t("system.profile.session.nav_description")
+  });
+  tabs.push({
+    value: "login-log",
+    label: t("system.profile.login_log.title"),
+    description: t("system.profile.login_log.nav_description")
+  });
   return tabs;
 });
 const userProfileForm = reactive<UserProfileForm>({
@@ -210,5 +215,4 @@ onMounted(async () => {
     position: static;
   }
 }
-
 </style>

package/dist/package/src/views/tool/code-gen/code-preview/index.vue

@@ -135,21 +135,11 @@ async function handleGenerate() {
     return;
   }
   if (missingI18ns.value.length) {
-    try {
-      await ElMessageBox.alert(
-        t("system.code.gen.preview.message.missing_i18ns", {
-          items: missingI18ns.value.join(t("system.code.gen.preview.value.list_separator"))
-        }),
-        t("common.title.warning"),
-        {
-          confirmButtonText: t("common.action.close"),
-          type: "warning"
-        }
-      );
-    } catch {
-      // 关闭提示框与点击关闭按钮语义一致。
-    }
-    return;
+    ElMessage.warning(
+      t("system.code.gen.preview.message.missing_i18ns", {
+        items: missingI18ns.value.join(t("system.code.gen.preview.value.list_separator"))
+      })
+    );
   }
   try {
     await ElMessageBox.confirm(

package/dist/package/src/views/tool/code-gen/table/index.vue

@@ -15,8 +15,8 @@
       v-model="dialog.visible"
       ref="formDialogRef"
       :title="dialogTitle"
-      width="920px"
-      label-width="240px"
+      width="min(1440px, calc(100vw - 32px))"
+      label-width="180px"
       top="4vh"
       :model="formData"
       :fields="formFields"
@@ -24,11 +24,13 @@
       :confirm-loading="saving"
       :gutter="16"
       :col-span="12"
+      :form-props="{ class: 'code-gen-table-form' }"
       @confirm="handleSubmit"
       @close="handleCloseDialog"
     >
       <template #tableI18nConfig>
         <CodeGenLocaleEditor
+          class="code-gen-table-locales"
           :model-value="formData.i18n_config"
           :source-comment="formData.comment"
           :show-left-tree-comment="formData.page_type === 'left_tree'"
@@ -263,6 +265,7 @@ const formFields = computed<ProFormField[]>(() => [
     prop: "page_type",
     label: t("system.code.gen.table.field.page_type"),
     component: "segmented",
+    colSpan: 16,
     options: pageTypeOptions.value,
     labelTooltip: t("system.code.gen.table.tooltip.page_type"),
     props: { onChange: handlePageTypeChange }
@@ -387,9 +390,9 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.code.gen.table.field.gen_backend"),
     component: "switch",
     labelTooltip: t("system.code.gen.table.tooltip.gen_backend"),
-    // 三个生成开关始终从新行开始并排展示。
+    // 生成开关按两列排列，减少表单横向空置并保持开关内容紧凑。
     rowBreakBefore: true,
-    colSpan: 8,
+    colSpan: 12,
     props: { activeText: t("system.code.gen.value.generate"), inactiveText: t("system.code.gen.value.skip") }
   },
   {
@@ -397,14 +400,15 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.code.gen.table.field.gen_frontend"),
     component: "switch",
     labelTooltip: t("system.code.gen.table.tooltip.gen_frontend"),
-    colSpan: 8,
+    colSpan: 12,
     props: { activeText: t("system.code.gen.value.generate"), inactiveText: t("system.code.gen.value.skip") }
   },
   {
     prop: "gen_sql",
     label: t("system.code.gen.table.field.gen_sql"),
     component: "switch",
-    colSpan: 8,
+    colSpan: 12,
+    rowBreakBefore: false,
     labelTooltip: t("system.code.gen.table.tooltip.gen_sql"),
     props: { activeText: t("system.code.gen.value.generate"), inactiveText: t("system.code.gen.value.skip") }
   },
@@ -412,7 +416,7 @@ const formFields = computed<ProFormField[]>(() => [
     prop: "status",
     label: t("system.code.gen.table.field.status"),
     component: "dict",
-    colSpan: 24,
+    colSpan: 12,
     props: { code: "code_gen_table_status", codeType: "number", type: "radio" },
     labelTooltip: t("system.code.gen.table.tooltip.status")
   },
@@ -623,21 +627,11 @@ async function handleGenerate(selected: CodeGenGenerateTarget) {
     generating.value = false;
   }
   if (missingI18ns.length) {
-    try {
-      await ElMessageBox.alert(
-        t("system.code.gen.preview.message.missing_i18ns", {
-          items: missingI18ns.join(t("system.code.gen.preview.value.list_separator"))
-        }),
-        t("common.title.warning"),
-        {
-          confirmButtonText: t("common.action.close"),
-          type: "warning"
-        }
-      );
-    } catch {
-      // 关闭提示框与点击关闭按钮语义一致。
-    }
-    return;
+    ElMessage.warning(
+      t("system.code.gen.preview.message.missing_i18ns", {
+        items: missingI18ns.join(t("system.code.gen.preview.value.list_separator"))
+      })
+    );
   }
   const message =
     tables.length === 1
@@ -970,14 +964,14 @@ function resolveDefaultColumn(columns: CodeGenDatabaseColumn[], columnName: stri
   return columns.some(item => item.name === columnName) ? columnName : "";
 }
 
-/** 转换菜单树为 ProForm 树形选择项。 */
+/** 转换菜单树为 ProForm 树形选择项，仅允许八位编号的一至三级目录承载生成页面。 */
 function convertMenuOptions(options: BaseMenu[]): ProFormOption[] {
   return options
     .filter(item => item.type === BaseMenuType.BASE_MENU_TYPE_FOLDER)
     .map(item => ({
       label: item.meta?.title || item.name || item.path,
       value: item.id,
-      disabled: item.id < 100 || item.id > 99999,
+      disabled: item.id < 10000000 || item.id > 99999999 || item.id % 100 !== 0,
       children: convertMenuOptions(item.children ?? [])
     }));
 }
@@ -1022,6 +1016,38 @@ function ensureLeftTreeConfig() {
 </script>
 
 <style scoped lang="scss">
+.code-gen-table-locales {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(min(100%, 280px), 1fr));
+  width: 100%;
+  min-width: 0;
+  :deep(.el-alert) {
+    grid-column: 1 / -1;
+  }
+}
+
+@media (max-width: 767px) {
+  .code-gen-table-locales {
+    grid-template-columns: 1fr;
+  }
+  :deep(.code-gen-table-form) {
+    .el-col {
+      flex: 0 0 100%;
+      max-width: 100%;
+    }
+    .el-form-item {
+      flex-direction: column;
+    }
+    .el-form-item__label {
+      justify-content: flex-start;
+      width: auto !important;
+    }
+    .el-form-item__content {
+      margin-left: 0 !important;
+    }
+  }
+}
+
 /* 固定操作列表头与普通表头使用同一主题背景，并保持行内操作单行展示。 */
 :deep(.code-gen-table) {
   --el-table-header-bg-color: var(--el-fill-color-light);

package/package.json

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