@kne/form-creator 0.1.8 → 0.1.11

package/dist/index.js

@@ -20,7 +20,7 @@ var SelectList__default = /*#__PURE__*/_interopDefaultLegacy(SelectList);
 var FormInfo__default = /*#__PURE__*/_interopDefaultLegacy(FormInfo);
 var InfoPage__default = /*#__PURE__*/_interopDefaultLegacy(InfoPage);
 
-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"};
+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-section-actions":"kne-form-creator_es-FC","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"};
 
 const locale$1 = {
   addField: '添加填写项',
@@ -1489,6 +1489,37 @@ const FIELD_GROUPS = [{
   label: '业务选择',
   types: ['SelectFunction', 'SelectIndustry', 'SelectAddress']
 }];
+const optionEnumValues = field => {
+  const options = field?.props?.options;
+  if (!Array.isArray(options) || !options.length) {
+    return undefined;
+  }
+  const values = options.map(item => item?.value).filter(value => value !== undefined && value !== null && value !== '');
+  return values.length ? values : undefined;
+};
+const stringWithEnumSchema = field => {
+  const schema = {
+    type: 'string'
+  };
+  const enums = optionEnumValues(field);
+  if (enums) {
+    schema.enum = enums;
+  }
+  return schema;
+};
+const superSelectValueSchema = field => {
+  if (field?.props?.single) {
+    return {
+      type: 'object'
+    };
+  }
+  return {
+    type: 'array',
+    items: {
+      type: 'object'
+    }
+  };
+};
 defineField('Input', {
   label: '单行文本',
   group: '基础字段',
@@ -1496,7 +1527,10 @@ defineField('Input', {
   defaultProps: {
     allowClear: true
   },
-  hasFieldProps: true
+  hasFieldProps: true,
+  valueSchema: {
+    type: 'string'
+  }
 });
 defineField('TextArea', {
   label: '多行文本',
@@ -1508,14 +1542,20 @@ defineField('TextArea', {
   defaults: {
     block: true
   },
-  hasFieldProps: true
+  hasFieldProps: true,
+  valueSchema: {
+    type: 'string'
+  }
 });
 defineField('InputNumber', {
   label: '数字',
   group: '基础字段',
   component: reactFormAntd.InputNumber,
   defaultProps: {},
-  hasFieldProps: true
+  hasFieldProps: true,
+  valueSchema: {
+    type: 'number'
+  }
 });
 defineField('Select', {
   label: '下拉选择',
@@ -1526,7 +1566,8 @@ defineField('Select', {
     allowClear: true
   },
   hasOptions: true,
-  hasFieldProps: true
+  hasFieldProps: true,
+  valueSchema: stringWithEnumSchema
 });
 defineField('RadioGroup', {
   label: '单选组',
@@ -1535,7 +1576,8 @@ defineField('RadioGroup', {
   defaultProps: {
     options: []
   },
-  hasOptions: true
+  hasOptions: true,
+  valueSchema: stringWithEnumSchema
 });
 defineField('CheckboxGroup', {
   label: '复选组',
@@ -1544,7 +1586,20 @@ defineField('CheckboxGroup', {
   defaultProps: {
     options: []
   },
-  hasOptions: true
+  hasOptions: true,
+  valueSchema: field => {
+    const items = {
+      type: 'string'
+    };
+    const enums = optionEnumValues(field);
+    if (enums) {
+      items.enum = enums;
+    }
+    return {
+      type: 'array',
+      items
+    };
+  }
 });
 defineField('SuperSelectList', {
   label: '普通下拉',
@@ -1559,7 +1614,8 @@ defineField('SuperSelectList', {
   },
   isSuperSelect: true,
   hasOptions: true,
-  optionsAllowDescription: true
+  optionsAllowDescription: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('SuperSelectTableList', {
   label: '表格选择',
@@ -1576,7 +1632,8 @@ defineField('SuperSelectTableList', {
   isSuperSelect: true,
   hasOptions: true,
   hasColumns: true,
-  optionsAllowDescription: true
+  optionsAllowDescription: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('SuperSelectTree', {
   label: '树形选择',
@@ -1592,7 +1649,8 @@ defineField('SuperSelectTree', {
   isSuperSelect: true,
   hasOptions: true,
   optionsAllowChildren: true,
-  optionsAllowDescription: true
+  optionsAllowDescription: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('SuperSelectCascader', {
   label: '级联选择',
@@ -1610,7 +1668,8 @@ defineField('SuperSelectCascader', {
   hasOptions: true,
   hasOnlyLastLevel: true,
   optionsAllowChildren: true,
-  optionsAllowDescription: true
+  optionsAllowDescription: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('SelectFunction', {
   label: '职能选择',
@@ -1621,7 +1680,8 @@ defineField('SelectFunction', {
     allowClear: true
   },
   isSuperSelect: true,
-  hasBuiltinData: true
+  hasBuiltinData: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('SelectIndustry', {
   label: '行业选择',
@@ -1632,7 +1692,8 @@ defineField('SelectIndustry', {
     allowClear: true
   },
   isSuperSelect: true,
-  hasBuiltinData: true
+  hasBuiltinData: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('SelectAddress', {
   label: '地址选择',
@@ -1643,14 +1704,18 @@ defineField('SelectAddress', {
     allowClear: true
   },
   isSuperSelect: true,
-  hasBuiltinData: true
+  hasBuiltinData: true,
+  valueSchema: superSelectValueSchema
 });
 defineField('Switch', {
   label: '开关',
   group: '基础字段',
   component: reactFormAntd.Switch,
   defaultProps: {},
-  hasFieldProps: true
+  hasFieldProps: true,
+  valueSchema: {
+    type: 'boolean'
+  }
 });
 defineField('Checkbox', {
   label: '复选框',
@@ -1658,6 +1723,9 @@ defineField('Checkbox', {
   component: reactFormAntd.Checkbox,
   defaultProps: {
     children: ''
+  },
+  valueSchema: {
+    type: 'boolean'
   }
 });
 defineField('DatePicker', {
@@ -1672,7 +1740,17 @@ defineField('DatePicker', {
     showTime: false
   },
   hasFieldProps: true,
-  resolveComponent: props => props?.range ? reactFormAntd.DatePicker.RangePicker || reactFormAntd.DatePicker : reactFormAntd.DatePicker
+  resolveComponent: props => props?.range ? reactFormAntd.DatePicker.RangePicker || reactFormAntd.DatePicker : reactFormAntd.DatePicker,
+  valueSchema: field => field?.props?.range ? {
+    type: 'array',
+    items: {
+      type: 'string'
+    },
+    minItems: 2,
+    maxItems: 2
+  } : {
+    type: 'string'
+  }
 });
 
 /**
@@ -1687,6 +1765,7 @@ defineField('DatePicker', {
  *
  * preset({ type, definition }) 的 fields 项还可传：
  * - groupName?: string 自定义类型下拉分组名；不传则归入「扩展字段」
+ * - valueSchema?: object | (field) => object  提交值的 JSON Schema 片段；缺省回退 { type: 'string' }
  */
 const registerField = (type, definition) => {
   const propsSchema = Array.isArray(definition?.propsSchema) ? definition.propsSchema : undefined;
@@ -1766,6 +1845,50 @@ const applyFromPropsSchema = function (props, values, propsSchema) {
   });
 };
 const getFieldDefinition = type => registry.get(type);
+
+/**
+ * 解析字段提交值的 JSON Schema 片段。
+ * 优先用 definition.valueSchema（对象或 (field)=>schema）；缺省 { type: 'string' }。
+ */
+const resolveFieldValueSchema = field => {
+  if (!field || !field.type) {
+    return {
+      type: 'string'
+    };
+  }
+  const definition = registry.get(field.type);
+  const raw = definition?.valueSchema;
+  let schema;
+  if (typeof raw === 'function') {
+    schema = raw(field);
+  } else if (raw && typeof raw === 'object') {
+    schema = {
+      ...raw
+    };
+  } else {
+    schema = {
+      type: 'string'
+    };
+  }
+  if (!schema || typeof schema !== 'object') {
+    schema = {
+      type: 'string'
+    };
+  } else {
+    schema = {
+      ...schema
+    };
+  }
+  const title = field.label != null && String(field.label).trim() ? String(field.label).trim() : undefined;
+  const description = field.description != null && String(field.description).trim() ? String(field.description).trim() : undefined;
+  if (title && schema.title == null) {
+    schema.title = title;
+  }
+  if (description && schema.description == null) {
+    schema.description = description;
+  }
+  return schema;
+};
 const getFieldComponent = (type, field) => {
   const definition = registry.get(type);
   if (!definition) {
@@ -2332,6 +2455,7 @@ const BlockListPanel = _ref3 => {
   } = reactIntl.useIntl();
   const [addMenuOpen, setAddMenuOpen] = react.useState(false);
   const [addFieldMenuId, setAddFieldMenuId] = react.useState(null);
+  const keepAddFieldMenuOpenRef = react.useRef(false);
   const renderAddBlockMenu = function (options, _temp) {
     let {
       onSelect,
@@ -2394,8 +2518,19 @@ const BlockListPanel = _ref3 => {
     }
     return /*#__PURE__*/jsxRuntime.jsx(antd.Dropdown, {
       open: menuOpen,
-      onOpenChange: open => setAddFieldMenuId(open ? menuKey : null),
-      trigger: ['hover'],
+      onOpenChange: open => {
+        if (open) {
+          setAddFieldMenuId(menuKey);
+          return;
+        }
+        // 已打开时再点触发器：antd 会 toggle 关闭，这里忽略，保持展开
+        if (keepAddFieldMenuOpenRef.current) {
+          keepAddFieldMenuOpenRef.current = false;
+          return;
+        }
+        setAddFieldMenuId(null);
+      },
+      trigger: ['hover', 'click'],
       mouseEnterDelay: 0.1,
       mouseLeaveDelay: 0.15,
       getPopupContainer: trigger => trigger.parentElement || document.body,
@@ -2465,10 +2600,12 @@ const BlockListPanel = _ref3 => {
         size: "small",
         icon: /*#__PURE__*/jsxRuntime.jsx(icons.PlusOutlined, {}),
         className: btnClass,
-        onClick: () => {
-          onAddFieldClick();
-          setAddFieldMenuId(null);
+        onMouseDown: () => {
+          if (menuOpen) {
+            keepAddFieldMenuOpenRef.current = true;
+          }
         },
+        onClick: () => setAddFieldMenuId(menuKey),
         children: formatMessage({
           id: 'addField'
         })
@@ -2553,6 +2690,7 @@ const BlockListPanel = _ref3 => {
               className: style['step-section-header'],
               children: [/*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
                 size: 8,
+                wrap: true,
                 className: style['step-section-title'],
                 children: [/*#__PURE__*/jsxRuntime.jsx("span", {
                   className: style['step-index'],
@@ -2577,45 +2715,50 @@ const BlockListPanel = _ref3 => {
                     count: step.list?.length || 0
                   })
                 })]
-              }), /*#__PURE__*/jsxRuntime.jsxs(ActionGroup, {
-                children: [/*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'moveUp'
-                  }),
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowUpOutlined, {}),
-                  disabled: stepIndex === 0,
-                  onClick: () => onMoveStep(block.id, step.id, 'up')
-                }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'moveDown'
-                  }),
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowDownOutlined, {}),
-                  disabled: stepIndex === (block.items?.length || 0) - 1,
-                  onClick: () => onMoveStep(block.id, step.id, 'down')
-                }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'editStep'
+              }), /*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
+                size: 4,
+                wrap: true,
+                className: style['step-section-actions'],
+                children: [/*#__PURE__*/jsxRuntime.jsxs(ActionGroup, {
+                  children: [/*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'moveUp'
+                    }),
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowUpOutlined, {}),
+                    disabled: stepIndex === 0,
+                    onClick: () => onMoveStep(block.id, step.id, 'up')
+                  }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'moveDown'
+                    }),
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowDownOutlined, {}),
+                    disabled: stepIndex === (block.items?.length || 0) - 1,
+                    onClick: () => onMoveStep(block.id, step.id, 'down')
+                  }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'editStep'
+                    }),
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.EditOutlined, {}),
+                    onClick: () => onEditStep(block.id, step)
+                  }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'deleteStep'
+                    }),
+                    danger: true,
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.DeleteOutlined, {}),
+                    onClick: () => onDeleteStep(block.id, step.id)
+                  })]
+                }), renderAddFieldButton({
+                  menuKey: `${block.id}:${step.id}`,
+                  depth,
+                  onAddFieldClick: () => onAddField(block.id, {
+                    stepId: step.id
                   }),
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.EditOutlined, {}),
-                  onClick: () => onEditStep(block.id, step)
-                }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'deleteStep'
-                  }),
-                  danger: true,
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.DeleteOutlined, {}),
-                  onClick: () => onDeleteStep(block.id, step.id)
+                  onAddChildBlock: kind => onAddBlock(kind, {
+                    parentBlockId: block.id,
+                    stepId: step.id
+                  })
                 })]
-              }), 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, {
               stepId: step.id
@@ -2670,6 +2813,7 @@ const BlockListPanel = _ref3 => {
               className: style['step-section-header'],
               children: [/*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
                 size: 8,
+                wrap: true,
                 className: style['step-section-title'],
                 children: [/*#__PURE__*/jsxRuntime.jsx("span", {
                   className: style['step-index'],
@@ -2694,45 +2838,50 @@ const BlockListPanel = _ref3 => {
                     count: option.list?.length || 0
                   })
                 })]
-              }), /*#__PURE__*/jsxRuntime.jsxs(ActionGroup, {
-                children: [/*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'moveUp'
-                  }),
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowUpOutlined, {}),
-                  disabled: optionIndex === 0,
-                  onClick: () => onMoveChoiceOption(block.id, option.id, 'up')
-                }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'moveDown'
-                  }),
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowDownOutlined, {}),
-                  disabled: optionIndex === (block.options?.length || 0) - 1,
-                  onClick: () => onMoveChoiceOption(block.id, option.id, 'down')
-                }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'editChoiceOption'
+              }), /*#__PURE__*/jsxRuntime.jsxs(antd.Space, {
+                size: 4,
+                wrap: true,
+                className: style['step-section-actions'],
+                children: [/*#__PURE__*/jsxRuntime.jsxs(ActionGroup, {
+                  children: [/*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'moveUp'
+                    }),
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowUpOutlined, {}),
+                    disabled: optionIndex === 0,
+                    onClick: () => onMoveChoiceOption(block.id, option.id, 'up')
+                  }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'moveDown'
+                    }),
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.ArrowDownOutlined, {}),
+                    disabled: optionIndex === (block.options?.length || 0) - 1,
+                    onClick: () => onMoveChoiceOption(block.id, option.id, 'down')
+                  }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'editChoiceOption'
+                    }),
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.EditOutlined, {}),
+                    onClick: () => onEditChoiceOption(block.id, option)
+                  }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
+                    title: formatMessage({
+                      id: 'deleteChoiceOption'
+                    }),
+                    danger: true,
+                    icon: /*#__PURE__*/jsxRuntime.jsx(icons.DeleteOutlined, {}),
+                    onClick: () => onDeleteChoiceOption(block.id, option.id)
+                  })]
+                }), renderAddFieldButton({
+                  menuKey: `${block.id}:opt:${option.id}`,
+                  depth,
+                  onAddFieldClick: () => onAddField(block.id, {
+                    optionId: option.id
                   }),
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.EditOutlined, {}),
-                  onClick: () => onEditChoiceOption(block.id, option)
-                }), /*#__PURE__*/jsxRuntime.jsx(IconBtn, {
-                  title: formatMessage({
-                    id: 'deleteChoiceOption'
-                  }),
-                  danger: true,
-                  icon: /*#__PURE__*/jsxRuntime.jsx(icons.DeleteOutlined, {}),
-                  onClick: () => onDeleteChoiceOption(block.id, option.id)
+                  onAddChildBlock: kind => onAddBlock(kind, {
+                    parentBlockId: block.id,
+                    optionId: 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
@@ -4759,7 +4908,7 @@ const resolveSelectedIds = (value, mode) => {
   }
   return [String(value)];
 };
-const clearUnselectedOptionFields = (openApi, keepIds, allOptions) => {
+const clearUnselectedOptionFields = (openApi, formData, keepIds, allOptions) => {
   if (!openApi?.setFields) {
     return;
   }
@@ -4769,7 +4918,11 @@ const clearUnselectedOptionFields = (openApi, keepIds, allOptions) => {
       return;
     }
     (option.list || []).forEach(field => {
-      if (field?.name) {
+      if (!field?.name) {
+        return;
+      }
+      const current = getByPath(formData, field.name);
+      if (current !== undefined) {
         entries.push({
           name: field.name,
           value: undefined
@@ -4777,10 +4930,13 @@ const clearUnselectedOptionFields = (openApi, keepIds, allOptions) => {
       }
     });
     collectBlockFieldNames(option.blocks || []).forEach(name => {
-      entries.push({
-        name,
-        value: undefined
-      });
+      const current = getByPath(formData, name);
+      if (current !== undefined) {
+        entries.push({
+          name,
+          value: undefined
+        });
+      }
     });
   });
   if (!entries.length) {
@@ -4857,14 +5013,16 @@ const ChoiceBlock = ({
     maxLength
   } = mode === 'multiple' ? resolveSelectLimits(block) : {};
   const firstOptionId = options[0] != null ? String(options[0].id) : undefined;
+  const rawValue = getByPath(formData || {}, selectorName);
+  // 仅随 selector 值变化；勿依赖整个 formData，否则清空未选支字段会触发 options 重算 → CheckboxGroup 死循环
+  const selectorValueKey = mode === 'multiple' ? Array.isArray(rawValue) ? rawValue.map(String).join('\0') : String(rawValue ?? '') : String(rawValue ?? '');
 
   // 单选且未选时，写入第一项，保证预览/提交与选项面板一致
   react.useEffect(() => {
     if (mode !== 'single' || !firstOptionId || !openApi?.setFields) {
       return;
     }
-    const current = getByPath(formData || {}, selectorName);
-    if (current != null && current !== '') {
+    if (selectorValueKey !== '') {
       return;
     }
     openApi.setFields([{
@@ -4873,11 +5031,10 @@ const ChoiceBlock = ({
     }], {
       runValidate: false
     });
-  }, [mode, firstOptionId, selectorName, openApi, formData]);
+  }, [mode, firstOptionId, selectorName, openApi, selectorValueKey]);
+  const selectedIdsFromValue = react.useMemo(() => resolveSelectedIds(rawValue, mode), [selectorValueKey, mode]);
   const selectorOptions = react.useMemo(() => {
-    const rawValue = getByPath(formData || {}, selectorName);
-    const selectedIds = resolveSelectedIds(rawValue, mode);
-    const atMax = mode === 'multiple' && maxLength != null && selectedIds.length >= maxLength;
+    const atMax = mode === 'multiple' && maxLength != null && selectedIdsFromValue.length >= maxLength;
     return options.map((option, index) => {
       const value = String(option.id);
       return {
@@ -4887,17 +5044,16 @@ const ChoiceBlock = ({
           index: index + 1
         }) : `选项${index + 1}`),
         value,
-        disabled: atMax && !selectedIds.includes(value)
+        disabled: atMax && !selectedIdsFromValue.includes(value)
       };
     });
-  }, [options, formatMessage, formData, selectorName, mode, maxLength]);
-  const rawValue = getByPath(formData || {}, selectorName);
-  let selectedIds = resolveSelectedIds(rawValue, mode);
+  }, [options, formatMessage, selectedIdsFromValue, mode, maxLength]);
+  let selectedIds = selectedIdsFromValue;
   if (mode === 'single' && !selectedIds.length && firstOptionId) {
     selectedIds = [firstOptionId];
   }
   const activeOptions = options.filter(option => selectedIds.includes(String(option.id)));
-  const handleChange = value => {
+  const handleChange = react.useCallback(value => {
     let nextIds = resolveSelectedIds(value, mode);
     if (mode === 'multiple' && maxLength != null && nextIds.length > maxLength) {
       nextIds = nextIds.slice(0, maxLength);
@@ -4908,9 +5064,9 @@ const ChoiceBlock = ({
         runValidate: false
       });
     }
-    clearUnselectedOptionFields(openApi, nextIds, options);
-  };
-  const selectorRule = mode === 'multiple' && (minLength != null || maxLength != null) ? value => {
+    clearUnselectedOptionFields(openApi, formData, nextIds, options);
+  }, [mode, maxLength, openApi, selectorName, formData, options]);
+  const selectorRule = react.useCallback(value => {
     const ids = resolveSelectedIds(value, 'multiple');
     if (minLength != null && ids.length < minLength) {
       return {
@@ -4936,10 +5092,11 @@ const ChoiceBlock = ({
       result: true,
       errMsg: ''
     };
-  } : undefined;
+  }, [minLength, maxLength, formatMessage]);
+  const hasSelectLimitRule = mode === 'multiple' && (minLength != null || maxLength != null);
   const Selector = mode === 'multiple' ? reactFormAntd.CheckboxGroup : reactFormAntd.RadioGroup;
   const selectorProps = {
-    key: 'choice-selector',
+    key: `choice-selector-${mode}`,
     name: selectorName,
     label: titleText || (formatMessage ? formatMessage({
       id: 'choiceAreaTitle'
@@ -4947,7 +5104,7 @@ const ChoiceBlock = ({
     labelHidden: true,
     options: selectorOptions,
     onChange: handleChange,
-    ...(selectorRule ? {
+    ...(hasSelectLimitRule ? {
       rule: selectorRule
     } : {}),
     ...(mode === 'single' ? {
@@ -4956,7 +5113,10 @@ const ChoiceBlock = ({
       ...(firstOptionId ? {
         defaultValue: firstOptionId
       } : {})
-    } : {})
+    } : {
+      // CheckboxGroup 需要数组初值，避免 undefined↔[] 来回同步
+      defaultValue: []
+    })
   };
   const contentChildren = [];
   activeOptions.forEach(option => {
@@ -5970,6 +6130,300 @@ const preset = function (_temp) {
   });
 };
 
+const createObjectLayer = () => ({
+  properties: {},
+  required: [],
+  composites: []
+});
+const isReq = rule => parseRuleString(rule).presets.includes('REQ');
+const resolveChoiceSelectorName = block => {
+  if (block.selectorName != null && String(block.selectorName).trim()) {
+    return String(block.selectorName).trim();
+  }
+  if (block.discriminator?.propertyName) {
+    return String(block.discriminator.propertyName).trim();
+  }
+  return `__choice_${block.id}`;
+};
+const mergeFieldIntoLayer = function (layer, field, _temp) {
+  let {
+    allowRequired = true
+  } = _temp === void 0 ? {} : _temp;
+  if (!field?.name) {
+    return;
+  }
+  const name = String(field.name).trim();
+  if (!name) {
+    return;
+  }
+  layer.properties[name] = resolveFieldValueSchema(field);
+  if (allowRequired && isReq(field.rule) && !layer.required.includes(name)) {
+    layer.required.push(name);
+  }
+};
+const mergeFieldsIntoLayer = (layer, fields, options) => {
+  (fields || []).forEach(field => mergeFieldIntoLayer(layer, field, options));
+};
+const toFiniteInt = (value, minAllowed) => {
+  if (value == null || value === '') {
+    return undefined;
+  }
+  const num = Number(value);
+  if (!Number.isFinite(num)) {
+    return undefined;
+  }
+  const int = Math.floor(num);
+  return int < minAllowed ? minAllowed : int;
+};
+const finalizeObjectSchema = function (layer, _temp2) {
+  let {
+    title,
+    description
+  } = _temp2 === void 0 ? {} : _temp2;
+  const schema = {
+    type: 'object',
+    properties: {
+      ...layer.properties
+    }
+  };
+  if (layer.required.length) {
+    schema.required = layer.required.slice();
+  }
+  if (title) {
+    schema.title = title;
+  }
+  if (description) {
+    schema.description = description;
+  }
+  if (layer.composites.length === 1) {
+    Object.assign(schema, layer.composites[0]);
+  } else if (layer.composites.length > 1) {
+    schema.allOf = layer.composites.slice();
+  }
+  return schema;
+};
+const walkBlocks = function (blocks, layer, depth) {
+  (blocks || []).forEach(block => {
+    if (!block) {
+      return;
+    }
+    walkBlock(block, layer);
+  });
+};
+const walkBlock = function (block, layer, depth) {
+  switch (block.kind) {
+    case 'formInfo':
+      {
+        mergeFieldsIntoLayer(layer, block.list);
+        walkBlocks(block.blocks, layer);
+        return;
+      }
+    case 'object':
+      {
+        const name = block.name != null && String(block.name).trim() ? String(block.name).trim() : '';
+        if (!name) {
+          mergeFieldsIntoLayer(layer, block.list);
+          walkBlocks(block.blocks, layer);
+          return;
+        }
+        const nested = createObjectLayer();
+        mergeFieldsIntoLayer(nested, block.list);
+        walkBlocks(block.blocks, nested);
+        layer.properties[name] = finalizeObjectSchema(nested, {
+          title: block.title || undefined,
+          description: block.subtitle || undefined
+        });
+        return;
+      }
+    case 'list':
+    case 'tableList':
+      {
+        const name = block.name != null && String(block.name).trim() ? String(block.name).trim() : '';
+        if (!name) {
+          return;
+        }
+        const itemLayer = createObjectLayer();
+        mergeFieldsIntoLayer(itemLayer, block.list);
+        if (block.kind === 'list') {
+          walkBlocks(block.itemBlocks, itemLayer);
+        }
+        const items = finalizeObjectSchema(itemLayer);
+        const arraySchema = {
+          type: 'array',
+          items
+        };
+        if (block.title) {
+          arraySchema.title = block.title;
+        }
+        const minItems = toFiniteInt(block.minLength, 0);
+        const maxItems = toFiniteInt(block.maxLength, 1);
+        if (minItems != null) {
+          arraySchema.minItems = minItems;
+        }
+        if (maxItems != null) {
+          arraySchema.maxItems = maxItems;
+        }
+        layer.properties[name] = arraySchema;
+        return;
+      }
+    case 'multiField':
+      {
+        const name = block.name != null && String(block.name).trim() ? String(block.name).trim() : '';
+        if (!name) {
+          return;
+        }
+        const itemField = {
+          type: block.fieldType || 'Input',
+          label: block.label,
+          props: {}
+        };
+        const arraySchema = {
+          type: 'array',
+          items: resolveFieldValueSchema(itemField)
+        };
+        if (block.label) {
+          arraySchema.title = block.label;
+        }
+        layer.properties[name] = arraySchema;
+        return;
+      }
+    case 'steps':
+      {
+        (block.items || []).forEach(step => {
+          mergeFieldsIntoLayer(layer, step?.list);
+          walkBlocks(step?.blocks, layer);
+        });
+        return;
+      }
+    case 'choice':
+      {
+        mergeChoiceIntoLayer(layer, block);
+        return;
+      }
+    default:
+      return;
+  }
+};
+
+/**
+ * choice：single → oneOf；multiple → anyOf。
+ * 每支为 object：单选支含 selector const；多选支为该 option 字段，selector 数组放在当前层。
+ * 支内 REQ 可进 required；hidden 字段仍进入 schema。
+ */
+const mergeChoiceIntoLayer = (layer, block, depth) => {
+  const mode = block.mode === 'multiple' ? 'multiple' : 'single';
+  const selectorInData = block.selectorInData !== false;
+  const selectorName = resolveChoiceSelectorName(block);
+  const options = block.options || [];
+  const optionIds = options.map(option => String(option.id));
+  const branches = options.map((option, index) => {
+    const branch = createObjectLayer();
+    const optionTitle = option.title || `选项${index + 1}`;
+    if (selectorInData && mode === 'single') {
+      branch.properties[selectorName] = {
+        const: String(option.id),
+        title: optionTitle
+      };
+      branch.required.push(selectorName);
+    }
+    mergeFieldsIntoLayer(branch, option.list, {
+      allowRequired: true
+    });
+    walkBlocks(option.blocks, branch);
+    return finalizeObjectSchema(branch, {
+      title: optionTitle
+    });
+  });
+  if (!branches.length) {
+    if (selectorInData) {
+      if (mode === 'multiple') {
+        const selectorSchema = {
+          type: 'array',
+          items: {
+            type: 'string'
+          },
+          uniqueItems: true
+        };
+        if (block.title) {
+          selectorSchema.title = block.title;
+        }
+        const minItems = toFiniteInt(block.minLength, 0);
+        const maxItems = toFiniteInt(block.maxLength, 1);
+        if (minItems != null) {
+          selectorSchema.minItems = minItems;
+        }
+        if (maxItems != null) {
+          selectorSchema.maxItems = maxItems;
+        }
+        layer.properties[selectorName] = selectorSchema;
+      } else {
+        layer.properties[selectorName] = {
+          type: 'string',
+          title: block.title || undefined
+        };
+      }
+    }
+    return;
+  }
+  if (mode === 'multiple') {
+    if (selectorInData) {
+      const selectorSchema = {
+        type: 'array',
+        items: {
+          type: 'string',
+          ...(optionIds.length ? {
+            enum: optionIds
+          } : {})
+        },
+        uniqueItems: true
+      };
+      if (block.title) {
+        selectorSchema.title = block.title;
+      }
+      const minItems = toFiniteInt(block.minLength, 0);
+      const maxItems = toFiniteInt(block.maxLength, 1);
+      if (minItems != null) {
+        selectorSchema.minItems = minItems;
+      }
+      if (maxItems != null) {
+        selectorSchema.maxItems = maxItems;
+      }
+      layer.properties[selectorName] = selectorSchema;
+    }
+    layer.composites.push({
+      anyOf: branches
+    });
+    return;
+  }
+  layer.composites.push({
+    oneOf: branches
+  });
+};
+
+/**
+ * 将搭建 Schema 转为描述表单提交数据形状的 JSON Schema。
+ * - 内置字段：fieldRegistry.valueSchema
+ * - 扩展字段：registerField / preset 的 valueSchema；缺省 { type: 'string' }
+ * - hidden 字段仍进入 data schema（可提交）
+ * - choice：single → oneOf，multiple → anyOf
+ */
+const schemaToDataSchema = function (schema, options) {
+  if (options === void 0) {
+    options = {};
+  }
+  const normalized = normalizeSchema(schema || {});
+  const layer = createObjectLayer();
+  walkBlocks(normalized.blocks, layer);
+  const root = finalizeObjectSchema(layer, {
+    title: normalized.title || undefined,
+    description: options.description
+  });
+  if (options.$schema) {
+    root.$schema = options.$schema;
+  }
+  return root;
+};
+
 exports.FormCreator = FormCreator$1;
 exports.MAX_BLOCK_DEPTH = MAX_BLOCK_DEPTH;
 exports.RULE_LEN_PRESET = RULE_LEN_PRESET;
@@ -6014,5 +6468,7 @@ exports.pickFieldProps = pickFieldProps;
 exports.pickFromPropsSchema = pickFromPropsSchema;
 exports.preset = preset;
 exports.removeBlockInTree = removeBlockInTree;
+exports.resolveFieldValueSchema = resolveFieldValueSchema;
+exports.schemaToDataSchema = schemaToDataSchema;
 exports.updateBlocks = updateBlocks;
 //# sourceMappingURL=index.js.map