openxiangda 1.0.68 → 1.0.69

package/templates/openxiangda-react-spa/src/layouts/AdminShell.tsx

@@ -1,25 +1,12 @@
 import {
-  Bell,
+  CalendarDays,
   ChevronDown,
   ChevronRight,
-  CircleHelp,
-  Database,
-  ExternalLink,
-  FileText,
-  FolderOpen,
-  Globe2,
-  Home,
-  LayoutDashboard,
   LogOut,
   Menu,
-  Rocket,
-  Search,
-  Settings,
+  RefreshCw,
   Shield,
-  Sparkles,
-  Upload,
   UserCircle,
-  Workflow,
   X,
 } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
@@ -33,56 +20,27 @@ import {
 } from "openxiangda/runtime/react";
 
 import {
-  MacPrimaryButton,
-  MacSecondaryButton,
-  MacStatePage,
-  MacStatusPill,
-  cn,
-} from "@/shared/mac-admin";
+  buildStarterAdminNavigation,
+  filterNavigationByMenuCodes,
+  type StarterNavigationGroup,
+} from "@/app/navigation";
+import { starterBrand } from "@/app/starter-content";
 import { runtimeDefaultRoutes } from "@/runtime/default-routes";
+import {
+  PrimaryButton,
+  SecondaryButton,
+  StatePage,
+  StatusPill,
+  cn,
+} from "@/shared/ui";
 
