@liujitcn/kratos-admin-system 0.0.49 → 0.0.51

package/dist/package/src/views/base/i18n-custom/index.vue

@@ -0,0 +1,321 @@
+<!-- 国际化自定义翻译 -->
+<template>
+  <div class="table-box">
+    <ProTable
+      ref="proTable"
+      row-key="id"
+      :columns="columns"
+      :header-actions="headerActions"
+      :request-api="requestBaseI18nCustomTable"
+    />
+
+    <FormDialog
+      v-model="dialog.visible"
+      ref="formDialogRef"
+      :title="t(dialog.editing ? 'system.base.i18n_custom.action.edit' : 'system.base.i18n_custom.action.create')"
+      width="680px"
+      :model="formData"
+      :fields="formFields"
+      :rules="rules"
+      @confirm="handleSubmit"
+      @close="handleCloseDialog"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
+import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
+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 {
+  getCurrentLocale,
+  getDefaultLocaleText,
+  normalizeLocale,
+  refreshAdminRuntimeConfig,
+  t
+} from "@liujitcn/kratos-admin-core";
+import { defBaseI18nCustomService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_i18n_custom";
+import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
+import type {
+  BaseI18nCustom,
+  BaseI18nCustomForm,
+  PageBaseI18nCustomRequest
+} from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n_custom";
+import { BaseConfigSite } from "@liujitcn/kratos-admin-system/rpc/base/v1/config";
+import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
+
+defineOptions({ name: "BaseI18nCustom", inheritAttrs: false });
+
+const { BUTTONS } = useAuthButtons();
+const proTable = ref<ProTableInstance>();
+const formDialogRef = ref<InstanceType<typeof FormDialog>>();
+const enabledLanguages = ref<Array<{ language_code: string; native_name?: string; language_name?: string }>>([]);
+const dialog = reactive({ editing: false, visible: false });
+const formData = reactive<BaseI18nCustomForm>({
+  id: 0,
+  site: BaseConfigSite.BASE_CONFIG_SITE_ADMIN,
+  key: "",
+  locale: getCurrentLocale(),
+  value: "",
+  status: Status.STATUS_ENABLE,
+  remark: ""
+});
+
+const siteOptions = computed<ProFormOption[]>(() => [
+  { label: t("system.base.i18n_custom.site.system"), value: BaseConfigSite.BASE_CONFIG_SITE_SYSTEM },
+  { label: t("system.base.i18n_custom.site.admin"), value: BaseConfigSite.BASE_CONFIG_SITE_ADMIN },
+  { label: t("system.base.i18n_custom.site.app"), value: BaseConfigSite.BASE_CONFIG_SITE_APP }
+]);
+
+const localeOptions = computed<ProFormOption[]>(() =>
+  enabledLanguages.value.map(item => ({
+    label: item.native_name || item.language_name || item.language_code,
+    value: item.language_code
+  }))
+);
+
+const statusOptions = computed<ProFormOption[]>(() => [
+  { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
+  { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
+]);
+
+const rules = computed(() => ({
+  site: [{ required: true, message: t("system.base.i18n_custom.placeholder.site"), trigger: "change" }],
+  key: [{ required: true, message: t("system.base.i18n_custom.placeholder.key"), trigger: "blur" }],
+  locale: [{ required: true, message: t("system.base.i18n_custom.placeholder.locale"), trigger: "change" }],
+  value: [{ required: true, message: t("system.base.i18n_custom.placeholder.value"), trigger: "blur" }]
+}));
+
+const formFields = computed<ProFormField[]>(() => [
+  {
+    prop: "site",
+    label: t("system.base.i18n_custom.field.site"),
+    component: "select",
+    options: siteOptions.value,
+    props: { disabled: dialog.editing }
+  },
+  {
+    prop: "key",
+    label: t("system.base.i18n_custom.field.key"),
+    component: "input",
+    props: { maxlength: 255, placeholder: t("system.base.i18n_custom.placeholder.key"), disabled: dialog.editing }
+  },
+  {
+    prop: "locale",
+    label: t("system.base.i18n_custom.field.locale"),
+    component: "select",
+    options: localeOptions.value,
+    props: { filterable: true, placeholder: t("system.base.i18n_custom.placeholder.locale"), disabled: dialog.editing }
+  },
+  {
+    prop: "value",
+    label: t("system.base.i18n_custom.field.value"),
+    component: "input",
+    props: { type: "textarea", rows: 4, maxlength: 10000, showWordLimit: true, placeholder: t("system.base.i18n_custom.placeholder.value") }
+  },
+  { prop: "status", label: t("system.base.i18n_custom.field.status"), component: "radio-group", options: statusOptions.value },
+  {
+    prop: "remark",
+    label: t("system.base.i18n_custom.field.remark"),
+    component: "input",
+    props: { maxlength: 255, placeholder: t("system.base.i18n_custom.placeholder.remark") }
+  }
+]);
+
+const columns = computed<ColumnProps[]>(() => [
+  { type: "selection", width: 55 },
+  { prop: "key", label: t("system.base.i18n_custom.field.key"), minWidth: 250, search: { el: "input" } },
+  {
+    prop: "site",
+    label: t("system.base.i18n_custom.field.site"),
+    width: 110,
+    search: { el: "select", enum: siteOptions.value },
+    render: scope => siteOptions.value.find(item => item.value === (scope.row as BaseI18nCustom).site)?.label || "-"
+  },
+  {
+    prop: "locale",
+    label: t("system.base.i18n_custom.field.locale"),
+    width: 120,
+    search: { el: "select", enum: localeOptions },
+    render: scope => getLanguageLabel((scope.row as BaseI18nCustom).locale)
+  },
+  {
+    prop: "default_value",
+    label: t("system.base.i18n_custom.field.default_value"),
+    minWidth: 200,
+    render: scope => getDefaultLocaleText(normalizeLocale((scope.row as BaseI18nCustom).locale), (scope.row as BaseI18nCustom).key) || "-"
+  },
+  { prop: "value", label: t("system.base.i18n_custom.field.value"), minWidth: 200 },
+  {
+    prop: "status",
+    label: t("system.base.i18n_custom.field.status"),
+    width: 100,
+    search: { el: "select", enum: statusOptions.value },
+    cellType: "status",
+    statusProps: {
+      activeValue: Status.STATUS_ENABLE,
+      inactiveValue: Status.STATUS_DISABLE,
+      activeText: t("common.status.enabled"),
+      inactiveText: t("common.status.disabled"),
+      disabled: () => !BUTTONS.value["base:i18n-custom:status"],
+      beforeChange: scope => handleBeforeSetStatus(scope.row as BaseI18nCustom)
+    }
+  },
+  { prop: "created_at", label: t("common.field.created_at"), minWidth: 180, align: "center" },
+  {
+    prop: "operation",
+    label: t("common.field.operation"),
+    cellType: "actions",
+    actions: [
+      {
+        label: t("common.action.edit"),
+        type: "primary",
+        link: true,
+        icon: EditPen,
+        hidden: () => !BUTTONS.value["base:i18n-custom:update"],
+        onClick: scope => handleOpenDialog((scope.row as BaseI18nCustom).id)
+      },
+      {
+        label: t("common.action.delete"),
+        type: "danger",
+        link: true,
+        icon: Delete,
+        hidden: () => !BUTTONS.value["base:i18n-custom:delete"],
+        onClick: scope => handleDelete(scope.row as BaseI18nCustom)
+      }
+    ]
+  }
+]);
+
+const headerActions = computed<HeaderActionProps[]>(() => [
+  {
+    label: t("common.action.create"),
+    type: "success",
+    icon: CirclePlus,
+    hidden: () => !BUTTONS.value["base:i18n-custom:create"],
+    onClick: () => handleOpenDialog()
+  },
+  {
+    label: t("common.action.delete"),
+    type: "danger",
+    icon: Delete,
+    hidden: () => !BUTTONS.value["base:i18n-custom:delete"],
+    disabled: scope => !scope.selectedList.length,
+    onClick: scope => handleDelete(scope.selectedList as BaseI18nCustom[])
+  }
+]);
+
+/** 请求国际化自定义翻译分页列表。 */
+async function requestBaseI18nCustomTable(params: PageBaseI18nCustomRequest) {
+  await loadLanguages();
+  const data = await defBaseI18nCustomService.PageBaseI18nCustom(buildPageRequest(params));
+  return { data: { list: data.items ?? [], total: data.total } };
+}
+
+/** 加载启用语言选项。 */
+async function loadLanguages() {
+  enabledLanguages.value = await loadEnabledBaseLanguages();
+}
+
+/** 返回语言显示名称。 */
+function getLanguageLabel(locale: string) {
+  const language = enabledLanguages.value.find(item => item.language_code === locale);
+  return language?.native_name || language?.language_name || locale;
+}
+
+/** 打开国际化自定义翻译编辑弹窗。 */
+async function handleOpenDialog(id?: number) {
+  await loadLanguages();
+  resetForm();
+  dialog.editing = Boolean(id);
+  dialog.visible = true;
+  if (!id) return;
+  Object.assign(formData, await defBaseI18nCustomService.GetBaseI18nCustom({ id }));
+}
+
+/** 关闭编辑弹窗并重置表单。 */
+function handleCloseDialog() {
+  dialog.visible = false;
+  resetForm();
+}
+
+/** 重置国际化自定义翻译表单。 */
+function resetForm() {
+  formDialogRef.value?.resetFields();
+  formDialogRef.value?.clearValidate();
+  Object.assign(formData, {
+    id: 0,
+    site: BaseConfigSite.BASE_CONFIG_SITE_ADMIN,
+    key: "",
+    locale: getCurrentLocale(),
+    value: "",
+    status: Status.STATUS_ENABLE,
+    remark: ""
+  });
+}
+
+/** 提交国际化自定义翻译。 */
+async function handleSubmit() {
+  const valid = await formDialogRef.value?.validate();
+  if (!valid) return;
+  const payload = JSON.parse(JSON.stringify(formData)) as BaseI18nCustomForm;
+  if (payload.id) {
+    await defBaseI18nCustomService.UpdateBaseI18nCustom({ i18n_custom: payload });
+  } else {
+    await defBaseI18nCustomService.CreateBaseI18nCustom({ i18n_custom: payload });
+  }
+  await refreshAdminRuntimeConfig();
+  ElMessage.success(t(payload.id ? "common.message.update_success" : "common.message.create_success", { resource: t("system.base.i18n_custom.resource") }));
+  handleCloseDialog();
+  proTable.value?.getTableList();
+}
+
+/** 设置国际化自定义翻译状态前确认。 */
+function handleBeforeSetStatus(row: BaseI18nCustom) {
+  return ElMessageBox.confirm(
+    t("system.base.i18n_custom.message.confirm_status", {
+      action: row.status === Status.STATUS_ENABLE ? t("common.status.disabled") : t("common.status.enabled"),
+      name: row.key
+    }),
+    t("common.title.warning"),
+    { type: "warning", confirmButtonText: t("common.action.confirm"), cancelButtonText: t("common.action.cancel") }
+  ).then(
+    async () => {
+      await defBaseI18nCustomService.SetBaseI18nCustomStatus({
+        id: row.id,
+        status: row.status === Status.STATUS_ENABLE ? Status.STATUS_DISABLE : Status.STATUS_ENABLE
+      });
+      await refreshAdminRuntimeConfig();
+      return true;
+    },
+    () => false
+  );
+}
+
+/** 删除国际化自定义翻译，兼容单项和批量操作。 */
+function handleDelete(selected?: BaseI18nCustom | BaseI18nCustom[] | number | string | Array<number | string>) {
+  const rows = Array.isArray(selected) ? (selected.filter(item => typeof item === "object") as BaseI18nCustom[]) : selected && typeof selected === "object" ? [selected] : [];
+  const ids = (rows.length ? rows.map(item => item.id) : normalizeSelectedIds(selected as number | string | Array<number | string>)).join(",");
+  if (!ids) {
+    ElMessage.warning(t("common.message.select_delete_item"));
+    return;
+  }
+  ElMessageBox.confirm(
+    t("system.base.i18n_custom.message.confirm_delete", { name: rows.length === 1 ? rows[0].key : ids }),
+    t("common.title.warning"),
+    { type: "warning", confirmButtonText: t("common.action.confirm"), cancelButtonText: t("common.action.cancel") }
+  ).then(async () => {
+    await defBaseI18nCustomService.DeleteBaseI18nCustom({ id: ids });
+    await refreshAdminRuntimeConfig();
+    ElMessage.success(t("common.message.delete_success"));
+    proTable.value?.getTableList();
+  });
+}
+
+</script>

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

@@ -22,8 +22,8 @@
 </template>
 
 <script setup lang="ts">
-import { computed, h, reactive, ref, type VNode } from "vue";
-import { ElButton, ElMessage, ElMessageBox, ElTag } from "element-plus";
+import { computed, h, reactive, ref } from "vue";
+import { ElMessage, ElMessageBox, ElTag } from "element-plus";
 import { CirclePlus, Delete, EditPen, Promotion, Tickets, VideoPause, VideoPlay } from "@element-plus/icons-vue";
 import type {
   ColumnProps,
@@ -48,14 +48,14 @@ 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 DynamicI18nCell from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nCell.vue";
+import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nEditor.vue";
 import {
   normalizeDynamicI18ns,
   serializeDynamicI18ns,
   type DynamicI18nRecord,
   type DynamicI18nValue
-} from "@liujitcn/kratos-admin-system/components/dynamicI18n";
+} from "@liujitcn/kratos-admin-system/components/i18n/dynamicI18n";
 
 defineOptions({
   name: "BaseJob",
@@ -172,132 +172,6 @@ function renderJobNameCell(scope: RenderScope<BaseJob>) {
   });
 }
 
-/**
- * 渲染定时任务操作列。
- */
-function renderOperationCell(scope: RenderScope<BaseJob>) {
-  const row = scope.row;
-  const actionNodes: VNode[] = [];
-
-  if (BUTTONS.value["base:job:update"]) {
-    actionNodes.push(
-      h(
-        ElButton,
-        {
-          key: `edit-${row.id}`,
-          type: "primary",
-          link: true,
-          icon: EditPen,
-          onClick: () => handleOpenDialog(row.id)
-        },
-        () => t("common.action.edit")
-      )
-    );
-  }
-
-  if (BUTTONS.value["base:job:delete"]) {
-    actionNodes.push(
-      h(
-        ElButton,
-        {
-          key: `delete-${row.id}`,
-          type: "danger",
-          link: true,
-          icon: Delete,
-          onClick: () => handleDelete(row)
-        },
-        () => t("common.action.delete")
-      )
-    );
-  }
-
-  if (
-    row.status === Status.STATUS_ENABLE &&
-    (row.entry_id === undefined || row.entry_id === 0) &&
-    BUTTONS.value["base:job:start"]
-  ) {
-    actionNodes.push(
-      h(
-        ElButton,
-        {
-          key: `start-${row.id}`,
-          type: "primary",
-          link: true,
-          icon: VideoPlay,
-          class: "job-action job-action--start",
-          onClick: () => handleStart(row.id, row.name)
-        },
-        () => t("system.base.job.action.start")
-      )
-    );
-  }
-
-  if (row.status === Status.STATUS_ENABLE && row.entry_id > 0 && BUTTONS.value["base:job:stop"]) {
-    actionNodes.push(
-      h(
-        ElButton,
-        {
-          key: `stop-${row.id}`,
-          type: "warning",
-          link: true,
-          icon: VideoPause,
-          class: "job-action job-action--stop",
-          onClick: () => handleStop(row.id, row.name)
-        },
-        () => t("system.base.job.action.stop")
-      )
-    );
-  }
-
-  if (
-    row.status === Status.STATUS_ENABLE &&
-    (row.entry_id === undefined || row.entry_id === 0) &&
-    BUTTONS.value["base:job:exec"]
-  ) {
-    actionNodes.push(
-      h(
-        ElButton,
-        {
-          key: `exec-${row.id}`,
-          type: "success",
-          link: true,
-          icon: Promotion,
-          class: "job-action job-action--exec",
-          onClick: () => handleExec(row.id, row.name)
-        },
-        () => t("system.base.job.action.execute")
-      )
-    );
-  }
-
-  if (BUTTONS.value["base:job:log"]) {
-    actionNodes.push(
-      h(
-        ElButton,
-        {
-          key: `log-${row.id}`,
-          type: "primary",
-          link: true,
-          icon: Tickets,
-          class: "job-action job-action--log",
-          onClick: () => handleOpenBaseJob(row.id, row.name)
-        },
-        () => t("system.base.job.action.log")
-      )
-    );
-  }
-
-  if (!actionNodes.length) return "--";
-  return h(
-    "div",
-    {
-      class: "job-operation",
-      key: `job-operation-${row.id}`
-    },
-    actionNodes
-  );
-}
-
 /** 定时任务表单字段配置。 */
 const formFields = computed<ProFormField[]>(() => [
   {
@@ -372,7 +246,86 @@ const columns = computed<ColumnProps[]>(() => [
   {
     prop: "operation",
     label: t("common.field.action"),
-    render: scope => renderOperationCell(scope as unknown as RenderScope<BaseJob>)
+    cellType: "actions",
+    actions: [
+      {
+        label: t("common.action.edit"),
+        type: "primary",
+        link: true,
+        icon: EditPen,
+        hidden: () => !BUTTONS.value["base:job:update"],
+        onClick: scope => handleOpenDialog((scope.row as BaseJob).id)
+      },
+      {
+        label: t("common.action.delete"),
+        type: "danger",
+        link: true,
+        icon: Delete,
+        hidden: () => !BUTTONS.value["base:job:delete"],
+        onClick: scope => handleDelete(scope.row as BaseJob)
+      },
+      {
+        label: t("system.base.job.action.start"),
+        type: "primary",
+        link: true,
+        icon: VideoPlay,
+        hidden: scope => {
+          const row = scope.row as BaseJob;
+          return (
+            row.status !== Status.STATUS_ENABLE ||
+            (row.entry_id !== undefined && row.entry_id !== 0) ||
+            !BUTTONS.value["base:job:start"]
+          );
+        },
+        onClick: scope => {
+          const row = scope.row as BaseJob;
+          return handleStart(row.id, row.name);
+        }
+      },
+      {
+        label: t("system.base.job.action.stop"),
+        type: "warning",
+        link: true,
+        icon: VideoPause,
+        hidden: scope => {
+          const row = scope.row as BaseJob;
+          return row.status !== Status.STATUS_ENABLE || !(row.entry_id > 0) || !BUTTONS.value["base:job:stop"];
+        },
+        onClick: scope => {
+          const row = scope.row as BaseJob;
+          return handleStop(row.id, row.name);
+        }
+      },
+      {
+        label: t("system.base.job.action.execute"),
+        type: "success",
+        link: true,
+        icon: Promotion,
+        hidden: scope => {
+          const row = scope.row as BaseJob;
+          return (
+            row.status !== Status.STATUS_ENABLE ||
+            (row.entry_id !== undefined && row.entry_id !== 0) ||
+            !BUTTONS.value["base:job:exec"]
+          );
+        },
+        onClick: scope => {
+          const row = scope.row as BaseJob;
+          return handleExec(row.id, row.name);
+        }
+      },
+      {
+        label: t("system.base.job.action.log"),
+        type: "info",
+        link: true,
+        icon: Tickets,
+        hidden: () => !BUTTONS.value["base:job:log"],
+        onClick: scope => {
+          const row = scope.row as BaseJob;
+          return handleOpenBaseJob(row.id, row.name);
+        }
+      }
+    ]
   }
 ]);
 
@@ -608,32 +561,3 @@ function handleOpenBaseJob(id: number, name: string) {
   navigateTo(router, "/base/job/log", { jobId: id, title: t("system.base.job.title.log", { name }) });
 }
 </script>
-
-<style scoped>
-.job-operation {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 4px 10px;
-  align-items: center;
-  white-space: nowrap;
-}
-.job-action {
-  margin-left: 0;
-  font-weight: 500;
-}
-.job-action:deep(.el-icon) {
-  margin-right: 4px;
-}
-.job-action--start {
-  --el-button-text-color: var(--el-color-primary);
-}
-.job-action--stop {
-  --el-button-text-color: var(--el-color-warning);
-}
-.job-action--exec {
-  --el-button-text-color: var(--el-color-success);
-}
-.job-action--log {
-  --el-button-text-color: var(--el-color-info);
-}
-</style>

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

@@ -5,11 +5,12 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
 import type { ColumnProps } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import { requestTenantCodeOptions, useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
-import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log";
+import { formatLogDateTime } from "@liujitcn/kratos-admin-system/components/log/log";
 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 LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/log/LogTable.vue";
+import { logDateSearch, logDetailColumn, logEnumLabel, createLogEnumOptions, requestLogTrace } from "@liujitcn/kratos-admin-system/components/log/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";
@@ -18,6 +19,7 @@ import type { BaseLoginLog, PageBaseLoginLogRequest } from "@liujitcn/kratos-adm
 defineOptions({ name: "BaseLoginLog", inheritAttrs: false });
 
 const page = ref<InstanceType<typeof LogTable>>();
+const { tenantColumns } = useTenantScope();
 const resultOptions = computed(() =>
   createLogEnumOptions([
     [BaseLogResult.BASE_LOG_RESULT_UNSPECIFIED, t("system.base.log.result.unspecified")],
@@ -39,7 +41,14 @@ const loginTypeOptions = computed(() =>
 
 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, align: "left" },
+  ...tenantColumns({
+    prop: "tenant_code",
+    label: t("system.base.log.field.tenant_code"),
+    minWidth: 120,
+    searchEl: "select",
+    enum: requestTenantCodeOptions,
+    render: scope => String((scope.row as BaseLoginLog).tenant_code ?? "")
+  }),
   {
     prop: "login_type",
     label: t("system.base.log.field.login_type"),