openxiangda 1.0.67 → 1.0.69

package/templates/openxiangda-react-spa/src/pages/defaults/FilePreviewRoutePage.tsx

@@ -1,58 +1,68 @@
-import { FileSearch, LockKeyhole, ShieldCheck, Ticket } from "lucide-react";
+import { ExternalLink, LockKeyhole, ShieldCheck } from "lucide-react";
 import { useParams } from "react-router-dom";
 
-import {
-  MacDiagnosticPanel,
-  MacPageHeader,
-  MacPanel,
-  MacStatePage,
-  MacStatusPill,
-} from "@/shared/mac-admin";
 import {
   defaultPageOverrides,
   resolveDefaultPageOverride,
 } from "@/runtime/default-page-overrides";
+import {
+  PageHeader,
+  Panel,
+  PrimaryButton,
+  StatePage,
+  StatusPill,
+} from "@/shared/ui";
+
+const servicePrefix = process.env.APP_SERVICE_PREFIX || "/service";
 
 export function FilePreviewRoutePage() {
   const params = useParams();
   const ticket = new URLSearchParams(window.location.search).get("ticket") || "";
   const appType = params.appType || process.env.OPENXIANGDA_APP_TYPE || process.env.APP_TYPE || "";
   const Override = resolveDefaultPageOverride(defaultPageOverrides, "file-preview");
+  const previewUrl = ticket
+    ? `${servicePrefix.replace(/\/+$/, "")}/file/preview-by-ticket/${encodeURIComponent(ticket)}`
+    : "";
+
   const defaultNode = ticket ? (
     <div className="min-w-0 space-y-5">
-      <MacPageHeader
-        description="轻量 runtime 内置文件预览入口。后续平台文件元数据协议稳定后，可在这里直接接入预览器或通过 override 替换整页。"
-        eyebrow="File Preview"
+      <PageHeader
+        actions={
+          <PrimaryButton onClick={() => window.open(previewUrl, "_blank", "noopener,noreferrer")}>
+            <ExternalLink size={17} />
+            新窗口打开
+          </PrimaryButton>
+        }
+        description="通过安全链接打开文件内容。若浏览器无法直接预览，可在新窗口中打开或下载。"
         meta={
           <>
-            <MacStatusPill tone="blue">ticket</MacStatusPill>
-            <MacStatusPill tone="emerald">同域校验</MacStatusPill>
-            <MacStatusPill tone="amber">可 override</MacStatusPill>
+            <StatusPill tone="blue">文件预览</StatusPill>
+            <StatusPill tone="emerald">安全访问</StatusPill>
           </>
         }
         title="文件预览"
       />
-      <MacPanel title="预览状态" description="当前 ticket 已进入 runtime，但文件内容预览仍等待平台文件接口接入。">
-        <div className="grid gap-4 md:grid-cols-[220px_minmax(0,1fr)]">
-          <div className="grid min-h-44 place-items-center rounded-2xl border border-dashed border-slate-300 bg-slate-50 text-slate-500">
-            <FileSearch size={44} />
-          </div>
-          <div className="min-w-0 space-y-3">
-            <Info label="ticket" value={ticket} />
-            <Info label="appType" value={appType || "--"} />
-            <Info label="preview" value="waiting for file metadata API" />
-          </div>
-        </div>
-      </MacPanel>
-      <MacDiagnosticPanel data={{ appType, ticket, kind: "file-preview" }} title="文件预览上下文" />
+      <Panel className="min-h-[70vh] overflow-hidden p-0">
+        <iframe
+          className="min-h-[70vh] w-full border-0 bg-white"
+          src={previewUrl}
+          title="文件预览"
+        />
+      </Panel>
     </div>
   ) : (
-    <MacStatePage
-      description="当前链接没有携带有效 ticket。请从平台文件字段或业务页面重新打开预览。"
+    <StatePage
+      actions={
+        <PrimaryButton onClick={() => window.history.back()}>
+          <ShieldCheck size={17} />
+          返回上一页
+        </PrimaryButton>
+      }
+      description="当前链接已失效或缺少必要的访问凭证。请从业务页面重新打开文件。"
       fullScreen
       icon={<LockKeyhole size={24} />}
-      status="TICKET"
-      title="文件预览 ticket 无效"
+      status="INVALID"
+      title="文件链接不可用"
     />
   );
 
@@ -68,17 +78,3 @@ export function FilePreviewRoutePage() {
     </main>
   );
 }
