@skopon-cool/form-sdk 0.4.2 → 0.4.3

package/dist/submit/intersectPayloadBlocksWithForm.d.ts

@@ -1,5 +1,11 @@
 import type { FormBlock, FormSchema } from '../types/index';
-export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' | 'blocks'>;
+export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' | 'blocks'> & {
+    /**
+     * ask 原始 blocks（normalize 前）。交集合并按此键集覆盖 form，
+     * 避免 normalize 填入的空默认值误盖表单样式。
+     */
+    rawBlocks?: FormBlock[];
+};
 export interface PayloadBlocksIntersection {
     matchedBlocks: FormBlock[];
     extraBlocks: FormBlock[];

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,CAAA;AAE1F,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;AAqDD,uEAAuE;AACvE,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,uBAAuB,GAAG,IAAI,CAUvF;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,uBAAuB,EACnC,cAAc,EAAE,UAAU,GAAG,SAAS,GACrC,yBAAyB,CAqC3B;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,0DAA0D;AAC1D,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,EAAE,CAK3F;AAED,mDAAmD;AACnD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,uBAAuB,GAAG,MAAM,EAAE,CAIvF"}
+{"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;AAuED,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,0DAA0D;AAC1D,wBAAgB,0BAA0B,CAAC,UAAU,EAAE,uBAAuB,GAAG,SAAS,EAAE,CAK3F;AAED,mDAAmD;AACnD,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,uBAAuB,GAAG,MAAM,EAAE,CAIvF"}

package/package.json

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

package/src/catalog/useSkoponBoundField.test.ts

@@ -3,7 +3,14 @@
  */
 import { describe, it, expect } from 'vitest'
 import type { ComponentContext } from '@a2ui/web_core/v0_9'
-import { asStringArray, clampStringArraySelection, normalizeSelectStoredValue, readBoundFieldValue, toggleStringArraySelection } from './useSkoponBoundField'
+import {
+  asStringArray,
+  clampStringArraySelection,
+  isCardSelectionDisabled,
+  normalizeSelectStoredValue,
+  readBoundFieldValue,
+  toggleStringArraySelection,
+} from './useSkoponBoundField'
 
 function createMockContext(initial: unknown = []): {
   context: ComponentContext
@@ -61,12 +68,16 @@ describe('readBoundFieldValue', () => {
 })
 
 describe('toggleStringArraySelection', () => {
-  it('blocks append when at maxCount', () => {
-    expect(toggleStringArraySelection(['a'], 'b', undefined, 1)).toBeNull()
+  it('replaces selection when maxCount is 1', () => {
+    expect(toggleStringArraySelection(['a'], 'b', 1, 1)).toEqual(['b'])
   })
 
-  it('blocks deselect when at minCount', () => {
-    expect(toggleStringArraySelection(['a'], 'a', 1, undefined)).toBeNull()
+  it('blocks append when at maxCount greater than 1', () => {
+    expect(toggleStringArraySelection(['a', 'b'], 'c', undefined, 2)).toBeNull()
+  })
+
+  it('allows deselect even when at minCount', () => {
+    expect(toggleStringArraySelection(['a'], 'a', 1, undefined)).toEqual([])
   })
 
   it('allows toggle within bounds', () => {
@@ -75,6 +86,20 @@ describe('toggleStringArraySelection', () => {
   })
 })
 
+describe('isCardSelectionDisabled', () => {
+  it('keeps selected cards clickable under minCount', () => {
+    expect(isCardSelectionDisabled(['a'], 'a', true, 1, 1)).toBe(false)
+  })
+
+  it('keeps unselected cards clickable when maxCount is 1', () => {
+    expect(isCardSelectionDisabled(['a'], 'b', true, 1, 1)).toBe(false)
+  })
+
+  it('disables unselected cards when maxCount greater than 1 is full', () => {
+    expect(isCardSelectionDisabled(['a', 'b'], 'c', true, undefined, 2)).toBe(true)
+  })
+})
+
 describe('clampStringArraySelection', () => {
   it('returns null when within maxCount', () => {
     expect(clampStringArraySelection(['a'], 2)).toBeNull()

package/src/catalog/useSkoponBoundField.ts

@@ -203,33 +203,47 @@ export function readOptionalSelectCount(value: unknown): number | undefined {
   return Math.floor(num)
 }
 
+/**
+ * 切换多选选中态。
+ * - 已选项：始终允许取消（minCount 仅提交校验）
+ * - maxCount === 1：点未选项直接替换为 [itemId]
+ * - maxCount > 1 且已满：阻止追加
+ */
 export function toggleStringArraySelection(
   selectedIds: string[],
   itemId: string,
-  minCount: number | undefined,
+  _minCount: number | undefined,
   maxCount: number | undefined,
 ): string[] | null {
   const isSelected = selectedIds.includes(itemId)
   if (isSelected) {
-    const next = selectedIds.filter((id) => id !== itemId)
-    if (minCount !== undefined && next.length < minCount) return null
-    return next
+    return selectedIds.filter((id) => id !== itemId)
+  }
+  if (maxCount === 1) {
+    return [itemId]
   }
   if (maxCount !== undefined && selectedIds.length >= maxCount) return null
   return [...selectedIds, itemId]
 }
 
+/**
+ * 卡片是否禁用点击。
+ * - 已选项始终可点（允许取消）；minCount 不在此强制
+ * - maxCount === 1 时未选项可点（用于替换）
+ * - maxCount > 1 且已满时未选项禁用
+ */
 export function isCardSelectionDisabled(
   selectedIds: string[],
   itemId: string,
   interactive: boolean,
-  minCount: number | undefined,
+  _minCount: number | undefined,
   maxCount: number | undefined,
 ): boolean {
   if (!interactive) return true
   const isSelected = selectedIds.includes(itemId)
-  if (!isSelected && maxCount !== undefined && selectedIds.length >= maxCount) return true
-  if (isSelected && minCount !== undefined && selectedIds.length <= minCount) return true
+  if (isSelected) return false
+  if (maxCount === 1) return false
+  if (maxCount !== undefined && selectedIds.length >= maxCount) return true
   return false
 }
 

package/src/submit/intersectPayloadBlocksWithForm.ts

@@ -2,7 +2,13 @@ import { normalizeFormDefinition } from '../adapter/formSchema'
 import type { FormBlock, FormSchema } from '../types/index'
 import { isInputBlockType, isLayoutBlockType } from '../types/index'
 
-export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' | 'blocks'>
+export type PayloadBlocksDefinition = Pick<FormSchema, 'title' | 'description' | 'blocks'> & {
+  /**
+   * ask 原始 blocks（normalize 前）。交集合并按此键集覆盖 form，
+   * 避免 normalize 填入的空默认值误盖表单样式。
+   */
+  rawBlocks?: FormBlock[]
+}
 
 export interface PayloadBlocksIntersection {
   matchedBlocks: FormBlock[]
@@ -13,6 +19,8 @@ export interface PayloadBlocksIntersection {
   description: string
 }
 
+const FORM_ANCHORED_KEYS = new Set(['type', 'name', 'id'])
+
 function normalizePayloadBlock(block: FormBlock): FormBlock {
   return normalizeFormDefinition({
     title: '',
@@ -47,21 +55,37 @@ function buildRenderBlocks(
   return renderBlocks
 }
 
-/** 交集块以 form 定义为准，仅从 payload 合并运行时 defaultValue。 */
-function mergeBlock(formBlock: FormBlock, payloadBlock: FormBlock): FormBlock {
-  const merged: FormBlock = {
-    ...formBlock,
-    name: formBlock.name?.trim() || payloadBlock.name,
+function resolveRawInputBlock(
+  payloadDef: PayloadBlocksDefinition,
+  name: string,
+  fallback: FormBlock,
+): FormBlock {
+  const rawBlocks = payloadDef.rawBlocks
+  if (!rawBlocks?.length) return fallback
+  for (const block of rawBlocks) {
+    if (!block || typeof block !== 'object') continue
+    const blockName = typeof block.name === 'string' ? block.name.trim() : ''
+    if (blockName === name) return block
   }
-  if (payloadBlock.defaultValue !== undefined) {
-    merged.defaultValue = payloadBlock.defaultValue
+  return fallback
+}
+
+/**
+ * 交集块：form 锚定 type/name/id；ask 原始 block 上显式出现的其余字段覆盖 form。
+ */
+function mergeBlock(formBlock: FormBlock, rawPayloadBlock: FormBlock): FormBlock {
+  const merged: FormBlock = { ...formBlock }
+  for (const key of Object.keys(rawPayloadBlock) as (keyof FormBlock)[]) {
+    if (FORM_ANCHORED_KEYS.has(key)) continue
+    if (!Object.prototype.hasOwnProperty.call(rawPayloadBlock, key)) continue
+    const value = rawPayloadBlock[key]
+    if (value === undefined) continue
+    Object.assign(merged, { [key]: value })
   }
-  return normalizeFormDefinition({
-    title: '',
-    description: '',
-    blocks: [merged],
-    jsonSchema: {},
-  }).blocks[0]!
+  merged.type = formBlock.type
+  merged.name = formBlock.name?.trim() || rawPayloadBlock.name
+  merged.id = formBlock.id
+  return normalizePayloadBlock(merged)
 }
 
 /** 解析 ask_user payload 为 blocksJson 形（title / description / blocks） */
@@ -69,12 +93,21 @@ export function parsePayloadBlocksJson(payload: unknown): PayloadBlocksDefinitio
   if (!payload || typeof payload !== 'object' || Array.isArray(payload)) return null
   const obj = payload as Record<string, unknown>
   if (!Array.isArray(obj.blocks)) return null
-  return normalizeFormDefinition({
+  const rawBlocks = obj.blocks.filter(
+    (block): block is FormBlock => Boolean(block) && typeof block === 'object' && !Array.isArray(block),
+  ) as FormBlock[]
+  const normalized = normalizeFormDefinition({
     title: typeof obj.title === 'string' ? obj.title : '',
     description: typeof obj.description === 'string' ? obj.description : '',
-    blocks: obj.blocks as FormBlock[],
+    blocks: rawBlocks,
     jsonSchema: {},
   })
+  return {
+    title: normalized.title,
+    description: normalized.description,
+    blocks: normalized.blocks,
+    rawBlocks,
+  }
 }
 
 /**
@@ -101,16 +134,10 @@ export function intersectPayloadBlocksWithForm(
     if (!name) continue
     const formBlock = formByName.get(name)
     if (formBlock) {
-      matchedBlocks.push(mergeBlock(formBlock, payloadBlock))
+      const rawPayloadBlock = resolveRawInputBlock(payloadDef, name, payloadBlock)
+      matchedBlocks.push(mergeBlock(formBlock, rawPayloadBlock))
     } else {
-      extraBlocks.push(
-        normalizeFormDefinition({
-          title: '',
-          description: '',
-          blocks: [payloadBlock],
-          jsonSchema: {},
-        }).blocks[0]!,
-      )
+      extraBlocks.push(normalizePayloadBlock(payloadBlock))
     }
   }
 

package/src/submit/submit.test.ts

@@ -176,7 +176,7 @@ describe('intersectPayloadBlocksWithForm', () => {
     expect(extractExtraBlockValues(extraBlocks)).toEqual({ resumes: [] })
   })
 
-  it('keeps form block type and schema when payload type differs', () => {
+  it('keeps form type/name/id and overlays explicit ask fields when payload type differs', () => {
     const selectForm: FormSchema = {
       title: 'Form',
       description: '',
@@ -209,7 +209,8 @@ describe('intersectPayloadBlocksWithForm', () => {
     const result = intersectPayloadBlocksWithForm(mismatchedPayload, selectForm)
     expect(result.matchedBlocks).toHaveLength(1)
     expect(result.matchedBlocks[0]?.type).toBe('select')
-    expect(result.matchedBlocks[0]?.label).toBe('Form Label')
+    expect(result.matchedBlocks[0]?.id).toBe('1')
+    expect(result.matchedBlocks[0]?.label).toBe('Payload Label')
     expect(result.matchedBlocks[0]?.options).toEqual([
       { label: 'A', value: 'a' },
       { label: 'B', value: 'b' },
@@ -217,6 +218,130 @@ describe('intersectPayloadBlocksWithForm', () => {
     expect(result.matchedBlocks[0]?.defaultValue).toBe('a')
   })
 
+  it('keeps form label when ask only provides name and defaultValue', () => {
+    const form: FormSchema = {
+      title: 'Form',
+      description: '',
+      blocks: [{ id: '1', type: 'text', name: 'video_title', label: 'Form Title', help: 'Form help' }],
+      jsonSchema: {},
+    }
+    const payloadDef = parsePayloadBlocksJson({
+      title: 'Ask',
+      blocks: [{ id: 'p1', type: 'text', name: 'video_title', defaultValue: 'hello' }],
+    })!
+    const result = intersectPayloadBlocksWithForm(payloadDef, form)
+    expect(result.matchedBlocks[0]?.label).toBe('Form Title')
+    expect(result.matchedBlocks[0]?.help).toBe('Form help')
+    expect(result.matchedBlocks[0]?.defaultValue).toBe('hello')
+  })
+
+  it('overlays ask caseFilter over form caseFilter', () => {
+    const form: FormSchema = {
+      title: 'Form',
+      description: '',
+      blocks: [
+        {
+          id: '1',
+          type: 'case_multiselect',
+          name: 'selected_cases',
+          label: 'Form Cases',
+          caseMinCount: 1,
+          caseMaxCount: 1,
+          caseFilter: {
+            agentUniqueId: 'agent-form',
+            flowType: 'service',
+            category: 'cat-form',
+            flowUniqueIds: [],
+            pageSize: 10,
+          },
+        },
+      ],
+      jsonSchema: {},
+    }
+    const payloadDef = parsePayloadBlocksJson({
+      title: 'Ask',
+      blocks: [
+        {
+          id: 'p1',
+          type: 'case_multiselect',
+          name: 'selected_cases',
+          label: 'Ask Cases',
+          caseMinCount: 1,
+          caseMaxCount: 3,
+          caseFilter: {
+            agentKind: 'management',
+            agentUniqueId: 'agent-ask',
+            flowType: 'service',
+            flowUniqueIds: [],
+            pageSize: 20,
+          },
+        },
+      ],
+    })!
+    const result = intersectPayloadBlocksWithForm(payloadDef, form)
+    const block = result.matchedBlocks[0]
+    expect(block?.type).toBe('case_multiselect')
+    expect(block?.label).toBe('Ask Cases')
+    expect(block?.caseMaxCount).toBe(3)
+    expect(block?.caseFilter).toMatchObject({
+      agentUniqueId: 'agent-ask',
+      flowType: 'service',
+      pageSize: 20,
+    })
+    expect(block?.caseFilter?.category).toBeUndefined()
+  })
+
+  it('overlays ask resumeFilter over form resumeFilter', () => {
+    const form: FormSchema = {
+      title: 'Form',
+      description: '',
+      blocks: [
+        {
+          id: '1',
+          type: 'resume_multiselect',
+          name: 'partners',
+          label: 'Form Partners',
+          resumeFilter: {
+            names: ['Alice'],
+            agentUniqueIds: ['agent-form'],
+            resumeUniqueIds: [],
+            pageSize: 10,
+          },
+        },
+      ],
+      jsonSchema: {},
+    }
+    const payloadDef = parsePayloadBlocksJson({
+      title: 'Ask',
+      blocks: [
+        {
+          id: 'p1',
+          type: 'resume_multiselect',
+          name: 'partners',
+          label: '选择伙伴',
+          help: '请谨慎选择您的伙伴',
+          resumeEnableRefresh: true,
+          resumeFilter: {
+            names: [],
+            agentUniqueIds: [],
+            resumeUniqueIds: [],
+            pageSize: 20,
+          },
+        },
+      ],
+    })!
+    const result = intersectPayloadBlocksWithForm(payloadDef, form)
+    const block = result.matchedBlocks[0]
+    expect(block?.label).toBe('选择伙伴')
+    expect(block?.help).toBe('请谨慎选择您的伙伴')
+    expect(block?.resumeFilter).toEqual({
+      names: [],
+      agentUniqueIds: [],
+      resumeUniqueIds: [],
+      pageSize: 20,
+    })
+  })
+
   it('preserves payload layout blocks in renderBlocks on partial intersection', () => {
     const partialPayload = parsePayloadBlocksJson({
       title: 'Ask',
@@ -237,7 +362,7 @@ describe('intersectPayloadBlocksWithForm', () => {
     ])
     expect(result.renderBlocks.map((b) => b.label)).toEqual([
       '请填写以下信息',
-      'Title',
+      '视频标题',
       '提交后不可修改',
     ])
     expect(result.renderBlocks.some((b) => b.type === 'heading' && b.label === '请填写以下信息')).toBe(