openyida 2026.9.8 → 2026.9.9

package/README.md

@@ -174,6 +174,8 @@ openyida update-app APP_XXX --theme-file .cache/openyida/crm/app-theme.css --nav
 openyida corp-efficiency
 openyida create-form create APP_XXX "Customer" .cache/openyida/forms/customer-fields.json
 openyida create-form update APP_XXX FORM_XXX .cache/openyida/forms/customer-changes.json
+openyida create-form update APP_XXX FORM_XXX --data-file .cache/openyida/forms/customer-changes.json
+openyida create-form resume APP_XXX FORM_XXX .cache/openyida/forms/customer-fields.json --json
 openyida sample openyida-page-template form-fields --output .cache/openyida/forms/customer-fields.json
 openyida sample openyida-page-template canvas-form-drawer --output project/pages/src/customer-entry.canvas.jsx --var APP_TYPE=APP_XXX --var FORM_UUID=FORM_XXX
 openyida get-schema APP_XXX FORM_XXX
@@ -413,7 +415,8 @@ Run `openyida --help` or `openyida <command> --help` for detailed usage.
 | `openyida create-form create <appType> "<formTitle>" <fieldsJsonFile> [--icon auto\|<iconName>] [--locale zh_CN\|en_US\|ja_JP] [--open\|--no-open]` | Create a form page |
 | `openyida create-form icons [--json]` | List available form navigation icons |
 | `openyida create-form validate-fields <fieldsJsonOrFile> [--json]` | Validate form field JSON locally |
-| `openyida create-form update <appType> ... [--locale zh_CN\|en_US\|ja_JP] [--open\|--no-open]` | Update a form page |
+| `openyida create-form update <appType> <formUuid> (<changesJsonOrFile> \| --data-file <changesJsonOrFile>) [--locale zh_CN\|en_US\|ja_JP] [--open\|--no-open]` | Update a form page |
+| `openyida create-form resume <appType> <formUuid> <fieldsJsonOrFile> [--json]` | Update a form page |
 | `openyida create-form patch <appType> <formUuid> <patchJsonOrFile> [--open\|--no-open]` | Update a form page |
 | `openyida create-form rule <appType> <formUuid> <rulesJsonOrFile> [--open\|--no-open]` | Update a form page |
 | `openyida create-form validation <appType> <formUuid> <validationsJsonOrFile> [--open\|--no-open]` | Update a form page |

package/lib/app/create-form/args.js

@@ -89,6 +89,7 @@ function createParseArgs(dependencies) {
       contentLocale: null,
       browserOpenMode: openOption.mode,
     };
+    let dataFileInput;
 
     const args = [...rawArgs];
 
