From 163e553de41d41f8e19908fa6b1038e0aa244b85 Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Wed, 28 Oct 2026 17:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E6=A1=86?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=9C=BA=E6=88=BF=20Chrome=2094=EF=BC=9A?=
 =?UTF-8?q?=E4=BB=A5=E5=89=8D=E7=82=B9=E4=B8=8B=E6=8B=89=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=9D=A0=20showPicker()=20=E5=BC=B9=E5=87=BA=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A1=86=EF=BC=8C=E5=AE=83=20Chrome=2099=20=E6=89=8D=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E6=9C=89=EF=BC=8CChrome=2094=20=E7=9A=84=E5=8E=9F?=
 =?UTF-8?q?=E5=9E=8B=E4=B8=8A=E6=9C=89=E8=BF=99=E4=B8=AA=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E3=80=81=E8=B0=83=E7=94=A8=E5=8D=B4=E6=B2=A1=E5=8F=8D=E5=BA=94?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B9=E7=9B=AE=206=20=E4=BB=BB=E5=8A=A1=203?=
 =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=208=20=E4=BB=BB=E5=8A=A1=205=20?=
 =?UTF-8?q?=E9=80=89=E4=B8=8D=E4=BA=86=E6=97=A5=E6=9C=9F=E3=80=82=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=8A=8A=E6=B5=8F=E8=A7=88=E5=99=A8=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=E6=A1=86=E9=80=8F=E6=98=8E=E5=9C=B0=E7=9B=96=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=8C=89=E9=92=AE=E4=B8=8A=E3=80=81=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E5=9B=BE=E6=A0=87=E6=92=91=E6=BB=A1=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E6=8C=89=E9=92=AE=E7=94=B1=E6=B5=8F=E8=A7=88?=
 =?UTF-8?q?=E5=99=A8=E8=87=AA=E5=B7=B1=E5=BC=B9=E5=87=BA=EF=BC=88Chromium?=
 =?UTF-8?q?=2094=20=E5=92=8C=E6=96=B0=E7=89=88=20Chrome=20=E5=AE=9E?=
 =?UTF-8?q?=E6=B5=8B=E9=83=BD=E8=83=BD=E9=80=89=EF=BC=89=E3=80=82=E8=BF=90?=
 =?UTF-8?q?=E8=A1=8C=E6=97=B6=E9=95=BF=E6=97=A5=E6=9C=9F=E5=92=8C=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87=20Windows=20=E4=B8=80=E8=87=B4=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E5=B8=A6=E6=98=9F=E6=9C=9F=EF=BC=88Linux=20=E7=9A=84=20zh-CN?=
 =?UTF-8?q?=20=E9=95=BF=E6=97=A5=E6=9C=9F=E6=98=AF"2026=E5=B9=B410?=
 =?UTF-8?q?=E6=9C=8828=E6=97=A5=E6=98=9F=E6=9C=9F=E4=B8=89"=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A1=86=E7=AA=84=EF=BC=8C=E6=98=9F=E6=9C=9F?=
 =?UTF-8?q?=E8=A2=AB=E6=88=AA=E6=8E=89=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 runtime/Sim.Runner/StudentProgramHost.cs   |  5 +++-
 web/src/winforms/DateTimePickerControl.vue | 28 +++++++++++++++-------
 web/src/winforms/winforms.css              | 20 ++++++++++++++++
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/runtime/Sim.Runner/StudentProgramHost.cs b/runtime/Sim.Runner/StudentProgramHost.cs
index e9dbc49..dea0635 100644
--- a/runtime/Sim.Runner/StudentProgramHost.cs
+++ b/runtime/Sim.Runner/StudentProgramHost.cs
@@ -28,10 +28,13 @@ internal static class StudentProgramHost
         Console.SetIn(TextReader.Null); // 标准输入用于协议，学生的 Console.ReadLine 读不到内容
 
         // 和中文 Windows 一致：DateTime.ToString() 等按 zh-CN 格式输出。
-        // Linux 上的区域数据把时间写成 09:05:03，中文 Windows 是 9:05:03（书上的截图也是），这里改成 Windows 的写法
+        // Linux 上的区域数据把时间写成 09:05:03，中文 Windows 是 9:05:03（书上的截图也是）；长日期后面多了星期（2024年1月16日星期二），
+        // 中文 Windows 的长日期不带星期（日期选择框的长日期格式窄，带上星期会被截掉）。这里都改成 Windows 的写法
         var zhCN = (CultureInfo)CultureInfo.GetCultureInfo("zh-CN").Clone();
         zhCN.DateTimeFormat.LongTimePattern = "H:mm:ss";
         zhCN.DateTimeFormat.ShortTimePattern = "H:mm";
