openxiangda-cli 2.0.0-alpha.67 → 2.0.0-alpha.68

package/template/apps/web/src/components/resource/StandardResourcePages.tsx

@@ -4,12 +4,10 @@ import {
   ExportOutlined,
   EyeOutlined,
   HistoryOutlined,
-  ImportOutlined,
   PlusOutlined,
 } from '@ant-design/icons';
 import {
   Alert,
-  App,
   Button,
   Card,
   Result,
@@ -47,17 +45,10 @@ export function ResourceListPage({
   resource,
   surface,
   title,
-  description,
   readCapability,
-  createCapability,
-  createPath,
-  onExport,
-  importDisabledReason = '导入能力将在批量事务合同落地后启用',
   children,
 }: ResourceListPageProps) {
-  const navigate = useNavigate();
   const { hasCapability } = useRuntime();
-  const { message } = App.useApp();
   if (!hasCapability(readCapability)) {
     return (
       <Shell>
@@ -65,7 +56,6 @@ export function ResourceListPage({
       </Shell>
     );
   }
-  const canCreate = createCapability ? hasCapability(createCapability) : false;
   return (
     <Shell>
       <Card
@@ -73,42 +63,7 @@ export function ResourceListPage({
         data-resource={resource}
         data-surface-layout={surface?.list ? 'standard' : undefined}
       >
-        <Space orientation="vertical" size={16} style={{ width: '100%' }}>
-          <div className="oxa-page-heading">
-            <div>
-              <h2 className="oxa-title">{title}</h2>
-              {description && <div className="oxa-muted">{description}</div>}
-            </div>
-            <Space>
-              <Button
-                disabled
-                icon={<ImportOutlined />}
-                title={importDisabledReason}
-              >
-                导入
-              </Button>
-              <Button
-                icon={<ExportOutlined />}
-                onClick={() => {
-                  if (onExport) onExport();
-                  else message.info('导出将使用当前 Data API 查询条件');
-                }}
-              >
-                导出
-              </Button>
-              {canCreate && createPath && (
-                <Button
-                  icon={<PlusOutlined />}
-                  onClick={() => navigate(createPath)}
-                  type="primary"
-                >
-                  新增
-                </Button>
-              )}
-            </Space>
-          </div>
-          {children}
-        </Space>
+        <div className="oxa-list-surface">{children}</div>
       </Card>
     </Shell>
   );
@@ -289,6 +244,7 @@ interface ResourceDetailPageProps extends StandardResourcePageProps {
   editCapability?: string;
   editPath?: string;
   auditTargetId?: string;
+  onAuditOpen?: () => void;
   hero: ReactNode;
   meta?: ReactNode;
   children: ReactNode;
@@ -307,6 +263,7 @@ export function ResourceDetailPage({
   editCapability,
   editPath,
   auditTargetId,
+  onAuditOpen,
   hero,
   meta,
   children,
@@ -356,11 +313,14 @@ export function ResourceDetailPage({
             {auditTargetId && (
               <Button
                 icon={<HistoryOutlined />}
-                onClick={() =>
-                  document
-                    .getElementById(auditTargetId)
-                    ?.scrollIntoView({ behavior: 'smooth', block: 'center' })
-                }
+                onClick={() => {
+                  onAuditOpen?.();
+                  window.requestAnimationFrame(() =>
+                    document
+                      .getElementById(auditTargetId)
+                      ?.scrollIntoView({ behavior: 'smooth', block: 'center' }),
+                  );
+                }}
               >
                 操作记录
               </Button>
@@ -399,6 +359,7 @@ export function MobileResourceDetailPage({
   editCapability,
   editPath,
   auditTargetId,
+  onAuditOpen,
   hero,
   meta,
   children,
@@ -417,7 +378,7 @@ export function MobileResourceDetailPage({
           {backLabel}
         </Button>
         <Space>
-          {auditTargetId && <Button icon={<HistoryOutlined />} onClick={() => document.getElementById(auditTargetId)?.scrollIntoView({ behavior: 'smooth', block: 'center' })}>操作记录</Button>}
+          {auditTargetId && <Button icon={<HistoryOutlined />} onClick={() => { onAuditOpen?.(); window.requestAnimationFrame(() => document.getElementById(auditTargetId)?.scrollIntoView({ behavior: 'smooth', block: 'center' })); }}>操作记录</Button>}
           {editCapability && editPath && hasCapability(editCapability) && <Button icon={<EditOutlined />} onClick={() => navigate(editPath)} type="primary">编辑</Button>}
         </Space>
       </header>

package/template/apps/web/src/components/resource/SurfaceFields.tsx

@@ -460,7 +460,7 @@ function ManagedFileField({
     refsRef.current = refs;
   }, [refs]);
   if (!onUpload) {
-    return <Alert type="info" showIcon message="该文件字段尚未配置上传能力" />;
+    return <Alert type="info" showIcon title="该文件字段尚未配置上传能力" />;
   }
   if (mobile) {
     const acceptValue = Array.isArray(accept) ? accept.join(',') : accept;

package/template/apps/web/src/main.tsx

@@ -1,11 +1,10 @@
 import { Refine } from '@refinedev/core';
-import { App as AntdApp, ConfigProvider, Spin } from 'antd';
-import zhCN from 'antd/locale/zh_CN';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
 import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
 import { applicationProvider } from './data-provider';
+import { AppearanceProvider } from './appearance';
 import { GeneratedResourcePage } from './components/resource/GeneratedResourceCrud';
 import { FilePreviewPage } from './FilePreviewPage';
 import { EmptyApplicationPage } from './Shell';
@@ -20,9 +19,13 @@ const firstPath = codes[0] ? `/${codes[0]}` : '/';
 function GlobalRequestLoading() {
   const loading = useGlobalRequestLoading();
   return loading ? (
-    <div aria-live="polite" className="oxa-global-request-loading">
-      <Spin size="small" />
-      <span>正在加载…</span>
+    <div
+      aria-label="页面请求进行中"
+      aria-valuetext="正在加载"
+      className="oxa-global-request-loading"
+      role="progressbar"
+    >
+      <span />
     </div>
   ) : null;
 }
@@ -40,21 +43,19 @@ const resourceRoutes = codes.flatMap(resourceCode => [
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <ConfigProvider locale={zhCN} theme={{ token: { borderRadius: 8, colorBgLayout: '#f3f7fd', colorPrimary: '#1677ff', colorText: '#172033', fontSize: 14 }, components: { Card: { headerFontSize: 16 }, Layout: { bodyBg: '#f3f7fd', headerBg: '#ffffff', siderBg: '#ffffff' }, Menu: { itemBorderRadius: 8, itemSelectedBg: '#eaf3ff' } } }}>
-      <AntdApp>
-        <GlobalRequestLoading />
-        <RuntimeBoundary>
-          <BrowserRouter basename={applicationBasename()}>
-            <Refine dataProvider={applicationProvider} resources={codes.map(code => ({ name: code, list: `/${code}`, create: `/${code}/new`, edit: `/${code}/:id/edit`, show: `/${code}/:id` }))}>
-              <Routes>
-                <Route path="/" element={codes.length ? <Navigate replace to={firstPath} /> : <EmptyApplicationPage />} />
-                <Route path="/files/:resourceCode/:fileId/preview" element={<FilePreviewPage />} />
-                {resourceRoutes}
-              </Routes>
-            </Refine>
-          </BrowserRouter>
-        </RuntimeBoundary>
-      </AntdApp>
-    </ConfigProvider>
+    <AppearanceProvider>
+      <GlobalRequestLoading />
+      <RuntimeBoundary>
+        <BrowserRouter basename={applicationBasename()}>
+          <Refine dataProvider={applicationProvider} resources={codes.map(code => ({ name: code, list: `/${code}`, create: `/${code}/new`, edit: `/${code}/:id/edit`, show: `/${code}/:id` }))}>
+            <Routes>
+              <Route path="/" element={codes.length ? <Navigate replace to={firstPath} /> : <EmptyApplicationPage />} />
+              <Route path="/files/:resourceCode/:fileId/preview" element={<FilePreviewPage />} />
+              {resourceRoutes}
+            </Routes>
+          </Refine>
+        </BrowserRouter>
+      </RuntimeBoundary>
+    </AppearanceProvider>
   </React.StrictMode>,
 );

package/template/apps/web/src/platform-client.ts

@@ -115,6 +115,13 @@ export async function loadCurrentIdentity(): Promise<RuntimeIdentity> {
   return activeIdentity;
 }
 
+export async function logoutCurrentUser() {
+  await request<null>('/api/auth/logout', {
+    method: 'POST',
+  });
+  activeIdentity = undefined;
+}
+
 function currentEnvironmentKey() {
   const key = activeIdentity?.environment.key || runtimeMount()?.environmentKey;
   if (!key) throw new Error('OPENXIANGDA_CURRENT_ENVIRONMENT_REQUIRED');