LOCAL_CHANGES.md

@@ -34,15 +34,6 @@
     *   从 upstream/main 同步了 `images/photo.svg`、`images/screen.svg`、`images/file.svg` 官方资源。
     *   移除了之前的所有本地修改（包括使用 `images/svg/send_image.svg` 等的尝试）。
 
-### `lib/ui/views/TIMUIKitChat/tim_uikit_multi_select_panel.dart`
-*   **修改日期**: 2026-01-06
-*   **修改目的**: 修复 Material 3 下多选面板图标按钮尺寸显示问题。
-*   **详细改动**:
-    *   为所有 `Image.asset` 添加明确的 `width` 和 `height` 参数。
-    *   桌面端（desktopWidget）图标设置为 30x30。
-    *   移动端（defaultWidget）图标设置为 40x40。
-    *   解决 `IconButton` 的 `iconSize` 参数对 `Image.asset` 不生效的 M3 兼容性问题。
-
 ### `scripts/sync_from_upstream.sh`
 *   **修改日期**: 2026-01-05
 *   **修改目的**: 修复同步脚本的关键 bug，确保 `images/` 真正被保护。

lib/ui/views/TIMUIKitChat/tim_uikit_multi_select_panel.dart

@@ -25,10 +25,12 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
 
   _handleForwardMessage(BuildContext context, bool isMergerForward,
       TUIChatSeparateViewModel model) {
+
     // 是否有选中消息
     if (model.getSelectedMessageList().isEmpty) {
       onTIMCallback(TIMCallback(
-          type: TIMCallbackType.INFO, infoRecommendText: TIM_t("请选择要操作的消息！")));
+          type: TIMCallbackType.INFO,
+          infoRecommendText: TIM_t("请选择要操作的消息！")));
       return;
     }
 
@@ -51,8 +53,7 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
     }
 
     // 逐条转发限制在 30 条以内
-    if (!isMergerForward &&
+    if (!isMergerForward && model.getSelectedMessageList().length > forwardMsgNumLimit) {
-        model.getSelectedMessageList().length > forwardMsgNumLimit) {
       _showForwardLimitDialog(context);
       return;
     }
@@ -116,7 +117,8 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
             isMergerForward: isMergerForward,
             conversationType: conversationType,
           ),
-            ));
+        )
+    );
   }
 
   @override
@@ -152,9 +154,7 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                     IconButton(
                       icon: Image.asset('images/forward.png',
                           package: 'tencent_cloud_chat_uikit',
-                          color: theme.selectPanelTextIconColor,
+                          color: theme.selectPanelTextIconColor),
-                          width: 30,
-                          height: 30),
                       iconSize: 30,
                       onPressed: () {
                         _handleForwardMessageWide(context, false, model);
@@ -170,9 +170,7 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                     IconButton(
                       icon: Image.asset('images/merge_forward.png',
                           package: 'tencent_cloud_chat_uikit',
-                          color: theme.selectPanelTextIconColor,
+                          color: theme.selectPanelTextIconColor),
-                          width: 30,
-                          height: 30),
                       iconSize: 30,
                       onPressed: () {
                         _handleForwardMessageWide(context, true, model);
@@ -180,8 +178,8 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                     ),
                     Text(
                       TIM_t("合并转发"),
-                      style: TextStyle(
+                      style:
-                          color: theme.selectPanelTextIconColor, fontSize: 12),
+                          TextStyle(color: theme.selectPanelTextIconColor, fontSize: 12),
                     )
                   ],
                 ),
@@ -190,14 +188,11 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                     IconButton(
                       icon: Image.asset('images/delete.png',
                           package: 'tencent_cloud_chat_uikit',
-                          color: theme.selectPanelTextIconColor,
+                          color: theme.selectPanelTextIconColor),
-                          width: 30,
-                          height: 30),
                       iconSize: 30,
                       onPressed: () {
                         TUIKitWidePopup.showSecondaryConfirmDialog(
-                            operationKey: TUIKitWideModalOperationKey
+                            operationKey: TUIKitWideModalOperationKey.confirmDeleteMessages,
-                                .confirmDeleteMessages,
                             context: context,
                             text: TIM_t("确定删除已选消息"),
                             theme: theme,
@@ -210,18 +205,14 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                     ),
                     Text(TIM_t("删除"),
                         style: TextStyle(
-                            color: theme.selectPanelTextIconColor,
+                            color: theme.selectPanelTextIconColor, fontSize: 12))
-                            fontSize: 12))
                   ],
                 ),
                 InkWell(
                   onTap: (){
                     model.updateMultiSelectStatus(false);
                   },
-                  child: Icon(
+                  child: Icon(Icons.close, color: theme.darkTextColor,),
-                    Icons.close,
-                    color: theme.darkTextColor,
-                  ),
                 )
               ],
             ))
@@ -232,8 +223,8 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
         decoration: BoxDecoration(
           border: Border(
               top: BorderSide(
-                  color:
+                  color: theme.weakDividerColor ??
-                      theme.weakDividerColor ?? CommonColor.weakDividerColor)),
+                      CommonColor.weakDividerColor)),
           color: theme.selectPanelBgColor ?? theme.primaryColor,
         ),
         padding: const EdgeInsets.only(top: 12, bottom: 48),
@@ -244,28 +235,21 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
               children: [
                 IconButton(
                   icon: Image.asset('images/forward.png',
-                      package: 'tencent_cloud_chat_uikit',
+                      package: 'tencent_cloud_chat_uikit', color: theme.selectPanelTextIconColor),
-                      color: theme.selectPanelTextIconColor,
-                      width: 40,
-                      height: 40),
                   iconSize: 40,
                   onPressed: () {
                     _handleForwardMessage(context, false, model);
                   },
                 ),
                 Text(TIM_t("逐条转发"),
-                    style: TextStyle(
+                    style: TextStyle(color: theme.selectPanelTextIconColor, fontSize: 12))
-                        color: theme.selectPanelTextIconColor, fontSize: 12))
               ],
             ),
             Column(
               children: [
                 IconButton(
                   icon: Image.asset('images/merge_forward.png',
-                      package: 'tencent_cloud_chat_uikit',
+                      package: 'tencent_cloud_chat_uikit', color: theme.selectPanelTextIconColor),
-                      color: theme.selectPanelTextIconColor,
-                      width: 40,
-                      height: 40),
                   iconSize: 40,
                   onPressed: () {
                     _handleForwardMessage(context, true, model);
@@ -273,8 +257,7 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                 ),
                 Text(
                   TIM_t("合并转发"),
-                  style: TextStyle(
+                  style: TextStyle(color: theme.selectPanelTextIconColor, fontSize: 12),
-                      color: theme.selectPanelTextIconColor, fontSize: 12),
                 )
               ],
             ),
@@ -282,10 +265,7 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
               children: [
                 IconButton(
                   icon: Image.asset('images/delete.png',
-                      package: 'tencent_cloud_chat_uikit',
+                      package: 'tencent_cloud_chat_uikit', color: theme.selectPanelTextIconColor),
-                      color: theme.selectPanelTextIconColor,
-                      width: 40,
-                      height: 40),
                   iconSize: 40,
                   onPressed: () {
                     showCupertinoModalPopup<String>(
@@ -326,8 +306,7 @@ class MultiSelectPanel extends TIMUIKitStatelessWidget {
                   },
                 ),
                 Text(TIM_t("删除"),
-                    style: TextStyle(
+                    style: TextStyle(color: theme.selectPanelTextIconColor, fontSize: 12))
-                        color: theme.selectPanelTextIconColor, fontSize: 12))
               ],
             )
           ],