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

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

@@ -12,30 +12,62 @@ import {
   type DirectoryResolveRequest,
 } from 'openxiangda-contracts/browser';
 import { applicationCode, runtimeMount } from './runtime-meta';
+import { useSyncExternalStore } from 'react';
 
 interface PlatformEnvelope<T> {
   code: number;
   message?: string;
   errorCode?: string;
+  requestId?: string;
   data: T;
 }
 
-async function request<T>(path: string, init?: RequestInit): Promise<T> {
-  const response = await fetch(path, {
-    credentials: 'include',
-    ...init,
-    headers: {
-      accept: 'application/json',
-      ...(init?.body ? { 'content-type': 'application/json' } : {}),
-      ...init?.headers,
+let globalRequestCount = 0;
+const globalRequestListeners = new Set<() => void>();
+
+function beginGlobalRequest() {
+  globalRequestCount += 1;
+  globalRequestListeners.forEach(listener => listener());
+}
+
+function endGlobalRequest() {
+  globalRequestCount = Math.max(0, globalRequestCount - 1);
+  globalRequestListeners.forEach(listener => listener());
+}
+
+export function useGlobalRequestLoading() {
+  return useSyncExternalStore(
+    listener => {
+      globalRequestListeners.add(listener);
+      return () => globalRequestListeners.delete(listener);
     },
-  });
-  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;
-  if (!response.ok || (envelope && envelope.code !== 200)) {
-    throw new Error(`${envelope?.errorCode || `HTTP_${response.status}`}: ${envelope?.message || '平台请求失败'}`);
+    () => globalRequestCount > 0,
+    () => false,
+  );
+}
+
+async function request<T>(path: string, init?: RequestInit): Promise<T> {
+  beginGlobalRequest();
+  try {
+    const response = await fetch(path, {
+      credentials: 'include',
+      ...init,
+      headers: {
+        accept: 'application/json',
+        ...(init?.body ? { 'content-type': 'application/json' } : {}),
+        ...init?.headers,
+      },
+    });
+    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;
+    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}`);
+    }
+    return envelope ? envelope.data : payload as T;
+  } finally {
+    endGlobalRequest();
   }
-  return envelope ? envelope.data : payload as T;
 }
 
 export interface RuntimeIdentity {
@@ -169,7 +201,11 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
     }
     for (const [fieldCode, value] of Object.entries(query.filters || {})) {
       if (value === undefined || value === null || value === '') continue;
-      const field = surface.fields[assertField(fieldCode)];
+      // A list state can outlive a resource route during client-side navigation.
+      // Ignore filters from the previous resource instead of constructing an
+      // invalid Native Data query for the current resource.
+      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] });
@@ -183,8 +219,10 @@ export function createNativeResourceClient(code: string, surface: DataResourceSu
   };
   return {
     async list(query: GenericResourceQuery) {
-      const sort = query.sort || surface.list?.defaultSort || { field: Object.keys(surface.fields)[0] || 'id', order: 'asc' as const };
-      const body: DataQuery = { schemaVersion: SCHEMA_VERSIONS.dataQuery, filters: filtersFor(query), order: [{ field: assertField(sort.field), direction: sort.order || 'asc' }], limit: query.pageSize, offset: (query.page - 1) * query.pageSize };
+      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() }) });
       return { rows: page.items, total: page.total };
     },

package/template/apps/web/src/styles.css

@@ -24,6 +24,25 @@ body {
   place-items: center;
 }
 
+.oxa-global-request-loading {
+  position: fixed;
+  z-index: 1200;
+  top: 14px;
+  left: 50%;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  padding: 7px 13px;
+  border: 1px solid #dbe7f7;
+  border-radius: 999px;
+  background: rgba(255, 255, 255, 0.96);
+  box-shadow: 0 8px 24px rgba(31, 59, 102, 0.15);
+  color: #355070;
+  font-size: 13px;
+  pointer-events: none;
+  transform: translateX(-50%);
+}
+
 .oxa-app-layout {
   min-height: 100vh;
   background: #f3f7fd;
@@ -1075,6 +1094,61 @@ body {
 .oxa-audit-entry {
   display: grid;
   gap: 4px;
+  padding: 10px 0;
+  border-bottom: 1px solid #edf0f5;
+}
+
+.oxa-audit-entry:last-child {
+  border-bottom: 0;
+}
+
+.oxa-audit-heading,
+.oxa-audit-meta,
+.oxa-audit-change-values {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.oxa-audit-heading {
+  justify-content: space-between;
+}
+
+.oxa-audit-meta {
+  flex-wrap: wrap;
+  color: #7b879b;
+  font-size: 12px;
+}
+
+.oxa-audit-meta .ant-typography {
+  font-size: 12px;
+}
+
+.oxa-audit-changes {
+  display: grid;
+  gap: 7px;
+  margin-top: 4px;
+}
+
+.oxa-audit-change {
+  display: grid;
+  gap: 3px;
+  padding: 7px 8px;
+  border-radius: 6px;
+  background: #f7f9fc;
+}
+
+.oxa-audit-change-values {
+  min-width: 0;
+  color: #47566f;
+  font-size: 12px;
+}
+
+.oxa-audit-change-values > :not(svg) {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .oxa-audit-entry > span {
@@ -1082,6 +1156,214 @@ body {
   font-size: 12px;
 }
 
+.oxa-mobile-reference-trigger {
+  display: flex;
+  width: 100%;
+  min-height: 42px;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  padding: 9px 12px;
+  border: 1px solid #d9dfe9;
+  border-radius: 8px;
+  background: #fff;
+  color: #1f2b3d;
+  font: inherit;
+  text-align: left;
+}
+
+.oxa-mobile-reference-trigger:disabled {
+  background: #f5f7fa;
+  color: #9aa5b5;
+}
+
+.oxa-mobile-reference-placeholder {
+  color: #9aa5b5;
+}
+
+.oxa-mobile-reference-backdrop {
+  position: fixed;
+  z-index: 1200;
+  inset: 0;
+  display: flex;
+  align-items: flex-end;
+  background: rgb(15 23 42 / 42%);
+}
+
+.oxa-mobile-reference-sheet {
+  display: grid;
+  width: 100%;
+  max-height: min(78vh, 640px);
+  gap: 12px;
+  padding: 16px 16px max(16px, env(safe-area-inset-bottom));
+  overflow: auto;
+  border-radius: 16px 16px 0 0;
+  background: #fff;
+  box-shadow: 0 -8px 32px rgb(15 23 42 / 18%);
+}
+
+.oxa-mobile-reference-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  color: #1f2b3d;
+}
+
+.oxa-mobile-reference-header button,
+.oxa-mobile-reference-more,
+.oxa-mobile-reference-confirm {
+  border: 0;
+  background: transparent;
+  color: #2d6cdf;
+  font: inherit;
+}
+
+.oxa-mobile-reference-search {
+  width: 100%;
+}
+
+.oxa-mobile-reference-options {
+  display: grid;
+  gap: 4px;
+}
+
+.oxa-mobile-reference-option {
+  display: flex;
+  min-height: 48px;
+  align-items: center;
+  gap: 10px;
+  padding: 8px 4px;
+  border: 0;
+  border-radius: 8px;
+  background: transparent;
+  color: #1f2b3d;
+  font: inherit;
+  text-align: left;
+}
+
+.oxa-mobile-reference-option.is-selected {
+  background: #edf4ff;
+}
+
+.oxa-mobile-reference-option:disabled {
+  color: #aab3c0;
+  opacity: 0.7;
+}
+
+.oxa-mobile-reference-option-copy {
+  display: grid;
+  min-width: 0;
+  flex: 1;
+  gap: 2px;
+}
+
+.oxa-mobile-reference-option-copy small {
+  overflow: hidden;
+  color: #7b879b;
+  font-size: 12px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.oxa-mobile-reference-loading,
+.oxa-mobile-reference-empty,
+.oxa-mobile-reference-error {
+  padding: 12px 4px;
+  color: #7b879b;
+  font-size: 13px;
+  text-align: center;
+}
+
+.oxa-mobile-reference-error {
+  color: #cf3c46;
+}
+
+.oxa-mobile-reference-more,
+.oxa-mobile-reference-confirm {
+  min-height: 42px;
+  border-radius: 8px;
+  background: #f0f5ff;
+  font-weight: 600;
+  text-align: center;
+}
+
+.oxa-mobile-reference-confirm {
+  background: #2d6cdf;
+  color: #fff;
+}
+
+.oxa-mobile-file-field {
+  display: grid;
+  gap: 8px;
+}
+
+.oxa-mobile-file-button {
+  display: inline-flex !important;
+  width: 100%;
+  min-height: 42px;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid #d9dfe9 !important;
+  border-radius: 8px;
+  background: #fff !important;
+  color: #2d6cdf;
+  font-weight: 600;
+}
+
+.oxa-mobile-file-button.ant-btn:disabled {
+  background: #f5f7fa;
+  color: #9aa5b5;
+}
+
+.oxa-mobile-pending-files {
+  display: grid;
+  gap: 8px;
+}
+
+.oxa-mobile-pending-file {
+  display: flex;
+  min-height: 42px;
+  align-items: center;
+  gap: 8px;
+  padding: 7px 9px;
+  border: 1px solid #dbe3ee;
+  border-radius: 8px;
+  background: #fbfcfe;
+  font-size: 13px;
+}
+
+.oxa-mobile-pending-file-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.oxa-mobile-pending-file-copy {
+  display: grid;
+  min-width: 0;
+  flex: 1;
+  gap: 2px;
+}
+
+.oxa-mobile-pending-file-copy small {
+  color: #7b879b;
+  font-size: 12px;
+}
+
+.oxa-mobile-pending-status {
+  color: #2d6cdf;
+  white-space: nowrap;
+}
+
+.oxa-mobile-pending-error {
+  max-width: 42%;
+  overflow: hidden;
+  color: #cf3c46;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 @media (max-width: 1280px) {
   .oxa-grid,
   .oxa-filter-grid {

package/template/apps/web/test/contracts.test.ts

@@ -20,9 +20,26 @@ test('standard surfaces keep authoritative directory/resource selectors and mobi
   const crud = readFileSync(new URL('../src/components/resource/GeneratedResourceCrud.tsx', import.meta.url), 'utf8');
   assert.match(surface, /PlatformDirectoryPicker/);
   assert.match(surface, /source="resource"/);
+  assert.match(surface, /MobileAuthoritativeSelector/);
+  assert.match(surface, /oxa-mobile-file-field/);
+  assert.match(surface, /mobilePending/);
+  assert.match(surface, /上传中/);
+  assert.match(surface, /重试/);
+  assert.match(surface, /AttachmentFileList files=\{refs\}/);
   assert.match(selector, /searchResource|resolveResource/);
+  assert.match(selector, /role="dialog"/);
+  assert.match(selector, /oxa-mobile-reference-sheet/);
   assert.match(crud, /MobileResourceListPage/);
   assert.match(crud, /fieldWritable/);
+  assert.match(crud, /exportResourceRows/);
+  assert.match(crud, /text\/csv;charset=utf-8/);
+  assert.match(crud, /数据读取失败/);
+  assert.match(crud, /state\.list\.query\.refetch/);
+  assert.match(crud, /key=\{pageKey\}/);
+  assert.match(crud, /setQuery\(\{\}\)/);
+  const client = readFileSync(new URL('../src/platform-client.ts', import.meta.url), 'utf8');
+  assert.match(client, /declaredFields\.has\(requestedSort\.field\)/);
+  assert.match(client, /if \(!declaredFields\.has\(fieldCode\)\) continue/);
 });
 
 test('runtime metadata stays mount-scoped', () => {

package/template/package.json

@@ -21,9 +21,9 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda-cli": "2.0.0-alpha.62",
-    "openxiangda-contracts": "2.0.0-alpha.30",
-    "openxiangda-devkit-core": "2.0.0-alpha.38",
+    "openxiangda-cli": "2.0.0-alpha.67",
+    "openxiangda-contracts": "2.0.0-alpha.31",
+    "openxiangda-devkit-core": "2.0.0-alpha.41",
     "typescript": "5.9.3"
   }
 }