From f9313392f1ca555fad87322ab20793106731983e Mon Sep 17 00:00:00 2001
From: chrocy <chrocy@outlook.com>
Date: Tue, 7 Apr 2026 16:44:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20Excel=20=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E8=AE=BE=E7=BD=AE=EF=BC=8C=E8=A7=A3=E5=86=B3=20#529?=
 =?UTF-8?q?=EF=BC=8C=E5=B0=86=E3=80=8C=E5=AF=BC=E5=87=BA=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E5=88=97=E3=80=8D=E9=80=89=E9=A1=B9=E5=90=88=E5=B9=B6=E5=88=B0?=
 =?UTF-8?q?=E3=80=8C=E5=8F=91=E9=80=81=E8=80=85=E5=90=8D=E7=A7=B0=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E3=80=8D=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/ExportPage.tsx | 86 +++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 41 deletions(-)

diff --git a/src/pages/ExportPage.tsx b/src/pages/ExportPage.tsx
index 14926f5..133f496 100644
--- a/src/pages/ExportPage.tsx
+++ b/src/pages/ExportPage.tsx
@@ -8128,27 +8128,7 @@ function ExportPage() {
                 </div>
               )}
 
-              {options.format === 'excel' && (
-                <div className="dialog-section">
-                  <div className="dialog-switch-row">
-                    <div className="dialog-switch-copy">
-                      <h4>导出完整列</h4>
-                      <div className="format-note">
-                        开启后将在 Excel 表格中单独拆分出「发送者昵称」、「微信ID」、「备注」和「群昵称」列。关闭则只保留紧凑的「发送者身份」。
-                      </div>
-                    </div>
-                    <button
-                      type="button"
-                      className={`dialog-switch ${!options.excelCompactColumns ? 'on' : ''}`}
-                      aria-pressed={!options.excelCompactColumns}
-                      aria-label="切换导出完整列"
-                      onClick={() => setOptions(prev => ({ ...prev, excelCompactColumns: !prev.excelCompactColumns }))}
-                    >
-                      <span className="dialog-switch-thumb" />
-                    </button>
-                  </div>
-                </div>
-              )}
+
 
               <div className="dialog-section">
                 <div className="section-header-action">
@@ -8230,27 +8210,51 @@ function ExportPage() {
                 </div>
               )}
 
-              {shouldShowDisplayNameSection && (
+              {(shouldShowDisplayNameSection || options.format === 'excel') && (
                 <div className="dialog-section">
-                  <h4>发送者名称显示</h4>
-                  <div className="display-name-options" role="radiogroup" aria-label="发送者名称显示">
-                    {displayNameOptions.map(option => {
-                      const isActive = options.displayNamePreference === option.value
-                      return (
-                        <button
-                          key={option.value}
-                          type="button"
-                          role="radio"
-                          aria-checked={isActive}
-                          className={`display-name-item ${isActive ? 'active' : ''}`}
-                          onClick={() => setOptions(prev => ({ ...prev, displayNamePreference: option.value }))}
-                        >
-                          <span>{option.label}</span>
-                          <small>{option.desc}</small>
-                        </button>
-                      )
-                    })}
-                  </div>
+                  {shouldShowDisplayNameSection && (
+                    <>
+                      <h4>发送者名称显示</h4>
+                      <div className="display-name-options" role="radiogroup" aria-label="发送者名称显示">
+                        {displayNameOptions.map(option => {
+                          const isActive = options.displayNamePreference === option.value
+                          return (
+                            <button
+                              key={option.value}
+                              type="button"
+                              role="radio"
+                              aria-checked={isActive}
+                              className={`display-name-item ${isActive ? 'active' : ''}`}
+                              onClick={() => setOptions(prev => ({ ...prev, displayNamePreference: option.value }))}
+                            >
+                              <span>{option.label}</span>
+                              <small>{option.desc}</small>
+                            </button>
+                          )
+                        })}
+                      </div>
+                    </>
+                  )}
+
+                  {options.format === 'excel' && (
+                    <div className={`dialog-switch-row ${shouldShowDisplayNameSection ? 'nested-row' : ''}`} style={shouldShowDisplayNameSection ? { marginTop: '12px', paddingTop: '12px', borderTop: '1px solid var(--border-light)' } : {}}>
+                      <div className="dialog-switch-copy">
+                        <h4>导出完整列</h4>
+                        <div className="format-note">
+                          开启后将在 Excel 表格中单独拆分出「发送者昵称」、「微信ID」、「备注」和「群昵称」列。关闭则只保留紧凑的「发送者身份」。
+                        </div>
+                      </div>
+                      <button
+                        type="button"
+                        className={`dialog-switch ${!options.excelCompactColumns ? 'on' : ''}`}
+                        aria-pressed={!options.excelCompactColumns}
+                        aria-label="切换导出完整列"
+                        onClick={() => setOptions(prev => ({ ...prev, excelCompactColumns: !prev.excelCompactColumns }))}
+                      >
+                        <span className="dialog-switch-thumb" />
+                      </button>
+                    </div>
+                  )}
                 </div>
               )}
             </div>