@liujitcn/kratos-admin-system 0.0.29 → 0.0.32

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

@@ -13,7 +13,15 @@
       :rules="rules"
       @confirm="handleSubmit"
       @close="handleCloseDialog"
-    />
+    >
+      <template #i18ns>
+        <DynamicI18nEditor
+          v-model="i18nValues"
+          :source="formData.name"
+          :maxlength="50"
+        />
+      </template>
+    </FormDialog>
   </div>
 </template>
 
@@ -31,7 +39,8 @@ import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
-import { defBaseJobService } from "@liujitcn/kratos-admin-system/api/system/base_job";
+import { defBaseJobService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_job";
+import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
 import type {
   BaseJob,
   BaseJobArgs,
@@ -40,8 +49,17 @@ import type {
 } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_job";
 import router, { navigateTo } from "@liujitcn/kratos-admin-core/navigation";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
+import { I18nTargetType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
+import DynamicI18nCell from "@liujitcn/kratos-admin-system/components/DynamicI18nCell.vue";
+import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/DynamicI18nEditor.vue";
+import {
+  normalizeDynamicI18ns,
+  serializeDynamicI18ns,
+  type DynamicI18nRecord,
+  type DynamicI18nValue
+} from "@liujitcn/kratos-admin-system/components/dynamicI18n";
 
 defineOptions({
   name: "BaseJob",
@@ -51,6 +69,7 @@ defineOptions({
 const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
+const i18nValues = ref<DynamicI18nValue[]>(normalizeDynamicI18ns(undefined));
 
 const dialog = reactive({
   editing: false,
@@ -69,7 +88,9 @@ const formData = reactive<BaseJobForm>({
   /** cron表达式 */
   cron_expression: "",
   /** 状态 */
-  status: Status.STATUS_ENABLE
+  status: Status.STATUS_ENABLE,
+  /** 定时任务名称多语言翻译。 */
+  i18ns: []
 });
 
 const rules = computed(() => ({
@@ -144,6 +165,17 @@ function renderArgsCell(scope: RenderScope<BaseJob>) {
   );
 }
 
+/** 渲染定时任务名称翻译预览。 */
+function renderJobNameCell(scope: RenderScope<BaseJob>) {
+  const row = scope.row;
+  return h(DynamicI18nCell, {
+    source: row.name,
+    targetType: I18nTargetType.I18N_TARGET_TYPE_BASE_JOB_NAME,
+    targetId: row.id,
+    i18ns: row.i18ns
+  });
+}
+
 /**
  * 渲染定时任务操作列。
  */
@@ -270,6 +302,13 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input",
     props: { placeholder: t("system.base.job.placeholder.name") }
   },
+  {
+    prop: "i18ns",
+    label: t("system.base.i18n.field.i18ns"),
+    component: "slot",
+    slotName: "i18ns",
+    colSpan: 24
+  },
   {
     prop: "invoke_target",
     label: t("system.base.job.field.invoke_target"),
@@ -298,7 +337,14 @@ const formFields = computed<ProFormField[]>(() => [
 /** 定时任务表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  { prop: "name", label: t("system.base.job.field.name"), minWidth: 140, search: { el: "input" } },
+  {
+    prop: "name",
+    label: t("system.base.job.field.name"),
+    minWidth: 140,
+    search: { el: "input" },
+    showOverflowTooltip: false,
+    render: scope => renderJobNameCell(scope as unknown as RenderScope<BaseJob>)
+  },
   { prop: "invoke_target", label: t("system.base.job.field.invoke_target"), minWidth: 180, search: { el: "input" } },
   {
     prop: "args",
@@ -357,6 +403,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
  * 请求定时任务列表，并由 ProTable 统一维护分页与搜索参数。
  */
 async function requestBaseJobTable(params: PageBaseJobRequest) {
+  await loadEnabledBaseLanguages();
   const data = await defBaseJobService.PageBaseJob(buildPageRequest(params));
   return { data: { list: data.base_jobs ?? [], total: data.total } };
 }
@@ -371,15 +418,16 @@ function refreshTable() {
 /**
  * 打开定时任务弹窗。
  */
-function handleOpenDialog(jobId?: number) {
+async function handleOpenDialog(jobId?: number) {
+  await loadEnabledBaseLanguages();
   resetForm();
   dialog.editing = Boolean(jobId);
   dialog.visible = true;
   if (!jobId) return;
 
-  defBaseJobService.GetBaseJob({ id: jobId }).then(data => {
-    Object.assign(formData, data);
-  });
+  const data = await defBaseJobService.GetBaseJob({ id: jobId });
+  Object.assign(formData, data);
+	i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
 }
 
 /**
@@ -402,6 +450,8 @@ function resetForm() {
   formData.args = [];
   formData.cron_expression = "";
   formData.status = Status.STATUS_ENABLE;
+  formData.i18ns = [];
+	i18nValues.value = normalizeDynamicI18ns(undefined);
 }
 
 /**
@@ -412,6 +462,11 @@ function handleSubmit() {
     if (!valid) return;
 
     const submitData = JSON.parse(JSON.stringify(formData)) as BaseJobForm;
+    submitData.i18ns = serializeDynamicI18ns(
+      i18nValues.value,
+      I18nTargetType.I18N_TARGET_TYPE_BASE_JOB_NAME,
+      submitData.id
+    );
     const request = submitData.id
       ? defBaseJobService.UpdateBaseJob({ base_job: submitData })
       : defBaseJobService.CreateBaseJob({ base_job: submitData });

package/dist/package/src/views/base/job/log.vue

@@ -45,11 +45,12 @@ import { InfoFilled } from "@element-plus/icons-vue";
 import type { ColumnProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
 import ProDialog from "@liujitcn/kratos-admin-core/components/Dialog/ProDialog.vue";
-import { defBaseJobService } from "@liujitcn/kratos-admin-system/api/system/base_job";
+import { defBaseJobService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_job";
+import { defBaseJobLogService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_job_log";
 import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
 import { formatJson } from "@liujitcn/kratos-admin-core/format";
-import type { BaseJobLog, PageBaseJobLogRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_job";
-import { BaseJobLogStatus } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_job";
+import type { BaseJobLog, PageBaseJobLogRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_job_log";
+import { BaseJobLogStatus } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_job_log";
 import { t } from "@liujitcn/kratos-admin-core";
 
 defineOptions({
@@ -59,7 +60,7 @@ defineOptions({
 
 const route = useRoute();
 const proTable = ref<ProTableInstance>();
-const jobId = ref(Number(route.query.jobId ?? 0));
+const initialJobID = Number(route.query.jobId ?? 0);
 
 const dialog = reactive({
   visible: false
@@ -91,6 +92,18 @@ const detail = reactive<BaseJobLog>(createDefaultDetail());
 
 /** 定时任务日志表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
+  {
+    prop: "job_id",
+    label: t("system.base.job.field.name"),
+    minWidth: 180,
+    search: {
+      el: "select",
+      defaultValue: initialJobID > 0 ? initialJobID : undefined,
+      props: { clearable: true, filterable: true },
+      order: 1
+    },
+    enum: requestBaseJobOptions
+  },
   {
     prop: "status",
     label: t("common.field.status"),
@@ -137,16 +150,30 @@ const columns = computed<ColumnProps[]>(() => [
 watch(
   () => route.query.jobId,
   value => {
-    jobId.value = Number(value ?? 0);
-    proTable.value?.search();
+    const nextJobID = Number(value ?? 0);
+    if (!proTable.value) return;
+    if (nextJobID > 0) {
+      proTable.value.searchParam.job_id = nextJobID;
+      proTable.value.searchInitParam.job_id = nextJobID;
+    } else {
+      delete proTable.value.searchParam.job_id;
+      delete proTable.value.searchInitParam.job_id;
+    }
+    proTable.value.search();
   }
 );
 
+/** 请求定时任务筛选选项。 */
+async function requestBaseJobOptions() {
+  const data = await defBaseJobService.OptionBaseJob({});
+  return { data: data.list ?? [] };
+}
+
 /**
- * 请求定时任务日志列表，并补充当前任务 ID。
+ * 请求定时任务日志列表。
  */
 async function requestBaseJobLogTable(params: PageBaseJobLogRequest) {
-  const data = await defBaseJobService.PageBaseJobLog({ ...buildPageRequest(params), job_id: jobId.value });
+  const data = await defBaseJobLogService.PageBaseJobLog(buildPageRequest(params));
   return { data: { list: data.base_job_logs ?? [], total: data.total } };
 }
 
@@ -158,7 +185,7 @@ function handleOpenDialog(logId?: number) {
   dialog.visible = true;
   if (!logId) return;
 
-  defBaseJobService.GetBaseJobLog({ id: logId }).then(data => {
+  defBaseJobLogService.GetBaseJobLog({ id: logId }).then(data => {
     Object.assign(detail, data);
   });
 }
@@ -185,7 +212,7 @@ function resetDetail() {
   padding: 20px;
   overflow-y: auto;
   background: #ffffff;
-  border-radius: 4px;
+  border-radius: var(--admin-page-radius);
 }
 .mt-4 {
   margin-top: 16px;
@@ -196,6 +223,6 @@ function resetDetail() {
   margin: 0;
   overflow: auto;
   background: #f5f7fa;
-  border-radius: 4px;
+  border-radius: var(--admin-page-radius);
 }
 </style>

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

@@ -34,7 +34,7 @@ import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/co
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { applyLanguageConfig, defLanguageService, t } from "@liujitcn/kratos-admin-core";
-import { defBaseLanguageService, invalidateEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/base_language";
+import { defBaseLanguageService, invalidateEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
 import type { BaseLanguage, BaseLanguageForm, PageBaseLanguageRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_language";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 
@@ -138,7 +138,8 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 /** 请求语言分页列表。 */
 async function requestBaseLanguageTable(params: PageBaseLanguageRequest) {
   const data = await defBaseLanguageService.PageBaseLanguage(buildPageRequest(params));
-  return { data: { list: data.base_languages ?? [], total: data.total } };
+  const list = (data.base_languages ?? []).map(item => ({ ...item, is_primary: item.is_primary ?? false }));
+  return { data: { list, total: data.total } };
 }
 
 /** 打开语言编辑弹窗。 */

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

@@ -0,0 +1,96 @@
+<template>
+  <LogTable ref="page" :config="config" />
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import type { ColumnProps } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import { t } from "@liujitcn/kratos-admin-core";
+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 { 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, PageBaseLoginLogRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_login_log";
+
+defineOptions({ name: "BaseLoginLog", inheritAttrs: false });
+
+const page = ref<InstanceType<typeof LogTable>>();
+const resultOptions = computed(() =>
+  createLogEnumOptions([
+    [BaseLogResult.BASE_LOG_RESULT_UNSPECIFIED, t("system.base.log.result.unspecified")],
+    [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 loginTypeOptions = computed(() =>
+  createLogEnumOptions([
+    [BaseLoginLogType.BASE_LOGIN_LOG_TYPE_UNSPECIFIED, t("system.base.log.login_type.unspecified")],
+    [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 columns = computed<ColumnProps[]>(() => [
+  { prop: "user_name", label: t("system.base.log.field.user_name"), minWidth: 130 },
+  { prop: "tenant_code", label: t("system.base.log.field.tenant_code"), minWidth: 120 },
+  {
+    prop: "login_type",
+    label: t("system.base.log.field.login_type"),
+    minWidth: 130,
+    search: { el: "select", enum: loginTypeOptions.value },
+    render: scope => logEnumLabel(loginTypeOptions.value, (scope.row as BaseLoginLog).login_type)
+  },
+  {
+    prop: "result",
+    label: t("system.base.log.field.result"),
+    minWidth: 110,
+    search: { el: "select", enum: resultOptions.value },
+    render: scope => logEnumLabel(resultOptions.value, (scope.row as BaseLoginLog).result)
+  },
+  { prop: "client_ip", label: t("system.base.log.field.client_ip"), minWidth: 140 },
+  { prop: "occurred_at", label: t("system.base.log.field.occurred_at"), minWidth: 190, search: logDateSearch(t) },
+  logDetailColumn(t("common.action.view"), id => page.value?.handleOpenDialog(id))
+]);
+
+const config = computed<LogTableConfig>(() => ({
+  columns: columns.value,
+  detailTitle: t("system.base.log.login.title.detail"),
+  closeText: t("common.action.close"),
+  trace: requestLogTrace,
+  detailFields: [
+    { key: "id", label: t("system.base.log.field.id") },
+    { key: "tenant_id", label: t("system.base.log.field.tenant_id") },
+    { key: "tenant_code", label: t("system.base.log.field.tenant_code") },
+    { key: "user_id", label: t("system.base.log.field.user_id") },
+    { key: "user_name", label: t("system.base.log.field.user_name") },
+    { key: "login_type", label: t("system.base.log.field.login_type"), enum: loginTypeOptions.value },
+    { key: "result", label: t("system.base.log.field.result"), enum: resultOptions.value },
+    { key: "reason_code", label: t("system.base.log.field.reason_code") },
+    { key: "reason", label: t("system.base.log.field.reason"), span: 2 },
+    { key: "client_ip", label: t("system.base.log.field.client_ip") },
+    { key: "device_id", label: t("system.base.log.field.device_id") },
+    { key: "user_agent", label: t("system.base.log.field.user_agent"), span: 2 },
+    { key: "request_id", label: t("system.base.log.field.request_id") },
+    { key: "trace_id", label: t("system.base.log.field.trace_id") },
+    { key: "occurred_at", label: t("system.base.log.field.occurred_at") },
+    { key: "created_at", label: t("system.base.log.field.created_at") }
+  ],
+  request: requestTable,
+  get: getDetail
+}));
+
+async function requestTable(params: Record<string, unknown>) {
+  const response = await defBaseLoginLogService.PageBaseLoginLog(buildPageRequest(params as unknown as PageBaseLoginLogRequest));
+  return { list: response.base_login_logs as unknown as Record<string, unknown>[], total: response.total };
+}
+
+async function getDetail(id: string) {
+  return (await defBaseLoginLogService.GetBaseLoginLog({ id })) as unknown as Record<string, unknown>;
+}
+</script>

package/dist/package/src/views/base/login-policy/format.ts

@@ -0,0 +1,4 @@
+/** formatLoginPolicyList 将登录策略列表格式化为表单文本。 */
+export function formatLoginPolicyList(value: string[] | undefined, separator: string): string {
+  return (value ?? []).join(separator);
+}