@liujitcn/kratos-admin-system 0.0.29 → 0.0.32

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

@@ -69,21 +69,22 @@ import PasswordStrength from "@liujitcn/kratos-admin-core/components/PasswordStr
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import TreeFilter from "@liujitcn/kratos-admin-core/components/TreeFilter/index.vue";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
-import { defBaseUserService } from "@liujitcn/kratos-admin-system/api/system/base_user";
+import { defBaseUserService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_user";
 import type {
   BaseUser,
   BaseUserForm,
   PageBaseUserRequest,
   ResetBaseUserPasswordRequest
 } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_user";
-import { defBaseDeptService } from "@liujitcn/kratos-admin-system/api/system/base_dept";
-import { defBaseRoleService } from "@liujitcn/kratos-admin-system/api/system/base_role";
-import { defBasePostService } from "@liujitcn/kratos-admin-system/api/system/base_post";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/base_tenant";
+import { BaseUserIDType } from "@liujitcn/kratos-admin-system/rpc/system/common/v1/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, validatePasswordStrengthValue } from "@liujitcn/kratos-admin-core/security";
+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 { t } from "@liujitcn/kratos-admin-core";
@@ -159,6 +160,12 @@ const formData = reactive<BaseUserFormState>({
   post_id: undefined,
   /** 手机号 */
   phone: "",
+  /** 邮箱 */
+  email: "",
+  /** 证件类型 */
+  id_type: BaseUserIDType.BASE_USER_ID_TYPE_UNSPECIFIED,
+  /** 证件号 */
+  id_code: "",
   /** 密码 */
   pwd: "",
   /** 性别 */
@@ -180,7 +187,7 @@ const rules = computed(() => ({
   tenant_id: [
     {
       required: true,
-      message: t("common.validation.required_select", { field: t("system.base.user.field.tenant") }),
+      message: t("common.validation.required_select", { field: t("common.field.tenant") }),
       trigger: "change"
     }
   ],
@@ -223,28 +230,41 @@ const rules = computed(() => ({
   dept_id: [
     {
       required: true,
-      message: t("common.validation.required_select", { field: t("system.base.user.field.department") }),
+      message: t("common.validation.required_select", { field: t("common.field.department") }),
       trigger: "change"
     }
   ],
   role_id: [
     {
       required: true,
-      message: t("common.validation.required_select", { field: t("system.base.user.field.role") }),
+      message: t("common.validation.required_select", { field: t("common.field.role") }),
       trigger: "change"
     }
   ],
   phone: [
     { max: 20, message: t("common.validation.max_length", { field: t("common.field.phone"), max: 20 }), trigger: "blur" },
     {
-      pattern: /^1[3-9]\d{9}$/,
+      pattern: /^(?:1[3-9][0-9*]{9})?$/,
       message: t("common.validation.phone_invalid"),
       trigger: "blur"
     }
   ],
+  email: [
+    {
+      type: "email",
+      message: t("system.base.user.validation.email_invalid"),
+      trigger: "blur"
+    }
+  ],
+  id_code: [
+    {
+      pattern: /^[A-Za-z0-9][A-Za-z0-9-]{0,63}$/,
+      message: t("system.base.user.validation.id_code_invalid"),
+      trigger: "blur"
+    }
+  ],
   pwd: [
-    { required: true, message: t("core.password.required"), trigger: "blur" },
-    { validator: validatePasswordField, trigger: "blur" }
+    { required: false, trigger: "blur" }
   ],
   status: [
     {
@@ -263,8 +283,7 @@ const rules = computed(() => ({
 }));
 const resetPwdRules = computed(() => ({
   pwd: [
-    { required: true, message: t("system.base.user.placeholder.new_password"), trigger: "blur" },
-    { validator: validatePasswordField, trigger: "blur" }
+    { required: true, message: t("system.base.user.placeholder.new_password"), trigger: "blur" }
   ]
 }));
 
@@ -276,6 +295,18 @@ const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
   { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
 ]);
+const idTypeOptions = computed<ProFormOption[]>(() => [
+  { label: t("system.base.user.id_type.unspecified"), value: BaseUserIDType.BASE_USER_ID_TYPE_UNSPECIFIED },
+  { label: t("system.base.user.id_type.id_card"), value: BaseUserIDType.BASE_USER_ID_TYPE_ID_CARD },
+  { label: t("system.base.user.id_type.passport"), value: BaseUserIDType.BASE_USER_ID_TYPE_PASSPORT },
+  { label: t("system.base.user.id_type.hk_macao_permit"), value: BaseUserIDType.BASE_USER_ID_TYPE_HK_MACAO_PERMIT },
+  { label: t("system.base.user.id_type.taiwan_permit"), value: BaseUserIDType.BASE_USER_ID_TYPE_TAIWAN_PERMIT },
+  {
+    label: t("system.base.user.id_type.foreign_permanent_residence"),
+    value: BaseUserIDType.BASE_USER_ID_TYPE_FOREIGN_PERMANENT_RESIDENCE
+  },
+  { label: t("system.base.user.id_type.other"), value: BaseUserIDType.BASE_USER_ID_TYPE_OTHER }
+]);
 const resetPwdFields = computed<ProFormField[]>(() => [
   {
     prop: "pwd",
@@ -307,10 +338,10 @@ const isSuperEditUser = computed(() => Boolean(formData.id && formData.user_name
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "tenant_id",
-    label: t("system.base.user.field.tenant"),
+    label: t("common.field.tenant"),
     component: "select",
     props: {
-      placeholder: t("system.base.user.placeholder.tenant"),
+      placeholder: t("common.placeholder.select"),
       filterable: true,
       disabled: Boolean(formData.id),
       onChange: handleFormTenantChange
@@ -338,18 +369,18 @@ const formFields = computed<ProFormField[]>(() => [
   },
   {
     prop: "role_id",
-    label: t("system.base.user.field.role"),
+    label: t("common.field.role"),
     component: "select",
     options: baseRoleOptions.value.map(item => ({ label: item.label, value: item.value, disabled: item.disabled })),
     props: { placeholder: t("common.placeholder.select"), disabled: isProtectedUserRole.value }
   },
   {
     prop: "dept_id",
-    label: t("system.base.user.field.department"),
+    label: t("common.field.department"),
     component: "tree-select",
     options: basedDeptOptions.value as unknown as ProFormOption[],
     props: {
-      placeholder: t("system.base.user.placeholder.department"),
+      placeholder: t("common.placeholder.select"),
       filterable: true,
       checkStrictly: true,
       renderAfterExpand: false,
@@ -358,10 +389,10 @@ const formFields = computed<ProFormField[]>(() => [
   },
   {
     prop: "post_id",
-    label: t("system.base.user.field.post"),
+    label: t("common.field.post"),
     component: "select",
     options: basePostOptions.value.map(item => ({ label: item.label, value: item.value, disabled: item.disabled })),
-    props: { placeholder: t("system.base.user.placeholder.post"), clearable: true, filterable: true }
+    props: { placeholder: t("common.placeholder.select"), clearable: true, filterable: true }
   },
   {
     prop: "phone",
@@ -369,11 +400,30 @@ 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"),
+    component: "select",
+    options: idTypeOptions.value,
+    props: { placeholder: t("common.placeholder.select") }
+  },
+  {
+    prop: "id_code",
+    label: t("system.base.user.field.id_code"),
+    component: "input",
+    props: { placeholder: t("system.base.user.placeholder.id_code") }
+  },
   {
     prop: "pwd",
     label: t("system.base.user.field.password"),
     component: "password",
-    props: { placeholder: t("system.base.user.placeholder.password"), showPassword: true },
+    props: { placeholder: t("system.base.user.placeholder.password_optional"), showPassword: true },
     visible: model => !model.id
   },
   {
@@ -406,7 +456,7 @@ const columns = computed<ColumnProps[]>(() => [
     ? ([
         {
           prop: "tenant_id",
-          label: t("system.base.user.field.tenant_short"),
+          label: t("common.field.tenant"),
           minWidth: 140,
           showOverflowTooltip: true,
           search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
@@ -417,16 +467,19 @@ const columns = computed<ColumnProps[]>(() => [
   { 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" } },
-  { prop: "role_id", label: t("system.base.user.field.role"), minWidth: 140, enum: requestRoleOptions },
+  { prop: "role_id", label: t("common.field.role"), minWidth: 140, enum: requestRoleOptions },
   {
     prop: "dept_id",
-    label: t("system.base.user.field.department_short"),
+    label: t("common.field.department"),
     minWidth: 180,
     showOverflowTooltip: true,
     enum: requestDeptOptions
   },
-  { prop: "post_id", label: t("system.base.user.field.post_short"), minWidth: 120, enum: requestPostOptions },
+  { prop: "post_id", label: t("common.field.post"), minWidth: 120, enum: requestPostOptions },
   { prop: "phone", label: t("common.field.phone"), minWidth: 130, search: { el: "input" } },
+  { prop: "email", label: t("system.base.user.field.email"), minWidth: 180, search: { el: "input" } },
+  { prop: "id_type", label: t("system.base.user.field.id_type"), minWidth: 150, enum: idTypeOptions },
+  { prop: "id_code", label: t("system.base.user.field.id_code"), minWidth: 180, showOverflowTooltip: true },
   {
     prop: "gender",
     label: t("system.base.user.field.gender"),
@@ -687,6 +740,9 @@ function resetForm() {
   formData.dept_id = undefined;
   formData.post_id = undefined;
   formData.phone = "";
+  formData.email = "";
+  formData.id_type = BaseUserIDType.BASE_USER_ID_TYPE_UNSPECIFIED;
+  formData.id_code = "";
   formData.pwd = "";
   formData.gender = 3;
   formData.avatar = "";
@@ -746,7 +802,10 @@ const handleSubmit = useDebounceFn(() => {
     const submitData = JSON.parse(JSON.stringify(formData)) as BaseUserFormState;
     const baseUser = {
       ...submitData,
-      pwd: submitData.id ? undefined : await encryptPassword(submitData.pwd, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_CREATE_BASE_USER)
+      pwd:
+        submitData.id || !submitData.pwd
+          ? undefined
+          : await encryptPassword(submitData.pwd, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_CREATE_BASE_USER)
     } as BaseUserForm;
     const request = submitData.id
       ? defBaseUserService.UpdateBaseUser({ base_user: baseUser })
@@ -832,26 +891,6 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
   );
 }
 
-/**
- * 校验密码强度，新增用户和重置密码统一要求达到最高强度。
- *
- * @param _rule 表单规则对象
- * @param value 当前密码值
- * @param callback 校验回调
- */
-function validatePasswordField(_rule: unknown, value: string, callback: (error?: Error) => void) {
-  if (!value) {
-    callback();
-    return;
-  }
-  const result = validatePasswordStrengthValue(value);
-  if (!result.valid) {
-    callback(new Error(t("core.password.error")));
-    return;
-  }
-  callback();
-}
-
 /**
  * 根据后端管理保护标记判断用户是否禁止通过用户管理操作。
  */

package/dist/package/src/views/message/inbox/index.vue

@@ -0,0 +1,276 @@
+<template>
+  <div class="table-box">
+    <ProTable ref="proTable" row-key="id" :columns="columns" :header-actions="headerActions" :request-api="requestTable" />
+    <ProDialog v-model="detailVisible" :title="detail?.title" width="720px" destroy-on-close :show-footer="false">
+      <div v-if="detail" class="message-detail">
+        <div class="message-meta">
+          <span class="message-category" :style="{ color: detail.category_color || undefined }">
+            <component :is="resolveNotificationIcon(detail.category_icon)" />
+            <span class="message-category__name">{{ detail.category_name }}</span>
+          </span>
+          <span>{{ detail.sender_name }}</span>
+          <span>{{ detail.received_at }}</span>
+        </div>
+        <RichTextPreview
+          v-if="detail.content_format === MessageContentFormat.MESSAGE_CONTENT_FORMAT_RICH_TEXT"
+          class="message-content"
+          :model-value="detail.content"
+        />
+        <pre v-else class="message-content">{{ detail.content }}</pre>
+        <el-button
+          v-if="detail.action_type === MessageActionType.MESSAGE_ACTION_TYPE_VIEW_KEY && actionRouteName"
+          class="message-action"
+          type="primary"
+          @click="openAction"
+        >
+          {{ t("common.action.view") }}
+        </el-button>
+      </div>
+    </ProDialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, h, onMounted, ref } from "vue";
+import { useRouter } from "vue-router";
+import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import ProDialog from "@liujitcn/kratos-admin-core/components/Dialog/ProDialog.vue";
+import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import type { ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
+import RichTextPreview from "@liujitcn/kratos-admin-core/components/RichTextPreview/index.vue";
+import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+import { t } from "@liujitcn/kratos-admin-core";
+import { defNotificationService } from "@liujitcn/kratos-admin-system/api/base/v1/notification";
+import type {
+  Notification,
+  NotificationCategory,
+  PageNotificationRequest
+} from "@liujitcn/kratos-admin-system/rpc/base/v1/notification";
+import {
+  MessageActionType,
+  MessageContentFormat,
+  NotificationView
+} from "@liujitcn/kratos-admin-system/rpc/base/v1/notification";
+
+defineOptions({ name: "NotificationInbox", inheritAttrs: false });
+
+const proTable = ref<ProTableInstance>();
+const router = useRouter();
+const detailVisible = ref(false);
+const detail = ref<Notification>();
+const categoryOptions = ref<NotificationCategory[]>([]);
+const actionRouteName = computed(() => {
+  const viewKey = detail.value?.action_target;
+  if (!viewKey) return "";
+  return ({ MESSAGE_INBOX: "NotificationInbox", PROFILE: "Profile", AI: "AiChat" } as Record<string, string>)[viewKey] ?? "";
+});
+const notificationIcons = {
+  Bell,
+  Calendar,
+  ChatDotRound,
+  CircleCheckFilled,
+  CollectionTag,
+  DataAnalysis,
+  InfoFilled,
+  List,
+  Lock,
+  Message,
+  Promotion,
+  Setting,
+  User,
+  WarningFilled
+};
+
+const viewOptions = computed<ProFormOption[]>(() => [
+  { label: t("system.notification.view.inbox"), value: NotificationView.NOTIFICATION_VIEW_INBOX },
+  { label: t("system.notification.view.unread"), value: NotificationView.NOTIFICATION_VIEW_UNREAD },
+  { label: t("system.notification.view.archived"), value: NotificationView.NOTIFICATION_VIEW_ARCHIVED }
+]);
+
+const categoryFilterOptions = computed<ProFormOption[]>(() =>
+  categoryOptions.value.map(item => ({ label: item.name, value: item.id }))
+);
+
+onMounted(() => void loadCategoryOptions());
+
+const columns = computed<ColumnProps[]>(() => [
+  { prop: "title", label: t("system.base.message.field.title"), minWidth: 240 },
+  {
+    prop: "category_name",
+    label: t("system.base.message.field.category"),
+    minWidth: 150,
+    search: { el: "select", key: "category_id", enum: categoryFilterOptions },
+    render: scope => {
+      const row = scope.row as Notification;
+      return h("span", { class: "message-category", style: { color: row.category_color || undefined } }, [
+        h(resolveNotificationIcon(row.category_icon)),
+        h("span", { class: "message-category__name" }, row.category_name)
+      ]);
+    }
+  },
+  {
+    prop: "read_at",
+    label: t("system.notification.field.read_status"),
+    width: 110,
+    search: { el: "select", key: "view", enum: viewOptions.value },
+    render: scope =>
+      (scope.row as Notification).read_at ? t("system.notification.status.read") : t("system.notification.status.unread")
+  },
+  { prop: "sender_name", label: t("system.notification.field.sender"), minWidth: 130 },
+  { prop: "received_at", label: t("system.notification.field.received_at"), minWidth: 180 },
+  {
+    prop: "operation",
+    label: t("common.field.operation"),
+    width: 250,
+    fixed: "right",
+    cellType: "actions",
+    actions: [
+      { label: t("common.action.view"), link: true, icon: View, onClick: scope => openDetail(scope.row as Notification) },
+      {
+        label: t("system.notification.action.mark_unread"),
+        link: true,
+        icon: RefreshLeft,
+        hidden: scope => !(scope.row as Notification).read_at,
+        onClick: scope => markUnread(scope.row as Notification)
+      },
+      {
+        label: t("system.notification.action.archive"),
+        link: true,
+        icon: Folder,
+        hidden: scope => Boolean((scope.row as Notification).archived_at) || !(scope.row as Notification).allow_archive,
+        onClick: scope => archive(scope.row as Notification)
+      },
+      {
+        label: t("system.notification.action.restore"),
+        link: true,
+        icon: RefreshLeft,
+        hidden: scope => !(scope.row as Notification).archived_at,
+        onClick: scope => restore(scope.row as Notification)
+      },
+      {
+        label: t("common.action.delete"),
+        type: "danger",
+        link: true,
+        icon: Delete,
+        hidden: scope => !(scope.row as Notification).allow_delete,
+        onClick: scope => remove(scope.row as Notification)
+      }
+    ]
+  }
+]);
+
+const headerActions = computed<HeaderActionProps[]>(() => [
+  { label: t("system.notification.action.mark_all_read"), type: "primary", icon: Finished, onClick: () => markAllRead() }
+]);
+
+/** 请求当前用户收件箱。 */
+async function requestTable(params: Record<string, unknown>) {
+  const request = buildPageRequest<PageNotificationRequest>(params as unknown as PageNotificationRequest);
+  request.view = Number(params.view ?? NotificationView.NOTIFICATION_VIEW_INBOX) as NotificationView;
+  const data = await defNotificationService.PageNotification(request);
+  return { data: { list: data.notifications ?? [], total: data.total } };
+}
+
+/** 加载消息分类筛选项。 */
+async function loadCategoryOptions() {
+  const result = await defNotificationService.ListNotificationCategories({});
+  categoryOptions.value = result.categories ?? [];
+}
+
+/** 打开消息详情并标记已读。 */
+async function openDetail(row: Notification) {
+  detail.value = await defNotificationService.GetNotification({ id: row.id });
+  detailVisible.value = true;
+  if (!row.read_at) {
+    await defNotificationService.MarkNotificationRead({ ids: [row.id] });
+    proTable.value?.getTableList();
+  }
+}
+
+/** 执行通知携带的稳定 viewKey 动作。 */
+function openAction() {
+  if (!actionRouteName.value) return;
+  void router.push({ name: actionRouteName.value });
+}
+
+/** 标记消息为未读。 */
+async function markUnread(row: Notification) {
+  await defNotificationService.MarkNotificationUnread({ ids: [row.id] });
+  proTable.value?.getTableList();
+}
+
+/** 标记全部消息为已读。 */
+async function markAllRead() {
+  const summary = await defNotificationService.GetNotificationSummary({});
+  if (!summary.latest_delivery_id) return;
+  await defNotificationService.MarkAllNotificationRead({ before_delivery_id: summary.latest_delivery_id });
+  ElMessage.success(t("common.message.operation_success"));
+  proTable.value?.getTableList();
+}
+
+/** 归档消息。 */
+async function archive(row: Notification) {
+  await defNotificationService.ArchiveNotification({ id: row.id });
+  proTable.value?.getTableList();
+}
+
+/** 恢复已归档消息。 */
+async function restore(row: Notification) {
+  await defNotificationService.RestoreNotification({ id: row.id });
+  proTable.value?.getTableList();
+}
+
+/** 从个人收件箱删除消息。 */
+async function remove(row: Notification) {
+  await ElMessageBox.confirm(t("common.confirm.delete"), t("common.title.warning"), { type: "warning" });
+  await defNotificationService.DeleteNotification({ id: row.id });
+  proTable.value?.getTableList();
+}
+
+/** 解析收件箱分类图标，未知图标使用默认图标。 */
+function resolveNotificationIcon(icon: string) {
+  return notificationIcons[icon as keyof typeof notificationIcons] ?? CollectionTag;
+}
+</script>
+
+<style scoped lang="scss">
+.message-meta {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 16px;
+  margin-bottom: 18px;
+  color: var(--el-text-color-secondary);
+}
+
+:deep(.message-category) {
+  display: inline-flex;
+  gap: 6px;
+  align-items: center;
+  line-height: 18px;
+}
+
+:deep(.message-category > svg) {
+  flex: 0 0 18px;
+  width: 18px;
+  height: 18px;
+}
+
+:deep(.message-category__name) {
+  white-space: nowrap;
+  color: var(--el-text-color-primary);
+}
+
+.message-content {
+  min-height: 180px;
+  margin: 0;
+  white-space: pre-wrap;
+  overflow-wrap: anywhere;
+  color: var(--el-text-color-primary);
+  font-family: inherit;
+  line-height: 1.7;
+}
+
+.message-content.core-rich-text-preview {
+  white-space: normal;
+}
+</style>