@liujitcn/kratos-admin-system 0.0.49 → 0.0.51

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

@@ -60,7 +60,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import { useDebounceFn } from "@vueuse/core";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { CirclePlus, Delete, EditPen, RefreshLeft } from "@element-plus/icons-vue";
@@ -82,13 +82,11 @@ import { BaseUserIDType } from "@liujitcn/kratos-admin-system/rpc/system/common/
 import { defBaseDeptService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_dept";
 import { defBaseRoleService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_role";
 import { defBasePostService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_post";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
 import type { SelectOptionResponse_Option, TreeOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { PASSWORD_CRYPTO_SCENE, encryptPassword } from "@liujitcn/kratos-admin-core/security";
-import { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 
 /** 用户表单状态，前端保留明文密码并在提交前加密。 */
@@ -124,7 +122,7 @@ type DeptFilterNode = {
 };
 
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
+const { isDefaultTenant, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const resetPwdFormDialogRef = ref<InstanceType<typeof FormDialog>>();
@@ -188,7 +186,7 @@ const resetPwdTargetName = ref("");
 const rules = computed(() => ({
   tenant_id: [
     {
-      required: true,
+      required: isDefaultTenant.value,
       message: t("common.validation.required_select", { field: t("common.field.tenant") }),
       trigger: "change"
     }
@@ -292,7 +290,7 @@ const resetPwdRules = computed(() => ({
 const basedDeptOptions = ref<TreeOptionResponse_Option[]>([]);
 const baseRoleOptions = ref<SelectOptionResponse_Option[]>([]);
 const basePostOptions = ref<SelectOptionResponse_Option[]>([]);
-const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
+const undeletableRoleIds = ref(new Set<number>());
 const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
   { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
@@ -324,8 +322,9 @@ const resetPwdFields = computed<ProFormField[]>(() => [
   }
 ]);
 
-/** 当前登录账号是否默认租户。 */
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+onMounted(() => {
+  if (isDefaultTenant.value) void loadTenantOptions();
+});
 
 /** 当前编辑用户是否绑定 super 或 tenant 内置角色。 */
 const isProtectedUserRole = computed(() => {
@@ -338,19 +337,7 @@ const isSuperEditUser = computed(() => Boolean(formData.id && formData.user_name
 
 /** 用户表单字段配置。 */
 const formFields = computed<ProFormField[]>(() => [
-  {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
-    component: "select",
-    props: {
-      placeholder: t("common.placeholder.select"),
-      filterable: true,
-      disabled: Boolean(formData.id),
-      onChange: handleFormTenantChange
-    },
-    visible: () => isDefaultTenant.value,
-    options: tenantOptions.value
-  },
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true, props: { onChange: handleFormTenantChange } }),
   {
     prop: "user_name",
     label: t("system.base.user.field.user_name"),
@@ -463,20 +450,8 @@ const formFields = computed<ProFormField[]>(() => [
 
 /** 用户表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
-  { type: "selection", width: 55, selectable: row => !isProtectedManagementUser(row as BaseUser) },
-  ...(isDefaultTenant.value
-    ? ([
-        {
-          prop: "tenant_id",
-          label: t("common.field.tenant"),
-          minWidth: 140,
-          align: "left",
-          showOverflowTooltip: true,
-          search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
-          enum: requestTenantOptions
-        }
-      ] satisfies ColumnProps[])
-    : []),
+  { type: "selection", width: 55, selectable: row => !isDeleteProtectedManagementUser(row as BaseUser) },
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "user_name", label: t("system.base.user.field.user_name"), minWidth: 140, search: { el: "input" } },
   { prop: "user_code", label: t("system.base.user.field.user_code"), minWidth: 140, search: { el: "input" } },
   { prop: "nick_name", label: t("system.base.user.field.nick_name_short"), minWidth: 100, search: { el: "input" } },
@@ -546,7 +521,7 @@ const columns = computed<ColumnProps[]>(() => [
         type: "danger",
         link: true,
         icon: Delete,
-        hidden: scope => isProtectedManagementUser(scope.row as BaseUser) || !BUTTONS.value["base:user:delete"],
+        hidden: scope => isDeleteProtectedManagementUser(scope.row as BaseUser) || !BUTTONS.value["base:user:delete"],
         onClick: scope => handleDelete(scope.row as BaseUser)
       }
     ]
@@ -623,7 +598,7 @@ function changeTreeFilter(value: string) {
  * 请求用户分页列表，并统一处理分页参数。
  */
 async function requestBaseUserTable(params: PageBaseUserRequest) {
-  const tenantId = isDefaultTenant.value ? params.tenant_id : undefined;
+  const tenantId = toRequestTenantId(params.tenant_id);
   if (tenantId !== selectedTenantId.value) {
     selectedTenantId.value = tenantId;
     initParam.dept_id = undefined;
@@ -640,13 +615,15 @@ async function requestBaseUserTable(params: PageBaseUserRequest) {
 
 /** 读取当前列表关联选项使用的租户。 */
 function getOptionTenantId() {
-  return isDefaultTenant.value ? selectedTenantId.value : undefined;
+  return toRequestTenantId(selectedTenantId.value);
 }
 
 /** 请求角色关联选项。 */
 async function requestRoleOptions() {
   const response = await defBaseRoleService.OptionBaseRole({ tenant_id: getOptionTenantId() });
-  return { data: response.list ?? [] };
+  const options = response.list ?? [];
+  updateUndeletableRoleIds(options);
+  return { data: options };
 }
 
 /** 请求部门关联选项。 */
@@ -679,26 +656,18 @@ async function loadFormOptions() {
     basedDeptOptions.value = [];
     return;
   }
-  const tenantId = isDefaultTenant.value ? formData.tenant_id : undefined;
+  const tenantId = toRequestTenantId(formData.tenant_id);
   const [optionBaseRoleResponse, optionBaseDeptResponse, optionBasePostResponse] = await Promise.all([
     defBaseRoleService.OptionBaseRole({ tenant_id: tenantId }),
     defBaseDeptService.OptionBaseDept({ tenant_id: tenantId }),
     defBasePostService.OptionBasePost({ tenant_id: tenantId })
   ]);
   baseRoleOptions.value = optionBaseRoleResponse.list || [];
+  updateUndeletableRoleIds(baseRoleOptions.value);
   basePostOptions.value = optionBasePostResponse.list || [];
   basedDeptOptions.value = optionBaseDeptResponse.list || [];
 }
 
-/**
- * 加载租户下拉选项。
- */
-async function loadTenantOptions() {
-  if (!isDefaultTenant.value || tenantOptions.value.length) return;
-  const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  tenantOptions.value = response.list ?? [];
-}
-
 /**
  * 切换用户表单租户时，清空角色和部门并重新加载选项。
  */
@@ -865,7 +834,7 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
     : selected && typeof selected === "object"
       ? [selected]
       : [];
-  if (userList.some(isProtectedManagementUser)) {
+  if (userList.some(isDeleteProtectedManagementUser)) {
     ElMessage.warning(t("system.base.user.message.protected_account"));
     return;
   }
@@ -908,4 +877,14 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
 function isProtectedManagementUser(row?: BaseUser) {
   return Boolean(row?.is_protected);
 }
+
+/** 判断用户是否禁止通过用户管理删除。 */
+function isDeleteProtectedManagementUser(row?: BaseUser) {
+  return isProtectedManagementUser(row) || Boolean(row?.role_id && undeletableRoleIds.value.has(row.role_id));
+}
+
+/** 根据角色选项同步不可删除的内置角色编号。 */
+function updateUndeletableRoleIds(options: SelectOptionResponse_Option[]) {
+  undeletableRoleIds.value = new Set(options.filter(option => option.disabled).map(option => option.value));
+}
 </script>

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

@@ -20,6 +20,7 @@
 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 { formatDateTime } from "@liujitcn/kratos-admin-core/format";
 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";
@@ -44,7 +45,13 @@ const resultOptions = computed<Array<[number, string]>>(() => [
   [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, align: "center" },
+  {
+    prop: "occurred_at",
+    label: t("system.profile.login_log.field.occurred_at"),
+    minWidth: 180,
+    align: "center",
+    render: scope => formatDateTime((scope.row as BaseLoginLog).occurred_at)
+  },
   {
     prop: "login_type",
     label: t("system.profile.login_log.field.login_type"),
@@ -58,7 +65,13 @@ const columns = computed<ColumnProps[]>(() => [
     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, align: "right" },
+  {
+    prop: "device_id",
+    label: t("system.profile.login_log.field.device_id"),
+    minWidth: 160,
+    align: "left",
+    render: scope => (scope.row as BaseLoginLog).device_id || (scope.row as BaseLoginLog).user_agent || "--"
+  },
   { prop: "reason", label: t("system.profile.login_log.field.reason"), minWidth: 180 }
 ]);
 

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

@@ -17,7 +17,7 @@
 
 <script setup lang="ts">
 import { t } from "@liujitcn/kratos-admin-core";
-import ChangePasswordForm from "../../../components/ChangePasswordForm.vue";
+import ChangePasswordForm from "../../../components/account/ChangePasswordForm.vue";
 </script>
 
 <style scoped lang="scss">

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

@@ -413,10 +413,10 @@ function getCurrentSecurityPath() {
   return resolveFrontendRouteURL(router, { path: route.path, query });
 }
 
-/** 拉取当前用户三方账号绑定状态。 */
+/** 拉取当前用户三方账号绑定状态，空列表字段省略时不展示绑定项。 */
 async function loadOauthBindings() {
   const result = await defProfileOauthService.ListOauthBinding({});
-  oauthBindings.value = result.bindings.map(withOauthProviderDisplay);
+  oauthBindings.value = (result.bindings ?? []).map(withOauthProviderDisplay);
 }
 
 /** 拉取当前用户 MFA 状态。 */

package/dist/package/src/views/tool/code-gen/components/CodeGenLocaleEditor.vue

@@ -10,8 +10,8 @@
 
 <script setup lang="ts">
 import { computed } from "vue";
-import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/DynamicI18nEditor.vue";
-import { getEditableLanguageOptions, type DynamicI18nValue } from "@liujitcn/kratos-admin-system/components/dynamicI18n";
+import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nEditor.vue";
+import { getEditableLanguageOptions, type DynamicI18nValue } from "@liujitcn/kratos-admin-system/components/i18n/dynamicI18n";
 import type { CodeGenLocaleConfig } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 
 /** 代码生成描述使用统一国际化入口，按字段保存回语言配置。 */

package/dist/package/src/views/tool/code-gen/config.ts

@@ -1,4 +1,4 @@
-import { getEditableLanguageOptions } from "@liujitcn/kratos-admin-system/components/dynamicI18n";
+import { getEditableLanguageOptions } from "@liujitcn/kratos-admin-system/components/i18n/dynamicI18n";
 import type { CodeGenLocaleConfig } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 import type { FormRules } from "element-plus";
 import { t } from "@liujitcn/kratos-admin-core";
@@ -80,6 +80,7 @@ const codeGenFormComponentLabelKeys: Record<ProFormComponentType, string> = {
   switch: "system.code.gen.component.switch",
   checkbox: "system.code.gen.component.checkbox",
   select: "system.code.gen.component.select",
+  "tenant-select": "system.code.gen.component.select",
   dict: "system.code.gen.component.dict",
   "radio-group": "system.code.gen.component.radio_group",
   "checkbox-group": "system.code.gen.component.checkbox_group",

package/package.json

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