From 73aa578c9b36f97c07673567a824f781a7df5e92 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Thu, 21 May 2026 15:10:34 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat(im):=20=E4=BF=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=AB=AF=203=20=E5=A4=84=EF=BC=9A=E7=BE=A4=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=20atUserNicknames=20=E7=B1=BB=E5=9E=8B=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=20null=E3=80=81=E7=A7=BB=E9=99=A4=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E3=80=8C=E6=B6=88=E6=81=AF=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=8D=E6=9F=A5=E8=AF=A2=E5=85=A5=E5=8F=A3=E3=80=81?=
 =?UTF-8?q?=E8=A1=A8=E6=83=85=E5=8C=85=E5=AE=BD=E9=AB=98=E5=8A=A0=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/im/manager/message/group/index.ts     |  3 +-
 .../im/manager/face/pack/FacePackItemForm.vue | 46 +++++++++++++++----
 src/views/im/manager/message/group/index.vue  | 11 +----
 .../im/manager/message/private/index.vue      | 11 +----
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/src/api/im/manager/message/group/index.ts b/src/api/im/manager/message/group/index.ts
index a9d16ef89..598193093 100644
--- a/src/api/im/manager/message/group/index.ts
+++ b/src/api/im/manager/message/group/index.ts
@@ -11,7 +11,8 @@ export interface ImManagerGroupMessageVO {
   content: string
   status: number
   atUserIds?: number[]
-  atUserNicknames?: string[]
+  // 与 atUserIds 同长度；后端对找不到 / 已删除的成员返回 null，UI 用 `?.[idx] || userId` 回退到 userId 渲染
+  atUserNicknames?: (string | null)[]
   receiptStatus?: number
   sendTime: Date
   createTime: Date
diff --git a/src/views/im/manager/face/pack/FacePackItemForm.vue b/src/views/im/manager/face/pack/FacePackItemForm.vue
index 0261d61c2..679ac8222 100644
--- a/src/views/im/manager/face/pack/FacePackItemForm.vue
+++ b/src/views/im/manager/face/pack/FacePackItemForm.vue
@@ -19,7 +19,8 @@
           class="w-1/1"
         />
       </el-form-item>
-      <el-form-item label="尺寸">
+      <!-- 尺寸：拆两个 form-item 让 prop / rules 各自绑定，避免单 form-item 时 rules 不生效 -->
+      <el-form-item label="宽度" prop="width">
         <el-input-number
           v-model="formData.width"
           :min="1"
@@ -27,18 +28,19 @@
           controls-position="right"
           class="!w-1/3"
         />
-        <span class="mx-2 text-[var(--el-text-color-secondary)]">×</span>
-        <el-input-number
-          v-model="formData.height"
-          :min="1"
-          :max="2048"
-          controls-position="right"
-          class="!w-1/3"
-        />
         <span class="ml-2 text-12px text-[var(--el-text-color-placeholder)]">
           上传后自动探测；可手动调整（1 ~ 2048 像素）
         </span>
       </el-form-item>
+      <el-form-item label="高度" prop="height">
+        <el-input-number
+          v-model="formData.height"
+          :min="1"
+          :max="2048"
+          controls-position="right"
+          class="!w-1/3"
+        />
+      </el-form-item>
       <el-form-item label="排序" prop="sort">
         <el-input-number
           v-model="formData.sort"
@@ -99,7 +101,31 @@ const formData = ref({
 })
 const formRules = reactive({
   url: [{ required: true, message: '表情图不能为空', trigger: 'change' }],
-  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+  status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+  // 宽高自动探测后允许手改，但提交前必须落 1-2048 范围；防止用户清空后 submit 让后端报错
+  // 范围 rule 加 transform 把 null/undefined 透传给 async-validator，让空值只触发上面的 required 文案
+  width: [
+    { required: true, message: '宽度不能为空', trigger: 'change' },
+    {
+      type: 'integer',
+      min: 1,
+      max: 2048,
+      message: '宽度需在 1 - 2048 像素之间',
+      trigger: 'change',
+      transform: (value) => (value == null ? value : Number(value))
+    }
+  ],
+  height: [
+    { required: true, message: '高度不能为空', trigger: 'change' },
+    {
+      type: 'integer',
+      min: 1,
+      max: 2048,
+      message: '高度需在 1 - 2048 像素之间',
+      trigger: 'change',
+      transform: (value) => (value == null ? value : Number(value))
+    }
+  ]
 })
 const formRef = ref() // 表单 Ref
 
diff --git a/src/views/im/manager/message/group/index.vue b/src/views/im/manager/message/group/index.vue
index 069ef46e6..2eba07cf2 100644
--- a/src/views/im/manager/message/group/index.vue
+++ b/src/views/im/manager/message/group/index.vue
@@ -33,15 +33,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="消息内容" prop="content">
-        <el-input
-          v-model="queryParams.content"
-          placeholder="请输入消息内容"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      <!-- 「消息内容」搜索入口暂时移除：后端 page 接口没有 content 字段，留着会误导管理员；后端补上后再恢复 -->
       <el-form-item label="发送时间" prop="sendTime">
         <el-date-picker
           v-model="queryParams.sendTime"
@@ -184,7 +176,6 @@ const queryParams = reactive({
   groupId: undefined as number | undefined,
   senderId: undefined as number | undefined,
   type: undefined as number | undefined,
-  content: undefined as string | undefined,
   sendTime: [] as string[]
 })
 const queryFormRef = ref() // 搜索的表单
diff --git a/src/views/im/manager/message/private/index.vue b/src/views/im/manager/message/private/index.vue
index 3733139d2..2e23333ae 100644
--- a/src/views/im/manager/message/private/index.vue
+++ b/src/views/im/manager/message/private/index.vue
@@ -37,15 +37,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="消息内容" prop="content">
-        <el-input
-          v-model="queryParams.content"
-          placeholder="请输入消息内容"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+      <!-- 「消息内容」搜索入口暂时移除：后端 page 接口没有 content 字段，留着会误导管理员；后端补上后再恢复 -->
       <el-form-item label="发送时间" prop="sendTime">
         <el-date-picker
           v-model="queryParams.sendTime"
@@ -159,7 +151,6 @@ const queryParams = reactive({
   senderId: undefined as number | undefined,
   receiverId: undefined as number | undefined,
   type: undefined as number | undefined,
-  content: undefined as string | undefined,
   sendTime: [] as string[]
 })
 const queryFormRef = ref() // 搜索的表单