@skopon-cool/form-sdk 0.4.7 → 0.4.9

package/dist/submit/intersectPayloadBlocksWithForm.d.ts

@@ -9,7 +9,7 @@ export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' |
 export interface PayloadBlocksIntersection {
     matchedBlocks: FormBlock[];
     extraBlocks: FormBlock[];
-    /** 按 payload 顺序：layout + matched input（不含 extra input） */
+    /** 按 payload 顺序：layout/media + matched input（不含 extra input） */
     renderBlocks: FormBlock[];
     title: string;
     description: string;
@@ -25,7 +25,7 @@ export declare function intersectPayloadBlocksWithForm(payloadDef: PayloadBlocks
 export declare function extractExtraBlockValues(extraBlocks: FormBlock[]): Record<string, unknown>;
 /** payload 是否含至少一个具 name 的 input 块（可用于卡片 fallback） */
 export declare function payloadHasInputBlocks(payloadDef: PayloadBlocksDefinition): boolean;
-/** 交集为空时 fallback：payload 中可上屏的 blocks（layout + 非 hidden input） */
+/** 交集为空时 fallback：payload 中可上屏的 blocks（layout/media + 非 hidden input） */
 export declare function getPayloadRenderableBlocks(payloadDef: PayloadBlocksDefinition): FormBlock[];
 /** payload 中所有 input 块 field name（fallback 提交用，含 hidden） */
 export declare function getPayloadInputFieldNames(payloadDef: PayloadBlocksDefinition): string[];

package/dist/submit/intersectPayloadBlocksWithForm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intersectPayloadBlocksWithForm.d.ts","sourceRoot":"","sources":["../../src/submit/intersectPayloadBlocksWithForm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3D,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG;IAC3F;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,SAAS,EAAE,CAAA;IAC1B,WAAW,EAAE,SAAS,EAAE,CAAA;IACxB,0DAA0D;IAC1D,YAAY,EAAE,SAAS,EAAE,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;CACpB;AA8ED,uEAAuE;AACvE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,uBAAuB,GAAG,IAAI,CAmBvF;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,uBAAuB,EACnC,cAAc,EAAE,UAAU,GAAG,SAAS,GACrC,yBAAyB,CA+B3B;AA+BD,2CAA2C;AAC3C,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzF;AAED,sDAAsD;AACtD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,uBAAuB,GAAG,OAAO,CAIlF;AAED,mEAAmE;AACnE,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,EAAE,CAO3F;AAED,4DAA4D;AAC5D,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,uBAAuB,GAAG,MAAM,EAAE,CAIvF;AAED,6DAA6D;AAC7D,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,uBAAuB,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB"}
+{"version":3,"file":"intersectPayloadBlocksWithForm.d.ts","sourceRoot":"","sources":["../../src/submit/intersectPayloadBlocksWithForm.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAG3D,MAAM,MAAM,uBAAuB,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,aAAa,GAAG,QAAQ,CAAC,GAAG;IAC3F;;;OAGG;IACH,SAAS,CAAC,EAAE,SAAS,EAAE,CAAA;CACxB,CAAA;AAED,MAAM,WAAW,yBAAyB;IACxC,aAAa,EAAE,SAAS,EAAE,CAAA;IAC1B,WAAW,EAAE,SAAS,EAAE,CAAA;IACxB,gEAAgE;IAChE,YAAY,EAAE,SAAS,EAAE,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,MAAM,CAAA;CACpB;AA+ED,uEAAuE;AACvE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,uBAAuB,GAAG,IAAI,CAmBvF;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,uBAAuB,EACnC,cAAc,EAAE,UAAU,GAAG,SAAS,GACrC,yBAAyB,CA+B3B;AA+BD,2CAA2C;AAC3C,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzF;AAED,sDAAsD;AACtD,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,uBAAuB,GAAG,OAAO,CAIlF;AAED,yEAAyE;AACzE,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,EAAE,CAO3F;AAED,4DAA4D;AAC5D,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,uBAAuB,GAAG,MAAM,EAAE,CAIvF;AAED,6DAA6D;AAC7D,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,uBAAuB,GAClC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "Skopon form rendering SDK (A2UI + form_definition) with submit helpers",
   "type": "module",
   "sideEffects": [

package/src/catalog/skoponCaseSelect.tsx

@@ -14,6 +14,20 @@ function readString(value: unknown): string {
   return typeof value === 'string' ? value : ''
 }
 
+/** 与 formSchema.normalizeFlowUniqueIds 对齐：兼容数组 / JSON 数组字符串。 */
+function readFlowUniqueIds(raw: unknown): string[] {
+  if (Array.isArray(raw)) return raw.map(String).filter(Boolean)
+  if (typeof raw === 'string' && raw.trim()) {
+    try {
+      const parsed: unknown = JSON.parse(raw)
+      if (Array.isArray(parsed)) return parsed.map(String).filter(Boolean)
+    } catch {
+      /* ignore */
+    }
+  }
+  return []
+}
+
 function readCaseFilter(raw: unknown): FormCaseFilter {
   if (!raw || typeof raw !== 'object') {
     return { flowUniqueIds: [], pageSize: 20 }
@@ -40,9 +54,7 @@ function readCaseFilter(raw: unknown): FormCaseFilter {
     typeof rec.category === 'string' && rec.category.trim()
       ? rec.category.trim()
       : undefined
-  const flowUniqueIds = Array.isArray(rec.flowUniqueIds)
-    ? rec.flowUniqueIds.map(String).filter(Boolean)
-    : []
+  const flowUniqueIds = readFlowUniqueIds(rec.flowUniqueIds)
   return { agentKind, agentUniqueId, flowType, category, flowUniqueIds, pageSize }
 }
 

package/src/components/AskUserFormCard.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { Button, Spin, Tag, Tooltip } from 'antd'
 import type { FormDetailResult, FormSchema, SubmitMode } from '../types/index'
+import { isInputBlockType } from '../types/index'
 import {
   resolveRealtimeWsUrl,
   resolveSubmitAuthHeaders,
@@ -213,7 +214,7 @@ function AskUserFormCardBody({
   const fieldNames = useMemo(
     () =>
       renderBlocks
-        .filter((block) => block.name?.trim())
+        .filter((block) => isInputBlockType(block.type) && block.name?.trim())
         .map((block) => block.name!.trim()),
     [renderBlocks],
   )
@@ -355,10 +356,20 @@ function AskUserFormCardBody({
         return
       }
 
+      // form 必须是交集后的有效 schema（含 ask 动态 caseFilter），
+      // 不能传 vt_forms 原始 formDef，否则 flowUniqueIds 等会被编辑器默认冲掉。
+      const effectiveForm =
+        renderBlocks.length > 0
+          ? {
+              title: surfaceTitle,
+              description: surfaceDescription,
+              blocks: renderBlocks,
+            }
+          : (payloadDef ?? undefined)
       const body = buildAnswerAgentBody({
         context: resolvedAnswerAgentContext,
         payload,
-        form: formDef ?? payloadDef,
+        form: effectiveForm,
         answer,
       })
       const agentError = validateAnswerAgentBody(body)
@@ -388,6 +399,8 @@ function AskUserFormCardBody({
     submitting,
     fieldNames,
     renderBlocks,
+    surfaceTitle,
+    surfaceDescription,
     extraValues,
     reportSnapshot,
     runtime,
@@ -396,7 +409,6 @@ function AskUserFormCardBody({
     resolvedSubmitHeaders,
     resolvedAnswerAgentContext,
     payload,
-    formDef,
     payloadDef,
   ])
 

package/src/submit/intersectPayloadBlocksWithForm.ts

@@ -1,6 +1,6 @@
 import { normalizeFormDefinition } from '../adapter/formSchema'
 import type { FormBlock, FormSchema } from '../types/index'
-import { isInputBlockType, isLayoutBlockType } from '../types/index'
+import { isDisplayBlockType, isInputBlockType } from '../types/index'
 
 export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' | 'blocks'> & {
   /**
@@ -13,7 +13,7 @@ export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' |
 export interface PayloadBlocksIntersection {
   matchedBlocks: FormBlock[]
   extraBlocks: FormBlock[]
-  /** 按 payload 顺序：layout + matched input（不含 extra input） */
+  /** 按 payload 顺序：layout/media + matched input（不含 extra input） */
   renderBlocks: FormBlock[]
   title: string
   description: string
@@ -46,7 +46,8 @@ function buildRenderBlocks(
 
   const renderBlocks: FormBlock[] = []
   for (const payloadBlock of payloadDef.blocks) {
-    if (isLayoutBlockType(payloadBlock.type)) {
+    // layout / media 按 payload 原样上屏（ask 动态 mediaUrls 必须保留）
+    if (isDisplayBlockType(payloadBlock.type)) {
       renderBlocks.push(normalizePayloadBlock(payloadBlock))
       continue
     }
@@ -205,10 +206,10 @@ export function payloadHasInputBlocks(payloadDef: PayloadBlocksDefinition): bool
   )
 }
 
-/** 交集为空时 fallback：payload 中可上屏的 blocks（layout + 非 hidden input） */
+/** 交集为空时 fallback：payload 中可上屏的 blocks（layout/media + 非 hidden input） */
 export function getPayloadRenderableBlocks(payloadDef: PayloadBlocksDefinition): FormBlock[] {
   return payloadDef.blocks.filter((block) => {
-    if (isLayoutBlockType(block.type)) return true
+    if (isDisplayBlockType(block.type)) return true
     if (!isInputBlockType(block.type) || !block.name?.trim()) return false
     // hidden text 不上屏；提交值由 getPayloadHiddenBlockValues / dataModel 补齐
     return !isHiddenTextBlock(block)