-type MenuItem = {
-  name: string;
-  path: string;
-  icon: typeof LayoutDashboard;
-  hint?: string;
-};
-
-type MenuGroup = {
-  title: string;
-  items: MenuItem[];
-};
-
-const fallbackNavigation: MenuItem[] = [
-  { hint: "应用总览", icon: LayoutDashboard, name: "运行时工作台", path: "admin" },
-  { hint: "普通用户入口", icon: Home, name: "用户门户", path: "portal" },
-  { hint: "匿名访问链路", icon: Globe2, name: "公开访问", path: "public" },
-];
-
-const systemNavigation: MenuGroup[] = [
-  {
-    title: "表单与流程",
-    items: [
-      { hint: "默认提交页", icon: FileText, name: "表单模板", path: "admin/forms" },
-      { hint: "流程发起和详情", icon: Workflow, name: "流程模板", path: "admin/process" },
-      { hint: "数据管理列表", icon: Database, name: "数据列表", path: "admin/data" },
-      { hint: "平台文件 ticket", icon: Upload, name: "文件预览", path: "file-preview" },
-    ],
-  },
-  {
-    title: "权限与发布",
-    items: [
-      { hint: "真实用户验证", icon: Sparkles, name: "AI 验证", path: "admin/verification" },
-      { hint: "页面 code 与角色", icon: Shield, name: "角色权限", path: "admin/permissions" },
-      { hint: "版本与部署", icon: Rocket, name: "发布版本", path: "admin/releases" },
-      { hint: "运行参数", icon: Settings, name: "系统设置", path: "admin/settings" },
-    ],
-  },
-];
-
-type RuntimeMenuLike = {
+type PlatformMenuLike = {
+  children?: PlatformMenuLike[];
+  code?: string | null;
   formUuid?: string | null;
-  path?: string | null;
+  isHidden?: boolean | null;
+  resourceCode?: string | null;
+  routeCode?: string | null;
   type?: string | null;
 };
 
@@ -97,14 +55,19 @@ export function AdminShell() {
   const [userMenuOpen, setUserMenuOpen] = useState(false);
   const [loggingOut, setLoggingOut] = useState(false);
 
-  const appName = String(bootstrap.data?.app?.name || "OpenXiangda 应用");
-  const runtimeMode = String(bootstrap.data?.runtime?.mode || "react-spa");
+  const appName = String(bootstrap.data?.app?.name || starterBrand.fallbackName);
   const userName = String(
     bootstrap.data?.user?.name ||
       bootstrap.data?.user?.nickName ||
       bootstrap.data?.user?.id ||
-      "未登录",
+      "当前用户",
   );
+  const todayText = new Intl.DateTimeFormat("zh-CN", {
+    day: "numeric",
+    month: "long",
+    weekday: "long",
+  }).format(new Date());
+
   const primaryReceiptFormUuid = useMemo(
     () =>
       runtimeDefaultRoutes.formSubmit?.formUuid ||
@@ -120,40 +83,20 @@ export function AdminShell() {
   const primaryDataFormUuid =
     runtimeDefaultRoutes.dataManageList?.formUuid || primaryReceiptFormUuid;
 
-  const groups = useMemo<MenuGroup[]>(() => {
-    const platformItems = menus.data.length
-      ? menus.data.flatMap(item => {
-          const children = item.children?.length ? item.children : [item];
-          return children
-            .filter(child => !child.isHidden)
-            .map(child => ({
-              hint: child.routeCode || child.resourceCode || undefined,
-              icon: resolveMenuIcon(String(child.name || child.path || "")),
-              name: child.name,
-              path: resolveRuntimeMenuPath(appType, child),
-            }));
-        })
-      : fallbackNavigation.map(item => ({
-          ...item,
-          path: resolveMenuPath(appType, item.path),
-        }));
-
-    return [
-      { title: "应用导航", items: platformItems },
-      ...buildSystemNavigation({
-        filePreviewTicket: runtimeDefaultRoutes.filePreview?.ticket,
-        processFormUuid: primaryProcessFormUuid,
-        receiptFormUuid: primaryReceiptFormUuid,
-        dataFormUuid: primaryDataFormUuid,
-      }).map(group => ({
-          ...group,
-          items: group.items.map(item => ({
-            ...item,
-            path: resolveMenuPath(appType, item.path),
-          })),
-        })),
-    ];
-  }, [appType, menus.data, primaryDataFormUuid, primaryProcessFormUuid, primaryReceiptFormUuid]);
+  const menuCodes = useMemo(() => collectMenuCodes(menus.data), [menus.data]);
+  const groups = useMemo<StarterNavigationGroup[]>(
+    () =>
+      filterNavigationByMenuCodes(
+        buildStarterAdminNavigation({
+          appType,
+          dataFormUuid: primaryDataFormUuid,
+          processFormUuid: primaryProcessFormUuid,
+          receiptFormUuid: primaryReceiptFormUuid,
+        }),
+        menuCodes,
+      ),
+    [appType, menuCodes, primaryDataFormUuid, primaryProcessFormUuid, primaryReceiptFormUuid],
+  );
 
   const handleLogout = async () => {
     setLoggingOut(true);
@@ -161,16 +104,19 @@ export function AdminShell() {
   };
 
   const sidebar = (
-    <aside className="flex h-full min-h-0 flex-col border-r border-white/70 bg-white/[0.84] backdrop-blur-xl">
+    <aside className="flex h-full min-h-0 flex-col border-r border-white/70 bg-white/[0.86] backdrop-blur-xl">
       <div className="flex h-20 shrink-0 items-center gap-3 border-b border-slate-200/70 px-5">
-        <Link className="grid h-12 w-12 place-items-center rounded-2xl bg-slate-950 text-sm font-semibold text-white shadow-lg shadow-slate-300/70" to={`/view/${appType}/admin`}>
-          OX
+        <Link
+          className="grid h-12 w-12 place-items-center rounded-2xl bg-[linear-gradient(135deg,#2563eb,#0f172a)] text-base font-semibold text-white shadow-lg shadow-blue-200/70"
+          to={`/view/${appType}/admin`}
+        >
+          {appName.slice(0, 1) || starterBrand.logoText}
         </Link>
         <div className="min-w-0">
           <Link className="block truncate text-base font-semibold text-slate-950" to={`/view/${appType}/admin`}>
-            OpenXiangda
+            {appName}
           </Link>
-          <div className="mt-0.5 truncate text-xs text-slate-500">React SPA Runtime</div>
+          <div className="mt-0.5 truncate text-xs text-slate-500">{starterBrand.subtitle}</div>
         </div>
       </div>
 
@@ -234,14 +180,10 @@ export function AdminShell() {
       </nav>
 
       <div className="shrink-0 border-t border-slate-200/70 p-4">
-        <div className="rounded-2xl bg-slate-950 p-4 text-white shadow-lg shadow-slate-300/60">
-          <div className="text-xs text-slate-300">Runtime Build</div>
-          <div className="mt-1 truncate text-sm font-semibold">
-            {String(bootstrap.data?.runtime?.activeBuildId || "local-dev")}
-          </div>
-          <div className="mt-3 flex flex-wrap gap-2">
-            <span className="rounded-full bg-white/[0.12] px-2.5 py-1 text-xs text-slate-100">{runtimeMode}</span>
-            <span className="rounded-full bg-emerald-400/18 px-2.5 py-1 text-xs text-emerald-100">online</span>
+        <div className="rounded-2xl bg-[linear-gradient(135deg,#eff6ff,#ecfeff)] p-4 ring-1 ring-blue-100">
+          <div className="text-xs font-semibold text-blue-700">今日提醒</div>
+          <div className="mt-1 text-sm leading-5 text-slate-600">
+            关注待办事项和业务数据变化，保持关键流程及时推进。
           </div>
         </div>
       </div>
@@ -250,13 +192,13 @@ export function AdminShell() {
 
   return (
     <PermissionBoundary
-      fallback={state => <RuntimePermissionState appType={appType} state={state} />}
-      loadingFallback={<RuntimeLoadingState />}
-      menuCode="runtime_workspace"
+      fallback={state => <AdminPermissionState appType={appType} state={state} />}
+      loadingFallback={<AdminLoadingState />}
+      menuCode="admin_dashboard"
       path={`/view/${appType}/admin`}
       routeCode="admin.dashboard"
     >
-      <div className="min-h-screen overflow-x-hidden bg-[linear-gradient(180deg,#eef2f7_0%,#f8fafc_48%,#edf2f7_100%)] text-slate-950">
+      <div className="min-h-screen overflow-x-hidden bg-[linear-gradient(180deg,#edf4ff_0%,#f8fafc_42%,#f1f5f9_100%)] text-slate-950">
         <div className="fixed inset-y-0 left-0 z-30 hidden w-80 lg:block">{sidebar}</div>
 
         {mobileOpen ? (
@@ -282,7 +224,7 @@ export function AdminShell() {
         ) : null}
 
         <main className="min-w-0 lg:pl-80">
-          <header className="sticky top-0 z-20 border-b border-white/70 bg-white/[0.78] backdrop-blur-xl">
+          <header className="sticky top-0 z-20 border-b border-white/70 bg-white/[0.8] backdrop-blur-xl">
             <div className="flex h-20 min-w-0 items-center justify-between gap-3 px-4 sm:px-6">
               <div className="flex min-w-0 items-center gap-3">
                 <button
@@ -295,28 +237,15 @@ export function AdminShell() {
                 </button>
                 <div className="min-w-0">
                   <div className="truncate text-lg font-semibold text-slate-950">{appName}</div>
-                  <div className="mt-1 flex min-w-0 items-center gap-2 text-xs text-slate-500">
-                    <span className="truncate">/view/{appType || "APP"}/admin</span>
-                    <span className="hidden sm:inline">·</span>
-                    <span className="hidden sm:inline">{runtimeMode}</span>
-                  </div>
+                  <div className="mt-1 truncate text-xs text-slate-500">欢迎回来，{userName}</div>
                 </div>
               </div>
 
-              <div className="hidden min-w-0 max-w-xl flex-1 items-center rounded-2xl border border-slate-200 bg-slate-50/90 px-3 py-2 text-sm text-slate-400 xl:flex">
-                <Search className="mr-2 shrink-0" size={17} />
-                <span className="truncate">搜索菜单、表单、页面 code</span>
-              </div>
-
               <div className="flex shrink-0 items-center gap-2">
-                <MacStatusPill tone="emerald">wisejob</MacStatusPill>
-                <button className="relative grid h-10 w-10 place-items-center rounded-xl bg-white text-slate-600 shadow-sm ring-1 ring-slate-200 transition hover:bg-slate-50" type="button">
-                  <Bell size={18} />
-                  <span className="absolute right-2 top-2 h-2 w-2 rounded-full bg-rose-500 ring-2 ring-white" />
-                </button>
-                <button className="hidden h-10 w-10 place-items-center rounded-xl bg-white text-slate-600 shadow-sm ring-1 ring-slate-200 transition hover:bg-slate-50 sm:grid" type="button">
-                  <CircleHelp size={18} />
-                </button>
+                <StatusPill tone="blue">
+                  <CalendarDays size={13} />
+                  {todayText}
+                </StatusPill>
                 <div className="relative">
                   <button
                     className="flex h-10 items-center gap-2 rounded-full bg-white py-1 pl-1 pr-3 text-sm font-medium text-slate-700 shadow-sm ring-1 ring-slate-200 transition hover:bg-slate-50"
@@ -348,23 +277,8 @@ export function AdminShell() {
                         }}
                         type="button"
                       >
-                        <FolderOpen size={17} />
-                        重新加载上下文
-                      </button>
-                      <button
-                        className="flex w-full items-center gap-2 rounded-xl px-3 py-2 text-left text-sm text-slate-600 transition hover:bg-slate-50"
-                        onClick={() => {
-                          setUserMenuOpen(false);
-                          window.open(
-                            `/dev/${encodeURIComponent(appType)}/admin`,
-                            "_blank",
-                            "noopener,noreferrer",
-                          );
-                        }}
-                        type="button"
-                      >
-                        <ExternalLink size={17} />
-                        打开开发态
+                        <RefreshCw size={17} />
+                        刷新数据
                       </button>
                       <button
                         className="flex w-full items-center gap-2 rounded-xl px-3 py-2 text-left text-sm text-rose-600 transition hover:bg-rose-50"
@@ -382,7 +296,7 @@ export function AdminShell() {
             </div>
           </header>
 
-          <div className="mx-auto min-w-0 max-w-[1600px] px-4 py-5 sm:px-6">
+          <div className="mx-auto min-w-0 max-w-[1500px] px-4 py-5 sm:px-6">
             <Outlet />
           </div>
         </main>
@@ -391,7 +305,7 @@ export function AdminShell() {
   );
 }
 
-function RuntimePermissionState({
+function AdminPermissionState({
   appType,
   state,
 }: {
@@ -408,13 +322,13 @@ function RuntimePermissionState({
 
   if (state.errorType === "unauthenticated") {
     return (
-      <MacStatePage
+      <StatePage
         actions={
-          <MacPrimaryButton onClick={() => void auth.redirectToLogin({ replace: true })}>
+          <PrimaryButton onClick={() => void auth.redirectToLogin({ replace: true })}>
             立即登录
-          </MacPrimaryButton>
+          </PrimaryButton>
         }
-        description="当前浏览器没有有效登录态，正在为你跳转到平台登录页。"
+        description="当前浏览器没有有效登录态，正在为你跳转到登录页。"
         fullScreen
         icon={<LogOut size={24} />}
         status="401"
@@ -424,16 +338,16 @@ function RuntimePermissionState({
   }
 
   return (
-    <MacStatePage
+    <StatePage
       actions={
         <>
-          <MacSecondaryButton onClick={() => window.history.back()}>返回上一页</MacSecondaryButton>
-          <MacPrimaryButton onClick={() => window.location.assign(`/view/${appType}/portal`)}>
+          <SecondaryButton onClick={() => window.history.back()}>返回上一页</SecondaryButton>
+          <PrimaryButton onClick={() => window.location.assign(`/view/${appType}/portal`)}>
             打开用户门户
-          </MacPrimaryButton>
+          </PrimaryButton>
         </>
       }
-      description={state.message || "请切换到有权限的账号，或联系管理员开通页面权限。"}
+      description={state.message || "请切换到有权限的账号，或联系管理员开通后台访问权限。"}
       fullScreen
       icon={<Shield size={24} />}
       status="403"
@@ -442,75 +356,33 @@ function RuntimePermissionState({
   );
 }
 
-function RuntimeLoadingState() {
+function AdminLoadingState() {
   return (
-    <MacStatePage
+    <StatePage
       description="正在读取应用、用户和页面权限信息。"
       fullScreen
-      icon={<Rocket size={24} />}
+      icon={<Shield size={24} />}
       status="LOADING"
-      title="正在进入工作区"
+      title="正在进入应用"
     />
   );
 }
 
-function resolveMenuPath(appType: string, rawPath: string) {
-  const path = rawPath.replace(/:appType/g, appType).replace(/\/{2,}/g, "/");
-  if (path.startsWith("/")) return path;
-  return `/view/${appType}/${path}`.replace(/\/{2,}/g, "/");
-}
-
-function resolveRuntimeMenuPath(appType: string, menu: RuntimeMenuLike) {
-  if (menu.path) return resolveMenuPath(appType, menu.path);
-  const type = String(menu.type || "").toLowerCase();
-  const formUuid = menu.formUuid ? encodeURIComponent(menu.formUuid) : "";
-  if (formUuid && (type.includes("process") || type.includes("workflow"))) {
-    return resolveMenuPath(appType, `admin/forms/${formUuid}/new`);
-  }
-  if (formUuid && (type.includes("receipt") || type.includes("form"))) {
-    return resolveMenuPath(appType, `admin/forms/${formUuid}/new`);
-  }
-  return resolveMenuPath(appType, "admin");
-}
-
-function buildSystemNavigation({
-  dataFormUuid,
-  filePreviewTicket,
-  processFormUuid,
-  receiptFormUuid,
-}: {
-  dataFormUuid?: string;
-  filePreviewTicket?: string;
-  processFormUuid?: string;
-  receiptFormUuid?: string;
-}): MenuGroup[] {
-  const receiptPath = receiptFormUuid
-    ? `admin/forms/${encodeURIComponent(receiptFormUuid)}/new`
-    : "admin/forms";
-  const processPath = processFormUuid
-    ? `admin/forms/${encodeURIComponent(processFormUuid)}/new`
-    : "admin/process";
-  const dataPath = dataFormUuid
-    ? `admin/data/${encodeURIComponent(dataFormUuid)}`
-    : "admin/data";
-  const filePreviewPath = filePreviewTicket
-    ? `file-preview?ticket=${encodeURIComponent(filePreviewTicket)}`
-    : "file-preview";
-
-  return systemNavigation.map(group => ({
-    ...group,
-    items: group.items.map(item => {
-      if (item.name === "表单模板") return { ...item, path: receiptPath };
-      if (item.name === "流程模板") return { ...item, path: processPath };
-      if (item.name === "数据列表") return { ...item, path: dataPath };
-      if (item.name === "文件预览") return { ...item, path: filePreviewPath };
-      return item;
-    }),
-  }));
+function collectMenuCodes(items: PlatformMenuLike[]): Set<string> {
+  const codes = new Set<string>();
+  const visit = (item: PlatformMenuLike) => {
+    if (item.isHidden) return;
+    for (const value of [item.code, item.resourceCode, item.routeCode]) {
+      if (value) codes.add(String(value));
+    }
+    for (const child of item.children || []) visit(child);
+  };
+  for (const item of items) visit(item);
+  return codes;
 }
 
 function findMenuFormUuid(
-  items: RuntimeMenuLike[],
+  items: PlatformMenuLike[],
   types: string[],
 ): string | undefined {
   for (const item of items) {
@@ -518,23 +390,12 @@ function findMenuFormUuid(
     if (item.formUuid && types.some(candidate => type.includes(candidate))) {
       return item.formUuid;
     }
-    const children = (item as { children?: RuntimeMenuLike[] }).children || [];
-    const nested: string | undefined = findMenuFormUuid(children, types);
+    const nested = findMenuFormUuid(item.children || [], types);
     if (nested) return nested;
   }
   return undefined;
 }
 
-function resolveMenuIcon(value: string): typeof LayoutDashboard {
-  const normalized = value.toLowerCase();
-  if (normalized.includes("用户") || normalized.includes("portal")) return Home;
-  if (normalized.includes("公开") || normalized.includes("public")) return Globe2;
-  if (normalized.includes("数据") || normalized.includes("data")) return Database;
-  if (normalized.includes("流程") || normalized.includes("process")) return Workflow;
-  if (normalized.includes("表单") || normalized.includes("form")) return FileText;
-  return LayoutDashboard;
-}
-
 function isMenuActive(pathname: string, search: string, target: string) {
   const current = `${pathname}${search}`;
   if (target.includes("?")) return current === target;

package/templates/openxiangda-react-spa/src/layouts/PublicShell.tsx

@@ -1,7 +1,7 @@
 import { Globe2, ShieldCheck } from "lucide-react";
 import { Link, Outlet, useParams } from "react-router-dom";
 
-import { MacStatusPill } from "@/shared/mac-admin";
+import { StatusPill } from "@/shared/ui";
 
 export function PublicShell() {
   const { appType = "" } = useParams();
@@ -15,14 +15,14 @@ export function PublicShell() {
               <Globe2 size={22} />
             </span>
             <span className="min-w-0">
-              <span className="block truncate text-base font-semibold text-slate-950">公开访问</span>
-              <span className="block truncate text-xs text-slate-500">Public Runtime</span>
+              <span className="block truncate text-base font-semibold text-slate-950">公开服务</span>
+              <span className="block truncate text-xs text-slate-500">无需登录的服务入口</span>
             </span>
           </Link>
-          <MacStatusPill tone="blue">
+          <StatusPill tone="blue">
             <ShieldCheck size={13} />
-            ticket / guest
-          </MacStatusPill>
+            安全访问
+          </StatusPill>
         </div>
       </header>
       <main className="mx-auto min-w-0 max-w-6xl px-5 py-8">

package/templates/openxiangda-react-spa/src/layouts/UserShell.tsx

@@ -10,18 +10,18 @@ import {
 } from "openxiangda/runtime/react";
 
 import {
-  MacPrimaryButton,
-  MacSecondaryButton,
-  MacStatePage,
-  MacStatusPill,
-} from "@/shared/mac-admin";
+  PrimaryButton,
+  SecondaryButton,
+  StatePage,
+  StatusPill,
+} from "@/shared/ui";
 
 export function UserShell() {
   const { appType = "" } = useParams();
   const bootstrap = useRuntimeBootstrap();
   const adminAccess = useCanAccessRoute({
     routeCode: "admin.dashboard",
-    menuCode: "runtime_workspace",
+    menuCode: "admin_dashboard",
     path: `/view/${appType}/admin`,
   });
 
@@ -44,11 +44,11 @@ export function UserShell() {
                 <span className="block truncate text-base font-semibold text-slate-950">
                   {String(bootstrap.data?.app?.name || "用户门户")}
                 </span>
-                <span className="block truncate text-xs text-slate-500">OpenXiangda Portal</span>
+                <span className="block truncate text-xs text-slate-500">服务门户</span>
               </span>
             </Link>
             <div className="flex shrink-0 items-center gap-2">
-              <MacStatusPill tone="emerald">已登录</MacStatusPill>
+              <StatusPill tone="emerald">已登录</StatusPill>
               {adminAccess.canAccess ? (
                 <Link
                   className="inline-flex h-10 items-center gap-2 rounded-xl bg-white px-3 text-sm font-semibold text-slate-700 shadow-sm ring-1 ring-slate-200 transition hover:bg-slate-50"
@@ -86,8 +86,8 @@ function UserAccessState({
 
   if (state.errorType === "unauthenticated") {
     return (
-      <MacStatePage
-        actions={<MacPrimaryButton onClick={() => void auth.redirectToLogin({ replace: true })}>去登录</MacPrimaryButton>}
+      <StatePage
+        actions={<PrimaryButton onClick={() => void auth.redirectToLogin({ replace: true })}>去登录</PrimaryButton>}
         description="当前没有有效登录态，正在跳转到登录页。"
         fullScreen
         icon={<LogIn size={24} />}
@@ -98,13 +98,13 @@ function UserAccessState({
   }
 
   return (
-    <MacStatePage
+    <StatePage
       actions={
         <>
-          <MacSecondaryButton onClick={() => window.history.back()}>返回上一页</MacSecondaryButton>
-          <MacPrimaryButton onClick={() => window.location.assign(`/view/${appType}/public`)}>
+          <SecondaryButton onClick={() => window.history.back()}>返回上一页</SecondaryButton>
+          <PrimaryButton onClick={() => window.location.assign(`/view/${appType}/public`)}>
             打开公开页
-          </MacPrimaryButton>
+          </PrimaryButton>
         </>
       }
       description={state.message || "请联系管理员开通用户门户页面权限。"}
@@ -118,7 +118,7 @@ function UserAccessState({
 
 function UserLoadingState() {
   return (
-    <MacStatePage
+    <StatePage
       description="正在确认当前用户、菜单和页面权限。"
       fullScreen
       icon={<Sparkles size={24} />}