openxiangda 1.0.44 → 1.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "OpenXiangda CLI, workspace build tools, runtime SDK, and form components.",
   "private": false,
   "bin": {

package/packages/sdk/src/build-source/scripts/publish-oss.mjs

@@ -17,6 +17,8 @@ import { loadConfig, rootDir } from "./utils/load-config.mjs";
 import { getContentType, getCacheControl } from "./utils/mime-types.mjs";
 import { createOSSClient, uploadWithRetry, ensureBucketCors } from "./utils/oss-client.mjs";
 import { createProgressTracker } from "./utils/progress.mjs";
+import { discoverPages } from "./utils/pages.mjs";
+import { buildUploadPatterns } from "./utils/publish-oss-patterns.mjs";
 
 const args = minimist(process.argv.slice(2).filter((arg) => arg !== "--"));
 const dryRun = Boolean(args["dry-run"]);
@@ -58,18 +60,11 @@ if (
 
 const client = dryRun ? null : createOSSClient(config.oss);
 
-/**
- * 构建文件扫描 glob 模式
- * @returns {string} glob 模式
- */
-function buildPattern() {
-  if (targetForm) return `{form-runtime/**/*,forms/${targetForm}/**/*}`;
-  if (targetPage) return `{page-runtime/**/*,pages/${targetPage}/**/*}`;
-  return "{form-runtime,page-runtime,forms,pages}/**/*";
-}
-
 const distDir = path.resolve(rootDir, "dist");
-const files = (await glob(buildPattern(), { cwd: distDir, nodir: true })).filter(
+const files = (await glob(
+  await buildUploadPatterns({ targetForm, targetPage, discoverPages }),
+  { cwd: distDir, nodir: true },
+)).filter(
   (file) => !file.endsWith("/build-cache.json"),
 );
 

package/packages/sdk/src/build-source/scripts/sync-schema.mjs

@@ -159,6 +159,7 @@ async function sendToApi(apiPayload, config, accessToken) {
         ? {
             schema: apiPayload.schema,
             packages: apiPayload.packages,
+            formType: apiPayload.formType,
           }
         : {
             userId: config.userId,
@@ -166,6 +167,7 @@ async function sendToApi(apiPayload, config, accessToken) {
             formUuid: apiPayload.formUuid,
             schema: apiPayload.schema,
             packages: apiPayload.packages,
+            formType: apiPayload.formType,
           },
     ),
   });

package/packages/sdk/src/build-source/scripts/utils/publish-oss-patterns.mjs

@@ -0,0 +1,20 @@
+export function getPageUploadPatterns(targetPage, pages = []) {
+  const names = new Set([targetPage].filter(Boolean));
+  for (const page of pages) {
+    const code = page?.config?.code;
+    if (page?.dirName === targetPage || code === targetPage) {
+      if (page.dirName) names.add(page.dirName);
+      if (code) names.add(code);
+    }
+  }
+  return ["page-runtime/**/*", ...[...names].map((name) => `pages/${name}/**/*`)];
+}
+
+export async function buildUploadPatterns({ targetForm, targetPage, discoverPages }) {
+  if (targetForm) return ["form-runtime/**/*", `forms/${targetForm}/**/*`];
+  if (targetPage) {
+    const pages = discoverPages ? await discoverPages() : [];
+    return getPageUploadPatterns(targetPage, pages);
+  }
+  return ["{form-runtime,page-runtime,forms,pages}/**/*"];
+}

package/packages/sdk/src/build-source/scripts/utils/publish-oss-patterns.test.ts

@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vitest";
+
+import { buildUploadPatterns, getPageUploadPatterns } from "./publish-oss-patterns.mjs";
+
+describe("publish oss upload patterns", () => {
+  it("uploads both page dir name and page config code assets", () => {
+    expect(
+      getPageUploadPatterns("runtime-workbench", [
+        {
+          dirName: "runtime-workbench",
+          config: { code: "runtime_workbench" },
+        },
+      ]),
+    ).toEqual([
+      "page-runtime/**/*",
+      "pages/runtime-workbench/**/*",
+      "pages/runtime_workbench/**/*",
+    ]);
+  });
+
+  it("resolves page config code when target page is already code", async () => {
+    await expect(
+      buildUploadPatterns({
+        targetForm: "",
+        targetPage: "runtime_workbench",
+        discoverPages: async () => [
+          {
+            dirName: "runtime-workbench",
+            config: { code: "runtime_workbench" },
+          },
+        ],
+      }),
+    ).resolves.toEqual([
+      "page-runtime/**/*",
+      "pages/runtime_workbench/**/*",
+      "pages/runtime-workbench/**/*",
+    ]);
+  });
+});

package/packages/sdk/src/build-source/scripts/utils/schema-transform.mjs

@@ -72,6 +72,9 @@ export function transformToApiFormat(schema, formName = "unknown") {
   validateFormSchema(schema, formName);
 
   const { formMeta, fields } = schema;
+  const formType = normalizeFormType(
+    formMeta.formType || schema.template?.formType,
+  );
   const componentNodes = fields.map(createFormComponentNode);
   const pageSchema = {
     version: "2.0",
@@ -88,12 +91,21 @@ export function transformToApiFormat(schema, formName = "unknown") {
   return {
     formUuid: formMeta.formUuid,
     appType: formMeta.appType,
+    formType,
     fieldCount: componentNodes.length,
     schema: JSON.stringify(pageSchema),
     packages: JSON.stringify({}),
   };
 }
 
+export function normalizeFormType(formType) {
+  const normalized = String(formType || "").trim().toLowerCase();
+  if (["process", "workflow", "flow", "flowform", "processform"].includes(normalized)) {
+    return "process";
+  }
+  return "receipt";
+}
+
 export function assertSchemaSyncResult(body, expectedFieldCount) {
   if (body?.code !== 200) {
     throw new Error(

package/packages/sdk/src/build-source/scripts/utils/schema-transform.test.ts

@@ -35,6 +35,7 @@ describe("schema-transform", () => {
     const schema = JSON.parse(payload.schema);
     const nodes = schema.componentsTree[0].children;
 
+    expect(payload.formType).toBe("receipt");
     expect(payload.fieldCount).toBe(2);
     expect(nodes[0].props).toMatchObject({
       fieldId: "customer_name",
@@ -48,6 +49,36 @@ describe("schema-transform", () => {
     });
   });
 
+  it("normalizes process form type from form meta or template", () => {
+    const fromMeta = transformToApiFormat(
+      {
+        formMeta: {
+          formUuid: "FORM_PROCESS_META",
+          appType: "APP_1",
+          title: "审批表单",
+          formType: "process",
+        },
+        fields: [{ fieldId: "title", componentName: "TextField", label: "标题" }],
+      },
+      "process-meta",
+    );
+    const fromTemplate = transformToApiFormat(
+      {
+        formMeta: {
+          formUuid: "FORM_PROCESS_TEMPLATE",
+          appType: "APP_1",
+          title: "审批表单",
+        },
+        template: { formType: "workflow" },
+        fields: [{ fieldId: "title", componentName: "TextField", label: "标题" }],
+      },
+      "process-template",
+    );
+
+    expect(fromMeta.formType).toBe("process");
+    expect(fromTemplate.formType).toBe("process");
+  });
+
   it("rejects duplicate field ids and empty fields", () => {
     expect(() =>
       transformToApiFormat(

package/templates/sy-lowcode-app-workspace/src/shared/form-schema.ts

@@ -57,8 +57,10 @@ export type OpenXiangdaFormSchemaInput = {
     formUuid: string;
     appType: string;
     title: string;
+    formType?: "receipt" | "process";
   };
   fields: FieldDefinition[];
+  template?: Record<string, unknown>;
 };
 
 export function option(value: string, label = value): FormOption {
@@ -72,6 +74,10 @@ export function options(values: string[]): FormOption[] {
 export function createFormSchema(input: OpenXiangdaFormSchemaInput) {
   return defineFormSchema({
     formMeta: input.formMeta,
+    template: {
+      ...(input.template || {}),
+      ...(input.formMeta.formType === "process" ? { formType: "process" } : {}),
+    },
     fields: input.fields.map(normalizeField),
     layout: input.fields.map((field) => ({
       id: `layout_${field.fieldId}`,