@liujitcn/kratos-admin-system 0.0.21 → 0.0.24

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

@@ -2,28 +2,28 @@
   <div class="table-box">
     <ProTable ref="proTable" row-key="id" :columns="columns" :request-api="requestBaseJobLogTable" />
 
-    <ProDialog v-model="dialog.visible" :title="t('system.jobLog.title.detail')" width="1200px" @close="handleCloseDialog">
+    <ProDialog v-model="dialog.visible" :title="t('system.base.job.log.title.detail')" width="1200px" @close="handleCloseDialog">
       <div class="detail-container">
-        <el-descriptions :title="t('system.jobLog.section.basic')" border :column="2">
-          <el-descriptions-item :label="t('system.common.field.status')">
+        <el-descriptions :title="t('system.base.job.log.section.basic')" border :column="2">
+          <el-descriptions-item :label="t('common.field.status')">
             <DictLabel v-model="detail.status" code="base_job_log_status" />
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.jobLog.field.processTime')">{{ detail.process_time }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.jobLog.field.executeTime')">{{ detail.execute_time }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.job.log.field.process_time')">{{ detail.process_time }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.job.log.field.execute_time')">{{ detail.execute_time }}</el-descriptions-item>
         </el-descriptions>
 
-        <el-descriptions :title="t('system.jobLog.section.execution')" border :column="1" class="mt-4">
-          <el-descriptions-item :label="t('system.jobLog.field.input')">
+        <el-descriptions :title="t('system.base.job.log.section.execution')" border :column="1" class="mt-4">
+          <el-descriptions-item :label="t('system.base.job.log.field.input')">
             <pre class="code-block">{{ formatJson(detail.input) }}</pre>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.jobLog.field.output')">
+          <el-descriptions-item :label="t('system.base.job.log.field.output')">
             <pre class="code-block">{{ formatJson(detail.output) }}</pre>
           </el-descriptions-item>
         </el-descriptions>
 
         <el-alert
-          v-if="detail.status === BaseJobLogStatus.FAIL"
-          :title="t('system.jobLog.field.error')"
+          v-if="detail.status === BaseJobLogStatus.BASE_JOB_LOG_STATUS_FAIL"
+          :title="t('system.base.job.log.field.error')"
           type="error"
           :description="detail.error"
           class="mt-4"
@@ -49,7 +49,7 @@ import { defBaseJobService } from "@liujitcn/kratos-admin-system/api/system/base
 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/common/v1/enum";
+import { BaseJobLogStatus } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_job";
 import { t } from "@liujitcn/kratos-admin-core";
 
 defineOptions({
@@ -79,7 +79,7 @@ function createDefaultDetail(): BaseJobLog {
     /** 错误信息 */
     error: "",
     /** 状态 */
-    status: BaseJobLogStatus.UNKNOWN_BJLS,
+    status: BaseJobLogStatus.BASE_JOB_LOG_STATUS_UNSPECIFIED,
     /** 消耗时间 */
     process_time: "",
     /** 执行时间 */
@@ -93,14 +93,14 @@ const detail = reactive<BaseJobLog>(createDefaultDetail());
 const columns = computed<ColumnProps[]>(() => [
   {
     prop: "status",
-    label: t("system.common.field.status"),
+    label: t("common.field.status"),
     minWidth: 120,
     dictCode: "base_job_log_status",
     search: { el: "select" }
   },
   {
     prop: "execute_time",
-    label: t("system.jobLog.field.executeTime"),
+    label: t("system.base.job.log.field.execute_time"),
     minWidth: 180,
     search: {
       el: "date-picker",
@@ -109,16 +109,16 @@ const columns = computed<ColumnProps[]>(() => [
         editable: false,
         class: "!w-[240px]",
         rangeSeparator: "~",
-        startPlaceholder: t("system.common.placeholder.startDate"),
-        endPlaceholder: t("system.common.placeholder.endDate"),
+        startPlaceholder: t("common.placeholder.start_date"),
+        endPlaceholder: t("common.placeholder.end_date"),
         valueFormat: "YYYY-MM-DD"
       }
     }
   },
-  { prop: "process_time", label: t("system.jobLog.field.processTimeMs"), minWidth: 130, align: "right" },
+  { prop: "process_time", label: t("system.base.job.log.field.process_time_ms"), minWidth: 130, align: "right" },
   {
     prop: "detailAction",
-    label: t("system.common.field.action"),
+    label: t("common.field.action"),
     width: 100,
     fixed: "right",
     cellType: "actions",

package/dist/package/src/views/{tool → base}/language/index.vue

@@ -12,12 +12,11 @@
     <FormDialog
       v-model="dialog.visible"
       ref="formDialogRef"
-      :title="t(dialog.editing ? 'system.language.action.edit' : 'system.language.action.create')"
+      :title="t(dialog.editing ? 'system.base.language.action.edit' : 'system.base.language.action.create')"
       width="620px"
       :model="formData"
       :fields="formFields"
       :rules="rules"
-      label-width="110px"
       @confirm="handleSubmit"
       @close="handleCloseDialog"
     />
@@ -34,7 +33,7 @@ import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog
 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 { t } from "@liujitcn/kratos-admin-core";
+import { applyLanguageConfig, defLanguageService, t } from "@liujitcn/kratos-admin-core";
 import { defBaseLanguageService, invalidateEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/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";
@@ -51,24 +50,23 @@ const formData = reactive<BaseLanguageForm>({
   language_name: "",
   native_name: "",
   sort: 100,
-  is_primary: false,
   status: Status.ENABLE
 });
 
 const rules = computed(() => ({
   language_code: [
-    { required: true, message: t("system.language.placeholder.code"), trigger: "blur" },
-    { max: 16, message: t("system.common.validation.maxLength", { field: t("system.language.field.code"), max: 16 }), trigger: "blur" }
+    { required: true, message: t("system.base.language.placeholder.code"), trigger: "blur" },
+    { max: 16, message: t("common.validation.max_length", { field: t("system.base.language.field.code"), max: 16 }), trigger: "blur" }
   ],
   language_name: [
-    { required: true, message: t("system.language.placeholder.name"), trigger: "blur" },
-    { max: 50, message: t("system.common.validation.maxLength", { field: t("system.language.field.name"), max: 50 }), trigger: "blur" }
+    { required: true, message: t("system.base.language.placeholder.name"), trigger: "blur" },
+    { max: 50, message: t("common.validation.max_length", { field: t("system.base.language.field.name"), max: 50 }), trigger: "blur" }
   ],
   native_name: [
-    { required: true, message: t("system.language.placeholder.nativeName"), trigger: "blur" },
-    { max: 50, message: t("system.common.validation.maxLength", { field: t("system.language.field.nativeName"), max: 50 }), trigger: "blur" }
+    { required: true, message: t("system.base.language.placeholder.native_name"), trigger: "blur" },
+    { max: 50, message: t("common.validation.max_length", { field: t("system.base.language.field.native_name"), max: 50 }), trigger: "blur" }
   ],
-  sort: [{ required: true, message: t("system.language.placeholder.sort"), trigger: "change" }]
+  sort: [{ required: true, message: t("system.base.language.placeholder.sort"), trigger: "change" }]
 }));
 
 const statusOptions = computed<ProFormOption[]>(() => [
@@ -77,22 +75,20 @@ const statusOptions = computed<ProFormOption[]>(() => [
 ]);
 
 const formFields = computed<ProFormField[]>(() => [
-  { prop: "language_code", label: t("system.language.field.code"), component: "input", props: { placeholder: t("system.language.placeholder.code"), disabled: dialog.editing } },
-  { prop: "language_name", label: t("system.language.field.name"), component: "input", props: { placeholder: t("system.language.placeholder.name") } },
-  { prop: "native_name", label: t("system.language.field.nativeName"), component: "input", props: { placeholder: t("system.language.placeholder.nativeName") } },
-  { prop: "sort", label: t("system.language.field.sort"), component: "input-number", props: { min: 0, controlsPosition: "right", style: { width: "100%" } } },
-  { prop: "is_primary", label: t("system.language.field.primary"), component: "switch" },
-  { prop: "status", label: t("system.language.field.status"), component: "radio-group", options: statusOptions.value }
+  { prop: "language_code", label: t("system.base.language.field.code"), component: "input", props: { placeholder: t("system.base.language.placeholder.code"), disabled: dialog.editing } },
+  { prop: "language_name", label: t("system.base.language.field.name"), component: "input", props: { placeholder: t("system.base.language.placeholder.name") } },
+  { prop: "native_name", label: t("system.base.language.field.native_name"), component: "input", props: { placeholder: t("system.base.language.placeholder.native_name") } },
+  { prop: "sort", label: t("system.base.language.field.sort"), component: "input-number", props: { min: 0, controlsPosition: "right", style: { width: "100%" } } },
+  { prop: "status", label: t("system.base.language.field.status"), component: "radio-group", options: statusOptions.value }
 ]);
 
 const columns = computed<ColumnProps[]>(() => [
-  { prop: "native_name", label: t("system.language.field.nativeName"), minWidth: 130 },
-  { type: "index", label: t("system.common.field.index"), width: 70 },
-  { prop: "language_name", label: t("system.language.field.name"), minWidth: 130, search: { el: "input" } },
-  { prop: "language_code", label: t("system.language.field.code"), minWidth: 120, search: { el: "input" } },
+  { prop: "native_name", label: t("system.base.language.field.native_name"), minWidth: 130 },
+  { prop: "language_name", label: t("system.base.language.field.name"), minWidth: 130, search: { el: "input" } },
+  { prop: "language_code", label: t("system.base.language.field.code"), minWidth: 120, search: { el: "input" } },
   {
     prop: "is_primary",
-    label: t("system.language.field.primary"),
+    label: t("system.base.language.field.primary"),
     minWidth: 100,
     cellType: "status",
     statusProps: {
@@ -100,13 +96,13 @@ const columns = computed<ColumnProps[]>(() => [
       inactiveValue: false,
       activeText: t("common.status.enabled"),
       inactiveText: t("common.status.disabled"),
-      disabled: () => !BUTTONS.value["tool:language:update"],
+      disabled: () => !BUTTONS.value["base:language:primary"],
       beforeChange: scope => handleBeforeSetPrimary(scope.row as BaseLanguage)
     }
   },
   {
     prop: "status",
-    label: t("system.language.field.status"),
+    label: t("system.base.language.field.status"),
     minWidth: 100,
     search: { el: "select" },
     cellType: "status",
@@ -115,28 +111,28 @@ const columns = computed<ColumnProps[]>(() => [
       inactiveValue: Status.DISABLE,
       activeText: t("common.status.enabled"),
       inactiveText: t("common.status.disabled"),
-      disabled: () => !BUTTONS.value["tool:language:status"],
+      disabled: () => !BUTTONS.value["base:language:status"],
       beforeChange: scope => handleBeforeSetStatus(scope.row as BaseLanguage)
     }
   },
-  { prop: "sort", label: t("system.language.field.sort"), width: 80 },
-  { prop: "created_at", label: t("system.common.field.createdAt"), minWidth: 180 },
+  { prop: "sort", label: t("system.base.language.field.sort"), width: 80 },
+  { prop: "created_at", label: t("common.field.created_at"), minWidth: 180 },
   {
     prop: "operation",
-    label: t("system.common.field.operation"),
+    label: t("common.field.operation"),
     width: 150,
     fixed: "right",
     cellType: "actions",
     actions: [
-      { label: t("common.action.edit"), type: "primary", link: true, icon: EditPen, hidden: () => !BUTTONS.value["tool:language:update"], onClick: scope => handleOpenDialog((scope.row as BaseLanguage).id) },
-      { label: t("common.action.delete"), type: "danger", link: true, icon: Delete, hidden: () => !BUTTONS.value["tool:language:delete"], onClick: scope => handleDelete(scope.row as BaseLanguage) }
+      { label: t("common.action.edit"), type: "primary", link: true, icon: EditPen, hidden: () => !BUTTONS.value["base:language:update"], onClick: scope => handleOpenDialog((scope.row as BaseLanguage).id) },
+      { label: t("common.action.delete"), type: "danger", link: true, icon: Delete, hidden: () => !BUTTONS.value["base:language:delete"], onClick: scope => handleDelete(scope.row as BaseLanguage) }
     ]
   }
 ]);
 
 const headerActions = computed<HeaderActionProps[]>(() => [
-  { label: t("common.action.create"), type: "success", icon: CirclePlus, hidden: () => !BUTTONS.value["tool:language:create"], onClick: () => handleOpenDialog() },
-  { label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["tool:language:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => handleDelete(scope.selectedList as BaseLanguage[]) }
+  { label: t("common.action.create"), type: "success", icon: CirclePlus, hidden: () => !BUTTONS.value["base:language:create"], onClick: () => handleOpenDialog() },
+  { label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["base:language:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => handleDelete(scope.selectedList as BaseLanguage[]) }
 ]);
 
 /** 请求语言分页列表。 */
@@ -164,7 +160,7 @@ function handleCloseDialog() {
 function resetForm() {
   formDialogRef.value?.resetFields();
   formDialogRef.value?.clearValidate();
-  Object.assign(formData, { id: 0, language_code: "", language_name: "", native_name: "", sort: 100, is_primary: false, status: Status.ENABLE });
+  Object.assign(formData, { id: 0, language_code: "", language_name: "", native_name: "", sort: 100, status: Status.ENABLE });
 }
 
 /** 提交语言表单。 */
@@ -177,7 +173,8 @@ function handleSubmit() {
       : defBaseLanguageService.CreateBaseLanguage({ base_language: payload });
     request.then(() => {
       invalidateEnabledBaseLanguages();
-      ElMessage.success(t(payload.id ? "system.common.message.updateSuccess" : "system.common.message.createSuccess", { resource: t("system.language.resource") }));
+      void refreshAdminLanguageConfig();
+      ElMessage.success(t(payload.id ? "common.message.update_success" : "common.message.create_success", { resource: t("system.base.language.resource") }));
       handleCloseDialog();
       proTable.value?.getTableList();
     });
@@ -187,11 +184,11 @@ function handleSubmit() {
 /** 设置语言状态前保护主语言。 */
 function handleBeforeSetStatus(row: BaseLanguage) {
   if (row.is_primary && row.status === Status.ENABLE) {
-    ElMessage.warning(t("system.language.message.primaryCannotDisable"));
+    ElMessage.warning(t("system.base.language.message.primary_cannot_disable"));
     return Promise.resolve(false);
   }
   return ElMessageBox.confirm(
-    t("system.language.message.confirmStatus", { action: row.status === Status.ENABLE ? t("common.status.disabled") : t("common.status.enabled"), name: row.native_name }),
+    t("system.base.language.message.confirm_status", { action: row.status === Status.ENABLE ? t("common.status.disabled") : t("common.status.enabled"), name: row.native_name }),
     t("common.title.warning"),
     { type: "warning", confirmButtonText: t("common.action.confirm"), cancelButtonText: t("common.action.cancel") }
   ).then(
@@ -200,6 +197,7 @@ function handleBeforeSetStatus(row: BaseLanguage) {
         .SetBaseLanguageStatus({ id: row.id, status: row.status === Status.ENABLE ? Status.DISABLE : Status.ENABLE })
         .then(() => {
           invalidateEnabledBaseLanguages();
+          void refreshAdminLanguageConfig();
           return true;
         }),
     () => false
@@ -210,20 +208,16 @@ function handleBeforeSetStatus(row: BaseLanguage) {
 function handleBeforeSetPrimary(row: BaseLanguage) {
   if (row.is_primary) return Promise.resolve(false);
   return ElMessageBox.confirm(
-    t("system.language.message.confirmPrimary", { name: row.native_name }),
+    t("system.base.language.message.confirm_primary", { name: row.native_name }),
     t("common.title.warning"),
     { type: "warning", confirmButtonText: t("common.action.confirm"), cancelButtonText: t("common.action.cancel") }
   ).then(
     () =>
       defBaseLanguageService
-        .UpdateBaseLanguage({
-          base_language: {
-            ...row,
-            is_primary: true
-          }
-        })
+        .SetBaseLanguagePrimary({ id: row.id })
         .then(() => {
           invalidateEnabledBaseLanguages();
+          void refreshAdminLanguageConfig();
           proTable.value?.getTableList();
           return true;
         }),
@@ -235,22 +229,32 @@ function handleBeforeSetPrimary(row: BaseLanguage) {
 function handleDelete(selected?: BaseLanguage | BaseLanguage[] | number | string | Array<number | string>) {
   const rows = Array.isArray(selected) ? (selected.filter(item => typeof item === "object") as BaseLanguage[]) : selected && typeof selected === "object" ? [selected] : [];
   if (rows.some(item => item.is_primary)) {
-    ElMessage.warning(t("system.language.message.primaryCannotDelete"));
+    ElMessage.warning(t("system.base.language.message.primary_cannot_delete"));
     return;
   }
   const ids = (rows.length ? rows.map(item => item.id) : normalizeSelectedIds(selected as number | string | Array<number | string>)).join(",");
   if (!ids) {
-    ElMessage.warning(t("system.common.message.selectDeleteItem"));
+    ElMessage.warning(t("common.message.select_delete_item"));
     return;
   }
-  ElMessageBox.confirm(t("system.language.message.confirmDelete", { name: rows.length === 1 ? rows[0].native_name : ids }), t("common.title.warning"), {
+  ElMessageBox.confirm(t("system.base.language.message.confirm_delete", { name: rows.length === 1 ? rows[0].native_name : ids }), t("common.title.warning"), {
     type: "warning",
     confirmButtonText: t("common.action.confirm"),
     cancelButtonText: t("common.action.cancel")
   }).then(() => defBaseLanguageService.DeleteBaseLanguage({ id: ids })).then(() => {
     invalidateEnabledBaseLanguages();
-    ElMessage.success(t("system.common.message.deleteSuccess", { resource: t("system.language.resource") }));
+    void refreshAdminLanguageConfig();
+    ElMessage.success(t("common.message.delete_success", { resource: t("system.base.language.resource") }));
     proTable.value?.getTableList();
   });
 }
+
+/** refreshAdminLanguageConfig 刷新核心语言切换器的运行时配置。 */
+async function refreshAdminLanguageConfig() {
+  try {
+    applyLanguageConfig(await defLanguageService.OptionLanguage({}));
+  } catch {
+    // 语言管理操作成功但公共语言查询失败时，保留当前切换器配置。
+  }
+}
 </script>

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

@@ -2,83 +2,83 @@
   <div class="table-box">
     <ProTable ref="proTable" row-key="id" :columns="columns" :request-api="requestBaseLogTable" />
 
-    <ProDialog v-model="dialog.visible" :title="t('system.log.title.detail')" width="1500px" @close="handleCloseDialog">
+    <ProDialog v-model="dialog.visible" :title="t('system.base.log.title.detail')" width="1500px" @close="handleCloseDialog">
       <div class="detail-container">
-        <el-descriptions :title="t('system.log.section.basic')" border :column="2">
-          <el-descriptions-item :label="t('system.log.field.result')">
+        <el-descriptions :title="t('system.base.log.section.basic')" border :column="2">
+          <el-descriptions-item :label="t('system.base.log.field.result')">
             <el-tag :type="detail.is_success ? 'success' : 'danger'" effect="light">
-              {{ t(detail.is_success ? "system.log.status.success" : "system.log.status.failed") }}
+              {{ t(detail.is_success ? "system.base.log.status.success" : "system.base.log.status.failed") }}
             </el-tag>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.statusCode')">
+          <el-descriptions-item :label="t('system.base.log.field.status_code')">
             <el-tag :type="statusCodeColor" effect="light">{{ detail.status_code || "--" }}</el-tag>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.costTime')">{{ detail.cost_time || "--" }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.requestTime')">{{
+          <el-descriptions-item :label="t('system.base.log.field.cost_time')">{{ detail.cost_time || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.request_time')">{{
             detail.request_time || "--"
           }}</el-descriptions-item>
         </el-descriptions>
 
         <el-descriptions
-          :title="t('system.log.section.request')"
+          :title="t('system.base.log.section.request')"
           border
           :column="2"
           direction="vertical"
           class="mt-4 compact-descriptions"
         >
-          <el-descriptions-item :label="t('system.log.field.requestId')">{{ detail.request_id || "--" }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.operation')">
+          <el-descriptions-item :label="t('system.base.log.field.request_id')">{{ detail.request_id || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.operation')">
             <el-tag effect="plain">{{ detail.operation || "--" }}</el-tag>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.method')">
+          <el-descriptions-item :label="t('system.base.log.field.method')">
             <el-tag effect="plain">{{ detail.method || "--" }}</el-tag>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.path')">{{ detail.path || "--" }}</el-descriptions-item>
-          <el-descriptions-item v-if="detail.request_uri" :label="t('system.log.field.requestUri')" :span="2">{{
+          <el-descriptions-item :label="t('system.base.log.field.path')">{{ detail.path || "--" }}</el-descriptions-item>
+          <el-descriptions-item v-if="detail.request_uri" :label="t('system.base.log.field.request_uri')" :span="2">{{
             detail.request_uri
           }}</el-descriptions-item>
-          <el-descriptions-item v-if="detail.referer" :label="t('system.log.field.referer')" :span="2">{{
+          <el-descriptions-item v-if="detail.referer" :label="t('system.base.log.field.referer')" :span="2">{{
             detail.referer
           }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.requestHeader')" :span="2">
+          <el-descriptions-item :label="t('system.base.log.field.request_header')" :span="2">
             <pre class="code-block">{{ formatPayload(detail.request_header) }}</pre>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.requestBody')" :span="2">
+          <el-descriptions-item :label="t('system.base.log.field.request_body')" :span="2">
             <pre class="code-block">{{ formatPayload(detail.request_body) }}</pre>
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.requestResult')" :span="2">
+          <el-descriptions-item :label="t('system.base.log.field.request_result')" :span="2">
             <pre class="code-block">{{ formatPayload(detail.response) }}</pre>
           </el-descriptions-item>
         </el-descriptions>
 
-        <el-descriptions :title="t('system.log.section.user')" border :column="2" class="mt-4">
-          <el-descriptions-item :label="t('system.log.field.userId')">{{ detail.user_id || "--" }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.userName')">{{ detail.user_name || "--" }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.clientIp')">{{ detail.client_ip || "--" }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.location')">{{ detail.location || "--" }}</el-descriptions-item>
+        <el-descriptions :title="t('system.base.log.section.user')" border :column="2" class="mt-4">
+          <el-descriptions-item :label="t('system.base.log.field.user_id')">{{ detail.user_id || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.user_name')">{{ detail.user_name || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.client_ip')">{{ detail.client_ip || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.location')">{{ detail.location || "--" }}</el-descriptions-item>
         </el-descriptions>
 
         <el-descriptions
-          :title="t('system.log.section.client')"
+          :title="t('system.base.log.section.client')"
           border
           :column="2"
           direction="vertical"
           class="mt-4 compact-descriptions"
         >
-          <el-descriptions-item :label="t('system.log.field.browser')">
+          <el-descriptions-item :label="t('system.base.log.field.browser')">
             {{ [detail.browser_name, detail.browser_version].filter(Boolean).join(" ") || "--" }}
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.os')">
+          <el-descriptions-item :label="t('system.base.log.field.os')">
             {{ [detail.os_name, detail.os_version].filter(Boolean).join(" ") || "--" }}
           </el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.clientName')">{{ detail.client_name || "--" }}</el-descriptions-item>
-          <el-descriptions-item :label="t('system.log.field.clientId')">{{ detail.client_id || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.client_name')">{{ detail.client_name || "--" }}</el-descriptions-item>
+          <el-descriptions-item :label="t('system.base.log.field.client_id')">{{ detail.client_id || "--" }}</el-descriptions-item>
           <el-descriptions-item label="User Agent" :span="2">{{ detail.user_agent || "--" }}</el-descriptions-item>
         </el-descriptions>
 
         <el-alert
           v-if="!detail.is_success"
-          :title="t('system.log.field.reason')"
+          :title="t('system.base.log.field.reason')"
           type="error"
           :description="detail.reason"
           class="mt-4"
@@ -220,19 +220,19 @@ function formatPayload(value: string): string {
 const columns = computed<ColumnProps[]>(() => [
   {
     prop: "operation",
-    label: t("system.log.field.operation"),
+    label: t("system.base.log.field.operation"),
     minWidth: 240,
     search: { el: "input" }
   },
   {
     prop: "status_code",
-    label: t("system.log.field.statusCode"),
+    label: t("system.base.log.field.status_code"),
     minWidth: 100,
     search: { el: "input-number", props: { min: 0, controlsPosition: "right" } }
   },
   {
     prop: "request_time",
-    label: t("system.log.field.requestTime"),
+    label: t("system.base.log.field.request_time"),
     minWidth: 140,
     search: {
       el: "date-picker",
@@ -241,21 +241,21 @@ const columns = computed<ColumnProps[]>(() => [
         editable: false,
         class: "!w-[240px]",
         rangeSeparator: "~",
-        startPlaceholder: t("system.common.placeholder.startDate"),
-        endPlaceholder: t("system.common.placeholder.endDate"),
+        startPlaceholder: t("common.placeholder.start_date"),
+        endPlaceholder: t("common.placeholder.end_date"),
         valueFormat: "YYYY-MM-DD"
       }
     }
   },
-  { prop: "user_name", label: t("system.log.field.userName"), minWidth: 80 },
-  { prop: "client_ip", label: t("system.log.field.clientIp"), minWidth: 80 },
-  { prop: "location", label: t("system.log.field.location"), minWidth: 80 },
-  { prop: "browser_name", label: t("system.log.field.browser"), minWidth: 80 },
-  { prop: "os_name", label: t("system.log.field.os"), minWidth: 80 },
-  { prop: "cost_time", label: t("system.log.field.costTime"), minWidth: 100, align: "right" },
+  { prop: "user_name", label: t("system.base.log.field.user_name"), minWidth: 80 },
+  { prop: "client_ip", label: t("system.base.log.field.client_ip"), minWidth: 80 },
+  { prop: "location", label: t("system.base.log.field.location"), minWidth: 80 },
+  { prop: "browser_name", label: t("system.base.log.field.browser"), minWidth: 80 },
+  { prop: "os_name", label: t("system.base.log.field.os"), minWidth: 80 },
+  { prop: "cost_time", label: t("system.base.log.field.cost_time"), minWidth: 100, align: "right" },
   {
     prop: "detailAction",
-    label: t("system.common.field.action"),
+    label: t("common.field.action"),
     width: 100,
     fixed: "right",
     cellType: "actions",