@kne/form-creator 0.1.18 → 0.1.20

package/dist/index.modern.js

@@ -14,10 +14,10 @@ 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 { ButtonFooter } from '@kne/button-group';
-import InfoPage, { Content } from '@kne/info-page';
+import InfoPage from '@kne/info-page';
 import { createWithRemoteLoader } from '@kne/remote-loader';
 
-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","panel-toolbar-extra":"kne-form-creator_O22ZM","schema-content":"kne-form-creator_9bWOD","schema-content-file-list":"kne-form-creator_UGdXA","schema-content-file":"kne-form-creator_75EtE","schema-content-file-image":"kne-form-creator_P-be6","schema-content-file-name":"kne-form-creator_NXpTS","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"};
+var style = {"kne-responsive-boundary":"kne-form-creator_gh14z","kne-responsive-scroll":"kne-form-creator_Kfn6L","option-group-stack":"kne-form-creator_TgBT-","form-info-show-index":"kne-form-creator_rqCos","field-label-index":"kne-form-creator_MLY0O","field-label-main":"kne-form-creator_UOUb4","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","panel-toolbar-extra":"kne-form-creator_O22ZM","schema-content":"kne-form-creator_9bWOD","schema-content-fields":"kne-form-creator_EmRDV","schema-content-field":"kne-form-creator_0Lanz","schema-content-field-block":"kne-form-creator_TQd-w","schema-content-field-label":"kne-form-creator_czEK3","schema-content-field-value":"kne-form-creator_YFKTK","schema-content-file-list":"kne-form-creator_UGdXA","schema-content-file":"kne-form-creator_75EtE","schema-content-file-image":"kne-form-creator_P-be6","schema-content-file-name":"kne-form-creator_NXpTS","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"};
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -102,6 +102,7 @@ const locale$1 = {
   blockNameRequired: '请填写保存用的名称',
   blockGap: '间距',
   blockBordered: '显示边框',
+  blockShowIndex: '展示题目序号',
   blockImportant: '突出显示',
   blockAddText: '添加按钮文案',
   blockAddTextPlaceholder: '例如：添加一条工作经历',
@@ -190,8 +191,8 @@ const locale$1 = {
   optionDescPlaceholder: '补充说明（可选）',
   addOption: '添加一个选项',
   builtinDataHint: '该类型自带数据，无需手动配置选项',
-  optionsEditorHint: '至少填写显示文字和对应值',
-  optionsTreeEditorHint: '点「添加子级」可挂下级选项；左侧竖线表示层级',
+  optionsEditorHint: '显示文字默认同步到对应值，可自行修改；保存时会去掉首尾空格',
+  optionsTreeEditorHint: '显示文字默认同步到对应值，可自行修改；点「添加子级」挂下级，左侧竖线表示层级',
   addChildOption: '添加子级',
   fieldColumns: '表格有哪些列',
   columnTitlePlaceholder: '列标题，例如：姓名',
@@ -243,6 +244,7 @@ const locale$1 = {
   propSwitchOffText: '关闭时显示的文字',
   propSwitchOnTextHint: '例如：开',
   propSwitchOffTextHint: '例如：关',
+  propOptionsInline: '选项单行显示',
   ruleLen: '长度限制',
   ruleLenRange: '长度范围',
   ruleLenMin: '最少字数',
@@ -326,6 +328,7 @@ const locale = {
   blockNameRequired: 'Please enter a save name',
   blockGap: 'Spacing',
   blockBordered: 'Show Border',
+  blockShowIndex: 'Show question numbers',
   blockImportant: 'Highlight',
   blockAddText: 'Add Button Label',
   blockAddTextPlaceholder: 'e.g. Add Work Experience',
@@ -414,8 +417,8 @@ const locale = {
   optionDescPlaceholder: 'Description (optional)',
   addOption: 'Add Option',
   builtinDataHint: 'This type comes with built-in data, no manual options needed',
-  optionsEditorHint: 'Enter at least the display text and value',
-  optionsTreeEditorHint: 'Use “Add Child” for nested options; the left line shows hierarchy',
+  optionsEditorHint: 'Display text syncs to value by default; you can edit value anytime. Leading/trailing spaces are trimmed on save',
+  optionsTreeEditorHint: 'Display text syncs to value by default; use “Add Child” for nesting; the left line shows hierarchy',
   addChildOption: 'Add Child',
   fieldColumns: 'Table Columns',
   columnTitlePlaceholder: 'Column title, e.g. Name',
@@ -467,6 +470,7 @@ const locale = {
   propSwitchOffText: 'Text when off',
   propSwitchOnTextHint: 'e.g. On',
   propSwitchOffTextHint: 'e.g. Off',
+  propOptionsInline: 'Options in a single row',
   ruleLen: 'Length Limit',
   ruleLenRange: 'Length Range',
   ruleLenMin: 'Min',
@@ -582,6 +586,7 @@ const createBlock = (kind, overrides = {}) => {
     gap: 24,
     bordered: false,
     important: false,
+    showIndex: false,
     name: needsName ? createDataKey(kind === 'object' ? 'obj' : 'block') : '',
     label: '',
     addText: '',
@@ -1219,6 +1224,7 @@ const blockToFormValues = block => {
     gap: (_block$gap = block.gap) != null ? _block$gap : 24,
     bordered: !!block.bordered,
     important: !!block.important,
+    showIndex: !!block.showIndex,
     name: block.name || '',
     label: block.label || '',
     addText: block.addText || '',
@@ -1243,6 +1249,7 @@ const formValuesToBlock = (values, existingBlock = {}) => {
     gap: (_values$gap = values.gap) != null ? _values$gap : 24,
     bordered: !!values.bordered,
     important: !!values.important,
+    showIndex: !!values.showIndex,
     name: values.name,
     label: values.label,
     addText: values.addText || undefined,
@@ -1647,18 +1654,22 @@ defineField('RadioGroup', {
   labelId: 'FieldTypeRadioGroup',
   component: RadioGroup,
   defaultProps: {
-    options: []
+    options: [],
+    inline: true
   },
   hasOptions: true,
+  hasFieldProps: true,
   valueSchema: stringWithEnumSchema
 });
 defineField('CheckboxGroup', {
   labelId: 'FieldTypeCheckboxGroup',
   component: CheckboxGroup,
   defaultProps: {
-    options: []
+    options: [],
+    inline: true
   },
   hasOptions: true,
+  hasFieldProps: true,
   valueSchema: field => {
     const items = {
       type: 'string'
@@ -2008,17 +2019,22 @@ const normalizeOptions = (options, {
   const columnNames = (_columns || []).map(item => item == null ? void 0 : item.name).filter(Boolean);
   return options.map(item => {
     var _item$label, _item$value, _item$description;
+    const label = String((_item$label = item == null ? void 0 : item.label) != null ? _item$label : '').trim();
+    let value = String((_item$value = item == null ? void 0 : item.value) != null ? _item$value : '').trim();
+    if (!value && label) {
+      value = label;
+    }
     const next = {
-      label: (_item$label = item == null ? void 0 : item.label) != null ? _item$label : '',
-      value: (_item$value = item == null ? void 0 : item.value) != null ? _item$value : '',
-      description: (_item$description = item == null ? void 0 : item.description) != null ? _item$description : ''
+      label,
+      value,
+      description: String((_item$description = item == null ? void 0 : item.description) != null ? _item$description : '').trim()
     };
     columnNames.forEach(name => {
       var _item$name;
       next[name] = (_item$name = item == null ? void 0 : item[name]) != null ? _item$name : '';
     });
     if (!String(next.label).trim() && columnNames[0] && String(next[columnNames[0]] || '').trim()) {
-      next.label = String(next[columnNames[0]]);
+      next.label = String(next[columnNames[0]]).trim();
     }
     if (!String(next.value).trim() && String(next.label).trim()) {
       next.value = next.label;
@@ -2173,6 +2189,11 @@ const pickFieldProps = (field, definition) => {
         checkedChildren: props.checkedChildren || '',
         unCheckedChildren: props.unCheckedChildren || ''
       };
+    case 'RadioGroup':
+    case 'CheckboxGroup':
+      return {
+        inline: props.inline !== false
+      };
     default:
       if (definition != null && (_definition$propsSche = definition.propsSchema) != null && _definition$propsSche.length) {
         return pickFromPropsSchema(props, definition.propsSchema, definition.defaultProps || {});
@@ -2240,6 +2261,11 @@ const applyFieldProps = (props, values, definition) => {
       setOptionalString(props, 'checkedChildren', values.checkedChildren);
       setOptionalString(props, 'unCheckedChildren', values.unCheckedChildren);
       break;
+    case 'RadioGroup':
+    case 'CheckboxGroup':
+      // 始终落盘布尔值，避免 Checkbox 未勾选时字段缺失被当成默认单行
+      props.inline = values.inline !== false;
+      break;
     default:
       if (definition != null && (_definition$propsSche2 = definition.propsSchema) != null && _definition$propsSche2.length) {
         applyFromPropsSchema(props, values, definition.propsSchema);
@@ -3161,7 +3187,12 @@ const BlockConfigFields = ({
       children: formatMessage({
         id: 'blockBordered'
       })
-    }, "bordered"), kind === 'list' ? /*#__PURE__*/jsx(Checkbox, {
+    }, "bordered"), kind === 'formInfo' ? /*#__PURE__*/jsx(Checkbox, {
+      name: "showIndex",
+      children: formatMessage({
+        id: 'blockShowIndex'
+      })
+    }, "showIndex") : null, kind === 'list' ? /*#__PURE__*/jsx(Checkbox, {
       name: "important",
       children: formatMessage({
         id: 'blockImportant'
@@ -3244,20 +3275,26 @@ const BlockConfigFields = ({
         var _openApi$data2;
         return (openApi == null || (_openApi$data2 = openApi.data) == null ? void 0 : _openApi$data2.mode) === 'multiple';
       }
-    }, "maxLength"), /*#__PURE__*/jsx(Input, {
+    }, "maxLength"), /*#__PURE__*/jsx(Checkbox, {
+      name: "selectorInData",
+      children: formatMessage({
+        id: 'choiceSelectorInData'
+      })
+    }, "selectorInData"), /*#__PURE__*/jsx(Input, {
       name: "selectorName",
       label: formatMessage({
         id: 'choiceSelectorName'
       }),
       placeholder: formatMessage({
         id: 'choiceSelectorNamePlaceholder'
-      })
-    }, "selectorName"), /*#__PURE__*/jsx(Checkbox, {
-      name: "selectorInData",
-      children: formatMessage({
-        id: 'choiceSelectorInData'
-      })
-    }, "selectorInData"));
+      }),
+      display: ({
+        openApi
+      }) => {
+        var _openApi$data3;
+        return (openApi == null || (_openApi$data3 = openApi.data) == null ? void 0 : _openApi$data3.selectorInData) !== false;
+      }
+    }, "selectorName"));
   }
   if (kind === 'multiField') {
     list.push(/*#__PURE__*/jsx(Input, {
@@ -3580,6 +3617,32 @@ const EMPTY_OPTION = () => ({
   label: '',
   value: ''
 });
+
+/** value 为空或仍等于当前 label 时视为联动中，改 label 会同步 value */
+const isOptionValueLinked = (label, value) => {
+  const labelText = label == null ? '' : String(label);
+  const valueText = value == null ? '' : String(value);
+  return valueText === '' || valueText === labelText;
+};
+const patchOptionLabelChange = (item, nextLabel) => {
+  const patch = {
+    label: nextLabel
+  };
+  if (isOptionValueLinked(item.label, item.value)) {
+    patch.value = nextLabel;
+  }
+  return patch;
+};
+const trimOptionLabelValue = item => {
+  var _item$label, _item$value;
+  const label = String((_item$label = item == null ? void 0 : item.label) != null ? _item$label : '').trim();
+  const rawValue = String((_item$value = item == null ? void 0 : item.value) != null ? _item$value : '').trim();
+  const linked = isOptionValueLinked(item == null ? void 0 : item.label, item == null ? void 0 : item.value) || rawValue === '' || rawValue === label;
+  return {
+    label,
+    value: linked ? label : rawValue
+  };
+};
 const createEmptyTableRow = columns => {
   const row = {
     label: '',
@@ -3623,9 +3686,8 @@ const FlatOptionRows = ({
         placeholder: formatMessage({
           id: 'optionLabelPlaceholder'
         }),
-        onChange: event => updateItem(index, {
-          label: event.target.value
-        })
+        onChange: event => updateItem(index, patchOptionLabelChange(item, event.target.value)),
+        onBlur: () => updateItem(index, trimOptionLabelValue(item))
       }), /*#__PURE__*/jsx(Input$1, {
         value: item.value,
         placeholder: formatMessage({
@@ -3633,7 +3695,13 @@ const FlatOptionRows = ({
         }),
         onChange: event => updateItem(index, {
           value: event.target.value
-        })
+        }),
+        onBlur: () => {
+          var _item$value2;
+          return updateItem(index, {
+            value: String((_item$value2 = item.value) != null ? _item$value2 : '').trim()
+          });
+        }
       }), allowDescription ? /*#__PURE__*/jsx(Input$1, {
         value: item.description || '',
         placeholder: formatMessage({
@@ -3641,7 +3709,13 @@ const FlatOptionRows = ({
         }),
         onChange: event => updateItem(index, {
           description: event.target.value
-        })
+        }),
+        onBlur: () => {
+          var _item$description;
+          return updateItem(index, {
+            description: String((_item$description = item.description) != null ? _item$description : '').trim()
+          });
+        }
       }) : null, /*#__PURE__*/jsx(Button, {
         type: "text",
         danger: true,
@@ -3714,9 +3788,8 @@ const TreeOptionNode = ({
           placeholder: formatMessage({
             id: 'optionLabelPlaceholder'
           }),
-          onChange: e => updateSelf({
-            label: e.target.value
-          })
+          onChange: e => updateSelf(patchOptionLabelChange(item, e.target.value)),
+          onBlur: () => updateSelf(trimOptionLabelValue(item))
         }), /*#__PURE__*/jsx(Input$1, {
           value: item.value,
           placeholder: formatMessage({
@@ -3724,7 +3797,13 @@ const TreeOptionNode = ({
           }),
           onChange: e => updateSelf({
             value: e.target.value
-          })
+          }),
+          onBlur: () => {
+            var _item$value3;
+            return updateSelf({
+              value: String((_item$value3 = item.value) != null ? _item$value3 : '').trim()
+            });
+          }
         }), allowDescription ? /*#__PURE__*/jsx(Input$1, {
           value: item.description || '',
           placeholder: formatMessage({
@@ -3732,7 +3811,13 @@ const TreeOptionNode = ({
           }),
           onChange: e => updateSelf({
             description: e.target.value
-          })
+          }),
+          onBlur: () => {
+            var _item$description2;
+            return updateSelf({
+              description: String((_item$description2 = item.description) != null ? _item$description2 : '').trim()
+            });
+          }
         }) : null]
       }), /*#__PURE__*/jsxs("div", {
         className: style['tree-option-actions'],
@@ -4210,7 +4295,7 @@ const SuperSelectPropsEditor = ({
 };
 var SuperSelectPropsEditor$1 = SuperSelectPropsEditor;
 
-const BUILTIN_PROP_TYPES = ['Input', 'TextArea', 'InputNumber', 'Select', 'DatePicker', 'Switch'];
+const BUILTIN_PROP_TYPES = ['Input', 'TextArea', 'InputNumber', 'Select', 'DatePicker', 'Switch', 'RadioGroup', 'CheckboxGroup'];
 const buildPropsSchemaList = (schema, formatMessage) => (schema || []).filter(item => item == null ? void 0 : item.name).map(item => {
   if (item.type === 'boolean') {
     return /*#__PURE__*/jsx(Checkbox, {
@@ -4441,6 +4526,14 @@ const buildBuiltinList = (type, formatMessage) => {
           id: 'propSwitchOffTextHint'
         })
       }, "unCheckedChildren")];
+    case 'RadioGroup':
+    case 'CheckboxGroup':
+      return [/*#__PURE__*/jsx(Checkbox, {
+        name: "inline",
+        children: formatMessage({
+          id: 'propOptionsInline'
+        })
+      }, "inline")];
     default:
       return [];
   }
@@ -5031,29 +5124,32 @@ const buildMultipleHint = (formatMessage, minLength, maxLength) => {
  * 外层用 InfoPage.Part 的 title 展示标题。
  */
 const ChoiceBlock = ({
-  block,
+  schemaBlock,
+  block: blockProp,
   preview: _preview = false,
   isMobile: _isMobile = false,
   isPartRoot: _isPartRoot = false,
   formatMessage,
   renderOptionContent
 }) => {
-  const mode = block.mode === 'multiple' ? 'multiple' : 'single';
-  const selectorName = resolveSelectorName(block);
-  const options = useMemo(() => block.options || [], [block.options]);
+  // schema 配置用 schemaBlock；兼容旧 prop 名 block（且忽略 withBlockLayout 写入的 boolean true）
+  const block = schemaBlock && typeof schemaBlock === 'object' ? schemaBlock : blockProp && typeof blockProp === 'object' ? blockProp : null;
+  const mode = (block == null ? void 0 : block.mode) === 'multiple' ? 'multiple' : 'single';
+  const selectorName = block ? resolveSelectorName(block) : '';
+  const options = useMemo(() => block && Array.isArray(block.options) ? block.options : [], [block]);
   const {
     formData,
     openApi
   } = useFormContext() || {};
-  const titleText = block.title != null ? String(block.title).trim() : '';
+  const titleText = (block == null ? void 0 : block.title) != null ? String(block.title).trim() : '';
   const title = titleText || (formatMessage ? formatMessage({
     id: 'choiceAreaTitle'
   }) : '请选择');
-  const bordered = _isMobile ? false : block.bordered || undefined;
+  const bordered = _isMobile ? false : (block == null ? void 0 : block.bordered) || undefined;
   const {
     minLength,
     maxLength
-  } = mode === 'multiple' ? resolveSelectLimits(block) : {};
+  } = mode === 'multiple' && block ? resolveSelectLimits(block) : {};
   const firstOptionId = options[0] != null ? String(options[0].id) : undefined;
   const rawValue = getByPath$1(formData || {}, selectorName);
   // 仅随 selector 值变化；勿依赖整个 formData，否则清空未选支字段会触发 options 重算 → CheckboxGroup 死循环
@@ -5176,6 +5272,9 @@ const ChoiceBlock = ({
   const modeHint = mode === 'multiple' ? buildMultipleHint(formatMessage, minLength, maxLength) : formatMessage ? formatMessage({
     id: 'choiceModeHintSingle'
   }) : '请选择其中一项';
+  if (!block) {
+    return null;
+  }
   return /*#__PURE__*/createElement(InfoPage.Part, {
     title,
     subtitle: modeHint,
@@ -5209,10 +5308,27 @@ const resolvePartRootClassName = (depth, ...extra) => {
   const names = [depth === 0 ? InfoPage.partRootClassName : null, ...extra].filter(Boolean);
   return names.length ? names.join(' ') : undefined;
 };
+const buildFieldLabel = field => {
+  const base = (field == null ? void 0 : field.label) != null && String(field.label).trim() ? String(field.label).trim() : (field == null ? void 0 : field.name) || '';
+  return base || undefined;
+};
+const buildIndexedLabelRender = index => {
+  return ({
+    label
+  }) => {
+    const text = label != null ? String(label).replace(/\u200b/g, '') : '';
+    return /*#__PURE__*/createElement(Fragment, null, /*#__PURE__*/createElement('span', {
+      className: style['field-label-index']
+    }, `${index + 1}.`), text ? /*#__PURE__*/createElement('span', {
+      className: style['field-label-main']
+    }, text) : null);
+  };
+};
 const renderFieldElements = (fields = [], preview = false, {
   namePrefix,
-  locale
-} = {}) => fields.filter(field => !field.hidden).map(field => {
+  locale,
+  showIndex: _showIndex = false
+} = {}) => fields.filter(field => !field.hidden).map((field, index) => {
   var _props$options;
   const Component = getFieldComponent(field.type, field);
   if (!Component) {
@@ -5227,16 +5343,32 @@ const renderFieldElements = (fields = [], preview = false, {
     delete props.placeholder;
   }
   delete props.range;
+
+  // Radio/Checkbox 选项布局：inline=false 纵向；Radio 用 antd vertical，Checkbox 用样式兜底
+  if (field.type === 'RadioGroup' || field.type === 'CheckboxGroup') {
+    const optionsInline = props.inline !== false;
+    delete props.inline;
+    if (!optionsInline) {
+      if (field.type === 'RadioGroup') {
+        props.vertical = true;
+      }
+      props.className = [props.className, style['option-group-stack']].filter(Boolean).join(' ');
+    }
+  }
   const description = field.description != null && String(field.description).trim() ? field.description : undefined;
   const fieldName = namePrefix && field.name ? `${namePrefix}.${field.name}` : field.name;
   // 显式传 locale，避免 Global 仍为 zh-CN 时 react-form-antd withLocale 盖掉父级英文
   const localeProps = locale ? {
     locale
   } : {};
+  const label = buildFieldLabel(field);
   return /*#__PURE__*/createElement(Component, _extends({
     key: field.id,
     name: fieldName,
-    label: field.label,
+    label: _showIndex ? label || '\u200b' : label
+  }, _showIndex ? {
+    labelRender: buildIndexedLabelRender(index)
+  } : null, {
     rule: field.rule || undefined,
     block: field.block || undefined
   }, props, localeProps, {
@@ -5245,9 +5377,14 @@ const renderFieldElements = (fields = [], preview = false, {
   }));
 }).filter(Boolean);
 const withBlockLayout = (element, forceBlock) => {
+  var _element$props;
   if (!element || !forceBlock) {
     return element;
   }
+  // FormInfo / List 等用 block 表示整行占位；勿覆盖 ChoiceBlock 的 schemaBlock
+  if (element.type === ChoiceBlock$1 || (_element$props = element.props) != null && _element$props.schemaBlock) {
+    return element;
+  }
   return /*#__PURE__*/createElement(element.type, _extends({}, element.props, {
     key: element.key,
     block: true
@@ -5302,7 +5439,10 @@ const renderBlockElement = (block, preview = false, ctx = {}) => {
   switch (block.kind) {
     case 'formInfo':
       {
-        const fields = renderFieldElements(block.list, preview, fieldRenderOpts);
+        const showIndex = !!block.showIndex;
+        const fields = renderFieldElements(block.list, preview, _extends({}, fieldRenderOpts, {
+          showIndex
+        }));
         const nested = renderChildBlocks(block.blocks || [], nextCtx).map(node => withBlockLayout(node, true));
         return withBlockLayout(/*#__PURE__*/createElement(FormInfo, _extends({
           key: block.id,
@@ -5313,7 +5453,7 @@ const renderBlockElement = (block, preview = false, ctx = {}) => {
           bordered,
           list: [...fields, ...nested]
         }, listItemPartProps || {}, {
-          className: resolvePartRootClassName(depth)
+          className: resolvePartRootClassName(depth, showIndex ? style['form-info-show-index'] : null)
         })), asListItem);
       }
     case 'object':
@@ -5434,7 +5574,7 @@ const renderBlockElement = (block, preview = false, ctx = {}) => {
     case 'choice':
       return withBlockLayout(/*#__PURE__*/createElement(ChoiceBlock$1, {
         key: block.id,
-        block,
+        schemaBlock: block,
         preview,
         isMobile,
         isPartRoot: depth === 0,
@@ -6985,18 +7125,42 @@ const resolveChoiceSelectorName = block => {
 const formatFieldValue = (field, value, formatMessage) => formatFieldDisplayValue(field, value, {
   formatMessage
 });
-const renderFieldsContent = (fields, data, formatMessage, column) => {
-  const list = (fields || []).filter(field => field && !field.hidden && field.name).map(field => ({
-    label: field.label || field.name,
-    content: formatFieldValue(field, getByPath(data, field.name), formatMessage),
-    block: field.block || undefined
-  }));
+
+/**
+ * 问卷题干往往很长：不用 InfoPage Content 的横向 label 列宽对齐（minWidth），
+ * 改为 label 在上、值在下，避免窄栏（如弹窗双栏预览）被撑乱。
+ */
+const renderFieldsContent = (fields, data, formatMessage, column, {
+  showIndex: _showIndex = false
+} = {}) => {
+  const list = (fields || []).filter(field => field && !field.hidden && field.name).map((field, index) => {
+    const baseLabel = field.label || field.name;
+    const label = _showIndex ? `${index + 1}. ${baseLabel}` : baseLabel;
+    return {
+      label,
+      content: formatFieldValue(field, getByPath(data, field.name), formatMessage),
+      block: field.block === true
+    };
+  });
   if (!list.length) {
     return null;
   }
-  return /*#__PURE__*/jsx(Content, {
-    col: column || 2,
-    list: list
+  const cols = Math.max(1, Number(column) || 2);
+  return /*#__PURE__*/jsx("div", {
+    className: style['schema-content-fields'],
+    style: {
+      '--schema-content-cols': cols
+    },
+    children: list.map((item, index) => /*#__PURE__*/jsxs("div", {
+      className: [style['schema-content-field'], item.block ? style['schema-content-field-block'] : null].filter(Boolean).join(' '),
+      children: [item.label ? /*#__PURE__*/jsxs("div", {
+        className: style['schema-content-field-label'],
+        children: [item.label, "\uFF1A"]
+      }) : null, /*#__PURE__*/jsx("div", {
+        className: style['schema-content-field-value'],
+        children: item.content
+      })]
+    }, index))
   });
 };
 const renderBlockList = (blocks, data, ctx) => (blocks || []).map(block => renderBlock(block, data, ctx)).filter(Boolean);
@@ -7024,7 +7188,9 @@ const renderBlock = (block, data, ctx) => {
     case 'formInfo':
       {
         return /*#__PURE__*/jsxs(InfoPage.Part, _extends({}, partProps, {
-          children: [renderFieldsContent(block.list, data, formatMessage, block.column), renderBlockList(block.blocks, data, nextCtx)]
+          children: [renderFieldsContent(block.list, data, formatMessage, block.column, {
+            showIndex: !!block.showIndex
+          }), renderBlockList(block.blocks, data, nextCtx)]
         }));
       }
     case 'object':
@@ -7066,13 +7232,21 @@ const renderBlock = (block, data, ctx) => {
         };
         const content = Array.isArray(values) ? values.map(item => formatFieldValue(itemField, item, formatMessage)).join('、') : formatFieldValue(itemField, values, formatMessage);
         return /*#__PURE__*/jsx(InfoPage.Part, _extends({}, partProps, {
-          children: /*#__PURE__*/jsx(Content, {
-            col: 1,
-            list: [{
-              label: block.label || block.name,
-              content,
-              block: true
-            }]
+          children: /*#__PURE__*/jsx("div", {
+            className: style['schema-content-fields'],
+            style: {
+              '--schema-content-cols': 1
+            },
+            children: /*#__PURE__*/jsxs("div", {
+              className: [style['schema-content-field'], style['schema-content-field-block']].join(' '),
+              children: [block.label || block.name ? /*#__PURE__*/jsx("div", {
+                className: style['schema-content-field-label'],
+                children: (block.label || block.name) + '：'
+              }) : null, /*#__PURE__*/jsx("div", {
+                className: style['schema-content-field-value'],
+                children: content
+              })]
+            })
           })
         }));
       }