openxiangda-cli 2.0.0-alpha.85 → 2.0.0-alpha.89

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

@@ -35,8 +35,13 @@ import {
   type MenuProps,
   type TableColumnsType,
 } from 'antd';
-import dayjs from 'dayjs';
-import type { DataAuditEntry, DataResourceSurface } from 'openxiangda-contracts/browser';
+import type {
+  DataAuditEntry,
+  DataResourceSurface,
+  DataTransactionOperation,
+  SubjectProfile,
+  UserReferenceValue,
+} from 'openxiangda-contracts/browser';
 import { useEffect, useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { resourceDefinitions } from '../../../../../packages/contracts/src/generated.js';
@@ -56,10 +61,24 @@ import {
   SurfaceFilterControl,
   type SurfaceField,
 } from './SurfaceFields';
-import { createNativeResourceClient, type GenericResourceQuery } from '../../platform-client';
-import { ResolvedValueText } from '../../AuthoritativeSelector';
+import {
+  createNativeResourceClient,
+  transactNativeData,
+  type GenericResourceQuery,
+} from '../../platform-client';
+import { normalizeFormValues, normalizeRecordForForm } from '../platform-fields/field-form-codec';
+import { DirectoryIdentityText } from '../../AuthoritativeSelector';
 import { useRuntime } from '../../runtime';
 import { ResourceBatchActions, ResourceImportButton } from './ResourceBatchActions';
+import {
+  SubtableField,
+  SubtableValueDisplay,
+} from '../platform-fields/SubtableField';
+import {
+  buildSubtableOperations,
+  type SubtableDraftRow,
+} from '../platform-fields/subtable-value';
+import type { GeneratedResourceDefinition } from './generated-resource-definition';
 
 type ResourceRecord = Record<string, unknown> & {
   id: string;
@@ -67,19 +86,28 @@ type ResourceRecord = Record<string, unknown> & {
   updated_at?: string;
 };
 
-type GeneratedDefinition = {
-  code: string;
-  name: string;
-  capabilities: {
-    read: string;
-    create: string;
-    update: string;
-    delete: string;
-  };
-  surface: DataResourceSurface;
-};
+const definitions = resourceDefinitions as unknown as Record<
+  string,
+  GeneratedResourceDefinition
+>;
 
-const definitions = resourceDefinitions as unknown as Record<string, GeneratedDefinition>;
+function signatureSigner(profile: SubjectProfile | null): UserReferenceValue | undefined {
+  if (!profile) return undefined;
+  return {
+    label: profile.displayName,
+    value: profile.userId,
+    ...(profile.avatarUrl ? { avatarUrl: profile.avatarUrl } : {}),
+    ...(profile.jobNumber ? { employeeNo: profile.jobNumber } : {}),
+    ...(profile.affiliatedDepartment
+      ? {
+          departments: [{
+            label: profile.affiliatedDepartment.name,
+            value: profile.affiliatedDepartment.id,
+          }],
+        }
+      : {}),
+  };
+}
 
 function definitionFor(resourceCode: string) {
   return definitions[resourceCode];
@@ -92,6 +120,7 @@ function fieldFor(surface: DataResourceSurface, key: string): SurfaceField {
     : {
         key,
         label: key,
+        type: 'text.short',
         widget: 'text',
         readCapabilities: [],
         createCapabilities: [],
@@ -112,39 +141,16 @@ function fieldsBySection(surface: DataResourceSurface) {
   }));
 }
 
-function normalizeRecordForForm(record: ResourceRecord, surface: DataResourceSurface) {
-  return Object.fromEntries(
-    Object.entries(record).map(([key, value]) => {
-      const widget = surface.fields[key]?.widget;
-      return widget === 'date' || widget === 'datetime' ? [key, value ? dayjs(String(value)) : undefined] : [key, value];
-    })
-  );
-}
-
-function normalizeFormValues(values: Record<string, unknown>, surface: DataResourceSurface) {
-  return Object.fromEntries(
-    Object.entries(values).map(([key, value]) => {
-      const widget = surface.fields[key]?.widget;
-      return widget === 'date' || widget === 'datetime'
-        ? [
-            key,
-            value && typeof value === 'object' && 'format' in value
-              ? widget === 'datetime'
-                ? dayjs(value as never).toISOString()
-                : (value as { format: (pattern: string) => string }).format('YYYY-MM-DD')
-              : value,
-          ]
-        : [key, value];
-    })
-  );
-}
-
-function fieldWritable(field: SurfaceField, mode: 'create' | 'edit', hasCapability: (code: string) => boolean, isAppSuperAdmin: boolean) {
+function fieldWriteAuthorized(field: SurfaceField, mode: 'create' | 'edit', hasCapability: (code: string) => boolean, isAppSuperAdmin: boolean) {
   if (isAppSuperAdmin) return true;
   const capabilities = mode === 'create' ? field.createCapabilities : field.updateCapabilities;
   return capabilities.length > 0 && capabilities.every(hasCapability);
 }
 
+function fieldWritable(field: SurfaceField, mode: 'create' | 'edit', hasCapability: (code: string) => boolean, isAppSuperAdmin: boolean) {
+  return field.widget !== 'readonly' && fieldWriteAuthorized(field, mode, hasCapability, isAppSuperAdmin);
+}
+
 function fieldReadable(field: SurfaceField, hasCapability: (code: string) => boolean, isAppSuperAdmin: boolean) {
   return isAppSuperAdmin || (field.readCapabilities.length > 0 && field.readCapabilities.every(hasCapability));
 }
@@ -166,27 +172,6 @@ function auditChangeFields(entry: DataAuditEntry, surface: DataResourceSurface)
   return fields.filter((field) => Object.prototype.hasOwnProperty.call(source, field.key));
 }
 
-function exportCellValue(field: SurfaceField, value: unknown) {
-  if (value === undefined || value === null || value === '') return '';
-  if (field.widget === 'boolean') return value ? '是' : '否';
-  if (field.options && !Array.isArray(value)) {
-    return field.options.find((option) => option.value === value)?.label || String(value);
-  }
-  if (Array.isArray(value)) {
-    return value.map((item) => field.options?.find((option) => option.value === item)?.label || String(item)).join('、');
-  }
-  if (field.widget === 'date' || field.widget === 'datetime') {
-    const parsed = new Date(String(value));
-    if (!Number.isNaN(parsed.getTime())) return parsed.toLocaleString('zh-CN', { hour12: false });
-  }
-  if (typeof value === 'object' && value && 'id' in value) return String((value as { id: unknown }).id);
-  return String(value);
-}
-
-function csvCell(value: string) {
-  return /[\r\n,"]/.test(value) ? `"${value.replaceAll('"', '""')}"` : value;
-}
-
 async function exportResourceRows(
   code: string,
   name: string,
@@ -196,35 +181,21 @@ async function exportResourceRows(
   sort: { field: string; order: 'asc' | 'desc' }
 ) {
   const client = createNativeResourceClient(code, surface);
-  const rows: ResourceRecord[] = [];
-  const pageSize = 500;
-  let page = 1;
-  let total = 0;
-  do {
-    const result = await client.list({
-      page,
-      pageSize,
-      keyword: query.keyword,
-      searchField: query.searchField,
-      filters: query.filters,
-      sort,
-    });
-    rows.push(...(result.rows as ResourceRecord[]));
-    total = result.total;
-    page += 1;
-  } while (rows.length < total && rows.length < 10000 && page <= 20);
-  const header = fields.map((field) => csvCell(field.label)).join(',');
-  const body = rows.map((row) => fields.map((field) => csvCell(exportCellValue(field, row[field.key]))).join(','));
-  const blob = new Blob([`\uFEFF${[header, ...body].join('\r\n')}`], {
-    type: 'text/csv;charset=utf-8',
-  });
-  const url = URL.createObjectURL(blob);
+  const exported = await client.exportCsv({
+    page: 1,
+    pageSize: 200,
+    keyword: query.keyword,
+    searchField: query.searchField,
+    filters: query.filters,
+    sort,
+  }, fields.map((field) => field.key));
+  const url = URL.createObjectURL(exported.blob);
   const anchor = document.createElement('a');
   anchor.href = url;
-  anchor.download = `${name}-${dayjs().format('YYYYMMDD-HHmmss')}.csv`;
+  anchor.download = exported.fileName || `${name}.csv`;
   anchor.click();
-  URL.revokeObjectURL(url);
-  return { count: rows.length, truncated: rows.length < total };
+  window.setTimeout(() => URL.revokeObjectURL(url), 0);
+  return { rowLimit: exported.rowLimit };
 }
 
 function AuditEntry({ entry, surface, readable }: { entry: DataAuditEntry; surface: DataResourceSurface; readable: (field: SurfaceField) => boolean }) {
@@ -244,7 +215,7 @@ function AuditEntry({ entry, surface, readable }: { entry: DataAuditEntry; surfa
             {entry.actor.oauthClientId ? `（${entry.actor.oauthClientId}）` : ''}
           </Typography.Text>
         ) : (
-          <ResolvedValueText source="user" value={entry.actor.userId} />
+          <DirectoryIdentityText id={entry.actor.userId} source="user" />
         )}
         <span>时间</span>
         <Typography.Text>{new Date(entry.occurredAt).toLocaleString('zh-CN')}</Typography.Text>
@@ -273,7 +244,10 @@ function AuditEntry({ entry, surface, readable }: { entry: DataAuditEntry; surfa
   );
 }
 
-function useGeneratedList(definition: GeneratedDefinition, readableFieldCodes: Set<string>) {
+function useGeneratedList(
+  definition: GeneratedResourceDefinition,
+  readableFieldCodes: Set<string>
+) {
   const { code, surface } = definition;
   const declaredDefaultSort = surface.list?.defaultSort?.field;
   const defaultSortField =
@@ -328,12 +302,14 @@ export function GeneratedResourcePage({
   resourceCode,
   mode = 'list',
   variant = 'desktop',
+  definition: providedDefinition,
 }: {
   resourceCode: string;
   mode?: 'list' | 'create' | 'edit' | 'detail';
   variant?: 'desktop' | 'mobile';
+  definition?: GeneratedResourceDefinition;
 }) {
-  const definition = definitionFor(resourceCode);
+  const definition = providedDefinition || definitionFor(resourceCode);
   if (!definition || definition.surface.generated === false) {
     return <Result status="404" title="未声明可生成的资源页面" />;
   }
@@ -343,11 +319,11 @@ export function GeneratedResourcePage({
   return <GeneratedResourceFormPage key={pageKey} definition={definition} mode={mode} variant={variant} />;
 }
 
-function GeneratedResourceListPage({ definition, variant }: { definition: GeneratedDefinition; variant: 'desktop' | 'mobile' }) {
+function GeneratedResourceListPage({ definition, variant }: { definition: GeneratedResourceDefinition; variant: 'desktop' | 'mobile' }) {
   return variant === 'mobile' ? <GeneratedMobileList definition={definition} /> : <GeneratedDesktopList definition={definition} />;
 }
 
-function GeneratedDesktopList({ definition }: { definition: GeneratedDefinition }) {
+function GeneratedDesktopList({ definition }: { definition: GeneratedResourceDefinition }) {
   const navigate = useNavigate();
   const { message } = App.useApp();
   const { hasCapability, identity } = useRuntime();
@@ -398,6 +374,7 @@ function GeneratedDesktopList({ definition }: { definition: GeneratedDefinition
           render: (value: unknown, record: ResourceRecord) => (
             <SurfaceFieldValue
               field={field}
+              resourceCode={code}
               value={value}
               renderers={{
                 renderValue: ({ value: current }) =>
@@ -474,7 +451,7 @@ function GeneratedDesktopList({ definition }: { definition: GeneratedDefinition
     setExporting(true);
     try {
       const result = await exportResourceRows(code, name, surface, fields, state.query, state.sort);
-      message.success(result.truncated ? `已导出 ${result.count} 条（最多导出 10000 条）` : `已导出 ${result.count} 条`);
+      message.success(`导出已生成（最多 ${result.rowLimit} 条）`);
     } catch (error) {
       message.error(error instanceof Error ? error.message : '导出失败');
     } finally {
@@ -569,6 +546,7 @@ function GeneratedDesktopList({ definition }: { definition: GeneratedDefinition
               <div className={`oxa-filter-item${index >= 2 && !filtersExpanded ? ' is-collapsed' : ''}`} key={key}>
                 <SurfaceFilterControl
                   field={field}
+                  resourceCode={code}
                   onChange={(value) =>
                     state.setDraft((item) => ({
                       ...item,
@@ -708,7 +686,7 @@ function GeneratedDesktopList({ definition }: { definition: GeneratedDefinition
   );
 }
 
-function GeneratedMobileList({ definition }: { definition: GeneratedDefinition }) {
+function GeneratedMobileList({ definition }: { definition: GeneratedResourceDefinition }) {
   const navigate = useNavigate();
   const { hasCapability, identity } = useRuntime();
   const { message } = App.useApp();
@@ -728,7 +706,7 @@ function GeneratedMobileList({ definition }: { definition: GeneratedDefinition }
     setExporting(true);
     try {
       const result = await exportResourceRows(code, name, surface, fields, state.query, state.sort);
-      message.success(result.truncated ? `已导出 ${result.count} 条（最多导出 10000 条）` : `已导出 ${result.count} 条`);
+      message.success(`导出已生成（最多 ${result.rowLimit} 条）`);
     } catch (error) {
       message.error(error instanceof Error ? error.message : '导出失败');
     } finally {
@@ -798,7 +776,7 @@ function GeneratedMobileList({ definition }: { definition: GeneratedDefinition }
                   <div key={field.key}>
                     <Typography.Text type="secondary">{field.label}</Typography.Text>
                     <div>
-                      <SurfaceFieldValue field={field} value={record[field.key]} />
+                      <SurfaceFieldValue field={field} resourceCode={code} value={record[field.key]} />
                     </div>
                   </div>
                 ))}
@@ -839,7 +817,7 @@ function GeneratedResourceFormPage({
   mode,
   variant,
 }: {
-  definition: GeneratedDefinition;
+  definition: GeneratedResourceDefinition;
   mode: 'create' | 'edit';
   variant: 'desktop' | 'mobile';
 }) {
@@ -850,6 +828,7 @@ function GeneratedResourceFormPage({
   const [form] = Form.useForm();
   const create = useCreate<ResourceRecord>();
   const update = useUpdate<ResourceRecord>();
+  const [transactionPending, setTransactionPending] = useState(false);
   const query = useOne<ResourceRecord>({
     resource: definition.code,
     id,
@@ -867,19 +846,102 @@ function GeneratedResourceFormPage({
   if (!hasCapability(mode === 'create' ? capabilities.create : capabilities.update))
     return <Result status="403" title="当前平台用户无此操作权限" />;
   const submit = async (values: Record<string, unknown>) => {
-    const next = normalizeFormValues(
-      Object.fromEntries(
-        Object.entries(values).filter(([key]) =>
+    const writableValues = Object.fromEntries(
+      Object.entries(values).filter(([key]) =>
+        fieldWritable(
+          fieldFor(surface, key),
+          mode,
+          hasCapability,
+          identity.isAppSuperAdmin
+        )
+      )
+    );
+    const subtableFields = Object.entries(surface.fields)
+      .map(([key, field]) => ({ key, ...field }))
+      .filter(
+        field =>
+          field.type === 'subtable' &&
           fieldWritable(
-            fieldFor(surface, key),
+            field,
             mode,
             hasCapability,
             identity.isAppSuperAdmin
           )
+      );
+    const next = normalizeFormValues(
+      Object.fromEntries(
+        Object.entries(writableValues).filter(
+          ([key]) => surface.fields[key]?.type !== 'subtable'
         )
       ),
       surface
     );
+    if (subtableFields.length > 0) {
+      if (mode === 'edit' && (!record?.id || !Number.isSafeInteger(record.revision))) {
+        throw new Error('OPENXIANGDA_SUBTABLE_PARENT_REVISION_REQUIRED');
+      }
+      const operations: DataTransactionOperation[] = [
+        mode === 'create'
+          ? { operation: 'create', resourceCode: code, data: next }
+          : {
+              operation: 'update',
+              resourceCode: code,
+              id: record!.id,
+              expectedRevision: record!.revision,
+              data: next,
+            },
+      ];
+      for (const subtableField of subtableFields) {
+        const config = subtableField.subtable;
+        const childDefinition = config
+          ? definitionFor(config.resourceCode)
+          : undefined;
+        if (!config || !childDefinition) {
+          throw new Error(`OPENXIANGDA_SUBTABLE_DEFINITION_MISSING:${subtableField.key}`);
+        }
+        operations.push(
+          ...buildSubtableOperations({
+            rows: Array.isArray(writableValues[subtableField.key])
+              ? writableValues[subtableField.key] as SubtableDraftRow[]
+              : [],
+            childResourceCode: config.resourceCode,
+            childSurface: childDefinition.surface,
+            foreignKey: config.foreignKey,
+            orderField: config.orderField,
+            maxRows: config.maxRows,
+            parent: mode === 'create'
+              ? { operation: 'create', operationIndex: 0 }
+              : { operation: 'update', id: record!.id },
+            canWrite: (fieldCode, childField, childOperation) =>
+              fieldWriteAuthorized(
+                { key: fieldCode, ...childField },
+                childOperation === 'create' ? 'create' : 'edit',
+                hasCapability,
+                identity.isAppSuperAdmin
+              ),
+            canDelete:
+              identity.isAppSuperAdmin ||
+              hasCapability(childDefinition.capabilities.delete),
+          })
+        );
+      }
+      if (operations.length > 100) {
+        throw new Error('OPENXIANGDA_DATA_TRANSACTION_TOO_LARGE');
+      }
+      setTransactionPending(true);
+      try {
+        const result = await transactNativeData(operations);
+        const parent = result.items[0];
+        if (!parent || parent.operation === 'emitEvent') {
+          throw new Error('OPENXIANGDA_SUBTABLE_PARENT_RESULT_MISSING');
+        }
+        message.success(mode === 'create' ? `${name}已创建` : '修改已保存');
+        navigate(mode === 'create' ? listPath : `/${code}/${parent.id}`);
+      } finally {
+        setTransactionPending(false);
+      }
+      return;
+    }
     if (mode === 'create') {
       await create.mutateAsync({ resource: code, values: next });
       message.success(`${name}已创建`);
@@ -931,8 +993,19 @@ function GeneratedResourceFormPage({
                     disabled={!fieldWritable(field, mode, hasCapability, identity.isAppSuperAdmin)}
                     field={field}
                     operation={mode === 'create' ? 'create' : 'update'}
+                    resourceCode={code}
                     recordId={record?.id}
                     renderers={{
+                      renderSubtable: (context) => (
+                        <SubtableField
+                          disabled={context.disabled}
+                          field={context.field}
+                          mobile={variant === 'mobile'}
+                          operation={context.operation}
+                          parentRecordId={context.recordId}
+                        />
+                      ),
+                      signer: signatureSigner(identity.subjectProfile),
                       upload: (current, file, recordId) => createNativeResourceClient(code, surface).upload(current.key, file, recordId),
                     }}
                   />
@@ -943,7 +1016,7 @@ function GeneratedResourceFormPage({
         </div>
         <div className="oxa-actions">
           <Button onClick={() => navigate(mode === 'edit' ? detailPath : listPath)}>取消</Button>
-          <Button htmlType="submit" loading={create.mutation.isPending || update.mutation.isPending} type="primary">
+          <Button htmlType="submit" loading={create.mutation.isPending || update.mutation.isPending || transactionPending} type="primary">
             {mode === 'create' ? '保存' : '保存修改'}
           </Button>
         </div>
@@ -952,7 +1025,7 @@ function GeneratedResourceFormPage({
   );
 }
 
-function GeneratedResourceDetailPage({ definition, variant }: { definition: GeneratedDefinition; variant: 'desktop' | 'mobile' }) {
+function GeneratedResourceDetailPage({ definition, variant }: { definition: GeneratedResourceDefinition; variant: 'desktop' | 'mobile' }) {
   const { id = '' } = useParams();
   const navigate = useNavigate();
   const { hasCapability, identity } = useRuntime();
@@ -1041,7 +1114,20 @@ function GeneratedResourceDetailPage({ definition, variant }: { definition: Gene
               items={group.fields.map((field) => ({
                 key: field.key,
                 label: field.label,
-                children: <SurfaceFieldValue field={field} value={record[field.key]} />,
+                span: field.type === 'subtable' ? 3 : 1,
+                children: field.type === 'subtable' ? (
+                  <SubtableValueDisplay
+                    field={field}
+                    mobile={variant === 'mobile'}
+                    parentRecordId={record.id}
+                  />
+                ) : (
+                  <SurfaceFieldValue
+                    field={field}
+                    resourceCode={definition.code}
+                    value={record[field.key]}
+                  />
+                ),
               }))}
             />
           </Card>

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

@@ -281,7 +281,14 @@ export function ResourceBatchActions({
               }}
             />
           </Form.Item>
-          {field && <SurfaceFieldControl disabled={false} field={{ ...field, requiredHint: true }} operation="update" />}
+          {field && (
+            <SurfaceFieldControl
+              disabled={false}
+              field={{ ...field, requiredHint: true }}
+              operation="update"
+              resourceCode={code}
+            />
+          )}
         </Form>
       </Modal>
       <Modal