From 2dd36479237906e1cad7f761b7a7a0ee6c859ab4 Mon Sep 17 00:00:00 2001
From: zxyszx <299979470+zxyszx@users.noreply.github.com>
Date: Thu, 13 Aug 2026 01:11:44 +0800
Subject: [PATCH] release: prepare v1.2.37

---
 .github/release-notes/v1.2.37.md |  4 ++++
 VERSION                          |  2 +-
 apps/web/src/pages/mail.tsx      | 21 +++++++++++++++++----
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .github/release-notes/v1.2.37.md

diff --git a/.github/release-notes/v1.2.37.md b/.github/release-notes/v1.2.37.md
new file mode 100644
index 0000000..3738291
--- /dev/null
+++ b/.github/release-notes/v1.2.37.md
@@ -0,0 +1,4 @@
+- 写信页发送区改为 Gmail 风格拆分按钮，主按钮直接发送，右侧下拉菜单提供“定时发送”。
+- 移除容易被误认为日期选择器的独立日历方块，保留原有定时预设和自定义发送时间功能。
+
+**完整更新日志**：[v1.2.36...v1.2.37](https://github.com/zxyszx/NewSzxcn-Email/compare/v1.2.36...v1.2.37)
diff --git a/VERSION b/VERSION
index 780ac74..a678a28 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.36
+1.2.37
diff --git a/apps/web/src/pages/mail.tsx b/apps/web/src/pages/mail.tsx
index 6f47bb2..40c11c4 100644
--- a/apps/web/src/pages/mail.tsx
+++ b/apps/web/src/pages/mail.tsx
@@ -4284,10 +4284,23 @@ function ComposeDialog({ mailboxes, mailbox, open, draft, limits, canSend, canMa
             />
           </div>
           <DialogFooter className="flex flex-row items-center justify-between gap-3 border-t bg-muted/15 px-4 py-3 sm:px-5">
-            <div className="flex min-w-0 items-center gap-2">
-              {canSend && <Button className="min-h-10 px-4" disabled={send.isPending || !senderMailbox}><Send className="h-4 w-4" />{send.isPending ? "发送中..." : "发送"}</Button>}
-              {canSchedule && <Button type="button" variant="outline" size="icon" className="h-10 w-10 shrink-0" title="定时发送" aria-label="定时发送" disabled={send.isPending || scheduleSend.isPending || !senderMailbox} onClick={() => setScheduleDialogOpen(true)}><Calendar className="h-4 w-4" /></Button>}
-            </div>
+            {canSend && (
+              <div className="flex min-w-0 items-center">
+                <Button className={cn("min-h-10 px-4", canSchedule && "rounded-r-none")} disabled={send.isPending || !senderMailbox}><Send className="h-4 w-4" />{send.isPending ? "发送中..." : "发送"}</Button>
+                {canSchedule && (
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button type="button" size="icon" className="h-10 w-9 shrink-0 rounded-l-none border-l border-primary-foreground/25 px-0" title="发送选项" aria-label="发送选项" disabled={send.isPending || scheduleSend.isPending || !senderMailbox}>
+                        <ChevronDown className="h-4 w-4" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="start" side="top" className="w-40">
+                      <DropdownMenuItem className={composerMenuItemClass} onSelect={() => setScheduleDialogOpen(true)}><Clock3 className="h-4 w-4" />定时发送</DropdownMenuItem>
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                )}
+              </div>
+            )}
             <Button type="button" variant="ghost" className="min-h-10 px-3" disabled={closing} onClick={() => { void closeCompose() }}>{closing ? "保存中..." : "取消"}</Button>
           </DialogFooter>
         </form>