openxiangda 1.0.109 → 1.0.110

package/lib/cli.js

@@ -1483,7 +1483,25 @@ async function workspace(args) {
       profileName,
       `/openxiangda-api/v1/apps/${encodeURIComponent(bound.appType)}/snapshot`
     );
-    runWorkspacePublish(profileName, profile, bound.appType, publishOptions.workspaceArgs);
+    const reactSpaWorkspace = isReactSpaWorkspace();
+    if (reactSpaWorkspace && !publishOptions.legacyFormBundle) {
+      if (publishOptions.targetForm && !publishOptions.targetPage && !publishOptions.only && !publishOptions.changed) {
+        runReactSpaFormSchemaPublish(profileName, profile, bound.appType, publishOptions);
+      } else {
+        fail(
+          [
+            'React SPA 工作区不使用 workspace publish 发布前端页面。',
+            '如需发布表单 schema，请运行：',
+            `  openxiangda workspace publish --profile ${profileName} --form <formCode>`,
+            '如需发布资源和前端运行时，请运行：',
+            `  openxiangda resource publish --profile ${profileName}`,
+            `  openxiangda runtime deploy --profile ${profileName}`,
+          ].join('\n')
+        );
+      }
+    } else {
+      runWorkspacePublish(profileName, profile, bound.appType, publishOptions.workspaceArgs);
+    }
     if (publishOptions.includeResources) {
       if (publishOptions.dryRun) {
         const manifest = loadWorkspaceResources();
@@ -3649,7 +3667,9 @@ async function resource(args) {
     return;
   }
 
+  const target = getWorkspaceTarget(config, profileName, flags);
   const validation = validateWorkspaceResources(manifest);
+  validateWorkspaceResourceBindings(manifest, target.bound, validation);
   await validateCompiledWorkflowResources(manifest, validation);
   if (subcommand === 'validate') {
     if (flags.json) return writeJson(validation);
@@ -3663,7 +3683,6 @@ async function resource(args) {
     fail(`资源配置校验失败: ${validation.errors[0]}`);
   }
 
-  const target = getWorkspaceTarget(config, profileName, flags);
   const dryRun = subcommand === 'publish' && Boolean(flags['dry-run']);
   if (subcommand === 'plan' || dryRun) {
     const plan = await buildResourcePlan(config, target, manifest);
@@ -5358,6 +5377,34 @@ function validateWorkspaceResources(manifest) {
   };
 }
 
+function validateWorkspaceResourceBindings(manifest, bound, validation) {
+  for (const item of manifest.workflows || []) {
+    if (!item.formCode && !item.form) continue;
+    const formCode = item.formCode || item.form;
+    const formBinding = bound?.resources?.forms?.[formCode];
+    const formUuid = formBinding?.formUuid;
+    if (!formUuid) {
+      validation.errors.push(
+        `${resourceLabel('workflow', item)}: formCode ${formCode} 未绑定。请先运行 openxiangda workspace publish --profile <name> --form ${formCode}`
+      );
+      continue;
+    }
+    const localSchemaPath = path.join(process.cwd(), 'src', 'forms', formCode, 'schema.ts');
+    if (fs.existsSync(localSchemaPath) && !formBinding.schemaSyncedAt) {
+      validation.errors.push(
+        `${resourceLabel('workflow', item)}: formCode ${formCode} 已绑定但本地 schema 尚未同步。请先运行 openxiangda workspace publish --profile <name> --form ${formCode}`
+      );
+    }
+    if (formBinding.formType && formBinding.formType !== 'process') {
+      validation.errors.push(
+        `${resourceLabel('workflow', item)}: formCode ${formCode} 当前 formType=${formBinding.formType}，流程表单需要 process`
+      );
+    }
+  }
+  validation.valid = validation.errors.length === 0;
+  return validation;
+}
+
 async function validateCompiledWorkflowResources(manifest, validation) {
   for (const item of manifest.workflows || []) {
     if (!item.workflowFile) continue;
@@ -9663,6 +9710,7 @@ function normalizeWorkspacePublishOptions(flags) {
   if (since) workspaceArgs.push('--since', since);
   if (dryRun) workspaceArgs.push('--dry-run');
   if (force) workspaceArgs.push('--force');
+  if (flags['legacy-form-bundle']) workspaceArgs.push('--legacy-form-bundle');
 
   const targeted = Boolean(targetForm || targetPage || only || changed);
   const includeResources =
@@ -9671,6 +9719,11 @@ function normalizeWorkspacePublishOptions(flags) {
   return {
     workspaceArgs,
     dryRun,
+    targetForm,
+    targetPage,
+    only,
+    changed,
+    legacyFormBundle: Boolean(flags['legacy-form-bundle']),
     includeResources,
     quietResourceSkip: !targeted || skipResources,
   };
@@ -9708,6 +9761,43 @@ function runWorkspacePublish(profileName, profile, appType, publishArgs = []) {
   }
 }
 
+function isReactSpaWorkspace() {
+  const configFile = path.join(process.cwd(), 'app-workspace.config.ts');
+  if (!fs.existsSync(configFile)) return false;
+  const content = fs.readFileSync(configFile, 'utf8');
+  return /runtimeMode\s*:\s*['"]react-spa['"]/.test(content);
+}
+
+function runReactSpaFormSchemaPublish(profileName, profile, appType, publishOptions) {
+  const packageFile = path.join(process.cwd(), 'package.json');
+  if (!fs.existsSync(packageFile)) {
+    fail('当前目录没有 package.json，无法识别工作区发布脚本');
+  }
+  const pkg = JSON.parse(fs.readFileSync(packageFile, 'utf8'));
+  const scripts = pkg.scripts || {};
+  const usePnpm = fs.existsSync(path.join(process.cwd(), 'pnpm-lock.yaml'));
+  const command = usePnpm ? 'pnpm' : 'npm';
+  const syncArgs = ['--form', publishOptions.targetForm];
+  if (publishOptions.dryRun) syncArgs.push('--dry-run');
+  const args = scripts['sync-schema']
+    ? ['run', 'sync-schema', '--', ...syncArgs]
+    : usePnpm
+      ? ['exec', 'lowcode-workspace', 'sync-schema', ...syncArgs]
+      : ['exec', '--', 'lowcode-workspace', 'sync-schema', ...syncArgs];
+  print(
+    `React SPA 表单 schema 发布${publishOptions.dryRun ? ' (dry-run)' : ''}: ${publishOptions.targetForm}`
+  );
+  const globalEnv = loadGlobalEnv();
+  const result = spawnSync(command, args, {
+    cwd: process.cwd(),
+    stdio: 'inherit',
+    env: buildWorkspacePublishEnv(profileName, profile, appType, globalEnv),
+  });
+  if (result.status !== 0) {
+    process.exit(result.status || 1);
+  }
+}
+
 function buildWorkspacePublishEnv(profileName, profile, appType, globalEnv) {
   const env = { ...process.env };
   const injectedGlobalKeys = [];

package/lib/design-gates.js

@@ -498,6 +498,7 @@ const RESOURCE_EXPLAINS = {
       enable: true,
     },
     commands: [
+      'openxiangda workspace publish --profile <name> --form expense_request',
       'openxiangda workflow compile src/workflows/expense_approval/workflow.ts --check',
       'openxiangda workflow compile src/workflows/expense_approval/workflow.ts --out-definition src/generated/workflows/expense_approval/definition.v3.json --out-preview src/generated/workflows/expense_approval/preview.json',
       'openxiangda resource validate workflow',

package/openxiangda-skills/SKILL.md

@@ -38,7 +38,7 @@ OpenXiangda supports two workspace modes. Classic `sy-lowcode-app-workspace` pub
 
 ### Hard rules — always
 
-- ✅ Publish classic workspaces through `openxiangda workspace publish --profile <name>`; publish React SPA workspaces through `openxiangda resource validate` → `openxiangda resource publish --dry-run` → `openxiangda resource publish` → `openxiangda runtime deploy`.
+- ✅ Publish classic workspaces through `openxiangda workspace publish --profile <name>`; publish React SPA forms first with `openxiangda workspace publish --form <formCode>`, then resources/runtime through `openxiangda resource validate` → `openxiangda resource publish --dry-run` → `openxiangda resource publish` → `openxiangda runtime deploy`.
 - ✅ Architecture-class requests are plan-gated by default. For 新应用、复杂页面、登录注册、公开访问、权限数据范围、流程自动化、连接器/通知、外部集成, first run `openxiangda doctor --json` when a workspace exists and `openxiangda design gates --topic <code> --json`; then ask the user to confirm the design. Before confirmation, only read files, inspect/snapshot, dry-run, ask questions, and write/output design docs. Do not edit source files, write platform resources, send notifications, publish, or deploy.
 - ✅ `runtime deploy` defaults to staged multipart `dist/` uploads plus a final manifest. Use `--upload-mode legacy-json` only for old platform servers.
 - ✅ User token lives in `~/.openxiangda/profiles.json`; project state in `.openxiangda/state.json` (IDs only).
@@ -162,7 +162,7 @@ When the user provides a root domain such as `https://yida.wisejob.cn/`, use it
 - Use JS_CODE for node-local cross-form data queries, create/update/batch update operations, process termination, platform API calls, external HTTP calls, and backend trigger orchestration. For logic that pages, automations, and workflows should reuse through a stable backend entry, prefer App Function. Do not use JS_CODE for simple UI interactions, ordinary form validation, or display-only page behavior.
 - For workflow/automation JS_CODE nodes, prefer V2 `runtimeMode: "trusted_node"`. AI-authored source must be TypeScript under `src/js-code-nodes/<scriptCode>/index.ts`, `src/automations/<resourceCode>/index.ts`, or `src/functions/<functionCode>/index.ts`. `pnpm build-js-code --script <scriptCode>` runs TypeScript validation before bundling, and `sourceFile.localPath` should point to the TS source; the CLI builds, uploads, and replaces it with snapshot metadata during validate/create.
 - Form permission group resources must have stable local codes. Use unique `code` values such as `ticket_reporter_view` and `ticket_repairer_view`; do not rely on the form code when one form has multiple groups.
-- Workflow resources should prefer `workflowFile` + `defineWorkflow` semantic DSL over hand-written raw JSON. Run `openxiangda workflow compile <workflow.ts> --check` and `openxiangda resource publish --dry-run --profile <name>` before publish; use `sdk.process.resolveCapabilities(...)` or `ProcessActionBar` / `ProcessTimeline` from `openxiangda/runtime/react` for runtime buttons and timelines instead of hard-coded operation lists.
+- Workflow resources should prefer `workflowFile` + `defineWorkflow` semantic DSL over hand-written raw JSON. For workflows bound by `formCode`, run `openxiangda workspace publish --form <formCode>` first so the process form schema/table is initialized, then run `openxiangda workflow compile <workflow.ts> --check` and `openxiangda resource publish --dry-run --profile <name>` before publish; use `sdk.process.resolveCapabilities(...)` or `ProcessActionBar` / `ProcessTimeline` from `openxiangda/runtime/react` for runtime buttons and timelines instead of hard-coded operation lists.
 - Workflow resources can be created as drafts. After resource publish, verify `openxiangda workflow list --profile <name> --json` and run `openxiangda workflow publish <workflowCode> --profile <name>` until `isPublished: true` is visible.
 
 ## Subskills

package/openxiangda-skills/skills/openxiangda-core/SKILL.md

@@ -37,6 +37,7 @@ openxiangda workspace publish --profile <name>
 For Phase 6 React SPA workspaces (`workspace init --runtime react-spa`), do not use `workspace publish` for frontend routes. Publish in two explicit steps:
 
 ```bash
+openxiangda workspace publish --profile <name> --form <formCode> # required for forms/workflows
 openxiangda resource validate --profile <name>
 openxiangda resource plan --profile <name>
 openxiangda resource publish --profile <name> --dry-run

package/package.json

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

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

@@ -22,6 +22,7 @@ import {
   ensureSchemaFormUuid,
   getOpenApiAccessToken,
   isOpenXiangdaMode,
+  markWorkspaceFormSchemaSynced,
 } from "./utils/form-api.mjs";
 import {
   assertSchemaSyncResult,
@@ -305,6 +306,12 @@ async function main() {
     } else {
       try {
         const response = await sendToApi(apiPayload, config, accessToken);
+        markWorkspaceFormSchemaSynced(config, form.name, apiPayload.formUuid, {
+          title: schema.formMeta?.title || form.name,
+          formType: apiPayload.formType || schema.formMeta?.formType || "receipt",
+          fieldCount: apiPayload.fieldCount,
+          tableName: response?.data?.tableName,
+        });
         console.log(`  ✅ 同步成功，tableName=${response.data.tableName}`);
         results.push({ name: form.name, success: true, response });
       } catch (error) {

package/packages/sdk/src/build-source/scripts/utils/form-api.mjs

@@ -116,6 +116,13 @@ function saveWorkspaceFormBinding(config, formName, formUuid, extra = {}) {
   return true;
 }
 
+export function markWorkspaceFormSchemaSynced(config, formName, formUuid, extra = {}) {
+  return saveWorkspaceFormBinding(config, formName, formUuid, {
+    ...extra,
+    schemaSyncedAt: new Date().toISOString(),
+  });
+}
+
 function readExportedStringConstant(filePath, exportName) {
   if (!filePath || !fs.existsSync(filePath)) return "";
   const content = fs.readFileSync(filePath, "utf-8");

package/templates/openxiangda-react-spa/AGENTS.md

@@ -33,7 +33,7 @@ openxiangda runtime deploy --profile <name>
 openxiangda commands --json
 ```
 
-`pnpm deploy -- --profile <name>` 会按顺序执行 `openxiangda resource publish --profile <name>` 与 `openxiangda runtime deploy --profile <name>`。不要直接运行 `pnpm publish:all`、`pnpm openxiangda:publish` 或 `lowcode-workspace publish-all`；这些是 legacy classic workspace 的内部发布入口，会被 `scripts/guard-publish.mjs` 拦截。
+`pnpm deploy -- --profile <name>` 会按顺序执行 `openxiangda resource publish --profile <name>` 与 `openxiangda runtime deploy --profile <name>`。如果应用包含 `src/forms/<formCode>/schema.ts`，先执行 `openxiangda workspace publish --profile <name> --form <formCode>` 初始化表单 schema/table。不要直接运行 `pnpm publish:all`、`pnpm openxiangda:publish` 或 `lowcode-workspace publish-all`；这些是 legacy classic workspace 的内部发布入口，会被 `scripts/guard-publish.mjs` 拦截。
 
 完整发布顺序：
 

package/templates/openxiangda-react-spa/scripts/guard-publish.mjs

@@ -4,7 +4,8 @@ const lines = [
   '',
   '错误：React SPA 工作区不要直接调用 lowcode-workspace publish-all。',
   '',
-  'React SPA 的发布入口分两步，且必须显式指定 profile：',
+  'React SPA 的发布入口必须显式指定 profile：',
+  '  openxiangda workspace publish --profile <name> --form <formCode>  # 仅同步表单 schema',
   '  openxiangda resource publish --profile <name>',
   '  openxiangda runtime deploy --profile <name>',
   '',