Prechádzať zdrojové kódy

feat: add node configuration drawer, modal, table, and constants components for admin UI

hujiarui 1 mesiac pred
rodič
commit
37aed62fa2

+ 93 - 3
src/components/admin/node-configurations/NodeConfigCreateWizardModal.tsx

@@ -18,7 +18,15 @@ import { proxyService } from '@/lib/services/proxyService';
 import AppointmentTypeEditor from './AppointmentTypeEditor';
 import RegisteredNodeSelect from '@/components/admin/node-configurations/RegisteredNodeSelect';
 
-import { LOCAL_PROXY_POOLS, COMMON_WEBSITES } from './nodeConfigConstants';
+import {
+  LOCAL_PROXY_POOLS,
+  COMMON_WEBSITES,
+  ACTIVE_TIME_PRESETS,
+  getBrowserTimezoneDisplay,
+  localToUtcTime,
+  convertActiveTimeLocalToUtc,
+  convertActiveTimeUtcToLocal,
+} from './nodeConfigConstants';
 
 interface NodeConfigCreateWizardModalProps {
   isOpen: boolean;
@@ -237,6 +245,11 @@ export default function NodeConfigCreateWizardModal({
       if (roleTpl.proxy_cd !== undefined) setProxyCd(Number(roleTpl.proxy_cd));
       if (roleTpl.session_max_life !== undefined) setSessionMaxLife(Number(roleTpl.session_max_life));
       if (roleTpl.login_interval !== undefined) setLoginInterval(Number(roleTpl.login_interval));
+      if (roleTpl.active_time_start !== undefined || roleTpl.active_time_end !== undefined) {
+        const { startLocal, endLocal } = convertActiveTimeUtcToLocal(roleTpl.active_time_start, roleTpl.active_time_end);
+        setActiveTimeStart(startLocal);
+        setActiveTimeEnd(endLocal);
+      }
 
       if (entryType === 'booker') {
         const accSource = roleTpl['account_source'] ?? roleTpl['booker.account_source'];
@@ -299,10 +312,13 @@ export default function NodeConfigCreateWizardModal({
       if (freeConfigStr.trim()) parsedFreeConfig = JSON.parse(freeConfigStr);
     } catch {}
 
+    const { startUtc, endUtc } = convertActiveTimeLocalToUtc(activeTimeStart, activeTimeEnd);
     const base: any = {
       node_id: nodeId.trim(),
       identifier: identifier.trim(),
       website: website.trim(),
+      active_time_start: startUtc,
+      active_time_end: endUtc,
       plugin_config: pluginConfig,
       appointment_types: appointmentTypes,
       free_config: parsedFreeConfig,
@@ -314,8 +330,6 @@ export default function NodeConfigCreateWizardModal({
       base.proxy_pool = proxyList;
       base.proxy_cd = proxyCd;
       base.session_max_life = sessionMaxLife;
-      base.active_time_start = activeTimeStart;
-      base.active_time_end = activeTimeEnd;
       base.booker = {
         account_source: bookerAccountSource,
         account_pool_id: bookerAccountPoolId.trim(),
@@ -580,6 +594,82 @@ export default function NodeConfigCreateWizardModal({
                 </div>
               </div>
 
+              {/* Active Time Window */}
+              <div className="border-2 border-black bg-neutral-100 p-4 shadow-[2px_2px_0px_#000] space-y-3">
+                <div className="flex items-center gap-2 border-b-2 border-black pb-1.5">
+                  <span className="w-2 h-2 bg-black inline-block" />
+                  <span className="font-black text-black uppercase">[ TIME WINDOW // 每日生效时间窗口 ]</span>
+                </div>
+
+                <div className="space-y-2">
+                  <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-1">
+                    <label className="block text-[11px] font-bold text-black">
+                      每日任务运行时间窗口 (本地时区: {getBrowserTimezoneDisplay()},系统自动转为 UTC 存储)
+                    </label>
+                    <span className="text-[10px] text-neutral-500 font-mono">
+                      {activeTimeStart === '00:00' && activeTimeEnd === '23:59'
+                        ? '全天 24H (底层存储 UTC: 00:00 ~ 23:59)'
+                        : `底层存储 UTC: ${localToUtcTime(activeTimeStart)} ~ ${localToUtcTime(activeTimeEnd)}`}
+                    </span>
+                  </div>
+
+                  <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
+                    <div>
+                      <label className="block text-[10px] font-bold text-neutral-600 mb-1">开始时间 (时:分)</label>
+                      <input
+                        type="time"
+                        value={activeTimeStart}
+                        onChange={(e) => setActiveTimeStart(e.target.value)}
+                        className="w-full px-3 py-1.5 border-2 border-black bg-neutral-50 focus:bg-white text-xs font-mono text-black outline-none shadow-[1px_1px_0px_#000]"
+                      />
+                    </div>
+                    <div>
+                      <label className="block text-[10px] font-bold text-neutral-600 mb-1">结束时间 (时:分)</label>
+                      <input
+                        type="time"
+                        value={activeTimeEnd}
+                        onChange={(e) => setActiveTimeEnd(e.target.value)}
+                        className="w-full px-3 py-1.5 border-2 border-black bg-neutral-50 focus:bg-white text-xs font-mono text-black outline-none shadow-[1px_1px_0px_#000]"
+                      />
+                    </div>
+                  </div>
+
+                  {/* Preset chips */}
+                  <div className="flex flex-wrap items-center gap-1.5 pt-1">
+                    <span className="text-[10px] text-neutral-500 font-bold">常用时段预设:</span>
+                    {ACTIVE_TIME_PRESETS.map((t) => (
+                      <button
+                        key={t.label}
+                        type="button"
+                        onClick={() => {
+                          setActiveTimeStart(t.start);
+                          setActiveTimeEnd(t.end);
+                        }}
+                        className={`px-2 py-0.5 text-[10px] font-mono font-bold border transition ${
+                          activeTimeStart === t.start && activeTimeEnd === t.end
+                            ? 'bg-amber-300 text-black border-black shadow-[1px_1px_0px_#000]'
+                            : 'bg-white text-neutral-700 border-neutral-300 hover:border-black hover:bg-neutral-100'
+                        }`}
+                      >
+                        {t.label}
+                      </button>
+                    ))}
+                    {(activeTimeStart !== '00:00' || activeTimeEnd !== '23:59') && (
+                      <button
+                        type="button"
+                        onClick={() => {
+                          setActiveTimeStart('00:00');
+                          setActiveTimeEnd('23:59');
+                        }}
+                        className="px-2 py-0.5 text-[10px] font-mono font-bold text-red-600 border border-red-300 hover:bg-red-50 hover:border-red-600 transition"
+                      >
+                        [ 重置为全天 24H ]
+                      </button>
+                    )}
+                  </div>
+                </div>
+              </div>
+
               {/* Standalone special */}
               {entryType === 'standalone' && (
                 <div className="border-2 border-black bg-neutral-100 p-4 shadow-[2px_2px_0px_#000] space-y-3">

+ 22 - 0
src/components/admin/node-configurations/NodeConfigDetailDrawer.tsx

@@ -19,6 +19,7 @@ import {
 } from '@/types';
 import { nodeConfigService } from '@/lib/services/nodeConfigService';
 import { retroConfirm } from '@/lib/dialog';
+import { convertActiveTimeUtcToLocal, getBrowserTimezoneName } from './nodeConfigConstants';
 
 interface NodeConfigDetailDrawerProps {
   isOpen: boolean;
@@ -362,6 +363,27 @@ export default function NodeConfigDetailDrawer({
                     <span className="text-neutral-500 block text-[10px]">当前版本:</span>
                     <span className="text-black font-bold">v{config.version}</span>
                   </div>
+                  <div>
+                    <span className="text-neutral-500 block text-[10px]">每日生效时间窗口:</span>
+                    <span className="text-black font-bold">
+                      {(() => {
+                        const { startLocal, endLocal, isFullDay } = convertActiveTimeUtcToLocal(
+                          config.active_time_start,
+                          config.active_time_end
+                        );
+                        if (isFullDay) {
+                          return '全天 24H (默认)';
+                        }
+                        return `${startLocal} ~ ${endLocal} (${getBrowserTimezoneName()}) [UTC: ${config.active_time_start} ~ ${config.active_time_end}]`;
+                      })()}
+                    </span>
+                  </div>
+                  <div>
+                    <span className="text-neutral-500 block text-[10px]">Session 存活 / 代理 CD:</span>
+                    <span className="text-black font-bold">
+                      {config.session_max_life ? `${config.session_max_life}s` : '-'} / {config.proxy_cd ? `${config.proxy_cd}s` : '-'}
+                    </span>
+                  </div>
                   <div className="col-span-2">
                     <span className="text-neutral-500 block text-[10px]">使馆登录网址 (website):</span>
                     <span className="text-black font-mono break-all">{config.website || '未设置'}</span>

+ 28 - 15
src/components/admin/node-configurations/NodeConfigEditModal.tsx

@@ -34,6 +34,10 @@ import {
   RANDOM_MAX_PRESETS,
   LOGIN_INTERVAL_PRESETS,
   ACTIVE_TIME_PRESETS,
+  getBrowserTimezoneDisplay,
+  localToUtcTime,
+  convertActiveTimeLocalToUtc,
+  convertActiveTimeUtcToLocal,
 } from './nodeConfigConstants';
 
 interface NodeConfigEditModalProps {
@@ -132,8 +136,9 @@ export default function NodeConfigEditModal({
       setWebsite(config.website || '');
       setProxyCd(config.proxy_cd !== undefined ? config.proxy_cd : '');
       setSessionMaxLife(config.session_max_life !== undefined ? config.session_max_life : '');
-      setActiveTimeStart(config.active_time_start || '');
-      setActiveTimeEnd(config.active_time_end || '');
+      const { startLocal, endLocal, isFullDay } = convertActiveTimeUtcToLocal(config.active_time_start, config.active_time_end);
+      setActiveTimeStart(isFullDay ? '00:00' : startLocal);
+      setActiveTimeEnd(isFullDay ? '23:59' : endLocal);
       setProxyPoolStr(config.proxy_pool ? config.proxy_pool.join(', ') : '');
 
       setOrderId(config.order_id || '');
@@ -220,13 +225,14 @@ export default function NodeConfigEditModal({
       setObj['session_max_life'] = Number(sessionMaxLife);
     }
 
-    if (activeTimeStart !== (config.active_time_start || '')) {
-      if (activeTimeStart === '') clearArr.push('active_time_start');
-      else setObj['active_time_start'] = activeTimeStart;
+    const { startUtc, endUtc } = convertActiveTimeLocalToUtc(activeTimeStart, activeTimeEnd);
+    const origStartUtc = config.active_time_start || '00:00';
+    const origEndUtc = config.active_time_end || '23:59';
+    if (startUtc !== origStartUtc) {
+      setObj['active_time_start'] = startUtc;
     }
-    if (activeTimeEnd !== (config.active_time_end || '')) {
-      if (activeTimeEnd === '') clearArr.push('active_time_end');
-      else setObj['active_time_end'] = activeTimeEnd;
+    if (endUtc !== origEndUtc) {
+      setObj['active_time_end'] = endUtc;
     }
 
     const newProxyList = proxyPoolStr.split(',').map((s) => s.trim()).filter(Boolean);
@@ -319,8 +325,8 @@ export default function NodeConfigEditModal({
       website,
       proxy_cd: proxyCd === '' ? undefined : Number(proxyCd),
       session_max_life: sessionMaxLife === '' ? undefined : Number(sessionMaxLife),
-      active_time_start: activeTimeStart || undefined,
-      active_time_end: activeTimeEnd || undefined,
+      active_time_start: convertActiveTimeLocalToUtc(activeTimeStart, activeTimeEnd).startUtc,
+      active_time_end: convertActiveTimeLocalToUtc(activeTimeStart, activeTimeEnd).endUtc,
       proxy_pool: proxyPoolStr
         .split(',')
         .map((s) => s.trim())
@@ -383,8 +389,11 @@ export default function NodeConfigEditModal({
     if (jsonObj.website !== undefined) setWebsite(jsonObj.website);
     if (jsonObj.proxy_cd !== undefined) setProxyCd(jsonObj.proxy_cd);
     if (jsonObj.session_max_life !== undefined) setSessionMaxLife(jsonObj.session_max_life);
-    if (jsonObj.active_time_start !== undefined) setActiveTimeStart(jsonObj.active_time_start);
-    if (jsonObj.active_time_end !== undefined) setActiveTimeEnd(jsonObj.active_time_end);
+    if (jsonObj.active_time_start !== undefined || jsonObj.active_time_end !== undefined) {
+      const { startLocal, endLocal } = convertActiveTimeUtcToLocal(jsonObj.active_time_start, jsonObj.active_time_end);
+      setActiveTimeStart(startLocal);
+      setActiveTimeEnd(endLocal);
+    }
     if (jsonObj.proxy_pool !== undefined && Array.isArray(jsonObj.proxy_pool)) {
       setProxyPoolStr(jsonObj.proxy_pool.join(', '));
     }
@@ -746,9 +755,13 @@ export default function NodeConfigEditModal({
 
                   {/* Active Time Window with presets */}
                   <div className="md:col-span-2 space-y-1.5 pt-1 border-t border-black/10">
-                    <div className="flex justify-between items-center">
-                      <label className="block text-[11px] font-bold text-black">每日生效时间窗口 (active_time_start ~ active_time_end)</label>
-                      <span className="text-[10px] text-neutral-500">留空为不限</span>
+                    <div className="flex flex-col sm:flex-row sm:items-center justify-between gap-1">
+                      <label className="block text-[11px] font-bold text-black">每日生效时间窗口 (本地时区: {getBrowserTimezoneDisplay()},系统自动转为 UTC 存储)</label>
+                      <span className="text-[10px] text-neutral-500 font-mono">
+                        {(!activeTimeStart && !activeTimeEnd) || (activeTimeStart === '00:00' && activeTimeEnd === '23:59')
+                          ? '全天 24H (底层存储 UTC: 00:00 ~ 23:59)'
+                          : `底层存储 UTC: ${localToUtcTime(activeTimeStart)} ~ ${localToUtcTime(activeTimeEnd)}`}
+                      </span>
                     </div>
                     <div className="grid grid-cols-2 gap-2">
                       <div>

+ 17 - 1
src/components/admin/node-configurations/NodeConfigTable.tsx

@@ -12,6 +12,7 @@ import {
 } from '@/types';
 import { nodeConfigService } from '@/lib/services/nodeConfigService';
 import { retroConfirm } from '@/lib/dialog';
+import { convertActiveTimeUtcToLocal, getBrowserTimezoneName } from './nodeConfigConstants';
 
 interface NodeConfigTableProps {
   entryType: NodeConfigEntryType;
@@ -169,10 +170,25 @@ export default function NodeConfigTable({
                         <span className="font-black text-black">{item.node_id}</span>
                         <span className="text-[10px] text-neutral-500 font-normal">#{item.id}</span>
                       </div>
-                      <div>
+                      <div className="flex flex-wrap items-center gap-1">
                         <span className="px-1.5 py-0.2 border border-black bg-amber-300 text-black font-black uppercase text-[10px] shadow-[1px_1px_0px_#000]">
                           {item.identifier}
                         </span>
+                        {(() => {
+                          const { startLocal, endLocal, isFullDay } = convertActiveTimeUtcToLocal(
+                            item.active_time_start,
+                            item.active_time_end
+                          );
+                          if (isFullDay) return null;
+                          return (
+                            <span
+                              className="px-1.5 py-0.2 border border-black bg-sky-200 text-sky-950 font-bold text-[10px] shadow-[1px_1px_0px_#000]"
+                              title={`每日生效运行时间窗口 (本地: ${startLocal}~${endLocal} [${getBrowserTimezoneName()}] | 存储UTC: ${item.active_time_start}~${item.active_time_end})`}
+                            >
+                              🕒 {startLocal}~{endLocal} (本地)
+                            </span>
+                          );
+                        })()}
                       </div>
                     </div>
                   </td>

+ 90 - 3
src/components/admin/node-configurations/nodeConfigConstants.ts

@@ -132,12 +132,99 @@ export const LOGIN_INTERVAL_PRESETS = [
 ];
 
 /**
- * 活跃时间段预设
+ * 浏览器本地时区与 UTC 相互转换工具函数
+ * 前端界面统一按浏览器本地时区 (Local Time) 交互与展示,后端及数据库均以标准 UTC 时间存储与执行。
+ */
+export function getBrowserTimezoneOffsetMinutes(): number {
+  return -new Date().getTimezoneOffset();
+}
+
+export function getBrowserTimezoneName(): string {
+  try {
+    return Intl.DateTimeFormat().resolvedOptions().timeZone || 'Local';
+  } catch {
+    return 'Local';
+  }
+}
+
+export function getBrowserTimezoneDisplay(): string {
+  try {
+    const tz = getBrowserTimezoneName();
+    const offsetMinutes = getBrowserTimezoneOffsetMinutes();
+    const sign = offsetMinutes >= 0 ? '+' : '-';
+    const absMinutes = Math.abs(offsetMinutes);
+    const h = Math.floor(absMinutes / 60);
+    const m = absMinutes % 60;
+    const offsetStr = `UTC${sign}${h}${m > 0 ? `:${String(m).padStart(2, '0')}` : ''}`;
+    return `${tz} (${offsetStr})`;
+  } catch {
+    return '本地时区';
+  }
+}
+
+export function localToUtcTime(localTime?: string): string {
+  if (!localTime || !localTime.includes(':')) return '';
+  const [hStr, mStr] = localTime.split(':');
+  const h = parseInt(hStr, 10);
+  const m = parseInt(mStr, 10);
+  if (isNaN(h) || isNaN(m)) return '';
+  const offsetMins = getBrowserTimezoneOffsetMinutes();
+  const totalUtcMinutes = ((h * 60 + m - offsetMins) % 1440 + 1440) % 1440;
+  const utcH = Math.floor(totalUtcMinutes / 60);
+  const utcM = totalUtcMinutes % 60;
+  return `${String(utcH).padStart(2, '0')}:${String(utcM).padStart(2, '0')}`;
+}
+
+export function utcToLocalTime(utcTime?: string): string {
+  if (!utcTime || !utcTime.includes(':')) return '';
+  const [hStr, mStr] = utcTime.split(':');
+  const h = parseInt(hStr, 10);
+  const m = parseInt(mStr, 10);
+  if (isNaN(h) || isNaN(m)) return '';
+  const offsetMins = getBrowserTimezoneOffsetMinutes();
+  const totalLocalMinutes = ((h * 60 + m + offsetMins) % 1440 + 1440) % 1440;
+  const localH = Math.floor(totalLocalMinutes / 60);
+  const localM = totalLocalMinutes % 60;
+  return `${String(localH).padStart(2, '0')}:${String(localM).padStart(2, '0')}`;
+}
+
+export function convertActiveTimeLocalToUtc(startLocal?: string, endLocal?: string): { startUtc: string; endUtc: string } {
+  if (!startLocal || !endLocal || (startLocal === '00:00' && endLocal === '23:59')) {
+    return { startUtc: '00:00', endUtc: '23:59' };
+  }
+  return {
+    startUtc: localToUtcTime(startLocal),
+    endUtc: localToUtcTime(endLocal),
+  };
+}
+
+export function convertActiveTimeUtcToLocal(startUtc?: string, endUtc?: string): { startLocal: string; endLocal: string; isFullDay: boolean } {
+  if (!startUtc || !endUtc || (startUtc === '00:00' && endUtc === '23:59')) {
+    return { startLocal: '00:00', endLocal: '23:59', isFullDay: true };
+  }
+  return {
+    startLocal: utcToLocalTime(startUtc),
+    endLocal: utcToLocalTime(endUtc),
+    isFullDay: false,
+  };
+}
+
+// 兼容别名
+export const bjToUtcTime = localToUtcTime;
+export const utcToBjTime = utcToLocalTime;
+export const convertActiveTimeBjToUtc = convertActiveTimeLocalToUtc;
+export const convertActiveTimeUtcToBj = (startUtc?: string, endUtc?: string) => {
+  const res = convertActiveTimeUtcToLocal(startUtc, endUtc);
+  return { startBj: res.startLocal, endBj: res.endLocal, isFullDay: res.isFullDay };
+};
+
+/**
+ * 活跃时间段预设 (展示值 start/end 为浏览器本地时间,底层保存将自动转为 UTC)
  */
 export const ACTIVE_TIME_PRESETS = [
   { start: '00:00', end: '23:59', label: '全天 24H (00:00-23:59)' },
-  { start: '08:00', end: '20:00', label: '白天工作时段 (08:00-20:00)' },
-  { start: '09:00', end: '18:00', label: '标准营业时段 (09:00-18:00)' },
+  { start: '08:00', end: '20:00', label: '白天工作时段 (本地 08:00-20:00)' },
+  { start: '09:00', end: '18:00', label: '标准营业时段 (本地 09:00-18:00)' },
 ];
 
 /**