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

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

@@ -8,6 +8,9 @@ import {
   type DataQuery,
   type DataRecord,
   type DataResourceSurface,
+  type DataTransactionOperation,
+  type DataTransactionRequest,
+  type DataTransactionResult,
   type DirectoryEntryPage,
   type DirectoryResolveRequest,
 } from 'openxiangda-contracts/browser';
@@ -15,7 +18,7 @@ import { applicationCode, runtimeMount } from './runtime-meta';
 import { useSyncExternalStore } from 'react';
 
 interface PlatformEnvelope<T> {
-  code: number;
+  code: number | string;
   message?: string;
   errorCode?: string;
   requestId?: string;
@@ -27,22 +30,22 @@ const globalRequestListeners = new Set<() => void>();
 
 function beginGlobalRequest() {
   globalRequestCount += 1;
-  globalRequestListeners.forEach(listener => listener());
+  globalRequestListeners.forEach((listener) => listener());
 }
 
 function endGlobalRequest() {
   globalRequestCount = Math.max(0, globalRequestCount - 1);
-  globalRequestListeners.forEach(listener => listener());
+  globalRequestListeners.forEach((listener) => listener());
 }
 
 export function useGlobalRequestLoading() {
   return useSyncExternalStore(
-    listener => {
+    (listener) => {
       globalRequestListeners.add(listener);
       return () => globalRequestListeners.delete(listener);
     },
     () => globalRequestCount > 0,
-    () => false,
+    () => false
   );
 }
 
@@ -59,12 +62,19 @@ async function request<T>(path: string, init?: RequestInit): Promise<T> {
       },
     });
     const payload = (await response.json().catch(() => null)) as PlatformEnvelope<T> | T | null;
-    const envelope = payload && typeof payload === 'object' && 'code' in payload ? payload as PlatformEnvelope<T> : null;
+    const envelope = payload && typeof payload === 'object' && 'code' in payload ? (payload as PlatformEnvelope<T>) : null;
     if (!response.ok || (envelope && envelope.code !== 200)) {
       const requestId = envelope?.requestId ? ` (requestId: ${envelope.requestId})` : '';
-      throw new Error(`${envelope?.errorCode || `HTTP_${response.status}`}: ${envelope?.message || '平台请求失败'}${requestId}`);
+      throw Object.assign(
+        new Error(`${envelope?.errorCode || `HTTP_${response.status}`}: ${envelope?.message || '平台请求失败'}${requestId}`),
+        {
+          code: envelope?.errorCode || `HTTP_${response.status}`,
+          status: response.status,
+          data: envelope?.data ?? null,
+        }
+      );
     }
-    return envelope ? envelope.data : payload as T;
+    return envelope ? envelope.data : (payload as T);
   } finally {
     endGlobalRequest();
   }