+        zhCN.DateTimeFormat.LongDatePattern = "yyyy'年'M'月'd'日'";
+        zhCN.DateTimeFormat.FullDateTimePattern = "yyyy'年'M'月'd'日' H:mm:ss";
         zhCN = CultureInfo.ReadOnly(zhCN);
         CultureInfo.DefaultThreadCurrentCulture = zhCN;
         CultureInfo.DefaultThreadCurrentUICulture = zhCN;
diff --git a/web/src/winforms/DateTimePickerControl.vue b/web/src/winforms/DateTimePickerControl.vue
index c55b312..8d5b979 100644
--- a/web/src/winforms/DateTimePickerControl.vue
+++ b/web/src/winforms/DateTimePickerControl.vue
@@ -1,7 +1,9 @@
 <script setup lang="ts">
 // 日期时间选择器：文字由运行器按 Format 生成（如 2024年1月16日），点下拉按钮弹出浏览器的日期 / 时间选择框，
 // 选好后把完整的日期时间发给运行器（只选日期时保留原来的时间，和 WinForms 一样）。
-import { computed, ref, type CSSProperties } from 'vue'
+// 下拉按钮上透明地盖着浏览器的日期框（日历图标撑满按钮），点按钮其实点的是日期框自己的图标，由浏览器弹出选择框。
+// 不用 showPicker()：它 Chrome 99 才正式有，机房 Chrome 94 的原型上虽然有这个方法，调用却没有反应。
+import { computed, type CSSProperties } from 'vue'
 import type { ControlNode, UserAction } from '@iot/shared'
 
 const props = defineProps<{
@@ -20,12 +22,9 @@ const nativeValue = computed(() => {
   const [date, time] = value.value.split('T')
   return inputType.value === 'date' ? date : inputType.value === 'time' ? time : value.value
 })
-const picker = ref<HTMLInputElement>()
-
-function open() {
-  if (!props.enabled) return
-  props.act({ action: 'dropDown' })
-  picker.value?.showPicker?.()
+/** 点的是盖在按钮上的日期框：告诉运行器"展开了"（触发 DropDown），弹出由浏览器负责 */
+function nativeDown() {
+  if (props.enabled) props.act({ action: 'dropDown' })
 }
 
 function pick(event: Event) {
@@ -58,7 +57,18 @@ function step(delta: number) {
       <span @mousedown.prevent="step(1)">▴</span>
       <span @mousedown.prevent="step(-1)">▾</span>
     </span>
-    <span v-else class="wf-dtp-button" title="选择日期" @mousedown.prevent="open">▾</span>
-    <input ref="picker" class="wf-dtp-native" :type="inputType" step="1" :value="nativeValue" tabindex="-1" @change="pick" />
+    <span v-else class="wf-dtp-button">▾</span>
+    <input
+      class="wf-dtp-native"
+      :class="{ 'wf-dtp-overlay': !p.ShowUpDown }"
+      title="选择日期"
+      :type="inputType"
+      step="1"
+      :value="nativeValue"
+      :disabled="!enabled"
+      tabindex="-1"
+      @mousedown="nativeDown"
+      @change="pick"
+    />
   </div>
 </template>
diff --git a/web/src/winforms/winforms.css b/web/src/winforms/winforms.css
index b831d19..88772a2 100644
--- a/web/src/winforms/winforms.css
+++ b/web/src/winforms/winforms.css
@@ -365,6 +365,26 @@
   padding: 0;
 }
 
+/* 日期框透明地盖在下拉按钮上，日历图标撑满整个按钮，点它就由浏览器弹出选择框（见 DateTimePickerControl.vue） */
+.wf-dtp-native.wf-dtp-overlay {
+  left: auto;
+  right: 0;
+  top: 0;
+  width: 17px;
+  height: auto;
+  pointer-events: auto;
+}
+
+.wf-dtp-overlay::-webkit-calendar-picker-indicator {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  padding: 0;
+}
+
 /* TrackBar：灰色轨道、刻度、蓝色滑块（Windows 10 样式） */
 .wf-trackbar {
   outline: none;