-
-function Info({ label, value }: { label: string; value: string }) {
-  return (
-    <div className="flex min-w-0 items-center gap-3 rounded-2xl bg-slate-50 px-4 py-3">
-      <span className="grid h-9 w-9 shrink-0 place-items-center rounded-xl bg-blue-50 text-blue-700">
-        {label === "ticket" ? <Ticket size={17} /> : <ShieldCheck size={17} />}
-      </span>
-      <span className="min-w-0">
-        <span className="block text-xs font-medium text-slate-500">{label}</span>
-        <span className="block truncate text-sm font-semibold text-slate-950">{value}</span>
-      </span>
-    </div>
-  );
-}

package/templates/openxiangda-react-spa/src/pages/defaults/FormRoutePage.tsx

@@ -6,13 +6,12 @@ import { normalizeRuntimeFormSchema } from "openxiangda/runtime";
 import { useOpenXiangda, useRuntimeAuth } from "openxiangda/runtime/react";
 
 import {
-  MacDiagnosticPanel,
-  MacPageHeader,
-  MacPanel,
-  MacPrimaryButton,
-  MacStatePage,
-  MacStatusPill,
-} from "@/shared/mac-admin";
+  PageHeader,
+  Panel,
+  PrimaryButton,
+  StatePage,
+  StatusPill,
+} from "@/shared/ui";
 import {
   defaultPageOverrides,
   resolveDefaultPageOverride,
@@ -90,7 +89,7 @@ export function FormRoutePage({ mode }: { mode: Mode }) {
   const pageCopy = useMemo(() => resolvePageCopy(overrideKind, mode), [mode, overrideKind]);
 
   if (error) return <DefaultErrorState error={error} />;
-  if (!schema) return <DefaultLoadingState description="正在读取表单配置、字段权限和默认值。" title="加载默认页" />;
+  if (!schema) return <DefaultLoadingState description="正在读取页面配置和当前用户权限。" title="正在加载" />;
 
   const Override = resolveDefaultPageOverride(defaultPageOverrides, overrideKind, formUuid);
   const defaultNode = (
@@ -112,19 +111,17 @@ export function FormRoutePage({ mode }: { mode: Mode }) {
 
   return (
     <div className="min-w-0 space-y-5">
-      <MacPageHeader
+      <PageHeader
         description={pageCopy.description}
-        eyebrow={pageCopy.eyebrow}
         meta={
           <>
-            <MacStatusPill tone={isProcessForm ? "amber" : "blue"}>{isProcessForm ? "流程表单" : "普通表单"}</MacStatusPill>
-            <MacStatusPill tone="emerald">后端权限兜底</MacStatusPill>
-            <MacStatusPill tone="violet">override ready</MacStatusPill>
+            <StatusPill tone={isProcessForm ? "amber" : "blue"}>{isProcessForm ? "流程办理" : "业务申请"}</StatusPill>
+            <StatusPill tone="emerald">权限已校验</StatusPill>
           </>
         }
         title={pageCopy.title}
       />
-      <MacPanel className="min-w-0 overflow-hidden">
+      <Panel className="min-w-0 overflow-hidden">
         {Override ? (
           <Override
             appType={appType}
@@ -137,15 +134,14 @@ export function FormRoutePage({ mode }: { mode: Mode }) {
         ) : (
           defaultNode
         )}
-      </MacPanel>
-      <MacDiagnosticPanel data={{ appType, formInstId, formUuid, kind: overrideKind }} title="默认页上下文" />
+      </Panel>
     </div>
   );
 }
 
 function DefaultLoadingState({ description, title }: { description: string; title: string }) {
   return (
-    <MacStatePage
+    <StatePage
       description={description}
       icon={<FileText size={24} />}
       status="LOADING"
@@ -165,8 +161,8 @@ function DefaultErrorState({ error }: { error: PageError }) {
 
   if (error.type === "unauthenticated") {
     return (
-      <MacStatePage
-        actions={<MacPrimaryButton onClick={() => void auth.redirectToLogin({ replace: true })}>去登录</MacPrimaryButton>}
+      <StatePage
+        actions={<PrimaryButton onClick={() => void auth.redirectToLogin({ replace: true })}>去登录</PrimaryButton>}
         description="当前没有有效登录态，正在跳转到登录页。"
         icon={<LogIn size={24} />}
         status="401"
@@ -176,11 +172,11 @@ function DefaultErrorState({ error }: { error: PageError }) {
   }
 
   return (
-    <MacStatePage
+    <StatePage
       description={error.message || "请确认当前用户是否拥有表单、流程或数据访问权限。"}
       icon={error.type === "forbidden" ? <Shield size={24} /> : <Workflow size={24} />}
       status={error.type === "forbidden" ? "403" : String(error.status || "ERROR")}
-      title={error.type === "forbidden" ? "无权访问默认页" : "默认页加载失败"}
+      title={error.type === "forbidden" ? "无权访问当前页面" : "页面加载失败"}
     />
   );
 }
@@ -188,29 +184,25 @@ function DefaultErrorState({ error }: { error: PageError }) {
 function resolvePageCopy(kind: DefaultPageKind, mode: Mode) {
   if (kind === "process-submit") {
     return {
-      description: "使用 SDK 内置提交页发起流程，审批预览和字段权限由后端接口决定。",
-      eyebrow: "Process Submit",
+      description: "填写并提交流程申请，提交后可继续查看办理进度。",
       title: "发起流程",
     };
   }
   if (kind === "process-detail" || mode === "process") {
     return {
-      description: "查看流程详情、审批动作和流程节点信息，操作权限由后端判定。",
-      eyebrow: "Process Detail",
+      description: "查看流程内容、办理进度和可执行操作。",
       title: "流程详情",
     };
   }
   if (kind === "form-detail") {
     return {
-      description: "查看表单详情、变更记录和字段权限状态。",
-      eyebrow: "Form Detail",
+      description: "查看业务记录详情和相关信息。",
       title: "表单详情",
     };
   }
   return {
-    description: "使用 SDK 内置提交页提交普通表单，提交成功后跳转到详情页。",
-    eyebrow: "Form Submit",
-    title: "发起表单",
+    description: "填写并提交业务申请，提交成功后可查看记录详情。",
+    title: "发起申请",
   };
 }
 

package/templates/openxiangda-react-spa/src/pages/portal/UserPortalPage.tsx

@@ -1,66 +1,71 @@
-import { ArrowRight, FileText, Inbox, Search, Sparkles } from "lucide-react";
+import { ArrowRight, FileText, Inbox, Search, ShieldCheck } from "lucide-react";
 
+import { portalEntries, recentActivities } from "@/app/starter-content";
 import {
-  MacListItem,
-  MacMetricCard,
-  MacPageHeader,
-  MacPanel,
-  MacStatusPill,
-} from "@/shared/mac-admin";
+  ListItem,
+  MetricCard,
+  PageHeader,
+  Panel,
+  StatusPill,
+} from "@/shared/ui";
 
-const entries = [
-  { desc: "打开常用表单和流程", icon: FileText, title: "发起申请", tone: "blue" as const },
-  { desc: "处理审批与办理任务", icon: Inbox, title: "我的待办", tone: "amber" as const },
-  { desc: "查看有权限的数据列表", icon: Search, title: "数据查询", tone: "emerald" as const },
-];
+const icons = [FileText, Inbox, Search];
 
 export function UserPortalPage() {
   return (
     <div className="min-w-0 space-y-5">
-      <MacPageHeader
-        description="面向普通用户的入口页，和后台共享同一套登录、权限与 SDK。你可以把这里替换成业务门户、移动端入口或任务中心。"
-        eyebrow="User Portal"
+      <PageHeader
+        description="普通用户可以在这里发起申请、查看事项进度，并查询自己有权限访问的数据。"
         meta={
           <>
-            <MacStatusPill tone="emerald">真实用户身份</MacStatusPill>
-            <MacStatusPill tone="blue">页面 code 权限</MacStatusPill>
-            <MacStatusPill tone="violet">可自定义路由</MacStatusPill>
+            <StatusPill tone="emerald">已登录</StatusPill>
+            <StatusPill tone="blue">服务入口</StatusPill>
+            <StatusPill tone="violet">我的事项</StatusPill>
           </>
         }
         title="用户门户"
       />
+
       <section className="grid gap-4 md:grid-cols-3">
-        {entries.map(entry => (
-          <MacMetricCard
+        {portalEntries.map((entry, index) => (
+          <MetricCard
             caption={entry.desc}
-            icon={entry.icon}
-            key={entry.title}
-            label={entry.title}
+            icon={icons[index]}
+            key={entry.label}
+            label={entry.label}
             tone={entry.tone}
             value={<span className="text-base">进入</span>}
           />
         ))}
       </section>
-      <MacPanel title="最近任务" description="示例内容来自 starter，真实项目可以接入流程待办或业务表单。">
-        <div className="grid gap-3 md:grid-cols-2">
-          {entries.map(entry => (
-            <MacListItem key={entry.title} tone={entry.tone}>
-              <div className="flex items-center justify-between gap-3">
-                <div className="min-w-0">
-                  <div className="truncate text-sm font-semibold text-slate-950">{entry.title}</div>
-                  <div className="mt-1 truncate text-xs text-slate-500">{entry.desc}</div>
+
+      <section className="grid gap-5 lg:grid-cols-[minmax(0,1fr)_360px]">
+        <Panel title="我的事项" description="常用事项会集中展示，便于持续跟进。">
+          <div className="grid gap-3 md:grid-cols-2">
+            {portalEntries.map(entry => (
+              <ListItem key={entry.label} tone={entry.tone}>
+                <div className="flex items-center justify-between gap-3">
+                  <div className="min-w-0">
+                    <div className="truncate text-sm font-semibold text-slate-950">{entry.label}</div>
+                    <div className="mt-1 truncate text-xs text-slate-500">{entry.desc}</div>
+                  </div>
+                  <ArrowRight className="shrink-0 text-slate-400" size={17} />
                 </div>
-                <ArrowRight className="shrink-0 text-slate-400" size={17} />
-              </div>
-            </MacListItem>
-          ))}
-          <MacListItem icon={<Sparkles size={17} />} tone="violet">
-            <div className="text-sm leading-6 text-slate-600">
-              AI 可以通过一次性登录链接，以不同真实用户身份验证门户权限和页面状态。
-            </div>
-          </MacListItem>
-        </div>
-      </MacPanel>
+              </ListItem>
+            ))}
+          </div>
+        </Panel>
+
+        <Panel title="最近动态">
+          <div className="space-y-3">
+            {recentActivities.slice(0, 3).map(activity => (
+              <ListItem icon={<ShieldCheck size={17} />} key={activity} tone="emerald">
+                <div className="text-sm leading-6 text-slate-600">{activity}</div>
+              </ListItem>
+            ))}
+          </div>
+        </Panel>
+      </section>
     </div>
   );
 }

package/templates/openxiangda-react-spa/src/pages/public/PublicHomePage.tsx

@@ -1,50 +1,49 @@
 import { FileCheck2, Globe2, LockKeyhole, MessageSquareText } from "lucide-react";
 
+import { publicServices } from "@/app/starter-content";
 import {
-  MacListItem,
-  MacPageHeader,
-  MacPanel,
-  MacStatusPill,
-} from "@/shared/mac-admin";
+  ListItem,
+  PageHeader,
+  Panel,
+  StatusPill,
+} from "@/shared/ui";
+
+const icons = [Globe2, FileCheck2, LockKeyhole];
 
 export function PublicHomePage() {
   return (
     <div className="min-w-0 space-y-5">
-      <MacPageHeader
-        description="公开表单、公开查询和 ticket 状态页都在 PublicShell 下实现，不再依赖旧平台导航参数。公开链路仍需要后端接口校验。"
-        eyebrow="Public Runtime"
+      <PageHeader
+        description="这里用于承载无需登录即可访问的说明、登记、查询或邀请链接。"
         meta={
           <>
-            <MacStatusPill tone="blue">guest</MacStatusPill>
-            <MacStatusPill tone="emerald">publicAccess</MacStatusPill>
-            <MacStatusPill tone="amber">ticket 状态</MacStatusPill>
+            <StatusPill tone="blue">公开说明</StatusPill>
+            <StatusPill tone="emerald">公开登记</StatusPill>
+            <StatusPill tone="amber">安全链接</StatusPill>
           </>
         }
-        title="公开访问"
+        title="公开服务"
       />
-      <MacPanel title="公开链路" description="这些是 starter 默认提供的公开页能力方向。">
+      <Panel title="可用服务" description="把面向外部用户或访客的入口集中展示，降低访问成本。">
         <div className="grid gap-3 md:grid-cols-3">
-          <MacListItem icon={<Globe2 size={17} />} tone="blue">
-            <div className="text-sm font-semibold text-slate-950">公开页面</div>
-            <div className="mt-1 text-xs text-slate-500">用于无需登录的说明、查询或入口。</div>
-          </MacListItem>
-          <MacListItem icon={<FileCheck2 size={17} />} tone="emerald">
-            <div className="text-sm font-semibold text-slate-950">公开表单</div>
-            <div className="mt-1 text-xs text-slate-500">通过后端公开访问策略提交数据。</div>
-          </MacListItem>
-          <MacListItem icon={<LockKeyhole size={17} />} tone="amber">
-            <div className="text-sm font-semibold text-slate-950">Ticket 校验</div>
-            <div className="mt-1 text-xs text-slate-500">文件预览、邀请链接等短期凭证入口。</div>
-          </MacListItem>
+          {publicServices.map((service, index) => {
+            const Icon = icons[index];
+            return (
+              <ListItem icon={<Icon size={17} />} key={service.label} tone={service.tone}>
+                <div className="text-sm font-semibold text-slate-950">{service.label}</div>
+                <div className="mt-1 text-xs leading-5 text-slate-500">{service.desc}</div>
+              </ListItem>
+            );
+          })}
         </div>
-      </MacPanel>
-      <MacPanel title="公开提示">
-        <MacListItem icon={<MessageSquareText size={17} />} tone="violet">
+      </Panel>
+      <Panel title="访问说明">
+        <ListItem icon={<MessageSquareText size={17} />} tone="violet">
           <div className="text-sm leading-6 text-slate-600">
-            公开访问不是绕过权限。默认模板只负责展示与路由，最终是否允许访问仍由平台接口和公开访问配置决定。
+            公开页面适合发布说明、收集反馈和提供一次性访问入口。涉及敏感数据时，仍应通过后端权限和短期凭证控制访问范围。
           </div>
-        </MacListItem>
-      </MacPanel>
+        </ListItem>
+      </Panel>
     </div>
   );
 }

package/templates/openxiangda-react-spa/src/pages/states/NotFoundPage.tsx

@@ -1,27 +1,27 @@
 import { Compass, Home } from "lucide-react";
 import { useParams } from "react-router-dom";
 
-import { MacPrimaryButton, MacSecondaryButton, MacStatePage } from "@/shared/mac-admin";
+import { PrimaryButton, SecondaryButton, StatePage } from "@/shared/ui";
 
 export function NotFoundPage() {
   const { appType = process.env.OPENXIANGDA_APP_TYPE || "" } = useParams();
   const home = appType ? `/view/${appType}/admin` : "/";
 
   return (
-    <MacStatePage
+    <StatePage
       actions={
         <>
-          <MacSecondaryButton onClick={() => window.history.back()}>
+          <SecondaryButton onClick={() => window.history.back()}>
             <Compass size={17} />
             返回上一页
-          </MacSecondaryButton>
-          <MacPrimaryButton onClick={() => window.location.assign(home)}>
+          </SecondaryButton>
+          <PrimaryButton onClick={() => window.location.assign(home)}>
             <Home size={17} />
             返回入口
-          </MacPrimaryButton>
+          </PrimaryButton>
         </>
       }
-      description="请检查当前 React Router 路由、页面 code 或平台 route resolver 配置。"
+      description="当前访问的页面不存在，可能是链接已变更或你没有从正确入口进入。"
       fullScreen
       icon={<Compass size={24} />}
       status="404"

package/templates/openxiangda-react-spa/src/resources/menus/menus.json

@@ -1,14 +1,41 @@
 {
   "menus": [
     {
-      "code": "runtime_workspace",
-      "name": "运行时工作台",
+      "code": "admin_dashboard",
+      "name": "业务工作台",
       "type": "nav",
       "routeCode": "admin.dashboard",
       "path": "/view/:appType/admin",
       "icon": "LayoutDashboard",
       "sortOrder": 10
     },
+    {
+      "code": "task_center",
+      "name": "待办中心",
+      "type": "nav",
+      "routeCode": "admin.tasks",
+      "path": "/view/:appType/admin/tasks",
+      "icon": "Inbox",
+      "sortOrder": 20
+    },
+    {
+      "code": "service_center",
+      "name": "服务入口",
+      "type": "nav",
+      "routeCode": "admin.services",
+      "path": "/view/:appType/admin/services",
+      "icon": "ClipboardList",
+      "sortOrder": 30
+    },
+    {
+      "code": "data_center",
+      "name": "数据中心",
+      "type": "nav",
+      "routeCode": "admin.data",
+      "path": "/view/:appType/admin/data",
+      "icon": "Database",
+      "sortOrder": 40
+    },
     {
       "code": "user_portal",
       "name": "用户门户",
@@ -16,16 +43,16 @@
       "routeCode": "portal.home",
       "path": "/view/:appType/portal",
       "icon": "Home",
-      "sortOrder": 20
+      "sortOrder": 50
     },
     {
       "code": "public_home",
-      "name": "公开访问",
+      "name": "公开服务",
       "type": "nav",
       "routeCode": "public.home",
       "path": "/view/:appType/public",
       "icon": "Globe",
-      "sortOrder": 30
+      "sortOrder": 60
     }
   ]
 }

package/templates/openxiangda-react-spa/src/resources/roles/roles.json

@@ -3,12 +3,12 @@
     {
       "code": "app_admin",
       "name": "应用管理员",
-      "description": "可访问 mac-admin 后台与全部 React SPA 路由"
+      "description": "可访问业务工作台、待办中心、服务入口、数据中心和门户页面"
     },
     {
       "code": "app_user",
       "name": "普通用户",
-      "description": "可访问用户门户和被授权的业务页面"
+      "description": "可访问用户门户和被授权的业务服务"
     }
   ]
 }

package/templates/openxiangda-react-spa/src/shared/mac-admin.tsx

@@ -282,7 +282,7 @@ export function MacListItem({
 
 export function MacDiagnosticPanel({
   data,
-  title = "调试信息",
+  title = "详细信息",
 }: {
   data: unknown;
   title?: string;
@@ -291,7 +291,7 @@ export function MacDiagnosticPanel({
     <details className="group rounded-2xl border border-slate-200/80 bg-white/70 p-4">
       <summary className="cursor-pointer select-none text-sm font-semibold text-slate-700">
         {title}
-        <span className="ml-2 text-xs font-normal text-slate-400">展开查看 runtime payload</span>
+        <span className="ml-2 text-xs font-normal text-slate-400">展开查看完整内容</span>
       </summary>
       <pre className="ox-scrollbar mt-4 max-h-96 overflow-auto rounded-2xl bg-slate-950 p-4 text-xs leading-6 text-slate-100">
         {JSON.stringify(data, null, 2)}

package/templates/openxiangda-react-spa/src/shared/ui.tsx

@@ -0,0 +1,13 @@
+export {
+  MacListItem as ListItem,
+  MacMetricCard as MetricCard,
+  MacPageHeader as PageHeader,
+  MacPanel as Panel,
+  MacPrimaryButton as PrimaryButton,
+  MacSecondaryButton as SecondaryButton,
+  MacStatePage as StatePage,
+  MacStatusPill as StatusPill,
+  MacTrendBars as TrendBars,
+  cn,
+  type MacTone as AppTone,
+} from "./mac-admin";