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

package/template/apps/web/src/components/resource/generated-resource-definition.ts

@@ -0,0 +1,18 @@
+import type { DataResourceSurface } from 'openxiangda-contracts/browser';
+
+export interface GeneratedResourceDefinition {
+  code: string;
+  name: string;
+  capabilities: {
+    read: string;
+    create: string;
+    update: string;
+    delete: string;
+  };
+  surface: DataResourceSurface;
+}
+
+export type GeneratedResourceDefinitions = Record<
+  string,
+  GeneratedResourceDefinition
+>;

package/template/apps/web/src/components/resource/resource-import.ts

@@ -82,7 +82,7 @@ export function parseResourceImportMatrix(
     if (!code) return null;
     const field = surface.fields[code];
     if (!field) return null;
-    if (field.widget === 'file') {
+    if (['file', 'image', 'signature'].includes(field.type)) {
       errors.push(`文件字段“${field.label}”必须通过平台上传组件录入`);
       return null;
     }
@@ -153,7 +153,7 @@ function importValue(field: DataResourceSurface['fields'][string], input: unknow
     if (!Number.isFinite(value)) throw new Error('必须是数字');
     return value;
   }
-  if (field.widget === 'boolean') {
+  if (field.type === 'boolean') {
     if (input === true || input === 1 || /^(?:是|true|yes|1)$/i.test(String(input).trim())) return true;
     if (input === false || input === 0 || /^(?:否|false|no|0)$/i.test(String(input).trim())) return false;
     throw new Error('请填写是或否');
@@ -185,7 +185,7 @@ function importValue(field: DataResourceSurface['fields'][string], input: unknow
       throw new Error('必须是有效 JSON');
     }
   }
-  const multiple = field.widget === 'multi' || field.multiple;
+  const multiple = field.type.endsWith('.multiple');
   const values = multiple
     ? (Array.isArray(input) ? input : String(input).split(/[、,，;；\n]+/)).map((value) => String(value).trim()).filter(Boolean)
     : [String(input).trim()];
@@ -193,7 +193,7 @@ function importValue(field: DataResourceSurface['fields'][string], input: unknow
     const resolved = values.map((value) => {
       const option = field.options?.find((item) => item.value === value || item.label === value);
       if (!option) throw new Error(`“${value}”不在可选项中`);
-      return option.value;
+      return { ...option };
     });
     return multiple ? resolved : resolved[0];
   }

package/template/apps/web/src/data-provider.ts

@@ -2,46 +2,71 @@ import type { DataProvider } from '@refinedev/core';
 import { createNativeResourceClient, type GenericResourceQuery } from './platform-client';
 import { applicationCode } from './runtime-meta';
 import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
+import type { GeneratedResourceDefinitions } from './components/resource/generated-resource-definition';
 
-type GeneratedDefinition = {
-  code: string;
-  name: string;
-  capabilities: { read: string; create: string; update: string; delete: string };
-  surface: import('openxiangda-contracts/browser').DataResourceSurface;
-};
-
-const definitions = resourceDefinitions as unknown as Record<string, GeneratedDefinition>;
+const definitions = resourceDefinitions as unknown as GeneratedResourceDefinitions;
 type ListParams = Parameters<NonNullable<DataProvider['getList']>>[0];
 type OneParams = Parameters<NonNullable<DataProvider['getOne']>>[0];
 type CreateParams = Parameters<NonNullable<DataProvider['create']>>[0];
 type UpdateParams = Parameters<NonNullable<DataProvider['update']>>[0];
 type DeleteParams = Parameters<NonNullable<DataProvider['deleteOne']>>[0];
 
-function clientFor(resource: string) {
-  const definition = definitions[resource];
-  if (!definition) throw new Error(`OPENXIANGDA_GENERATED_RESOURCE_NOT_DECLARED:${resource}`);
-  return createNativeResourceClient(resource, definition.surface);
+export function createApplicationProvider(
+  declaredDefinitions: GeneratedResourceDefinitions
+) {
+  const clientFor = (resource: string) => {
+    const definition = declaredDefinitions[resource];
+    if (!definition) {
+      throw new Error(
+        `OPENXIANGDA_GENERATED_RESOURCE_NOT_DECLARED:${resource}`
+      );
+    }
+    return createNativeResourceClient(resource, definition.surface);
+  };
+
+  return {
+    getApiUrl: () =>
+      `/service/openxiangda-api/v2/applications/${applicationCode()}/native/data`,
+    getList: async ({ resource, pagination, sorters, meta }: ListParams) => {
+      const query = (meta?.query || {}) as Partial<GenericResourceQuery>;
+      const sorter = sorters?.[0];
+      const result = await clientFor(resource).list({
+        page: pagination?.currentPage || 1,
+        pageSize: pagination?.pageSize || 20,
+        ...query,
+        ...(sorter
+          ? {
+              sort: {
+                field: String(sorter.field),
+                order: (sorter.order || 'asc') as 'asc' | 'desc',
+              },
+            }
+          : {}),
+      });
+      return { data: result.rows, total: result.total };
+    },
+    getOne: async ({ resource, id }: OneParams) => ({
+      data: await clientFor(resource).get(String(id)),
+    }),
+    create: async ({ resource, variables }: CreateParams) => ({
+      data: await clientFor(resource).create(
+        variables as Record<string, unknown>
+      ),
+    }),
+    update: async ({ resource, id, variables, meta }: UpdateParams) => ({
+      data: await clientFor(resource).update(
+        String(id),
+        Number(meta?.expectedRevision),
+        variables as Record<string, unknown>
+      ),
+    }),
+    deleteOne: async ({ resource, id, meta }: DeleteParams) => ({
+      data: await clientFor(resource).remove(
+        String(id),
+        Number(meta?.expectedRevision)
+      ),
+    }),
+  } as unknown as DataProvider;
 }
 
-export const applicationProvider = {
-  getApiUrl: () => `/service/openxiangda-api/v2/applications/${applicationCode()}/native/data`,
-  getList: async ({ resource, pagination, sorters, meta }: ListParams) => {
-    const query = (meta?.query || {}) as Partial<GenericResourceQuery>;
-    const sorter = sorters?.[0];
-    const result = await clientFor(resource).list({
-      page: pagination?.currentPage || 1,
-      pageSize: pagination?.pageSize || 20,
-      ...query,
-      ...(sorter ? { sort: { field: String(sorter.field), order: (sorter.order || 'asc') as 'asc' | 'desc' } } : {}),
-    });
-    return { data: result.rows, total: result.total };
-  },
-  getOne: async ({ resource, id }: OneParams) => ({ data: await clientFor(resource).get(String(id)) }),
-  create: async ({ resource, variables }: CreateParams) => ({ data: await clientFor(resource).create(variables as Record<string, unknown>) }),
-  update: async ({ resource, id, variables, meta }: UpdateParams) => ({
-    data: await clientFor(resource).update(String(id), Number(meta?.expectedRevision), variables as Record<string, unknown>),
-  }),
-  deleteOne: async ({ resource, id, meta }: DeleteParams) => ({
-    data: await clientFor(resource).remove(String(id), Number(meta?.expectedRevision)),
-  }),
-} as unknown as DataProvider;
+export const applicationProvider = createApplicationProvider(definitions);