@@ -103,8 +113,15 @@ let activeIdentity: RuntimeIdentity | undefined;
 export async function loadCurrentIdentity(): Promise<RuntimeIdentity> {
   const mount = runtimeMount();
   if (mount) {
-    const current = await request<DeployedCurrent>(`${nativeBase()}/current-user?environmentKey=${encodeURIComponent(mount.environmentKey)}`);
-    if (current.schemaVersion !== 'openxiangda.current-user/v2' || current.appCode !== mount.appCode || current.environment.key !== mount.environmentKey || current.principal.type !== 'user') {
+    const current = await request<DeployedCurrent>(
+      `${nativeBase()}/current-user?environmentKey=${encodeURIComponent(mount.environmentKey)}`
+    );
+    if (
+      current.schemaVersion !== 'openxiangda.current-user/v2' ||
+      current.appCode !== mount.appCode ||
+      current.environment.key !== mount.environmentKey ||
+      current.principal.type !== 'user'
+    ) {
       throw new Error('OPENXIANGDA_DEPLOYED_CURRENT_USER_INVALID');
     }
     activeIdentity = { ...current.principal, environment: current.environment };
@@ -115,6 +132,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');
@@ -124,29 +148,49 @@ function currentEnvironmentKey() {
 export type DirectoryKind = 'user' | 'department';
 
 export async function searchDirectory(kind: DirectoryKind, options: { keyword: string; cursor?: string }) {
-  const params = new URLSearchParams({ environmentKey: currentEnvironmentKey(), keyword: options.keyword.trim(), limit: '20' });
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    keyword: options.keyword.trim(),
+    limit: '20',
+  });
   if (options.cursor) params.set('cursor', options.cursor);
   return request<DirectoryEntryPage>(`${nativeBase().replace(/\/native$/, '')}/directory/${kind}s?${params}`);
 }
 
 export async function browseDepartmentTree(options: { parentId?: string; cursor?: string }) {
-  const params = new URLSearchParams({ environmentKey: currentEnvironmentKey(), limit: '100' });
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    limit: '100',
+  });
   if (options.parentId) params.set('parentId', options.parentId);
   if (options.cursor) params.set('offset', options.cursor);
   return request<DirectoryEntryPage>(`${nativeBase().replace(/\/native$/, '')}/directory/departments/tree?${params}`);
 }
 
 export async function browseDepartmentUsers(departmentId: string, page = 1) {
-  const params = new URLSearchParams({ environmentKey: currentEnvironmentKey(), page: String(page), limit: '20' });
-  return request<DirectoryEntryPage>(`${nativeBase().replace(/\/native$/, '')}/directory/departments/${encodeURIComponent(departmentId)}/users?${params}`);
+  const params = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    page: String(page),
+    limit: '20',
+  });
+  return request<DirectoryEntryPage>(
+    `${nativeBase().replace(/\/native$/, '')}/directory/departments/${encodeURIComponent(departmentId)}/users?${params}`
+  );
 }
 
 export async function resolveDirectory(kind: DirectoryKind, ids: string[]) {
   const uniqueIds = [...new Set(ids)];
   if (uniqueIds.length === 0) throw new Error('OPENXIANGDA_DIRECTORY_RESOLVE_IDS_REQUIRED');
   if (uniqueIds.length > 50) throw new Error('OPENXIANGDA_DIRECTORY_RESOLVE_IDS_EXCEEDED');
-  const body: DirectoryResolveRequest = { schemaVersion: SCHEMA_VERSIONS.directoryResolveRequest, kind, ids: uniqueIds };
-  return request<DirectoryEntryPage>(`${nativeBase().replace(/\/native$/, '')}/directory/resolve?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`, { method: 'POST', body: JSON.stringify(body) });
+  const body: DirectoryResolveRequest = {
+    schemaVersion: SCHEMA_VERSIONS.directoryResolveRequest,
+    kind,
+    ids: uniqueIds,
+  };
+  return request<DirectoryEntryPage>(
+    `${nativeBase().replace(/\/native$/, '')}/directory/resolve?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`,
+    { method: 'POST', body: JSON.stringify(body) }
+  );
 }
 
 export async function searchResource(resourceCode: string, labelField: string, options: { keyword: string; cursor?: string }) {
@@ -154,14 +198,32 @@ export async function searchResource(resourceCode: string, labelField: string, o
   const offset = options.cursor ? Number(options.cursor) : 0;
   const query: DataQuery = {
     schemaVersion: SCHEMA_VERSIONS.dataQuery,
-    filters: options.keyword.trim() ? [{ field: labelField, operator: 'ilike', value: `%${options.keyword.trim()}%` }] : [],
+    filters: options.keyword.trim()
+      ? [
+          {
+            field: labelField,
+            operator: 'ilike',
+            value: `%${options.keyword.trim()}%`,
+          },
+        ]
+      : [],
     order: [{ field: labelField, direction: 'asc' }],
     limit: pageSize,
     offset: Number.isSafeInteger(offset) && offset >= 0 ? offset : 0,
   };
-  const page = await request<DataPage<Record<string, unknown>>>(`${dataBase(resourceCode)}/query`, { method: 'POST', body: JSON.stringify({ ...query, environmentKey: currentEnvironmentKey() }) });
+  const page = await request<DataPage<Record<string, unknown>>>(`${dataBase(resourceCode)}/query`, {
+    method: 'POST',
+    body: JSON.stringify({
+      ...query,
+      environmentKey: currentEnvironmentKey(),
+    }),
+  });
   return {
-    items: page.items.map(item => ({ id: String(item.id), label: String(item[labelField] ?? item.id), selectable: true })),
+    items: page.items.map((item) => ({
+      id: String(item.id),
+      label: String(item[labelField] ?? item.id),
+      selectable: true,
+    })),
     nextCursor: page.items.length >= pageSize ? String(page.offset + page.items.length) : null,
   };
 }
@@ -169,10 +231,18 @@ export async function searchResource(resourceCode: string, labelField: string, o
 export async function resolveResource(resourceCode: string, ids: string[], labelField: string) {
   if (ids.length === 0) throw new Error('OPENXIANGDA_RESOURCE_RESOLVE_IDS_REQUIRED');
   if (ids.length > 50) throw new Error('OPENXIANGDA_RESOURCE_RESOLVE_IDS_EXCEEDED');
-  const items = await Promise.all(ids.map(async id => {
-    const record = await request<DataRecord<Record<string, unknown>>>(`${dataBase(resourceCode)}/records/${encodeURIComponent(id)}?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`);
-    return { id, label: String(record.data[labelField] ?? id), selectable: true };
-  }));
+  const items = await Promise.all(
+    ids.map(async (id) => {
+      const record = await request<DataRecord<Record<string, unknown>>>(
+        `${dataBase(resourceCode)}/records/${encodeURIComponent(id)}?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`
+      );
+      return {
+        id,
+        label: String(record.data[labelField] ?? id),
+        selectable: true,
+      };
+    })
+  );
   return { items, nextCursor: null };
 }
 
@@ -197,7 +267,12 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
     if (query.keyword?.trim()) {
       const searchable = surface.list?.searchableFields || [];
       const field = searchable.includes(query.searchField || '') ? query.searchField! : searchable[0];
-      if (field) filters.push({ field: assertField(field), operator: 'ilike', value: `%${query.keyword.trim()}%` });
+      if (field)
+        filters.push({
+          field: assertField(field),
+          operator: 'ilike',
+          value: `%${query.keyword.trim()}%`,
+        });
     }
     for (const [fieldCode, value] of Object.entries(query.filters || {})) {
       if (value === undefined || value === null || value === '') continue;
@@ -207,8 +282,10 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
       if (!declaredFields.has(fieldCode)) continue;
       const field = surface.fields[fieldCode];
       if (Array.isArray(value) && value.length === 2 && ['date', 'datetime', 'number', 'money', 'percent'].includes(field?.widget || '')) {
-        if (value[0] !== undefined && value[0] !== null && value[0] !== '') filters.push({ field: fieldCode, operator: 'gte', value: value[0] });
-        if (value[1] !== undefined && value[1] !== null && value[1] !== '') filters.push({ field: fieldCode, operator: 'lte', value: value[1] });
+        if (value[0] !== undefined && value[0] !== null && value[0] !== '')
+          filters.push({ field: fieldCode, operator: 'gte', value: value[0] });
+        if (value[1] !== undefined && value[1] !== null && value[1] !== '')
+          filters.push({ field: fieldCode, operator: 'lte', value: value[1] });
       } else if (Array.isArray(value) && ['multi', 'directory-user', 'directory-department', 'resource'].includes(field?.widget || '')) {
         filters.push({ field: fieldCode, operator: 'cs', value });
       } else {
@@ -219,42 +296,112 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
   };
   return {
     async list(query: GenericResourceQuery) {
-      const fallbackSort = surface.list?.defaultSort || { field: Object.keys(surface.fields)[0] || 'id', order: 'asc' as const };
+      const fallbackSort = surface.list?.defaultSort || {
+        field: Object.keys(surface.fields)[0] || 'id',
+        order: 'asc' as const,
+      };
       const requestedSort = query.sort || fallbackSort;
       const sort = declaredFields.has(requestedSort.field) ? requestedSort : fallbackSort;
-      const body: DataQuery = { schemaVersion: SCHEMA_VERSIONS.dataQuery, filters: filtersFor(query), order: [{ field: sort.field, direction: sort.order || 'asc' }], limit: query.pageSize, offset: (query.page - 1) * query.pageSize };
-      const page = await request<DataPage<Record<string, unknown>>>(`${base}/query`, { method: 'POST', body: JSON.stringify({ ...body, environmentKey: currentEnvironmentKey() }) });
+      const body: DataQuery = {
+        schemaVersion: SCHEMA_VERSIONS.dataQuery,
+        filters: filtersFor(query),
+        order: [{ field: sort.field, direction: sort.order || 'asc' }],
+        limit: query.pageSize,
+        offset: (query.page - 1) * query.pageSize,
+      };
+      const page = await request<DataPage<Record<string, unknown>>>(`${base}/query`, {
+        method: 'POST',
+        body: JSON.stringify({
+          ...body,
+          environmentKey: currentEnvironmentKey(),
+        }),
+      });
       return { rows: page.items, total: page.total };
     },
     async get(id: string) {
-      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`);
+      const record = await request<DataRecord<Record<string, unknown>>>(
+        `${base}/records/${encodeURIComponent(id)}?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`
+      );
       return record.data;
     },
     async audit(id: string) {
-      return request<DataAuditPage>(`${base}/records/${encodeURIComponent(id)}/audit?limit=10&offset=0&environmentKey=${encodeURIComponent(currentEnvironmentKey())}`);
+      return request<DataAuditPage>(
+        `${base}/records/${encodeURIComponent(id)}/audit?limit=10&offset=0&environmentKey=${encodeURIComponent(currentEnvironmentKey())}`
+      );
     },
     async create(data: Record<string, unknown>) {
-      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), data }) });
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records`, {
+        method: 'POST',
+        body: JSON.stringify({
+          environmentKey: currentEnvironmentKey(),
+          data,
+        }),
+      });
       return record.data;
     },
     async update(id: string, expectedRevision: number, data: Record<string, unknown>) {
-      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}/update`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), expectedRevision, data }) });
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}/update`, {
+        method: 'POST',
+        body: JSON.stringify({
+          environmentKey: currentEnvironmentKey(),
+          expectedRevision,
+          data,
+        }),
+      });
       return record.data;
     },
     async remove(id: string, expectedRevision: number) {
-      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}/delete`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), expectedRevision }) });
+      const record = await request<DataRecord<Record<string, unknown>>>(`${base}/records/${encodeURIComponent(id)}/delete`, {
+        method: 'POST',
+        body: JSON.stringify({
+          environmentKey: currentEnvironmentKey(),
+          expectedRevision,
+        }),
+      });
       return record.data;
     },
     async upload(fieldCode: string, file: File, recordId?: string) {
       assertField(fieldCode);
-      const plan = await request<DataFileUploadPlan>(`${base}/files/uploads/initiate`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey(), fieldCode, fileName: file.name, fileSize: file.size, contentType: file.type || 'application/octet-stream', ...(recordId ? { recordId } : {}) }) });
-      const uploaded = await fetch(plan.uploadUrl, { method: plan.uploadMethod, headers: plan.headers, body: file });
+      const plan = await request<DataFileUploadPlan>(`${base}/files/uploads/initiate`, {
+        method: 'POST',
+        body: JSON.stringify({
+          environmentKey: currentEnvironmentKey(),
+          fieldCode,
+          fileName: file.name,
+          fileSize: file.size,
+          contentType: file.type || 'application/octet-stream',
+          ...(recordId ? { recordId } : {}),
+        }),
+      });
+      const uploaded = await fetch(plan.uploadUrl, {
+        method: plan.uploadMethod,
+        headers: plan.headers,
+        body: file,
+      });
       if (!uploaded.ok) throw new Error(`FILE_UPLOAD_FAILED: HTTP_${uploaded.status}`);
-      return request<DataFileRef>(`${base}/files/${encodeURIComponent(plan.file.id)}/complete`, { method: 'POST', body: JSON.stringify({ environmentKey: currentEnvironmentKey() }) });
+      return request<DataFileRef>(`${base}/files/${encodeURIComponent(plan.file.id)}/complete`, {
+        method: 'POST',
+        body: JSON.stringify({ environmentKey: currentEnvironmentKey() }),
+      });
     },
   };
 }
 
+export async function transactNativeData(operations: DataTransactionOperation[], idempotencyKey: string = crypto.randomUUID()) {
+  const transaction: DataTransactionRequest = {
+    schemaVersion: SCHEMA_VERSIONS.dataTransactionRequest,
+    idempotencyKey,
+    operations,
+  };
+  return request<DataTransactionResult>(`${nativeBase()}/data/transactions`, {
+    method: 'POST',
+    body: JSON.stringify({
+      ...transaction,
+      environmentKey: currentEnvironmentKey(),
+    }),
+  });
+}
+
 function nativeBase() {
   return `/service/openxiangda-api/v2/applications/${applicationCode()}/native`;
 }
@@ -264,16 +411,24 @@ function dataBase(code: string) {
 }
 
 export function dataFileContentUrl(resource: string, fileId: string, disposition: 'attachment' | 'inline' = 'attachment') {
-  const query = new URLSearchParams({ environmentKey: currentEnvironmentKey(), disposition });
+  const query = new URLSearchParams({
+    environmentKey: currentEnvironmentKey(),
+    disposition,
+  });
   return `${dataBase(resource)}/files/${encodeURIComponent(fileId)}/content?${query}`;
 }
 
 export async function loadDataFilePreview(resource: string, fileId: string) {
-  return request<DataFilePreview>(`${dataBase(resource)}/files/${encodeURIComponent(fileId)}/preview?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`);
+  return request<DataFilePreview>(
+    `${dataBase(resource)}/files/${encodeURIComponent(fileId)}/preview?environmentKey=${encodeURIComponent(currentEnvironmentKey())}`
+  );
 }
 
 export async function fetchDataFileBlob(resource: string, fileId: string) {
-  const response = await fetch(dataFileContentUrl(resource, fileId, 'inline'), { credentials: 'include', headers: { accept: 'application/octet-stream,*/*' } });
+  const response = await fetch(dataFileContentUrl(resource, fileId, 'inline'), {
+    credentials: 'include',
+    headers: { accept: 'application/octet-stream,*/*' },
+  });
   if (!response.ok) throw new Error(`FILE_CONTENT_READ_FAILED: HTTP_${response.status}`);
   return response.blob();
 }