@kne/form-creator 0.1.4 → 0.1.5

package/dist/index.modern.js

@@ -4,7 +4,7 @@ import { useState, useMemo, useEffect, createElement, Fragment } from 'react';
 import { Space, Tag, Button, Typography, Flex, Dropdown, Empty, message, Checkbox as Checkbox$1, Input as Input$1, InputNumber as InputNumber$1, Card, Tooltip } from 'antd';
 import { createWithIntlProvider, useIntl } from '@kne/react-intl';
 import { useIsMobile, RESPONSIVE_BOUNDARY_CLASS } from '@kne/responsive-utils';
-import { ArrowUpOutlined, ArrowDownOutlined, EditOutlined, DeleteOutlined, PlusOutlined, SettingOutlined, FormOutlined, UnorderedListOutlined, TableOutlined, AppstoreOutlined, OrderedListOutlined, ApartmentOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { ArrowUpOutlined, ArrowDownOutlined, EditOutlined, DeleteOutlined, PlusOutlined, SettingOutlined, FormOutlined, UnorderedListOutlined, TableOutlined, ClusterOutlined, PartitionOutlined, AppstoreOutlined, OrderedListOutlined, SelectOutlined, ApartmentOutlined, ArrowLeftOutlined, ArrowRightOutlined, QuestionCircleOutlined } from '@ant-design/icons';
 import { hooks, Input, TextArea, InputNumber, Select, RadioGroup, CheckboxGroup, Switch, Checkbox, DatePicker, useFormContext, Slider, SubmitButton, ResetButton, CancelButton, RULES, preset as preset$1 } from '@kne/react-form-antd';
 import SelectList, { SelectTableList, SelectTree, SelectCascader } from '@kne/super-select';
 import { SelectFunction, SelectIndustry, SelectAddress } from '@kne/super-select-plus';
@@ -12,8 +12,9 @@ import '@kne/super-select/dist/index.css';
 import '@kne/super-select-plus/dist/index.css';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import FormInfo, { FormModal, Form, Steps, MultiField, TableList, List } from '@kne/form-info';
+import InfoPage from '@kne/info-page';
 
-var style = {"kne-responsive-boundary":"kne-form-creator_gh14z","kne-responsive-scroll":"kne-form-creator_Kfn6L","form-creator":"kne-form-creator_Xrjrk","editor-pane":"kne-form-creator_Skfuv","preview-pane":"kne-form-creator_v4Lsp","editor-header":"kne-form-creator_WaSS-","block-list-panel":"kne-form-creator_lx8An","form-actions-setting-btn":"kne-form-creator_NekU2","panel-toolbar":"kne-form-creator_t0WxZ","add-block-btn":"kne-form-creator_16Zre","add-inline-btn":"kne-form-creator_iCYdB","ant-btn-disabled":"kne-form-creator_LdGtv","block-list":"kne-form-creator_wK5eK","block-section":"kne-form-creator_15IiK","block-kind-formInfo":"kne-form-creator_D0hoK","block-kind-list":"kne-form-creator_JdPhy","block-kind-tableList":"kne-form-creator_gzd64","block-kind-multiField":"kne-form-creator_t0iOJ","block-kind-steps":"kne-form-creator_QNF9W","step-section":"kne-form-creator_22ajp","block-section-header":"kne-form-creator_wS4rL","block-header-left":"kne-form-creator_t4awC","block-title":"kne-form-creator_wSVJf","block-summary":"kne-form-creator_GzeW8","block-header-actions":"kne-form-creator_Ue-nT","block-body":"kne-form-creator_je1H0","section-toolbar":"kne-form-creator_LUO8S","section-toolbar-label":"kne-form-creator_7KQ79","field-list":"kne-form-creator_-B7WZ","step-list":"kne-form-creator_kc1pH","step-section-header":"kne-form-creator_wkhEX","step-section-title":"kne-form-creator_NBinE","step-index":"kne-form-creator_CCKZZ","field-row":"kne-form-creator_XMkdt","field-row-index":"kne-form-creator_a-cDo","field-row-main":"kne-form-creator_ftlwp","inline-empty":"kne-form-creator_yP-RF","action-group":"kne-form-creator_773yo","hover-reveal":"kne-form-creator_S234h","action-btn":"kne-form-creator_mLgqh","add-block-dropdown":"kne-form-creator_vmS-e","add-block-option":"kne-form-creator_gjg2Y","add-block-option-icon":"kne-form-creator_qh1hh","add-block-option-text":"kne-form-creator_G8iJO","add-block-option-title":"kne-form-creator_ETSvm","add-block-option-desc":"kne-form-creator_O0C3l","field-empty":"kne-form-creator_Nmpfl","field-label-tips-icon":"kne-form-creator_0VVaO","preview-header":"kne-form-creator_c4BT0","preview-title":"kne-form-creator_fPkK4","preview-body":"kne-form-creator_6JntQ","schema-form":"kne-form-creator_MxCWP","schema-body":"kne-form-creator_q9ydz","schema-actions":"kne-form-creator_Y4eEH","schema-actions-inner":"kne-form-creator_FT9Zf","field-editor-form":"kne-form-creator_PGPHL","form-actions-editor":"kne-form-creator_fchMy","form-actions-switch-field":"kne-form-creator_6JE9x","form-actions-layout-panel":"kne-form-creator_rtm9D","form-actions-align-group":"kne-form-creator_51ZsV","form-actions-layout-title":"kne-form-creator_hFeiC","form-actions-gap-slider":"kne-form-creator_Gq0bk","editor-section":"kne-form-creator_jJy85","section-divider":"kne-form-creator_zA7L-","rule-editor":"kne-form-creator_bAlGU","options-editor":"kne-form-creator_AK4yO","super-select-props":"kne-form-creator_Iawhh","field-props-editor":"kne-form-creator_Gabf2","columns-editor":"kne-form-creator_DQW1N","prop-row":"kne-form-creator_7K54P","prop-label":"kne-form-creator_HAAyH","options-item":"kne-form-creator_dnOd2","table-row-card":"kne-form-creator_cwCYp","tree-options-editor":"kne-form-creator_s3nHO","tree-options-list":"kne-form-creator_Djs-E","tree-option-node":"kne-form-creator_XAcut","tree-option-row":"kne-form-creator_4K4Rj","tree-option-fields":"kne-form-creator_-4cjc","tree-option-actions":"kne-form-creator_IjCNI","tree-option-children":"kne-form-creator_pVPGJ","tree-add-sibling":"kne-form-creator_bl46P","rule-checkbox-group":"kne-form-creator_tDgVP","rule-len-row":"kne-form-creator_ATsae","rule-len-input":"kne-form-creator_jY4Ld","rule-len-sep":"kne-form-creator_jBDC8","options-list":"kne-form-creator_GUBNS","options-row":"kne-form-creator_uohD0","options-tip":"kne-form-creator_vrTmK","icon-square-btn":"kne-form-creator_DZjCf","icon-square-btn-sm":"kne-form-creator_GAh-t","is-mobile":"kne-form-creator_LtgJz"};
+var style = {"kne-responsive-boundary":"kne-form-creator_gh14z","kne-responsive-scroll":"kne-form-creator_Kfn6L","form-creator":"kne-form-creator_Xrjrk","editor-pane":"kne-form-creator_Skfuv","preview-pane":"kne-form-creator_v4Lsp","editor-header":"kne-form-creator_WaSS-","block-list-panel":"kne-form-creator_lx8An","form-actions-setting-btn":"kne-form-creator_NekU2","panel-toolbar":"kne-form-creator_t0WxZ","add-block-btn":"kne-form-creator_16Zre","add-inline-btn":"kne-form-creator_iCYdB","ant-btn-disabled":"kne-form-creator_LdGtv","block-list":"kne-form-creator_wK5eK","block-section":"kne-form-creator_15IiK","block-kind-formInfo":"kne-form-creator_D0hoK","block-kind-list":"kne-form-creator_JdPhy","block-kind-tableList":"kne-form-creator_gzd64","block-kind-multiField":"kne-form-creator_t0iOJ","block-kind-steps":"kne-form-creator_QNF9W","step-section":"kne-form-creator_22ajp","block-section-header":"kne-form-creator_wS4rL","block-header-left":"kne-form-creator_t4awC","block-title":"kne-form-creator_wSVJf","block-summary":"kne-form-creator_GzeW8","block-header-actions":"kne-form-creator_Ue-nT","block-body":"kne-form-creator_je1H0","item-blocks-section":"kne-form-creator_wq4bT","nested-block-list":"kne-form-creator_4NWH4","block-section-nested":"kne-form-creator_mUKom","add-field-dropdown":"kne-form-creator_9JS0d","add-field-dropdown-item":"kne-form-creator_Ql1z3","add-field-dropdown-item-icon":"kne-form-creator_ZHB5O","add-field-dropdown-item-desc":"kne-form-creator_dcsOS","add-field-dropdown-divider":"kne-form-creator_CUK0H","add-field-dropdown-label":"kne-form-creator_bPJ-2","section-toolbar":"kne-form-creator_LUO8S","section-toolbar-label":"kne-form-creator_7KQ79","field-list":"kne-form-creator_-B7WZ","step-list":"kne-form-creator_kc1pH","step-section-header":"kne-form-creator_wkhEX","step-section-title":"kne-form-creator_NBinE","step-index":"kne-form-creator_CCKZZ","field-row":"kne-form-creator_XMkdt","field-row-index":"kne-form-creator_a-cDo","field-row-main":"kne-form-creator_ftlwp","inline-empty":"kne-form-creator_yP-RF","action-group":"kne-form-creator_773yo","hover-reveal":"kne-form-creator_S234h","hover-reveal-active":"kne-form-creator_AE-6r","action-btn":"kne-form-creator_mLgqh","add-block-dropdown":"kne-form-creator_vmS-e","add-block-option":"kne-form-creator_gjg2Y","add-block-option-icon":"kne-form-creator_qh1hh","add-block-option-text":"kne-form-creator_G8iJO","add-block-option-title":"kne-form-creator_ETSvm","add-block-option-desc":"kne-form-creator_O0C3l","field-empty":"kne-form-creator_Nmpfl","field-label-tips-icon":"kne-form-creator_0VVaO","preview-header":"kne-form-creator_c4BT0","preview-title":"kne-form-creator_fPkK4","preview-body":"kne-form-creator_6JntQ","schema-form":"kne-form-creator_MxCWP","schema-body":"kne-form-creator_q9ydz","schema-actions":"kne-form-creator_Y4eEH","schema-actions-inner":"kne-form-creator_FT9Zf","choice-block":"kne-form-creator_RllJe","choice-selector":"kne-form-creator_5A1eM","choice-panels":"kne-form-creator_IO0MY","choice-panels-empty":"kne-form-creator_T0nND","choice-option-panel":"kne-form-creator_FQixN","choice-option-panel-title":"kne-form-creator_ofRo2","choice-option-summary":"kne-form-creator_pksH8","field-editor-form":"kne-form-creator_PGPHL","form-actions-editor":"kne-form-creator_fchMy","form-actions-switch-field":"kne-form-creator_6JE9x","form-actions-layout-panel":"kne-form-creator_rtm9D","form-actions-align-group":"kne-form-creator_51ZsV","form-actions-layout-title":"kne-form-creator_hFeiC","form-actions-gap-slider":"kne-form-creator_Gq0bk","editor-section":"kne-form-creator_jJy85","section-divider":"kne-form-creator_zA7L-","rule-editor":"kne-form-creator_bAlGU","options-editor":"kne-form-creator_AK4yO","super-select-props":"kne-form-creator_Iawhh","field-props-editor":"kne-form-creator_Gabf2","columns-editor":"kne-form-creator_DQW1N","prop-row":"kne-form-creator_7K54P","prop-label":"kne-form-creator_HAAyH","options-item":"kne-form-creator_dnOd2","table-row-card":"kne-form-creator_cwCYp","tree-options-editor":"kne-form-creator_s3nHO","tree-options-list":"kne-form-creator_Djs-E","tree-option-node":"kne-form-creator_XAcut","tree-option-row":"kne-form-creator_4K4Rj","tree-option-fields":"kne-form-creator_-4cjc","tree-option-actions":"kne-form-creator_IjCNI","tree-option-children":"kne-form-creator_pVPGJ","tree-add-sibling":"kne-form-creator_bl46P","rule-checkbox-group":"kne-form-creator_tDgVP","rule-len-row":"kne-form-creator_ATsae","rule-len-input":"kne-form-creator_jY4Ld","rule-len-sep":"kne-form-creator_jBDC8","options-list":"kne-form-creator_GUBNS","options-row":"kne-form-creator_uohD0","options-tip":"kne-form-creator_vrTmK","icon-square-btn":"kne-form-creator_DZjCf","icon-square-btn-sm":"kne-form-creator_GAh-t","is-mobile":"kne-form-creator_LtgJz"};
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -53,18 +54,49 @@ const locale$1 = {
   expandBlock: '展开',
   collapseBlock: '收起',
   fieldCount: '{count} 个填写项',
+  fieldAndItemBlockCount: '{fields} 个填写项 · {nests} 个子模块',
+  addChildBlock: '添加子模块',
   stepCount: '{count} 个步骤',
   blockKind_formInfo: '基础表单',
   blockKind_list: '可增减列表',
   blockKind_tableList: '表格列表',
   blockKind_multiField: '同类多值',
+  blockKind_object: '分组信息',
+  blockKind_choice: '选项切换',
   blockKind_steps: '分步表单',
+  choiceMode: '可选几个',
+  choiceModeSingle: '只能选一个',
+  choiceModeMultiple: '可以选多个',
+  choiceMinSelect: '最少选择几个',
+  choiceMaxSelect: '最多选择几个',
+  choiceMinSelectError: '请至少选择 {count} 项',
+  choiceMaxSelectError: '最多只能选择 {count} 项',
+  choiceSelectorName: '所选结果的名称',
+  choiceSelectorNamePlaceholder: '可不填，系统会自动生成',
+  choiceSelectorInData: '提交时带上所选结果',
+  choiceTitlePlaceholder: '例如：客户类型',
+  choiceOptionListTitle: '选项列表',
+  addChoiceOption: '添加选项',
+  editChoiceOption: '编辑选项',
+  deleteChoiceOption: '删除选项',
+  choiceOptionTitle: '选项名称',
+  choiceOptionTitlePlaceholder: '例如：企业、个人',
+  emptyChoiceOptionList: '暂无选项，点击上方添加',
+  choiceOptionFallback: '选项{index}',
+  choiceOptionCount: '{count} 个选项',
+  choiceAreaTitle: '请选择',
+  choiceModeHintSingle: '请选择其中一项',
+  choiceModeHintMultiple: '可以选择多项',
+  choiceModeHintMultipleMin: '请至少选择 {count} 项',
+  choiceModeHintMultipleMax: '最多选择 {count} 项',
+  choiceModeHintMultipleRange: '请选择 {min}–{max} 项',
+  choiceSelectFirstHint: '请先在上方选择，再填写对应内容',
   blockTitle: '模块标题',
   blockTitlePlaceholder: '例如：基本信息',
   blockSubtitle: '模块副标题',
   blockSubtitlePlaceholder: '例如：请填写员工基本信息',
-  blockName: '数据标识',
-  blockNameRequired: '请填写数据标识',
+  blockName: '保存用的名称',
+  blockNameRequired: '请填写保存用的名称',
   blockGap: '间距',
   blockBordered: '显示边框',
   blockImportant: '突出显示',
@@ -88,7 +120,7 @@ const locale$1 = {
   stepNext: '下一步',
   stepComplete: '完成',
   fieldType: '填写项类型',
-  fieldName: '数据标识',
+  fieldName: '保存用的名称',
   fieldNamePlaceholder: '已自动生成，可修改',
   fieldLabel: '显示名称',
   fieldLabelPlaceholder: '例如：姓名',
@@ -103,7 +135,7 @@ const locale$1 = {
   fieldHidden: '隐藏该项',
   fieldHiddenTag: '已隐藏',
   fieldBlockTag: '整行',
-  fieldNameDuplicate: '该数据标识已被使用，请换一个',
+  fieldNameDuplicate: '该名称已被使用，请换一个',
   untitledField: '未命名填写项',
   previewTitle: '表单预览',
   previewHint: '左侧的配置变化会实时同步到这里',
@@ -142,9 +174,9 @@ const locale$1 = {
   columnNamePlaceholder: '已自动生成，可修改',
   columnWidthPlaceholder: '列宽（可选）',
   addColumn: '添加一列',
-  columnsEditorHint: '列标题用于表头展示；数据名已自动生成，需要时可改',
+  columnsEditorHint: '列标题用于表头展示；保存用的名称已自动生成，需要时可改',
   fieldTableRows: '表格数据',
-  tableRowsNeedColumnsHint: '请先在上方填写列的数据名，再来配置每一行数据',
+  tableRowsNeedColumnsHint: '请先在上方填写列的保存名称，再来配置每一行数据',
   tableRowTitle: '第 {index} 行',
   tableRowLabelPlaceholder: '选中后显示的文字',
   addTableRow: '添加一行数据',
@@ -218,18 +250,49 @@ const locale = {
   expandBlock: 'Expand',
   collapseBlock: 'Collapse',
   fieldCount: '{count} fields',
+  fieldAndItemBlockCount: '{fields} fields · {nests} child sections',
+  addChildBlock: 'Add child section',
   stepCount: '{count} steps',
   blockKind_formInfo: 'Basic Form',
   blockKind_list: 'Repeatable List',
   blockKind_tableList: 'Table List',
   blockKind_multiField: 'Multi-Value',
+  blockKind_object: 'Grouped Fields',
+  blockKind_choice: 'Options',
   blockKind_steps: 'Step-by-Step',
+  choiceMode: 'How many can be selected',
+  choiceModeSingle: 'One only',
+  choiceModeMultiple: 'More than one',
+  choiceMinSelect: 'Minimum selections',
+  choiceMaxSelect: 'Maximum selections',
+  choiceMinSelectError: 'Select at least {count}',
+  choiceMaxSelectError: 'Select at most {count}',
+  choiceSelectorName: 'Name for the selection',
+  choiceSelectorNamePlaceholder: 'Optional — generated automatically if empty',
+  choiceSelectorInData: 'Include the selection when submitting',
+  choiceTitlePlaceholder: 'e.g. Customer type',
+  choiceOptionListTitle: 'Options',
+  addChoiceOption: 'Add option',
+  editChoiceOption: 'Edit option',
+  deleteChoiceOption: 'Delete option',
+  choiceOptionTitle: 'Option name',
+  choiceOptionTitlePlaceholder: 'e.g. Company, Individual',
+  emptyChoiceOptionList: 'No options yet. Click above to add one.',
+  choiceOptionFallback: 'Option {index}',
+  choiceOptionCount: '{count} options',
+  choiceAreaTitle: 'Please select',
+  choiceModeHintSingle: 'Select one option',
+  choiceModeHintMultiple: 'You can select more than one',
+  choiceModeHintMultipleMin: 'Select at least {count}',
+  choiceModeHintMultipleMax: 'Select at most {count}',
+  choiceModeHintMultipleRange: 'Select {min}–{max} options',
+  choiceSelectFirstHint: 'Select an option above to continue',
   blockTitle: 'Section Title',
   blockTitlePlaceholder: 'e.g. Basic Info',
   blockSubtitle: 'Section Subtitle',
   blockSubtitlePlaceholder: 'e.g. Please fill in employee info',
-  blockName: 'Data Key',
-  blockNameRequired: 'Data key is required',
+  blockName: 'Save name',
+  blockNameRequired: 'Please enter a save name',
   blockGap: 'Spacing',
   blockBordered: 'Show Border',
   blockImportant: 'Highlight',
@@ -253,7 +316,7 @@ const locale = {
   stepNext: 'Next',
   stepComplete: 'Done',
   fieldType: 'Field Type',
-  fieldName: 'Data Key',
+  fieldName: 'Save name',
   fieldNamePlaceholder: 'Auto-generated, editable',
   fieldLabel: 'Display Name',
   fieldLabelPlaceholder: 'e.g. Full Name',
@@ -268,7 +331,7 @@ const locale = {
   fieldHidden: 'Hidden',
   fieldHiddenTag: 'Hidden',
   fieldBlockTag: 'Full Width',
-  fieldNameDuplicate: 'This data key is already in use, please choose another',
+  fieldNameDuplicate: 'This name is already in use, please choose another',
   untitledField: 'Untitled Field',
   previewTitle: 'Form Preview',
   previewHint: 'Changes on the left are reflected here in real time',
@@ -379,6 +442,7 @@ const createFieldId = () => `field_${Date.now()}_${Math.random().toString(36).sl
 /** 生成可编辑的默认数据标识，如 field_xxxx / col_xxxx */
 const createDataKey = (prefix = 'field') => `${prefix}_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
 const isAutoDataKey = (value, prefix = 'field') => new RegExp(`^${prefix}_[a-z0-9]+_[a-z0-9]+$`, 'i').test(String(value || '').trim());
+const MAX_BLOCK_DEPTH = 5;
 const createEmptyColumn = () => ({
   title: '',
   name: createDataKey('col'),
@@ -442,7 +506,14 @@ const createField$1 = (overrides = {}) => _extends({
   hidden: false,
   props: {}
 }, overrides);
+const createChoiceOption = (overrides = {}) => _extends({
+  id: createFieldId(),
+  title: '',
+  list: [],
+  blocks: []
+}, overrides);
 const createBlock = (kind, overrides = {}) => {
+  const needsName = ['list', 'tableList', 'multiField', 'object'].includes(kind);
   const base = {
     id: createFieldId(),
     kind,
@@ -452,56 +523,199 @@ const createBlock = (kind, overrides = {}) => {
     gap: 24,
     bordered: false,
     important: false,
-    name: ['list', 'tableList', 'multiField'].includes(kind) ? createDataKey('block') : '',
+    name: needsName ? createDataKey(kind === 'object' ? 'obj' : 'block') : '',
     label: '',
     addText: '',
     maxLength: undefined,
     minLength: undefined,
     fieldType: 'Input',
     autoStep: true,
+    mode: 'single',
+    selectorName: '',
+    selectorInData: true,
+    discriminator: undefined,
     list: [],
-    items: []
+    items: [],
+    itemBlocks: [],
+    blocks: [],
+    options: []
   };
   if (kind === 'steps') {
     return _extends({}, base, {
       list: undefined,
+      itemBlocks: undefined,
+      blocks: undefined,
+      options: undefined,
       items: [createStep()]
     }, overrides);
   }
   if (kind === 'multiField') {
     return _extends({}, base, {
-      list: undefined
+      list: undefined,
+      itemBlocks: undefined,
+      blocks: undefined,
+      options: undefined,
+      items: undefined
+    }, overrides);
+  }
+  if (kind === 'choice') {
+    const next = _extends({}, base, {
+      list: undefined,
+      itemBlocks: undefined,
+      blocks: undefined,
+      items: undefined,
+      name: '',
+      options: [createChoiceOption({
+        title: '选项1'
+      })]
+    }, overrides, {
+      kind: 'choice'
+    });
+    next.mode = next.mode === 'multiple' ? 'multiple' : 'single';
+    if (!Array.isArray(next.options)) {
+      next.options = [createChoiceOption({
+        title: '选项1'
+      })];
+    }
+    return next;
+  }
+  if (kind === 'object') {
+    return _extends({}, base, {
+      items: undefined,
+      options: undefined,
+      itemBlocks: undefined
+    }, overrides);
+  }
+  if (kind === 'list') {
+    return _extends({}, base, {
+      blocks: undefined
+    }, overrides);
+  }
+  if (kind === 'tableList') {
+    return _extends({}, base, {
+      blocks: undefined,
+      itemBlocks: undefined
     }, overrides);
   }
-  return _extends({}, base, overrides);
+
+  // formInfo：支持 blocks 子模块
+  return _extends({}, base, {
+    itemBlocks: undefined
+  }, overrides);
 };
 const createStep = (overrides = {}) => _extends({
   id: createFieldId(),
   title: '',
   column: 2,
-  list: []
+  list: [],
+  blocks: []
 }, overrides);
+const normalizeSelectCount = (value, minAllowed = 0) => {
+  if (value == null || value === '') {
+    return undefined;
+  }
+  const num = Number(value);
+  if (!Number.isFinite(num)) {
+    return undefined;
+  }
+  const int = Math.floor(num);
+  if (int < minAllowed) {
+    return undefined;
+  }
+  return int;
+};
 const normalizeField = field => _extends({}, createField$1(), field, {
   props: _extends({}, field.props || {})
 });
-const normalizeStep = step => _extends({}, createStep(), step, {
-  list: Array.isArray(step.list) ? step.list.map(normalizeField) : []
+const normalizeStep = (step, depth = 0) => _extends({}, createStep(), step, {
+  list: Array.isArray(step.list) ? step.list.map(normalizeField) : [],
+  blocks: Array.isArray(step.blocks) ? step.blocks.map(child => normalizeBlock(child, depth + 1)) : []
 });
-const normalizeBlock = block => {
+const normalizeChoiceOption = (option, depth) => {
+  var _blocks$;
+  let list = Array.isArray(option.list) ? option.list.map(normalizeField) : [];
+  let blocks = Array.isArray(option.blocks) ? option.blocks.map(block => normalizeBlock(block, depth + 1)) : [];
+
+  // 兼容仅写 blocks: [formInfo] 的写法：把首个 formInfo 的字段提升到 option.list，便于编辑器管理
+  if (!list.length && ((_blocks$ = blocks[0]) == null ? void 0 : _blocks$.kind) === 'formInfo' && (blocks[0].list || []).length) {
+    list = (blocks[0].list || []).map(normalizeField);
+    blocks = blocks.slice(1);
+  }
+  return _extends({}, createChoiceOption(), option, {
+    list,
+    blocks
+  });
+};
+const normalizeBlock = (block, depth = 0) => {
   const kind = block.kind || 'formInfo';
+  if (depth > MAX_BLOCK_DEPTH) {
+    return _extends({}, createBlock(kind), block, {
+      list: Array.isArray(block.list) ? block.list.map(normalizeField) : [],
+      itemBlocks: [],
+      options: [],
+      items: kind === 'steps' ? [createStep()] : undefined
+    });
+  }
   const normalized = _extends({}, createBlock(kind), block);
   if (kind === 'steps') {
-    normalized.items = Array.isArray(block.items) ? block.items.map(normalizeStep) : [createStep()];
+    normalized.items = Array.isArray(block.items) ? block.items.map(step => normalizeStep(step, depth)) : [createStep()];
     delete normalized.list;
+    delete normalized.itemBlocks;
+    delete normalized.blocks;
+    delete normalized.options;
     return normalized;
   }
   if (kind === 'multiField') {
     normalized.list = undefined;
     normalized.items = undefined;
+    normalized.itemBlocks = undefined;
+    normalized.blocks = undefined;
+    normalized.options = undefined;
+    return normalized;
+  }
+  if (kind === 'choice') {
+    normalized.mode = block.mode === 'multiple' ? 'multiple' : 'single';
+    normalized.selectorName = block.selectorName != null ? String(block.selectorName) : '';
+    normalized.selectorInData = block.selectorInData !== false;
+    normalized.discriminator = block.discriminator && typeof block.discriminator === 'object' ? _extends({}, block.discriminator) : undefined;
+    normalized.options = Array.isArray(block.options) ? block.options.map(option => normalizeChoiceOption(option, depth)) : [];
+    normalized.list = undefined;
+    normalized.items = undefined;
+    normalized.itemBlocks = undefined;
+    normalized.blocks = undefined;
+    if (normalized.mode === 'multiple') {
+      const minSelect = normalizeSelectCount(block.minLength, 0);
+      const maxSelect = normalizeSelectCount(block.maxLength, 1);
+      normalized.minLength = minSelect;
+      normalized.maxLength = maxSelect != null && minSelect != null && maxSelect < minSelect ? minSelect : maxSelect;
+    } else {
+      normalized.minLength = undefined;
+      normalized.maxLength = undefined;
+    }
+    return normalized;
+  }
+  if (kind === 'object') {
+    normalized.list = Array.isArray(block.list) ? block.list.map(normalizeField) : [];
+    normalized.items = undefined;
+    normalized.itemBlocks = undefined;
+    normalized.options = undefined;
+    normalized.blocks = Array.isArray(block.blocks) ? block.blocks.map(child => normalizeBlock(child, depth + 1)) : [];
     return normalized;
   }
   normalized.list = Array.isArray(block.list) ? block.list.map(normalizeField) : [];
   normalized.items = undefined;
+  normalized.options = undefined;
+  if (kind === 'list') {
+    normalized.itemBlocks = Array.isArray(block.itemBlocks) ? block.itemBlocks.map(child => normalizeBlock(child, depth + 1)) : [];
+    normalized.blocks = undefined;
+  } else if (kind === 'tableList') {
+    normalized.itemBlocks = undefined;
+    normalized.blocks = undefined;
+  } else {
+    // formInfo
+    normalized.itemBlocks = undefined;
+    normalized.blocks = Array.isArray(block.blocks) ? block.blocks.map(child => normalizeBlock(child, depth + 1)) : [];
+  }
   return normalized;
 };
 const normalizeSchema = (schema = {}) => {
@@ -509,7 +723,7 @@ const normalizeSchema = (schema = {}) => {
   if (Array.isArray(schema.blocks)) {
     return _extends({}, base, schema, {
       actions: normalizeFormActions(schema.actions),
-      blocks: schema.blocks.map(normalizeBlock)
+      blocks: schema.blocks.map(block => normalizeBlock(block))
     });
   }
   if (Array.isArray(schema.list) && schema.list.length) {
@@ -550,52 +764,338 @@ const isFieldNameUnique = (fields, name, excludeId) => {
   }
   return !fields.some(item => item.name === name && item.id !== excludeId);
 };
-const collectSchemaFields = (schema, {
-  blockId,
-  stepId
-} = {}) => {
-  const blocks = schema.blocks || [];
-  const fields = [];
+const collectFieldsFromBlocks = (blocks = [], acc = []) => {
   blocks.forEach(block => {
-    if (blockId && block.id !== blockId) {
+    if (!block) {
       return;
     }
     if (block.kind === 'steps') {
       (block.items || []).forEach(step => {
-        if (stepId !== undefined && step.id !== stepId) {
-          return;
-        }
-        fields.push(...(step.list || []));
+        acc.push(...(step.list || []));
+        collectFieldsFromBlocks(step.blocks || [], acc);
+      });
+      return;
+    }
+    if (block.kind === 'choice') {
+      (block.options || []).forEach(option => {
+        acc.push(...(option.list || []));
+        collectFieldsFromBlocks(option.blocks || [], acc);
       });
       return;
     }
-    if (block.kind !== 'multiField') {
-      fields.push(...(block.list || []));
+    if (block.kind !== 'multiField' && Array.isArray(block.list)) {
+      acc.push(...block.list);
+    }
+    if (Array.isArray(block.itemBlocks)) {
+      collectFieldsFromBlocks(block.itemBlocks, acc);
+    }
+    if (Array.isArray(block.blocks)) {
+      collectFieldsFromBlocks(block.blocks, acc);
     }
   });
+  return acc;
+};
+const collectSchemaFields = (schema, {
+  blockId,
+  stepId,
+  optionId
+} = {}) => {
+  const blocks = schema.blocks || [];
+  if (!blockId) {
+    return collectFieldsFromBlocks(blocks);
+  }
+  const block = findBlockInTree(blocks, blockId);
+  if (!block) {
+    return [];
+  }
+  const fields = [];
+  if (block.kind === 'steps') {
+    (block.items || []).forEach(step => {
+      if (stepId !== undefined && step.id !== stepId) {
+        return;
+      }
+      fields.push(...(step.list || []));
+    });
+    return fields;
+  }
+  if (block.kind === 'choice') {
+    (block.options || []).forEach(option => {
+      if (optionId !== undefined && option.id !== optionId) {
+        return;
+      }
+      fields.push(...(option.list || []));
+      collectFieldsFromBlocks(option.blocks || [], fields);
+    });
+    return fields;
+  }
+  if (block.kind !== 'multiField') {
+    fields.push(...(block.list || []));
+  }
   return fields;
 };
+
+/** 收集 blocks 树中所有字段 name（含 object 前缀后的完整名需在渲染层处理） */
+const collectBlockFieldNames = (blocks = [], {
+  objectNamePrefix: _objectNamePrefix = ''
+} = {}) => {
+  const names = [];
+  const walk = (list, prefix) => {
+    (list || []).forEach(block => {
+      if (!block) {
+        return;
+      }
+      if (block.kind === 'object') {
+        const nextPrefix = [prefix, block.name].filter(Boolean).join('.');
+        (block.list || []).forEach(field => {
+          if (field != null && field.name) {
+            names.push(nextPrefix ? `${nextPrefix}.${field.name}` : field.name);
+          }
+        });
+        walk(block.blocks || [], nextPrefix);
+        return;
+      }
+      if (block.kind === 'choice') {
+        (block.options || []).forEach(option => {
+          (option.list || []).forEach(field => {
+            if (field != null && field.name) {
+              names.push(prefix ? `${prefix}.${field.name}` : field.name);
+            }
+          });
+          walk(option.blocks || [], prefix);
+        });
+        return;
+      }
+      if (block.kind === 'steps') {
+        (block.items || []).forEach(step => {
+          (step.list || []).forEach(field => {
+            if (field != null && field.name) {
+              names.push(prefix ? `${prefix}.${field.name}` : field.name);
+            }
+          });
+          walk(step.blocks || [], prefix);
+        });
+        return;
+      }
+      if (block.kind !== 'multiField') {
+        (block.list || []).forEach(field => {
+          if (field != null && field.name) {
+            names.push(prefix ? `${prefix}.${field.name}` : field.name);
+          }
+        });
+      }
+      if (block.kind === 'list') {
+        // 列表项内字段相对 GroupList，此处只收集定义名供 choice 清理参考
+        walk(block.itemBlocks || [], prefix);
+      }
+      if (Array.isArray(block.blocks)) {
+        walk(block.blocks, prefix);
+      }
+    });
+  };
+  walk(blocks, _objectNamePrefix);
+  return names;
+};
 const updateBlocks = (schema, updater) => _extends({}, schema, {
   blocks: updater(schema.blocks || [])
 });
-const findBlock = (schema, blockId) => (schema.blocks || []).find(block => block.id === blockId);
-const mapBlocks = (schema, blockId, updater) => updateBlocks(schema, blocks => blocks.map(block => {
-  if (block.id !== blockId) {
-    return block;
-  }
-  return updater(block);
-}));
-const hasRenderableContent = schema => {
-  const blocks = schema.blocks || [];
-  return blocks.some(block => {
+
+/** 在 blocks / itemBlocks / choice.options.blocks / steps.items.blocks 树中查找模块 */
+const findBlockInTree = (blocks = [], blockId) => {
+  for (const block of blocks) {
+    if (!block) {
+      continue;
+    }
+    if (block.id === blockId) {
+      return block;
+    }
+    if (Array.isArray(block.itemBlocks)) {
+      const found = findBlockInTree(block.itemBlocks, blockId);
+      if (found) {
+        return found;
+      }
+    }
+    if (Array.isArray(block.blocks)) {
+      const found = findBlockInTree(block.blocks, blockId);
+      if (found) {
+        return found;
+      }
+    }
+    if (block.kind === 'choice') {
+      for (const option of block.options || []) {
+        const found = findBlockInTree(option.blocks || [], blockId);
+        if (found) {
+          return found;
+        }
+      }
+    }
     if (block.kind === 'steps') {
-      return (block.items || []).some(step => (step.list || []).length > 0);
+      for (const step of block.items || []) {
+        const found = findBlockInTree(step.blocks || [], blockId);
+        if (found) {
+          return found;
+        }
+      }
     }
-    if (block.kind === 'multiField') {
-      return !!block.name;
+  }
+  return null;
+};
+const findBlock = (schema, blockId) => findBlockInTree(schema.blocks || [], blockId);
+
+/** 对模块上挂载的子模块列表（itemBlocks / blocks / option.blocks / step.blocks）应用同一变换 */
+const mapChildBlockLists = (block, mapList) => {
+  let nextBlock = block;
+  let changed = false;
+  if (Array.isArray(block.itemBlocks)) {
+    const itemBlocks = mapList(block.itemBlocks);
+    if (itemBlocks !== block.itemBlocks) {
+      nextBlock = _extends({}, nextBlock, {
+        itemBlocks
+      });
+      changed = true;
+    }
+  }
+  if (Array.isArray(block.blocks)) {
+    const childBlocks = mapList(block.blocks);
+    if (childBlocks !== block.blocks) {
+      nextBlock = _extends({}, nextBlock, {
+        blocks: childBlocks
+      });
+      changed = true;
+    }
+  }
+  if (block.kind === 'choice' && Array.isArray(block.options)) {
+    let optionsChanged = false;
+    const options = block.options.map(option => {
+      if (!Array.isArray(option.blocks)) {
+        return option;
+      }
+      const optionBlocks = mapList(option.blocks);
+      if (optionBlocks !== option.blocks) {
+        optionsChanged = true;
+        return _extends({}, option, {
+          blocks: optionBlocks
+        });
+      }
+      return option;
+    });
+    if (optionsChanged) {
+      nextBlock = _extends({}, nextBlock, {
+        options
+      });
+      changed = true;
+    }
+  }
+  if (block.kind === 'steps' && Array.isArray(block.items)) {
+    let itemsChanged = false;
+    const items = block.items.map(step => {
+      if (!Array.isArray(step.blocks)) {
+        return step;
+      }
+      const stepBlocks = mapList(step.blocks);
+      if (stepBlocks !== step.blocks) {
+        itemsChanged = true;
+        return _extends({}, step, {
+          blocks: stepBlocks
+        });
+      }
+      return step;
+    });
+    if (itemsChanged) {
+      nextBlock = _extends({}, nextBlock, {
+        items
+      });
+      changed = true;
+    }
+  }
+  return {
+    nextBlock,
+    changed
+  };
+};
+const mapBlocksInTree = (blocks, blockId, updater) => {
+  let changed = false;
+  const next = (blocks || []).map(block => {
+    if (!block) {
+      return block;
+    }
+    if (block.id === blockId) {
+      changed = true;
+      return updater(block);
+    }
+    const {
+      nextBlock,
+      changed: childChanged
+    } = mapChildBlockLists(block, list => mapBlocksInTree(list, blockId, updater));
+    if (childChanged) {
+      changed = true;
+    }
+    return nextBlock;
+  });
+  return changed ? next : blocks;
+};
+const mapBlocks = (schema, blockId, updater) => updateBlocks(schema, blocks => mapBlocksInTree(blocks, blockId, updater));
+const removeBlockInTree = (blocks, blockId) => {
+  let changed = false;
+  const filtered = (blocks || []).filter(block => {
+    if ((block == null ? void 0 : block.id) === blockId) {
+      changed = true;
+      return false;
+    }
+    return true;
+  });
+  const next = filtered.map(block => {
+    const {
+      nextBlock,
+      changed: childChanged
+    } = mapChildBlockLists(block, list => removeBlockInTree(list, blockId));
+    if (childChanged) {
+      changed = true;
+    }
+    return nextBlock;
+  });
+  return changed ? next : blocks;
+};
+const moveBlockInTree = (blocks, blockId, direction) => {
+  if ((blocks || []).some(block => (block == null ? void 0 : block.id) === blockId)) {
+    return moveItem(blocks, blockId, direction);
+  }
+  let changed = false;
+  const next = (blocks || []).map(block => {
+    const {
+      nextBlock,
+      changed: childChanged
+    } = mapChildBlockLists(block, list => moveBlockInTree(list, blockId, direction));
+    if (childChanged) {
+      changed = true;
     }
-    return (block.list || []).length > 0 || block.title;
+    return nextBlock;
   });
+  return changed ? next : blocks;
+};
+const blockHasContent = block => {
+  if (!block) {
+    return false;
+  }
+  if (block.kind === 'steps') {
+    return (block.items || []).some(step => (step.list || []).length > 0 || (step.blocks || []).some(blockHasContent) || step.title);
+  }
+  if (block.kind === 'multiField') {
+    return !!block.name;
+  }
+  if (block.kind === 'choice') {
+    return (block.options || []).some(option => (option.list || []).length > 0 || (option.blocks || []).some(blockHasContent) || option.title);
+  }
+  if (block.kind === 'object') {
+    return !!(block.name && ((block.list || []).length > 0 || (block.blocks || []).some(blockHasContent) || block.title));
+  }
+  if ((block.list || []).length > 0 || block.title || (block.blocks || []).some(blockHasContent)) {
+    return true;
+  }
+  return (block.itemBlocks || []).some(blockHasContent);
+};
+const hasRenderableContent = schema => {
+  const blocks = schema.blocks || [];
+  return blocks.some(blockHasContent);
 };
 
 const BLOCK_KINDS = {
@@ -625,6 +1125,19 @@ const BLOCK_KINDS = {
     requiresName: true,
     description: '同一种填写项可以输入多个值，例如多个手机号'
   },
+  object: {
+    label: '分组信息',
+    color: 'orange',
+    hasFieldList: true,
+    requiresName: true,
+    description: '把相关的填写项放在一起，例如「在校时间」下的开始与结束'
+  },
+  choice: {
+    label: '选项切换',
+    color: 'magenta',
+    hasChoiceOptions: true,
+    description: '先选一类情况，再填写对应内容；可设为单选或多选'
+  },
   steps: {
     label: '分步表单',
     color: 'gold',
@@ -653,13 +1166,18 @@ const blockToFormValues = block => {
     maxLength: (_block$maxLength = block.maxLength) != null ? _block$maxLength : null,
     minLength: (_block$minLength = block.minLength) != null ? _block$minLength : null,
     fieldType: block.fieldType || 'Input',
-    autoStep: block.autoStep !== false
+    autoStep: block.autoStep !== false,
+    mode: block.mode === 'multiple' ? 'multiple' : 'single',
+    selectorName: block.selectorName || '',
+    selectorInData: block.selectorInData !== false
   };
 };
 const formValuesToBlock = (values, existingBlock = {}) => {
   var _values$column, _values$gap, _values$maxLength, _values$minLength;
-  return _extends({}, existingBlock, {
-    kind: values.kind || existingBlock.kind,
+  const kind = values.kind || existingBlock.kind;
+  const mode = values.mode === 'multiple' ? 'multiple' : 'single';
+  const next = _extends({}, existingBlock, {
+    kind,
     title: values.title,
     subtitle: values.subtitle,
     column: (_values$column = values.column) != null ? _values$column : 2,
@@ -672,8 +1190,16 @@ const formValuesToBlock = (values, existingBlock = {}) => {
     maxLength: (_values$maxLength = values.maxLength) != null ? _values$maxLength : undefined,
     minLength: (_values$minLength = values.minLength) != null ? _values$minLength : undefined,
     fieldType: values.fieldType || 'Input',
-    autoStep: values.autoStep !== false
+    autoStep: values.autoStep !== false,
+    mode,
+    selectorName: values.selectorName || '',
+    selectorInData: values.selectorInData !== false
   });
+  if (kind === 'choice' && mode !== 'multiple') {
+    next.minLength = undefined;
+    next.maxLength = undefined;
+  }
+  return next;
 };
 const stepToFormValues = step => {
   var _step$column;
@@ -689,6 +1215,12 @@ const formValuesToStep = (values, existingStep = {}) => {
     column: (_values$column2 = values.column) != null ? _values$column2 : 2
   });
 };
+const choiceOptionToFormValues = option => ({
+  title: option.title || ''
+});
+const formValuesToChoiceOption = (values, existingOption = {}) => _extends({}, existingOption, {
+  title: values.title
+});
 
 const _excluded$4 = ["children"];
 const mapOptionItem = item => {
@@ -774,7 +1306,7 @@ const DEFAULT_RULE_CONFIG = () => ({
 });
 const RULE_LEN_PRESET = 'LEN';
 
-/** 注册填写项校验规则 preset，会在规则勾选面板中展示 */
+/** 内部：注册填写项校验规则，会在规则勾选面板中展示（请通过 preset 注册） */
 const registerRulePreset = item => {
   if (!(item != null && item.value)) {
     return;
@@ -1043,7 +1575,7 @@ defineField('DatePicker', {
  * - min / max?: number（type=number）
  * - options?: { label, value }[]（type=select）
  *
- * registerField(type, definition) 还可传：
+ * preset({ type, definition }) 的 fields 项还可传：
  * - groupName?: string 自定义类型下拉分组名；不传则归入「扩展字段」
  */
 const registerField = (type, definition) => {
@@ -1620,6 +2152,31 @@ const IconBtn = _ref => {
     className: style['action-btn']
   }, props));
 };
+const ROOT_ADD_OPTIONS = [{
+  key: 'formInfo',
+  icon: /*#__PURE__*/jsx(FormOutlined, {})
+}, {
+  key: 'list',
+  icon: /*#__PURE__*/jsx(UnorderedListOutlined, {})
+}, {
+  key: 'tableList',
+  icon: /*#__PURE__*/jsx(TableOutlined, {})
+}, {
+  key: 'object',
+  icon: /*#__PURE__*/jsx(ClusterOutlined, {})
+}, {
+  key: 'choice',
+  icon: /*#__PURE__*/jsx(PartitionOutlined, {})
+}, {
+  key: 'multiField',
+  icon: /*#__PURE__*/jsx(AppstoreOutlined, {})
+}, {
+  key: 'steps',
+  icon: /*#__PURE__*/jsx(OrderedListOutlined, {})
+}];
+
+/** 可挂子模块的容器；表格列表 / 同类多值本身不支持子模块 */
+const NESTED_ADD_OPTIONS = ROOT_ADD_OPTIONS.filter(opt => opt.key !== 'steps');
 const BlockListPanel = ({
   blocks,
   onAddBlock,
@@ -1634,29 +2191,160 @@ const BlockListPanel = ({
   onEditStep,
   onDeleteStep,
   onMoveStep,
+  onAddChoiceOption,
+  onEditChoiceOption,
+  onDeleteChoiceOption,
+  onMoveChoiceOption,
   onOpenFormActions
 }) => {
   const {
     formatMessage
   } = useIntl();
   const [addMenuOpen, setAddMenuOpen] = useState(false);
-  const addBlockOptions = [{
-    key: 'formInfo',
-    icon: /*#__PURE__*/jsx(FormOutlined, {})
-  }, {
-    key: 'list',
-    icon: /*#__PURE__*/jsx(UnorderedListOutlined, {})
-  }, {
-    key: 'tableList',
-    icon: /*#__PURE__*/jsx(TableOutlined, {})
-  }, {
-    key: 'multiField',
-    icon: /*#__PURE__*/jsx(AppstoreOutlined, {})
-  }, {
-    key: 'steps',
-    icon: /*#__PURE__*/jsx(OrderedListOutlined, {})
-  }];
-  const renderFieldList = (fields, blockId, stepId) => {
+  const [addFieldMenuId, setAddFieldMenuId] = useState(null);
+  const renderAddBlockMenu = (options, {
+    onSelect,
+    className
+  } = {}) => /*#__PURE__*/jsx("div", {
+    className: className || style['add-block-dropdown'],
+    children: options.map(opt => {
+      const definition = getBlockDefinition(opt.key);
+      return /*#__PURE__*/jsxs("div", {
+        role: "button",
+        tabIndex: 0,
+        className: style['add-block-option'],
+        onClick: () => onSelect(opt.key),
+        onKeyDown: e => {
+          if (e.key === 'Enter' || e.key === ' ') {
+            onSelect(opt.key);
+          }
+        },
+        children: [/*#__PURE__*/jsx("div", {
+          className: style['add-block-option-icon'],
+          children: opt.icon
+        }), /*#__PURE__*/jsxs("div", {
+          className: style['add-block-option-text'],
+          children: [/*#__PURE__*/jsx("div", {
+            className: style['add-block-option-title'],
+            children: formatMessage({
+              id: `blockKind_${opt.key}`
+            })
+          }), /*#__PURE__*/jsx("div", {
+            className: style['add-block-option-desc'],
+            children: definition == null ? void 0 : definition.description
+          })]
+        })]
+      }, opt.key);
+    })
+  });
+  const renderAddFieldButton = ({
+    menuKey,
+    depth,
+    onAddFieldClick,
+    onAddChildBlock
+  }) => {
+    const canAddChild = typeof onAddChildBlock === 'function' && depth < MAX_BLOCK_DEPTH;
+    const menuOpen = addFieldMenuId === menuKey;
+    const btnClass = `${style['add-inline-btn']} ${style['hover-reveal']} ${menuOpen ? style['hover-reveal-active'] : ''}`.trim();
+    if (!canAddChild) {
+      return /*#__PURE__*/jsx(Button, {
+        type: "text",
+        size: "small",
+        icon: /*#__PURE__*/jsx(PlusOutlined, {}),
+        className: btnClass,
+        onClick: onAddFieldClick,
+        children: formatMessage({
+          id: 'addField'
+        })
+      });
+    }
+    return /*#__PURE__*/jsx(Dropdown, {
+      open: menuOpen,
+      onOpenChange: open => setAddFieldMenuId(open ? menuKey : null),
+      trigger: ['hover'],
+      mouseEnterDelay: 0.1,
+      mouseLeaveDelay: 0.15,
+      getPopupContainer: trigger => trigger.parentElement || document.body,
+      dropdownRender: () => /*#__PURE__*/jsxs("div", {
+        className: style['add-field-dropdown'],
+        children: [/*#__PURE__*/jsxs("div", {
+          role: "button",
+          tabIndex: 0,
+          className: style['add-field-dropdown-item'],
+          onClick: () => {
+            onAddFieldClick();
+            setAddFieldMenuId(null);
+          },
+          onKeyDown: e => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              onAddFieldClick();
+              setAddFieldMenuId(null);
+            }
+          },
+          children: [/*#__PURE__*/jsx("span", {
+            className: style['add-field-dropdown-item-icon'],
+            children: /*#__PURE__*/jsx(SelectOutlined, {})
+          }), /*#__PURE__*/jsx("span", {
+            children: formatMessage({
+              id: 'addField'
+            })
+          })]
+        }), /*#__PURE__*/jsx("div", {
+          className: style['add-field-dropdown-divider']
+        }), /*#__PURE__*/jsx("div", {
+          className: style['add-field-dropdown-label'],
+          children: formatMessage({
+            id: 'addChildBlock'
+          })
+        }), NESTED_ADD_OPTIONS.map(opt => {
+          const definition = getBlockDefinition(opt.key);
+          return /*#__PURE__*/jsxs("div", {
+            role: "button",
+            tabIndex: 0,
+            className: style['add-field-dropdown-item'],
+            onClick: () => {
+              onAddChildBlock(opt.key);
+              setAddFieldMenuId(null);
+            },
+            onKeyDown: e => {
+              if (e.key === 'Enter' || e.key === ' ') {
+                onAddChildBlock(opt.key);
+                setAddFieldMenuId(null);
+              }
+            },
+            children: [/*#__PURE__*/jsx("span", {
+              className: style['add-field-dropdown-item-icon'],
+              children: opt.icon
+            }), /*#__PURE__*/jsx("span", {
+              children: formatMessage({
+                id: `blockKind_${opt.key}`
+              })
+            }), definition != null && definition.description ? /*#__PURE__*/jsx("span", {
+              className: style['add-field-dropdown-item-desc'],
+              children: definition.description
+            }) : null]
+          }, opt.key);
+        })]
+      }),
+      children: /*#__PURE__*/jsx(Button, {
+        type: "text",
+        size: "small",
+        icon: /*#__PURE__*/jsx(PlusOutlined, {}),
+        className: btnClass,
+        onClick: () => {
+          onAddFieldClick();
+          setAddFieldMenuId(null);
+        },
+        children: formatMessage({
+          id: 'addField'
+        })
+      })
+    });
+  };
+  const renderFieldList = (fields, blockId, {
+    stepId,
+    optionId
+  } = {}) => {
     if (!(fields || []).length) {
       return /*#__PURE__*/jsx(Text$3, {
         type: "secondary",
@@ -1672,13 +2360,35 @@ const BlockListPanel = ({
         field: field,
         index: fieldIndex,
         total: fields.length,
-        onEdit: fieldItem => onEditField(blockId, fieldItem, stepId),
-        onDelete: fieldId => onDeleteField(blockId, fieldId, stepId),
-        onMove: (fieldId, direction) => onMoveField(blockId, fieldId, direction, stepId)
+        onEdit: fieldItem => onEditField(blockId, fieldItem, {
+          stepId,
+          optionId
+        }),
+        onDelete: fieldId => onDeleteField(blockId, fieldId, {
+          stepId,
+          optionId
+        }),
+        onMove: (fieldId, direction) => onMoveField(blockId, fieldId, direction, {
+          stepId,
+          optionId
+        })
       }, field.id))
     });
   };
-  const renderBlockChildren = block => {
+  const renderNestedBlocks = (childBlocks, depth) => {
+    if (!(childBlocks || []).length) {
+      return null;
+    }
+    return /*#__PURE__*/jsx("div", {
+      className: style['item-blocks-section'],
+      children: /*#__PURE__*/jsx("div", {
+        className: style['nested-block-list'],
+        children: childBlocks.map((child, childIndex) => renderBlockSection(child, childIndex, childBlocks.length, depth + 1))
+      })
+    });
+  };
+  const renderItemBlocks = (parentBlock, depth) => renderNestedBlocks(parentBlock.itemBlocks, depth);
+  const renderBlockChildren = (block, depth) => {
     if (block.kind === 'steps') {
       return /*#__PURE__*/jsxs("div", {
         className: style['block-body'],
@@ -1703,7 +2413,7 @@ const BlockListPanel = ({
         }), (block.items || []).length ? /*#__PURE__*/jsx("div", {
           className: style['step-list'],
           children: (block.items || []).map((step, stepIndex) => {
-            var _step$list, _block$items;
+            var _step$list, _step$list2, _block$items;
             return /*#__PURE__*/jsxs("div", {
               className: style['step-section'],
               children: [/*#__PURE__*/jsxs("div", {
@@ -1723,10 +2433,15 @@ const BlockListPanel = ({
                     })
                   }), /*#__PURE__*/jsx(Text$3, {
                     type: "secondary",
-                    children: formatMessage({
+                    children: (step.blocks || []).length ? formatMessage({
+                      id: 'fieldAndItemBlockCount'
+                    }, {
+                      fields: ((_step$list = step.list) == null ? void 0 : _step$list.length) || 0,
+                      nests: step.blocks.length
+                    }) : formatMessage({
                       id: 'fieldCount'
                     }, {
-                      count: ((_step$list = step.list) == null ? void 0 : _step$list.length) || 0
+                      count: ((_step$list2 = step.list) == null ? void 0 : _step$list2.length) || 0
                     })
                   })]
                 }), /*#__PURE__*/jsxs(ActionGroup, {
@@ -1758,17 +2473,20 @@ const BlockListPanel = ({
                     icon: /*#__PURE__*/jsx(DeleteOutlined, {}),
                     onClick: () => onDeleteStep(block.id, step.id)
                   })]
-                }), /*#__PURE__*/jsx(Button, {
-                  type: "text",
-                  size: "small",
-                  icon: /*#__PURE__*/jsx(PlusOutlined, {}),
-                  className: `${style['add-inline-btn']} ${style['hover-reveal']}`,
-                  onClick: () => onAddField(block.id, step.id),
-                  children: formatMessage({
-                    id: 'addField'
+                }), renderAddFieldButton({
+                  menuKey: `${block.id}:${step.id}`,
+                  depth,
+                  onAddFieldClick: () => onAddField(block.id, {
+                    stepId: step.id
+                  }),
+                  onAddChildBlock: kind => onAddBlock(kind, {
+                    parentBlockId: block.id,
+                    stepId: step.id
                   })
                 })]
-              }), renderFieldList(step.list, block.id, step.id)]
+              }), renderFieldList(step.list, block.id, {
+                stepId: step.id
+              }), renderNestedBlocks(step.blocks, depth)]
             }, step.id);
           })
         }) : /*#__PURE__*/jsx(Text$3, {
@@ -1791,10 +2509,217 @@ const BlockListPanel = ({
         })
       });
     }
-    return /*#__PURE__*/jsx("div", {
+    if (block.kind === 'choice') {
+      return /*#__PURE__*/jsxs("div", {
+        className: style['block-body'],
+        children: [/*#__PURE__*/jsxs("div", {
+          className: style['section-toolbar'],
+          children: [/*#__PURE__*/jsx(Text$3, {
+            type: "secondary",
+            className: style['section-toolbar-label'],
+            children: formatMessage({
+              id: 'choiceOptionListTitle'
+            })
+          }), /*#__PURE__*/jsx(Button, {
+            type: "text",
+            size: "small",
+            icon: /*#__PURE__*/jsx(PlusOutlined, {}),
+            className: `${style['add-inline-btn']} ${style['hover-reveal']}`,
+            onClick: () => onAddChoiceOption(block.id),
+            children: formatMessage({
+              id: 'addChoiceOption'
+            })
+          })]
+        }), (block.options || []).length ? /*#__PURE__*/jsx("div", {
+          className: style['step-list'],
+          children: (block.options || []).map((option, optionIndex) => {
+            var _option$list, _option$list2, _block$options;
+            return /*#__PURE__*/jsxs("div", {
+              className: style['step-section'],
+              children: [/*#__PURE__*/jsxs("div", {
+                className: style['step-section-header'],
+                children: [/*#__PURE__*/jsxs(Space, {
+                  size: 8,
+                  className: style['step-section-title'],
+                  children: [/*#__PURE__*/jsx("span", {
+                    className: style['step-index'],
+                    children: optionIndex + 1
+                  }), /*#__PURE__*/jsx(Text$3, {
+                    strong: true,
+                    children: option.title || formatMessage({
+                      id: 'choiceOptionFallback'
+                    }, {
+                      index: optionIndex + 1
+                    })
+                  }), /*#__PURE__*/jsx(Text$3, {
+                    type: "secondary",
+                    children: (option.blocks || []).length ? formatMessage({
+                      id: 'fieldAndItemBlockCount'
+                    }, {
+                      fields: ((_option$list = option.list) == null ? void 0 : _option$list.length) || 0,
+                      nests: option.blocks.length
+                    }) : formatMessage({
+                      id: 'fieldCount'
+                    }, {
+                      count: ((_option$list2 = option.list) == null ? void 0 : _option$list2.length) || 0
+                    })
+                  })]
+                }), /*#__PURE__*/jsxs(ActionGroup, {
+                  children: [/*#__PURE__*/jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'moveUp'
+                    }),
+                    icon: /*#__PURE__*/jsx(ArrowUpOutlined, {}),
+                    disabled: optionIndex === 0,
+                    onClick: () => onMoveChoiceOption(block.id, option.id, 'up')
+                  }), /*#__PURE__*/jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'moveDown'
+                    }),
+                    icon: /*#__PURE__*/jsx(ArrowDownOutlined, {}),
+                    disabled: optionIndex === (((_block$options = block.options) == null ? void 0 : _block$options.length) || 0) - 1,
+                    onClick: () => onMoveChoiceOption(block.id, option.id, 'down')
+                  }), /*#__PURE__*/jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'editChoiceOption'
+                    }),
+                    icon: /*#__PURE__*/jsx(EditOutlined, {}),
+                    onClick: () => onEditChoiceOption(block.id, option)
+                  }), /*#__PURE__*/jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'deleteChoiceOption'
+                    }),
+                    danger: true,
+                    icon: /*#__PURE__*/jsx(DeleteOutlined, {}),
+                    onClick: () => onDeleteChoiceOption(block.id, option.id)
+                  })]
+                }), renderAddFieldButton({
+                  menuKey: `${block.id}:opt:${option.id}`,
+                  depth,
+                  onAddFieldClick: () => onAddField(block.id, {
+                    optionId: option.id
+                  }),
+                  onAddChildBlock: kind => onAddBlock(kind, {
+                    parentBlockId: block.id,
+                    optionId: option.id
+                  })
+                })]
+              }), renderFieldList(option.list, block.id, {
+                optionId: option.id
+              }), renderNestedBlocks(option.blocks, depth)]
+            }, option.id);
+          })
+        }) : /*#__PURE__*/jsx(Text$3, {
+          type: "secondary",
+          className: style['inline-empty'],
+          children: formatMessage({
+            id: 'emptyChoiceOptionList'
+          })
+        })]
+      });
+    }
+    const supportsItemBlocks = block.kind === 'list';
+    const supportsBlocks = block.kind === 'formInfo' || block.kind === 'object';
+    return /*#__PURE__*/jsxs("div", {
       className: style['block-body'],
-      children: renderFieldList(block.list, block.id)
+      children: [renderFieldList(block.list, block.id), supportsItemBlocks ? renderItemBlocks(block, depth) : null, supportsBlocks ? renderNestedBlocks(block.blocks, depth) : null]
+    });
+  };
+  const renderBlockSection = (block, blockIndex, total, depth = 0) => {
+    var _block$itemBlocks, _block$blocks, _block$items2, _block$options2, _block$list, _block$list2;
+    const definition = getBlockDefinition(block.kind);
+    const canAddField = block.kind !== 'steps' && block.kind !== 'multiField' && block.kind !== 'choice';
+    const supportsItemBlocks = block.kind === 'list';
+    const supportsBlocks = block.kind === 'formInfo' || block.kind === 'object';
+    const supportsChildModules = supportsItemBlocks || supportsBlocks;
+    const nestCount = supportsItemBlocks ? ((_block$itemBlocks = block.itemBlocks) == null ? void 0 : _block$itemBlocks.length) || 0 : ((_block$blocks = block.blocks) == null ? void 0 : _block$blocks.length) || 0;
+    const summary = block.kind === 'steps' ? formatMessage({
+      id: 'stepCount'
+    }, {
+      count: ((_block$items2 = block.items) == null ? void 0 : _block$items2.length) || 0
+    }) : block.kind === 'multiField' ? formatMessage({
+      id: 'multiFieldSummary'
+    }, {
+      type: block.fieldType
+    }) : block.kind === 'choice' ? formatMessage({
+      id: 'choiceOptionCount'
+    }, {
+      count: ((_block$options2 = block.options) == null ? void 0 : _block$options2.length) || 0
+    }) : supportsChildModules && nestCount > 0 ? formatMessage({
+      id: 'fieldAndItemBlockCount'
+    }, {
+      fields: ((_block$list = block.list) == null ? void 0 : _block$list.length) || 0,
+      nests: nestCount
+    }) : formatMessage({
+      id: 'fieldCount'
+    }, {
+      count: ((_block$list2 = block.list) == null ? void 0 : _block$list2.length) || 0
     });
+    return /*#__PURE__*/jsxs("section", {
+      className: `${style['block-section']} ${style[`block-kind-${block.kind}`] || ''} ${depth > 0 ? style['block-section-nested'] : ''}`.trim(),
+      children: [/*#__PURE__*/jsxs("header", {
+        className: style['block-section-header'],
+        children: [/*#__PURE__*/jsxs("div", {
+          className: style['block-header-left'],
+          children: [/*#__PURE__*/jsx(Tag, {
+            bordered: false,
+            color: (definition == null ? void 0 : definition.color) || 'default',
+            children: (definition == null ? void 0 : definition.label) || block.kind
+          }), /*#__PURE__*/jsx(Text$3, {
+            strong: true,
+            ellipsis: true,
+            className: style['block-title'],
+            children: block.title || block.label || block.name || formatMessage({
+              id: 'untitledBlock'
+            })
+          }), /*#__PURE__*/jsx("span", {
+            className: style['block-summary'],
+            children: summary
+          })]
+        }), /*#__PURE__*/jsxs(Space, {
+          size: 4,
+          wrap: true,
+          className: style['block-header-actions'],
+          children: [/*#__PURE__*/jsxs(ActionGroup, {
+            children: [/*#__PURE__*/jsx(IconBtn, {
+              title: formatMessage({
+                id: 'moveUp'
+              }),
+              icon: /*#__PURE__*/jsx(ArrowUpOutlined, {}),
+              disabled: blockIndex === 0,
+              onClick: () => onMoveBlock(block.id, 'up')
+            }), /*#__PURE__*/jsx(IconBtn, {
+              title: formatMessage({
+                id: 'moveDown'
+              }),
+              icon: /*#__PURE__*/jsx(ArrowDownOutlined, {}),
+              disabled: blockIndex === total - 1,
+              onClick: () => onMoveBlock(block.id, 'down')
+            }), /*#__PURE__*/jsx(IconBtn, {
+              title: formatMessage({
+                id: 'editBlock'
+              }),
+              icon: /*#__PURE__*/jsx(SettingOutlined, {}),
+              onClick: () => onEditBlock(block)
+            }), /*#__PURE__*/jsx(IconBtn, {
+              title: formatMessage({
+                id: 'deleteBlock'
+              }),
+              danger: true,
+              icon: /*#__PURE__*/jsx(DeleteOutlined, {}),
+              onClick: () => onDeleteBlock(block.id)
+            })]
+          }), canAddField ? renderAddFieldButton({
+            menuKey: block.id,
+            depth,
+            onAddFieldClick: () => onAddField(block.id),
+            onAddChildBlock: supportsChildModules ? kind => onAddBlock(kind, {
+              parentBlockId: block.id
+            }) : undefined
+          }) : null]
+        })]
+      }), renderBlockChildren(block, depth)]
+    }, block.id);
   };
   return /*#__PURE__*/jsxs("div", {
     className: style['block-list-panel'],
@@ -1807,41 +2732,11 @@ const BlockListPanel = ({
         open: addMenuOpen,
         onOpenChange: setAddMenuOpen,
         trigger: ['click'],
-        dropdownRender: () => /*#__PURE__*/jsx("div", {
-          className: style['add-block-dropdown'],
-          children: addBlockOptions.map(opt => {
-            const definition = getBlockDefinition(opt.key);
-            return /*#__PURE__*/jsxs("div", {
-              role: "button",
-              tabIndex: 0,
-              className: style['add-block-option'],
-              onClick: () => {
-                onAddBlock(opt.key);
-                setAddMenuOpen(false);
-              },
-              onKeyDown: e => {
-                if (e.key === 'Enter' || e.key === ' ') {
-                  onAddBlock(opt.key);
-                  setAddMenuOpen(false);
-                }
-              },
-              children: [/*#__PURE__*/jsx("div", {
-                className: style['add-block-option-icon'],
-                children: opt.icon
-              }), /*#__PURE__*/jsxs("div", {
-                className: style['add-block-option-text'],
-                children: [/*#__PURE__*/jsx("div", {
-                  className: style['add-block-option-title'],
-                  children: formatMessage({
-                    id: `blockKind_${opt.key}`
-                  })
-                }), /*#__PURE__*/jsx("div", {
-                  className: style['add-block-option-desc'],
-                  children: definition == null ? void 0 : definition.description
-                })]
-              })]
-            }, opt.key);
-          })
+        dropdownRender: () => renderAddBlockMenu(ROOT_ADD_OPTIONS, {
+          onSelect: kind => {
+            onAddBlock(kind);
+            setAddMenuOpen(false);
+          }
         }),
         children: /*#__PURE__*/jsx(Button, {
           type: "primary",
@@ -1871,91 +2766,7 @@ const BlockListPanel = ({
       })
     }) : /*#__PURE__*/jsx("div", {
       className: style['block-list'],
-      children: blocks.map((block, blockIndex) => {
-        var _block$items2, _block$list;
-        const definition = getBlockDefinition(block.kind);
-        const canAddField = block.kind !== 'steps' && block.kind !== 'multiField';
-        const summary = block.kind === 'steps' ? formatMessage({
-          id: 'stepCount'
-        }, {
-          count: ((_block$items2 = block.items) == null ? void 0 : _block$items2.length) || 0
-        }) : block.kind === 'multiField' ? formatMessage({
-          id: 'multiFieldSummary'
-        }, {
-          type: block.fieldType
-        }) : formatMessage({
-          id: 'fieldCount'
-        }, {
-          count: ((_block$list = block.list) == null ? void 0 : _block$list.length) || 0
-        });
-        return /*#__PURE__*/jsxs("section", {
-          className: `${style['block-section']} ${style[`block-kind-${block.kind}`] || ''}`.trim(),
-          children: [/*#__PURE__*/jsxs("header", {
-            className: style['block-section-header'],
-            children: [/*#__PURE__*/jsxs("div", {
-              className: style['block-header-left'],
-              children: [/*#__PURE__*/jsx(Tag, {
-                bordered: false,
-                color: (definition == null ? void 0 : definition.color) || 'default',
-                children: (definition == null ? void 0 : definition.label) || block.kind
-              }), /*#__PURE__*/jsx(Text$3, {
-                strong: true,
-                ellipsis: true,
-                className: style['block-title'],
-                children: block.title || block.label || block.name || formatMessage({
-                  id: 'untitledBlock'
-                })
-              }), /*#__PURE__*/jsx("span", {
-                className: style['block-summary'],
-                children: summary
-              })]
-            }), /*#__PURE__*/jsxs(Space, {
-              size: 4,
-              wrap: true,
-              className: style['block-header-actions'],
-              children: [/*#__PURE__*/jsxs(ActionGroup, {
-                children: [/*#__PURE__*/jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'moveUp'
-                  }),
-                  icon: /*#__PURE__*/jsx(ArrowUpOutlined, {}),
-                  disabled: blockIndex === 0,
-                  onClick: () => onMoveBlock(block.id, 'up')
-                }), /*#__PURE__*/jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'moveDown'
-                  }),
-                  icon: /*#__PURE__*/jsx(ArrowDownOutlined, {}),
-                  disabled: blockIndex === blocks.length - 1,
-                  onClick: () => onMoveBlock(block.id, 'down')
-                }), /*#__PURE__*/jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'editBlock'
-                  }),
-                  icon: /*#__PURE__*/jsx(SettingOutlined, {}),
-                  onClick: () => onEditBlock(block)
-                }), /*#__PURE__*/jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'deleteBlock'
-                  }),
-                  danger: true,
-                  icon: /*#__PURE__*/jsx(DeleteOutlined, {}),
-                  onClick: () => onDeleteBlock(block.id)
-                })]
-              }), canAddField ? /*#__PURE__*/jsx(Button, {
-                type: "text",
-                size: "small",
-                icon: /*#__PURE__*/jsx(PlusOutlined, {}),
-                className: `${style['add-inline-btn']} ${style['hover-reveal']}`,
-                onClick: () => onAddField(block.id),
-                children: formatMessage({
-                  id: 'addField'
-                })
-              }) : null]
-            })]
-          }), renderBlockChildren(block)]
-        }, block.id);
-      })
+      children: blocks.map((block, blockIndex) => renderBlockSection(block, blockIndex, blocks.length, 0))
     })]
   });
 };
