guanwei 1.2.0 → 1.2.2

package/server/src/services/divineStore.ts

@@ -160,7 +160,7 @@ export function listDivinations(username: string, page = 1, pageSize = 20, profi
   const where = profileId ? 'WHERE username = ? AND profile_id = ?' : 'WHERE username = ?';
   const params = profileId ? [username, profileId] : [username];
   const totalRow = d.prepare('SELECT COUNT(*) AS c FROM divinations ' + where).get(...params) as any;
-  const rows = d.prepare('SELECT id, art_id, question, created_at, report_json, status, profile_id FROM divinations ' + where + ' ORDER BY created_at DESC LIMIT ? OFFSET ?')
+  const rows = d.prepare('SELECT id, art_id, question, created_at, report_json, status, profile_id FROM divinations ' + where + ' ORDER BY created_at DESC, id DESC LIMIT ? OFFSET ?')
     .all(...params, size, (pageN - 1) * size) as any[];
   return {
     list: rows.map(r => ({

package/src/pages/DemoPage.tsx

@@ -1,6 +1,6 @@
 // 演示模式（Demo Mode）：无需后端 / 无需 API Key 的完整体验页
 // 九术排盘用 shared/core 本地引擎在浏览器计算，AI 报告加载内置示例（静态 JSON）——GitHub Pages 上可直接体验
-import { useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
 import { Link } from 'react-router-dom';
 import { baziCalc } from '@core/engine/bazi';
 import { ziweiCalc } from '@core/engine/ziwei';
@@ -92,6 +92,19 @@ export default function DemoPage() {
       default: return () => null;
     }
   };
+
+  // 切换术数时清空上一术的排盘结果（否则旧数据传给新术 Result 组件会崩溃）
+  const prevArtRef = useRef(artId);
+  useEffect(() => {
+    if (prevArtRef.current !== artId) {
+      prevArtRef.current = artId;
+      setPhase('idle');
+      setReport(null);
+      setLocalResult(null);
+      setShowRaw(false);
+    }
+  }, [artId]);
+
   const reset = () => {
     setPhase('idle');
     setReport(null);

package/src/pages/ModulePage.tsx

@@ -129,6 +129,24 @@ export default function ModulePage() {
   const divineIdRef = useRef<string | null>(null);
   divineIdRef.current = divineId;
 
+  // ─── 术数切换（/art/qimen → /art/ziwei）必须全量重置 ───
+  // 若不重置：上一术的 status='done' + result 会传给新术的 Result 组件，
+  // 新术访问旧数据结构中不存在的字段 → TypeError → ErrorBoundary 兜底显示「此页一时未应机」
+  const prevArtRef = useRef(artId);
+  useEffect(() => {
+    if (prevArtRef.current !== artId) {
+      prevArtRef.current = artId;
+      ai.reset();          // 清 AI 解读 + 在途流式请求作废（reqId 失效）
+      reset();             // 清排盘 status/result/divineId
+      setFit(null);
+      profileRef.current = null;
+      questionRef.current = '';
+      inputsRef.current = null;
+      profileIdRef.current = 'main';
+      savedRef.current = null;
+    }
+  }, [artId, ai, reset]);
+
   // 起占成功 → 自动存档（StrictMode 防重复：以 result 引用去重）
   const savedRef = useRef<unknown>(null);
   useEffect(() => {