@liujitcn/kratos-admin-system 0.0.37 → 0.0.39

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

@@ -1,12 +1,22 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_session.proto
 
 /* eslint-disable */
 import type { Empty } from "../../../google/protobuf/empty";
 
+/** 查询本人全部会话请求。 */
+export interface ListCurrentBaseSessionsRequest {
+}
+
+/** 本人有效会话列表。 */
+export interface ListCurrentBaseSessionsResponse {
+  /** 本人有效会话列表 */
+  sessions: BaseSession[];
+}
+
 /** 查询当前会话请求参数。 */
 export interface GetCurrentBaseSessionRequest {
 }
@@ -15,8 +25,36 @@ export interface GetCurrentBaseSessionRequest {
 export interface RevokeAllBaseSessionsRequest {
 }
 
+/** 在线会话分页查询请求。 */
+export interface PageOnlineBaseSessionsRequest {
+  /** 关键字 */
+  keyword: string;
+  /** 租户编码 */
+  tenant_code: string;
+  /** 当前页码 */
+  page_num: number;
+  /** 每页行数 */
+  page_size: number;
+}
+
+/** 在线会话分页响应。 */
+export interface PageOnlineBaseSessionsResponse {
+  /** 在线会话列表 */
+  sessions: BaseSession[];
+  /** 总数 */
+  total: number;
+}
+
+/** 下线指定会话请求。 */
+export interface RevokeBaseSessionRequest {
+  /** 会话ID */
+  session_id: string;
+}
+
 /** 当前会话信息。 */
 export interface BaseSession {
+  /** 会话ID */
+  session_id: string;
   /** 用户ID */
   user_id: number;
   /** 用户账号 */
@@ -33,12 +71,20 @@ export interface BaseSession {
   issued_at: string;
   /** 令牌有效期（秒） */
   expires_in: number;
+  /** 是否为当前请求会话 */
+  current: boolean;
 }
 
 /** Admin会话管理服务。 */
 export interface BaseSessionService {
+  /** 查询当前用户全部有效会话。 */
+  ListCurrentBaseSessions(request: ListCurrentBaseSessionsRequest): Promise<ListCurrentBaseSessionsResponse>;
   /** 查询当前用户会话。 */
   GetCurrentBaseSession(request: GetCurrentBaseSessionRequest): Promise<BaseSession>;
   /** 撤销当前用户全部会话。 */
   RevokeAllBaseSessions(request: RevokeAllBaseSessionsRequest): Promise<Empty>;
+  /** 分页查询当前在线用户会话。 */
+  PageOnlineBaseSessions(request: PageOnlineBaseSessionsRequest): Promise<PageOnlineBaseSessionsResponse>;
+  /** 下线指定用户会话。 */
+  RevokeBaseSession(request: RevokeBaseSessionRequest): Promise<Empty>;
 }

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_archive.proto
 
@@ -92,7 +92,7 @@ export interface SetBaseTableArchiveStatusRequest {
   status: number;
 }
 
-/** BaseTableArchiveService 管理数据库表归档配置。 */
+/** Admin数据库表归档配置服务。 */
 export interface BaseTableArchiveService {
   /** 查询表归档配置分页列表。 */
   PageBaseTableArchive(request: PageBaseTableArchiveRequest): Promise<PageBaseTableArchiveResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_archive_record.proto
 
@@ -86,7 +86,7 @@ export interface GetBaseTableArchiveRecordRequest {
   id: number;
 }
 
-/** BaseTableArchiveRecordService 查询表归档执行记录。 */
+/** Admin表归档执行记录服务。 */
 export interface BaseTableArchiveRecordService {
   /** 查询表归档记录分页列表。 */
   PageBaseTableArchiveRecord(request: PageBaseTableArchiveRecordRequest): Promise<PageBaseTableArchiveRecordResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_archive_restore.proto
 
@@ -80,7 +80,7 @@ export interface ExecuteBaseTableArchiveRestoreRequest {
   base_table_archive_restore: BaseTableArchiveRestore | undefined;
 }
 
-/** BaseTableArchiveRestoreService 手工恢复归档数据。 */
+/** Admin归档数据恢复服务。 */
 export interface BaseTableArchiveRestoreService {
   /** 查询归档恢复记录分页列表。 */
   PageBaseTableArchiveRestore(

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_backup.proto
 
@@ -74,7 +74,7 @@ export interface SetBaseTableBackupStatusRequest {
   status: number;
 }
 
-/** BaseTableBackupService 管理数据库备份配置。 */
+/** Admin数据库备份配置服务。 */
 export interface BaseTableBackupService {
   /** 查询数据库备份配置分页列表。 */
   PageBaseTableBackup(request: PageBaseTableBackupRequest): Promise<PageBaseTableBackupResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_backup_record.proto
 
@@ -73,7 +73,7 @@ export interface GetBaseTableBackupRecordRequest {
   id: number;
 }
 
-/** BaseTableBackupRecordService 查询数据库备份执行记录。 */
+/** Admin数据库备份执行记录服务。 */
 export interface BaseTableBackupRecordService {
   /** 查询数据库备份记录分页列表。 */
   PageBaseTableBackupRecord(request: PageBaseTableBackupRecordRequest): Promise<PageBaseTableBackupRecordResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_backup_restore.proto
 
@@ -80,7 +80,7 @@ export interface ExecuteBaseTableBackupRestoreRequest {
   base_table_backup_restore: BaseTableBackupRestore | undefined;
 }
 
-/** BaseTableBackupRestoreService 手工恢复数据库备份。 */
+/** Admin数据库备份恢复服务。 */
 export interface BaseTableBackupRestoreService {
   /** 查询备份恢复记录分页列表。 */
   PageBaseTableBackupRestore(request: PageBaseTableBackupRestoreRequest): Promise<PageBaseTableBackupRestoreResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_table_source.proto
 
@@ -17,7 +17,7 @@ export interface OptionBaseTableRequest {
   source_name: string;
 }
 
-/** BaseTableSourceService 提供数据备份、数据归档和代码生成共用的数据源元数据。 */
+/** Admin数据源元数据服务，提供数据备份、数据归档和代码生成共用的数据源信息。 */
 export interface BaseTableSourceService {
   /** 查询已初始化的数据源名称。 */
   OptionBaseTableSource(request: OptionBaseTableSourceRequest): Promise<StringValues>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_tenant.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_third_account.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/base_user.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/cache.proto
 
@@ -52,7 +52,7 @@ export interface CacheField {
   value: string;
 }
 
-/** 运行时缓存查询服务。 */
+/** Admin运行时缓存查询服务。 */
 export interface CacheService {
   /** 分页查询当前进程已观测到的缓存条目。 */
   PageCache(request: PageCacheRequest): Promise<PageCacheResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/code_gen.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/code_gen_column.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/code_gen_proto.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/code_gen_table.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/common.proto
 

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/oauth_client.proto
 
@@ -151,7 +151,7 @@ export interface OauthClientCredentials {
   crypto_key: string;
 }
 
-/** 开放授权客户端管理服务。 */
+/** Admin开放授权客户端管理服务。 */
 export interface OauthClientService {
   /** 查询可授权的开发接口选项。 */
   OptionOauthClientApi(request: OptionOauthClientApiRequest): Promise<OptionOauthClientApiResponse>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/ops_monitoring.proto
 
@@ -240,7 +240,7 @@ export interface OpsAlert {
   status: string;
 }
 
-/** 运维监控服务。 */
+/** Admin运维监控服务。 */
 export interface OpsMonitoringService {
   /** 查询当前进程运行信息。 */
   GetOpsRuntime(request: GetOpsRuntimeRequest): Promise<OpsRuntime>;

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

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/admin/v1/runtime_log.proto
 

package/dist/package/src/rpc/system/common/v1/common.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/common/v1/common.proto
 

package/dist/package/src/rpc/system/config/v1/system_config.ts

@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-ts_proto. DO NOT EDIT.
 // versions:
-//   protoc-gen-ts_proto  v2.12.1
+//   protoc-gen-ts_proto  v2.11.8
 //   protoc               unknown
 // source: system/config/v1/system_config.proto
 

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

@@ -136,6 +136,12 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input-number",
     props: { min: 1, max: 1440, precision: 0 }
   },
+  {
+    prop: "allow_concurrent_login",
+    label: t("system.base.login_policy.field.allow_concurrent_login"),
+    component: "switch",
+    props: { activeText: t("common.status.enabled"), inactiveText: t("common.status.disabled") }
+  },
   {
     prop: "password_min_length",
     label: t("system.base.login_policy.field.password_min_length"),
@@ -160,6 +166,12 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input-number",
     props: { min: 0, max: 3650, precision: 0 }
   },
+  {
+    prop: "mfa_remember_days",
+    label: t("system.base.login_policy.field.mfa_remember_days"),
+    component: "input-number",
+    props: { min: 0, max: 90, precision: 0 }
+  },
   {
     prop: "initial_password",
     label: t("system.base.login_policy.field.initial_password"),
@@ -182,6 +194,7 @@ const formRules = computed(() => ({
     { 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" }]
 }));
 
 const columns = computed<ColumnProps[]>(() => [
@@ -207,6 +220,18 @@ const columns = computed<ColumnProps[]>(() => [
   },
   { prop: "max_failed_attempts", label: t("system.base.login_policy.field.max_failed_attempts"), width: 110, align: "right" },
   { prop: "lock_duration_minutes", label: t("system.base.login_policy.field.lock_duration_minutes"), width: 110, align: "right" },
+  {
+    prop: "allow_concurrent_login",
+    label: t("system.base.login_policy.field.allow_concurrent_login"),
+    width: 130,
+    cellType: "status",
+    statusProps: {
+      activeValue: true,
+      inactiveValue: false,
+      activeText: t("common.status.enabled"),
+      inactiveText: t("common.status.disabled")
+    }
+  },
   { 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" },
   {
@@ -216,6 +241,7 @@ const columns = computed<ColumnProps[]>(() => [
     align: "right"
   },
   { prop: "password_max_age_days", label: t("system.base.login_policy.field.password_max_age_days"), width: 110, align: "right" },
+  { prop: "mfa_remember_days", label: t("system.base.login_policy.field.mfa_remember_days"), width: 130, align: "right" },
   {
     prop: "status",
     label: t("common.field.status"),
@@ -312,10 +338,12 @@ function defaultForm(): BaseLoginPolicyFormState {
     user_id: 0,
     max_failed_attempts: 5,
     lock_duration_minutes: 15,
+    allow_concurrent_login: false,
     password_min_length: 8,
     password_history_count: 3,
     password_min_complexity_classes: 3,
     password_max_age_days: 90,
+    mfa_remember_days: 0,
     initial_password: "",
     status: Status.STATUS_ENABLE,
     rules: []

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

@@ -0,0 +1,116 @@
+<template>
+  <div class="online-session-page">
+    <el-card class="admin-page-card">
+      <ProTable
+        :key="isDefaultTenant ? 'default-tenant' : 'current-tenant'"
+        ref="proTable"
+        row-key="session_id"
+        :columns="columns"
+        :request-api="requestTable"
+      />
+    </el-card>
+  </div>
+</template>
+
+<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 { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
+import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+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";
+
+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 columns = computed<ColumnProps[]>(() => [
+  {
+    prop: "tenant_code",
+    label: t("common.field.tenant"),
+    minWidth: 130,
+    search: isDefaultTenant.value ? { el: "select", props: { filterable: true }, order: 1 } : undefined,
+    enum: requestSessionTenantOptions
+  },
+  {
+    prop: "user_name",
+    label: t("system.base.online_session.field.user_name"),
+    minWidth: 140,
+    search: { el: "input", key: "keyword", order: 2 }
+  },
+  { prop: "client_ip", label: t("system.base.online_session.field.client_ip"), minWidth: 140 },
+  { prop: "device", label: t("system.base.online_session.field.device"), minWidth: 180 },
+  { prop: "user_agent", label: t("system.base.online_session.field.user_agent"), minWidth: 220 },
+  { prop: "issued_at", label: t("system.base.online_session.field.issued_at"), minWidth: 180 },
+  {
+    prop: "operation",
+    label: t("common.field.operation"),
+    width: 100,
+    fixed: "right",
+    cellType: "actions",
+    actions: [
+      {
+        label: t("system.base.online_session.action.revoke"),
+        type: "danger",
+        link: true,
+        icon: SwitchButton,
+        hidden: () => !BUTTONS.value["base:online-session:revoke"],
+        onClick: scope => revokeSession(scope.row as BaseSession)
+      }
+    ]
+  }
+]);
+
+/** 将租户名称映射到会话使用的租户编码，供下拉筛选与表格展示复用。 */
+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(
+    buildPageRequest<PageOnlineBaseSessionsRequest>({
+      ...(params as unknown as PageOnlineBaseSessionsRequest),
+      tenant_code: isDefaultTenant.value ? String(params.tenant_code ?? "") : ""
+    })
+  );
+  return { data: { list: response.sessions ?? [], total: response.total } };
+}
+
+/** 下线指定在线用户会话。 */
+async function revokeSession(row: BaseSession) {
+  await ElMessageBox.confirm(
+    t("system.base.online_session.confirm.revoke", { user_name: row.user_name }),
+    t("common.title.warning"),
+    { type: "warning" }
+  );
+  await defBaseSessionService.RevokeBaseSession({ session_id: row.session_id });
+  ElMessage.success(t("system.base.online_session.message.revoked"));
+  proTable.value?.getTableList();
+}
+</script>
+
+<style scoped lang="scss">
+.online-session-page {
+  min-width: 0;
+}
+</style>

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

@@ -27,7 +27,9 @@
       v-model="dialog.visible"
       ref="formDialogRef"
       :title="t(dialog.editing ? 'system.base.user.action.edit' : 'system.base.user.action.create')"
-      width="800px"
+      width="960px"
+      label-width="120px"
+      :col-span="12"
       :model="formData"
       :fields="formFields"
       :rules="rules"
@@ -400,12 +402,6 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input",
     props: { placeholder: t("common.validation.phone_required") }
   },
-  {
-    prop: "email",
-    label: t("system.base.user.field.email"),
-    component: "input",
-    props: { placeholder: t("system.base.user.placeholder.email") }
-  },
   {
     prop: "id_type",
     label: t("system.base.user.field.id_type"),
@@ -419,10 +415,19 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input",
     props: { placeholder: t("system.base.user.placeholder.id_code") }
   },
+  {
+    prop: "email",
+    label: t("system.base.user.field.email"),
+    component: "input",
+    colSpan: 24,
+    props: { placeholder: t("system.base.user.placeholder.email") }
+  },
   {
     prop: "pwd",
     label: t("system.base.user.field.password"),
     component: "password",
+    rowBreakBefore: true,
+    colSpan: 24,
     props: { placeholder: t("system.base.user.placeholder.password_optional"), showPassword: true },
     visible: model => !model.id
   },
@@ -431,9 +436,15 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.base.user.field.password_strength"),
     component: "slot",
     slotName: "passwordStrength",
+    colSpan: 24,
     visible: model => !model.id
   },
-  { prop: "gender", label: t("system.base.user.field.gender"), component: "dict", props: { code: "base_user_gender" } },
+  {
+    prop: "gender",
+    label: t("system.base.user.field.gender"),
+    component: "dict",
+    props: { code: "base_user_gender", style: { width: "100%" } }
+  },
   {
     prop: "status",
     label: t("common.field.status"),
@@ -445,6 +456,7 @@ const formFields = computed<ProFormField[]>(() => [
     prop: "remark",
     label: t("common.field.remark"),
     component: "textarea",
+    colSpan: 24,
     props: { placeholder: t("common.placeholder.remark") }
   }
 ]);