@skopon-cool/form-sdk 0.4.5 → 0.4.7

package/src/index.ts

@@ -4,13 +4,17 @@ export type {
   A2uiComponentNode,
   A2uiSurfaceDoc,
   FormBlock,
+  FormBlockCondition,
   FormBlockOption,
   FormBlockType,
+  FormCaseFilter,
+  FormConditionOperator,
   FormDefinitionPayload,
   FormDetailResult,
   FormFilePlaceholderIcon,
   FormJsonSchema,
   FormMediaSize,
+  FormResumeFilter,
   FormSchema,
   SubmitMode,
 } from './types/index'
@@ -18,9 +22,12 @@ export type {
 export {
   A2UI_PROTOCOL_VERSION,
   FORM_MEDIA_SIZES,
+  isDisplayBlockType,
   isInputBlockType,
   isLayoutBlockType,
   isMediaBlockType,
+  isOptionsBlockType,
+  supportsDefaultValue,
 } from './types/index'
 
 export {
@@ -37,7 +44,16 @@ export {
   resolveSurfaceFromFormDefinition,
 } from './adapter/resolveSurface'
 
-export { normalizeFormDefinition, syncFormDefinition } from './adapter/formSchema'
+export {
+  blocksToJsonSchema,
+  coerceToggleValue,
+  createEmptyBlock,
+  createEmptyFormDefinition,
+  normalizeFormDefinition,
+  normalizeMultiselectCount,
+  resolveSchemaDefaultValue,
+  syncFormDefinition,
+} from './adapter/formSchema'
 
 export { extractSurfaceValues } from './adapter/extractSurfaceValues'
 
@@ -49,6 +65,7 @@ export {
 } from './submit/buildCurlStatement'
 export {
   extractExtraBlockValues,
+  getPayloadHiddenBlockValues,
   getPayloadInputFieldNames,
   getPayloadRenderableBlocks,
   intersectPayloadBlocksWithForm,
@@ -144,6 +161,4 @@ export {
   type CaseSearchResult,
 } from './catalog/caseSearchContext'
 
-export type { FormResumeFilter, FormCaseFilter } from './types/index'
-
 import './styles/index.css'

package/src/submit/intersectPayloadBlocksWithForm.ts

@@ -21,6 +21,10 @@ export interface PayloadBlocksIntersection {
 
 const FORM_ANCHORED_KEYS = new Set(['type', 'name', 'id'])
 
+function isHiddenTextBlock(block: FormBlock): boolean {
+  return block.type === 'text' && block.hidden === true
+}
+
 function normalizePayloadBlock(block: FormBlock): FormBlock {
   return normalizeFormDefinition({
     title: '',
@@ -50,7 +54,10 @@ function buildRenderBlocks(
     const name = payloadBlock.name?.trim()
     if (!name) continue
     const matched = matchedByName.get(name)
-    if (matched) renderBlocks.push(matched)
+    if (!matched) continue
+    // hidden text 不上屏；提交值由 AskUser 从 matchedBlocks 提取
+    if (isHiddenTextBlock(matched)) continue
+    renderBlocks.push(matched)
   }
   return renderBlocks
 }
@@ -198,17 +205,33 @@ export function payloadHasInputBlocks(payloadDef: PayloadBlocksDefinition): bool
   )
 }
 
-/** 交集为空时 fallback：payload 中可上屏的 blocks（layout + input） */
+/** 交集为空时 fallback：payload 中可上屏的 blocks（layout + 非 hidden input） */
 export function getPayloadRenderableBlocks(payloadDef: PayloadBlocksDefinition): FormBlock[] {
   return payloadDef.blocks.filter((block) => {
     if (isLayoutBlockType(block.type)) return true
-    return isInputBlockType(block.type) && Boolean(block.name?.trim())
+    if (!isInputBlockType(block.type) || !block.name?.trim()) return false
+    // hidden text 不上屏；提交值由 getPayloadHiddenBlockValues / dataModel 补齐
+    return !isHiddenTextBlock(block)
   })
 }
 
-/** payload 中所有 input 块 field name（fallback 提交用） */
+/** payload 中所有 input 块 field name（fallback 提交用，含 hidden） */
 export function getPayloadInputFieldNames(payloadDef: PayloadBlocksDefinition): string[] {
   return payloadDef.blocks
     .filter((block) => isInputBlockType(block.type) && block.name?.trim())
     .map((block) => block.name!.trim())
 }
+
+/** payload 中 hidden text 的默认提交值（fallback 不上屏时仍需写入 answer） */
+export function getPayloadHiddenBlockValues(
+  payloadDef: PayloadBlocksDefinition,
+): Record<string, unknown> {
+  const values: Record<string, unknown> = {}
+  for (const block of payloadDef.blocks) {
+    if (!isHiddenTextBlock(block)) continue
+    const name = block.name?.trim()
+    if (!name) continue
+    values[name] = blockValueFromDefault(block)
+  }
+  return values
+}

package/src/submit/submit.test.ts

@@ -11,6 +11,7 @@ import {
 import { buildAnswerAgentBody, validateAnswerAgentBody } from '../submit/buildAnswerAgentBody'
 import {
   extractExtraBlockValues,
+  getPayloadHiddenBlockValues,
   getPayloadInputFieldNames,
   getPayloadRenderableBlocks,
   intersectPayloadBlocksWithForm,
@@ -427,6 +428,59 @@ describe('payload fallback helpers', () => {
     expect(blocks.map((b) => b.id)).toEqual(['title', 'q1'])
   })
 
+  it('excludes hidden text from renderable blocks but keeps submit defaults', () => {
+    const withHidden = parsePayloadBlocksJson({
+      title: '',
+      blocks: [
+        { id: 'title', type: 'heading', label: '问卷调查' },
+        { id: 'q1', type: 'radio', name: 'occupation', label: '职业', options: [] },
+        {
+          id: 'hint',
+          type: 'text',
+          name: 'agent_hint',
+          label: '提示',
+          defaultValue: 'keep-me',
+          hidden: true,
+        },
+      ],
+    })!
+    expect(getPayloadRenderableBlocks(withHidden).map((b) => b.id)).toEqual(['title', 'q1'])
+    expect(getPayloadHiddenBlockValues(withHidden)).toEqual({ agent_hint: 'keep-me' })
+    expect(getPayloadInputFieldNames(withHidden)).toEqual(['occupation', 'agent_hint'])
+  })
+
+  it('omits matched hidden text from renderBlocks', () => {
+    const formWithHint: FormSchema = {
+      title: 'Form',
+      description: '',
+      blocks: [
+        { id: '1', type: 'text', name: 'video_title', label: 'Title' },
+        { id: '2', type: 'text', name: 'agent_hint', label: 'Hint', hidden: true },
+      ],
+      jsonSchema: {},
+    }
+    const payload = parsePayloadBlocksJson({
+      title: 'Ask',
+      blocks: [
+        { id: 'p1', type: 'text', name: 'video_title', label: '视频标题' },
+        {
+          id: 'p2',
+          type: 'text',
+          name: 'agent_hint',
+          label: '提示',
+          defaultValue: 'hint',
+          hidden: true,
+        },
+      ],
+    })!
+    const result = intersectPayloadBlocksWithForm(payload, formWithHint)
+    expect(result.matchedBlocks.map((b) => b.name)).toEqual(['video_title', 'agent_hint'])
+    expect(result.renderBlocks.map((b) => b.name)).toEqual(['video_title'])
+    expect(extractExtraBlockValues(result.matchedBlocks.filter((b) => b.hidden))).toEqual({
+      agent_hint: 'hint',
+    })
+  })
+
   it('returns input field names for submit', () => {
     expect(getPayloadInputFieldNames(surveyPayload)).toEqual(['occupation'])
   })

package/src/types/index.ts

@@ -86,9 +86,19 @@ export interface FormBlockOption {
   label: string
 }
 
+export type FormConditionOperator = 'eq' | 'ne' | 'empty' | 'notEmpty'
+
+export interface FormBlockCondition {
+  fieldName: string
+  operator: FormConditionOperator
+  value?: string
+}
+
 /** 简历多选组件：渲染时用于 /univ/resume/search 的筛选条件 */
 export interface FormResumeFilter {
   names?: string[]
+  /** Agent 类型（编辑器辅助，运行时不用） */
+  agentKind?: string
   agentUniqueIds?: string[]
   resumeUniqueIds?: string[]
   pageSize?: number
@@ -127,6 +137,12 @@ export interface FormBlock {
   fileMinCount?: number
   fileMaxCount?: number
   defaultValue?: string | string[] | boolean
+  /** 派生 JSON Schema 时写入 property.$comment */
+  jsonSchemaDescription?: string
+  /** 是否隐藏（仅 text 块；隐藏时仍提交） */
+  hidden?: boolean
+  /** 是否需要 LLM 处理（持久化进 block json） */
+  needLLM?: boolean
   /** 简历多选：是否显示「换一批」 */
   resumeEnableRefresh?: boolean
   /** 简历多选：最少选中数量，配置值 ≥ 1 */
@@ -143,6 +159,7 @@ export interface FormBlock {
   caseMaxCount?: number
   /** 案例单选：列表筛选条件（持久化进 block json） */
   caseFilter?: FormCaseFilter
+  condition?: FormBlockCondition
 }
 
 export interface FormSchema {
@@ -164,6 +181,23 @@ export function isInputBlockType(type: FormBlockType): boolean {
   return !isLayoutBlockType(type) && !isMediaBlockType(type)
 }
 
+export function isDisplayBlockType(type: FormBlockType): boolean {
+  return isLayoutBlockType(type) || isMediaBlockType(type)
+}
+
+export function isOptionsBlockType(type: FormBlockType): boolean {
+  return type === 'select' || type === 'multiselect' || type === 'radio' || type === 'checkbox'
+}
+
+export function supportsDefaultValue(type: FormBlockType): boolean {
+  return (
+    isInputBlockType(type) &&
+    type !== 'file' &&
+    type !== 'resume_multiselect' &&
+    type !== 'case_multiselect'
+  )
+}
+
 export interface FormDefinitionPayload {
   title?: string
   description?: string