feat: 设置弹框组件样式调整

2026-03-09 20:00:18 +08:00
parent 480abbcf47
commit d4255fc1c8
2 changed files with 128 additions and 106 deletions
--- a/app/components/SettingsModal.jsx
+++ b/app/components/SettingsModal.jsx
@@ -1,6 +1,7 @@
 'use client';

 import { useEffect, useState } from 'react';
+import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog';
 import ConfirmModal from './ConfirmModal';
 import { ResetIcon, SettingsIcon } from './Icons';

@@ -20,6 +21,7 @@ export default function SettingsModal({
 }) {
  const [sliderDragging, setSliderDragging] = useState(false);
  const [resetWidthConfirmOpen, setResetWidthConfirmOpen] = useState(false);
+  const [localSeconds, setLocalSeconds] = useState(tempSeconds);

  useEffect(() => {
    if (!sliderDragging) return;
@@ -32,125 +34,143 @@ export default function SettingsModal({
    };
  }, [sliderDragging]);

+  // 外部的 tempSeconds 变更时，同步到本地显示，但不立即生效
+  useEffect(() => {
+    setLocalSeconds(tempSeconds);
+  }, [tempSeconds]);
+
  return (
-    <div
-      className={`modal-overlay ${sliderDragging ? 'modal-overlay-translucent' : ''}`}
-      role="dialog"
-      aria-modal="true"
-      aria-label="设置"
-      onClick={onClose}
+    <Dialog
+      open
+      onOpenChange={(open) => {
+        if (!open) onClose?.();
+      }}
    >
-      <div className="glass card modal" onClick={(e) => e.stopPropagation()}>
-        <div className="title" style={{ marginBottom: 12 }}>
-          <SettingsIcon width="20" height="20" />
-          <span>设置</span>
-        </div>
-
-        <div className="form-group" style={{ marginBottom: 16 }}>
-          <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem' }}>刷新频率</div>
-          <div className="chips" style={{ marginBottom: 12 }}>
-            {[30, 60, 120, 300].map((s) => (
-              <button
-                key={s}
-                type="button"
-                className={`chip ${tempSeconds === s ? 'active' : ''}`}
-                onClick={() => setTempSeconds(s)}
-                aria-pressed={tempSeconds === s}
-              >
-                {s} 秒
-              </button>
-            ))}
+      <DialogContent
+        overlayClassName={`modal-overlay ${sliderDragging ? 'modal-overlay-translucent' : ''} z-[9999]`}
+        className="!p-0 z-[10000]"
+        showCloseButton={false}
+      >
+        <div className="glass card modal">
+          <div className="title" style={{ marginBottom: 12 }}>
+            <SettingsIcon width="20" height="20" />
+            <DialogTitle asChild>
+              <span>设置</span>
+            </DialogTitle>
          </div>
-          <input
-            className="input"
-            type="number"
-            inputMode="numeric"
-            min="30"
-            step="5"
-            value={tempSeconds}
-            onChange={(e) => setTempSeconds(Number(e.target.value))}
-            placeholder="自定义秒数"
-          />
-          {tempSeconds < 30 && (
-            <div className="error-text" style={{ marginTop: 8 }}>
-              最小 30 秒
-            </div>
-          )}
-        </div>

-        {!isMobile && setContainerWidth && (
          <div className="form-group" style={{ marginBottom: 16 }}>
-            <div style={{ display: 'flex', alignItems: 'center', gap: 6, marginBottom: 8 }}>
-              <div className="muted" style={{ fontSize: '0.8rem' }}>页面宽度</div>
-              {onResetContainerWidth && (
+            <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem' }}>刷新频率</div>
+            <div className="chips" style={{ marginBottom: 12 }}>
+              {[30, 60, 120, 300].map((s) => (
                <button
+                  key={s}
                  type="button"
-                  className="icon-button"
-                  onClick={() => setResetWidthConfirmOpen(true)}
-                  title="重置页面宽度"
-                  style={{
-                    border: 'none',
-                    width: '24px',
-                    height: '24px',
-                    padding: 0,
-                    backgroundColor: 'transparent',
-                    color: 'var(--muted)',
-                  }}
+                className={`chip ${localSeconds === s ? 'active' : ''}`}
+                onClick={() => setLocalSeconds(s)}
+                aria-pressed={localSeconds === s}
                >
-                  <ResetIcon width="14" height="14" />
+                  {s} 秒
                </button>
-              )}
-            </div>
-            <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
-              <input
-                type="range"
-                min={600}
-                max={2000}
-                step={10}
-                value={Math.min(2000, Math.max(600, Number(containerWidth) || 1200))}
-                onChange={(e) => setContainerWidth(Number(e.target.value))}
-                onPointerDown={() => setSliderDragging(true)}
-                className="page-width-slider"
-                style={{
-                  flex: 1,
-                  height: 6,
-                  accentColor: 'var(--primary)',
-                }}
-              />
-              <span className="muted" style={{ fontSize: '0.8rem', minWidth: 48 }}>
-                {Math.min(2000, Math.max(600, Number(containerWidth) || 1200))}px
-              </span>
+              ))}
            </div>
+            <input
+              className="input"
+              type="number"
+              inputMode="numeric"
+              min="30"
+              step="5"
+            value={localSeconds}
+            onChange={(e) => setLocalSeconds(Number(e.target.value))}
+              placeholder="自定义秒数"
+            />
+          {localSeconds < 30 && (
+              <div className="error-text" style={{ marginTop: 8 }}>
+                最小 30 秒
+              </div>
+            )}
          </div>
-        )}

-        <div className="form-group" style={{ marginBottom: 16 }}>
-          <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem' }}>数据导出</div>
-          <div className="row" style={{ gap: 8 }}>
-            <button type="button" className="button" onClick={exportLocalData}>导出配置</button>
-          </div>
-          <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem', marginTop: 26 }}>数据导入</div>
-          <div className="row" style={{ gap: 8, marginTop: 8 }}>
-            <button type="button" className="button" onClick={() => importFileRef.current?.click?.()}>导入配置</button>
-          </div>
-          <input
-            ref={importFileRef}
-            type="file"
-            accept="application/json"
-            style={{ display: 'none' }}
-            onChange={handleImportFileChange}
-          />
-          {importMsg && (
-            <div className="muted" style={{ marginTop: 8 }}>
-              {importMsg}
+          {!isMobile && setContainerWidth && (
+            <div className="form-group" style={{ marginBottom: 16 }}>
+              <div style={{ display: 'flex', alignItems: 'center', gap: 6, marginBottom: 8 }}>
+                <div className="muted" style={{ fontSize: '0.8rem' }}>页面宽度</div>
+                {onResetContainerWidth && (
+                  <button
+                    type="button"
+                    className="icon-button"
+                    onClick={() => setResetWidthConfirmOpen(true)}
+                    title="重置页面宽度"
+                    style={{
+                      border: 'none',
+                      width: '24px',
+                      height: '24px',
+                      padding: 0,
+                      backgroundColor: 'transparent',
+                      color: 'var(--muted)',
+                    }}
+                  >
+                    <ResetIcon width="14" height="14" />
+                  </button>
+                )}
+              </div>
+              <div style={{ display: 'flex', alignItems: 'center', gap: 12 }}>
+                <input
+                  type="range"
+                  min={600}
+                  max={2000}
+                  step={10}
+                  value={Math.min(2000, Math.max(600, Number(containerWidth) || 1200))}
+                  onChange={(e) => setContainerWidth(Number(e.target.value))}
+                  onPointerDown={() => setSliderDragging(true)}
+                  className="page-width-slider"
+                  style={{
+                    flex: 1,
+                    height: 6,
+                    accentColor: 'var(--primary)',
+                  }}
+                />
+                <span className="muted" style={{ fontSize: '0.8rem', minWidth: 48 }}>
+                  {Math.min(2000, Math.max(600, Number(containerWidth) || 1200))}px
+                </span>
+              </div>
            </div>
          )}
-        </div>

-        <div className="row" style={{ justifyContent: 'flex-end', marginTop: 24 }}>
-          <button className="button" onClick={saveSettings} disabled={tempSeconds < 30}>保存并关闭</button>
+          <div className="form-group" style={{ marginBottom: 16 }}>
+            <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem' }}>数据导出</div>
+            <div className="row" style={{ gap: 8 }}>
+              <button type="button" className="button" onClick={exportLocalData}>导出配置</button>
+            </div>
+            <div className="muted" style={{ marginBottom: 8, fontSize: '0.8rem', marginTop: 26 }}>数据导入</div>
+            <div className="row" style={{ gap: 8, marginTop: 8 }}>
+              <button type="button" className="button" onClick={() => importFileRef.current?.click?.()}>导入配置</button>
+            </div>
+            <input
+              ref={importFileRef}
+              type="file"
+              accept="application/json"
+              style={{ display: 'none' }}
+              onChange={handleImportFileChange}
+            />
+            {importMsg && (
+              <div className="muted" style={{ marginTop: 8 }}>
+                {importMsg}
+              </div>
+            )}
+          </div>
+
+          <div className="row" style={{ justifyContent: 'flex-end', marginTop: 24 }}>
+            <button
+              className="button"
+              onClick={(e) => saveSettings(e, localSeconds)}
+              disabled={localSeconds < 30}
+            >
+              保存并关闭
+            </button>
+          </div>
        </div>
-      </div>
+      </DialogContent>
      {resetWidthConfirmOpen && onResetContainerWidth && (
        <ConfirmModal
          title="重置页面宽度"
@@ -163,6 +183,6 @@ export default function SettingsModal({
          confirmText="重置"
        />
      )}
-    </div>
+    </Dialog>
  );
 }
--- a/app/page.jsx
+++ b/app/page.jsx
@@ -2585,9 +2585,11 @@ export default function HomePage() {
    await refreshAll(codes);
  };

-  const saveSettings = (e) => {
+  const saveSettings = (e, secondsOverride) => {
    e?.preventDefault?.();
-    const ms = Math.max(30, Number(tempSeconds)) * 1000;
+    const seconds = secondsOverride ?? tempSeconds;
+    const ms = Math.max(30, Number(seconds)) * 1000;
+    setTempSeconds(Math.round(ms / 1000));
    setRefreshMs(ms);
    storageHelper.setItem('refreshMs', String(ms));
    const w = Math.min(2000, Math.max(600, Number(containerWidth) || 1200));