@@ -1970,7 +2781,7 @@ const BlockConfigFields = ({
   const definition = getBlockDefinition(kind);
   const fieldTypeOptions = useMemo(() => getFieldTypes(), []);
   const list = [];
-  if (kind === 'formInfo' || kind === 'list' || kind === 'tableList') {
+  if (kind === 'formInfo' || kind === 'list' || kind === 'tableList' || kind === 'object') {
     list.push(/*#__PURE__*/jsx(Input, {
       name: "title",
       label: formatMessage({
@@ -2003,7 +2814,7 @@ const BlockConfigFields = ({
       }),
       min: 1,
       max: 4
-    }, "column"), kind === 'formInfo' ? /*#__PURE__*/jsx(InputNumber, {
+    }, "column"), kind === 'formInfo' || kind === 'object' ? /*#__PURE__*/jsx(InputNumber, {
       name: "gap",
       label: formatMessage({
         id: 'blockGap'
@@ -2020,27 +2831,98 @@ const BlockConfigFields = ({
       children: formatMessage({
         id: 'blockImportant'
       })
-    }, "important") : null, kind !== 'formInfo' ? /*#__PURE__*/jsx(Input, {
+    }, "important") : null, kind === 'list' || kind === 'tableList' ? /*#__PURE__*/jsx(Input, {
       name: "addText",
       label: formatMessage({
-        id: 'blockAddText'
+        id: 'blockAddText'
+      }),
+      placeholder: formatMessage({
+        id: 'blockAddTextPlaceholder'
+      })
+    }, "addText") : null, kind === 'list' || kind === 'tableList' ? /*#__PURE__*/jsx(InputNumber, {
+      name: "maxLength",
+      label: formatMessage({
+        id: 'blockMaxLength'
+      }),
+      min: 1
+    }, "maxLength") : null, kind === 'list' || kind === 'tableList' ? /*#__PURE__*/jsx(InputNumber, {
+      name: "minLength",
+      label: formatMessage({
+        id: 'blockMinLength'
+      }),
+      min: 0
+    }, "minLength") : null);
+  }
+  if (kind === 'choice') {
+    list.push(/*#__PURE__*/jsx(Input, {
+      name: "title",
+      label: formatMessage({
+        id: 'blockTitle'
+      }),
+      placeholder: formatMessage({
+        id: 'choiceTitlePlaceholder'
+      })
+    }, "title"), /*#__PURE__*/jsx(Select, {
+      name: "mode",
+      label: formatMessage({
+        id: 'choiceMode'
+      }),
+      rule: "REQ",
+      options: [{
+        label: formatMessage({
+          id: 'choiceModeSingle'
+        }),
+        value: 'single'
+      }, {
+        label: formatMessage({
+          id: 'choiceModeMultiple'
+        }),
+        value: 'multiple'
+      }]
+    }, "mode"), /*#__PURE__*/jsx(InputNumber, {
+      name: "minLength",
+      label: formatMessage({
+        id: 'choiceMinSelect'
+      }),
+      min: 0,
+      placeholder: formatMessage({
+        id: 'propOptionalNumber'
+      }),
+      display: ({
+        openApi
+      }) => {
+        var _openApi$data;
+        return (openApi == null || (_openApi$data = openApi.data) == null ? void 0 : _openApi$data.mode) === 'multiple';
+      }
+    }, "minLength"), /*#__PURE__*/jsx(InputNumber, {
+      name: "maxLength",
+      label: formatMessage({
+        id: 'choiceMaxSelect'
+      }),
+      min: 1,
+      placeholder: formatMessage({
+        id: 'propOptionalNumber'
+      }),
+      display: ({
+        openApi
+      }) => {
+        var _openApi$data2;
+        return (openApi == null || (_openApi$data2 = openApi.data) == null ? void 0 : _openApi$data2.mode) === 'multiple';
+      }
+    }, "maxLength"), /*#__PURE__*/jsx(Input, {
+      name: "selectorName",
+      label: formatMessage({
+        id: 'choiceSelectorName'
       }),
       placeholder: formatMessage({
-        id: 'blockAddTextPlaceholder'
+        id: 'choiceSelectorNamePlaceholder'
       })
-    }, "addText") : null, kind !== 'formInfo' ? /*#__PURE__*/jsx(InputNumber, {
-      name: "maxLength",
-      label: formatMessage({
-        id: 'blockMaxLength'
-      }),
-      min: 1
-    }, "maxLength") : null, kind !== 'formInfo' ? /*#__PURE__*/jsx(InputNumber, {
-      name: "minLength",
-      label: formatMessage({
-        id: 'blockMinLength'
-      }),
-      min: 0
-    }, "minLength") : null);
+    }, "selectorName"), /*#__PURE__*/jsx(Checkbox, {
+      name: "selectorInData",
+      children: formatMessage({
+        id: 'choiceSelectorInData'
+      })
+    }, "selectorInData"));
   }
   if (kind === 'multiField') {
     list.push(/*#__PURE__*/jsx(Input, {
@@ -2131,7 +3013,7 @@ const BlockEditorModal = ({
   const isEdit = !!(block != null && block.id);
   const formData = useMemo(() => blockToFormValues(block || createBlock('formInfo')), [block, open]);
   const handleSubmit = async values => {
-    if (((block == null ? void 0 : block.kind) === 'list' || (block == null ? void 0 : block.kind) === 'tableList' || (block == null ? void 0 : block.kind) === 'multiField') && !values.name) {
+    if (((block == null ? void 0 : block.kind) === 'list' || (block == null ? void 0 : block.kind) === 'tableList' || (block == null ? void 0 : block.kind) === 'multiField' || (block == null ? void 0 : block.kind) === 'object') && !values.name) {
       message.error(formatMessage({
         id: 'blockNameRequired'
       }));
@@ -2228,6 +3110,59 @@ const StepEditorModal = ({
 };
 var StepEditorModal$1 = StepEditorModal;
 
+const ChoiceOptionEditorModal = ({
+  open,
+  option,
+  onCancel,
+  onSave,
+  renderModal
+}) => {
+  const {
+    formatMessage
+  } = useIntl();
+  const isMobile = useIsMobile();
+  const formData = useMemo(() => choiceOptionToFormValues(option || createChoiceOption()), [option, open]);
+  return /*#__PURE__*/jsx(FormModal, _extends({
+    destroyOnHidden: true,
+    destroyOnClose: true,
+    title: formatMessage({
+      id: option != null && option.id ? 'editChoiceOption' : 'addChoiceOption'
+    }),
+    open: open,
+    onCancel: onCancel,
+    width: isMobile ? 'calc(100vw - 32px)' : 560
+  }, renderModal ? {
+    renderModal
+  } : {}, {
+    formProps: {
+      data: formData,
+      onSubmit: values => {
+        onSave(formValuesToChoiceOption(values, option || createChoiceOption()));
+      }
+    },
+    okText: formatMessage({
+      id: 'confirm'
+    }),
+    cancelText: formatMessage({
+      id: 'cancel'
+    }),
+    children: /*#__PURE__*/jsx(FormInfo, {
+      column: 1,
+      list: [/*#__PURE__*/jsx(Input, {
+        name: "title",
+        label: formatMessage({
+          id: 'choiceOptionTitle'
+        }),
+        rule: "REQ",
+        placeholder: formatMessage({
+          id: 'choiceOptionTitlePlaceholder'
+        })
+      }, "title")]
+    })
+  }), open ? option != null && option.id ? `edit-option-${option.id}` : `add-option-${formData.title || 'new'}` : 'closed');
+};
+var ChoiceOptionEditorModal$1 = ChoiceOptionEditorModal;
+
 const {
   Text: Text$2
 } = Typography;
@@ -3646,6 +4581,270 @@ const FormActionsEditor = ({
 };
 var FormActionsEditor$1 = FormActionsEditor;
 
+const getByPath = (obj, path) => {
+  if (obj == null || path == null || path === '') {
+    return undefined;
+  }
+  return String(path).split('.').reduce((current, key) => current == null ? undefined : current[key], obj);
+};
+const resolveSelectorName = block => {
+  var _block$discriminator;
+  if (block.selectorName != null && String(block.selectorName).trim()) {
+    return String(block.selectorName).trim();
+  }
+  if ((_block$discriminator = block.discriminator) != null && _block$discriminator.propertyName) {
+    return String(block.discriminator.propertyName).trim();
+  }
+  return `__choice_${block.id}`;
+};
+const resolveSelectedIds = (value, mode) => {
+  if (mode === 'multiple') {
+    if (Array.isArray(value)) {
+      return value.map(String);
+    }
+    if (value == null || value === '') {
+      return [];
+    }
+    return [String(value)];
+  }
+  if (value == null || value === '') {
+    return [];
+  }
+  return [String(value)];
+};
+const clearUnselectedOptionFields = (openApi, keepIds, allOptions) => {
+  if (!(openApi != null && openApi.setFields)) {
+    return;
+  }
+  const entries = [];
+  allOptions.forEach(option => {
+    if (keepIds.includes(String(option.id))) {
+      return;
+    }
+    (option.list || []).forEach(field => {
+      if (field != null && field.name) {
+        entries.push({
+          name: field.name,
+          value: undefined
+        });
+      }
+    });
+    collectBlockFieldNames(option.blocks || []).forEach(name => {
+      entries.push({
+        name,
+        value: undefined
+      });
+    });
+  });
+  if (!entries.length) {
+    return;
+  }
+  openApi.setFields(entries, {
+    runValidate: false
+  });
+};
+const resolveSelectLimits = block => {
+  const minLength = Number.isFinite(Number(block.minLength)) ? Math.max(0, Math.floor(Number(block.minLength))) : undefined;
+  let maxLength = Number.isFinite(Number(block.maxLength)) ? Math.max(1, Math.floor(Number(block.maxLength))) : undefined;
+  if (minLength != null && maxLength != null && maxLength < minLength) {
+    maxLength = minLength;
+  }
+  return {
+    minLength,
+    maxLength
+  };
+};
+const buildMultipleHint = (formatMessage, minLength, maxLength) => {
+  if (minLength != null && maxLength != null) {
+    return formatMessage ? formatMessage({
+      id: 'choiceModeHintMultipleRange'
+    }, {
+      min: minLength,
+      max: maxLength
+    }) : `请选择 ${minLength}–${maxLength} 项`;
+  }
+  if (minLength != null) {
+    return formatMessage ? formatMessage({
+      id: 'choiceModeHintMultipleMin'
+    }, {
+      count: minLength
+    }) : `请至少选择 ${minLength} 项`;
+  }
+  if (maxLength != null) {
+    return formatMessage ? formatMessage({
+      id: 'choiceModeHintMultipleMax'
+    }, {
+      count: maxLength
+    }) : `最多选择 ${maxLength} 项`;
+  }
+  return formatMessage ? formatMessage({
+    id: 'choiceModeHintMultiple'
+  }) : '可以选择多项';
+};
+
+/**
+ * choice：同一条选项 UI；mode=single 只挂载一支；mode=multiple 平铺所有选中支。
+ * 外层用 InfoPage.Part 的 title 展示标题。
+ */
+const ChoiceBlock = ({
+  block,
+  preview: _preview = false,
+  isMobile: _isMobile = false,
+  formatMessage,
+  renderOptionContent
+}) => {
+  const mode = block.mode === 'multiple' ? 'multiple' : 'single';
+  const selectorName = resolveSelectorName(block);
+  const options = useMemo(() => block.options || [], [block.options]);
+  const {
+    formData,
+    openApi
+  } = useFormContext() || {};
+  const titleText = block.title != null ? String(block.title).trim() : '';
+  const title = titleText || (formatMessage ? formatMessage({
+    id: 'choiceAreaTitle'
+  }) : '请选择');
+  const bordered = _isMobile ? false : block.bordered || undefined;
+  const {
+    minLength,
+    maxLength
+  } = mode === 'multiple' ? resolveSelectLimits(block) : {};
+  const firstOptionId = options[0] != null ? String(options[0].id) : undefined;
+
+  // 单选且未选时，写入第一项，保证预览/提交与选项面板一致
+  useEffect(() => {
+    if (mode !== 'single' || !firstOptionId || !(openApi != null && openApi.setFields)) {
+      return;
+    }
+    const current = getByPath(formData || {}, selectorName);
+    if (current != null && current !== '') {
+      return;
+    }
+    openApi.setFields([{
+      name: selectorName,
+      value: firstOptionId
+    }], {
+      runValidate: false
+    });
+  }, [mode, firstOptionId, selectorName, openApi, formData]);
+  const selectorOptions = useMemo(() => {
+    const rawValue = getByPath(formData || {}, selectorName);
+    const selectedIds = resolveSelectedIds(rawValue, mode);
+    const atMax = mode === 'multiple' && maxLength != null && selectedIds.length >= maxLength;
+    return options.map((option, index) => {
+      const value = String(option.id);
+      return {
+        label: option.title || (formatMessage ? formatMessage({
+          id: 'choiceOptionFallback'
+        }, {
+          index: index + 1
+        }) : `选项${index + 1}`),
+        value,
+        disabled: atMax && !selectedIds.includes(value)
+      };
+    });
+  }, [options, formatMessage, formData, selectorName, mode, maxLength]);
+  const rawValue = getByPath(formData || {}, selectorName);
+  let selectedIds = resolveSelectedIds(rawValue, mode);
+  if (mode === 'single' && !selectedIds.length && firstOptionId) {
+    selectedIds = [firstOptionId];
+  }
+  const activeOptions = options.filter(option => selectedIds.includes(String(option.id)));
+  const handleChange = value => {
+    let nextIds = resolveSelectedIds(value, mode);
+    if (mode === 'multiple' && maxLength != null && nextIds.length > maxLength) {
+      nextIds = nextIds.slice(0, maxLength);
+      openApi == null || openApi.setFields == null || openApi.setFields([{
+        name: selectorName,
+        value: nextIds
+      }], {
+        runValidate: false
+      });
+    }
+    clearUnselectedOptionFields(openApi, nextIds, options);
+  };
+  const selectorRule = mode === 'multiple' && (minLength != null || maxLength != null) ? value => {
+    const ids = resolveSelectedIds(value, 'multiple');
+    if (minLength != null && ids.length < minLength) {
+      return {
+        result: false,
+        errMsg: formatMessage ? formatMessage({
+          id: 'choiceMinSelectError'
+        }, {
+          count: minLength
+        }) : `请至少选择 ${minLength} 项`
+      };
+    }
+    if (maxLength != null && ids.length > maxLength) {
+      return {
+        result: false,
+        errMsg: formatMessage ? formatMessage({
+          id: 'choiceMaxSelectError'
+        }, {
+          count: maxLength
+        }) : `最多只能选择 ${maxLength} 项`
+      };
+    }
+    return {
+      result: true,
+      errMsg: ''
+    };
+  } : undefined;
+  const Selector = mode === 'multiple' ? CheckboxGroup : RadioGroup;
+  const selectorProps = _extends({
+    key: 'choice-selector',
+    name: selectorName,
+    label: titleText || (formatMessage ? formatMessage({
+      id: 'choiceAreaTitle'
+    }) : '请选择'),
+    labelHidden: true,
+    options: selectorOptions,
+    onChange: handleChange
+  }, selectorRule ? {
+    rule: selectorRule
+  } : {}, mode === 'single' ? _extends({
+    optionType: 'button',
+    buttonStyle: 'solid'
+  }, firstOptionId ? {
+    defaultValue: firstOptionId
+  } : {}) : {});
+  const contentChildren = [];
+  activeOptions.forEach(option => {
+    const nodes = (typeof renderOptionContent === 'function' ? renderOptionContent(option, {
+      preview: _preview,
+      isMobile: _isMobile,
+      formatMessage
+    }) : []) || [];
+    if (nodes.length) {
+      contentChildren.push(/*#__PURE__*/createElement('div', {
+        key: option.id,
+        className: style['choice-option-panel']
+      }, mode === 'multiple' && option.title ? /*#__PURE__*/createElement('div', {
+        className: style['choice-option-panel-title']
+      }, option.title) : null, ...nodes));
+    }
+  });
+  const modeHint = mode === 'multiple' ? buildMultipleHint(formatMessage, minLength, maxLength) : formatMessage ? formatMessage({
+    id: 'choiceModeHintSingle'
+  }) : '请选择其中一项';
+  return /*#__PURE__*/createElement(InfoPage.Part, {
+    title,
+    subtitle: modeHint,
+    bordered,
+    className: style['choice-block'],
+    'data-choice-mode': mode
+  }, /*#__PURE__*/createElement('div', {
+    className: style['choice-selector']
+  }, /*#__PURE__*/createElement(Selector, selectorProps)), contentChildren.length ? /*#__PURE__*/createElement('div', {
+    className: style['choice-panels']
+  }, ...contentChildren) : /*#__PURE__*/createElement('div', {
+    className: style['choice-panels-empty']
+  }, formatMessage ? formatMessage({
+    id: 'choiceSelectFirstHint'
+  }) : '请先在上方选择'));
+};
+var ChoiceBlock$1 = ChoiceBlock;
+
 const buildLabelTips = tips => {
   if (tips == null || !String(tips).trim()) {
     return undefined;
@@ -3656,7 +4855,9 @@ const buildLabelTips = tips => {
     className: style['field-label-tips-icon']
   }));
 };
-const renderFieldElements = (fields = [], preview = false) => fields.filter(field => !field.hidden).map(field => {
+const renderFieldElements = (fields = [], preview = false, {
+  namePrefix
+} = {}) => fields.filter(field => !field.hidden).map(field => {
   var _props$options;
   const Component = getFieldComponent(field.type, field);
   if (!Component) {
@@ -3667,18 +4868,15 @@ const renderFieldElements = (fields = [], preview = false) => fields.filter(fiel
   if (definition != null && definition.optionsAllowDescription && (_props$options = props.options) != null && _props$options.length && !props.api && !definition.optionsAllowChildren) {
     props.api = createApiFromOptions(props.options);
   }
-
-  // 空字符串会盖掉 react-form-antd / SuperSelect 的默认「请输入/请选择」占位
   if (!Array.isArray(props.placeholder) && props.placeholder != null && !String(props.placeholder).trim()) {
     delete props.placeholder;
   }
-
-  // schema 内部标记，不传给 antd
   delete props.range;
   const description = field.description != null && String(field.description).trim() ? field.description : undefined;
+  const fieldName = namePrefix && field.name ? `${namePrefix}.${field.name}` : field.name;
   return /*#__PURE__*/createElement(Component, _extends({
     key: field.id,
-    name: field.name,
+    name: fieldName,
     label: field.label,
     rule: field.rule || undefined,
     block: field.block || undefined
@@ -3687,59 +4885,122 @@ const renderFieldElements = (fields = [], preview = false) => fields.filter(fiel
     description
   }));
 }).filter(Boolean);
-const renderBlockElement = (block, preview = false, {
-  isMobile: _isMobile = false,
-  formatMessage
-} = {}) => {
-  const fields = renderFieldElements(block.list, preview);
-  const bordered = _isMobile ? false : block.bordered || undefined;
+const withBlockLayout = (element, forceBlock) => {
+  if (!element || !forceBlock) {
+    return element;
+  }
+  return /*#__PURE__*/createElement(element.type, _extends({}, element.props, {
+    key: element.key,
+    block: true
+  }));
+};
+
+/** 列表子项内嵌的 FormInfo / List：表头圆角、去掉底边，压过 antd Card CSS-in-JS */
+const nestedListItemPartProps = {
+  styles: {
+    header: {
+      borderBottom: 'none',
+      borderRadius: 'var(--radius-default, 8px) var(--radius-default, 8px) 0 0'
+    }
+  },
+  style: {
+    borderRadius: 'var(--radius-default, 8px)',
+    overflow: 'hidden'
+  }
+};
+const renderBlockElement = (block, preview = false, ctx = {}) => {
+  const {
+    isMobile = false,
+    formatMessage,
+    depth = 0,
+    asListItem = false
+  } = ctx;
+  if (!block || depth > MAX_BLOCK_DEPTH) {
+    return null;
+  }
+  const nextCtx = _extends({}, ctx, {
+    depth: depth + 1,
+    asListItem: false
+  });
+  const bordered = isMobile ? false : block.bordered || undefined;
+  const listItemPartProps = asListItem ? nestedListItemPartProps : null;
+  const renderChildBlocks = (blocks = [], childCtx = nextCtx) => (blocks || []).map(child => renderBlockElement(child, preview, childCtx)).filter(Boolean);
   switch (block.kind) {
     case 'formInfo':
-      return /*#__PURE__*/createElement(FormInfo, {
-        key: block.id,
-        title: block.title || undefined,
-        subtitle: block.subtitle || undefined,
-        column: block.column,
-        gap: block.gap,
-        bordered,
-        list: fields
-      });
+      {
+        const fields = renderFieldElements(block.list, preview);
+        const nested = renderChildBlocks(block.blocks || [], nextCtx).map(node => withBlockLayout(node, true));
+        return withBlockLayout(/*#__PURE__*/createElement(FormInfo, _extends({
+          key: block.id,
+          title: block.title || undefined,
+          subtitle: block.subtitle || undefined,
+          column: block.column,
+          gap: block.gap,
+          bordered,
+          list: [...fields, ...nested]
+        }, listItemPartProps || {})), asListItem);
+      }
+    case 'object':
+      {
+        const fields = renderFieldElements(block.list, preview, {
+          namePrefix: block.name || ''
+        });
+        const nested = renderChildBlocks(block.blocks || [], nextCtx).map(node => withBlockLayout(node, true));
+        return withBlockLayout(/*#__PURE__*/createElement(FormInfo, _extends({
+          key: block.id,
+          title: block.title || undefined,
+          subtitle: block.subtitle || undefined,
+          column: block.column,
+          gap: block.gap,
+          bordered,
+          list: [...fields, ...nested]
+        }, listItemPartProps || {})), asListItem);
+      }
     case 'list':
-      return /*#__PURE__*/createElement(List, _extends({
-        key: block.id,
-        name: block.name,
-        title: block.title || undefined,
-        important: block.important || undefined,
-        bordered,
-        maxLength: block.maxLength,
-        minLength: block.minLength
-      }, block.addText ? {
-        addText: block.addText
-      } : {}, typeof block.itemTitle === 'function' || block.itemTitle ? {
-        itemTitle: block.itemTitle
-      } : {}, {
-        list: fields
-      }));
+      {
+        const fields = renderFieldElements(block.list, preview);
+        const nested = renderChildBlocks(block.itemBlocks || [], _extends({}, nextCtx, {
+          asListItem: true
+        })).map(node => withBlockLayout(node, true));
+        return withBlockLayout(/*#__PURE__*/createElement(List, _extends({
+          key: block.id,
+          name: block.name,
+          title: block.title || undefined,
+          important: block.important || undefined,
+          bordered,
+          maxLength: block.maxLength,
+          minLength: block.minLength
+        }, block.addText ? {
+          addText: block.addText
+        } : {}, typeof block.itemTitle === 'function' || block.itemTitle ? {
+          itemTitle: block.itemTitle
+        } : {}, {
+          list: [...fields, ...nested]
+        }, listItemPartProps || {})), asListItem);
+      }
     case 'tableList':
-      return /*#__PURE__*/createElement(TableList, _extends({
-        key: block.id,
-        name: block.name,
-        title: block.title || undefined,
-        bordered,
-        maxLength: block.maxLength,
-        minLength: block.minLength
-      }, block.addText ? {
-        addText: block.addText
-      } : {}, {
-        list: fields
-      }));
+      {
+        const fields = renderFieldElements(block.list, preview);
+        return withBlockLayout(/*#__PURE__*/createElement(TableList, _extends({
+          key: block.id,
+          name: block.name,
+          title: block.title || undefined,
+          bordered,
+          maxLength: block.maxLength,
+          minLength: block.minLength
+        }, block.addText ? {
+          addText: block.addText
+        } : {}, {
+          list: fields
+        }, listItemPartProps || {})), asListItem);
+      }
     case 'multiField':
       {
         const FieldComponent = getFieldComponent(block.fieldType);
         if (!FieldComponent) {
           return null;
         }
-        return /*#__PURE__*/createElement(MultiField, _extends({
+        return withBlockLayout(/*#__PURE__*/createElement(MultiField, _extends({
           key: block.id,
           name: block.name,
           label: block.label,
@@ -3747,26 +5008,70 @@ const renderBlockElement = (block, preview = false, {
           block: block.block || undefined
         }, block.addText ? {
           addText: block.addText
-        } : {}));
+        } : {})), asListItem);
       }
     case 'steps':
       {
-        const _bordered = _isMobile ? false : block.bordered || undefined;
-        return /*#__PURE__*/createElement(Steps, {
+        return withBlockLayout(/*#__PURE__*/createElement(Steps, {
           key: block.id,
           title: block.title || undefined,
           subtitle: block.subtitle || undefined,
-          bordered: _bordered,
-          items: (block.items || []).map(step => ({
-            key: step.id,
-            title: step.title,
-            column: step.column,
-            gap: block.gap,
-            list: renderFieldElements(step.list, preview),
-            fieldNames: (step.list || []).filter(field => field && !field.hidden && field.name).map(field => field.name)
-          }))
-        });
+          bordered,
+          prevIcon: /*#__PURE__*/createElement(ArrowLeftOutlined),
+          nextIcon: /*#__PURE__*/createElement(ArrowRightOutlined),
+          items: (block.items || []).map(step => {
+            const fields = renderFieldElements(step.list, preview);
+            const nested = renderChildBlocks(step.blocks || [], nextCtx);
+            const fieldNames = [...(step.list || []).filter(field => field && !field.hidden && field.name).map(field => field.name), ...collectBlockFieldNames(step.blocks || [])];
+            if (nested.length) {
+              return {
+                key: step.id,
+                title: step.title,
+                column: step.column,
+                gap: block.gap,
+                fieldNames,
+                children: /*#__PURE__*/createElement(Fragment, {
+                  key: `${step.id}-body`
+                }, fields.length ? /*#__PURE__*/createElement(FormInfo, {
+                  key: `${step.id}-fields`,
+                  column: step.column,
+                  gap: block.gap,
+                  list: fields
+                }) : null, ...nested)
+              };
+            }
+            return {
+              key: step.id,
+              title: step.title,
+              column: step.column,
+              gap: block.gap,
+              list: fields,
+              fieldNames
+            };
+          })
+        }), asListItem);
       }
+    case 'choice':
+      return withBlockLayout(/*#__PURE__*/createElement(ChoiceBlock$1, {
+        key: block.id,
+        block,
+        preview,
+        isMobile,
+        formatMessage,
+        renderOptionContent: option => {
+          const nodes = [];
+          if ((option.list || []).length) {
+            nodes.push(/*#__PURE__*/createElement(FormInfo, {
+              key: `${option.id}-fields`,
+              column: block.column || 2,
+              gap: block.gap,
+              list: renderFieldElements(option.list, preview)
+            }));
+          }
+          nodes.push(...renderChildBlocks(option.blocks || [], nextCtx));
+          return nodes.filter(Boolean);
+        }
+      }), asListItem);
     default:
       return null;
   }
@@ -3774,7 +5079,7 @@ const renderBlockElement = (block, preview = false, {
 const renderSchemaInner = (schema, {
   preview: _preview = false,
   className,
-  isMobile: _isMobile2 = false,
+  isMobile: _isMobile = false,
   formatMessage,
   children,
   actionNode
@@ -3782,7 +5087,7 @@ const renderSchemaInner = (schema, {
   const normalized = normalizeSchema(schema);
   const blocks = normalized.blocks || [];
   const contentChildren = blocks.map(block => renderBlockElement(block, _preview, {
-    isMobile: _isMobile2,
+    isMobile: _isMobile,
     formatMessage
   })).filter(Boolean);
   if (!contentChildren.length && !children && !actionNode) {
@@ -3797,7 +5102,7 @@ const renderSchemaContent = (schema, {
   preview: _preview2 = false,
   formProps: _formProps = {},
   className,
-  isMobile: _isMobile3 = false,
+  isMobile: _isMobile2 = false,
   formatMessage,
   children,
   actionNode
@@ -3805,7 +5110,7 @@ const renderSchemaContent = (schema, {
   const normalized = normalizeSchema(schema);
   const blocks = normalized.blocks || [];
   const contentChildren = blocks.map(block => renderBlockElement(block, _preview2, {
-    isMobile: _isMobile3,
+    isMobile: _isMobile2,
     formatMessage
   })).filter(Boolean);
   if (!contentChildren.length && !children) {
@@ -4007,8 +5312,13 @@ const FormCreator = withLocale$1(({
   const [innerSchema, setInnerSchema] = useState(() => normalizeSchema(defaultValue || defaultSchema()));
   const [blockEditorOpen, setBlockEditorOpen] = useState(false);
   const [editingBlock, setEditingBlock] = useState(null);
+  const [blockParentId, setBlockParentId] = useState(null);
+  const [blockParentStepId, setBlockParentStepId] = useState(null);
+  const [blockParentOptionId, setBlockParentOptionId] = useState(null);
   const [stepEditorOpen, setStepEditorOpen] = useState(false);
   const [stepContext, setStepContext] = useState(null);
+  const [choiceOptionEditorOpen, setChoiceOptionEditorOpen] = useState(false);
+  const [choiceOptionContext, setChoiceOptionContext] = useState(null);
   const [fieldEditorOpen, setFieldEditorOpen] = useState(false);
   const [fieldContext, setFieldContext] = useState(null);
   const [editingField, setEditingField] = useState(null);
@@ -4021,31 +5331,70 @@ const FormCreator = withLocale$1(({
     }
     onChange == null || onChange(normalized);
   };
-  const handleAddBlock = kind => {
+  const clearBlockEditor = () => {
+    setBlockEditorOpen(false);
+    setEditingBlock(null);
+    setBlockParentId(null);
+    setBlockParentStepId(null);
+    setBlockParentOptionId(null);
+  };
+  const handleAddBlock = (kind, {
+    parentBlockId,
+    stepId,
+    optionId
+  } = {}) => {
     setEditingBlock(createBlock(kind));
+    setBlockParentId(parentBlockId || null);
+    setBlockParentStepId(stepId || null);
+    setBlockParentOptionId(optionId || null);
     setBlockEditorOpen(true);
   };
   const handleEditBlock = block => {
     setEditingBlock(block);
+    setBlockParentId(null);
+    setBlockParentStepId(null);
+    setBlockParentOptionId(null);
     setBlockEditorOpen(true);
   };
   const handleSaveBlock = block => {
-    const exists = schema.blocks.some(item => item.id === block.id);
-    updateSchema(_extends({}, schema, {
-      blocks: exists ? schema.blocks.map(item => item.id === block.id ? block : item) : [...schema.blocks, block]
-    }));
-    setBlockEditorOpen(false);
-    setEditingBlock(null);
+    const exists = !!findBlock(schema, block.id);
+    if (exists) {
+      updateSchema(mapBlocks(schema, block.id, () => block));
+    } else if (blockParentId && blockParentStepId) {
+      updateSchema(mapBlocks(schema, blockParentId, parent => _extends({}, parent, {
+        items: (parent.items || []).map(step => step.id === blockParentStepId ? _extends({}, step, {
+          blocks: [...(step.blocks || []), block]
+        }) : step)
+      })));
+    } else if (blockParentId && blockParentOptionId) {
+      updateSchema(mapBlocks(schema, blockParentId, parent => _extends({}, parent, {
+        options: (parent.options || []).map(option => option.id === blockParentOptionId ? _extends({}, option, {
+          blocks: [...(option.blocks || []), block]
+        }) : option)
+      })));
+    } else if (blockParentId) {
+      updateSchema(mapBlocks(schema, blockParentId, parent => {
+        if (parent.kind === 'list') {
+          return _extends({}, parent, {
+            itemBlocks: [...(parent.itemBlocks || []), block]
+          });
+        }
+        return _extends({}, parent, {
+          blocks: [...(parent.blocks || []), block]
+        });
+      }));
+    } else {
+      updateSchema(_extends({}, schema, {
+        blocks: [...schema.blocks, block]
+      }));
+    }
+    clearBlockEditor();
   };
   const handleDeleteBlock = blockId => {
-    updateSchema(_extends({}, schema, {
-      blocks: schema.blocks.filter(item => item.id !== blockId)
-    }));
+    updateSchema(updateBlocks(schema, blocks => removeBlockInTree(blocks, blockId)));
   };
   const handleMoveBlock = (blockId, direction) => {
-    updateSchema(_extends({}, schema, {
-      blocks: moveItem(schema.blocks, blockId, direction)
-    }));
+    updateSchema(updateBlocks(schema, blocks => moveBlockInTree(blocks, blockId, direction)));
   };
   const handleAddStep = blockId => {
     setStepContext({
@@ -4084,27 +5433,71 @@ const FormCreator = withLocale$1(({
       items: moveItem(block.items || [], stepId, direction)
     })));
   };
-  const handleAddField = (blockId, stepId) => {
-    setFieldContext({
+  const handleAddChoiceOption = blockId => {
+    setChoiceOptionContext({
       blockId,
-      stepId
+      option: createChoiceOption()
     });
-    setEditingField(null);
-    setFieldEditorOpen(true);
+    setChoiceOptionEditorOpen(true);
   };
-  const handleEditField = (blockId, field, stepId) => {
-    setFieldContext({
+  const handleEditChoiceOption = (blockId, option) => {
+    setChoiceOptionContext({
       blockId,
-      stepId
+      option
     });
+    setChoiceOptionEditorOpen(true);
+  };
+  const handleSaveChoiceOption = option => {
+    const {
+      blockId
+    } = choiceOptionContext;
+    updateSchema(mapBlocks(schema, blockId, block => {
+      const exists = (block.options || []).some(item => item.id === option.id);
+      return _extends({}, block, {
+        options: exists ? block.options.map(item => item.id === option.id ? option : item) : [...(block.options || []), option]
+      });
+    }));
+    setChoiceOptionEditorOpen(false);
+    setChoiceOptionContext(null);
+  };
+  const handleDeleteChoiceOption = (blockId, optionId) => {
+    updateSchema(mapBlocks(schema, blockId, block => _extends({}, block, {
+      options: (block.options || []).filter(item => item.id !== optionId)
+    })));
+  };
+  const handleMoveChoiceOption = (blockId, optionId, direction) => {
+    updateSchema(mapBlocks(schema, blockId, block => _extends({}, block, {
+      options: moveItem(block.options || [], optionId, direction)
+    })));
+  };
+  const normalizeFieldScope = scope => {
+    if (typeof scope === 'string' || scope == null) {
+      return {
+        stepId: scope
+      };
+    }
+    return scope;
+  };
+  const handleAddField = (blockId, scope) => {
+    setFieldContext(_extends({
+      blockId
+    }, normalizeFieldScope(scope)));
+    setEditingField(null);
+    setFieldEditorOpen(true);
+  };
+  const handleEditField = (blockId, field, scope) => {
+    setFieldContext(_extends({
+      blockId
+    }, normalizeFieldScope(scope)));
     setEditingField(field);
     setFieldEditorOpen(true);
   };
   const handleSaveField = field => {
     const {
       blockId,
-      stepId
-    } = fieldContext;
+      stepId,
+      optionId
+    } = fieldContext || {};
     updateSchema(mapBlocks(schema, blockId, block => {
       if (block.kind === 'steps') {
         return _extends({}, block, {
@@ -4119,6 +5512,19 @@ const FormCreator = withLocale$1(({
           })
         });
       }
+      if (block.kind === 'choice') {
+        return _extends({}, block, {
+          options: (block.options || []).map(option => {
+            if (option.id !== optionId) {
+              return option;
+            }
+            const exists = (option.list || []).some(item => item.id === field.id);
+            return _extends({}, option, {
+              list: exists ? option.list.map(item => item.id === field.id ? field : item) : [...(option.list || []), field]
+            });
+          })
+        });
+      }
       const exists = (block.list || []).some(item => item.id === field.id);
       return _extends({}, block, {
         list: exists ? block.list.map(item => item.id === field.id ? field : item) : [...(block.list || []), field]
@@ -4128,7 +5534,11 @@ const FormCreator = withLocale$1(({
     setFieldContext(null);
     setEditingField(null);
   };
-  const handleDeleteField = (blockId, fieldId, stepId) => {
+  const handleDeleteField = (blockId, fieldId, scope) => {
+    const {
+      stepId,
+      optionId
+    } = normalizeFieldScope(scope);
     updateSchema(mapBlocks(schema, blockId, block => {
       if (block.kind === 'steps') {
         return _extends({}, block, {
@@ -4137,12 +5547,23 @@ const FormCreator = withLocale$1(({
           }) : step)
         });
       }
+      if (block.kind === 'choice') {
+        return _extends({}, block, {
+          options: (block.options || []).map(option => option.id === optionId ? _extends({}, option, {
+            list: (option.list || []).filter(item => item.id !== fieldId)
+          }) : option)
+        });
+      }
       return _extends({}, block, {
         list: (block.list || []).filter(item => item.id !== fieldId)
       });
     }));
   };
-  const handleMoveField = (blockId, fieldId, direction, stepId) => {
+  const handleMoveField = (blockId, fieldId, direction, scope) => {
+    const {
+      stepId,
+      optionId
+    } = normalizeFieldScope(scope);
     updateSchema(mapBlocks(schema, blockId, block => {
       if (block.kind === 'steps') {
         return _extends({}, block, {
@@ -4151,6 +5572,13 @@ const FormCreator = withLocale$1(({
           }) : step)
         });
       }
+      if (block.kind === 'choice') {
+        return _extends({}, block, {
+          options: (block.options || []).map(option => option.id === optionId ? _extends({}, option, {
+            list: moveItem(option.list || [], fieldId, direction)
+          }) : option)
+        });
+      }
       return _extends({}, block, {
         list: moveItem(block.list || [], fieldId, direction)
       });
@@ -4158,7 +5586,8 @@ const FormCreator = withLocale$1(({
   };
   const currentFieldScope = fieldContext ? collectSchemaFields(schema, {
     blockId: fieldContext.blockId,
-    stepId: fieldContext.stepId
+    stepId: fieldContext.stepId,
+    optionId: fieldContext.optionId
   }) : [];
   return /*#__PURE__*/jsxs("div", {
     className: [style['form-creator'], RESPONSIVE_BOUNDARY_CLASS, isMobile ? style['is-mobile'] : '', className].filter(Boolean).join(' '),
@@ -4178,6 +5607,10 @@ const FormCreator = withLocale$1(({
         onEditStep: handleEditStep,
         onDeleteStep: handleDeleteStep,
         onMoveStep: handleMoveStep,
+        onAddChoiceOption: handleAddChoiceOption,
+        onEditChoiceOption: handleEditChoiceOption,
+        onDeleteChoiceOption: handleDeleteChoiceOption,
+        onMoveChoiceOption: handleMoveChoiceOption,
         onOpenFormActions: () => setFormActionsOpen(true)
       })
     }), _showPreview ? /*#__PURE__*/jsx("div", {
@@ -4199,10 +5632,7 @@ const FormCreator = withLocale$1(({
       open: blockEditorOpen,
       block: editingBlock,
       renderModal: renderModal,
-      onCancel: () => {
-        setBlockEditorOpen(false);
-        setEditingBlock(null);
-      },
+      onCancel: clearBlockEditor,
       onSave: handleSaveBlock
     }), /*#__PURE__*/jsx(StepEditorModal$1, {
       open: stepEditorOpen,
@@ -4213,6 +5643,15 @@ const FormCreator = withLocale$1(({
         setStepContext(null);
       },
       onSave: handleSaveStep
+    }), /*#__PURE__*/jsx(ChoiceOptionEditorModal$1, {
+      open: choiceOptionEditorOpen,
+      option: choiceOptionContext == null ? void 0 : choiceOptionContext.option,
+      renderModal: renderModal,
+      onCancel: () => {
+        setChoiceOptionEditorOpen(false);
+        setChoiceOptionContext(null);
+      },
+      onSave: handleSaveChoiceOption
     }), /*#__PURE__*/jsx(FieldEditorModal$1, {
       open: fieldEditorOpen,
       field: editingField,
@@ -4288,5 +5727,5 @@ const preset = ({
   });
 };
 
-export { FormCreator$1 as FormCreator, RULE_LEN_PRESET, RULE_PRESET_ITEMS, SchemaRenderer$1 as SchemaRenderer, SchemaRendererInner, applyFromPropsSchema, blockToFormValues, buildRuleString, collectSchemaFields, createBlock, createField$1 as createField, createFieldId, createStep, FormCreator$1 as default, defaultFormActions, defaultSchema, fieldToFormValues, findBlock, formValuesToBlock, formValuesToField, getBlockDefinition, getBlockKindOptions, getFieldComponent, getFieldDefinition, getFieldTypes, getRulePresetItems, hasRenderableContent, isFieldNameUnique, mapBlocks, moveItem, normalizeBlock, normalizeFormActions, normalizeOptions, normalizeSchema, parseRuleString, pickFieldProps, pickFromPropsSchema, preset, registerField, registerRulePreset, updateBlocks };
+export { FormCreator$1 as FormCreator, MAX_BLOCK_DEPTH, RULE_LEN_PRESET, RULE_PRESET_ITEMS, SchemaRenderer$1 as SchemaRenderer, SchemaRendererInner, applyFromPropsSchema, blockToFormValues, buildRuleString, collectBlockFieldNames, collectSchemaFields, createBlock, createChoiceOption, createField$1 as createField, createFieldId, createStep, FormCreator$1 as default, defaultFormActions, defaultSchema, fieldToFormValues, findBlock, findBlockInTree, formValuesToBlock, formValuesToField, getBlockDefinition, getBlockKindOptions, getFieldComponent, getFieldDefinition, getFieldTypes, getRulePresetItems, hasRenderableContent, isFieldNameUnique, mapBlocks, moveBlockInTree, moveItem, normalizeBlock, normalizeFormActions, normalizeOptions, normalizeSchema, parseRuleString, pickFieldProps, pickFromPropsSchema, preset, removeBlockInTree, updateBlocks };
 //# sourceMappingURL=index.modern.js.map