@@ -111,6 +112,14 @@ function createParseArgs(dependencies) {
         i--;
       } else if (args[i] === '--icon') {
         throwCreateFormError('--icon requires a value', 'CREATE_FORM_INVALID_ARGUMENTS');
+      } else if (args[i] === '--data-file') {
+        const next = args[i + 1];
+        if (dataFileInput !== undefined || !next || next.startsWith('--')) {
+          throwCreateFormError('--data-file requires exactly one value', 'CREATE_FORM_INVALID_ARGUMENTS');
+        }
+        dataFileInput = next;
+        args.splice(i, 2);
+        i--;
       } else if ((args[i] === '--locale' || args[i] === '--content-locale' || args[i] === '--lang') && i + 1 < args.length) {
         options.contentLocale = args[i + 1];
         if (!normalizeYidaLocale(options.contentLocale)) {
@@ -145,6 +154,10 @@ function createParseArgs(dependencies) {
 
     const mode = args[0];
 
+    if (dataFileInput !== undefined && mode !== 'update') {
+      throwCreateFormError('--data-file is only supported by create-form update', 'CREATE_FORM_INVALID_ARGUMENTS');
+    }
+
     if (mode === 'icons' || mode === 'list-icons') {
       return {
         mode: 'icons',
@@ -182,7 +195,12 @@ function createParseArgs(dependencies) {
     }
 
     if (mode === 'update') {
-      if (args.length < 4) {
+      const positionalInput = args[3];
+      if (args.length > 4 || (positionalInput && dataFileInput !== undefined)) {
+        throwCreateFormError('Use either <changesJsonOrFile> or --data-file, not both', 'CREATE_FORM_INVALID_ARGUMENTS');
+      }
+      const changesJsonOrFile = dataFileInput !== undefined ? dataFileInput : positionalInput;
+      if (args.length < 3 || !changesJsonOrFile) {
         usage(t('create_form.usage_update'), t('create_form.example_update'));
         throwCreateFormError(t('create_form.usage_update'), 'CREATE_FORM_INVALID_ARGUMENTS');
       }
@@ -190,7 +208,23 @@ function createParseArgs(dependencies) {
         mode: 'update',
         appType: args[1],
         formUuid: args[2],
-        changesJsonOrFile: args[3],
+        changesJsonOrFile,
+        ...options
+      };
+    }
+
+    if (mode === 'resume') {
+      if (args.length !== 4) {
+        throwCreateFormError(
+          'openyida create-form resume <appType> <formUuid> <fieldsJsonOrFile> --json',
+          'CREATE_FORM_INVALID_ARGUMENTS'
+        );
+      }
+      return {
+        mode: 'resume',
+        appType: args[1],
+        formUuid: args[2],
+        fieldsJsonOrFile: args[3],
         ...options
       };
     }

package/lib/app/create-form/batch.js

@@ -101,7 +101,10 @@ function execute(args) {
 }
 
 async function schedule(forms, concurrency, results, worker, save) {
-  const pending = new Set(forms.filter(form => !results[form.key] || results[form.key].status === 'blocked').map(form => form.key));
+  const pending = new Set(forms.filter(form => {
+    const result = results[form.key];
+    return !result || result.status === 'blocked' || (result.status === 'failed' && result.formUuid);
+  }).map(form => form.key));
   const active = new Map();
   try {
     while (pending.size || active.size) {
@@ -114,7 +117,7 @@ async function schedule(forms, concurrency, results, worker, save) {
         }
         if (active.size >= concurrency || deps.some(status => status !== 'success')) { continue; }
         pending.delete(form.key);
-        results[form.key] = { status: 'running' };
+        results[form.key] = { ...results[form.key], status: 'running' };
         save(); // Record intent before the request; an interrupted create is never retried automatically.
         const task = Promise.resolve().then(() => worker(form)).then(output => {
           results[form.key] = { ...output, status: 'success' };
@@ -178,16 +181,30 @@ async function run(args, dependencies = {}) {
       return matches[0].fieldId;
     };
     await schedule(forms, options.concurrency, state.results, async form => {
-      let formUuid = form.formUuid;
+      let formUuid = form.formUuid || state.results[form.key]?.formUuid;
+      let shouldResume = Boolean(!form.formUuid && formUuid);
+      const resolvedFields = mapReferences(form.fields, resolve);
       if (!formUuid) {
-        const argv = ['create-form', 'create', options.appType, form.title, JSON.stringify(mapReferences(form.fields, resolve)), '--no-open'];
+        const argv = ['create-form', 'create', options.appType, form.title, JSON.stringify(resolvedFields), '--no-open'];
         for (const key of ['icon', 'locale']) { if (form[key]) { argv.push(`--${key}`, form[key]); } }
-        const created = await call(argv);
-        if (typeof created.formUuid !== 'string' || !created.formUuid.startsWith('FORM')) { invalid(`create result: ${form.key}`); }
-        formUuid = created.formUuid;
+        try {
+          const created = await call(argv);
+          if (typeof created.formUuid !== 'string' || !created.formUuid.startsWith('FORM')) { invalid(`create result: ${form.key}`); }
+          formUuid = created.formUuid;
+        } catch (error) {
+          const createdFormUuid = error.output?.formUuid || error.output?.details?.formUuid;
+          if (typeof createdFormUuid !== 'string' || !createdFormUuid.startsWith('FORM')) {
+            throw error;
+          }
+          formUuid = createdFormUuid;
+          shouldResume = true;
+        }
       }
       state.results[form.key].formUuid = formUuid;
       save(state);
+      if (shouldResume) {
+        await call(['create-form', 'resume', options.appType, formUuid, JSON.stringify(resolvedFields), '--json']);
+      }
       const schema = await call(['get-schema', options.appType, formUuid, '--field-map-json']);
       if (schema.formUuid !== formUuid || !Array.isArray(schema.fields)) { invalid(`schema: ${form.key}`); }
       return { formUuid, fields: schema.fields };

package/lib/app/create-form/commands.js

@@ -6,6 +6,8 @@ function dispatchCreateFormCommand(parsedArgs, authContext, handlers) {
   switch (parsedArgs.mode) {
     case 'update':
       return handlers.update(...args);
+    case 'resume':
+      return handlers.resume(...args);
     case 'patch':
       return handlers.patch(...args);
     case 'rule':

package/lib/app/create-form.js

@@ -5911,6 +5911,297 @@ async function mainValidation(parsedArgs, authRef) {
 
 // ── update 模式主流程 ─────────────────────────────────
 
+function collectResumeFieldEvidence(fields, output) {
+  const evidence = output || [];
+  (fields || []).forEach(function (field) {
+    if (!field || typeof field !== 'object') {
+      return;
+    }
+    const labelText = extractLabelText(field);
+    if (labelText && !isFormPresentationComponent(field.componentName)) {
+      evidence.push({
+        label: labelText,
+        componentName: field.componentName,
+        fieldId: field.props && field.props.fieldId ? field.props.fieldId : null,
+      });
+    }
+    if (Array.isArray(field.children)) {
+      collectResumeFieldEvidence(field.children.flat(), evidence);
+    }
+  });
+  return evidence;
+}
+
+function desiredResumeFieldIdentity(field) {
+  const labelValue = field && field.label;
+  const label = typeof labelValue === 'string'
+    ? labelValue
+    : labelValue && (labelValue.zh_CN || labelValue.ja_JP || labelValue.en_US || labelValue.pureEn_US);
+  return {
+    label: String(label || '').trim(),
+    componentName: normalizeFormDefinitionType(field),
+  };
+}
+
+function collectResumeDesiredFields(fields, options) {
+  const output = [];
+  const verifyNestedFields = Boolean(options && options.verifyNestedFields);
+
+  function visit(value) {
+    if (Array.isArray(value)) {
+      value.forEach(visit);
+      return;
+    }
+    if (!value || typeof value !== 'object') {
+      return;
+    }
+    const componentName = normalizeFormDefinitionType(value);
+    if (isSupportedBusinessFieldType(componentName)) {
+      output.push(value);
+      if (!verifyNestedFields) {
+        return;
+      }
+    }
+    if (Array.isArray(value.children)) {
+      value.children.forEach(visit);
+    }
+  }
+
+  visit(fields);
+  return output;
+}
+
+function isRecoverableBlankResumeSchema(schema) {
+  const allowedShellComponents = new Set(['Page', 'RootHeader', 'RootContent', 'RootFooter', 'FooterYida']);
+  const componentsTree = schema && schema.pages && schema.pages[0] && schema.pages[0].componentsTree;
+  if (!Array.isArray(componentsTree) || componentsTree.length === 0) {
+    return true;
+  }
+  let safe = true;
+  function visit(node) {
+    if (!node || typeof node !== 'object' || !safe) {
+      return;
+    }
+    if (node.componentName && !allowedShellComponents.has(node.componentName)) {
+      safe = false;
+      return;
+    }
+    if (Array.isArray(node.children)) {
+      node.children.forEach(visit);
+    }
+  }
+  componentsTree.forEach(visit);
+  return safe;
+}
+
+function buildResumeChanges(existingFields, desiredFields) {
+  const existingByLabel = new Map();
+  existingFields.forEach(function (field) {
+    const bucket = existingByLabel.get(field.label) || [];
+    bucket.push(field);
+    existingByLabel.set(field.label, bucket);
+  });
+
+  const desiredLabels = new Set();
+  const missing = [];
+  const existing = [];
+  const conflicts = [];
+  desiredFields.forEach(function (field) {
+    const identity = desiredResumeFieldIdentity(field);
+    if (!identity.label || desiredLabels.has(identity.label)) {
+      conflicts.push({
+        code: identity.label ? 'CREATE_FORM_RESUME_DUPLICATE_DESIRED_FIELD' : 'CREATE_FORM_RESUME_FIELD_LABEL_REQUIRED',
+        label: identity.label || null,
+      });
+      return;
+    }
+    desiredLabels.add(identity.label);
+    const matches = existingByLabel.get(identity.label) || [];
+    if (matches.length === 0) {
+      missing.push(field);
+      return;
+    }
+    if (matches.length !== 1 || matches[0].componentName !== identity.componentName) {
+      conflicts.push({
+        code: 'CREATE_FORM_RESUME_FIELD_CONFLICT',
+        label: identity.label,
+        requestedType: identity.componentName,
+        observedTypes: matches.map(function (item) { return item.componentName; }),
+      });
+      return;
+    }
+    existing.push({
+      label: identity.label,
+      componentName: identity.componentName,
+      fieldId: matches[0].fieldId,
+    });
+  });
+  return { missing, existing, conflicts };
+}
+
+async function readResumeSchema(authRef, appType, formUuid) {
+  const schemaResult = await requestWithAutoLogin(function (auth) {
+    return sendGetRequest(
+      auth.baseUrl,
+      buildApiPath(appType, 'getFormSchema', { prefix: '_view', namespace: 'alibaba' }),
+      { formUuid: formUuid, schemaVersion: 'V5' }
+    );
+  }, authRef);
+  if (!schemaResult || schemaResult.success === false || schemaResult.__needLogin || schemaResult.__csrfExpired) {
+    throwCreateFormError(t('create_form.resume_readback_failed'), 'CREATE_FORM_RESUME_READBACK_FAILED', {
+      appType,
+      formUuid,
+      result: sanitizeFailureResult(schemaResult),
+    });
+  }
+  if (schemaResult.appType && schemaResult.appType !== appType) {
+    throwCreateFormError(t('create_form.resume_ownership_unverified'), 'CREATE_FORM_RESUME_OWNERSHIP_UNVERIFIED', {
+      appType,
+      formUuid,
+    });
+  }
+  if (schemaResult.formUuid && schemaResult.formUuid !== formUuid) {
+    throwCreateFormError(t('create_form.resume_identity_mismatch'), 'CREATE_FORM_RESUME_OWNERSHIP_UNVERIFIED', {
+      appType,
+      formUuid,
+    });
+  }
+  const schema = schemaResult.content
+    ? (typeof schemaResult.content === 'string' ? JSON.parse(schemaResult.content) : schemaResult.content)
+    : schemaResult.pages ? schemaResult : null;
+  if (!schema || !Array.isArray(schema.pages) || schema.pages.length === 0) {
+    throwCreateFormError(t('create_form.resume_schema_invalid'), 'CREATE_FORM_RESUME_SCHEMA_INVALID', {
+      appType,
+      formUuid,
+    });
+  }
+  return { schemaResult, schema, version: extractSchemaServerRevision(schemaResult) };
+}
+
+async function mainResume(parsedArgs, authRef) {
+  const { appType, formUuid, fieldsJsonOrFile } = parsedArgs;
+  assertNoEmojiInDefinitionFileName(fieldsJsonOrFile);
+  const { fields, validations } = readFieldsDefinition(fieldsJsonOrFile);
+  assertNoEmojiInFormDefinition(formUuid, fields, [], 'create-form resume input');
+  validateFormFieldDefinitions(fields);
+
+  const firstRead = await readResumeSchema(authRef, appType, formUuid);
+  const root = firstRead.schema.pages[0].componentsTree && firstRead.schema.pages[0].componentsTree[0];
+  const formContainer = root ? findFormContainer(root) : null;
+  const completedStages = ['read_target', 'verify_ownership'];
+  let recoveredBlankShell = false;
+  let plan;
+
+  if (!formContainer) {
+    if (!isRecoverableBlankResumeSchema(firstRead.schema)) {
+      throwCreateFormError(t('create_form.resume_container_invalid'), 'CREATE_FORM_RESUME_SCHEMA_INVALID', {
+        appType,
+        formUuid,
+        retryable: false,
+        remoteWrites: 0,
+      });
+    }
+    const corpId = resolveCorpId(authRef.authData);
+    const formTitle = firstRead.schemaResult.formTitle || firstRead.schemaResult.title || formUuid;
+    firstRead.schema = buildFormSchema(formTitle, fields, formUuid, corpId, appType, 'single', 'default', 'top');
+    const resumeValidationRules = collectSmartValidationRulesFromFields(fields).concat(validations || []);
+    if (resumeValidationRules.length > 0) {
+      applySmartValidations(firstRead.schema, resumeValidationRules);
+    }
+    await saveFormSchema(authRef, appType, formUuid, firstRead.schema, firstRead.version, 4);
+    completedStages.push('rebuild_blank_schema', 'save_schema');
+    recoveredBlankShell = true;
+    plan = {
+      existing: [],
+      missing: collectResumeDesiredFields(fields, { verifyNestedFields: true }),
+      conflicts: [],
+    };
+  } else if (!Array.isArray(formContainer.children)) {
+    throwCreateFormError(t('create_form.resume_container_invalid'), 'CREATE_FORM_RESUME_SCHEMA_INVALID', {
+      appType,
+      formUuid,
+      retryable: false,
+      remoteWrites: 0,
+    });
+  } else {
+    plan = buildResumeChanges(
+      collectResumeFieldEvidence(formContainer.children),
+      collectResumeDesiredFields(fields)
+    );
+    if (plan.conflicts.length > 0) {
+      throwCreateFormError(t('create_form.resume_field_conflict'), 'CREATE_FORM_RESUME_CONFLICT', {
+        appType,
+        formUuid,
+        retryable: false,
+        remoteWrites: 0,
+        diagnostics: plan.conflicts,
+      });
+    }
+    completedStages.push('compare_fields');
+  }
+
+  if (!recoveredBlankShell && plan.missing.length > 0) {
+    const applied = applyChangesToSchema(
+      firstRead.schema,
+      plan.missing.map(function (field) { return { action: 'add', field }; }),
+      { verbose: true }
+    );
+    if ((applied.diagnostics || []).length > 0) {
+      throwCreateFormError(t('create_form.resume_field_resolution_failed'), 'CREATE_FORM_RESUME_CONFLICT', {
+        appType,
+        formUuid,
+        retryable: false,
+        remoteWrites: 0,
+        diagnostics: applied.diagnostics,
+      });
+    }
+    const corpId = resolveCorpId(authRef.authData);
+    const updatedContainer = findFormContainer(firstRead.schema.pages[0].componentsTree[0]);
+    fillSerialNumberFormulas(updatedContainer.children, corpId, appType, formUuid);
+    await saveFormSchema(authRef, appType, formUuid, firstRead.schema, firstRead.version, 4);
+    completedStages.push('add_missing_fields', 'save_schema');
+  }
+
+  const finalRead = await readResumeSchema(authRef, appType, formUuid);
+  const finalContainer = findFormContainer(finalRead.schema.pages[0].componentsTree[0]);
+  const finalPlan = buildResumeChanges(
+    collectResumeFieldEvidence(finalContainer && finalContainer.children),
+    collectResumeDesiredFields(fields, { verifyNestedFields: true })
+  );
+  if (finalPlan.missing.length > 0 || finalPlan.conflicts.length > 0) {
+    throwCreateFormError(t('create_form.resume_readback_mismatch'), 'CREATE_FORM_RESUME_READBACK_MISMATCH', {
+      appType,
+      formUuid,
+      retryable: false,
+      resultUnknown: true,
+      completedStages,
+      missingFieldCount: finalPlan.missing.length,
+      diagnostics: finalPlan.conflicts,
+    });
+  }
+  completedStages.push('verify_final_schema');
+  const formUrl = authRef.baseUrl + '/' + appType + '/workbench/' + formUuid;
+  const output = {
+    success: true,
+    appType,
+    formUuid,
+    completedStages,
+    requestedFieldCount: fields.length,
+    existingFieldCount: plan.existing.length,
+    addedFieldCount: plan.missing.length,
+    finalFieldCount: collectResumeFieldEvidence(finalContainer.children).length,
+    recoveredBlankShell,
+    url: formUrl,
+  };
+  console.log(JSON.stringify(withBrowserHandoff(
+    output,
+    formUrl,
+    { stage: 'resume_form_success', title: formUuid },
+    parsedArgs.browserOpenMode
+  )));
+  return output;
+}
+
 async function mainUpdate(parsedArgs, authRef) {
   const { appType, formUuid, changesJsonOrFile } = parsedArgs;
 
@@ -6102,6 +6393,7 @@ async function run(args) {
     {
       create: mainCreate,
       update: mainUpdate,
+      resume: mainResume,
       patch: mainPatch,
       rule: mainRule,
       validation: mainValidation,

package/lib/app/services/canvas-page-schema-builder.js

@@ -530,8 +530,8 @@ function buildCanvasPageSchemaObject(sourceCode, runtimeCode, importedModules, f
             componentName: 'Page',
             id: nextNodeId(),
             props: {
-              contentBgColor: 'var(--oyd-page-background, var(--pod-page-bg-color, var(--color-white, #fff)))',
-              pageStyle: { backgroundColor: 'var(--oyd-page-background, var(--pod-page-bg-color, var(--color-white, #fff)))' },
+              contentBgColor: 'var(--pod-page-bg-color, var(--color-white, #fff))',
+              pageStyle: { backgroundColor: 'var(--pod-page-bg-color, var(--color-white, #fff))' },
               contentMargin: '0',
               contentPadding: '0',
               showTitle: false,
@@ -539,7 +539,7 @@ function buildCanvasPageSchemaObject(sourceCode, runtimeCode, importedModules, f
               templateVersion: '1.0.0',
               contentMarginMobile: '0',
               className: 'page_' + nextSuffix(),
-              contentBgColorMobile: 'var(--oyd-page-background, var(--pod-page-bg-color, var(--color-white, #fff)))',
+              contentBgColorMobile: 'var(--pod-page-bg-color, var(--color-white, #fff))',
             },
             condition: true,
             css: [

package/lib/core/command-manifest.js

@@ -449,6 +449,7 @@ const COMMAND_SIDE_EFFECTS = new Map([
     'create-form.bind-datasource',
     'create-form.create',
     'create-form.patch',
+    'create-form.resume',
     'create-form.rule',
     'create-form.update',
     'create-form.validation',
@@ -689,6 +690,7 @@ const COMMAND_PERMISSIONS = new Map([
     'create-form.create',
     'create-form.batch',
     'create-form.patch',
+    'create-form.resume',
     'create-form.rule',
     'create-form.update',
     'create-form.validation',
@@ -1223,7 +1225,8 @@ const COMMAND_GROUPS = [
       command('create-form.validate-fields', ['create-form', 'validate-fields'], 'create-form validate-fields <fieldsJsonOrFile> [--json]', 'help.cmd_validate_form', {
         requiresLogin: false,
       }),
-      command('create-form.update', ['create-form', 'update'], 'create-form update <appType> ... [--locale zh_CN|en_US|ja_JP] [--open|--no-open]', 'help.cmd_update_form'),
+      command('create-form.update', ['create-form', 'update'], 'create-form update <appType> <formUuid> (<changesJsonOrFile> | --data-file <changesJsonOrFile>) [--locale zh_CN|en_US|ja_JP] [--open|--no-open]', 'help.cmd_update_form'),
+      command('create-form.resume', ['create-form', 'resume'], 'create-form resume <appType> <formUuid> <fieldsJsonOrFile> [--json]', 'help.cmd_update_form'),
       command('create-form.patch', ['create-form', 'patch'], 'create-form patch <appType> <formUuid> <patchJsonOrFile> [--open|--no-open]', 'help.cmd_update_form'),
       command('create-form.rule', ['create-form', 'rule'], 'create-form rule <appType> <formUuid> <rulesJsonOrFile> [--open|--no-open]', 'help.cmd_update_form'),
       command('create-form.validation', ['create-form', 'validation'], 'create-form validation <appType> <formUuid> <validationsJsonOrFile> [--open|--no-open]', 'help.cmd_update_form'),

package/lib/core/locales/en.js

@@ -827,7 +827,15 @@ Examples:
     example_update: 'Example: openyida create-form update "APP_XXX" "FORM-YYY" \'[{"action":"add","field":{"type":"TextField","label":"Note"}}]\'',
     usage_label: 'Usage:',
     usage_create_short: '  create: openyida create-form create <appType> <formTitle> <fieldsJsonFile>',
-    usage_update_short: '  update: openyida create-form update <appType> <formUuid> <changesJsonOrFile>',
+    usage_update_short: '  update: openyida create-form update <appType> <formUuid> <changesJsonOrFile> or --data-file <changesJsonOrFile>',
+    resume_readback_failed: 'Unable to read the target form before resume.',
+    resume_ownership_unverified: 'The target form does not belong to the requested app; resume stopped.',
+    resume_identity_mismatch: 'The target form identity does not match the readback; resume stopped.',
+    resume_schema_invalid: 'The target form schema is unavailable.',
+    resume_container_invalid: 'The target form container is unavailable.',
+    resume_field_conflict: 'Existing fields conflict with the requested definition; resume stopped.',
+    resume_field_resolution_failed: 'Resume field resolution failed.',
+    resume_readback_mismatch: 'Resume readback did not confirm all requested fields.',
     example_label: '\nExamples:',
     fields_file_not_found: '  ❌ Fields definition file not found: ',
     fields_format_invalid: 'Invalid fields definition format',

package/lib/core/locales/zh.js

@@ -798,7 +798,15 @@ openyida - 宜搭命令行工具
     example_update: '示例：openyida create-form update "APP_XXX" "FORM-YYY" \'[{"action":"add","field":{"type":"TextField","label":"备注"}}]\'',
     usage_label: '用法:',
     usage_create_short: '  创建: openyida create-form create <appType> <formTitle> <fieldsJsonFile>',
-    usage_update_short: '  更新: openyida create-form update <appType> <formUuid> <changesJsonOrFile>',
+    usage_update_short: '  更新: openyida create-form update <appType> <formUuid> <changesJsonOrFile> 或 --data-file <changesJsonOrFile>',
+    resume_readback_failed: '恢复前无法回读目标表单。',
+    resume_ownership_unverified: '目标表单不属于指定应用，已停止恢复。',
+    resume_identity_mismatch: '目标表单身份与回读结果不一致，已停止恢复。',
+    resume_schema_invalid: '目标表单 Schema 不可用。',
+    resume_container_invalid: '目标表单容器不可用。',
+    resume_field_conflict: '已有字段与请求定义冲突，恢复已停止。',
+    resume_field_resolution_failed: '恢复字段解析失败。',
+    resume_readback_mismatch: '恢复后的回读未确认全部请求字段。',
     example_label: '\n示例:',
     fields_file_not_found: '  ❌ 字段定义文件不存在: ',
     fields_format_invalid: '字段定义格式不正确',

package/lib/core/sample.js

@@ -51,12 +51,14 @@ const SAMPLES = {
     'canvas-form-drawer': 'canvas-form-drawer.canvas.jsx',
     'form-open-container': 'canvas-form-drawer.canvas.jsx',
     'canvas-dialog': 'canvas-dialog.canvas.jsx',
+    'canvas-theme': 'canvas-form-drawer.canvas.jsx',
     'canvas-nav-side': 'canvas-nav/side.jsx',
     'canvas-nav-top': 'canvas-nav/top.jsx',
     'canvas-nav-mixed': 'canvas-nav/mixed.jsx',
     'canvas-nav-dock': 'canvas-nav/dock.jsx',
     'canvas-nav-tabs': 'canvas-nav/tabs.jsx',
     'canvas-nav-data': 'canvas-nav/data.jsx',
+    'canvas-nav-content': 'canvas-nav/content.jsx',
   },
   'yida-design': {
     'app-theme': 'app-custom-theme-template.css',
@@ -91,12 +93,15 @@ const SAMPLE_OUTPUT_FILENAMES = {
   'openyida-page-template/canvas-nav-dock': 'canvas-nav-dock.jsx',
   'openyida-page-template/canvas-nav-tabs': 'canvas-nav-tabs.jsx',
   'openyida-page-template/canvas-nav-data': 'canvas-nav-data.jsx',
+  'openyida-page-template/canvas-nav-content': 'canvas-nav-content.jsx',
   'openyida-page-template/form-open-container': 'form-open-container.jsx',
   'openyida-page-template/canvas-dialog': 'canvas-dialog.jsx',
+  'openyida-page-template/canvas-theme': 'canvas-theme.jsx',
   'yida-design/app-theme': 'app-theme.css',
 };
 
 const SAMPLE_HINTS = {
+  'openyida-page-template/canvas-nav-content': '合并 CanvasNavigationContent；顶部导航传 navigation，工作台传 children，原生页传 iframeSrc 和 title；宿主已分配高度时显式传 height。',
   'openyida-page-template/canvas-nav-data': '向 loadCanvasNavigation 传入 PRD 规划的 items，通常工作台在首位；接口只过滤不可见入口，保留规划顺序与分组。',
   'openyida-page-template/form-open-container': '将 import、抽屉组件和辅助函数合并到现有 Canvas 页面；表单使用 useYidaFormOpen，其他内容使用 CanvasDrawer。',
   'yida-design/app-theme': '已复制应用主题模板；请由 yida-design 按 design.md 定点修改需要变化的 token。',
@@ -251,7 +256,7 @@ async function run(args) {
   const defaultOutputPath = path.join(process.cwd(), '.cache', 'samples', outputFilename);
   const { outputPath, variables, designFile } = parseOptions(rest, defaultOutputPath);
   const isNavSample = skill === 'openyida-page-template' && name.startsWith('canvas-nav-');
-  const prefixPath = isNavSample && !['canvas-nav-tabs', 'canvas-nav-data'].includes(name) ? path.join(path.dirname(sourcePath), 'shared.jsx') : null;
+  const prefixPath = isNavSample && !['canvas-nav-tabs', 'canvas-nav-data', 'canvas-nav-content'].includes(name) ? path.join(path.dirname(sourcePath), 'shared.jsx') : null;
   const sidebarPath = isNavSample && ['canvas-nav-side', 'canvas-nav-mixed'].includes(name) ? path.join(path.dirname(sourcePath), 'sidebar.jsx') : null;
   if ([sourcePath, prefixPath, sidebarPath, designFile].filter(Boolean).some(file => path.resolve(outputPath) === path.resolve(file))) {
     throw new CliError('输出路径不能覆盖模板或 design.md', { code: 'SAMPLE_OUTPUT_CONFLICT' });
@@ -289,6 +294,13 @@ async function run(args) {
   } else if (prefixPath) {
     const content = [prefixPath, sidebarPath, sourcePath].filter(Boolean).map(file => fs.readFileSync(file, 'utf8')).join('\n');
     fs.writeFileSync(outputPath, applyTemplateVariables(content, variables), 'utf8');
+  } else if (sampleKey === 'openyida-page-template/canvas-theme') {
+    const sourceContent = fs.readFileSync(sourcePath, 'utf8');
+    const fragment = sourceContent.match(/\/\/ @openyida-canvas-theme:start\r?\n([\s\S]*?)\/\/ @openyida-canvas-theme:end/);
+    if (!fragment) {
+      throw new CliError('Canvas theme fragment missing', { code: 'SAMPLE_FRAGMENT_MISSING' });
+    }
+    fs.writeFileSync(outputPath, "import React from 'react';\n\n" + fragment[1], 'utf8');
   } else if (sampleKey === 'openyida-page-template/form-open-container') {
     const sourceContent = fs.readFileSync(sourcePath, 'utf8');
     const fragment = sourceContent.match(/\/\/ @openyida-form-drawer:start\r?\n([\s\S]*?)\/\/ @openyida-form-drawer:end/);

package/lib/design-plan/materialize.js

@@ -491,8 +491,7 @@ function deriveSurfacePalette(primaryColor, surfaceTone, template) {
   const darkSurface = surface && [1, 3, 5].every(index => parseInt(surface.slice(index, index + 2), 16) < 128);
   if (surfaceTone !== 'brand-tinted' || darkSurface) {return {};}
   return {
-    // 品牌浅底属于 Shell；原生页面保留独立表面，Canvas 透明时透出 Shell。
-    // 不覆盖上方按导航归属生成的 --oyd-page-background。
+    // 品牌氛围属于 Shell；原生页面和 Canvas 共用页面底色，不受导航归属影响。
     '--pod-shell-bg-color-light': mixHex(primaryColor, [255, 255, 255], 0.94),
     '--pod-card-bg-color': 'var(--color-white, #fff)',
     '--color-fill1-1': mixHex(primaryColor, [255, 255, 255], 0.97),
@@ -684,12 +683,9 @@ function renderDesign(plan) {
   for (const [token, value] of Object.entries(derived)) {
     output = replaceTokenValue(output, token, value);
   }
-  // 页面背景先遵循导航形态；项目显式 token 覆盖在下方应用，始终优先。
-  // 深色设计保留其明确的暗色画布，普通平台导航默认跟随应用页面背景。
-  if (navigationConfig(plan).hideAppNav === 'y' && !selected.themeId.startsWith('dark-')) {
-    output = replaceTokenValue(output, '--oyd-page-background', 'transparent');
-  } else if (!selected.themeId.startsWith('dark-')) {
-    output = replaceTokenValue(output, '--oyd-page-background', 'var(--pod-page-bg-color, var(--color-white, #fff))');
+  // 页面底色统一使用平台 token；导航形态不改变底色，项目显式设计仍优先。
+  if (!selected.themeId.startsWith('dark-')) {
+    output = replaceTokenValue(output, '--pod-page-bg-color', 'var(--color-white, #fff)');
   }
   const explicitTokens = visual.tokens || {};
   if (typeof explicitTokens !== 'object' || Array.isArray(explicitTokens)) {
@@ -718,9 +714,9 @@ function renderDesign(plan) {
     output = injectAfterFrontmatter(output, [
       '## 项目配色适配（优先于模板默认配色）', '',
       `用户选择的 ${text(color.primaryColorName, primaryColor)} 用于整体浅色氛围。Shell 浅色背景、填充和边界已按同一主色派生，项目显式 token 覆盖优先；最终取值以本文 tokens 为准。`,
-      '背景分层：--pod-shell-bg-color-light 承载 Shell 浅色氛围；--pod-page-bg-color 保留原生表单/数据管理的独立底色（浅色主题通常为白色）；--oyd-page-background 仅控制自定义页。隐藏应用导航时自定义页默认透明，显示平台导航时默认跟随原生页面底色；品牌浅底不得覆盖这项导航默认值。仅有明确的页面背景设计时覆盖 --oyd-page-background，不要因此改写 --pod-page-bg-color。',
+      '背景分层：Shell 承载外层氛围；原生页面与自定义页统一消费 --pod-page-bg-color，卡片与面板消费 --pod-card-bg-color。导航隐藏不自动改为透明；渐变、纹理、图片属于页面局部装饰层。明确的应用背景设计通过 app-theme.css 配置平台 token。',
       '模板中“固定无彩画布”“中性灰必须 R=G=B”“禁止主题色进入背景”等默认限制在本项目不适用；保留布局、圆角、阴影与组件结构。不要为了保留模板灰底，把用户选择的浅彩导航改白。',
-      '页面背景消费 --oyd-page-background，卡片消费 --pod-card-bg-color（回退 --color-white），边界消费 --pod-card-border；近白页面与白卡必须保留可见细边框，不能只靠阴影分层。导航、表头、嵌套区域与选中态消费同一组品牌/填充 token。',
+      '页面背景消费 --pod-page-bg-color，卡片消费 --pod-card-bg-color（回退 --color-white），边界消费 --pod-card-border；近白页面与白卡必须保留可见细边框，不能只靠阴影分层。导航、表头、嵌套区域与选中态消费同一组品牌/填充 token。',
       '正文与标题使用 --color-text1-4，表头与 placeholder 使用 --color-text1-10，辅助说明使用 --color-text1-3；保持中性文字明度层级，不把整页文字染成主色。成功、警告、错误沿用应用语义色。',
       'antd 的主色、容器、浮层、文字、边框、填充及语义色都须映射应用 token；浅彩氛围不能仅出现在导航和主按钮。页面实现前先读本节，再读取下面的结构与组件规则。', '',
     ].join('\n'));