diff --git a/code/fms/fms-vue/src/components/fms-file/FileCard.vue b/code/fms/fms-vue/src/components/fms-file/FileCard.vue
index d844b745..492b7713 100644
--- a/code/fms/fms-vue/src/components/fms-file/FileCard.vue
+++ b/code/fms/fms-vue/src/components/fms-file/FileCard.vue
@@ -182,9 +182,9 @@ function onMoreClick(info) {
     height: 32px;
     margin: 0;
     padding: 0;
-    /* 底部三个操作按钮必须是等宽 flex 子项：在 flex-basis: 0% 下浏览器按
-       内容盒均分剩余空间，任何一方额外的 padding / border 都会让其 border-box
-       更宽。故这里与 .popover-trigger 统一 padding:0 + border:none，
+    /* 底部三个操作按钮（含「更多」Dropdown 零包裹后的 Button）必须是等宽 flex 子项：
+       在 flex-basis: 0% 下浏览器按内容盒均分剩余空间，任何一方额外的 padding / border
+       都会让其 border-box 更宽。故统一 padding:0 + border:none，
        让三个按钮 border-box 完全相等 */
     border: none;
     border-radius: 0;
@@ -219,22 +219,6 @@ function onMoreClick(info) {
     }
   }
 
-  /* 「更多」按钮被 Dropdown 包裹：Popover 的 .popover-trigger 才是 flex 子项，
-     必须让它与两个直接按钮一样 flex:1 且 padding/border 保持一致，
-     三个操作按钮宽度才会一致 */
-  :deep(.popover-trigger) {
-    flex: 1;
-    min-width: 0;
-    display: flex;
-    justify-self: auto;
-    box-sizing: border-box;
-    padding: 0;
-    border: none;
-
-    .button {
-      width: 100%;
-    }
-  }
 }
 
 /* 操作栏按钮间的竖向分隔线：独立元素，不依赖按钮类名 / 禁用态，
diff --git a/code/fms/fms-vue/src/components/fms-table/FmsTable.vue b/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
index 8500cb07..6264eb36 100644
--- a/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
+++ b/code/fms/fms-vue/src/components/fms-table/FmsTable.vue
@@ -11,6 +11,8 @@ const props = defineProps({
   virtual: { type: Boolean, default: true },
   virtualX: { type: Boolean, default: true },
   colResizable: { type: Boolean, default: true },
+  // 边框自绘：true=外框圆角描边+行分隔线（默认）；false=无外框仅行分隔线（嵌入卡片场景）。
+  // stk-table 库内边框恒为 false，不用其渐变边框。
   bordered: { type: [Boolean, String], default: true },
   noDataFull: { type: Boolean, default: true },
   showOverflow: { type: Boolean, default: true },
@@ -37,6 +39,9 @@ const props = defineProps({
     default: undefined,
     validator: (value) => value === 'light' || value === 'dark',
   },
+  // 行高：唯一真源，同时驱动虚拟滚动计算与库注入的 --row-height 等 CSS 变量，外部勿用 CSS 覆盖
+  rowHeight: { type: Number, default: 34 },
+  headerRowHeight: { type: Number, default: 40 },
 })
 
 const emit = defineEmits(['update:columns', 'change', 'row-order-change'])
@@ -185,6 +190,7 @@ function rebindActiveEditingRow(rows) {
   state.value = {
     editing: true,
     focusCol: previousState.focusCol,
+    focused: previousState.focused,
     initialValues: captureEditableValues(replacement),
   }
 }
@@ -203,12 +209,15 @@ function activateEditing(row, focusCol) {
       focusCol,
       initialValues: captureEditableValues(row),
     }
+    pendingFocusKey = String(getRowKey(row))
     return
   }
 
   const current = state.value
   if (current.editing && current.focusCol === focusCol) return
   state.value = { ...current, editing: true, focusCol }
+  // 同行切换列：编辑器会因 focusCol 变化重挂载，标记待聚焦以恢复焦点+全选
+  pendingFocusKey = String(getRowKey(row))
 }
 
 function editorValuesEqual(col, previous, current) {
@@ -218,11 +227,29 @@ function editorValuesEqual(col, previous, current) {
   return String(previous ?? '') === String(current ?? '')
 }
 
-const selectOnFocus = ref(true)
+// 最近激活、等待编辑器挂载后聚焦的行 key。用于区分「用户激活单元格（点击/键盘/程序化）」
+// 与「数据变更引发的重挂载」：前者需要自动聚焦+全选，后者不应聚焦——否则失焦引发的
+// 重渲染会把焦点抢回来（表现为离开单元格时高亮一闪而过）。
+let pendingFocusKey = null
 const editingCtx = {
   isEditing: (row) => props.editable && getRowEditingState(row)?.value.editing,
   shouldFocus: (row, col) => getRowEditingState(row)?.value.focusCol === col.dataIndex,
-  shouldSelectOnFocus: selectOnFocus,
+  // 焦点恢复判定依据：重渲染前该行编辑器是否持有焦点（blur 时已置 false）
+  wasFocused: (row) => Boolean(getRowEditingState(row)?.value.focused),
+  consumePendingFocus: (row) => {
+    if (pendingFocusKey == null) return false
+    if (pendingFocusKey !== String(getRowKey(row))) return false
+    pendingFocusKey = null
+    return true
+  },
+  onEditorFocus: (row) => {
+    const state = getRowEditingState(row)
+    if (state?.value) state.value = { ...state.value, focused: true }
+  },
+  onEditorBlur: (row) => {
+    const state = getRowEditingState(row)
+    if (state?.value) state.value = { ...state.value, focused: false }
+  },
   shouldNotify: (row, col, newValue) => {
     const values = getRowEditingState(row)?.value.initialValues
     if (!values?.has(col.dataIndex)) return true
@@ -429,14 +456,11 @@ function onWholeRowDragEnd() {
   wholeRowDragSource.value = -1
 }
 
-// 行高同时作为 CSS 变量与 StkTable 的 row-height / header-row-height
-const rowHeight = 34
-const headerRowHeight = 40
+// 行高/表头行高通过 prop 传给 StkTable：库内部会将其注入为滚动容器上的
+// --row-height / --header-row-height / --footer-row-height，并参与虚拟滚动计算，
+// 此处只补充库不管理的表头/表尾背景色。
 const customVars = {
-  '--header-row-height': `${headerRowHeight}px`,
-  '--row-height': `${rowHeight}px`,
-  '--footer-row-height': '36px',
-  '--th-bgc': 'var(--fms-card)',
+  '--th-bgc': 'var(--fms-table-header-bg)',
   '--tf-bgc': 'var(--fms-background)',
 }
 
@@ -456,7 +480,7 @@ async function scrollToRow(rowKey) {
   if (!table) return
   const idx = props.dataSource.findIndex((row) => String(getRowKey(row)) === String(rowKey))
   if (idx < 0) return
-  table.scrollTo(idx * rowHeight, null)
+  table.scrollTo(idx * props.rowHeight, null)
 }
 
 // 新增行等程序化场景使用：滚动到目标行，并让该行立即进入编辑状态。
@@ -603,20 +627,11 @@ function handleAreaSelectionChange(ranges) {
     return
   }
 
-  // 非键盘导航（鼠标点击等）：立即激活。
-  // 同一行已编辑时仍更新 focusCol（保证焦点切换到新列），
-  // 但暂时禁用 select 全选（避免鼠标点击触发全选文本）。
+  // 非键盘导航（鼠标点击等）：立即激活。同行切换列时编辑器重挂载并恢复焦点+全选
+  // （直接输入即替换整格内容）；点击已聚焦编辑器内部则由原生行为定位光标。
   pendingEditingTarget = null
   clearEditActivateTimer()
-  if (activeEditingRow === row) {
-    selectOnFocus.value = false
-    activateEditing(row, focusCol)
-    nextTick(() => {
-      selectOnFocus.value = true
-    })
-  } else {
-    activateEditing(row, focusCol)
-  }
+  activateEditing(row, focusCol)
   lastEditActivateAt = performance.now()
 }
 
@@ -675,7 +690,10 @@ defineExpose({
   <div
     ref="rootRef"
     class="fms-table"
-    :class="{ 'is-whole-row-drag': rowDraggable && !rowDragHandle }"
+    :class="[
+      { 'is-whole-row-drag': rowDraggable && !rowDragHandle },
+      bordered ? 'fms-table--bordered' : '',
+    ]"
     @keydown.capture="handleKeydownCapture"
     @dragstart="onWholeRowDragStart"
     @dragover="onWholeRowDragOver"
@@ -688,8 +706,8 @@ defineExpose({
       v-bind="$attrs"
       :style="customVars"
       :theme="tableTheme"
-      :row-height="rowHeight"
-      :header-row-height="headerRowHeight"
+      :row-height="props.rowHeight"
+      :header-row-height="props.headerRowHeight"
       :virtual="effectiveVirtual"
       :virtual-x="virtualX"
       :smooth-scroll="true"
@@ -728,9 +746,14 @@ defineExpose({
 .fms-table {
   width: 100%;
   height: 100%;
-  border: 1px solid var(--fms-border);
-  border-radius: 8px;
   overflow: hidden;
+
+  /* 自绘外框：描边沿圆弧走，四角闭合（库内边框恒 false，渐变线不参与）。
+     false 时不描边，嵌入卡片内只留行分隔线 */
+  &.fms-table--bordered {
+    border: 1px solid var(--fms-border);
+    border-radius: 8px;
+  }
 }
 
 /* 整行拖拽：数据行鼠标提示可拖拽；拖拽中的行半透明、落点高亮 */
@@ -769,28 +792,14 @@ defineExpose({
   }
 }
 
-/*
- * 边框由纯 CSS solid border 实现（不用 stk-table 的渐变），彻底避免渐变叠加和粗细不一致问题。
- * stk-table bordered=false — 不做任何边框绘制。
- * 外层 .fms-table div — 圆角外框（border）。
- * 单元格 border-bottom — 行列间的横线。
- * 最后一行 tbody tr — 去掉 border-bottom（避免与 div bottom border 重叠）。
- */
+/* 自绘行分隔线（库 bordered=false 时不画任何边框）：
+   单元格只画 border-bottom，外框（含四角圆弧描边）由外层 .fms-table--bordered 统一承担，
+   避免库渐变线叠加与最后一行/外框的双线问题 */
 .fms-table__inner.stk-table {
   th,
   td {
     border-bottom: 1px solid var(--fms-border);
   }
-
-  // 表头底部用稍粗的线或同色线均可，这里保持一致
-  thead th {
-    border-bottom-color: var(--fms-border);
-  }
-
-  // 最后一行不画底线，由外层 div 的 border-bottom 统一表现
-  .stk-tbody-main tr:last-child td {
-    border-bottom: none;
-  }
 }
 
 .fms-checkbox {
@@ -867,7 +876,7 @@ defineExpose({
 
 .fms-cell-editor {
   width: 100%;
-  height: calc(100% - 4px);
+  height: 100%;
   min-width: 0;
   font-size: 13px;
 }
@@ -879,6 +888,8 @@ defineExpose({
     width: 100%;
     height: 100%;
     min-height: 0;
+    // input-wrapper 默认 content-box，height:100% 再加边框会溢出单元格，改边框盒
+    box-sizing: border-box;
   }
 
   .fms-cell-editor-root .select-trigger {
@@ -907,8 +918,14 @@ defineExpose({
   white-space: nowrap;
 }
 
+// 编辑器所在 td 需要确定高度，否则非虚拟模式下（≤100 行，库不给 td 定高，
+// 只有 tr 有 height）子元素 height:100% 无法解析，Input 会塌成内容高度（约 20px）
+.fms-table__inner.stk-table .stk-tbody-main td:has(> .fms-cell-editor-root) {
+  height: var(--row-height);
+}
+
 .fms-table__inner td:has(> .fms-cell-editor-root) {
-  padding-inline: 3px;
+  padding: 3px;
 }
 
 // actions 列按钮容器
diff --git a/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js b/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
index 558cfc9b..aeae57c6 100644
--- a/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
+++ b/code/fms/fms-vue/src/components/fms-table/utils/createEditableCellRenderer.js
@@ -78,11 +78,17 @@ function isEditorDisabled(editor, row) {
 function createFocusHandler(ctx, row, col, selectText = false) {
   return ({ component, el }) => {
     if (!ctx.shouldFocus(row, col)) return
+    // 仅两类场景聚焦：用户刚激活该单元格（consumePendingFocus 一次性），
+    // 或重渲染前本编辑器就持有焦点（wasFocused，数据回灌重挂载后恢复焦点）。
+    // 其余重挂载不聚焦，避免失焦引发的更新把焦点抢回来。
+    const pending = ctx.consumePendingFocus?.(row)
+    const wasFocused = Boolean(ctx.wasFocused?.(row))
+    if (!pending && !wasFocused) return
     const input = el?.matches?.('input') ? el : el?.querySelector?.('input')
     if (document.activeElement === input) return
 
     const instance = component?.exposed || component?.proxy
-    const shouldSelect = selectText && (ctx.shouldSelectOnFocus?.value ?? true)
+    const shouldSelect = selectText && (pending || wasFocused)
     const opts = shouldSelect ? { cursor: 'all', preventScroll: true } : { preventScroll: true }
     if (instance?.focus) {
       instance.focus(opts)
@@ -104,7 +110,9 @@ function createInput(row, col, editor, ctx) {
     'onUpdate:modelValue': (value) => {
       setInputDraft(row, col.dataIndex, value)
     },
+    onFocus: () => ctx.onEditorFocus?.(row),
     onBlur: (event) => {
+      ctx.onEditorBlur?.(row)
       const value = event.target.value
       commitInputDraft(row, col.dataIndex, value)
       notifyChange(ctx, editor, row, col, value)
diff --git a/code/fms/fms-vue/src/components/ui/button/index.scss b/code/fms/fms-vue/src/components/ui/button/index.scss
index 11e0a568..6d99bb9a 100644
--- a/code/fms/fms-vue/src/components/ui/button/index.scss
+++ b/code/fms/fms-vue/src/components/ui/button/index.scss
@@ -9,6 +9,8 @@
   :deep(svg) {
     width: 1em;
     height: 1em;
+    /* 补偿光学视觉差：图标十字视觉重心偏高，微调下移与中文字形对齐 */
+    margin-top: 1px;
   }
   padding: 0 var(--fms-control-padding-x);
   font-size: var(--fms-font-size);
@@ -21,12 +23,7 @@
   transition:
     background-color 150ms ease,
     border-color 150ms ease,
-    color 150ms ease,
-    transform 150ms ease;
-}
-
-.button:active {
-  transform: scale(0.97);
+    color 150ms ease;
 }
 
 .button:focus-visible {
diff --git a/code/fms/fms-vue/src/components/ui/date/date-picker.vue b/code/fms/fms-vue/src/components/ui/date/date-picker.vue
index 01d9722a..c4811aa5 100644
--- a/code/fms/fms-vue/src/components/ui/date/date-picker.vue
+++ b/code/fms/fms-vue/src/components/ui/date/date-picker.vue
@@ -139,6 +139,7 @@ watch(pickerConfig, () => {
       :offset="8"
       :disabled="disabled"
       :follow-trigger-width="true"
+      unwrapped
     >
       <template #trigger>
         <div class="fms-date-trigger" @click="toggle">
diff --git a/code/fms/fms-vue/src/components/ui/date/index.scss b/code/fms/fms-vue/src/components/ui/date/index.scss
index 05f0f7e5..0904e443 100644
--- a/code/fms/fms-vue/src/components/ui/date/index.scss
+++ b/code/fms/fms-vue/src/components/ui/date/index.scss
@@ -10,12 +10,6 @@
   /* 窄容器下保持日历可读（7 列日期格子约 31px），
      浮层跟随触发器宽度，视觉统一不受影响 */
   min-width: 240px;
-
-  /* 让触发器撑满组件宽度（覆盖 popover 默认 inline-flex） */
-  .popover-trigger {
-    display: block;
-    width: 100%;
-  }
 }
 
 /* ---------- 触发器（类 Input 外观） ---------- */
@@ -24,7 +18,9 @@
   display: flex;
   align-items: center;
   gap: 6px;
-  height: var(--fms-control-height);
+  /* min-height 而非 height：与 Input/Select 一致，内容不足时撑到控件高度，
+     被放进更矮的容器（如表格编辑单元格）时可被 min-height:0 压缩 */
+  min-height: var(--fms-control-height);
   padding: 0 var(--fms-control-padding-x);
   border: 1px solid var(--fms-border);
   border-radius: var(--fms-control-radius);
diff --git a/code/fms/fms-vue/src/components/ui/date/range-picker.vue b/code/fms/fms-vue/src/components/ui/date/range-picker.vue
index 77b256c2..5dbf863c 100644
--- a/code/fms/fms-vue/src/components/ui/date/range-picker.vue
+++ b/code/fms/fms-vue/src/components/ui/date/range-picker.vue
@@ -195,6 +195,7 @@ watch(pickerConfig, () => {
       :offset="8"
       :disabled="disabled"
       :follow-trigger-width="true"
+      unwrapped
     >
       <template #trigger>
         <div class="fms-range-trigger" @click="toggle">
diff --git a/code/fms/fms-vue/src/components/ui/demo/popover.vue b/code/fms/fms-vue/src/components/ui/demo/popover.vue
index 751782cc..81e1147a 100644
--- a/code/fms/fms-vue/src/components/ui/demo/popover.vue
+++ b/code/fms/fms-vue/src/components/ui/demo/popover.vue
@@ -6,6 +6,7 @@ import Input from '../input/input.vue'
 
 const popoverOpen = ref(false)
 const popoverKeyword = ref('')
+const popoverUserClicks = ref(0)
 const popoverPlacements = [
   'top',
   'top-start',
@@ -32,20 +33,20 @@ const popoverPlacements = [
 
     <p class="demo-label">基础用法</p>
     <div class="demo-panel">
-      <Popover trigger="click" placement="top" arrow>
+      <Popover trigger="click" placement="top" arrow unwrapped>
         <template #trigger><Button>点击打开</Button></template>
         <template #content>
           <p class="popover-demo-title">标题</p>
           <p class="popover-demo-text">这是一段浮层内容，用于说明当前操作。</p>
         </template>
       </Popover>
-      <Popover trigger="hover" placement="top" arrow>
+      <Popover trigger="hover" placement="top" arrow unwrapped>
         <template #trigger><Button type="outline">悬停打开</Button></template>
         <template #content>
           <p class="popover-demo-text">hover 触发的浮层，移入浮层内不会关闭。</p>
         </template>
       </Popover>
-      <Popover trigger="focus" placement="top" arrow>
+      <Popover trigger="focus" placement="top" arrow unwrapped>
         <template #trigger><Input /></template>
         <template #content>
           <p class="popover-demo-text">focus 触发，失焦后关闭。</p>
@@ -55,7 +56,14 @@ const popoverPlacements = [
 
     <p class="demo-label">十二方位</p>
     <div class="demo-panel popover-placement-grid">
-      <Popover v-for="p in popoverPlacements" :key="p" trigger="hover" :placement="p" arrow>
+      <Popover
+        v-for="p in popoverPlacements"
+        :key="p"
+        trigger="hover"
+        :placement="p"
+        arrow
+        unwrapped
+      >
         <template #trigger
           ><Button type="outline">{{ p }}</Button></template
         >
@@ -67,7 +75,7 @@ const popoverPlacements = [
 
     <p class="demo-label">携带表单内容</p>
     <div class="demo-panel">
-      <Popover trigger="click" placement="bottom-start">
+      <Popover trigger="click" placement="bottom-start" unwrapped>
         <template #trigger><Button>筛选</Button></template>
         <template #content>
           <div class="popover-demo-form">
@@ -80,16 +88,47 @@ const popoverPlacements = [
 
     <p class="demo-label">禁用与受控</p>
     <div class="demo-panel">
-      <Popover trigger="click" placement="top" arrow disabled>
+      <Popover trigger="click" placement="top" arrow disabled unwrapped>
         <template #trigger><Button type="outline">禁用</Button></template>
         <template #content><p class="popover-demo-text">禁用后不响应触发</p></template>
       </Popover>
-      <Popover v-model:open="popoverOpen" trigger="manual" placement="top" arrow>
+      <Popover v-model:open="popoverOpen" trigger="manual" placement="top" arrow unwrapped>
         <template #trigger><Button type="outline">manual 受控</Button></template>
         <template #content><p class="popover-demo-text">由外部状态控制开关</p></template>
       </Popover>
       <Button type="secondary" @click="popoverOpen = true">打开</Button>
       <Button type="secondary" @click="popoverOpen = false">关闭</Button>
     </div>
+
+    <p class="demo-label">零包裹模式（unwrapped）</p>
+    <div class="demo-panel">
+      <Popover trigger="click" placement="top" arrow unwrapped>
+        <template #trigger><Button>组件作触发器</Button></template>
+        <template #content>
+          <p class="popover-demo-text">事件注入到 Button 组件根元素，DOM 中无中间包裹层。</p>
+        </template>
+      </Popover>
+
+      <Popover trigger="click" placement="top" arrow unwrapped>
+        <template #trigger
+          ><Button @click="popoverUserClicks++">点击（用户 + 内部）</Button></template
+        >
+        <template #content>
+          <p class="popover-demo-text">
+            用户 @click 与内部 toggle 均触发，互不覆盖（已点击 {{ popoverUserClicks }} 次）。
+          </p>
+        </template>
+      </Popover>
+
+      <Popover trigger="click" placement="top" arrow unwrapped>
+        <template #trigger>
+          <Button type="outline">多根</Button>
+          <Button type="outline">fragment</Button>
+        </template>
+        <template #content>
+          <p class="popover-demo-text">多根插槽无法注入事件，自动回退到 span 包裹层。</p>
+        </template>
+      </Popover>
+    </div>
   </section>
 </template>
diff --git a/code/fms/fms-vue/src/components/ui/demo/segmented.vue b/code/fms/fms-vue/src/components/ui/demo/segmented.vue
new file mode 100644
index 00000000..2e081fb0
--- /dev/null
+++ b/code/fms/fms-vue/src/components/ui/demo/segmented.vue
@@ -0,0 +1,80 @@
+<script setup>
+import { ref } from 'vue'
+import { BarChart3, CalendarDays, LayoutGrid, List } from '@lucide/vue'
+import Segmented from '../segmented/segmented.vue'
+
+const period = ref('daily')
+const view = ref('list')
+const align = ref('left')
+const withIcon = ref('list')
+const blockValue = ref('list')
+const verticalValue = ref('list')
+const singleDisabled = ref('list')
+const groupDisabled = ref('list')
+
+const periodOptions = [
+  { label: '日', value: 'daily' },
+  { label: '周', value: 'weekly' },
+  { label: '月', value: 'monthly' },
+]
+
+const viewOptions = [
+  { label: '列表', value: 'list', icon: List },
+  { label: '卡片', value: 'grid', icon: LayoutGrid },
+  { label: '日历', value: 'calendar', icon: CalendarDays },
+  { label: '图表', value: 'chart', icon: BarChart3 },
+]
+
+// 省略 label 即渲染为纯图标选项
+const iconOnlyOptions = viewOptions.map((item) => ({ value: item.value, icon: item.icon }))
+const disabledOptions = [
+  ...viewOptions.slice(0, 3),
+  { label: '图表（禁用）', value: 'chart', disabled: true },
+]
+</script>
+
+<template>
+  <section class="showcase-section" aria-labelledby="segmented-title">
+    <div class="section-heading">
+      <p class="eyebrow">Components</p>
+      <h2 id="segmented-title">Segmented 分段控制器</h2>
+      <p>在一组互斥选项中切换，等价于带底座滑块的单选组，支持图标、尺寸与方向键导航。</p>
+    </div>
+
+    <p class="demo-label">基础用法（当前值：{{ period }}）</p>
+    <div class="demo-panel">
+      <Segmented v-model="period" :options="periodOptions" />
+    </div>
+
+    <p class="demo-label">带图标</p>
+    <div class="demo-panel">
+      <Segmented v-model="withIcon" :options="viewOptions" />
+    </div>
+
+    <p class="demo-label">仅图标（省略 label）</p>
+    <div class="demo-panel">
+      <Segmented v-model="view" :options="iconOnlyOptions" />
+    </div>
+
+    <p class="demo-label">全圆角</p>
+    <div class="demo-panel">
+      <Segmented v-model="align" shape="round" :options="periodOptions" />
+    </div>
+
+    <p class="demo-label">通栏（block）</p>
+    <div class="demo-panel">
+      <Segmented v-model="blockValue" block :options="viewOptions" />
+    </div>
+
+    <p class="demo-label">纵向</p>
+    <div class="demo-panel">
+      <Segmented v-model="verticalValue" vertical :options="viewOptions" />
+    </div>
+
+    <p class="demo-label">禁用态</p>
+    <div class="demo-panel demo-panel-column">
+      <Segmented v-model="singleDisabled" :options="disabledOptions" />
+      <Segmented v-model="groupDisabled" disabled :options="periodOptions" />
+    </div>
+  </section>
+</template>
diff --git a/code/fms/fms-vue/src/components/ui/dropdown/dropdown.vue b/code/fms/fms-vue/src/components/ui/dropdown/dropdown.vue
index 2ca2d389..fcad1e10 100644
--- a/code/fms/fms-vue/src/components/ui/dropdown/dropdown.vue
+++ b/code/fms/fms-vue/src/components/ui/dropdown/dropdown.vue
@@ -28,8 +28,9 @@ const props = defineProps({
   mouseLeaveDelay: { type: Number, default: 200 },
   /** 与触发器的间距（px） */
   offset: { type: Number, default: 4 },
-  /** 触发器是否撑满父容器宽度；透传给 Popover（见 Popover.stretchTrigger） */
-  stretchTrigger: { type: Boolean, default: false },
+  /** 零包裹模式（默认开启）：把事件注入到触发器单根 vnode，不再包 span；
+       布局由用户内容自己决定；多根/文本节点自动回退到 Popover 的 span 包裹层 */
+  unwrapped: { type: Boolean, default: true },
 })
 
 const emit = defineEmits(['update:open', 'openChange', 'click'])
@@ -180,7 +181,7 @@ provide('dropdownActiveIndex', activeIndex)
     :disabled="disabled"
     :arrow="false"
     :offset="offset"
-    :stretch-trigger="stretchTrigger"
+    :unwrapped="unwrapped"
     :mouse-enter-delay="mouseEnterDelay"
     :mouse-leave-delay="mouseLeaveDelay"
     @update:open="onOpenChange"
diff --git a/code/fms/fms-vue/src/components/ui/dropdown/index.scss b/code/fms/fms-vue/src/components/ui/dropdown/index.scss
index 3c9ef4e4..06ec9854 100644
--- a/code/fms/fms-vue/src/components/ui/dropdown/index.scss
+++ b/code/fms/fms-vue/src/components/ui/dropdown/index.scss
@@ -54,13 +54,6 @@
   }
 }
 
-/* 子菜单项包裹在嵌套 Popover 的 trigger 中（inline-flex 会收缩宽度），
-   改为块级填满 .dropdown-menu，保证整行可 hover / 可点击 */
-.dropdown-menu :deep(.popover-trigger) {
-  display: block;
-  width: 100%;
-}
-
 .dropdown-item:hover:not(.dropdown-item-disabled),
 .dropdown-item-active {
   background: var(--fms-secondary-hover);
diff --git a/code/fms/fms-vue/src/components/ui/dropdown/menu.vue b/code/fms/fms-vue/src/components/ui/dropdown/menu.vue
index ca445c9f..03ecbcfe 100644
--- a/code/fms/fms-vue/src/components/ui/dropdown/menu.vue
+++ b/code/fms/fms-vue/src/components/ui/dropdown/menu.vue
@@ -43,6 +43,7 @@ function onItemClick(item) {
       placement="right-start"
       :offset="0"
       :arrow="false"
+      unwrapped
     >
       <template #trigger>
         <span
diff --git a/code/fms/fms-vue/src/components/ui/form/form-item.vue b/code/fms/fms-vue/src/components/ui/form/form-item.vue
index 7b982010..888d7545 100644
--- a/code/fms/fms-vue/src/components/ui/form/form-item.vue
+++ b/code/fms/fms-vue/src/components/ui/form/form-item.vue
@@ -41,7 +41,7 @@ const rootEl = ref(null)
 /* ---------- 合并规则 ---------- */
 const mergedRules = computed(() => {
   if (Array.isArray(props.rules) && props.rules.length > 0) return props.rules
-  return form?.rules?.[props.name] || []
+  return form?.rules?.value?.[props.name] || []
 })
 
 /* ---------- 状态 ---------- */
@@ -96,7 +96,7 @@ async function runValidation() {
   const nextErrors = await validateRules({
     name: props.name,
     label: props.label,
-    value: form?.model?.[props.name],
+    value: form?.model?.value?.[props.name],
     rules: mergedRules.value,
   })
   errors.value = nextErrors
@@ -119,9 +119,14 @@ function clearValidation() {
 // change 触发：值变化即校验。watch 非 immediate，初始值不会触发报红；
 // 重置后值被父层清空时（值空且未触碰过）也跳过，避免重置即整片报红
 watch(
-  () => form?.model?.[props.name],
-  (value) => {
+  () => [form?.model?.value, form?.model?.value?.[props.name]],
+  ([model, value], [prevModel] = []) => {
     if (validateTrigger.value !== 'change') return
+    // model 对象被父级整体替换（如切换编辑目标）：视为全新表单，清除校验态，不触发报红
+    if (model !== prevModel) {
+      clearValidation()
+      return
+    }
     if (!touched.value && isEmptyValue(value)) return
     touched.value = true
     runValidation()
@@ -138,7 +143,7 @@ function onRootFocusOut(event) {
   window.clearTimeout(blurTimer)
   blurTimer = window.setTimeout(() => {
     // 首次失焦且值为空：仅标记触碰，不报错，避免打开表单即整片报红
-    if (!touched.value && isEmptyValue(form?.model?.[props.name])) {
+    if (!touched.value && isEmptyValue(form?.model?.value?.[props.name])) {
       touched.value = true
       return
     }
diff --git a/code/fms/fms-vue/src/components/ui/form/form.vue b/code/fms/fms-vue/src/components/ui/form/form.vue
index 43ba6a45..0462327f 100644
--- a/code/fms/fms-vue/src/components/ui/form/form.vue
+++ b/code/fms/fms-vue/src/components/ui/form/form.vue
@@ -95,10 +95,11 @@ function onReset(event) {
 }
 
 /* ---------- 上下文 ---------- */
-// 下发给 FormItem：简单值用 computed 包裹保证响应式，model / rules 直接传引用
+// 下发给 FormItem：model / rules 用 computed 包裹——父级可能整体替换这两个 prop 的对象
+// （如切换编辑目标、克隆草稿），provide 只执行一次，直接传引用会让 FormItem 校验读到过期对象
 provide('fms-form', {
-  model: props.model,
-  rules: props.rules,
+  model: computed(() => props.model),
+  rules: computed(() => props.rules),
   layout: computed(() => props.layout),
   labelAlign: computed(() => props.labelAlign),
   labelWidth: computed(() => props.labelWidth),
diff --git a/code/fms/fms-vue/src/components/ui/index.js b/code/fms/fms-vue/src/components/ui/index.js
index 9a73839e..1a856f1b 100644
--- a/code/fms/fms-vue/src/components/ui/index.js
+++ b/code/fms/fms-vue/src/components/ui/index.js
@@ -19,6 +19,7 @@ import Popover from './popover/popover.vue'
 import Radio from './radio/radio.vue'
 import RadioGroup from './radio/radio-group.vue'
 import Scrollbar from './scrollbar/scrollbar.vue'
+import Segmented from './segmented/segmented.vue'
 import Select from './select/select.vue'
 import Spin from './spin/spin.vue'
 import Splitter from './splitter/splitter.vue'
@@ -51,6 +52,7 @@ export {
   Radio,
   RadioGroup,
   Scrollbar,
+  Segmented,
   Select,
   Spin,
   Splitter,
diff --git a/code/fms/fms-vue/src/components/ui/input/input.vue b/code/fms/fms-vue/src/components/ui/input/input.vue
index 8853990a..eb5fb4d3 100644
--- a/code/fms/fms-vue/src/components/ui/input/input.vue
+++ b/code/fms/fms-vue/src/components/ui/input/input.vue
@@ -256,9 +256,14 @@ onMounted(() => {
   nextTick(measureDefaultTextareaHeight)
 })
 
-/* 程序化聚焦/选中文本（内联重命名等场景需要 focus + select） */
+/* 程序化聚焦/选中文本（内联重命名、表格单元格编辑等场景需要 focus + select） */
 defineExpose({
-  focus: () => inputEl.value?.focus(),
+  // opts：preventScroll 透传原生 focus；cursor: 'all' 表示聚焦后全选内容
+  focus: (opts = undefined) => {
+    const nativeOpts = opts?.preventScroll !== undefined ? { preventScroll: opts.preventScroll } : undefined
+    inputEl.value?.focus(nativeOpts)
+    if (opts?.cursor === 'all') inputEl.value?.select()
+  },
   select: () => inputEl.value?.select(),
   blur: () => inputEl.value?.blur(),
 })
diff --git a/code/fms/fms-vue/src/components/ui/popover/index.scss b/code/fms/fms-vue/src/components/ui/popover/index.scss
index 1d842360..badca63a 100644
--- a/code/fms/fms-vue/src/components/ui/popover/index.scss
+++ b/code/fms/fms-vue/src/components/ui/popover/index.scss
@@ -4,12 +4,6 @@
   justify-self: start;
 }
 
-/* 触发器撑满父容器（stretch-trigger）：结构树等需要占满整行可用宽度的场景 */
-.popover-trigger--stretch {
-  display: block;
-  width: 100%;
-}
-
 /* 在完整轮廓上统一投影，让箭头和主体拥有连续的视觉重量。 */
 .popover {
   position: fixed;
@@ -35,8 +29,8 @@
 /* 与 Antdv Next 一致：箭头是浮层轮廓的一部分，不使用独立边框或阴影。 */
 .popover-arrow {
   position: absolute;
-  width: 16px;
-  height: 16px;
+  width: 20px;
+  height: 20px;
   z-index: 1;
   display: block;
   overflow: hidden;
@@ -47,38 +41,40 @@
   position: absolute;
   inset-inline: 0;
   bottom: 0;
-  width: 16px;
-  height: 8px;
+  width: 20px;
+  height: 10px;
   background: var(--fms-card);
   clip-path: polygon(0 100%, 50% 0, 100% 100%);
 }
 
-/* 浮层在触发器上方，箭头在浮层下边，尖角朝下 */
+/* 浮层在触发器上方，箭头在浮层下边，尖角朝下。
+   位移收 20%（=4px，箭头盒高 20px）让三角形与内容块重叠：
+   同色背景连成一体，消除 drop-shadow 投影在交界处产生的分割线 */
 .popover-top .popover-arrow {
   bottom: 0;
   left: 50%;
-  transform: translateX(-50%) translateY(100%) rotate(180deg);
+  transform: translateX(-50%) translateY(80%) rotate(180deg);
 }
 
 /* 浮层在触发器下方，箭头在浮层上边，尖角朝上 */
 .popover-bottom .popover-arrow {
   top: 0;
   left: 50%;
-  transform: translateX(-50%) translateY(-100%);
+  transform: translateX(-50%) translateY(-80%);
 }
 
 /* 浮层在触发器左侧，箭头在浮层右边，尖角朝右 */
 .popover-left .popover-arrow {
   right: 0;
   top: 50%;
-  transform: translateX(100%) translateY(-50%) rotate(90deg);
+  transform: translateX(80%) translateY(-50%) rotate(90deg);
 }
 
 /* 浮层在触发器右侧，箭头在浮层左边，尖角朝左 */
 .popover-right .popover-arrow {
   left: 0;
   top: 50%;
-  transform: translateX(-100%) translateY(-50%) rotate(-90deg);
+  transform: translateX(-80%) translateY(-50%) rotate(-90deg);
 }
 
 /* start / end 对齐时，箭头从居中移到靠近触发器边缘一侧 */
@@ -98,10 +94,18 @@
   top: 16px;
 }
 
-.popover-left-end .popover-arrow,
+/* left/right-end：bottom 定位本身已把箭头放到底部，必须同时覆盖 transform
+   去掉基础的 translateY(-50%)（否则上移半个盒高会把箭头推到矮内容块的顶部） */
+.popover-left-end .popover-arrow {
+  top: auto;
+  bottom: 4px;
+  transform: translateX(80%) rotate(90deg);
+}
+
 .popover-right-end .popover-arrow {
   top: auto;
-  bottom: 16px;
+  bottom: 4px;
+  transform: translateX(-80%) rotate(-90deg);
 }
 
 /* 过渡只动 opacity / transform，低成本且支持 reduced-motion */
diff --git a/code/fms/fms-vue/src/components/ui/popover/popover.vue b/code/fms/fms-vue/src/components/ui/popover/popover.vue
index b3a3b10d..fc6cf08a 100644
--- a/code/fms/fms-vue/src/components/ui/popover/popover.vue
+++ b/code/fms/fms-vue/src/components/ui/popover/popover.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
+import { Comment, Fragment, cloneVNode, computed, nextTick, onBeforeUnmount, ref, useSlots, watch } from 'vue'
 import { PLACEMENTS, computePosition } from '../utils/position.js'
 
 /* ---------- props / emits / slots ---------- */
@@ -35,13 +35,16 @@ const props = defineProps({
   /** 浮层宽度是否严格跟随触发器宽度。
       用于 Select 等需与触发框等宽对齐的场景；默认 false 由内容自适应撑开。 */
   followTriggerWidth: { type: Boolean, default: false },
-  /** 触发器是否撑满父容器宽度（display:block + width:100%）。
-       默认 false（inline-flex 收缩到内容宽度，适配按钮/图标触发器）；
-       需要触发器占据整行可用宽度的场景（如结构树）设为 true。 */
-  stretchTrigger: { type: Boolean, default: false },
+  /** 零包裹模式：true 时把 6 个事件直接注入触发器单根 vnode（不再包 span），
+       布局规则由用户内容自己决定（block 天然撑满 / flex 跟随父级）；
+       多根 fragment / 文本节点自动回退到 span 包裹层。
+       注意：与 antdv 一致，用户触发器节点需能接受
+       mouseenter/mouseleave/focus/click 事件。 */
+  unwrapped: { type: Boolean, default: false },
 })
 
 const emit = defineEmits(['update:open', 'openChange'])
+const slots = useSlots()
 
 /* ---------- 公共状态 ---------- */
 const triggerEl = ref(null)
@@ -200,6 +203,77 @@ function onFocusOut(event) {
   setOpen(false)
 }
 
+/* ---------- 零包裹模式：事件注入 + 锚点指令 ---------- */
+// 锚点指令：把用户触发器 vnode 的根 DOM 同步到 triggerEl（定位锚点 / 外部点击
+// contains / followTriggerWidth 宽度测量三处复用，语义与包裹层 span 完全一致）。
+// 生命周期钩子驱动，无轮询；不覆盖用户自己的 ref / directives。
+const triggerRefDirective = {
+  mounted: (el) => {
+    triggerEl.value = el
+    // 受控打开 / contextmenu 已打开后重渲染的场景补一次定位
+    if (isOpen.value) nextTick(updatePosition)
+  },
+  updated: (el) => {
+    triggerEl.value = el
+  },
+  unmounted: (el) => {
+    if (triggerEl.value === el) triggerEl.value = null
+  },
+}
+
+// 归一化触发器 vnode：unwrapped 且插槽为单根元素/组件时，cloneVNode 注入 6 个
+// 事件 handler（mergeProps 自动与用户已有 on* 合并为 [用户, 内部] 数组，两者都触发），
+// 并追加锚点指令；多根 fragment / 文本节点返回 null 走 span 包裹层。
+// 兼容 Fragment 单子节点：Dropdown 等用 <slot name="trigger"><slot /></slot> 包装触发器时，
+// renderSlot 会产出 Fragment vnode；解包到其唯一真实子节点即可正常零包裹。
+// computed + slots.trigger 响应式依赖：仅插槽内容或 unwrapped 变化时重算，零冗余开销。
+const injectedTrigger = computed(() => {
+  if (!props.unwrapped) return null
+  const nodes = slots.trigger?.() ?? []
+  const real = nodes.filter((n) => n.type !== Comment)
+  if (real.length !== 1) return null
+  let vnode = real[0]
+  // Fragment 单子节点解包：兼容 Dropdown#trigger 嵌套 slot 经 renderSlot 产生的 Fragment。
+  // 嵌套 slot（<slot name="trigger"><slot /></slot>）会产出多层 Fragment 包裹，
+  // 循环解包直到拿到真实元素/组件。
+  while (vnode.type === Fragment) {
+    const fragChildren = Array.isArray(vnode.children) ? vnode.children : []
+    const fragReal = fragChildren.filter((n) => n.type !== Comment)
+    if (fragReal.length !== 1) return null
+    vnode = fragReal[0]
+  }
+  // 文本 / 注释等 symbol 类型 vnode 无法承载事件与指令，回退包裹层
+  if (typeof vnode.type === 'symbol') return null
+  const injected = cloneVNode(
+    vnode,
+    {
+      onClick,
+      onContextmenu: onContextMenu,
+      onMouseenter: onMouseEnter,
+      onMouseleave: onMouseLeave,
+      onFocusin: onFocusIn,
+      onFocusout: onFocusOut,
+    },
+    true,
+  )
+  // cloneVNode(merge=true) 在 props 变化时自动把 patchFlag 置 -1、dynamicProps 置 null，
+  // 保证注入的属性完整参与 diff，不会按旧 flag 跳过更新。
+  // 注意：Vue 3 vnode 的指令字段名是 `dirs`（非 `directives`），必须用 `dirs`
+  // 才会被 mountElement 遍历执行；拼成 `directives` 会被静默忽略。
+  // 注意：必须直接返回 cloneVNode 结果（保留 __v_isVNode / shapeFlag 等内部标记），
+  // 只在其上挂 dirs 指令；不能对象展开构造新对象，否则渲染函数不会按 vnode 渲染、
+  // on* 事件和 dirs 都会被丢弃，零包裹模式的事件注入和锚点同步全部失效。
+  injected.dirs = [...(vnode.dirs || []), { dir: triggerRefDirective }]
+  return injected
+})
+
+// 渲染函数组件包装：<component :is="vnode"> 在 Vue 3 不会可靠地把 vnode 的 on* 事件
+// 和 dirs 挂到元素上；用 render-function 组件返回 vnode 才能让 renderer 按 vnode 完整挂载
+// （应用 props.on* 为 DOM 监听、遍历 dirs 执行指令、设置锚点 triggerEl）。
+const InjectedTriggerComp = computed(() => ({
+  render: () => injectedTrigger.value,
+}))
+
 /* ---------- 全局关闭：click outside / Esc ---------- */
 function onDocumentPointerDown(event) {
   if (!isOpen.value) return
@@ -249,10 +323,14 @@ onBeforeUnmount(() => {
 </script>
 
 <template>
+  <!-- 零包裹：直接渲染注入事件后的用户 vnode，锚点由指令同步；无中间 DOM -->
+  <component :is="InjectedTriggerComp" v-if="injectedTrigger" />
+
+  <!-- 包裹层 fallback：unwrapped=false、多根 fragment、文本节点三种情况走此分支 -->
   <span
+    v-else
     ref="triggerEl"
     class="popover-trigger"
-    :class="{ 'popover-trigger--stretch': stretchTrigger }"
     @click="onClick"
     @contextmenu="onContextMenu"
     @mouseenter="onMouseEnter"
diff --git a/code/fms/fms-vue/src/components/ui/segmented/index.scss b/code/fms/fms-vue/src/components/ui/segmented/index.scss
new file mode 100644
index 00000000..26b8ca56
--- /dev/null
+++ b/code/fms/fms-vue/src/components/ui/segmented/index.scss
@@ -0,0 +1,160 @@
+/* ============================================================
+ * Segmented 分段控制器
+ * - 容器为浅灰轨道，选中项由绝对定位的 thumb 白色滑块托底
+ * - thumb 的位移与尺寸由 JS 测量选中项后写入内联样式，测量完成前不显示
+ * 尺寸全部取自 --fms-segmented-* token，颜色复用语义色 token。
+ * ============================================================ */
+
+.segmented {
+  box-sizing: border-box;
+  display: inline-block;
+  padding: var(--fms-segmented-track-padding);
+  border-radius: var(--fms-segmented-radius);
+  background: var(--fms-secondary);
+  color: var(--fms-text-secondary);
+  font-size: var(--fms-segmented-font-size);
+  line-height: var(--fms-line-height);
+  user-select: none;
+}
+
+/* 撑满父容器：容器与选项共同分配可用空间 */
+.segmented-block {
+  display: flex;
+  width: 100%;
+}
+
+.segmented-vertical.segmented-block {
+  width: auto;
+  height: 100%;
+}
+
+/* 选项组：thumb 的定位上下文 */
+.segmented-group {
+  position: relative;
+  display: flex;
+  align-items: stretch;
+  width: 100%;
+}
+
+.segmented-vertical .segmented-group {
+  flex-direction: column;
+}
+
+/* ---------- 滑块 ---------- */
+.segmented-thumb {
+  position: absolute;
+  top: 0;
+  left: 0;
+  box-sizing: border-box;
+  width: 0;
+  height: 100%;
+  border-radius: var(--fms-segmented-item-radius);
+  background: var(--fms-card);
+  box-shadow: var(--fms-shadow);
+  visibility: hidden;
+}
+
+.segmented-vertical .segmented-thumb {
+  width: 100%;
+  height: 0;
+}
+
+/* 测量出首个位置后才显示，避免 0 尺寸的空滑块闪现 */
+.segmented-thumb-visible {
+  visibility: visible;
+}
+
+/* ---------- 选项 ---------- */
+.segmented-item {
+  position: relative;
+  box-sizing: border-box;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  flex: 0 0 auto;
+  min-width: 0;
+  min-height: var(--fms-segmented-height);
+  padding: 0 var(--fms-segmented-padding-x);
+  border-radius: var(--fms-segmented-item-radius);
+  color: var(--fms-text-secondary);
+  cursor: pointer;
+  /* 提升为独立合成层，规避 Safari 下与滑块的层叠闪烁 */
+  transform: translateZ(0);
+  transition:
+    color 150ms ease,
+    background-color 150ms ease;
+}
+
+.segmented-block .segmented-item {
+  flex: 1 1 0;
+}
+
+/* 未选中且未禁用：悬停给浅底色并提亮文字（选中态由 thumb 表达，不叠加悬停底色） */
+.segmented-item:not(.segmented-item-selected):not(.segmented-item-disabled):hover {
+  background: var(--fms-secondary-hover);
+  color: var(--fms-text);
+}
+
+.segmented-item-selected {
+  color: var(--fms-text);
+  font-weight: 500;
+}
+
+.segmented-item-disabled {
+  color: var(--fms-disabled-text);
+  cursor: not-allowed;
+}
+
+/* 键盘焦点：原生 radio 视觉隐藏，焦点圈投射到整个选项 */
+.segmented-item:has(.segmented-input:focus-visible) {
+  outline: 2px solid var(--fms-primary);
+  outline-offset: 2px;
+}
+
+/* 原生 radio 不可见但保留可聚焦与同组方向键导航 */
+.segmented-input {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 0;
+  height: 0;
+  margin: 0;
+  opacity: 0;
+  pointer-events: none;
+}
+
+/* 标签内容：图标 + 文本居中，超长省略 */
+.segmented-item-label {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  gap: 6px;
+  min-width: 0;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.segmented-item-icon {
+  display: inline-flex;
+  flex-shrink: 0;
+  width: 1em;
+  height: 1em;
+}
+
+.segmented-item-icon svg {
+  width: 100%;
+  height: 100%;
+}
+
+/* 全圆角：覆盖默认的项圆角 */
+.segmented-shape-round {
+  --fms-segmented-radius: 999px;
+  --fms-segmented-item-radius: 999px;
+}
+
+@media (prefers-reduced-motion: reduce) {
+  .segmented-item {
+    transition: none;
+  }
+}
diff --git a/code/fms/fms-vue/src/components/ui/segmented/segmented.vue b/code/fms/fms-vue/src/components/ui/segmented/segmented.vue
new file mode 100644
index 00000000..0a5a42c3
--- /dev/null
+++ b/code/fms/fms-vue/src/components/ui/segmented/segmented.vue
@@ -0,0 +1,179 @@
+<script setup>
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, toRaw, useId, watch } from 'vue'
+
+/* ---------- props / emits / slots ---------- */
+const props = defineProps({
+  /** 双向绑定的选中值 */
+  modelValue: { type: [String, Number, Boolean], default: undefined },
+  /**
+   * 选项数据源，与 #label 插槽配合使用：
+   * ['daily', 'weekly'] 或 [{ label, value, disabled?, icon? }]；
+   * 对象项不给 label 即为纯图标项，icon 可为组件或 VNode
+   */
+  options: { type: Array, default: () => [] },
+  /** 圆角形状：default 跟随控件圆角，round 全圆角 */
+  shape: {
+    type: String,
+    default: 'default',
+    validator: (value) => ['default', 'round'].includes(value),
+  },
+  /** 纵向排列，滑块上下移动 */
+  vertical: { type: Boolean, default: false },
+  /** 撑满父容器宽度（纵向时为高度），各项等分空间 */
+  block: { type: Boolean, default: false },
+  /** 禁用整组 */
+  disabled: { type: Boolean, default: false },
+  /** 原生 radio 组名，未设置时自动生成，避免多组之间互斥冲突 */
+  name: { type: String, default: undefined },
+})
+
+const emit = defineEmits(['update:modelValue', 'change'])
+
+/* ---------- 选项归一 ---------- */
+// 兼容原始值与对象两种形态，保留 index 与 raw 供插槽使用
+const mergedOptions = computed(() =>
+  (props.options || []).map((option, index) => {
+    const isObject = option !== null && typeof option === 'object'
+    const value = isObject ? option.value : option
+    // 对象形态只在显式给了 label 时显示文字（纯图标项留空），原始值形态以自身为文本
+    const rawLabel = isObject ? option.label : option
+    return {
+      value,
+      label: rawLabel == null ? '' : String(rawLabel),
+      disabled: isObject ? Boolean(option.disabled) : false,
+      // options 常由 ref 提供（深层响应式），toRaw 还原组件本身，避免「组件被响应式化」告警
+      icon: isObject && option.icon ? toRaw(option.icon) : undefined,
+      index,
+      raw: option,
+    }
+  }),
+)
+
+/* ---------- 选中值 ---------- */
+// 未传 modelValue 时走非受控：内部保存选中值，仍可通过 change 监听
+const innerValue = ref(undefined)
+const currentValue = computed(() =>
+  props.modelValue !== undefined ? props.modelValue : innerValue.value,
+)
+
+// useId 依赖实例上下文，必须在 setup 同步阶段取，不能延迟到 computed 求值
+const autoName = useId()
+const groupName = computed(() => props.name || autoName)
+
+function isSelected(option) {
+  return Object.is(option.value, currentValue.value)
+}
+
+/* ---------- 事件 ---------- */
+function onChange(option) {
+  if (props.disabled || option.disabled) return
+  // 原生 radio 仅在值变化时派发 change，无需自行去重
+  if (props.modelValue !== undefined) emit('update:modelValue', option.value)
+  else innerValue.value = option.value
+  emit('change', option.value)
+}
+
+/* ---------- 滑块测量 ---------- */
+const groupEl = ref(null)
+const thumbStyle = ref({})
+const thumbVisible = ref(false)
+let observer = null
+
+// 读取选中项在 group 内的偏移与尺寸，写入 thumb 的内联样式（无过渡，切换即到位）
+function measureThumb() {
+  const group = groupEl.value
+  if (!group) return
+  const activeEl = group.querySelector('.segmented-item-selected')
+  if (!activeEl) {
+    thumbVisible.value = false
+    return
+  }
+  thumbStyle.value = props.vertical
+    ? { transform: `translateY(${activeEl.offsetTop}px)`, height: `${activeEl.offsetHeight}px` }
+    : { transform: `translateX(${activeEl.offsetLeft}px)`, width: `${activeEl.offsetWidth}px` }
+  thumbVisible.value = true
+}
+
+onMounted(() => {
+  nextTick(measureThumb)
+  // 容器尺寸变化（block 拉伸、字体加载、选项文字变化）时重新定位滑块
+  if (typeof ResizeObserver !== 'undefined' && groupEl.value) {
+    observer = new ResizeObserver(() => measureThumb())
+    observer.observe(groupEl.value)
+  }
+})
+
+onBeforeUnmount(() => {
+  observer?.disconnect()
+  observer = null
+})
+
+// 选中项、选项集或排列方向变化时重新测量；v-for 更新在 nextTick 后才落到 DOM
+watch([currentValue, () => props.options, () => props.vertical], () => nextTick(measureThumb))
+</script>
+
+<template>
+  <div
+    class="segmented"
+    :class="[
+      `segmented-shape-${shape}`,
+      {
+        'segmented-block': block,
+        'segmented-vertical': vertical,
+        'segmented-disabled': disabled,
+      },
+    ]"
+    role="radiogroup"
+    :aria-disabled="disabled || undefined"
+    :aria-orientation="vertical ? 'vertical' : 'horizontal'"
+  >
+    <div ref="groupEl" class="segmented-group">
+      <!-- 滑块：先于选项渲染，作为选中态底座托在下方 -->
+      <div
+        class="segmented-thumb"
+        :class="{ 'segmented-thumb-visible': thumbVisible }"
+        :style="thumbStyle"
+        aria-hidden="true"
+      />
+      <label
+        v-for="option in mergedOptions"
+        :key="option.index"
+        class="segmented-item"
+        :class="{
+          'segmented-item-selected': isSelected(option),
+          'segmented-item-disabled': disabled || option.disabled,
+        }"
+      >
+        <input
+          class="segmented-input"
+          type="radio"
+          :name="groupName"
+          :value="String(option.value)"
+          :checked="isSelected(option)"
+          :disabled="disabled || option.disabled"
+          @change="onChange(option)"
+        />
+        <span class="segmented-item-label">
+          <slot
+            name="label"
+            :option="option.raw"
+            :index="option.index"
+            :checked="isSelected(option)"
+          >
+            <component
+              :is="option.icon"
+              v-if="option.icon"
+              class="segmented-item-icon"
+              aria-hidden="true"
+            />
+            <span v-if="option.label !== ''" class="segmented-item-text">{{ option.label }}</span>
+          </slot>
+        </span>
+      </label>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+@use './index.scss';
+</style>
diff --git a/code/fms/fms-vue/src/components/ui/select/index.scss b/code/fms/fms-vue/src/components/ui/select/index.scss
index 07edb05f..452ca758 100644
--- a/code/fms/fms-vue/src/components/ui/select/index.scss
+++ b/code/fms/fms-vue/src/components/ui/select/index.scss
@@ -4,13 +4,6 @@
   display: inline-block;
   vertical-align: middle;
   width: 100%;
-
-  /* Popover 触发器默认 inline-flex 会收缩到内容宽度，
-     改为块级填满 .select，保证触发器与下拉宽度一致 */
-  :deep(.popover-trigger) {
-    display: block;
-    width: 100%;
-  }
 }
 
 .select-trigger {
@@ -52,7 +45,10 @@
   z-index: 1;
 }
 
-/* 触发器输入框：透明内嵌，撑满框体；筛选直接在输入框内键入 */
+/* 触发器输入框：透明内嵌，撑满框体；筛选直接在输入框内键入。
+   文本垂直居中由触发器的 flex align-items 负责，行高跟随全局行高即可，
+   勿写死 var(--fms-control-height)——那会把触发器内容顶到 28px+边框，
+   破坏 min-height 的约束（表单里实际渲染 30px，表格编辑行被撑高） */
 .select-input {
   flex: 1;
   min-width: 0;
@@ -63,7 +59,7 @@
   background: transparent;
   color: inherit;
   font: inherit;
-  line-height: var(--fms-control-height);
+  line-height: var(--fms-line-height);
   text-overflow: ellipsis;
 }
 
diff --git a/code/fms/fms-vue/src/components/ui/select/select.vue b/code/fms/fms-vue/src/components/ui/select/select.vue
index 664b420f..19ed2d9f 100644
--- a/code/fms/fms-vue/src/components/ui/select/select.vue
+++ b/code/fms/fms-vue/src/components/ui/select/select.vue
@@ -45,6 +45,9 @@ const triggerInputRef = ref(null)
 const triggerFocused = ref(false)
 const editing = ref(false)
 const selectedCache = ref(null)
+// 选中/清除后焦点会随下拉内容卸载丢到 body，主动交还输入框时会触发 focus 事件，
+// 但此时不应重新展开（「聚焦即展开」仅面向用户主动聚焦），用标记抑制这一次。
+const suppressNextAutoOpen = ref(false)
 
 const selectId = useId()
 const listboxId = `${selectId}-listbox`
@@ -210,9 +213,23 @@ function openDropdown() {
   if (!open.value) open.value = true
 }
 
+// 程序化归还焦点（选中/清除/取消后）：抑制本次聚焦触发的自动展开。
+// focus() 在已聚焦时不派发事件，标记可能残留，nextTick 兜底复位避免误吞下一次真实聚焦。
+function refocusTrigger() {
+  suppressNextAutoOpen.value = true
+  triggerInputRef.value?.focus({ preventScroll: true })
+  nextTick(() => {
+    suppressNextAutoOpen.value = false
+  })
+}
+
 // 聚焦（Tab / 点击空白处后聚焦）即展开；已聚焦时再点击浏览器不会重发 focus 事件，
 // 故点击也要兜底展开，让用户再次点击触发器即可重新打开下拉
 function onTriggerFocus() {
+  if (suppressNextAutoOpen.value) {
+    suppressNextAutoOpen.value = false
+    return
+  }
   openDropdown()
 }
 
@@ -297,6 +314,8 @@ function selectOption(option) {
   emit('update:modelValue', option.value)
   emit('change', option.value, option)
   open.value = false
+  // 非 filterable 模式焦点在下拉容器上，随浮层卸载会丢失；交还输入框保持键盘流
+  refocusTrigger()
 }
 
 // 供默认插槽使用：按原始值选中并关闭（插槽自定义选项无规范化 option）
@@ -306,6 +325,7 @@ function selectValue(value) {
   emit('update:modelValue', value)
   emit('change', value, undefined)
   open.value = false
+  refocusTrigger()
 }
 
 function closeDropdown() {
@@ -318,7 +338,7 @@ function clearValue() {
   activeIndex.value = -1
   selectedCache.value = null
   // 键盘触发清除时按钮会被卸载，先把焦点交还输入框，避免焦点丢失后浮层残留。
-  triggerInputRef.value?.focus({ preventScroll: true })
+  refocusTrigger()
   emit('update:modelValue', undefined)
   emit('change', undefined, undefined)
 }
@@ -353,6 +373,8 @@ function cancelEditing() {
   editing.value = false
   filterQuery.value = ''
   open.value = false
+  // Esc 取消：焦点在下拉容器上会随卸载丢失，交还输入框保持键盘流
+  refocusTrigger()
 }
 
 function onTriggerKeydown(event) {
@@ -417,6 +439,7 @@ function onTriggerKeydown(event) {
       :offset="4"
       :disabled="disabled"
       :follow-trigger-width="true"
+      unwrapped
       @update:open="onOpenChange"
     >
       <!-- 触发器：类 Input 的框体，直接在此输入框键入即可筛选；含清除按钮与折叠箭头 -->
diff --git a/code/fms/fms-vue/src/components/ui/tooltip/tooltip.vue b/code/fms/fms-vue/src/components/ui/tooltip/tooltip.vue
index 36cd65a3..d57d4c10 100644
--- a/code/fms/fms-vue/src/components/ui/tooltip/tooltip.vue
+++ b/code/fms/fms-vue/src/components/ui/tooltip/tooltip.vue
@@ -36,6 +36,7 @@ const emit = defineEmits(['update:open', 'openChange'])
     :mouse-enter-delay="mouseEnterDelay"
     :mouse-leave-delay="mouseLeaveDelay"
     :disabled="disabled"
+    unwrapped
     @update:open="emit('update:open', $event)"
     @open-change="emit('openChange', $event)"
   >
diff --git a/code/fms/fms-vue/src/layouts/components/AppSidebar.vue b/code/fms/fms-vue/src/layouts/components/AppSidebar.vue
index ed896f99..0fa43dc2 100644
--- a/code/fms/fms-vue/src/layouts/components/AppSidebar.vue
+++ b/code/fms/fms-vue/src/layouts/components/AppSidebar.vue
@@ -174,15 +174,6 @@ function toNavItem(node) {
   padding: 4px;
 }
 
-/* Popover 默认把 trigger 包在行内 span（inline-flex），会让按钮收缩到内容宽度
-   导致卡片撑不满、caret 无法靠右；这里改为块级撑满。
-   注意：.popover-trigger 是子组件 Popover 渲染的元素，scoped 样式无法直接命中，
-   必须用 :deep() 穿透到它自己这一层 */
-.fms-team :deep(.popover-trigger) {
-  display: block;
-  width: 100%;
-}
-
 .fms-team-trigger {
   display: flex;
   align-items: center;
diff --git a/code/fms/fms-vue/src/layouts/components/AppTabs.vue b/code/fms/fms-vue/src/layouts/components/AppTabs.vue
index f303a2eb..b5344f7f 100644
--- a/code/fms/fms-vue/src/layouts/components/AppTabs.vue
+++ b/code/fms/fms-vue/src/layouts/components/AppTabs.vue
@@ -297,12 +297,6 @@ function refreshTab(key) {
   &::-webkit-scrollbar {
     display: none;
   }
-
-  /* 右键菜单的 Dropdown 以 .popover-trigger 包裹每个页签；作为 flex 子项需禁止收缩，
-     对齐原 .fms-tab 的 flex-shrink:0 行为，避免页签被压窄 */
-  :deep(.popover-trigger) {
-    flex-shrink: 0;
-  }
 }
 
 .fms-tab {
diff --git a/code/fms/fms-vue/src/theme/tokens.css b/code/fms/fms-vue/src/theme/tokens.css
index 2876fe6a..6d005b12 100644
--- a/code/fms/fms-vue/src/theme/tokens.css
+++ b/code/fms/fms-vue/src/theme/tokens.css
@@ -112,6 +112,14 @@
   --fms-splitter-bar-size-hover: 4px;
   --fms-splitter-handle-size: 20px;
 
+  /* 分段控制器（segmented）：轨道 padding / 项高 / 项内边距 / 字号 / 圆角（不随主题变化） */
+  --fms-segmented-track-padding: 2px;
+  --fms-segmented-height: 28px;
+  --fms-segmented-padding-x: 12px;
+  --fms-segmented-font-size: 13px;
+  --fms-segmented-radius: var(--fms-control-radius);
+  --fms-segmented-item-radius: 4px;
+
   /* 树（tree）：节点高度 / 缩进 / 图标 / 拖拽指示线（不随主题变化） */
   --fms-tree-node-height: 32px;
   --fms-tree-indent: 18px;
@@ -121,6 +129,9 @@
   --fms-tree-title-padding-x: 6px;
   --fms-tree-grip-size: 16px;
   --fms-tree-drop-line-size: 2px;
+
+  /* 表格：表头底色（比卡片底色略灰，区分表头与数据区） */
+  --fms-table-header-bg: #f7f8fa;
 }
 
 .dark {
@@ -133,6 +144,9 @@
   --fms-text-secondary: #9aa3af;
   --fms-border: #2a2f3a;
 
+  /* 表格：表头底色（深色下比卡片底色略亮） */
+  --fms-table-header-bg: #20242c;
+
   /* 禁用态 */
   --fms-disabled-bg: #262a33;
   --fms-disabled-text: #5b6472;
diff --git a/code/fms/fms-vue/src/views/dashboard/index.vue b/code/fms/fms-vue/src/views/dashboard/index.vue
index e0ab853e..e47f1969 100644
--- a/code/fms/fms-vue/src/views/dashboard/index.vue
+++ b/code/fms/fms-vue/src/views/dashboard/index.vue
@@ -165,6 +165,10 @@ function onAdvancedReset() {
             <Plus :size="14" aria-hidden="true" />
             新增
           </Button>
+          <Button type="primary">
+            <Plus :size="14" aria-hidden="true" />
+            Add New
+          </Button>
         </div>
       </div>
 
@@ -193,7 +197,7 @@ function onAdvancedReset() {
       </div>
 
       <div class="demo-table">
-        <FmsTable :columns="columns" :data-source="dataSource" row-key="id" />
+        <FmsTable :columns="columns" :data-source="dataSource" row-key="id" :bordered="false" />
       </div>
 
       <!-- 底部分页：仅 UI 骨架，分页逻辑后续接入 -->
@@ -303,12 +307,6 @@ function onAdvancedReset() {
   flex: 1;
   min-height: 0;
 
-  /* 去掉表格外框：卡片本身靠阴影分层，表格直接铺满白卡（仅此处覆盖，
-     不影响其他页面使用 FmsTable 时保留外框） */
-  :deep(.fms-table) {
-    border: none;
-  }
-
   /* 行级特殊样式：rowClassName 返回的 class 落在 stk-table 的 tr 上，
      这里通过 :deep() 跨过组件边界设置字体颜色与背景色 */
   :deep(.fms-row-alert) {
diff --git a/code/fms/fms-vue/src/views/demo/index.vue b/code/fms/fms-vue/src/views/demo/index.vue
index 9ae28f9e..79201da2 100644
--- a/code/fms/fms-vue/src/views/demo/index.vue
+++ b/code/fms/fms-vue/src/views/demo/index.vue
@@ -13,6 +13,7 @@ import PaginationDemo from '@/components/ui/demo/pagination.vue'
 import InputDemo from '@/components/ui/demo/input.vue'
 import CheckboxDemo from '@/components/ui/demo/checkbox.vue'
 import RadioDemo from '@/components/ui/demo/radio.vue'
+import SegmentedDemo from '@/components/ui/demo/segmented.vue'
 import SwitchDemo from '@/components/ui/demo/switch.vue'
 import SelectDemo from '@/components/ui/demo/select.vue'
 import DateDemo from '@/components/ui/demo/date.vue'
@@ -61,6 +62,7 @@ const categories = [
       { key: 'input', label: 'Input 输入框' },
       { key: 'checkbox', label: 'Checkbox 复选框' },
       { key: 'radio', label: 'Radio 单选框' },
+      { key: 'segmented', label: 'Segmented 分段控制器' },
       { key: 'switch', label: 'Switch 开关' },
       { key: 'select', label: 'Select 下拉选择' },
       { key: 'date', label: 'DatePicker 日期选择' },
@@ -100,6 +102,7 @@ const demoMap = {
   input: InputDemo,
   checkbox: CheckboxDemo,
   radio: RadioDemo,
+  segmented: SegmentedDemo,
   switch: SwitchDemo,
   select: SelectDemo,
   date: DateDemo,
@@ -387,3 +390,23 @@ const demoMap = {
   }
 }
 </style>
+
+<style>
+/* ---- demo 浮层内容排版 ----
+   Popover/Tooltip 等浮层经 Teleport 渲染到 body，scoped 样式无法命中，
+   故用非 scoped 类。清除 <p> 浏览器默认 margin（上下 1em），
+   否则标题+正文两个 p 会让内容块虚高（约 90px 而非 56px）。 */
+.popover-demo-title {
+  margin: 0 0 4px;
+  font-weight: 600;
+}
+
+.popover-demo-text {
+  margin: 0;
+  color: var(--fms-text-secondary);
+}
+
+.popover-demo-title + .popover-demo-text {
+  margin-top: 4px;
+}
+</style>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/I18nKeyCell.js b/code/fms/fms-vue/src/views/system/module-management/components/I18nKeyCell.js
new file mode 100644
index 00000000..5c5e3ee6
--- /dev/null
+++ b/code/fms/fms-vue/src/views/system/module-management/components/I18nKeyCell.js
@@ -0,0 +1,40 @@
+/**
+ * 多语言键单元格（h 渲染函数）：key 文本 + globe 快捷设置按钮。
+ * 供字段定义 / 列表配置等 FmsTable 列的 customCell 复用。
+ * 表格 cell 由 h() 动态渲染、不受 scoped 样式约束，样式放独立 scss 随本模块全局引入。
+ */
+import { h } from 'vue'
+import { Languages } from '@lucide/vue'
+import './i18n-key-cell.scss'
+
+/**
+ * @param {object} opts
+ * @param {(row: object) => void} opts.onOpen 点击 globe 打开快捷设置
+ * @param {(row: object) => string} [opts.textOf] 单元格显示值（缺省用 cellValue）
+ * @param {(row: object) => boolean} [opts.isMuted] 显示为继承/占位样式（灰色）
+ */
+export function createI18nKeyCell({ onOpen, textOf, isMuted }) {
+  return ({ row, cellValue }) => {
+    const text = textOf ? textOf(row) : cellValue || ''
+    return h('span', { class: 'mm-i18n-cell' }, [
+      h(
+        'span',
+        { class: ['mm-i18n-cell__text', isMuted?.(row) ? 'is-muted' : ''] },
+        text || '',
+      ),
+      h(
+        'button',
+        {
+          type: 'button',
+          title: '设置多语言',
+          class: 'mm-i18n-cell__btn',
+          onClick: (event) => {
+            event.stopPropagation()
+            onOpen(row)
+          },
+        },
+        [h(Languages, { size: 14 })],
+      ),
+    ])
+  }
+}
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/ModuleBasicPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/ModuleBasicPanel.vue
index 75e60a48..dda3157f 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/ModuleBasicPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/ModuleBasicPanel.vue
@@ -46,6 +46,8 @@ const isData = computed(() => formData.value?.b_module_type === 'data')
 const isQuery = computed(() => formData.value?.b_module_type === 'query')
 
 /* ---------- 校验规则：错误直接显示在对应 FormItem 下方 ---------- */
+// data/query 的必填项与数据库 CK_s_module_config 约束对齐：
+// data：查询视图/保存表/主键字段/删除策略全必填；query：仅查询视图必填（主键字段可选）
 const formRules = computed(() => ({
   b_code: [
     {
@@ -59,8 +61,11 @@ const formRules = computed(() => ({
   ],
   b_name: [{ required: true, message: '请填写模块名称' }],
   b_module_type: [{ required: true, message: '请选择模块类型' }],
-  b_viewtable: [{ required: true, message: '请填写查询视图' }],
-  b_keyfield: [{ required: true, message: '请填写主键字段' }],
+  b_viewtable:
+    isData.value || isQuery.value ? [{ required: true, message: '请填写查询视图' }] : [],
+  b_keyfield: isData.value ? [{ required: true, message: '请填写主键字段' }] : [],
+  b_savetable: isData.value ? [{ required: true, message: '请填写保存表' }] : [],
+  b_delete_policy: isData.value ? [{ required: true, message: '请选择删除策略' }] : [],
 }))
 
 const formRef = ref(null)
@@ -94,6 +99,18 @@ function onCodeInput(v) {
 function onModuleTypeChange(v) {
   if (!formData.value) return
   formData.value.b_module_type = v
+  // 切换类型时清掉不适用字段，与数据库 CK_s_module_config 约束对齐
+  // （category 要求数据来源字段全空；query 要求保存表/删除策略为空），否则残留值会导致保存失败
+  if (v === 'category') {
+    formData.value.b_viewtable = null
+    formData.value.b_keyfield = null
+    formData.value.b_savetable = null
+    formData.value.b_orderfield = null
+    formData.value.b_delete_policy = null
+  } else if (v === 'query') {
+    formData.value.b_savetable = null
+    formData.value.b_delete_policy = null
+  }
   formData.value.b_i18n = buildModuleI18nKey(v, formData.value.b_code)
   emitUpdate()
 }
@@ -173,19 +190,19 @@ function onI18nSaved(key) {
             @update:model-value="(v) => setField('b_viewtable', v)"
           />
         </FormItem>
-        <FormItem label="主键字段" name="b_keyfield" required>
+        <FormItem label="主键字段" name="b_keyfield" :required="isData">
           <Input
             :model-value="formData.b_keyfield"
             :disabled="loading"
-            placeholder="如 b_id"
+            placeholder="data 必填，query 可选，如 b_id"
             @update:model-value="(v) => setField('b_keyfield', v)"
           />
         </FormItem>
-        <FormItem v-if="isData" label="保存表" name="b_savetable">
+        <FormItem v-if="isData" label="保存表" name="b_savetable" required>
           <Input
             :model-value="formData.b_savetable"
             :disabled="loading"
-            placeholder="data 模块的保存目标"
+            placeholder="data 模块的保存目标，必填"
             @update:model-value="(v) => setField('b_savetable', v)"
           />
         </FormItem>
@@ -197,12 +214,11 @@ function onI18nSaved(key) {
             @update:model-value="(v) => setField('b_orderfield', v)"
           />
         </FormItem>
-        <FormItem v-if="isData" label="删除策略" name="b_delete_policy">
+        <FormItem v-if="isData" label="删除策略" name="b_delete_policy" required>
           <Select
             :model-value="formData.b_delete_policy"
             :options="deletePolicyOptions"
             :disabled="loading"
-            clearable
             @update:model-value="(v) => setField('b_delete_policy', v)"
           />
         </FormItem>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/ModuleFieldsPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/ModuleFieldsPanel.vue
index ab31d9d3..83fbc8e7 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/ModuleFieldsPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/ModuleFieldsPanel.vue
@@ -3,11 +3,11 @@
  * 字段定义面板（s_field）：可编辑表格维护模块字段。
  * i18n 键按 field.{moduleCode}.{fieldName} 自动同步。
  */
-import { h, ref, shallowRef, watch } from 'vue'
-import { Languages } from '@lucide/vue'
+import { ref, shallowRef, watch } from 'vue'
 import FmsTable from '@/components/fms-table/FmsTable.vue'
 import { buildModuleItemI18nKey, syncModuleItemI18nKeys } from '@/utils/i18n'
 import I18nQuickSetModal from './I18nQuickSetModal.vue'
+import { createI18nKeyCell } from './I18nKeyCell'
 
 const props = defineProps({
   moduleId: { type: String, required: true },
@@ -16,7 +16,7 @@ const props = defineProps({
   loading: { type: Boolean, default: false },
 })
 
-const emit = defineEmits(['update', 'i18nSaved', 'syncFields'])
+const emit = defineEmits(['update', 'i18nSaved'])
 
 const FIELD_TYPES = [
   { label: '输入框', value: 'input' },
@@ -72,23 +72,7 @@ function openI18n(row) {
   i18nModalRef.value?.open(key, row.b_name || row.b_field || '')
 }
 
-const I18nKeyCell = ({ row, cellValue }) =>
-  h('span', { class: 'mm-i18n-cell' }, [
-    h('span', { class: 'mm-i18n-cell__text' }, cellValue || ''),
-    h(
-      'button',
-      {
-        type: 'button',
-        title: '设置多语言',
-        class: 'mm-i18n-cell__btn',
-        onClick: (event) => {
-          event.stopPropagation()
-          openI18n(row)
-        },
-      },
-      [h(Languages, { size: 14 })],
-    ),
-  ])
+const I18nKeyCell = createI18nKeyCell({ onOpen: openI18n })
 
 const columns = shallowRef([
   { dataIndex: 'b_field', title: '字段名', width: 150 },
@@ -146,36 +130,3 @@ const columns = shallowRef([
   flex: 1;
 }
 </style>
-
-<!-- 表格 cell 由 h() 动态渲染，不受 scoped 样式约束，需全局定义 -->
-<style lang="scss">
-.mm-i18n-cell {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 4px;
-  width: 100%;
-}
-
-.mm-i18n-cell__text {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.mm-i18n-cell__btn {
-  flex: none;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  padding: 2px;
-  border: none;
-  background: transparent;
-  color: var(--fms-text-secondary);
-  cursor: pointer;
-
-  &:hover {
-    color: var(--fms-primary);
-  }
-}
-</style>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/ModuleI18nPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/ModuleI18nPanel.vue
index 95de2fd7..c663dde4 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/ModuleI18nPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/ModuleI18nPanel.vue
@@ -4,7 +4,7 @@
  * 受管键（模块/字段/权限的 b_i18n）自动维护：默认语言为空时自动跟随当前名称。
  * 语言列表使用前端常量（DEFAULT_LANGUAGES），后续可切换语言类型表。
  */
-import { computed, h, ref, watch } from 'vue'
+import { computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
 import { Message, Button, Input } from '@/components/ui'
 import FmsTable from '@/components/fms-table/FmsTable.vue'
 import { createTempId } from '@/utils/tempId'
@@ -44,6 +44,20 @@ function isManagedRow(row) {
   return Boolean(row && row._managedId)
 }
 
+// 判断受管行是否为"无内容"：非默认语言全空、默认语言只有自动跟随的名称
+// （来自数据库 _localeIds 或用户改过任何值都算有内容）。编码输入的中间态
+// 键（module.b → module.b_ → module.b_user）只会产生这种空行。
+function isEmptyManagedRow(row, defaultLocale) {
+  if (row._localeIds && Object.keys(row._localeIds).length) return false
+  for (const lang of langOptions) {
+    const value = row[lang.code]
+    if (value == null || value === '') continue
+    if (lang.code === defaultLocale && String(value) === String(row._defaultValue ?? '')) continue
+    return false
+  }
+  return true
+}
+
 // 保证模块、字段、权限的受管键始终存在。默认语言为空或仍为上一次默认名称时，
 // 自动跟随当前名称；人工修改后的翻译不再被名称变化覆盖。
 function reconcileManagedRows(itemsOverride) {
@@ -65,7 +79,8 @@ function reconcileManagedRows(itemsOverride) {
     if (!row) row = unclaimedByKey.get(String(item.key))
     if (!row && item.sourceKey) row = unclaimedByKey.get(String(item.sourceKey))
     if (!row) {
-      row = { _id: createTempId(), b_key: item.key, _localeIds: {} }
+      // _syncInjected 标记由 reconcile 自动创建（非用户手输），键失效且无内容时可整行丢弃
+      row = { _id: createTempId(), b_key: item.key, _localeIds: {}, _syncInjected: true }
       rows.push(row)
     }
     const previousDefault = row._defaultValue
@@ -84,14 +99,19 @@ function reconcileManagedRows(itemsOverride) {
     row._sortType = String(item.key).split('.', 1)[0]
   }
 
-  // 已从配置中移除的条目不再受保护，保留其翻译供管理员自行处理
+  // 键已失效的受管行：自动创建且无内容的直接丢弃（如编码输入中间态产生的空行，
+  // 不丢弃会残留 module.b / module.b_ / module.b_user 一串）；有翻译或来自数据库的
+  // 解除保护保留，供管理员自行处理
+  const keptRows = []
   for (const row of rows) {
-    if (!row._managedId || row._syncInjected || currentManagedIds.has(String(row._managedId)))
-      continue
-    delete row._managedId
-    delete row._defaultValue
+    if (row._managedId && !currentManagedIds.has(String(row._managedId))) {
+      if (row._syncInjected && isEmptyManagedRow(row, defaultLocale)) continue
+      delete row._managedId
+      delete row._defaultValue
+    }
+    keptRows.push(row)
   }
-  pivotRows.value = consolidatePivotRows(rows)
+  pivotRows.value = consolidatePivotRows(keptRows)
 }
 
 // 将扁平记录按 key 聚合成一行（每种语言一列）
@@ -146,10 +166,34 @@ watch(
   { immediate: true },
 )
 
+// 字段/权限草稿变化（含同步字段、改名、编码输入）时实时补齐受管行：finalI18nItems
+// 每次重算都是新数组，引用变化即触发。防抖 300ms——编码连续输入时合并中间态，
+// 只 reconcile 最终键。加载中不做（loadI18n 完成后会自行 reconcile，避免竞态）。
+let reconcileTimer = null
+watch(
+  () => props.i18nItems,
+  () => {
+    if (isLoading.value) return
+    clearTimeout(reconcileTimer)
+    reconcileTimer = setTimeout(() => reconcileManagedRows(), 300)
+  },
+)
+onBeforeUnmount(() => clearTimeout(reconcileTimer))
+
 function onCellChange() {
   reconcileManagedRows()
 }
 
+async function addRow() {
+  if (props.loading || isLoading.value) return
+  const newId = createTempId()
+  // stk-table 对同一引用数组的 push 不敏感，必须换新引用才会渲染新行
+  pivotRows.value = [...pivotRows.value, { _id: newId, b_key: '', _localeIds: {} }]
+  activeKey.value = String(newId)
+  await nextTick()
+  tableRef.value?.editRow?.(String(newId), 'b_key')
+}
+
 function removeRow(row) {
   if (isManagedRow(row)) return
   pivotRows.value = pivotRows.value.filter((r) => r !== row)
@@ -178,11 +222,8 @@ const columns = computed(() => {
       dataIndex: 'b_key',
       title: '多语言键',
       width: 260,
-      customCell: ({ row }) =>
-        h('span', { class: 'mm-i18n-key' }, [
-          h('span', { class: 'mm-i18n-key__text' }, row.b_key || ''),
-          isManagedRow(row) ? h('span', { class: 'mm-i18n-key__tag' }, '自动') : null,
-        ]),
+      // 不能带 customCell：resolveCustomCell 会让 customCell 优先而忽略 editor，导致新增行无法进入输入框
+      editor: { type: 'input', disabled: (row) => isManagedRow(row) },
     },
   ]
   for (const lang of langOptions) {
@@ -299,6 +340,7 @@ defineExpose({
       <div class="mm-i18n__search">
         <Input v-model="searchKey" placeholder="按多语言键过滤" allow-clear />
       </div>
+      <Button type="primary" :disabled="loading || isLoading" @click="addRow">新增多语言</Button>
       <Button type="outline" :disabled="loading || isLoading" @click="loadI18n">刷新</Button>
     </div>
     <div class="mm-panel__body">
@@ -342,26 +384,4 @@ defineExpose({
   flex: 1;
 }
 
-.mm-i18n-key {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  width: 100%;
-}
-
-.mm-i18n-key__text {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.mm-i18n-key__tag {
-  flex: none;
-  padding: 0 6px;
-  border-radius: 999px;
-  font-size: 11px;
-  line-height: 16px;
-  background: var(--fms-secondary);
-  color: var(--fms-text-secondary);
-}
 </style>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/ModuleListConfigPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/ModuleListConfigPanel.vue
index ba9eb66e..8199ba22 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/ModuleListConfigPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/ModuleListConfigPanel.vue
@@ -1,125 +1,234 @@
 <script setup>
 /**
- * 列表配置面板（s_field_view）：列宽/分组/显示/排序，支持行拖拽与分组管理。
+ * 列表配置面板（s_field_view）：与子表表格设计（TableEditPanel）同一套布局与结构编辑机制——
+ * 左侧 FieldLibrary 字段库 | 头部工具栏 → 顶部 TablePreview 多级表头实时预览 →
+ * 下层「分组结构树 | TableInspector 属性面板」。
+ * 结构内核在 useStructureEditing、表头推导在 useBandLayout（共用）。
+ *
+ * 列表侧差异：
+ * - 分组多级嵌套（b_parent_id）与子表设计一致；
+ * - 无分组启停（features 关闭 groupEnable）；
+ * - 行自动包含全部启用字段（加载时补全，缺失字段按控件类型给默认列），
+ *   「删除列」= 隐藏（b_visible=0，预览置灰），数据视图勾选「显示」恢复；
+ * - 属性面板：列宽 / 标题多语言（b_i18n 空 = 继承字段 key，globe 翻译）；
+ * - 分组标题多语言：属性面板 globe，key 首次点击自动生成（group.{模块编码}.{随机串}）。
+ * 排序语义：行 b_xh 为「未分组在前 + 分组树先序」的全局平铺序，与运行时列序一致。
  */
-import { computed, ref, shallowRef, watch } from 'vue'
-import { Message, Button } from '@/components/ui'
-import FmsTable from '@/components/fms-table/FmsTable.vue'
+import { computed, ref } from 'vue'
+import { Plus } from '@lucide/vue'
+import { Button, Popover, Segmented } from '@/components/ui'
+import ModuleStructureTree from './structure-tree/ModuleStructureTree.vue'
+import FieldLibrary from './edit-panels/FieldLibrary.vue'
+import TablePreview from './table-edit/TablePreview.vue'
+import TableInspector from './table-edit/TableInspector.vue'
+import EditDataView from './edit-panels/EditDataView.vue'
+import I18nQuickSetModal from './I18nQuickSetModal.vue'
+import { createI18nKeyCell } from './I18nKeyCell'
+import { createTempId } from '@/utils/tempId'
+import { useBandLayout } from '../composables/useBandLayout'
+import { useStructureEditing } from '../composables/useStructureEditing'
+import { useFieldLookup } from '../composables/useFieldLookup'
+import { listRowDefaults } from '../fieldAreaDefaults'
 
 const props = defineProps({
   moduleId: { type: String, required: true },
+  /** 模块编码：用于生成分组多语言 key 前缀 */
+  moduleCode: { type: String, default: '' },
   listConfig: { type: Array, default: () => [] },
-  editConfig: { type: Array, default: () => [] },
-  queryConfig: { type: Array, default: () => [] },
   fields: { type: Array, default: () => [] },
   groups: { type: Array, default: () => [] },
   loading: { type: Boolean, default: false },
 })
 
-const emit = defineEmits(['update', 'syncEdit', 'syncQuery'])
+const emit = defineEmits(['update', 'updateGroups', 'i18n-saved'])
 
-const localList = ref([])
-const activeKey = ref(null)
+const i18nModalRef = ref(null)
+const structureTreeRef = ref(null)
 
-watch(
-  () => props.listConfig,
-  (val) => {
-    if (val === localList.value) return
-    localList.value = val?.map((row) => ({ ...row })) || []
-  },
-  { immediate: true },
-)
+/* ================= 公共查询表 ================= */
+const { fieldMap, fieldOf, fieldName, controlTypeLabel } = useFieldLookup(() => props.fields)
+
+/* ================= 结构编辑内核（与子表设计共用） ================= */
+const editing = useStructureEditing({
+  moduleId: () => props.moduleId,
+  getGroups: () => props.groups,
+  getRows: () => props.listConfig,
+  loading: () => props.loading,
+  createRow: (field, groupId) => ({
+    b_id: createTempId(),
+    b_module_id: props.moduleId,
+    b_field_id: String(field.b_id),
+    b_group_id: groupId || null,
+    b_i18n: null,
+    b_xh: 0,
+    ...listRowDefaults(field), // b_visible / b_width / b_sortable
+  }),
+  applyGroups: (groups, removedGroupIds) =>
+    emit('updateGroups', groups, removedGroupIds),
+  applyRows: (rows) => emit('update', rows),
+  requestRename: (gid) => structureTreeRef.value?.startRename(gid),
+  clipboardKeys: ['b_visible', 'b_width'],
+  fieldNameOf: (row) => fieldName(row),
+  getField: (fieldId) => fieldMap.value.get(fieldId),
+})
+const {
+  localRows,
+  localGroups,
+  selectedNodeKey,
+  selectedRow,
+  selectedBand,
+  bandMeta,
+  groupIdOfRow,
+  addRootGroup,
+  addSubGroup,
+  deleteBand,
+  onRenameCommit,
+  onBandTitleChange,
+  onWidthCommit,
+  commitBandDrag,
+  commitColDrag,
+  onNodeMove,
+  onNodeAddSub,
+  selectRow,
+  selectField,
+  onFieldDrop,
+  clipboardProps,
+  copyRowProps,
+  pastePropsToSelected,
+  widthOf,
+} = editing
+
+const { visualColumns, bandRows, headerColumns, ungroupedCount } = useBandLayout(editing)
+
+const groupCount = computed(() => (props.groups || []).length)
 
 function emitUpdate() {
-  emit('update', localList.value)
+  emit('update', localRows.value)
 }
 
-function onRowOrderChange(rows) {
-  const sorted = rows.map((row, index) => ({ ...row, b_xh: (index + 1) * 10 }))
-  localList.value = sorted
+/* ================= 结构树事件转发 ================= */
+function onColDrop({ fieldId, line }) {
+  if (props.loading || !fieldId || !line) return
+  commitColDrag(fieldId, line)
+}
+function onBandDrop({ gid, line }) {
+  if (props.loading || !gid || !line) return
+  commitBandDrag(gid, line)
+}
+
+/* ================= 列删除 = 隐藏 ================= */
+// 列表配置行自动包含全部启用字段（加载时补全），删除列不删行——置 b_visible=0
+// （预览置灰带「隐藏」标记），数据视图勾选「显示」恢复
+function hideRow(row) {
+  if (!row || props.loading) return
+  row.b_visible = 0
   emitUpdate()
 }
 
-const fieldNameMap = computed(() => {
+function onNodeDelete({ key }) {
+  if (props.loading || !key) return
+  if (key.startsWith('c:')) {
+    const row = editing.findRowByFieldId(key.slice(2))
+    if (row) hideRow(row)
+  } else if (key.startsWith('g:') && key !== 'g:ungrouped') {
+    const band = bandMeta.value.metaMap.get(key.slice(2))
+    if (band) deleteBand(band)
+  }
+}
+
+function onRemoveSelected() {
+  if (selectedBand.value) {
+    deleteBand(selectedBand.value)
+    return
+  }
+  hideRow(selectedRow.value)
+}
+
+function onStructureContextMenuClick({ item, node }) {
+  if (node?.kind === 'group') {
+    const band = bandMeta.value.metaMap.get(String(node.gid))
+    if (!band) return
+    if (item.key === 'add-sub') addSubGroup(band)
+    else if (item.key === 'rename') structureTreeRef.value?.startRename(String(node.gid))
+    else if (item.key === 'delete') deleteBand(band)
+    // 列表侧无分组启停（features 已关），无 enable 分支
+  } else if (node?.kind === 'col') {
+    if (item.key === 'copy') {
+      selectRow(node.row)
+      copyRowProps()
+    } else if (item.key === 'paste') {
+      selectRow(node.row)
+      pastePropsToSelected()
+    } else if (item.key === 'delete') {
+      hideRow(node.row)
+    }
+  }
+}
+
+/* ================= 标题多语言 ================= */
+const fieldI18nMap = computed(() => {
   const map = new Map()
   for (const field of props.fields || []) {
-    map.set(String(field.b_id), field.b_name || field.b_field)
+    map.set(String(field.b_id), field.b_i18n || '')
   }
   return map
 })
 
-const groupOptions = computed(() => {
-  const options = []
-  for (const group of props.groups || []) {
-    if (Number(group.b_canuse) !== 1) continue
-    options.push({ label: group.b_title || `分组-${group.b_id}`, value: String(group.b_id) })
-  }
-  return options
+/* 行生效的多语言 key：b_i18n 覆盖，空则继承字段 */
+function effectiveI18nKeyOf(row) {
+  return String(row.b_i18n || fieldI18nMap.value.get(String(row.b_field_id)) || '')
+}
+
+function openRowI18n(row) {
+  const key = effectiveI18nKeyOf(row)
+  if (!key) return
+  i18nModalRef.value?.open(key, fieldName(row) || '')
+}
+
+const I18nKeyCell = createI18nKeyCell({
+  onOpen: openRowI18n,
+  textOf: (row) => effectiveI18nKeyOf(row),
+  isMuted: (row) => !row.b_i18n,
 })
 
-function syncToEdit() {
-  if (props.loading) return
-  const visibleMap = new Map()
-  for (const row of localList.value) {
-    if (row.b_field_id != null) {
-      visibleMap.set(String(row.b_field_id), Number(row.b_visible) === 1 ? 1 : 0)
-    }
+/* ================= 属性面板接线 ================= */
+const inspectorCollapsed = ref(false)
+
+/* ================= 视图形态：设计 / 数据 ================= */
+const VIEW_OPTIONS = [
+  { label: '设计', value: 'design' },
+  { label: '数据', value: 'data' },
+]
+const viewMode = ref('design')
+
+/* ================= 数据区：列属性批量编辑表 ================= */
+// 数据视图高亮行 id；行点击同步选中（树/预览/Inspector 联动）；行序只经树/预览拖拽维护
+const activeKey = ref(null)
+
+function switchView(mode) {
+  viewMode.value = mode
+  if (mode === 'data') {
+    activeKey.value = selectedRow.value ? String(selectedRow.value.b_id) : null
   }
-  if (visibleMap.size === 0) {
-    Message.info('列表配置中没有字段')
-    return
-  }
-  let count = 0
-  const updated = (props.editConfig || []).map((row) => {
-    const target = visibleMap.get(String(row.b_field_id))
-    if (target !== undefined) {
-      count++
-      return { ...row, b_visible: target }
-    }
-    return row
-  })
-  emit('syncEdit', updated)
-  Message.success(`已同步 ${count} 条到编辑显示`)
 }
 
-function syncToQuery() {
-  if (props.loading) return
-  const visibleMap = new Map()
-  for (const row of localList.value) {
-    if (row.b_field_id != null) {
-      visibleMap.set(String(row.b_field_id), Number(row.b_visible) === 1 ? 1 : 0)
-    }
-  }
-  if (visibleMap.size === 0) {
-    Message.info('列表配置中没有字段')
-    return
-  }
-  let count = 0
-  const updated = (props.queryConfig || []).map((row) => {
-    const target = visibleMap.get(String(row.b_field_id))
-    if (target !== undefined) {
-      count++
-      return { ...row, b_canuse: target }
-    }
-    return row
-  })
-  emit('syncQuery', updated)
-  Message.success(`已同步 ${count} 条到查询配置`)
+function onDataRowClick(row) {
+  selectRow(row)
+  activeKey.value = String(row.b_id)
 }
 
-const columns = shallowRef([
+const dataColumns = computed(() => [
   {
     dataIndex: 'b_field_id',
     title: '字段',
     width: 180,
-    customCell: ({ row }) => fieldNameMap.value.get(String(row.b_field_id)) || row.b_field_id || '',
+    customCell: ({ row }) => fieldName(row) || String(row.b_field_id || ''),
   },
-  { dataIndex: 'b_width', title: '列宽', width: 90, editor: { type: 'input', inputType: 'number' } },
   {
-    dataIndex: 'b_group_id',
-    title: '分组',
-    width: 160,
-    editor: { type: 'select', options: () => groupOptions.value },
+    dataIndex: 'b_width',
+    title: '列宽',
+    width: 90,
+    editor: { type: 'input', inputType: 'number' },
   },
   {
     dataIndex: 'b_visible',
@@ -128,56 +237,338 @@ const columns = shallowRef([
     align: 'center',
     editor: { type: 'checkbox' },
   },
+  {
+    dataIndex: 'b_i18n',
+    title: '标题多语言',
+    width: 220,
+    customCell: I18nKeyCell,
+  },
   { dataIndex: 'b_xh', title: '排序号', width: 90 },
 ])
+
+// 分组标题多语言：globe 首次点击自动生成 key（group.{模块编码}.{随机串}），此后固定复用
+function openGroupI18n() {
+  const band = selectedBand.value
+  if (!band) return
+  const existing = String(band.group.b_i18n || '').trim()
+  let key = existing
+  if (!key) {
+    const code = String(props.moduleCode || '').trim()
+    key = `group.${code ? code + '.' : ''}${Math.random().toString(36).slice(2, 8)}`
+    emit(
+      'updateGroups',
+      (props.groups || []).map((g) =>
+        String(g.b_id) === String(band.gid) ? { ...g, b_i18n: key } : g,
+      ),
+    )
+  }
+  i18nModalRef.value?.open(key, band.group.b_title || '')
+}
 </script>
 
 <template>
-  <div class="mm-panel">
-    <div class="mm-panel__toolbar">
-      <Button type="outline" :disabled="loading || !editConfig.length" @click="syncToEdit">
-        同步到编辑显示
-      </Button>
-      <Button type="outline" :disabled="loading || !queryConfig.length" @click="syncToQuery">
-        同步到查询配置
-      </Button>
+  <div class="mm-list-design">
+    <!-- 上：设计区（左字段库 | 右主区） -->
+    <div v-show="viewMode === 'design'" class="mm-list-design__design">
+    <!-- 左：字段库（点击加入/定位，拖出到结构树入组） -->
+    <FieldLibrary
+      :fields="props.fields"
+      :rows="localRows"
+      :selected-field-id="selectedRow?.b_field_id"
+      :loading="props.loading"
+      drag-mode="native"
+      item-title="点击加入列表；已加入的点击定位；拖拽到下方分组树可加入对应分组"
+      added-title="已加入列表"
+      @select="selectField"
+    />
+
+    <!-- 右：头部工具栏 + 预览 + 树/属性 -->
+    <div class="mm-list-design__main">
+    <!-- 顶部工具栏：操作居左、视图切换居中、帮助居右（同子表设计头部） -->
+    <div class="mm-list-design__head">
+      <div class="mm-list-design__head-left">
+        <Button type="outline" :disabled="loading" @click="addRootGroup">
+          <Plus :size="14" /> 添加分组
+        </Button>
+      </div>
+      <div class="mm-list-design__head-center">
+        <Segmented
+          class="mm-list-design__view-switch"
+          aria-label="视图切换"
+          :model-value="viewMode"
+          :options="VIEW_OPTIONS"
+          @update:model-value="switchView"
+        />
+      </div>
+      <div class="mm-list-design__head-right">
+        <Popover trigger="hover" placement="bottom-end" :arrow="false" :offset="8" unwrapped>
+          <template #trigger><span class="mm-list-design__help-icon" aria-hidden="true">?</span></template>
+          <template #content>
+            <div class="mm-list-design__help-title">操作说明</div>
+            <ul class="mm-list-design__help-list">
+              <li>左侧字段库：点击加入列表；拖到结构树可入对应分组</li>
+              <li>预览表：拖列头换位、拖右缘调列宽</li>
+              <li>结构树：拖拽排序 / 嵌套分组 / 移动列；列节点 🗑 删除</li>
+              <li>右键分组可新增子分组 / 重命名 / 删除</li>
+              <li>删错的列从左侧字段库随时加回</li>
+            </ul>
+          </template>
+        </Popover>
+      </div>
     </div>
-    <div class="mm-panel__body">
-      <FmsTable
-        v-model:columns="columns"
-        :data-source="localList"
-        :editable="!loading"
-        :row-draggable="!loading"
-        row-key="b_id"
-        :active-row-key="activeKey"
-        @row-click="(_, row) => (activeKey = String(row.b_id))"
-        @change="emitUpdate"
-        @row-order-change="onRowOrderChange"
+
+    <!-- 上：多级表头实时预览 -->
+    <TablePreview
+      :visual-columns="visualColumns"
+      :band-rows="bandRows"
+      :header-columns="headerColumns"
+      :ungrouped-count="ungroupedCount"
+      :selected-node-key="selectedNodeKey"
+      :loading="loading"
+      :width-of="widthOf"
+      :field-name="fieldName"
+      :field-of="fieldOf"
+      :group-id-of-row="groupIdOfRow"
+      :commit-col-drag="commitColDrag"
+      :on-commit="emitUpdate"
+      empty-text="暂无列配置"
+    />
+
+    <!-- 下：分组结构树 | 属性面板（同子表设计 config 区） -->
+    <div
+      class="mm-list-design__config"
+      :class="{ 'is-inspector-collapsed': inspectorCollapsed }"
+    >
+      <div class="mm-list-design__tree-panel">
+        <div class="mm-list-design__tree-head">
+          <span>分组结构</span>
+          <span class="mm-list-design__tree-meta">{{ groupCount }} 个分组</span>
+        </div>
+        <div class="mm-list-design__tree-scroll">
+          <ModuleStructureTree
+            ref="structureTreeRef"
+            :groups="localGroups"
+            :rows="localRows"
+            :fields="props.fields"
+            :selected-key="selectedNodeKey"
+            :loading="props.loading"
+            :paste-enabled="!!clipboardProps"
+            :features="{ groupEnable: false, colClipboard: true, colDelete: true }"
+            @update:selected-key="(k) => (selectedNodeKey = k)"
+            @col-drop="onColDrop"
+            @band-drop="onBandDrop"
+            @field-drop="onFieldDrop"
+            @context-menu-click="onStructureContextMenuClick"
+            @rename-commit="onRenameCommit"
+            @node-move="onNodeMove"
+            @node-delete="onNodeDelete"
+            @node-add-sub="onNodeAddSub"
+          >
+            <template #empty>
+              <span class="mm-list-design__tree-empty">暂无分组，点击工具栏「添加分组」</span>
+            </template>
+          </ModuleStructureTree>
+        </div>
+      </div>
+
+      <!-- 右：属性面板（选中列/分组带） -->
+      <TableInspector
+        :inspector-collapsed="inspectorCollapsed"
+        :selected-row="selectedRow"
+        :selected-band="selectedBand"
+        :loading="loading"
+        :field-name="fieldName"
+        :control-type-label="controlTypeLabel"
+        :width-of="widthOf"
+        :status-flags="[]"
+        :show-band-enable="false"
+        :row-i18n-key-of="effectiveI18nKeyOf"
+        :band-i18n-enabled="true"
+        @update:collapsed="(v) => (inspectorCollapsed = v)"
+        @width-commit="onWidthCommit"
+        @remove-selected="onRemoveSelected"
+        @band-title-change="onBandTitleChange"
+        @add-sub-group="addSubGroup(selectedBand)"
+        @rename="structureTreeRef?.startRename(selectedBand?.gid)"
+        @delete-band="deleteBand(selectedBand)"
+        @open-row-i18n="(row) => openRowI18n(row)"
+        @open-band-i18n="openGroupI18n"
       />
+      </div>
     </div>
+    </div>
+
+    <!-- 数据视图（设计/数据切换；外层 padding 由 EditDataView 自带） -->
+    <EditDataView
+      v-show="viewMode === 'data'"
+      :rows="localRows"
+      :loading="loading"
+      :data-columns="dataColumns"
+      :active-key="activeKey"
+      :row-drag-handle="false"
+      @back="switchView('design')"
+      @row-click="onDataRowClick"
+      @change="emitUpdate"
+    />
+
+    <I18nQuickSetModal ref="i18nModalRef" @saved="(key) => emit('i18n-saved', key)" />
   </div>
 </template>
 
 <style lang="scss" scoped>
-.mm-panel {
+/* 空间结构同表单/子表设计：设计视图（左字段库 | 主区：工具栏 → 预览 → 树/属性）与数据视图切换 */
+.mm-list-design {
   display: flex;
   flex-direction: column;
-  min-height: 0;
   flex: 1;
+  min-height: 0;
+  min-width: 0;
+  border: 1px solid var(--fms-border);
+  border-radius: var(--fms-control-radius);
+  overflow: hidden;
+  background: var(--fms-card);
 }
 
-.mm-panel__toolbar {
+/* 设计区（同子表设计三区 grid） */
+.mm-list-design__design {
+  display: grid;
+  grid-template-columns: 184px minmax(0, 1fr);
+  flex: 1;
+  min-height: 0;
+  min-width: 0;
+}
+
+/* 下：数据区（固定高度，不挤压设计区） */
+/* 右主区 */
+.mm-list-design__main {
   display: flex;
+  flex-direction: column;
+  min-width: 0;
+  min-height: 0;
+}
+
+/* 顶部工具栏：操作居左、帮助居右 */
+.mm-list-design__head {
+  display: flex;
+  align-items: center;
+  gap: 12px;
   flex: none;
-  flex-wrap: wrap;
+  padding: 8px 12px;
+  border-bottom: 1px solid var(--fms-border);
+}
+.mm-list-design__head-left {
+  display: inline-flex;
+  align-items: center;
   gap: 8px;
-  padding: 0 0 8px;
+  min-width: 0;
+  flex: 1 1 auto;
+  justify-content: flex-start;
+}
+/* 视图切换：左/右两翼 flex 伸缩挤出中间位，保证居中（同表单/子表设计） */
+.mm-list-design__head-center {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+.mm-list-design__head-right {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+  flex: 1 1 auto;
+  justify-content: flex-end;
 }
 
-.mm-panel__body {
+/* 下层：分组结构树 | 属性面板（同子表设计的 config 区，可折叠至 32px） */
+.mm-list-design__config {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) 280px;
+  flex: 1;
+  min-height: 0;
+  min-width: 0;
+}
+.mm-list-design__config.is-inspector-collapsed {
+  grid-template-columns: minmax(0, 1fr) 32px;
+}
+
+/* 左：分组结构树面板 */
+.mm-list-design__tree-panel {
   display: flex;
   flex-direction: column;
-  min-height: 0;
   flex: 1;
+  min-height: 0;
+  min-width: 0;
+  padding: 8px;
+  overflow: hidden;
+}
+.mm-list-design__tree-head {
+  flex: none;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 2px 4px 8px;
+  color: var(--fms-text);
+  font-size: 12px;
+  font-weight: 700;
+}
+.mm-list-design__tree-meta {
+  color: var(--fms-text-secondary);
+  font-size: 10px;
+  font-weight: 400;
+}
+.mm-list-design__tree-scroll {
+  flex: 1;
+  min-height: 0;
+  overflow: auto;
+}
+.mm-list-design__tree-empty {
+  padding: 12px 8px;
+  color: var(--fms-text-secondary);
+  font-size: 11px;
+  text-align: center;
+}
+
+.mm-list-design__help-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 22px;
+  height: 22px;
+  border: 1px solid var(--fms-border);
+  border-radius: 50%;
+  background: var(--fms-card);
+  color: var(--fms-text-secondary);
+  font-size: 12px;
+  font-weight: 600;
+  line-height: 1;
+  padding-bottom: 1px;
+  cursor: help;
+  margin-left: auto;
+  transition: border-color 0.15s, color 0.15s, background 0.15s;
+  &:hover {
+    border-color: color-mix(in srgb, var(--fms-primary) 45%, transparent);
+    background: color-mix(in srgb, var(--fms-primary) 5%, var(--fms-card));
+    color: var(--fms-primary);
+  }
+}
+.mm-list-design__help-title {
+  margin-bottom: 6px;
+  color: var(--fms-text);
+  font-size: 12px;
+  font-weight: 600;
+}
+.mm-list-design__help-list {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  li {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 3px 0;
+    color: var(--fms-text-secondary);
+    font-size: 11px;
+  }
 }
 </style>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/ModulePowersPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/ModulePowersPanel.vue
index d349215e..0971dec7 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/ModulePowersPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/ModulePowersPanel.vue
@@ -61,7 +61,8 @@ async function addRow() {
     b_xh: (localPowers.value.length + 1) * 10,
     b_canuse: 1,
   }
-  localPowers.value.push(newRow)
+  // stk-table 对同一引用数组的 push 不敏感（内部 shallowRef + 引用 watch），必须换新引用才会渲染新行
+  localPowers.value = [...localPowers.value, newRow]
   emitUpdate()
   activeKey.value = String(newId)
   await nextTick()
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/ModuleQueryConfigPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/ModuleQueryConfigPanel.vue
index d0a77856..536c2bb0 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/ModuleQueryConfigPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/ModuleQueryConfigPanel.vue
@@ -1,20 +1,26 @@
 <script setup>
 /**
- * 查询配置面板（s_field_query）：查询控件/操作符/默认值/启用/排序，支持行拖拽与新增。
+ * 查询配置面板（s_field_query）：字段/查询控件/操作符/默认值/启用/排序，支持行拖拽与新增。
+ * 选择字段时按字段控件类型智能默认查询组件与操作符（可再手动改）。
+ * 参与语义：生成的条件行用「启用」开关表达是否参与运行时——停用行保留配置，
+ * 勾选即恢复；删除仅用于清掉误加的行（补充缺失会按字段重新生成）。
  */
-import { computed, ref, shallowRef, watch } from 'vue'
+import { computed, nextTick, ref, shallowRef, watch } from 'vue'
 import { Button } from '@/components/ui'
 import FmsTable from '@/components/fms-table/FmsTable.vue'
 import { createTempId } from '@/utils/tempId'
+import { queryRowDefaults } from '../fieldAreaDefaults'
 
 const props = defineProps({
   moduleId: { type: String, required: true },
   queryConfig: { type: Array, default: () => [] },
   fields: { type: Array, default: () => [] },
   loading: { type: Boolean, default: false },
+  /** 启用字段中尚未配置查询条件的数量（父级派生），>0 时显示补充入口 */
+  missingCount: { type: Number, default: 0 },
 })
 
-const emit = defineEmits(['update'])
+const emit = defineEmits(['update', 'fill-missing'])
 
 const COMPONENT_OPTIONS = [
   { label: '输入框', value: 'input' },
@@ -38,6 +44,7 @@ const OPERATOR_OPTIONS = [
 
 const localQuery = ref([])
 const activeKey = ref(null)
+const tableRef = ref(null)
 
 watch(
   () => props.queryConfig,
@@ -58,28 +65,74 @@ function onRowOrderChange(rows) {
   emitUpdate()
 }
 
-const fieldNameMap = computed(() => {
+/* ================= 字段引用 ================= */
+// 字段下拉选项：停用字段也列出（标注「停用」）——历史行引用停用字段时，
+// select 展示态要能解析出标题，否则查不到选项会回退显示裸 id
+const fieldOptions = computed(() => {
+  const options = []
+  for (const field of props.fields || []) {
+    const label = field.b_name || field.b_field
+    options.push({
+      label: Number(field.b_canuse) === 1 ? label : `${label}（停用）`,
+      value: String(field.b_id),
+    })
+  }
+  return options
+})
+
+const fieldMap = computed(() => {
   const map = new Map()
   for (const field of props.fields || []) {
-    map.set(String(field.b_id), field.b_name || field.b_field)
+    map.set(String(field.b_id), field)
   }
   return map
 })
 
-function addRow() {
+/* 选定字段后按控件类型重置查询组件/操作符并清空默认值；
+   选字段是配置一行的第一步，直接覆盖（用户随后可再改） */
+function onCellChange(row, col) {
+  if (col?.dataIndex === 'b_field_id' && row.b_field_id != null) {
+    const field = fieldMap.value.get(String(row.b_field_id))
+    if (field) {
+      const defaults = queryRowDefaults(field)
+      row.b_component = defaults.b_component
+      row.b_operator = defaults.b_operator
+      row.b_default_value = null
+    }
+  }
+  emitUpdate()
+}
+
+/* ================= 行增删 ================= */
+async function addRow() {
   if (props.loading) return
-  localQuery.value.push({
-    b_id: createTempId(),
-    b_module_id: props.moduleId,
-    b_field_module_id: props.moduleId,
-    b_field_id: null,
-    b_relation_id: null,
-    b_component: 'input',
-    b_operator: 'eq',
-    b_default_value: null,
-    b_xh: (localQuery.value.length + 1) * 10,
-    b_canuse: 1,
-  })
+  const newId = createTempId()
+  // stk-table 对同一引用数组的 push 不敏感（内部 shallowRef + 引用 watch），必须换新引用才会渲染新行
+  localQuery.value = [
+    ...localQuery.value,
+    {
+      b_id: newId,
+      b_module_id: props.moduleId,
+      b_field_module_id: props.moduleId,
+      b_field_id: null,
+      b_relation_id: null,
+      b_component: 'input',
+      b_operator: 'like',
+      b_default_value: null,
+      b_xh: (localQuery.value.length + 1) * 10,
+      b_canuse: 1,
+    },
+  ]
+  emitUpdate()
+  activeKey.value = String(newId)
+  await nextTick()
+  // 聚焦第一个可编辑列（字段），选定字段后再补组件/操作符
+  tableRef.value?.editRow?.(String(newId), 'b_field_id')
+}
+
+function removeRow(row) {
+  localQuery.value = localQuery.value.filter((item) => item !== row)
+  if (String(row.b_id) === String(activeKey.value)) activeKey.value = null
   emitUpdate()
 }
 
@@ -88,7 +141,7 @@ const columns = shallowRef([
     dataIndex: 'b_field_id',
     title: '字段',
     width: 180,
-    customCell: ({ row }) => fieldNameMap.value.get(String(row.b_field_id)) || row.b_field_id || '',
+    editor: { type: 'select', options: () => fieldOptions.value },
   },
   {
     dataIndex: 'b_component',
@@ -111,6 +164,19 @@ const columns = shallowRef([
     editor: { type: 'checkbox' },
   },
   { dataIndex: 'b_xh', title: '排序号', width: 90 },
+  {
+    dataIndex: 'actions',
+    title: '',
+    width: 60,
+    actions: [
+      {
+        type: 'delete',
+        label: '删除',
+        confirm: '确定删除该查询条件？',
+        onClick: (row) => removeRow(row),
+      },
+    ],
+  },
 ])
 </script>
 
@@ -118,9 +184,19 @@ const columns = shallowRef([
   <div class="mm-panel">
     <div class="mm-panel__toolbar">
       <Button type="primary" :disabled="loading" @click="addRow">新增查询条件</Button>
+      <Button
+        v-if="missingCount > 0"
+        type="outline"
+        :disabled="loading"
+        title="为尚未配置查询条件的启用字段生成默认行"
+        @click="emit('fill-missing')"
+      >
+        补充缺失字段 ({{ missingCount }})
+      </Button>
     </div>
     <div class="mm-panel__body">
       <FmsTable
+        ref="tableRef"
         v-model:columns="columns"
         :data-source="localQuery"
         :editable="!loading"
@@ -128,7 +204,7 @@ const columns = shallowRef([
         row-key="b_id"
         :active-row-key="activeKey"
         @row-click="(_, row) => (activeKey = String(row.b_id))"
-        @change="emitUpdate"
+        @change="onCellChange"
         @row-order-change="onRowOrderChange"
       />
     </div>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/edit-panels/EditDataView.vue b/code/fms/fms-vue/src/views/system/module-management/components/edit-panels/EditDataView.vue
index 4730dcf2..dbed8b8b 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/edit-panels/EditDataView.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/edit-panels/EditDataView.vue
@@ -1,6 +1,6 @@
 <script setup>
 /**
- * 两个编辑器共享的数据视图：工具栏（返回设计视图 / 同步到列表 / 查询配置）+ FmsTable。
+ * 两个编辑器共享的数据视图：工具栏（返回设计视图）+ FmsTable。
  * 行数据与变更提交由壳组件持有，本组件只负责渲染与转发事件。
  */
 import { Button } from '@/components/ui'
@@ -9,35 +9,22 @@ import FmsTable from '@/components/fms-table/FmsTable.vue'
 defineProps({
   rows: { type: Array, required: true },
   loading: { type: Boolean, default: false },
-  listConfig: { type: Array, default: () => [] },
-  queryConfig: { type: Array, default: () => [] },
   dataColumns: { type: Array, required: true },
   /** 高亮行 id（行点击由壳组件更新） */
   activeKey: { type: [String, Number], default: null },
   /** 是否显示行拖拽把手（表格编辑器关闭，避免与列宽拖拽视觉混淆） */
   rowDragHandle: { type: Boolean, default: true },
+  /** 是否显示「返回设计视图」按钮（数据视图常驻的宿主传 false） */
+  showBack: { type: Boolean, default: true },
 })
 
-const emit = defineEmits([
-  'back',
-  'sync-list',
-  'sync-query',
-  'row-click',
-  'change',
-  'row-order-change',
-])
+const emit = defineEmits(['back', 'row-click', 'change', 'row-order-change'])
 </script>
 
 <template>
   <div class="mm-edit__data">
-    <div class="mm-panel__toolbar">
+    <div v-if="showBack" class="mm-panel__toolbar">
       <Button type="outline" :disabled="loading" @click="emit('back')">返回设计视图</Button>
-      <Button type="outline" :disabled="loading || !listConfig.length" @click="emit('sync-list')">
-        同步到列表配置
-      </Button>
-      <Button type="outline" :disabled="loading || !queryConfig.length" @click="emit('sync-query')">
-        同步到查询配置
-      </Button>
     </div>
     <div class="mm-panel__body">
       <FmsTable
@@ -62,6 +49,9 @@ const emit = defineEmits([
   flex-direction: column;
   flex: 1;
   min-height: 0;
+  /* 数据视图不占满面板内框，外层留边与页面其它内容块的呼吸感一致 */
+  padding: 10px;
+  box-sizing: border-box;
 }
 
 .mm-panel__toolbar {
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormEditPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormEditPanel.vue
index b09bb160..f6a5e62e 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormEditPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormEditPanel.vue
@@ -24,10 +24,8 @@ import {
   Button,
   Input,
   Popover,
-  Radio,
-  RadioGroup,
+  Segmented,
   Select,
-  Tabs,
   Checkbox,
   DatePicker,
   Form,
@@ -40,7 +38,6 @@ import { useFieldLookup } from '../../composables/useFieldLookup'
 import {
   applyClipboardProps,
   buildClipboardProps,
-  buildVisibilityMap,
   createEditRowFactory,
   renumberRows,
   toggleFlag,
@@ -54,7 +51,6 @@ const props = defineProps({
   moduleId: { type: String, required: true },
   editConfig: { type: Array, default: () => [] },
   listConfig: { type: Array, default: () => [] },
-  queryConfig: { type: Array, default: () => [] },
   fields: { type: Array, default: () => [] },
   groups: { type: Array, default: () => [] },
   /** 模块编辑方式：form 主表（表单画布设计）| table 子表（表格列设计） */
@@ -67,8 +63,7 @@ const props = defineProps({
 const emit = defineEmits([
   'update',
   'updateGroups',
-  'syncList',
-  'syncQuery',
+  'updateListConfig',
   'update:editMode',
 ])
 
@@ -80,6 +75,17 @@ function onEditModeChange(value) {
   emit('update:editMode', value || 'form')
 }
 
+/* ================= 头部切换器选项（ui Segmented） ================= */
+// 编辑方式的 title 由 #label 插槽挂到 span，保留原生悬浮说明
+const EDIT_MODE_OPTIONS = [
+  { label: '主表表单', value: 'form', title: '主表：以表单形式编辑' },
+  { label: '子表表格', value: 'table', title: '子表：以表格形式编辑' },
+]
+const VIEW_OPTIONS = [
+  { label: '设计', value: 'design' },
+  { label: '数据', value: 'data' },
+]
+
 /* ================= 视图形态 ================= */
 const viewMode = ref('design') // 'design' | 'data'
 const selectedRowKey = ref(null)
@@ -224,47 +230,6 @@ const groupOptions = computed(() => {
   return options
 })
 
-/* ================= 数据视图：同步到列表 / 查询 ================= */
-function syncToList() {
-  if (props.loading) return
-  const visibleMap = buildVisibilityMap(localEdit.value)
-  if (visibleMap.size === 0) {
-    Message.info('编辑配置中没有字段')
-    return
-  }
-  let count = 0
-  const updated = (props.listConfig || []).map((row) => {
-    const target = visibleMap.get(String(row.b_field_id))
-    if (target !== undefined) {
-      count++
-      return { ...row, b_visible: target }
-    }
-    return row
-  })
-  emit('syncList', updated)
-  Message.success(`已同步 ${count} 条到列表配置`)
-}
-
-function syncToQuery() {
-  if (props.loading) return
-  const visibleMap = buildVisibilityMap(localEdit.value)
-  if (visibleMap.size === 0) {
-    Message.info('编辑配置中没有字段')
-    return
-  }
-  let count = 0
-  const updated = (props.queryConfig || []).map((row) => {
-    const target = visibleMap.get(String(row.b_field_id))
-    if (target !== undefined) {
-      count++
-      return { ...row, b_canuse: target }
-    }
-    return row
-  })
-  emit('syncQuery', updated)
-  Message.success(`已同步 ${count} 条到查询配置`)
-}
-
 /* ================= 数据视图：表格列 ================= */
 // 表单（主表）模式：编辑分组 / 栅格宽度 / 占位符 / 文本域高度
 function formDataColumns() {
@@ -449,8 +414,11 @@ watch(
   canvasSections,
   (sections) => {
     sectionOrder.value = sections.map((s) => s)
-    // 首次：初始化持久顺序（默认 = 当前分区顺序）
-    if (!sectionOrderKeys.value.length) {
+    // 首次：初始化持久顺序（默认 = 当前分区顺序）。
+    // 空分区时不写入：本回调写 sectionOrderKeys 会让 canvasSections 失效重算并再次
+    // 触发本 watcher；空 keys 每轮都满足 !length 条件且每次赋新数组引用，
+    // 形成递归更新死循环（新建空模块首次挂载 FormEditPanel 时必现）。
+    if (!sectionOrderKeys.value.length && sections.length) {
       sectionOrderKeys.value = sections.map((s) => s.key)
     }
   },
@@ -580,14 +548,14 @@ function deleteGroupDirect(section) {
     if (String(row.b_group_id || '') === gid) row.b_group_id = null
   }
   emitUpdate()
-  // 列表配置中引用该分组的行清理 b_group_id
+  // 列表配置中引用该分组的行清理 b_group_id（引用完整性，非可见性抄写）
   const listUpdated = (props.listConfig || []).map((r) =>
     String(r.b_group_id || '') === gid ? { ...r, b_group_id: null } : r,
   )
   if (
     listUpdated.some((r, i) => JSON.stringify(r) !== JSON.stringify((props.listConfig || [])[i]))
   ) {
-    emit('syncList', listUpdated)
+    emit('updateListConfig', listUpdated)
   }
   emit('updateGroups', groups.filter((g) => String(g.b_id) !== gid))
   Message.success(
@@ -1334,28 +1302,25 @@ onBeforeUnmount(() => {
       <div class="mm-fdesign__main">
         <div class="mm-edit__head">
           <div class="mm-edit__head-left">
-            <RadioGroup
+            <Segmented
               class="mm-edit__mode"
-              role="group"
               aria-label="编辑方式"
               :model-value="editMode || 'form'"
               :disabled="loading"
+              :options="EDIT_MODE_OPTIONS"
               @update:model-value="onEditModeChange"
             >
-              <Radio value="form" title="主表：以表单形式编辑">主表表单</Radio>
-              <Radio value="table" title="子表：以表格形式编辑">子表表格</Radio>
-            </RadioGroup>
+              <template #label="{ option }">
+                <span :title="option.title">{{ option.label }}</span>
+              </template>
+            </Segmented>
           </div>
           <div class="mm-edit__head-center">
-            <Tabs
+            <Segmented
               class="mm-edit__view-switch"
-              nav-only
-              :items="[
-                { key: 'design', label: '设计' },
-                { key: 'data', label: '数据' },
-              ]"
-              :model-value="viewMode"
               aria-label="视图切换"
+              :model-value="viewMode"
+              :options="VIEW_OPTIONS"
               @update:model-value="switchView"
             />
           </div>
@@ -1366,7 +1331,7 @@ onBeforeUnmount(() => {
             <Button type="ghost" :disabled="loading" @click="previewOpen = true">
               <Eye :size="14" /> 预览
             </Button>
-            <Popover trigger="hover" placement="bottom-end" :arrow="false" :offset="8">
+            <Popover trigger="hover" placement="bottom-end" :arrow="false" :offset="8" unwrapped>
               <template #trigger>
                 <span class="mm-edit__help-icon" aria-hidden="true">?</span>
               </template>
@@ -1719,18 +1684,14 @@ onBeforeUnmount(() => {
       />
     </div>
 
-    <!-- ================= 数据视图 ================= -->
+    <!-- ================= 数据视图（设计/数据切换；外层 padding 由 EditDataView 自带） ================= -->
     <EditDataView
       v-show="viewMode === 'data'"
       :rows="localEdit"
       :loading="loading"
-      :list-config="props.listConfig"
-      :query-config="props.queryConfig"
       :data-columns="dataColumns"
       :active-key="activeKey"
       @back="switchView('design')"
-      @sync-list="syncToList"
-      @sync-query="syncToQuery"
       @row-click="(row) => (activeKey = String(row.b_id))"
       @change="emitUpdate"
       @row-order-change="onRowOrderChange"
@@ -1939,15 +1900,7 @@ onBeforeUnmount(() => {
   justify-content: flex-end;
 }
 
-/* 编辑方式：ui RadioGroup（紧凑字号） */
-.mm-edit__mode {
-  font-size: 12px;
-}
-
-/* 视图切换：ui Tabs nav-only */
-.mm-edit__view-switch {
-  font-size: 12px;
-}
+/* 编辑方式 / 视图切换：ui Segmented（默认尺寸） */
 
 /* ---- 快捷键帮助（右上角 ? 图标，ui Popover hover 展示） ---- */
 .mm-edit__help-icon {
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormInspector.vue b/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormInspector.vue
index 80e7f98b..3d91f9dd 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormInspector.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/form-edit/FormInspector.vue
@@ -246,7 +246,6 @@ const TEXTAREA_HEIGHT_OPTIONS = [
   border-radius: 4px;
   background: transparent;
   color: color-mix(in srgb, var(--fms-text-secondary) 70%, var(--fms-text));
-  transform: none;
 
   &:hover:not(:disabled) {
     background: var(--fms-secondary);
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/i18n-key-cell.scss b/code/fms/fms-vue/src/views/system/module-management/components/i18n-key-cell.scss
new file mode 100644
index 00000000..a05de939
--- /dev/null
+++ b/code/fms/fms-vue/src/views/system/module-management/components/i18n-key-cell.scss
@@ -0,0 +1,35 @@
+/* 多语言键单元格（I18nKeyCell）：随 JS 模块全局引入 */
+.mm-i18n-cell {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 4px;
+  width: 100%;
+}
+
+.mm-i18n-cell__text {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
+  // 继承字段 key 等占位值：灰色弱化
+  &.is-muted {
+    color: var(--fms-text-disabled, #9ca3af);
+  }
+}
+
+.mm-i18n-cell__btn {
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2px;
+  border: none;
+  background: transparent;
+  color: var(--fms-text-secondary);
+  cursor: pointer;
+
+  &:hover {
+    color: var(--fms-primary);
+  }
+}
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/ModuleStructureTree.vue b/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/ModuleStructureTree.vue
index d3333657..b8113c65 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/ModuleStructureTree.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/ModuleStructureTree.vue
@@ -39,8 +39,18 @@ const props = defineProps({
   loading: { type: Boolean, default: false },
   /** 剪贴板是否有列属性（决定右键「粘贴」可用性） */
   pasteEnabled: { type: Boolean, default: false },
+  /** 宿主能力开关（默认全开）：groupEnable 分组启停、colClipboard 列属性复制粘贴、
+   *  colDelete 列删除——列表配置等宿主「行存在即已配置、不删行」时关闭 */
+  features: { type: Object, default: () => ({}) },
 })
 
+// 归一化：仅显式 false 视为关闭，未传字段保持默认开启
+const featureFlags = computed(() => ({
+  groupEnable: props.features.groupEnable !== false,
+  colClipboard: props.features.colClipboard !== false,
+  colDelete: props.features.colDelete !== false,
+}))
+
 const emit = defineEmits([
   'update:selectedKey',
   'col-drop',
@@ -536,19 +546,28 @@ const contextItems = computed(() => {
   const node = contextNode.value
   if (!node || node.key === 'g:ungrouped') return []
   if (node.kind === 'group') {
-    return [
+    const items = [
       { key: 'add-sub', label: '新增子分组', icon: FolderPlus },
       { key: 'rename', label: '重命名', icon: Pencil },
       { divider: true },
-      { key: 'enable', label: node.disabled ? '启用' : '停用', icon: Power },
-      { key: 'delete', label: '删除分组', icon: Trash2, danger: true },
     ]
+    if (featureFlags.value.groupEnable) {
+      items.push({ key: 'enable', label: node.disabled ? '启用' : '停用', icon: Power })
+    }
+    items.push({ key: 'delete', label: '删除分组', icon: Trash2, danger: true })
+    return items
   }
-  return [
-    { key: 'copy', label: '复制列属性', icon: Copy },
-    { key: 'paste', label: '粘贴列属性', icon: Clipboard, disabled: !props.pasteEnabled },
-    { key: 'delete', label: '删除列', icon: Trash2, danger: true },
-  ]
+  const items = []
+  if (featureFlags.value.colClipboard) {
+    items.push(
+      { key: 'copy', label: '复制列属性', icon: Copy },
+      { key: 'paste', label: '粘贴列属性', icon: Clipboard, disabled: !props.pasteEnabled },
+    )
+  }
+  if (featureFlags.value.colDelete) {
+    items.push({ key: 'delete', label: '删除列', icon: Trash2, danger: true })
+  }
+  return items
 })
 
 function onMenuItemClick({ item }) {
@@ -607,6 +626,7 @@ provide('moduleStructureTree', {
   expandedKeys,
   selectedKey: computed(() => props.selectedKey),
   loading: computed(() => props.loading),
+  features: featureFlags,
   dragKey,
   dragType,
   dropKey,
@@ -638,13 +658,11 @@ provide('moduleStructureTree', {
 
 <template>
   <!-- 右键菜单：Dropdown 以鼠标位置为锚点弹出，节点 contextmenu 冒泡至此触发；
-       stretch-trigger：Popover trigger 默认 inline-flex 收缩到内容宽度，
-       结构树需撑满分组树面板，故显式撑开 -->
+       零包裹模式下事件注入到 .mst-tree（自带 width:100%）直接撑满面板 -->
   <Dropdown
     trigger="contextmenu"
     placement="bottom-start"
     :items="contextItems"
-    stretch-trigger
     @click="onMenuItemClick"
   >
     <div class="mst-tree" role="tree" @keydown="onTreeKeydown" @dragleave="onRootDragLeave">
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/StructureTreeNode.vue b/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/StructureTreeNode.vue
index 7abe4f8a..023f93c2 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/StructureTreeNode.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/structure-tree/StructureTreeNode.vue
@@ -41,6 +41,8 @@ const canMoveDown = computed(
   () => !isUngrouped.value && !ctx.loading.value && !isEditing.value && props.node.canDown !== false,
 )
 const canDelete = computed(() => !isUngrouped.value && !ctx.loading.value && !isEditing.value)
+// 列节点的删除按钮按宿主 features 整体隐藏（列表配置语义：行存在即已配置，不删行）
+const showDeleteBtn = computed(() => isGroup.value || ctx.features.value.colDelete)
 // 分组：新增子分组按钮（未分组容器 / 列无此操作）
 const canAddSub = computed(() => isGroup.value && !ctx.loading.value && !isEditing.value)
 function onMove(direction) {
@@ -146,8 +148,9 @@ function onRenameCancel() {
         class="mst-node__grip"
         title="按住拖动：换位 / 拖入分组嵌套"
         aria-label="拖动排序或移动"
-      ><GripVertical /></span>
-      <span v-else class="mst-node__grip is-placeholder" aria-hidden="true"></span>
+      >
+        <GripVertical />
+      </span>
 
       <span
         v-if="isGroup"
@@ -159,7 +162,6 @@ function onRenameCancel() {
       >
         <ChevronRight class="mst-node__switcher-icon" :class="{ 'is-open': isExpanded }" />
       </span>
-      <span v-else class="mst-node__switcher is-placeholder" aria-hidden="true"></span>
 
       <component :is="nodeIcon" class="mst-node__icon" aria-hidden="true" />
 
@@ -242,6 +244,7 @@ function onRenameCancel() {
           <FolderPlus :size="12" />
         </Button>
         <Button
+          v-if="showDeleteBtn"
           type="ghost"
           class="mst-node__act is-danger"
           title="删除"
@@ -341,11 +344,6 @@ function onRenameCancel() {
   color: #b0b7c3;
   cursor: grab;
 
-  &.is-placeholder {
-    cursor: default;
-    visibility: hidden;
-  }
-
   &:active {
     cursor: grabbing;
   }
@@ -366,14 +364,9 @@ function onRenameCancel() {
     background-color 0.15s ease,
     color 0.15s ease;
 
-  &:hover:not(.is-placeholder) {
+  &:hover {
     background: color-mix(in srgb, var(--fms-primary) 10%, transparent);
   }
-
-  &.is-placeholder {
-    cursor: default;
-    visibility: hidden;
-  }
 }
 
 .mst-node__switcher-icon {
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableEditPanel.vue b/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableEditPanel.vue
index 34edce10..aba3f9be 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableEditPanel.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableEditPanel.vue
@@ -1,23 +1,19 @@
 <script setup>
 /**
  * 子表表格设计面板壳组件。
- * 保留对外 props/emits 契约完全不变，负责：
- * - 本地草稿 / 分组 / 选中态
- * - 分组树推导（useGroupTree）+ 结构规范（rebuildFlat / commitColDrag / commitBandDrag）
- * - 结构树专用组件 ModuleStructureTree 的编排与事件转发
- * - 复制/粘贴列属性
- * - 键盘快捷键（Ctrl+C/V/X / Delete）
- * UI 子组件（FieldLibrary / TablePreview / TableInspector / EditDataView）通过
- * props 接收数据、emits 提交变更。
+ * 结构编辑内核（分组树/行归属/平铺重编/选中态/剪贴板/列宽钳制）在
+ * useStructureEditing，多级表头推导在 useBandLayout——均与列表配置面板共用。
+ * 壳层负责：编辑方式与设计/数据视图切换、字段库、Inspector、键盘快捷键的编排，
+ * 以及 UI 子组件（FieldLibrary / TablePreview / TableInspector / EditDataView）的数据接线。
  */
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
 import { Trash2, Plus } from '@lucide/vue'
-import { Message, Button, Popover, Radio, RadioGroup, Tabs } from '@/components/ui'
+import { Button, Popover, Segmented } from '@/components/ui'
 import ModuleStructureTree from '../structure-tree/ModuleStructureTree.vue'
-import { createTempId } from '@/utils/tempId'
-import { useGroupTree, buildGroupTree } from '../../composables/useGroupTree'
+import { useBandLayout } from '../../composables/useBandLayout'
+import { useStructureEditing } from '../../composables/useStructureEditing'
 import { useFieldLookup } from '../../composables/useFieldLookup'
-import { applyClipboardProps, buildClipboardProps, buildVisibilityMap, createEditRowFactory, renumberRows, toggleFlag } from '../../editPanelShared'
+import { createEditRowFactory, renumberRows, toggleFlag } from '../../editPanelShared'
 import FieldLibrary from '../edit-panels/FieldLibrary.vue'
 import TablePreview from './TablePreview.vue'
 import TableInspector from './TableInspector.vue'
@@ -26,8 +22,8 @@ import EditDataView from '../edit-panels/EditDataView.vue'
 const props = defineProps({
   moduleId: { type: String, required: true },
   editConfig: { type: Array, default: () => [] },
+  /** @deprecated 仅兼容旧绑定：分组删除的列表引用清理已上移 index.vue onGroupsUpdate */
   listConfig: { type: Array, default: () => [] },
-  queryConfig: { type: Array, default: () => [] },
   fields: { type: Array, default: () => [] },
   groups: { type: Array, default: () => [] },
   editMode: { type: String, default: 'form' },
@@ -35,13 +31,24 @@ const props = defineProps({
   active: { type: Boolean, default: true },
 })
 
-const emit = defineEmits(['update', 'updateGroups', 'syncList', 'syncQuery', 'update:editMode'])
+// updateGroups(groups, removedGroupIds?)：removedGroupIds 非空时由宿主级联清理其它配置分节的引用
+const emit = defineEmits(['update', 'updateGroups', 'update:editMode'])
 
-/* ================= 本地草稿 ================= */
-const localEdit = ref([])
-const localGroups = ref([])
-watch(() => props.groups, (g) => { localGroups.value = g ? g.map((row) => ({ ...row })) : [] }, { immediate: true })
+/* ================= 头部切换器选项（ui Segmented） ================= */
+// 编辑方式的 title 由 #label 插槽挂到 span，保留原生悬浮说明
+const EDIT_MODE_OPTIONS = [
+  { label: '主表表单', value: 'form', title: '主表：以表单形式编辑' },
+  { label: '子表表格', value: 'table', title: '子表：以表格形式编辑' },
+]
+const VIEW_OPTIONS = [
+  { label: '设计', value: 'design' },
+  { label: '数据', value: 'data' },
+]
+
+/* ================= 视图形态 ================= */
+const viewMode = ref('design')
 const activeKey = ref(null)
+const inspectorCollapsed = ref(false)
 const structureTreeRef = ref(null)
 
 function onEditModeChange(value) {
@@ -49,53 +56,17 @@ function onEditModeChange(value) {
   emit('update:editMode', value || 'form')
 }
 
-/* ================= 视图形态 ================= */
-const viewMode = ref('design')
-const selectedNodeKey = ref(null)
-const inspectorCollapsed = ref(false)
-
-function emitUpdate() { emit('update', localEdit.value) }
-
-/* ================= 数据视图：行排序 ================= */
-function onRowOrderChange(rows) {
-  localEdit.value = renumberRows(rows)
-  emitUpdate()
-}
-
 /* ================= 公共查询表 ================= */
-const { fieldNameMap, fieldMap, fieldOf, fieldName, controlTypeLabel } = useFieldLookup(() => props.fields)
-
-/* ================= 数据视图：同步到列表 / 查询 ================= */
-function syncToList() {
-  if (props.loading) return
-  const visibleMap = buildVisibilityMap(localEdit.value)
-  if (visibleMap.size === 0) { Message.info('编辑配置中没有字段'); return }
-  let count = 0
-  const updated = (props.listConfig || []).map((row) => {
-    const target = visibleMap.get(String(row.b_field_id))
-    if (target !== undefined) { count++; return { ...row, b_visible: target } }
-    return row
-  })
-  emit('syncList', updated)
-  Message.success(`已同步 ${count} 条到列表配置`)
-}
-function syncToQuery() {
-  if (props.loading) return
-  const visibleMap = buildVisibilityMap(localEdit.value)
-  if (visibleMap.size === 0) { Message.info('编辑配置中没有字段'); return }
-  let count = 0
-  const updated = (props.queryConfig || []).map((row) => {
-    const target = visibleMap.get(String(row.b_field_id))
-    if (target !== undefined) { count++; return { ...row, b_canuse: target } }
-    return row
-  })
-  emit('syncQuery', updated)
-  Message.success(`已同步 ${count} 条到查询配置`)
-}
+const { fieldMap, fieldOf, fieldName, controlTypeLabel } = useFieldLookup(() => props.fields)
 
 /* ================= 数据视图：表格列 ================= */
 const dataColumns = computed(() => [
-  { dataIndex: 'b_field_id', title: '字段', width: 180, customCell: ({ row }) => fieldNameMap.value.get(String(row.b_field_id)) || row.b_field_id || '' },
+  {
+    dataIndex: 'b_field_id',
+    title: '字段',
+    width: 180,
+    customCell: ({ row }) => fieldName(row) || row.b_field_id || '',
+  },
   { dataIndex: 'b_visible', title: '显示', width: 70, align: 'center', editor: { type: 'checkbox' } },
   { dataIndex: 'b_required', title: '必填', width: 70, align: 'center', editor: { type: 'checkbox' } },
   { dataIndex: 'b_readonly', title: '只读', width: 70, align: 'center', editor: { type: 'checkbox' } },
@@ -104,135 +75,81 @@ const dataColumns = computed(() => [
   { dataIndex: 'b_xh', title: '排序号', width: 90 },
 ])
 
-/* ================= 设计视图：字段/分组推导 ================= */
-const COLUMN_WIDTH_OPTIONS = [
-  { label: '窄 90', value: '90' }, { label: '默认 120', value: '120' },
-  { label: '中 160', value: '160' }, { label: '宽 200', value: '200' }, { label: '大 240', value: '240' },
-]
-
-function widthOf(row) {
-  const v = Number(row?.b_width)
-  return v >= 40 && v <= 600 ? v : 120
-}
+/* ================= 设计视图：默认列宽 ================= */
 function defaultWidthOf(field) {
   const map = { checkbox: 90, number: 140, money: 140, date: 140, datetime: 170, select: 160, textarea: 220 }
   return map[field?.b_type] || 140
 }
-function onWidthChange(value) {
-  const row = selectedRow.value
-  if (!row || props.loading) return
-  row.b_width = Math.min(600, Math.max(40, Number(value) || 120))
-  emitUpdate()
-}
-function onWidthCommit(value) {
-  const row = selectedRow.value
-  if (!row || props.loading) return
-  const width = Math.min(600, Math.max(40, Number(value) || 120))
-  if (width === widthOf(row)) return
-  row.b_width = width
-  emitUpdate()
-}
-function onWidthStep(delta) {
-  const row = selectedRow.value
-  if (!row || props.loading) return
-  onWidthChange(widthOf(row) + delta)
-}
-const columnWidthOptions = computed(() => {
-  if (!selectedRow.value) return COLUMN_WIDTH_OPTIONS
-  const current = String(widthOf(selectedRow.value))
-  if (COLUMN_WIDTH_OPTIONS.some((o) => o.value === current)) return COLUMN_WIDTH_OPTIONS
-  return [...COLUMN_WIDTH_OPTIONS, { label: `当前 ${current}px`, value: current }]
+
+/* ================= 结构编辑内核（与列表配置共用） ================= */
+const editing = useStructureEditing({
+  moduleId: () => props.moduleId,
+  getGroups: () => props.groups,
+  getRows: () => props.editConfig,
+  loading: () => props.loading,
+  createRow: createEditRowFactory({
+    moduleId: props.moduleId,
+    getExtra: (field) => ({ b_width: defaultWidthOf(field) }),
+  }),
+  applyGroups: (groups, removedGroupIds) => emit('updateGroups', groups, removedGroupIds),
+  applyRows: (rows) => emit('update', rows),
+  requestRename: (gid) => structureTreeRef.value?.startRename(gid),
+  fieldNameOf: (row) => fieldName(row),
+  getField: (fieldId) => fieldMap.value.get(fieldId),
 })
+const {
+  localRows: localEdit,
+  localGroups,
+  selectedNodeKey,
+  selectedRow,
+  selectedBand,
+  groupColumnsMap,
+  bandMeta,
+  groupIdOfRow,
+  addRootGroup,
+  addSubGroup,
+  deleteBand,
+  onRenameCommit,
+  onBandTitleChange,
+  toggleBandEnable,
+  commitBandDrag,
+  commitColDrag,
+  removeRow,
+  removeSelected,
+  onNodeMove,
+  onNodeDelete,
+  onNodeAddSub,
+  selectField,
+  onFieldDrop,
+  clipboardProps,
+  copyRowProps,
+  pastePropsToSelected,
+  widthOf,
+  onWidthCommit,
+} = editing
 
-/* ================= 分组树（多级表头） ================= */
-const { groupColumnsMap, bandMeta, isDescendantGroup, groupIdOfRow } = useGroupTree(localGroups, localEdit)
-
-const visualColumns = computed(() => {
-  const columns = groupColumnsMap.value
-  const list = []
-  for (const row of columns.ungrouped) list.push({ kind: 'col', key: `col-${row.b_field_id}`, row, gid: null })
-  const walk = (nodes) => {
-    for (const node of nodes) {
-      const own = columns.map.get(node.gid) || []
-      for (const row of own) list.push({ kind: 'col', key: `col-${row.b_field_id}`, row, gid: node.gid })
-      if (!own.length && !node.children.length) list.push({ kind: 'slot', key: `slot-${node.gid}`, gid: node.gid, group: node.group })
-      walk(node.children)
-    }
-  }
-  walk(bandMeta.value.roots)
-  return list
-})
-
-const bandRows = computed(() => {
-  const { roots, maxLevel } = bandMeta.value
-  if (!roots.length) return []
-  const ungrouped = groupColumnsMap.value.ungrouped
-  const totalHeaderRows = maxLevel + 2
-  const byLevel = new Map()
-  const collect = (nodes) => {
-    for (const node of nodes) { if (!byLevel.has(node.level)) byLevel.set(node.level, []); byLevel.get(node.level).push(node); collect(node.children) }
-  }
-  collect(roots)
-  const rows = []
-  for (let level = 0; level <= maxLevel; level++) {
-    const nodes = byLevel.get(level) || []
-    const cells = []
-    if (level === 0 && ungrouped.length) {
-      for (const row of ungrouped) cells.push({ kind: 'ungrouped-col', row, span: 1, rowspan: totalHeaderRows })
-    }
-    cells.push(...nodes.map((node) => ({ kind: 'band', gid: node.gid, group: node.group, level: node.level, span: node.span, rowspan: node.children.length ? 1 : maxLevel - node.level + 1 })))
-    rows.push(cells)
-  }
-  return rows
-})
-
-const ungroupedInBand = computed(() => bandRows.value.length > 0 && groupColumnsMap.value.ungrouped.length > 0)
-const headerColumns = computed(() => {
-  if (!ungroupedInBand.value) return visualColumns.value
-  return visualColumns.value.filter((c) => c.gid != null)
-})
-
-/* ================= 关键处理区：分组树数据 ================= */
-function findRowByFieldId(fid) { return localEdit.value.find((r) => String(r.b_field_id) === String(fid)) || null }
-
-watch(() => props.editConfig, (val) => {
-  if (val === localEdit.value) return
-  localEdit.value = val?.map((row) => ({ ...row })) || []
-  reorderSilently()
-}, { immediate: true })
+const { visualColumns, bandRows, headerColumns } = useBandLayout(editing)
 
 const groupCount = computed(() => (props.groups || []).length)
 
-/* ================= 结构编辑：事件转发 ================= */
-function onColDrop({ fieldId, line }) { if (props.loading || !fieldId || !line) return; commitColDrag(fieldId, line) }
-function onBandDrop({ gid, line }) { if (props.loading || !gid || !line) return; commitBandDrag(gid, line) }
-function onFieldDrop({ fieldId, dropKey, dropPosition }) { onExternalFieldDrop(fieldId, dropKey, dropPosition) }
+function emitUpdate() {
+  emit('update', localEdit.value)
+}
 
-function onExternalFieldDrop(fieldId, dropKey, dropPosition) {
-  if (props.loading || !fieldId) return
-  const field = fieldMap.value.get(String(fieldId))
-  if (!field) return
-  const existing = localEdit.value.find((r) => String(r.b_field_id) === String(fieldId))
-  if (existing) {
-    if (dropKey === 'g:ungrouped') { commitColDrag(fieldId, { kind: 'ungrouped' }) }
-    else if (dropKey.startsWith('g:')) { commitColDrag(fieldId, { kind: 'into-band', gid: dropKey.slice(2) }) }
-    else {
-      const row = findRowByFieldId(dropKey.slice(2))
-      commitColDrag(fieldId, { kind: 'col-edge', gid: row ? groupIdOfRow(row) : null, targetId: dropKey.slice(2), pos: dropPosition === 'before' ? 'before' : 'after' })
-    }
-    return
-  }
-  let groupId = null, targetId = null
-  if (dropKey === 'g:ungrouped') { groupId = null }
-  else if (dropKey.startsWith('g:')) { groupId = dropKey.slice(2) }
-  else {
-    const row = findRowByFieldId(dropKey.slice(2))
-    groupId = row ? groupIdOfRow(row) : null; targetId = row ? dropKey.slice(2) : null
-  }
-  const created = insertField(field, { groupId, targetId, position: dropPosition === 'before' ? 'before' : 'after' })
-  if (!created) return
-  selectRow(created)
-  nextTick(() => scrollToRowCell(String(created.b_field_id)))
+/* ================= 数据视图：行排序 ================= */
+function onRowOrderChange(rows) {
+  localEdit.value = renumberRows(rows)
+  emitUpdate()
+}
+
+/* ================= 结构编辑：事件转发 ================= */
+function onColDrop({ fieldId, line }) {
+  if (props.loading || !fieldId || !line) return
+  commitColDrag(fieldId, line)
+}
+function onBandDrop({ gid, line }) {
+  if (props.loading || !gid || !line) return
+  commitBandDrag(gid, line)
 }
 
 function onStructureContextMenuClick({ item, node }) {
@@ -241,334 +158,21 @@ function onStructureContextMenuClick({ item, node }) {
     if (!band) return
     if (item.key === 'add-sub') addSubGroup(band)
     else if (item.key === 'rename') structureTreeRef.value?.startRename(String(node.gid))
-    else if (item.key === 'enable') { selectBand(band); toggleBandEnable() }
-    else if (item.key === 'delete') deleteBand(band)
+    else if (item.key === 'enable') {
+      editing.selectBand(band)
+      toggleBandEnable()
+    } else if (item.key === 'delete') deleteBand(band)
   } else if (node?.kind === 'col') {
-    if (item.key === 'copy') { selectRow(node.row); copyRowProps() }
-    else if (item.key === 'paste') { selectRow(node.row); pastePropsToSelected() }
-    else if (item.key === 'delete') removeRow(node.row)
+    if (item.key === 'copy') {
+      editing.selectRow(node.row)
+      copyRowProps()
+    } else if (item.key === 'paste') {
+      editing.selectRow(node.row)
+      pastePropsToSelected()
+    } else if (item.key === 'delete') removeRow(node.row)
   }
 }
 
-function onRenameCommit({ gid, title }) {
-  const updated = (props.groups || []).map((g) => String(g.b_id) === String(gid) ? { ...g, b_title: title } : g)
-  emit('updateGroups', updated)
-}
-
-/* ================= 结构规范化 ================= */
-function reorderSilently() {
-  const columns = groupColumnsMap.value
-  const list = [...columns.ungrouped]
-  const walk = (nodes) => { for (const node of nodes) { for (const row of columns.map.get(node.gid) || []) list.push(row); walk(node.children) } }
-  walk(bandMeta.value.roots)
-  if (list.length === localEdit.value.length && list.every((r, i) => r === localEdit.value[i])) return
-  localEdit.value = list
-}
-
-function rebuildFlat(roots = bandMeta.value.roots) {
-  const columns = groupColumnsMap.value
-  const list = [...columns.ungrouped]
-  const walk = (nodes) => { for (const node of nodes) { for (const row of columns.map.get(node.gid) || []) list.push(row); walk(node.children) } }
-  walk(roots)
-  localEdit.value = list.map((row, i) => ({ ...row, b_xh: (i + 1) * 10 }))
-  emitUpdate()
-}
-
-// 由给定分组数组构建可用于重排的 band 根节点（gid + children），与 bandMeta 解耦
-function toRoots(nodes) {
-  return nodes.map((node) => ({ gid: String(node.group.b_id), children: toRoots(node.children) }))
-}
-function bandRootsFromGroups(groups) {
-  return toRoots(buildGroupTree(groups))
-}
-
-function renumberAllSiblings(groups) {
-  const roots = buildGroupTree(groups)
-  const result = []
-  const walk = (nodes) => { nodes.forEach((node, i) => { result.push({ ...node.group, b_xh: (i + 1) * 10 }); walk(node.children) }) }
-  walk(roots)
-  return result
-}
-function emitGroupsRenumbered(nextGroups) { emit('updateGroups', renumberAllSiblings(nextGroups)) }
-
-/* ================= 选择 ================= */
-const selectedRow = computed(() => {
-  const key = selectedNodeKey.value
-  if (!key || !key.startsWith('c:')) return null
-  return findRowByFieldId(key.slice(2)) || null
-})
-const selectedBand = computed(() => {
-  const key = selectedNodeKey.value
-  if (!key || !key.startsWith('g:') || key === 'g:ungrouped') return null
-  return bandMeta.value.metaMap.get(key.slice(2)) || null
-})
-function selectRow(row) { selectedNodeKey.value = row ? `c:${row.b_field_id}` : null }
-function selectBand(band) { selectedNodeKey.value = band ? `g:${band.gid}` : null }
-function clearSelection() { selectedNodeKey.value = null }
-
-/* ================= 分组带：增删改 ================= */
-function nextGroupXh() { return (props.groups || []).reduce((m, g) => Math.max(m, Number(g.b_xh || 0)), 0) + 10 }
-
-function addRootGroup() {
-  if (props.loading) return
-  const newGroup = { b_id: createTempId(), b_module_id: props.moduleId, b_parent_id: null, b_title: '', b_xh: nextGroupXh(), b_canuse: 1 }
-  emitGroupsRenumbered([...(props.groups || []), newGroup])
-  focusNewBandTitle(newGroup.b_id)
-}
-
-function addSubGroup(band) {
-  if (!band || props.loading) return
-  const newGroup = { b_id: createTempId(), b_module_id: props.moduleId, b_parent_id: String(band.gid), b_title: '', b_xh: nextGroupXh(), b_canuse: 1 }
-  emitGroupsRenumbered([...(props.groups || []), newGroup])
-  focusNewBandTitle(newGroup.b_id)
-}
-
-function focusNewBandTitle(gid) {
-  nextTick(() => {
-    if (!bandMeta.value.metaMap.has(String(gid))) return
-    selectedNodeKey.value = `g:${gid}`
-    structureTreeRef.value?.startRename(String(gid))
-  })
-}
-
-function deleteBand(band) {
-  if (!band || props.loading) return
-  const gid = String(band.gid)
-  const full = bandMeta.value.metaMap.get(gid)
-  if (!full) return
-  const title = full.group.b_title || `分组-${gid}`
-  const affected = new Set()
-  const collect = (nodes) => { for (const node of nodes) { affected.add(String(node.gid)); collect(node.children) } }
-  collect([full])
-  const childGids = new Set(full.children.map((n) => String(n.gid)))
-  const parentId = full.group.b_parent_id == null ? null : String(full.group.b_parent_id)
-  let groups = (props.groups || []).filter((g) => String(g.b_id) !== gid)
-  groups = groups.map((g) => (childGids.has(String(g.b_id)) ? { ...g, b_parent_id: parentId } : g))
-  for (const row of localEdit.value) { if (groupIdOfRow(row) === gid) row.b_group_id = null }
-  rebuildFlat(bandRootsFromGroups(groups))
-  emit('updateGroups', groups)
-  const listUpdated = (props.listConfig || []).map((r) => {
-    const rgid = r.b_group_id == null ? null : String(r.b_group_id)
-    return rgid === gid ? { ...r, b_group_id: null } : r
-  })
-  if (listUpdated.some((r, i) => JSON.stringify(r) !== JSON.stringify((props.listConfig || [])[i]))) { emit('syncList', listUpdated) }
-  if (selectedNodeKey.value === `g:${gid}`) selectedNodeKey.value = null
-  Message.success(affected.size > 1 ? `已删除分组「${title}」，其下字段移至「未分组」` : `已删除分组「${title}」`)
-}
-
-function onBandTitleChange(value) {
-  const band = selectedBand.value
-  if (!band || props.loading) return
-  const title = String(value ?? '').trim()
-  if (band.group.b_title === title) return
-  emit('updateGroups', (props.groups || []).map((g) => String(g.b_id) === String(band.gid) ? { ...g, b_title: title } : g))
-}
-
-function toggleBandEnable() {
-  const band = selectedBand.value
-  if (!band || props.loading) return
-  emit('updateGroups', (props.groups || []).map((g) => String(g.b_id) === String(band.gid) ? { ...g, b_canuse: Number(g.b_canuse) === 1 ? 0 : 1 } : g))
-}
-
-/* ================= 列：增删改 ================= */
-const createEditRow = createEditRowFactory({ moduleId: props.moduleId, getExtra: (field) => ({ b_width: defaultWidthOf(field) }) })
-
-function appendIntoGroup(row, groupId, rows) {
-  if (groupId != null) {
-    const last = bandOwnRangeEnd(String(groupId), rows)
-    if (last >= 0) rows.splice(last + 1, 0, row)
-    else rows.splice(countColumnsBefore(String(groupId), rows), 0, row)
-  } else { rows.push(row) }
-}
-
-function insertField(field, { groupId = null, targetId = null, position = 'after' } = {}) {
-  if (!field || props.loading) return null
-  const existing = localEdit.value.find((r) => String(r.b_field_id) === String(field.b_id))
-  if (existing) return existing
-  const row = createEditRow(field, groupId)
-  if (targetId != null) {
-    const tIdx = localEdit.value.findIndex((r) => String(r.b_field_id) === String(targetId))
-    if (tIdx >= 0) localEdit.value.splice(tIdx + (position === 'after' ? 1 : 0), 0, row)
-    else appendIntoGroup(row, groupId, localEdit.value)
-  } else { appendIntoGroup(row, groupId, localEdit.value) }
-  rebuildFlat()
-  return row
-}
-
-function removeRow(row) {
-  if (!row || props.loading) return
-  localEdit.value = renumberRows(localEdit.value.filter((item) => String(item.b_id) !== String(row.b_id)))
-  emitUpdate()
-  if (selectedNodeKey.value === `c:${row.b_field_id}`) selectedNodeKey.value = null
-}
-
-function removeSelected() {
-  const band = selectedBand.value
-  if (band) { deleteBand(band); return }
-  removeRow(selectedRow.value)
-}
-
-/* ================= 结构树节点常驻操作 ================= */
-function onNodeMove({ key, direction }) {
-  if (props.loading || !key || !direction) return
-  if (key.startsWith('c:')) { const row = findRowByFieldId(key.slice(2)); if (row) moveColumn(row, direction) }
-  else if (key.startsWith('g:') && key !== 'g:ungrouped') { const band = bandMeta.value.metaMap.get(key.slice(2)); if (band) moveBand(band, direction) }
-}
-function onNodeDelete({ key }) {
-  if (props.loading || !key) return
-  if (key.startsWith('c:')) { const row = findRowByFieldId(key.slice(2)); if (row) removeRow(row) }
-  else if (key.startsWith('g:') && key !== 'g:ungrouped') { const band = bandMeta.value.metaMap.get(key.slice(2)); if (band) deleteBand(band) }
-}
-function onNodeAddSub({ key }) {
-  if (props.loading || !key || !key.startsWith('g:') || key === 'g:ungrouped') return
-  const band = bandMeta.value.metaMap.get(key.slice(2))
-  if (band) addSubGroup(band)
-}
-
-function moveColumn(row, delta) {
-  const list = localEdit.value
-  const gid = groupIdOfRow(row)
-  const own = []
-  for (let i = 0; i < list.length; i++) { if (groupIdOfRow(list[i]) === gid) own.push(i) }
-  const idx = own.findIndex((i) => String(list[i].b_id) === String(row.b_id))
-  const target = idx + (delta > 0 ? 1 : -1)
-  if (idx < 0 || target < 0 || target >= own.length) return
-  const a = own[idx], b = own[target]
-  const tmp = list[a]; list[a] = list[b]; list[b] = tmp
-  rebuildFlat()
-  selectedNodeKey.value = `c:${row.b_field_id}`
-}
-
-function moveBand(band, delta) {
-  const gid = String(band.gid)
-  const parentId = band.group.b_parent_id == null ? null : String(band.group.b_parent_id)
-  const parentNode = parentId != null ? bandMeta.value.metaMap.get(parentId) : null
-  const sibs = parentNode ? parentNode.children : bandMeta.value.roots
-  const idx = sibs.findIndex((n) => String(n.gid) === gid)
-  if (idx < 0) return
-  const target = idx + (delta > 0 ? 1 : -1)
-  if (target < 0 || target >= sibs.length) return
-  commitBandDrag(gid, { kind: 'band-edge', gid: sibs[target].gid, pos: delta > 0 ? 'after' : 'before' })
-}
-
-function selectField(field) {
-  if (!field || props.loading) return
-  const existing = localEdit.value.find((r) => String(r.b_field_id) === String(field.b_id))
-  if (existing) { selectRow(existing); nextTick(() => scrollToRowCell(String(existing.b_field_id))); return }
-  const band = selectedBand.value
-  const gid = band ? String(band.gid) : null
-  const row = insertField(field, { groupId: gid })
-  if (!row) return
-  selectRow(row)
-  nextTick(() => scrollToRowCell(String(row.b_field_id)))
-}
-
-function scrollToRowCell(fieldId) {
-  document.querySelector(`.mm-tdesign__cell[data-field-id="${fieldId}"]`)?.scrollIntoView?.({ block: 'nearest', behavior: 'smooth' })
-}
-
-/* ================= 复制/粘贴（列属性） ================= */
-const clipboardProps = ref(null)
-const CLIP_KEYS = ['b_required', 'b_readonly', 'b_disabled', 'b_visible', 'b_placeholder', 'b_height', 'b_width']
-
-function copyRowProps() {
-  const row = selectedRow.value
-  if (!row || props.loading) return
-  clipboardProps.value = buildClipboardProps(row, fieldName, CLIP_KEYS)
-}
-
-function pastePropsToSelected() {
-  const row = selectedRow.value
-  if (!row || props.loading || !clipboardProps.value) return
-  applyClipboardProps(row, clipboardProps.value.props)
-  emitUpdate()
-}
-
-/* ================= 结构拖拽 commit ================= */
-function bandOwnRangeEnd(gid, rows) {
-  let last = -1
-  rows.forEach((r, i) => { if (groupIdOfRow(r) === gid) last = i })
-  return last
-}
-
-function countColumnsBefore(gid, rows) {
-  const columns = groupColumnsMap.value
-  let count = 0, found = false
-  const walk = (nodes) => {
-    if (found) return
-    for (const node of nodes) {
-      if (node.gid === gid) { found = true; return }
-      count += (columns.map.get(node.gid) || []).length
-      walk(node.children)
-      if (found) return
-    }
-  }
-  walk(bandMeta.value.roots)
-  return found ? count : rows.length
-}
-
-function commitColDrag(fieldId, line) {
-  const rows = localEdit.value
-  const idx = rows.findIndex((r) => String(r.b_field_id) === String(fieldId))
-  if (idx < 0) return
-  const [moved] = rows.splice(idx, 1)
-  let insertAt = -1
-  if (line.kind === 'col-edge') {
-    const tIdx = rows.findIndex((r) => String(r.b_field_id) === String(line.targetId))
-    if (tIdx < 0) { rows.splice(idx, 0, moved); return }
-    moved.b_group_id = line.gid == null ? null : String(line.gid)
-    insertAt = tIdx + (line.pos === 'after' ? 1 : 0)
-  } else if (line.kind === 'into-band') {
-    moved.b_group_id = String(line.gid)
-    const last = bandOwnRangeEnd(String(line.gid), rows)
-    insertAt = last >= 0 ? last + 1 : countColumnsBefore(String(line.gid), rows)
-  } else if (line.kind === 'col-group-edge') {
-    const target = bandMeta.value.metaMap.get(String(line.gid))
-    if (!target) { rows.splice(idx, 0, moved); return }
-    moved.b_group_id = target.group.b_parent_id == null ? null : String(target.group.b_parent_id)
-    insertAt = countColumnsBefore(String(line.gid), rows)
-    if (line.pos === 'after') insertAt += target.span
-  } else if (line.kind === 'ungrouped') { moved.b_group_id = null; insertAt = rows.length }
-  else { rows.splice(idx, 0, moved); return }
-  if (insertAt < 0) insertAt = rows.length
-  rows.splice(insertAt, 0, moved)
-  rebuildFlat()
-  selectedNodeKey.value = `c:${moved.b_field_id}`
-}
-
-function commitBandDrag(sourceGid, line) {
-  const source = bandMeta.value.metaMap.get(String(sourceGid))
-  if (!source) return
-  let newParentId = null, orderedSibGids = []
-  if (line.kind === 'band-nest') {
-    const target = bandMeta.value.metaMap.get(String(line.gid))
-    if (!target || isDescendantGroup(String(sourceGid), line.gid)) return
-    newParentId = String(target.gid)
-    orderedSibGids = [...target.children.filter((n) => n.gid !== sourceGid).map((n) => n.gid), sourceGid]
-  } else if (line.kind === 'band-edge') {
-    const target = bandMeta.value.metaMap.get(String(line.gid))
-    if (!target || isDescendantGroup(String(sourceGid), line.gid)) return
-    newParentId = target.group.b_parent_id == null ? null : String(target.group.b_parent_id)
-    const parentNode = newParentId != null ? bandMeta.value.metaMap.get(newParentId) : null
-    const sibGids = (parentNode ? parentNode.children : bandMeta.value.roots).filter((n) => n.gid !== sourceGid).map((n) => n.gid)
-    const tIdx = sibGids.indexOf(String(line.gid))
-    if (tIdx < 0) return
-    orderedSibGids = [...sibGids]; orderedSibGids.splice(line.pos === 'after' ? tIdx + 1 : tIdx, 0, sourceGid)
-  } else { return }
-  const sibSet = new Set(orderedSibGids.map(String))
-  const orderById = new Map(orderedSibGids.map((gid, i) => [String(gid), i]))
-  const groups = (props.groups || []).map((g) => {
-    const c = { ...g }; const gid = String(g.b_id)
-    if (gid === String(sourceGid)) c.b_parent_id = newParentId
-    if (sibSet.has(gid)) c.b_xh = (orderById.get(gid) + 1) * 10
-    return c
-  })
-  emit('updateGroups', groups)
-  localGroups.value = groups.map((g) => ({ ...g }))
-  rebuildFlat(bandRootsFromGroups(groups))
-  selectedNodeKey.value = `g:${sourceGid}`
-}
-
 /* ================= 键盘快捷键 ================= */
 function onDesignerKeydown(event) {
   if (!props.active) return
@@ -578,19 +182,39 @@ function onDesignerKeydown(event) {
   }
   if (event.target?.closest?.('input, textarea, select, [contenteditable="true"]')) return
   const mod = event.ctrlKey || event.metaKey
-  if (mod && (event.key === 'c' || event.key === 'C')) { event.preventDefault(); copyRowProps(); return }
-  if (mod && (event.key === 'v' || event.key === 'V')) { event.preventDefault(); pastePropsToSelected(); return }
-  if (mod && (event.key === 'x' || event.key === 'X')) { event.preventDefault(); copyRowProps(); removeSelected(); return }
+  if (mod && (event.key === 'c' || event.key === 'C')) {
+    event.preventDefault()
+    copyRowProps()
+    return
+  }
+  if (mod && (event.key === 'v' || event.key === 'V')) {
+    event.preventDefault()
+    pastePropsToSelected()
+    return
+  }
+  if (mod && (event.key === 'x' || event.key === 'X')) {
+    event.preventDefault()
+    copyRowProps()
+    removeSelected()
+    return
+  }
   if (['Delete', 'Backspace'].includes(event.key)) {
     const band = selectedBand.value
-    if (band) { event.preventDefault(); deleteBand(band); return }
+    if (band) {
+      event.preventDefault()
+      deleteBand(band)
+      return
+    }
     if (!selectedRow.value) return
-    event.preventDefault(); removeSelected()
+    event.preventDefault()
+    removeSelected()
   }
 }
 
 onMounted(() => window.addEventListener('keydown', onDesignerKeydown))
-onBeforeUnmount(() => { window.removeEventListener('keydown', onDesignerKeydown) })
+onBeforeUnmount(() => {
+  window.removeEventListener('keydown', onDesignerKeydown)
+})
 
 /* ================= 属性编辑（列，写入草稿，随页面「保存」提交） ================= */
 function toggleInspector(key) {
@@ -603,8 +227,9 @@ function toggleInspector(key) {
 /* ================= 视图切换 ================= */
 function switchView(mode) {
   viewMode.value = mode
-  if (mode === 'data') { activeKey.value = selectedRow.value ? String(selectedRow.value.b_id) : null }
-  else if (activeKey.value != null) {
+  if (mode === 'data') {
+    activeKey.value = selectedRow.value ? String(selectedRow.value.b_id) : null
+  } else if (activeKey.value != null) {
     const row = localEdit.value.find((r) => String(r.b_id) === String(activeKey.value))
     if (row) selectedNodeKey.value = `c:${row.b_field_id}`
   }
@@ -630,26 +255,41 @@ function switchView(mode) {
       <div class="mm-fdesign__main">
         <div class="mm-edit__head">
           <div class="mm-edit__head-left">
-            <RadioGroup class="mm-edit__mode" role="group" aria-label="编辑方式"
-              :model-value="editMode || 'form'" :disabled="loading" @update:model-value="onEditModeChange">
-              <Radio value="form" title="主表：以表单形式编辑">主表表单</Radio>
-              <Radio value="table" title="子表：以表格形式编辑">子表表格</Radio>
-            </RadioGroup>
+            <Segmented
+              class="mm-edit__mode"
+              aria-label="编辑方式"
+              :model-value="editMode || 'form'"
+              :disabled="loading"
+              :options="EDIT_MODE_OPTIONS"
+              @update:model-value="onEditModeChange"
+            >
+              <template #label="{ option }">
+                <span :title="option.title">{{ option.label }}</span>
+              </template>
+            </Segmented>
           </div>
           <div class="mm-edit__head-center">
-            <Tabs class="mm-edit__view-switch" nav-only
-              :items="[{ key: 'design', label: '设计' }, { key: 'data', label: '数据' }]"
-              :model-value="viewMode" aria-label="视图切换" @update:model-value="switchView" />
+            <Segmented
+              class="mm-edit__view-switch"
+              aria-label="视图切换"
+              :model-value="viewMode"
+              :options="VIEW_OPTIONS"
+              @update:model-value="switchView"
+            />
           </div>
           <div class="mm-edit__head-right">
             <Button type="outline" :disabled="loading" @click="addRootGroup">
               <Plus :size="14" /> 添加分组
             </Button>
-            <Button type="outline" :disabled="loading || !(selectedRow || selectedBand)"
-              title="删除选中的列或分组带" @click="removeSelected">
+            <Button
+              type="outline"
+              :disabled="loading || !(selectedRow || selectedBand)"
+              title="删除选中的列或分组带"
+              @click="removeSelected"
+            >
               <Trash2 :size="14" /> 删除
             </Button>
-            <Popover trigger="hover" placement="bottom-end" :arrow="false" :offset="8">
+            <Popover trigger="hover" placement="bottom-end" :arrow="false" :offset="8" unwrapped>
               <template #trigger><span class="mm-edit__help-icon" aria-hidden="true">?</span></template>
               <template #content>
                 <div class="mm-edit__help-title">操作说明</div>
@@ -721,11 +361,8 @@ function switchView(mode) {
             :field-name="fieldName"
             :control-type-label="controlTypeLabel"
             :width-of="widthOf"
-            :column-width-options="columnWidthOptions"
             @update:collapsed="(v) => (inspectorCollapsed = v)"
-            @width-change="onWidthChange"
             @width-commit="onWidthCommit"
-            @width-step="onWidthStep"
             @toggle="toggleInspector"
             @band-title-change="onBandTitleChange"
             @toggle-band-enable="toggleBandEnable"
@@ -743,14 +380,10 @@ function switchView(mode) {
       v-show="viewMode === 'data'"
       :rows="localEdit"
       :loading="loading"
-      :list-config="props.listConfig"
-      :query-config="props.queryConfig"
       :data-columns="dataColumns"
       :active-key="activeKey"
       :row-drag-handle="false"
       @back="switchView('design')"
-      @sync-list="syncToList"
-      @sync-query="syncToQuery"
       @row-click="(row) => (activeKey = String(row.b_id))"
       @change="emitUpdate"
       @row-order-change="onRowOrderChange"
@@ -801,10 +434,7 @@ function switchView(mode) {
   justify-content: flex-end;
 }
 
-/* 编辑方式：ui RadioGroup（紧凑字号） */
-.mm-edit__mode { font-size: 12px; }
-/* 视图切换：ui Tabs nav-only */
-.mm-edit__view-switch { font-size: 12px; }
+/* 编辑方式 / 视图切换：ui Segmented（默认尺寸） */
 
 /* ---- 快捷键帮助（右上角 ? 图标，ui Popover hover 展示） ---- */
 .mm-edit__help-icon {
@@ -926,4 +556,4 @@ function switchView(mode) {
   font-size: 11px;
   text-align: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableInspector.vue b/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableInspector.vue
index 7bdde6b5..d30293bf 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableInspector.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TableInspector.vue
@@ -1,11 +1,25 @@
 <script setup>
 /**
- * 子表属性面板：列属性 / 分组带属性 / 空态三态。
- * 全部变更经 emits 交给壳组件（TableEditPanel）写入草稿并提交，
- * 本组件不持有选中行/分组数据。
+ * 属性面板（列属性 / 分组带属性 / 空态三态），TableEditPanel 与 ModuleListConfigPanel 共用。
+ * 全部变更经 emits 交给壳组件写入草稿并提交，本组件不持有选中行/分组数据。
+ * 宿主差异经可选 props 表达：statusFlags（状态开关集合）、showRowDelete、
+ * showBandEnable、rowI18nKeyOf / bandI18nEnabled（标题多语言入口）。
  */
-import { Button, Input, Select, Switch } from '@/components/ui'
-import { PanelRightClose, PanelRightOpen, Trash2, FolderPlus, Pencil } from '@lucide/vue'
+import { computed } from 'vue'
+import { Button, Input, Switch } from '@/components/ui'
+import {
+  Asterisk,
+  Ban,
+  Eye,
+  EyeOff,
+  FolderPlus,
+  Languages,
+  Lock,
+  PanelRightClose,
+  PanelRightOpen,
+  Pencil,
+  Trash2,
+} from '@lucide/vue'
 
 const props = defineProps({
   inspectorCollapsed: { type: Boolean, default: false },
@@ -17,14 +31,21 @@ const props = defineProps({
   fieldName: { type: Function, required: true },
   controlTypeLabel: { type: Function, required: true },
   widthOf: { type: Function, required: true },
-  columnWidthOptions: { type: Array, required: true },
+  /** 状态开关 chips 配置（[{flag,label,icon,iconOff?}]），缺省为子表编辑的四项 */
+  statusFlags: { type: Array, default: null },
+  /** 是否显示「删除列」按钮（列表配置不删行，false 隐藏） */
+  showRowDelete: { type: Boolean, default: true },
+  /** 是否显示分组「启用」开关（列表配置无分组启停，false 隐藏） */
+  showBandEnable: { type: Boolean, default: true },
+  /** 列标题多语言 key 取值（提供时列属性区显示该行 + 翻译按钮） */
+  rowI18nKeyOf: { type: Function, default: null },
+  /** 分组标题多语言入口（true 时分组区显示操作按钮） */
+  bandI18nEnabled: { type: Boolean, default: false },
 })
 
 const emit = defineEmits([
   'update:collapsed',
-  'width-change',
   'width-commit',
-  'width-step',
   'toggle',
   'band-title-change',
   'toggle-band-enable',
@@ -32,7 +53,21 @@ const emit = defineEmits([
   'add-sub-group',
   'rename',
   'delete-band',
+  'open-row-i18n',
+  'open-band-i18n',
 ])
+
+/* ---------- 列状态开关（单图标 chips，参考主表字段卡片） ---------- */
+const DEFAULT_STATUS_CHIPS = [
+  { flag: 'b_required', label: '必填', icon: Asterisk },
+  { flag: 'b_readonly', label: '只读', icon: Lock },
+  { flag: 'b_disabled', label: '禁用', icon: Ban },
+  { flag: 'b_visible', label: '显示', icon: Eye, iconOff: EyeOff },
+]
+const statusChips = computed(() => props.statusFlags || DEFAULT_STATUS_CHIPS)
+function isOn(flag) {
+  return Number(props.selectedRow?.[flag]) === 1
+}
 </script>
 
 <template>
@@ -87,79 +122,53 @@ const emit = defineEmits([
         </div>
         <div class="mm-fdesign__prop">
           <label for="mm-tdesign-width">列宽 (px)</label>
-          <div class="mm-fdesign__span-control">
-            <Select
-              id="mm-tdesign-width"
-              :model-value="String(widthOf(selectedRow))"
-              :disabled="loading"
-              :options="columnWidthOptions"
-              @update:model-value="(v) => emit('width-change', v)"
-            />
-            <Button
-              type="ghost"
-              class="mm-fdesign__step"
-              :disabled="loading || widthOf(selectedRow) <= 40"
-              aria-label="列宽减 10"
-              @click="emit('width-step', -10)"
-            >
-              −
-            </Button>
-            <Input
-              type="number"
-              class="mm-fdesign__span-input"
-              :model-value="widthOf(selectedRow)"
-              :disabled="loading"
-              aria-label="自定义列宽"
-              @change="(v) => emit('width-commit', v)"
-            />
-            <Button
-              type="ghost"
-              class="mm-fdesign__step"
-              :disabled="loading || widthOf(selectedRow) >= 600"
-              aria-label="列宽加 10"
-              @click="emit('width-step', 10)"
-            >
-              +
-            </Button>
-          </div>
+          <Input
+            id="mm-tdesign-width"
+            type="number"
+            class="mm-fdesign__span-input"
+            :model-value="widthOf(selectedRow)"
+            :disabled="loading"
+            aria-label="列宽"
+            @change="(v) => emit('width-commit', v)"
+          />
         </div>
-        <div class="mm-fdesign__prop-group">状态</div>
-        <div class="mm-fdesign__toggles">
-          <div class="mm-fdesign__toggle-line">
-            <span>必填</span>
-            <Switch
-              :model-value="Number(selectedRow.b_required) === 1"
-              :disabled="loading"
-              @update:model-value="() => emit('toggle', 'b_required')"
-            />
-          </div>
-          <div class="mm-fdesign__toggle-line">
-            <span>只读</span>
-            <Switch
-              :model-value="Number(selectedRow.b_readonly) === 1"
-              :disabled="loading"
-              @update:model-value="() => emit('toggle', 'b_readonly')"
-            />
-          </div>
-          <div class="mm-fdesign__toggle-line">
-            <span>禁用</span>
-            <Switch
-              :model-value="Number(selectedRow.b_disabled) === 1"
-              :disabled="loading"
-              @update:model-value="() => emit('toggle', 'b_disabled')"
-            />
-          </div>
-          <div class="mm-fdesign__toggle-line">
-            <span>显示</span>
-            <Switch
-              :model-value="Number(selectedRow.b_visible) === 1"
-              :disabled="loading"
-              @update:model-value="() => emit('toggle', 'b_visible')"
-            />
-          </div>
+        <div v-if="rowI18nKeyOf" class="mm-fdesign__prop">
+          <label>标题多语言</label>
+          <Button
+            type="outline"
+            class="mm-fdesign__band-action"
+            :disabled="loading"
+            :title="rowI18nKeyOf(selectedRow) || '该字段未配置多语言键'"
+            @click="emit('open-row-i18n', selectedRow)"
+          >
+            <Languages :size="14" /> {{ rowI18nKeyOf(selectedRow) || '无多语言键' }}
+          </Button>
         </div>
-        <div class="mm-fdesign__prop-group">操作</div>
+        <div v-if="statusChips.length" class="mm-fdesign__prop-group">状态</div>
+        <div
+          v-if="statusChips.length"
+          class="mm-fdesign__status-chips"
+          role="group"
+          aria-label="列状态开关"
+        >
+          <button
+            v-for="chip in statusChips"
+            :key="chip.flag"
+            type="button"
+            class="mm-fdesign__status-chip"
+            :class="{ 'is-on': isOn(chip.flag) }"
+            :disabled="loading"
+            :title="chip.label"
+            :aria-label="chip.label"
+            :aria-pressed="isOn(chip.flag)"
+            @click="emit('toggle', chip.flag)"
+          >
+            <component :is="chip.iconOff && !isOn(chip.flag) ? chip.iconOff : chip.icon" :size="12" />
+          </button>
+        </div>
+        <div v-if="showRowDelete" class="mm-fdesign__prop-group">操作</div>
         <Button
+          v-if="showRowDelete"
           type="danger"
           :disabled="loading"
           class="mm-fdesign__delete"
@@ -195,7 +204,7 @@ const emit = defineEmits([
           </div>
         </div>
         <div class="mm-fdesign__toggles">
-          <div class="mm-fdesign__toggle-line">
+          <div v-if="showBandEnable" class="mm-fdesign__toggle-line">
             <span>启用</span>
             <Switch
               :model-value="Number(selectedBand.group.b_canuse) === 1"
@@ -205,6 +214,16 @@ const emit = defineEmits([
           </div>
         </div>
         <div class="mm-fdesign__prop-group">操作</div>
+        <Button
+          v-if="bandI18nEnabled"
+          type="outline"
+          :disabled="loading"
+          class="mm-fdesign__band-action"
+          title="设置分组标题多语言（键自动生成）"
+          @click="emit('open-band-i18n')"
+        >
+          <Languages :size="14" /> 分组多语言
+        </Button>
         <Button
           type="outline"
           :disabled="loading"
@@ -309,7 +328,6 @@ const emit = defineEmits([
   border-radius: 4px;
   background: transparent;
   color: color-mix(in srgb, var(--fms-text-secondary) 70%, var(--fms-text));
-  transform: none;
 
   &:hover:not(:disabled) {
     background: var(--fms-secondary);
@@ -376,51 +394,49 @@ const emit = defineEmits([
   font-size: 11px;
 }
 
-.mm-fdesign__span-control {
-  display: flex;
-  gap: 4px;
-
-  :deep(.select-wrapper) {
-    flex: 1;
-    min-width: 0;
-  }
-}
-
-/* 自定义列宽数字输入：压缩 ui Input 高度 */
+/* 列宽数字输入：压缩 ui Input 高度，撑满属性行 */
 .mm-fdesign__span-input.input-wrapper {
-  flex: none;
-  width: 48px;
+  width: 100%;
   height: 26px;
   min-height: 0;
-  padding: 0 4px;
+  padding: 0 8px;
   font-size: 11px;
-
-  :deep(.input) {
-    text-align: center;
-  }
 }
 
-/* 列宽步进钮（覆盖 ui Button 默认尺寸） */
-.mm-fdesign__step.button {
-  flex: none;
+.mm-fdesign__status-chips {
+  display: flex;
+  gap: 6px;
+  margin-top: 10px;
+}
+
+/* 状态开关：单图标 chips，开启主色高亮（参考主表字段卡片的 label-chip） */
+.mm-fdesign__status-chip {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   width: 22px;
-  height: 26px;
-  min-height: 0;
+  height: 22px;
   padding: 0;
-  border: 1px solid var(--fms-border);
+  border: none;
   border-radius: 4px;
-  background: var(--fms-card);
+  background: color-mix(in srgb, var(--fms-primary) 5%, transparent);
   color: var(--fms-text-secondary);
-  font-size: 12px;
-  line-height: 1;
+  cursor: pointer;
+  transition:
+    background 0.15s,
+    color 0.15s;
 
   &:hover:not(:disabled) {
-    border-color: var(--fms-primary);
+    background: color-mix(in srgb, var(--fms-primary) 16%, transparent);
+  }
+
+  &.is-on {
     color: var(--fms-primary);
+    background: color-mix(in srgb, var(--fms-primary) 16%, transparent);
   }
 
   &:disabled {
-    opacity: 0.45;
+    opacity: 0.5;
     cursor: not-allowed;
   }
 }
diff --git a/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TablePreview.vue b/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TablePreview.vue
index d3487894..5c869774 100644
--- a/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TablePreview.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/components/table-edit/TablePreview.vue
@@ -1,8 +1,9 @@
 <script setup>
 /**
  * 子表多级表头预览表：band 行渲染、mock 数据行、预览拖拽落点指示。
- * 严格被动预览，唯一交互是列头右缘拖拽列宽与列头拖拽排序（均经 composable 处理）。
- * 列/分组结构数据由壳组件（TableEditPanel）经 props 传入，变更经 commitColDrag 提交。
+ * 交互：列头右缘拖拽列宽与列头拖拽排序（均经 composable 处理）。
+ * 列/分组结构数据由壳组件（TableEditPanel / ModuleListConfigPanel）经 props 传入，
+ * 变更经 commitColDrag 提交。
  */
 import { computed, onBeforeUnmount } from 'vue'
 import { useColumnResize } from './useColumnResize'
@@ -20,6 +21,8 @@ const props = defineProps({
   /** 统一选中态：'g:<gid>' 分组带 | 'c:<fieldId>' 列 | null */
   selectedNodeKey: { type: String, default: null },
   loading: { type: Boolean, default: false },
+  /** 空态文案（列表配置等宿主无字段库，提示语不同） */
+  emptyText: { type: String, default: '暂无列：从左侧字段库点击添加字段' },
   /** 取当前列宽（40–600 边界） */
   widthOf: { type: Function, required: true },
   fieldName: { type: Function, required: true },
@@ -241,7 +244,7 @@ function mockValue(col) {
       >
         未分组
       </div>
-      <div v-if="!visualColumns.length" class="mm-fdesign__empty">暂无列：从左侧字段库点击添加字段</div>
+      <div v-if="!visualColumns.length" class="mm-fdesign__empty">{{ emptyText }}</div>
     </div>
   </div>
 </template>
diff --git a/code/fms/fms-vue/src/views/system/module-management/composables/useBandLayout.js b/code/fms/fms-vue/src/views/system/module-management/composables/useBandLayout.js
new file mode 100644
index 00000000..748074fc
--- /dev/null
+++ b/code/fms/fms-vue/src/views/system/module-management/composables/useBandLayout.js
@@ -0,0 +1,91 @@
+/**
+ * 多级表头渲染推导（纯 computed，无状态）：
+ * visualColumns（视觉列序：未分组列 + 分组树先序）/ bandRows（每层级一个表头行，
+ * 未分组列头 rowspan 贯穿）/ headerColumns（列头行）/ ungroupedInBand / ungroupedCount。
+ * 供 TableEditPanel（子表设计）与 ModuleListConfigPanel（列表配置）共用，
+ * 输入为 useGroupTree 的返回值（groupColumnsMap / bandMeta）。
+ */
+import { computed } from 'vue'
+
+/**
+ * @param {{ groupColumnsMap: import('vue').ComputedRef<{map: Map, ungrouped: Array}>,
+ *           bandMeta: import('vue').ComputedRef<{roots: Array, maxLevel: number}> }} tree
+ */
+export function useBandLayout(tree) {
+  const { groupColumnsMap, bandMeta } = tree
+
+  // 视觉列序：未分组列在前，随后分组树先序（每分组：直属列 → 空叶子分组补 slot 占位）
+  const visualColumns = computed(() => {
+    const columns = groupColumnsMap.value
+    const list = []
+    for (const row of columns.ungrouped) {
+      list.push({ kind: 'col', key: `col-${row.b_field_id}`, row, gid: null })
+    }
+    const walk = (nodes) => {
+      for (const node of nodes) {
+        const own = columns.map.get(node.gid) || []
+        for (const row of own) {
+          list.push({ kind: 'col', key: `col-${row.b_field_id}`, row, gid: node.gid })
+        }
+        if (!own.length && !node.children.length) {
+          list.push({ kind: 'slot', key: `slot-${node.gid}`, gid: node.gid, group: node.group })
+        }
+        walk(node.children)
+      }
+    }
+    walk(bandMeta.value.roots)
+    return list
+  })
+
+  // 多级表头 band 行：每层一个 tr 的单元格序列；未分组列头在第 0 层，贯穿全部表头行高
+  const bandRows = computed(() => {
+    const { roots, maxLevel } = bandMeta.value
+    if (!roots.length) return []
+    const ungrouped = groupColumnsMap.value.ungrouped
+    const totalHeaderRows = maxLevel + 2
+    const byLevel = new Map()
+    const collect = (nodes) => {
+      for (const node of nodes) {
+        if (!byLevel.has(node.level)) byLevel.set(node.level, [])
+        byLevel.get(node.level).push(node)
+        collect(node.children)
+      }
+    }
+    collect(roots)
+    const rows = []
+    for (let level = 0; level <= maxLevel; level++) {
+      const nodes = byLevel.get(level) || []
+      const cells = []
+      if (level === 0 && ungrouped.length) {
+        for (const row of ungrouped) {
+          cells.push({ kind: 'ungrouped-col', row, span: 1, rowspan: totalHeaderRows })
+        }
+      }
+      cells.push(
+        ...nodes.map((node) => ({
+          kind: 'band',
+          gid: node.gid,
+          group: node.group,
+          level: node.level,
+          span: node.span,
+          rowspan: node.children.length ? 1 : maxLevel - node.level + 1,
+        })),
+      )
+      rows.push(cells)
+    }
+    return rows
+  })
+
+  const ungroupedCount = computed(() => groupColumnsMap.value.ungrouped.length)
+  const ungroupedInBand = computed(
+    () => bandRows.value.length > 0 && groupColumnsMap.value.ungrouped.length > 0,
+  )
+
+  // 列头行：未分组列头已渲染在 band 行时，这里只渲染分组内列
+  const headerColumns = computed(() => {
+    if (!ungroupedInBand.value) return visualColumns.value
+    return visualColumns.value.filter((c) => c.gid != null)
+  })
+
+  return { visualColumns, bandRows, headerColumns, ungroupedInBand, ungroupedCount }
+}
diff --git a/code/fms/fms-vue/src/views/system/module-management/composables/useModuleConfig.js b/code/fms/fms-vue/src/views/system/module-management/composables/useModuleConfig.js
index 92dcf2d3..b60cdaa1 100644
--- a/code/fms/fms-vue/src/views/system/module-management/composables/useModuleConfig.js
+++ b/code/fms/fms-vue/src/views/system/module-management/composables/useModuleConfig.js
@@ -2,8 +2,7 @@
  * 草稿加载与脏检查：
  * configLoading / originals / drafts / loadedModuleId / skipModuleLoad 约定、
  * loadModuleConfig / hasModuleChanges / reloadModule / onModuleSelect /
- * watch(moduleSelectedId)，以及草稿派生联动（onFieldsUpdate / applyDisabledFieldDefaults /
- * onAutoCodeUpdate / syncFields）。
+ * watch(moduleSelectedId)，以及草稿派生联动（onFieldsUpdate / onAutoCodeUpdate / syncFields）。
  */
 import { computed, watch } from 'vue'
 import { Message } from '@/components/ui'
@@ -11,6 +10,7 @@ import { loadDataApi, describeApi } from '@/services/api'
 import { cloneData } from '@/utils/dataChanges'
 import { createTempId } from '@/utils/tempId'
 import { buildModuleItemI18nKey } from '@/utils/i18n'
+import { listRowDefaults, queryRowDefaults } from '../fieldAreaDefaults'
 
 export function useModuleConfig(deps) {
   const {
@@ -76,6 +76,12 @@ export function useModuleConfig(deps) {
       }
       originals.value = original
       drafts.value = cloneData(original)
+      // 列表配置自动包含全部启用字段：缺失的按控件类型生成默认列。
+      // 「删除列」语义为隐藏（b_visible=0）而非删行——行删了下次加载又会自动补回。
+      const listGenerated = buildMissingDefaultConfigs(original.module, original.fields)
+      if (listGenerated.listConfig.length) {
+        drafts.value.listConfig = [...(drafts.value.listConfig || []), ...listGenerated.listConfig]
+      }
       loadedModuleId.value = id
       activeSection.value = 'basic'
     } catch (e) {
@@ -150,36 +156,13 @@ export function useModuleConfig(deps) {
   }
 
   /* ================= 草稿派生联动 ================= */
+  // 字段停用不做跨表联动：运行时按字段 b_canuse 过滤显示，各配置行原样保留，
+  // 重新启用字段即恢复原配置。
   function onFieldsUpdate(newFields) {
     if (!drafts.value) return
-    applyDisabledFieldDefaults(drafts.value.fields, newFields)
     drafts.value.fields = newFields
   }
 
-  function applyDisabledFieldDefaults(previousFields, nextFields) {
-    const previousStates = new Map()
-    for (const field of previousFields || []) {
-      if (field.b_id != null) previousStates.set(String(field.b_id), Number(field.b_canuse) === 1)
-    }
-    const disabledIds = new Set()
-    for (const field of nextFields || []) {
-      if (field.b_id == null) continue
-      if (previousStates.get(String(field.b_id)) && Number(field.b_canuse) !== 1) {
-        disabledIds.add(String(field.b_id))
-      }
-    }
-    if (!disabledIds.size) return
-    for (const row of drafts.value.listConfig || []) {
-      if (disabledIds.has(String(row.b_field_id))) row.b_visible = 0
-    }
-    for (const row of drafts.value.editConfig || []) {
-      if (disabledIds.has(String(row.b_field_id))) row.b_visible = 0
-    }
-    for (const row of drafts.value.queryConfig || []) {
-      if (disabledIds.has(String(row.b_field_id))) row.b_canuse = 0
-    }
-  }
-
   function onAutoCodeUpdate(rows) {
     if (!drafts.value) return
     const previousRule = drafts.value.autoCode?.[0]
@@ -200,6 +183,130 @@ export function useModuleConfig(deps) {
   }
 
   /* ================= 模块：同步字段 ================= */
+  // 已配置过对应配置行的字段 id（列表/编辑/查询），用于判断新增字段是否缺默认配置
+  function configuredFieldIds(section) {
+    const ids = new Set()
+    for (const source of [originals.value, drafts.value]) {
+      for (const row of source?.[section] || []) {
+        if (row.b_field_id != null) ids.add(String(row.b_field_id))
+      }
+    }
+    return ids
+  }
+
+  // 为尚未配置的字段生成列表/查询默认行（参考旧系统 buildMissingDefaultConfigs）。
+  // 默认属性见 fieldAreaDefaults：默认不参与的字段（大文本等）同样生成行、开关置 0，
+  // 保留配置空间；表单设计（editConfig）不自动生成：字段由用户在表单设计器中逐个添加，
+  // 自动铺满会与设计器的画布/分组/栅格编辑冲突。
+  function buildMissingDefaultConfigs(module, fields) {
+    const moduleId = String(module.b_id)
+    const listFieldIds = configuredFieldIds('listConfig')
+    const queryFieldIds = configuredFieldIds('queryConfig')
+    const generated = { listConfig: [], queryConfig: [] }
+    let orderIndex = 0
+    for (const field of fields) {
+      if (Number(field.b_canuse) !== 1) continue
+      orderIndex++
+      const fieldId = String(field.b_id)
+      const order = orderIndex * 10
+      if (!listFieldIds.has(fieldId)) {
+        generated.listConfig.push({
+          b_id: createTempId(),
+          b_module_id: moduleId,
+          b_field_id: fieldId,
+          b_group_id: null,
+          b_i18n: field.b_i18n || null,
+          b_xh: order,
+          ...listRowDefaults(field),
+        })
+      }
+      if (!queryFieldIds.has(fieldId)) {
+        generated.queryConfig.push({
+          b_id: createTempId(),
+          b_module_id: moduleId,
+          b_field_module_id: moduleId,
+          b_field_id: fieldId,
+          b_relation_id: null,
+          b_default_value: null,
+          b_xh: order,
+          ...queryRowDefaults(field),
+        })
+      }
+    }
+    return generated
+  }
+
+  // 计算同步计划（纯计算，不改草稿）：describe 结果与现有字段合并、
+  // 找出视图已不存在的字段、为新字段生成列表/编辑/查询默认配置。
+  function buildSyncPlan(module, columns) {
+    const viewColumnSet = new Set(columns.map((col) => String(col.name || '').toLowerCase()))
+    const existingMap = new Map()
+    for (const field of drafts.value.fields || []) {
+      if (field.b_field) existingMap.set(field.b_field.toLowerCase(), field)
+    }
+    const mergedFields = []
+    let addedCount = 0
+    for (const col of columns) {
+      const existing = existingMap.get(String(col.name).toLowerCase())
+      if (existing) {
+        mergedFields.push({ ...existing, b_canuse: 1 })
+      } else {
+        addedCount++
+        mergedFields.push({
+          b_id: createTempId(),
+          b_module_id: String(module.b_id),
+          b_field: col.name,
+          b_name: col.name,
+          b_i18n: null,
+          b_type: 'input',
+          b_dbtype: col.type || null,
+          b_length: col.size ?? null,
+          b_nullable: col.nullable ?? 1,
+          b_default_value: null,
+          b_canuse: 1,
+        })
+      }
+    }
+    // 视图中已不存在的字段：应用时移除并级联清理配置行与受管 i18n
+    const removedIds = new Set()
+    // 受管多语言的 _managedId 是 `field:${i18nKey}`（见 index.vue finalI18nItems），不是字段 b_id
+    const removedI18nIds = new Set()
+    for (const existing of drafts.value.fields || []) {
+      if (!viewColumnSet.has(String(existing.b_field).toLowerCase())) {
+        removedIds.add(String(existing.b_id))
+        const key = existing.b_i18n || buildModuleItemI18nKey('field', module.b_code, existing.b_field)
+        if (key) removedI18nIds.add(`field:${key}`)
+      }
+    }
+    for (const field of mergedFields) {
+      field.b_i18n = buildModuleItemI18nKey('field', module.b_code, field.b_field)
+    }
+    const generated = buildMissingDefaultConfigs(module, mergedFields)
+    const generatedCount = generated.listConfig.length + generated.queryConfig.length
+    return { mergedFields, removedIds, removedI18nIds, generated, addedCount, generatedCount }
+  }
+
+  function applySyncPlan(plan) {
+    if (plan.removedIds.size) {
+      for (const section of ['listConfig', 'editConfig', 'queryConfig']) {
+        drafts.value[section] = (drafts.value[section] || []).filter(
+          (row) => !plan.removedIds.has(String(row.b_field_id)),
+        )
+      }
+      i18nPanelRef.value?.removeByManagedIds?.(Array.from(plan.removedI18nIds))
+    }
+    for (const section of ['listConfig', 'queryConfig']) {
+      const rows = plan.generated[section]
+      if (!rows.length) continue
+      drafts.value[section] = [...(drafts.value[section] || []), ...rows]
+    }
+    drafts.value.fields = plan.mergedFields
+    const parts = [`已同步 ${plan.mergedFields.length} 个字段`]
+    if (plan.addedCount) parts.push(`新增 ${plan.addedCount} 个并补充 ${plan.generatedCount} 条默认配置`)
+    if (plan.removedIds.size) parts.push(`移除 ${plan.removedIds.size} 个及其关联配置`)
+    Message.success(parts.join('，'))
+  }
+
   async function syncFields() {
     const module = drafts.value?.module
     if (!module) return
@@ -208,54 +315,14 @@ export function useModuleConfig(deps) {
     configSyncing.value = true
     try {
       const res = await describeApi(view)
-      const columns = res.data || []
-      const existingFields = drafts.value.fields || []
-      const viewColumnSet = new Set(columns.map((col) => String(col.name || '').toLowerCase()))
-      const existingMap = new Map()
-      for (const field of existingFields) {
-        if (field.b_field) existingMap.set(field.b_field.toLowerCase(), field)
+      const plan = buildSyncPlan(module, res.data || [])
+      if (!plan.addedCount && !plan.removedIds.size) {
+        Message.info('字段与视图结构一致，无需同步')
+        return
       }
-      const mergedFields = []
-      for (const col of columns) {
-        const existing = existingMap.get(String(col.name).toLowerCase())
-        if (existing) {
-          mergedFields.push({ ...existing, b_canuse: 1 })
-        } else {
-          mergedFields.push({
-            b_id: createTempId(),
-            b_module_id: String(module.b_id),
-            b_field: col.name,
-            b_name: col.name,
-            b_i18n: null,
-            b_type: 'input',
-            b_dbtype: col.type || null,
-            b_length: col.size ?? null,
-            b_nullable: col.nullable ?? 1,
-            b_default_value: null,
-            b_canuse: 1,
-          })
-        }
-      }
-      // 视图中已不存在的字段：移除并清理关联配置行
-      const removedIds = new Set()
-      for (const existing of existingFields) {
-        if (!viewColumnSet.has(String(existing.b_field).toLowerCase())) {
-          removedIds.add(String(existing.b_id))
-        }
-      }
-      if (removedIds.size) {
-        for (const section of ['listConfig', 'editConfig', 'queryConfig']) {
-          drafts.value[section] = (drafts.value[section] || []).filter(
-            (row) => !removedIds.has(String(row.b_field_id)),
-          )
-        }
-        i18nPanelRef.value?.removeByManagedIds?.(Array.from(removedIds).map((id) => `field:${id}`))
-      }
-      for (const field of mergedFields) {
-        field.b_i18n = buildModuleItemI18nKey('field', module.b_code, field.b_field)
-      }
-      drafts.value.fields = mergedFields
-      Message.success(`已同步 ${mergedFields.length} 个字段`)
+      // 同步只改草稿、不落库（保存前可整体撤销），直接执行；
+      // 差异明细由 applySyncPlan 的成功提示汇总
+      applySyncPlan(plan)
     } catch (e) {
       Message.error('同步字段失败：' + (e?.message || e))
     } finally {
@@ -263,11 +330,52 @@ export function useModuleConfig(deps) {
     }
   }
 
+  /* ================= 欠配置统计与一键补充 ================= */
+  // 启用字段中尚未出现在指定配置（listConfig/queryConfig）的数量
+  function missingConfigCount(section) {
+    return computed(() => {
+      const fields = drafts.value?.fields || []
+      if (!fields.length) return 0
+      const configured = new Set()
+      for (const row of drafts.value?.[section] || []) {
+        if (row.b_field_id != null) configured.add(String(row.b_field_id))
+      }
+      let count = 0
+      for (const field of fields) {
+        if (Number(field.b_canuse) !== 1) continue
+        if (!configured.has(String(field.b_id))) count++
+      }
+      return count
+    })
+  }
+
+  // 为缺失的启用字段补充默认配置行（复用同步字段的默认行生成逻辑）
+  function fillMissingConfigs(sections) {
+    const module = drafts.value?.module
+    if (!module || busy.value) return
+    const generated = buildMissingDefaultConfigs(module, drafts.value.fields)
+    let total = 0
+    for (const section of sections) {
+      const rows = generated[section]
+      if (!rows?.length) continue
+      drafts.value[section] = [...(drafts.value[section] || []), ...rows]
+      total += rows.length
+    }
+    if (total) Message.success(`已补充 ${total} 条默认配置`)
+    else Message.info('没有需要补充的配置')
+  }
+
+  const missingListCount = missingConfigCount('listConfig')
+  const missingQueryCount = missingConfigCount('queryConfig')
+
   return {
     reloadModule,
     onModuleSelect,
     onFieldsUpdate,
     onAutoCodeUpdate,
     syncFields,
+    missingListCount,
+    missingQueryCount,
+    fillMissingConfigs,
   }
 }
\ No newline at end of file
diff --git a/code/fms/fms-vue/src/views/system/module-management/composables/useModuleSave.js b/code/fms/fms-vue/src/views/system/module-management/composables/useModuleSave.js
index c5af6d1c..d18bca93 100644
--- a/code/fms/fms-vue/src/views/system/module-management/composables/useModuleSave.js
+++ b/code/fms/fms-vue/src/views/system/module-management/composables/useModuleSave.js
@@ -146,6 +146,10 @@ export function useModuleSave({
       }
       await saveObjectApi(saveReqs)
 
+      // 保存过程原地改写了草稿行的 b_id / b_field_id（临时 id → 真实 id），数组引用未变，
+      // 各面板靠引用变化触发的 watch 不会重新同步——本地副本会残留临时 id，下次编辑回灌
+      // 就把字段 id 打回负数（引发重复插入与配置行悬空引用）。这里整体换引用强制各面板重新拉取。
+      drafts.value = cloneData(drafts.value)
       originals.value = cloneData(drafts.value)
       i18nPanel?.markSaved?.()
       unsavedModuleIds.delete(moduleId)
diff --git a/code/fms/fms-vue/src/views/system/module-management/composables/useModuleTree.js b/code/fms/fms-vue/src/views/system/module-management/composables/useModuleTree.js
index 5f643af2..a9f771c1 100644
--- a/code/fms/fms-vue/src/views/system/module-management/composables/useModuleTree.js
+++ b/code/fms/fms-vue/src/views/system/module-management/composables/useModuleTree.js
@@ -291,28 +291,22 @@ export function useModuleTree(deps) {
       onOk: async () => {
         try {
           const id2 = String(module.b_id)
-          const reqs = []
-          // 收集子表行
+          // 子表按 b_module_id 条件删（后端 deletes 行内所有列组成 AND 条件），
+          // 无需先查出各行 id；主表仍按主键删
           const subTables = [
-            ['s_field', 'b_module_id'],
-            ['s_field_group', 'b_module_id'],
-            ['s_field_view', 'b_module_id'],
-            ['s_field_edit', 'b_module_id'],
-            ['s_field_query', 'b_module_id'],
-            ['s_autocode', 'b_module_id'],
+            's_field',
+            's_field_group',
+            's_field_view',
+            's_field_edit',
+            's_field_query',
+            's_autocode',
+            's_power',
           ]
-          for (const [table, field] of subTables) {
-            const res = await loadDataApi(table, `${field} = ${id2}`)
-            const rows = res.data || []
-            if (rows.length) {
-              reqs.push({ table, key_field: 'b_id', deletes: rows.map((r) => ({ b_id: r.b_id })) })
-            }
-          }
-          const powerRes = await loadDataApi('s_power', `b_module_id = ${id2}`)
-          const powers = powerRes.data || []
-          if (powers.length) {
-            reqs.push({ table: 's_power', key_field: 'b_id', deletes: powers.map((r) => ({ b_id: r.b_id })) })
-          }
+          const reqs = subTables.map((table) => ({
+            table,
+            key_field: 'b_id',
+            deletes: [{ b_module_id: id2 }],
+          }))
           // 多语言（s_i18n 无 b_module_id 字段，需按模块编码匹配 b_key 前缀）。
           // 若不清理，删除后残留的孤儿键会被同编码新模块的多语言面板加载，
           // 进而产生指向已不存在记录的 UPDATE，导致后端「修改记录数异常: 0」。
diff --git a/code/fms/fms-vue/src/views/system/module-management/composables/useStructureEditing.js b/code/fms/fms-vue/src/views/system/module-management/composables/useStructureEditing.js
new file mode 100644
index 00000000..6b870603
--- /dev/null
+++ b/code/fms/fms-vue/src/views/system/module-management/composables/useStructureEditing.js
@@ -0,0 +1,641 @@
+/**
+ * 结构编辑内核（分组树 + 行归属 + 平铺重编 + 选中态 + 列属性剪贴板）。
+ * 由 TableEditPanel（子表设计，s_field_edit 行）与 ModuleListConfigPanel（列表配置，
+ * s_field_view 行）共用：宿主只注入数据源（getter）、行工厂（差异字段）、
+ * 提交回调（转 emit）与重命名请求（转发结构树 startRename）。
+ *
+ * 语义约定：
+ * - 分组 b_xh 为「兄弟内编号」((i+1)*10)，不同层可重复；
+ * - 行 b_xh 为「未分组在前 + 分组树先序」的全局平铺序，与运行时列序一致；
+ * - 删除分组：直接子分组提升为被删分组的父级，组内行归未分组；级联清理其它配置
+ *   分节的引用由 applyGroups(groups, removedGroupIds) 的宿主（index.vue）统一完成。
+ */
+import { computed, nextTick, ref, watch } from 'vue'
+import { Message } from '@/components/ui'
+import { createTempId } from '@/utils/tempId'
+import { useGroupTree, buildGroupTree } from './useGroupTree'
+import { applyClipboardProps, buildClipboardProps, renumberRows } from '../editPanelShared'
+
+const DEFAULT_CLIP_KEYS = [
+  'b_required',
+  'b_readonly',
+  'b_disabled',
+  'b_visible',
+  'b_placeholder',
+  'b_height',
+  'b_width',
+]
+
+/**
+ * @param {object} opts
+ * @param {() => string} opts.moduleId
+ * @param {() => Array} opts.getGroups          宿主 props.groups（不可变基准）
+ * @param {() => Array} opts.getRows            宿主 props.editConfig / props.listConfig
+ * @param {() => boolean} opts.loading
+ * @param {(field: object, groupId: string|null) => object} opts.createRow 行工厂（差异字段）
+ * @param {(groups: Array, removedGroupIds?: string[]) => void} opts.applyGroups
+ * @param {(rows: Array) => void} opts.applyRows
+ * @param {(gid: string) => void} [opts.requestRename] 新建分组后请求结构树进入重命名
+ * @param {string[]} [opts.clipboardKeys]       列属性复制粘贴键集
+ * @param {(row: object) => string} [opts.fieldNameOf] 剪贴板条目命名（useFieldLookup 的 fieldName）
+ * @param {(fieldId: string) => object|null} [opts.getField] 字段库拖入的字段解析（fieldMap.get）
+ */
+export function useStructureEditing({
+  moduleId,
+  getGroups,
+  getRows,
+  loading,
+  createRow,
+  applyGroups,
+  applyRows,
+  requestRename = () => {},
+  clipboardKeys = DEFAULT_CLIP_KEYS,
+  fieldNameOf = (row) => String(row?.b_field_id || ''),
+  getField = null,
+}) {
+  /* ================= 本地草稿 ================= */
+  const localRows = ref([])
+  const localGroups = ref([])
+  const selectedNodeKey = ref(null)
+
+  const { groupColumnsMap, bandMeta, isDescendantGroup, groupIdOfRow } = useGroupTree(
+    localGroups,
+    localRows,
+  )
+
+  watch(
+    getGroups,
+    (val) => {
+      localGroups.value = val ? val.map((row) => ({ ...row })) : []
+    },
+    { immediate: true },
+  )
+
+  watch(
+    getRows,
+    (val) => {
+      if (val === localRows.value) return
+      localRows.value = val?.map((row) => ({ ...row })) || []
+      reorderSilently()
+    },
+    { immediate: true },
+  )
+
+  function findRowByFieldId(fid) {
+    return localRows.value.find((r) => String(r.b_field_id) === String(fid)) || null
+  }
+
+  /* ================= 结构规范化 ================= */
+  function reorderSilently() {
+    const columns = groupColumnsMap.value
+    const list = [...columns.ungrouped]
+    const walk = (nodes) => {
+      for (const node of nodes) {
+        for (const row of columns.map.get(node.gid) || []) list.push(row)
+        walk(node.children)
+      }
+    }
+    walk(bandMeta.value.roots)
+    if (list.length === localRows.value.length && list.every((r, i) => r === localRows.value[i])) {
+      return
+    }
+    localRows.value = list
+  }
+
+  function rebuildFlat(roots = bandMeta.value.roots) {
+    const columns = groupColumnsMap.value
+    const list = [...columns.ungrouped]
+    const walk = (nodes) => {
+      for (const node of nodes) {
+        for (const row of columns.map.get(node.gid) || []) list.push(row)
+        walk(node.children)
+      }
+    }
+    walk(roots)
+    localRows.value = list.map((row, i) => ({ ...row, b_xh: (i + 1) * 10 }))
+    applyRows(localRows.value)
+  }
+
+  // 由给定分组数组构建可用于重排的 band 根节点（gid + children），与 bandMeta 解耦
+  function toRoots(nodes) {
+    return nodes.map((node) => ({ gid: String(node.group.b_id), children: toRoots(node.children) }))
+  }
+  function bandRootsFromGroups(groups) {
+    return toRoots(buildGroupTree(groups))
+  }
+
+  // 分组 b_xh 按每层兄弟内编号（非全局序）
+  function renumberAllSiblings(groups) {
+    const roots = buildGroupTree(groups)
+    const result = []
+    const walk = (nodes) => {
+      nodes.forEach((node, i) => {
+        result.push({ ...node.group, b_xh: (i + 1) * 10 })
+        walk(node.children)
+      })
+    }
+    walk(roots)
+    return result
+  }
+  function emitGroupsRenumbered(nextGroups) {
+    applyGroups(renumberAllSiblings(nextGroups))
+  }
+
+  /* ================= 选择 ================= */
+  const selectedRow = computed(() => {
+    const key = selectedNodeKey.value
+    if (!key || !key.startsWith('c:')) return null
+    return findRowByFieldId(key.slice(2)) || null
+  })
+  const selectedBand = computed(() => {
+    const key = selectedNodeKey.value
+    if (!key || !key.startsWith('g:') || key === 'g:ungrouped') return null
+    return bandMeta.value.metaMap.get(key.slice(2)) || null
+  })
+  function selectRow(row) {
+    selectedNodeKey.value = row ? `c:${row.b_field_id}` : null
+  }
+  function selectBand(band) {
+    selectedNodeKey.value = band ? `g:${band.gid}` : null
+  }
+  function clearSelection() {
+    selectedNodeKey.value = null
+  }
+
+  /* ================= 分组带：增删改 ================= */
+  function nextGroupXh() {
+    return (getGroups() || []).reduce((m, g) => Math.max(m, Number(g.b_xh || 0)), 0) + 10
+  }
+
+  function addRootGroup() {
+    if (loading()) return
+    const newGroup = {
+      b_id: createTempId(),
+      b_module_id: moduleId(),
+      b_parent_id: null,
+      b_title: '',
+      b_xh: nextGroupXh(),
+      b_canuse: 1,
+    }
+    emitGroupsRenumbered([...(getGroups() || []), newGroup])
+    focusNewBandTitle(newGroup.b_id)
+  }
+
+  function addSubGroup(band) {
+    if (!band || loading()) return
+    const newGroup = {
+      b_id: createTempId(),
+      b_module_id: moduleId(),
+      b_parent_id: String(band.gid),
+      b_title: '',
+      b_xh: nextGroupXh(),
+      b_canuse: 1,
+    }
+    emitGroupsRenumbered([...(getGroups() || []), newGroup])
+    focusNewBandTitle(newGroup.b_id)
+  }
+
+  function focusNewBandTitle(gid) {
+    nextTick(() => {
+      if (!bandMeta.value.metaMap.has(String(gid))) return
+      selectedNodeKey.value = `g:${gid}`
+      requestRename(String(gid))
+    })
+  }
+
+  function deleteBand(band) {
+    if (!band || loading()) return
+    const gid = String(band.gid)
+    const full = bandMeta.value.metaMap.get(gid)
+    if (!full) return
+    const title = full.group.b_title || `分组-${gid}`
+    const affected = new Set()
+    const collect = (nodes) => {
+      for (const node of nodes) {
+        affected.add(String(node.gid))
+        collect(node.children)
+      }
+    }
+    collect([full])
+    const childGids = new Set(full.children.map((n) => String(n.gid)))
+    const parentId = full.group.b_parent_id == null ? null : String(full.group.b_parent_id)
+    let groups = (getGroups() || []).filter((g) => String(g.b_id) !== gid)
+    groups = groups.map((g) =>
+      childGids.has(String(g.b_id)) ? { ...g, b_parent_id: parentId } : g,
+    )
+    for (const row of localRows.value) {
+      if (groupIdOfRow(row) === gid) row.b_group_id = null
+    }
+    rebuildFlat(bandRootsFromGroups(groups))
+    // removedGroupIds 上抛：其它配置分节（列表/编辑/表单）的分组引用由宿主统一清理
+    applyGroups(groups, [gid])
+    if (selectedNodeKey.value === `g:${gid}`) selectedNodeKey.value = null
+    Message.success(
+      affected.size > 1 ? `已删除分组「${title}」，其下字段移至「未分组」` : `已删除分组「${title}」`,
+    )
+  }
+
+  function onRenameCommit({ gid, title }) {
+    const value = String(title ?? '').trim()
+    applyGroups(
+      (getGroups() || []).map((g) =>
+        String(g.b_id) === String(gid) ? { ...g, b_title: value } : g,
+      ),
+    )
+  }
+
+  function onBandTitleChange(value) {
+    const band = selectedBand.value
+    if (!band || loading()) return
+    const title = String(value ?? '').trim()
+    if (band.group.b_title === title) return
+    applyGroups(
+      (getGroups() || []).map((g) =>
+        String(g.b_id) === String(band.gid) ? { ...g, b_title: title } : g,
+      ),
+    )
+  }
+
+  function toggleBandEnable() {
+    const band = selectedBand.value
+    if (!band || loading()) return
+    applyGroups(
+      (getGroups() || []).map((g) =>
+        String(g.b_id) === String(band.gid)
+          ? { ...g, b_canuse: Number(g.b_canuse) === 1 ? 0 : 1 }
+          : g,
+      ),
+    )
+  }
+
+  /* ================= 列：增删改 ================= */
+  function bandOwnRangeEnd(gid, rows) {
+    let last = -1
+    rows.forEach((r, i) => {
+      if (groupIdOfRow(r) === gid) last = i
+    })
+    return last
+  }
+
+  function countColumnsBefore(gid, rows) {
+    const columns = groupColumnsMap.value
+    let count = 0
+    let found = false
+    const walk = (nodes) => {
+      if (found) return
+      for (const node of nodes) {
+        if (node.gid === gid) {
+          found = true
+          return
+        }
+        count += (columns.map.get(node.gid) || []).length
+        walk(node.children)
+        if (found) return
+      }
+    }
+    walk(bandMeta.value.roots)
+    return found ? count : rows.length
+  }
+
+  function appendIntoGroup(row, groupId, rows) {
+    if (groupId != null) {
+      const last = bandOwnRangeEnd(String(groupId), rows)
+      if (last >= 0) rows.splice(last + 1, 0, row)
+      else rows.splice(countColumnsBefore(String(groupId), rows), 0, row)
+    } else {
+      rows.push(row)
+    }
+  }
+
+  function insertField(field, { groupId = null, targetId = null, position = 'after' } = {}) {
+    if (!field || loading()) return null
+    const existing = localRows.value.find((r) => String(r.b_field_id) === String(field.b_id))
+    if (existing) return existing
+    const row = createRow(field, groupId)
+    if (targetId != null) {
+      const tIdx = localRows.value.findIndex(
+        (r) => String(r.b_field_id) === String(targetId),
+      )
+      if (tIdx >= 0) {
+        localRows.value.splice(tIdx + (position === 'after' ? 1 : 0), 0, row)
+      } else appendIntoGroup(row, groupId, localRows.value)
+    } else {
+      appendIntoGroup(row, groupId, localRows.value)
+    }
+    rebuildFlat()
+    return row
+  }
+
+  function removeRow(row) {
+    if (!row || loading()) return
+    localRows.value = renumberRows(
+      localRows.value.filter((item) => String(item.b_id) !== String(row.b_id)),
+    )
+    applyRows(localRows.value)
+    if (selectedNodeKey.value === `c:${row.b_field_id}`) selectedNodeKey.value = null
+  }
+
+  function removeSelected() {
+    const band = selectedBand.value
+    if (band) {
+      deleteBand(band)
+      return
+    }
+    removeRow(selectedRow.value)
+  }
+
+  function moveColumn(row, delta) {
+    const list = localRows.value
+    const gid = groupIdOfRow(row)
+    const own = []
+    for (let i = 0; i < list.length; i++) {
+      if (groupIdOfRow(list[i]) === gid) own.push(i)
+    }
+    const idx = own.findIndex((i) => String(list[i].b_id) === String(row.b_id))
+    const target = idx + (delta > 0 ? 1 : -1)
+    if (idx < 0 || target < 0 || target >= own.length) return
+    const a = own[idx]
+    const b = own[target]
+    const tmp = list[a]
+    list[a] = list[b]
+    list[b] = tmp
+    rebuildFlat()
+    selectedNodeKey.value = `c:${row.b_field_id}`
+  }
+
+  function moveBand(band, delta) {
+    const gid = String(band.gid)
+    const parentId = band.group.b_parent_id == null ? null : String(band.group.b_parent_id)
+    const parentNode = parentId != null ? bandMeta.value.metaMap.get(parentId) : null
+    const sibs = parentNode ? parentNode.children : bandMeta.value.roots
+    const idx = sibs.findIndex((n) => String(n.gid) === gid)
+    if (idx < 0) return
+    const target = idx + (delta > 0 ? 1 : -1)
+    if (target < 0 || target >= sibs.length) return
+    commitBandDrag(gid, {
+      kind: 'band-edge',
+      gid: sibs[target].gid,
+      pos: delta > 0 ? 'after' : 'before',
+    })
+  }
+
+  /* ================= 结构树节点常驻操作 ================= */
+  function onNodeMove({ key, direction }) {
+    if (loading() || !key || !direction) return
+    if (key.startsWith('c:')) {
+      const row = findRowByFieldId(key.slice(2))
+      if (row) moveColumn(row, direction)
+    } else if (key.startsWith('g:') && key !== 'g:ungrouped') {
+      const band = bandMeta.value.metaMap.get(key.slice(2))
+      if (band) moveBand(band, direction)
+    }
+  }
+  function onNodeDelete({ key }) {
+    if (loading() || !key) return
+    if (key.startsWith('c:')) {
+      const row = findRowByFieldId(key.slice(2))
+      if (row) removeRow(row)
+    } else if (key.startsWith('g:') && key !== 'g:ungrouped') {
+      const band = bandMeta.value.metaMap.get(key.slice(2))
+      if (band) deleteBand(band)
+    }
+  }
+  function onNodeAddSub({ key }) {
+    if (loading() || !key || !key.startsWith('g:') || key === 'g:ungrouped') return
+    const band = bandMeta.value.metaMap.get(key.slice(2))
+    if (band) addSubGroup(band)
+  }
+
+  /* ================= 字段定位/外部拖入（字段库） ================= */
+  function scrollToRowCell(fieldId) {
+    document
+      .querySelector(`.mm-tdesign__cell[data-field-id="${fieldId}"]`)
+      ?.scrollIntoView?.({ block: 'nearest', behavior: 'smooth' })
+  }
+
+  function selectField(field) {
+    if (!field || loading()) return
+    const existing = findRowByFieldId(String(field.b_id))
+    if (existing) {
+      selectRow(existing)
+      nextTick(() => scrollToRowCell(String(existing.b_field_id)))
+      return existing
+    }
+    const band = selectedBand.value
+    const gid = band ? String(band.gid) : null
+    const row = insertField(field, { groupId: gid })
+    if (!row) return null
+    selectRow(row)
+    nextTick(() => scrollToRowCell(String(row.b_field_id)))
+    return row
+  }
+
+  // 字段库外部拖入：dropKey 为 'g:ungrouped' / 'g:<gid>' / 'c:<fieldId>'
+  function onFieldDrop({ fieldId, dropKey, dropPosition }) {
+    if (loading() || !fieldId || !getField) return
+    const field = getField(String(fieldId))
+    if (!field) return
+    const existing = findRowByFieldId(fieldId)
+    if (existing) {
+      if (dropKey === 'g:ungrouped') {
+        commitColDrag(fieldId, { kind: 'ungrouped' })
+      } else if (dropKey.startsWith('g:')) {
+        commitColDrag(fieldId, { kind: 'into-band', gid: dropKey.slice(2) })
+      } else {
+        const row = findRowByFieldId(dropKey.slice(2))
+        commitColDrag(fieldId, {
+          kind: 'col-edge',
+          gid: row ? groupIdOfRow(row) : null,
+          targetId: dropKey.slice(2),
+          pos: dropPosition === 'before' ? 'before' : 'after',
+        })
+      }
+      return
+    }
+    let groupId = null
+    let targetId = null
+    if (dropKey === 'g:ungrouped') {
+      groupId = null
+    } else if (dropKey.startsWith('g:')) {
+      groupId = dropKey.slice(2)
+    } else {
+      const row = findRowByFieldId(dropKey.slice(2))
+      groupId = row ? groupIdOfRow(row) : null
+      targetId = row ? dropKey.slice(2) : null
+    }
+    const created = insertField(field, {
+      groupId,
+      targetId,
+      position: dropPosition === 'before' ? 'before' : 'after',
+    })
+    if (!created) return
+    selectRow(created)
+    nextTick(() => scrollToRowCell(String(created.b_field_id)))
+  }
+
+  /* ================= 复制/粘贴（列属性） ================= */
+  const clipboardProps = ref(null)
+
+  function copyRowProps() {
+    const row = selectedRow.value
+    if (!row || loading()) return
+    clipboardProps.value = buildClipboardProps(row, fieldNameOf, clipboardKeys)
+  }
+
+  function pastePropsToSelected() {
+    const row = selectedRow.value
+    if (!row || loading() || !clipboardProps.value) return
+    applyClipboardProps(row, clipboardProps.value.props)
+    applyRows(localRows.value)
+  }
+
+  /* ================= 结构拖拽 commit ================= */
+  function commitColDrag(fieldId, line) {
+    const rows = localRows.value
+    const idx = rows.findIndex((r) => String(r.b_field_id) === String(fieldId))
+    if (idx < 0) return
+    const [moved] = rows.splice(idx, 1)
+    let insertAt = -1
+    if (line.kind === 'col-edge') {
+      const tIdx = rows.findIndex((r) => String(r.b_field_id) === String(line.targetId))
+      if (tIdx < 0) {
+        rows.splice(idx, 0, moved)
+        return
+      }
+      moved.b_group_id = line.gid == null ? null : String(line.gid)
+      insertAt = tIdx + (line.pos === 'after' ? 1 : 0)
+    } else if (line.kind === 'into-band') {
+      moved.b_group_id = String(line.gid)
+      const last = bandOwnRangeEnd(String(line.gid), rows)
+      insertAt = last >= 0 ? last + 1 : countColumnsBefore(String(line.gid), rows)
+    } else if (line.kind === 'col-group-edge') {
+      const target = bandMeta.value.metaMap.get(String(line.gid))
+      if (!target) {
+        rows.splice(idx, 0, moved)
+        return
+      }
+      moved.b_group_id = target.group.b_parent_id == null ? null : String(target.group.b_parent_id)
+      insertAt = countColumnsBefore(String(line.gid), rows)
+      if (line.pos === 'after') insertAt += target.span
+    } else if (line.kind === 'ungrouped') {
+      moved.b_group_id = null
+      insertAt = rows.length
+    } else {
+      rows.splice(idx, 0, moved)
+      return
+    }
+    if (insertAt < 0) insertAt = rows.length
+    rows.splice(insertAt, 0, moved)
+    rebuildFlat()
+    selectedNodeKey.value = `c:${moved.b_field_id}`
+  }
+
+  function commitBandDrag(sourceGid, line) {
+    const source = bandMeta.value.metaMap.get(String(sourceGid))
+    if (!source) return
+    let newParentId = null
+    let orderedSibGids = []
+    if (line.kind === 'band-nest') {
+      const target = bandMeta.value.metaMap.get(String(line.gid))
+      if (!target || isDescendantGroup(String(sourceGid), line.gid)) return
+      newParentId = String(target.gid)
+      orderedSibGids = [
+        ...target.children.filter((n) => n.gid !== sourceGid).map((n) => n.gid),
+        sourceGid,
+      ]
+    } else if (line.kind === 'band-edge') {
+      const target = bandMeta.value.metaMap.get(String(line.gid))
+      if (!target || isDescendantGroup(String(sourceGid), line.gid)) return
+      newParentId = target.group.b_parent_id == null ? null : String(target.group.b_parent_id)
+      const parentNode = newParentId != null ? bandMeta.value.metaMap.get(newParentId) : null
+      const sibGids = (parentNode ? parentNode.children : bandMeta.value.roots)
+        .filter((n) => n.gid !== sourceGid)
+        .map((n) => n.gid)
+      const tIdx = sibGids.indexOf(String(line.gid))
+      if (tIdx < 0) return
+      orderedSibGids = [...sibGids]
+      orderedSibGids.splice(line.pos === 'after' ? tIdx + 1 : tIdx, 0, sourceGid)
+    } else {
+      return
+    }
+    const sibSet = new Set(orderedSibGids.map(String))
+    const orderById = new Map(orderedSibGids.map((gid, i) => [String(gid), i]))
+    const groups = (getGroups() || []).map((g) => {
+      const c = { ...g }
+      const gid = String(g.b_id)
+      if (gid === String(sourceGid)) c.b_parent_id = newParentId
+      if (sibSet.has(gid)) c.b_xh = (orderById.get(gid) + 1) * 10
+      return c
+    })
+    applyGroups(groups)
+    // 乐观回写：不等宿主 props 往返，避免 bandMeta 在提交间隙用旧树
+    localGroups.value = groups.map((g) => ({ ...g }))
+    rebuildFlat(bandRootsFromGroups(groups))
+    selectedNodeKey.value = `g:${sourceGid}`
+  }
+
+  /* ================= 列宽（40–600 钳制） ================= */
+  function widthOf(row) {
+    const v = Number(row?.b_width)
+    return v >= 40 && v <= 600 ? v : 120
+  }
+
+  function onWidthCommit(value) {
+    const row = selectedRow.value
+    if (!row || loading()) return
+    const width = Math.min(600, Math.max(40, Number(value) || 120))
+    if (width === widthOf(row)) return
+    row.b_width = width
+    applyRows(localRows.value)
+  }
+
+  return {
+    // 状态
+    localRows,
+    localGroups,
+    selectedNodeKey,
+    // 选择
+    selectedRow,
+    selectedBand,
+    selectRow,
+    selectBand,
+    clearSelection,
+    // 树推导透传
+    groupColumnsMap,
+    bandMeta,
+    isDescendantGroup,
+    groupIdOfRow,
+    findRowByFieldId,
+    // 分组操作
+    addRootGroup,
+    addSubGroup,
+    deleteBand,
+    onRenameCommit,
+    onBandTitleChange,
+    toggleBandEnable,
+    commitBandDrag,
+    // 行操作
+    commitColDrag,
+    insertField,
+    removeRow,
+    removeSelected,
+    moveColumn,
+    moveBand,
+    // 树节点常驻操作
+    onNodeMove,
+    onNodeDelete,
+    onNodeAddSub,
+    // 字段定位
+    selectField,
+    scrollToRowCell,
+    // 字段库外部拖入
+    onFieldDrop,
+    // 剪贴板
+    clipboardProps,
+    copyRowProps,
+    pastePropsToSelected,
+    // 列宽
+    widthOf,
+    onWidthCommit,
+  }
+}
diff --git a/code/fms/fms-vue/src/views/system/module-management/editPanelShared.js b/code/fms/fms-vue/src/views/system/module-management/editPanelShared.js
index 3d11cb88..0e291a8d 100644
--- a/code/fms/fms-vue/src/views/system/module-management/editPanelShared.js
+++ b/code/fms/fms-vue/src/views/system/module-management/editPanelShared.js
@@ -1,6 +1,6 @@
 /**
  * 两个编辑面板共享的纯函数（无 Vue 依赖）。
- * 栅格重排、列属性复制/粘贴、可见性 Map、字段库搜索、编辑行构建等。
+ * 栅格重排、列属性复制/粘贴、字段库搜索、编辑行构建等。
  */
 import { createTempId } from '@/utils/tempId'
 
@@ -9,17 +9,6 @@ export function renumberRows(rows) {
   return rows.map((row, index) => ({ ...row, b_xh: (index + 1) * 10 }))
 }
 
-/** 构建字段可见性 Map：b_field_id → b_visible（1/0） */
-export function buildVisibilityMap(rows) {
-  const map = new Map()
-  for (const row of rows) {
-    if (row.b_field_id != null) {
-      map.set(String(row.b_field_id), Number(row.b_visible) === 1 ? 1 : 0)
-    }
-  }
-  return map
-}
-
 /**
  * 复制列属性：提取指定 keys 的标准化值，返回 { name, props }。
  * 特殊键处理：b_placeholder → 字符串或 null；b_height/b_width → 数值或 null；
diff --git a/code/fms/fms-vue/src/views/system/module-management/fieldAreaDefaults.js b/code/fms/fms-vue/src/views/system/module-management/fieldAreaDefaults.js
new file mode 100644
index 00000000..44cbca1c
--- /dev/null
+++ b/code/fms/fms-vue/src/views/system/module-management/fieldAreaDefaults.js
@@ -0,0 +1,59 @@
+/**
+ * 字段区域默认策略（唯一真源）：
+ * 「字段定义 → 列表列 / 查询条件默认配置行」的规则集中于此，供
+ * useModuleConfig.buildMissingDefaultConfigs（同步字段、补充缺失）与查询面板
+ * （选定字段后的组件/操作符重置）共用。
+ *
+ * 参与语义约定：配置行存在 = 已配置；是否参与运行时由行内开关表达
+ * （列表 b_visible、查询 b_canuse）。默认不参与的字段（大文本）同样生成行、
+ * 开关置 0——保留配置空间，勾选即恢复；删除行仅用于清掉不该存在的行（误加的查询条件）。
+ */
+
+/** 大文本字段：默认不进列表、默认不作为查询条件 */
+function isLargeText(field) {
+  return field.b_type === 'textarea' || field.b_dbtype === 'text'
+}
+
+/** 列表列默认宽度（按控件类型） */
+const LIST_WIDTH_DEFAULTS = {
+  input: 120,
+  textarea: 160,
+  number: 100,
+  money: 110,
+  date: 100,
+  datetime: 150,
+  checkbox: 60,
+  select: 110,
+}
+
+/** 字段 → 列表列默认属性（b_visible / b_width / b_sortable） */
+export function listRowDefaults(field) {
+  return {
+    b_visible: isLargeText(field) ? 0 : 1,
+    b_width: LIST_WIDTH_DEFAULTS[field.b_type] ?? 100,
+    b_sortable: 0,
+  }
+}
+
+/** 按控件类型给出查询组件/操作符默认值；未列出的（input/textarea）走通用 like */
+const QUERY_COMPONENT_DEFAULTS = {
+  number: { component: 'number', operator: 'eq' },
+  money: { component: 'number', operator: 'eq' },
+  date: { component: 'date', operator: 'ge' },
+  datetime: { component: 'datetime', operator: 'ge' },
+  select: { component: 'select', operator: 'eq' },
+  checkbox: { component: 'checkbox', operator: 'eq' },
+}
+
+/** 字段 → 查询条件默认属性（b_component / b_operator / b_canuse） */
+export function queryRowDefaults(field) {
+  const component = QUERY_COMPONENT_DEFAULTS[field.b_type] || {
+    component: 'input',
+    operator: 'like',
+  }
+  return {
+    b_component: component.component,
+    b_operator: component.operator,
+    b_canuse: isLargeText(field) ? 0 : 1,
+  }
+}
diff --git a/code/fms/fms-vue/src/views/system/module-management/index.vue b/code/fms/fms-vue/src/views/system/module-management/index.vue
index 80b41ce6..55b49bd6 100644
--- a/code/fms/fms-vue/src/views/system/module-management/index.vue
+++ b/code/fms/fms-vue/src/views/system/module-management/index.vue
@@ -19,7 +19,6 @@ import {
   List,
   Pencil,
   Hash,
-  RefreshCw,
   Shield,
   Globe,
   Info,
@@ -94,7 +93,6 @@ const isQueryModule = computed(() => moduleType.value === 'query')
 
 /* ================= 编辑方式 / 导航 / i18n 展示（面板编排） ================= */
 const editMode = computed(() => drafts.value?.module?.b_edit_mode || 'form')
-const editNavLabel = computed(() => (editMode.value === 'table' ? '表格设计' : '表单设计'))
 
 const finalI18nItems = computed(() => {
   const module = drafts.value?.module
@@ -117,6 +115,11 @@ const finalI18nItems = computed(() => {
     const key = buildModuleItemI18nKey('power', module.b_code, power.b_code)
     if (key) items.push({ key, managed: true, defaultValue: power.b_name || '', id: `power:${key}` })
   }
+  // 分组标题多语言：b_i18n 为用户手填 key（空则运行时直接用标题原文，不纳入受管）
+  for (const group of drafts.value?.groups || []) {
+    const key = String(group.b_i18n || '').trim()
+    if (key) items.push({ key, managed: true, defaultValue: group.b_title || '', id: `group:${group.b_id}` })
+  }
   return items
 })
 
@@ -137,30 +140,18 @@ const configGroups = computed(() => {
       items: [{ key: 'fields', label: '字段定义', icon: Table2 }],
     })
 
-    // 界面配置：表单设计（数据模块）→ 列表配置 → 查询配置
+    // 界面配置：表单设计（数据模块，含主表表单/子表表格两种编辑方式）→ 列表配置 → 查询配置
     const uiItems = []
     if (isDataModule.value) {
-      const editLen = drafts.value?.editConfig?.length ?? 0
-      uiItems.push({
-        key: 'edit',
-        label: editNavLabel.value,
-        icon: Pencil,
-        badge: editLen ? '已配置' : '',
-      })
+      uiItems.push({ key: 'edit', label: '表单设计', icon: Pencil })
     }
-    const listLen = drafts.value?.listConfig?.length ?? 0
-    uiItems.push({
-      key: 'list',
-      label: '列表配置',
-      icon: List,
-      badge: listLen ? '已配置' : '',
-    })
-    const queryLen = drafts.value?.queryConfig?.length ?? 0
+    // 列表配置行在加载时自动补全全部启用字段，无「缺失」概念，不带徽标
+    uiItems.push({ key: 'list', label: '列表配置', icon: List })
     uiItems.push({
       key: 'query',
       label: '查询配置',
       icon: Search,
-      badge: queryLen ? '已配置' : '',
+      badge: missingQueryCount.value ? `缺 ${missingQueryCount.value}` : '',
     })
     groups.push({ key: 'display', label: '界面配置', items: uiItems })
 
@@ -195,6 +186,9 @@ const configNavItems = computed(() =>
   configGroups.value.flatMap((group) => group.items.map((item) => ({ ...item }))),
 )
 
+/* 编辑设计器：form/table 两面板 props/emits 契约一致，用动态组件消除模板重复 */
+const activeEditPanel = computed(() => (editMode.value === 'table' ? ModuleTableEditPanel : ModuleFormEditPanel))
+
 /* ================= composables ================= */
 const { saveModule } = useModuleSave({
   selectedModule,
@@ -298,11 +292,12 @@ const {
 })
 
 const {
-  reloadModule,
   onModuleSelect,
   onFieldsUpdate,
   onAutoCodeUpdate,
   syncFields,
+  missingQueryCount,
+  fillMissingConfigs,
 } = useModuleConfig({
   moduleSelectedId,
   moduleTreeData,
@@ -337,6 +332,19 @@ function onModuleUpdate(section, newData) {
   if (drafts.value) drafts.value[section] = newData
 }
 
+/* 分组管理弹层提交：写回分组草稿，并清理被删分组在列表/编辑配置中的引用 */
+function onGroupsUpdate(groups, removedGroupIds) {
+  if (!drafts.value) return
+  drafts.value.groups = groups
+  const removed = new Set((removedGroupIds || []).map(String))
+  if (!removed.size) return
+  for (const section of ['listConfig', 'editConfig']) {
+    drafts.value[section] = (drafts.value[section] || []).map((row) =>
+      removed.has(String(row.b_group_id)) ? { ...row, b_group_id: null } : row,
+    )
+  }
+}
+
 function onModuleI18nSaved() {
   i18nPanelRef.value?.refreshKey?.()
 }
@@ -408,6 +416,27 @@ loadModuleTree()
         <SplitterPanel>
       <main class="mm-main">
         <template v-if="selectedModule">
+          <!-- 顶部通栏操作：保存 / 同步字段（全 tab 生效，不随内容区切换） -->
+          <div class="mm-main-toolbar">
+            <Button
+              type="primary"
+              :loading="configSaving"
+              :disabled="configLoading || !drafts"
+              @click="saveModule"
+            >
+              <Save :size="14" /> 保存
+            </Button>
+            <Button
+              v-if="isDataModule || isQueryModule"
+              type="outline"
+              :disabled="busy"
+              title="按数据库视图结构对齐字段定义"
+              @click="syncFields"
+            >
+              同步字段
+            </Button>
+          </div>
+
           <Tabs
             v-if="drafts"
             v-model="activeSection"
@@ -421,21 +450,6 @@ loadModuleTree()
               <span class="mm-config-nav__label">{{ item.label }}</span>
               <span v-if="item.badge" class="mm-config-nav__badge">{{ item.badge }}</span>
             </template>
-            <template #rightExtra>
-              <div class="mm-header__actions">
-                <Button type="outline" :disabled="busy || !selectedModule" @click="reloadModule">
-                  <RefreshCw :size="14" /> 重载
-                </Button>
-                <Button
-                  type="primary"
-                  :loading="configSaving"
-                  :disabled="configLoading"
-                  @click="saveModule"
-                >
-                  <Save :size="14" /> 保存
-                </Button>
-              </div>
-            </template>
           </Tabs>
 
           <div class="mm-body__inner">
@@ -456,9 +470,6 @@ loadModuleTree()
                   v-show="activeSection === 'fields'"
                   class="mm-config-pane"
                 >
-                  <div class="mm-section-toolbar">
-                    <Button type="outline" :disabled="busy" @click="syncFields">同步字段</Button>
-                  </div>
                   <ModuleFieldsPanel
                     :module-id="String(selectedModule.b_id)"
                     :module-code="drafts?.module?.b_code || ''"
@@ -466,7 +477,6 @@ loadModuleTree()
                     :loading="busy"
                     @update="onFieldsUpdate"
                     @i18n-saved="onModuleI18nSaved"
-                    @sync-fields="syncFields"
                   />
                 </div>
 
@@ -477,25 +487,23 @@ loadModuleTree()
                 >
                   <ModuleListConfigPanel
                     :module-id="String(selectedModule.b_id)"
+                    :module-code="drafts?.module?.b_code || ''"
                     :list-config="drafts?.listConfig"
-                    :edit-config="drafts?.editConfig"
-                    :query-config="drafts?.queryConfig"
                     :fields="drafts?.fields"
                     :groups="drafts?.groups"
                     :loading="busy"
                     @update="(v) => onModuleUpdate('listConfig', v)"
-                    @sync-edit="(v) => onModuleUpdate('editConfig', v)"
-                    @sync-query="(v) => onModuleUpdate('queryConfig', v)"
+                    @update-groups="onGroupsUpdate"
+                    @i18n-saved="onModuleI18nSaved"
                   />
                 </div>
 
                 <div v-if="isDataModule" v-show="activeSection === 'edit'" class="mm-config-pane">
-                  <ModuleTableEditPanel
-                    v-if="editMode === 'table'"
+                  <component
+                    :is="activeEditPanel"
                     :module-id="String(selectedModule.b_id)"
                     :edit-config="drafts?.editConfig"
                     :list-config="drafts?.listConfig"
-                    :query-config="drafts?.queryConfig"
                     :fields="drafts?.fields"
                     :groups="drafts?.groups"
                     :edit-mode="editMode"
@@ -505,28 +513,8 @@ loadModuleTree()
                     @update:edit-mode="
                       (v) => onModuleUpdate('module', { ...(drafts?.module || {}), b_edit_mode: v })
                     "
-                    @update-groups="(v) => onModuleUpdate('groups', v)"
-                    @sync-list="(v) => onModuleUpdate('listConfig', v)"
-                    @sync-query="(v) => onModuleUpdate('queryConfig', v)"
-                  />
-                  <ModuleFormEditPanel
-                    v-else
-                    :module-id="String(selectedModule.b_id)"
-                    :edit-config="drafts?.editConfig"
-                    :list-config="drafts?.listConfig"
-                    :query-config="drafts?.queryConfig"
-                    :fields="drafts?.fields"
-                    :groups="drafts?.groups"
-                    :edit-mode="editMode"
-                    :active="activeSection === 'edit'"
-                    :loading="busy"
-                    @update="(v) => onModuleUpdate('editConfig', v)"
-                    @update:edit-mode="
-                      (v) => onModuleUpdate('module', { ...(drafts?.module || {}), b_edit_mode: v })
-                    "
-                    @update-groups="(v) => onModuleUpdate('groups', v)"
-                    @sync-list="(v) => onModuleUpdate('listConfig', v)"
-                    @sync-query="(v) => onModuleUpdate('queryConfig', v)"
+                    @update-groups="onGroupsUpdate"
+                    @update-list-config="(v) => onModuleUpdate('listConfig', v)"
                   />
                 </div>
 
@@ -540,7 +528,9 @@ loadModuleTree()
                     :query-config="drafts?.queryConfig"
                     :fields="drafts?.fields"
                     :loading="busy"
+                    :missing-count="missingQueryCount"
                     @update="(v) => onModuleUpdate('queryConfig', v)"
+                    @fill-missing="() => fillMissingConfigs(['queryConfig'])"
                   />
                 </div>
 
@@ -803,12 +793,13 @@ loadModuleTree()
   font-size: 13px;
 }
 
-/* 操作按钮组（Tabs 的 rightExtra 插槽内） */
-.mm-header__actions {
+/* 顶部通栏操作条：保存 / 同步字段（位于 tabs 之上，全 tab 生效） */
+.mm-main-toolbar {
   display: flex;
   align-items: center;
-  gap: 12px;
+  gap: 8px;
   flex: none;
+  padding: 8px 10px;
 }
 
 /* ---- 右侧：配置工作区 ---- */
@@ -897,11 +888,4 @@ loadModuleTree()
     transform: rotate(360deg);
   }
 }
-
-.mm-section-toolbar {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding-bottom: 8px;
-}
 </style>
diff --git a/code/fms/fms-vue/src/views/tmp-dnd-panel.vue b/code/fms/fms-vue/src/views/tmp-dnd-panel.vue
index 18df1091..3e5b7d74 100644
--- a/code/fms/fms-vue/src/views/tmp-dnd-panel.vue
+++ b/code/fms/fms-vue/src/views/tmp-dnd-panel.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref } from 'vue'
-import ModuleTableEditPanel from '@/views/system/module-management/components/ModuleTableEditPanel.vue'
+import ModuleTableEditPanel from '@/views/system/module-management/components/table-edit/TableEditPanel.vue'
 
 const fields = [
   { b_id: '1', b_name: '姓名', b_field: 'name', b_type: 'input' },
diff --git a/code/fms/fms-vue/tests/components/popover.spec.js b/code/fms/fms-vue/tests/components/popover.spec.js
new file mode 100644
index 00000000..af5b77d3
--- /dev/null
+++ b/code/fms/fms-vue/tests/components/popover.spec.js
@@ -0,0 +1,160 @@
+import { describe, it, expect } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { nextTick, ref } from 'vue'
+import Popover from '@/components/ui/popover/popover.vue'
+import Button from '@/components/ui/button/button.vue'
+
+/** 查询 Teleport 到 body 的浮层（Transition + v-if 渲染） */
+function bodyPopover() {
+  return document.body.querySelector('.popover')
+}
+
+async function flush() {
+  await nextTick()
+}
+
+describe('Popover 触发器包裹', () => {
+  it('默认（unwrapped=false）渲染 span.popover-trigger 包裹层', () => {
+    const wrapper = mount(Popover, {
+      props: { trigger: 'click' },
+      slots: {
+        trigger: '<button class="t-btn">触发</button>',
+        content: '<div class="t-content">内容</div>',
+      },
+    })
+    expect(wrapper.find('span.popover-trigger').exists()).toBe(true)
+    expect(wrapper.find('button.t-btn').exists()).toBe(true)
+    wrapper.unmount()
+  })
+
+  it('unwrapped 单根元素：不渲染包裹层 span，仅保留用户触发器', () => {
+    const wrapper = mount(Popover, {
+      props: { trigger: 'click', unwrapped: true },
+      slots: {
+        trigger: '<button class="t-btn">触发</button>',
+        content: '<div class="t-content">内容</div>',
+      },
+    })
+    expect(wrapper.find('span.popover-trigger').exists()).toBe(false)
+    expect(wrapper.find('button.t-btn').exists()).toBe(true)
+    wrapper.unmount()
+  })
+
+  it('unwrapped 多根 fragment：自动回退到 span.popover-trigger 包裹层', () => {
+    const wrapper = mount(Popover, {
+      props: { trigger: 'click', unwrapped: true },
+      slots: {
+        trigger: '<button>A</button><button>B</button>',
+        content: '<div class="t-content">内容</div>',
+      },
+    })
+    expect(wrapper.find('span.popover-trigger').exists()).toBe(true)
+    expect(wrapper.findAll('span.popover-trigger > button').length).toBe(2)
+    wrapper.unmount()
+  })
+
+  it('unwrapped 文本节点：回退到包裹层', () => {
+    const wrapper = mount(Popover, {
+      props: { trigger: 'click', unwrapped: true },
+      slots: {
+        trigger: '纯文本触发器',
+        content: '<div class="t-content">内容</div>',
+      },
+    })
+    expect(wrapper.find('span.popover-trigger').exists()).toBe(true)
+    wrapper.unmount()
+  })
+})
+
+describe('Popover 零包裹交互', () => {
+  it('unwrapped 点击触发器可开合浮层（事件注入到用户 vnode）', async () => {
+    const wrapper = mount(Popover, {
+      props: { trigger: 'click', unwrapped: true },
+      slots: {
+        trigger: '<button class="t-btn">触发</button>',
+        content: '<div class="t-content">内容</div>',
+      },
+    })
+    expect(bodyPopover()).toBeNull()
+
+    await wrapper.find('button.t-btn').trigger('click')
+    await flush()
+    expect(bodyPopover()).not.toBeNull()
+
+    await wrapper.find('button.t-btn').trigger('click')
+    await flush()
+    expect(bodyPopover()).toBeNull()
+    wrapper.unmount()
+  })
+
+  it('unwrapped 浮层有 left/top 定位（证明锚点指令真正挂载：vnode.dirs 字段名）', async () => {
+    // 回归测试：曾因把指令注入到 vnode.directives 字段（应为 vnode.dirs），
+    // 导致锚点指令静默失效、triggerEl 永远 null、updatePosition 提前 return、
+    // 浮层无定位在 body 末尾不可见。jsdom 矩形=0，updatePosition 期望写出 0px。
+    const wrapper = mount(Popover, {
+      props: { trigger: 'click', unwrapped: true },
+      slots: {
+        trigger: '<button class="t-btn">触发</button>',
+        content: '<div class="t-content">内容</div>',
+      },
+    })
+    await wrapper.find('button.t-btn').trigger('click')
+    await flush()
+    const float = bodyPopover()
+    expect(float).not.toBeNull()
+    // 锚点指令必须已挂载并同步 triggerEl，updatePosition 才能写 left/top；
+    // 若 vnode.dirs 拼成 directives（被静默忽略），style.left 保持空串。
+    // jsdom 矩形=0，具体值取决于 computePosition 的 shift 防溢出，仅断言非空即可。
+    expect(float.style.left).not.toBe('')
+    expect(float.style.top).not.toBe('')
+    wrapper.unmount()
+  })
+
+  it('事件合并：用户 @click 与内部 toggle 均触发，不互相覆盖', async () => {
+    const TestHost = {
+      components: { Popover },
+      setup() {
+        const userClicks = ref(0)
+        return { userClicks }
+      },
+      template: `
+        <div>
+          <Popover trigger="click" unwrapped>
+            <template #trigger>
+              <button class="t-btn" @click="userClicks++">触发</button>
+            </template>
+            <template #content><div class="t-content">内容</div></template>
+          </Popover>
+          <span class="t-counter">{{ userClicks }}</span>
+        </div>
+      `,
+    }
+    const wrapper = mount(TestHost)
+    await wrapper.find('button.t-btn').trigger('click')
+    await flush()
+    // 用户 handler 先执行
+    expect(wrapper.find('.t-counter').text()).toBe('1')
+    // 内部 toggle 后执行 → 浮层打开
+    expect(bodyPopover()).not.toBeNull()
+    wrapper.unmount()
+  })
+
+  it('组件作触发器：事件注入到组件根元素，点击可开合', async () => {
+    const TestHost = {
+      components: { Popover, Button },
+      template: `
+        <Popover trigger="click" unwrapped>
+          <template #trigger><Button>点击</Button></template>
+          <template #content><div class="t-content">内容</div></template>
+        </Popover>
+      `,
+    }
+    const wrapper = mount(TestHost)
+    const btn = wrapper.find('button')
+    expect(btn.exists()).toBe(true)
+    await btn.trigger('click')
+    await flush()
+    expect(bodyPopover()).not.toBeNull()
+    wrapper.unmount()
+  })
+})
diff --git a/code/fms/fms-vue/tests/unit/form-edit-panel-mount.spec.js b/code/fms/fms-vue/tests/unit/form-edit-panel-mount.spec.js
new file mode 100644
index 00000000..0a3d7707
--- /dev/null
+++ b/code/fms/fms-vue/tests/unit/form-edit-panel-mount.spec.js
@@ -0,0 +1,96 @@
+/**
+ * 复现用：新建空数据模块后 FormEditPanel 首次挂载（全部空数组）。
+ * 若存在响应式自触发循环，Vue 会抛 "Maximum recursive updates exceeded"。
+ */
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi } from 'vitest'
+import { createPinia, setActivePinia } from 'pinia'
+import ModuleFormEditPanel from '@/views/system/module-management/components/form-edit/FormEditPanel.vue'
+
+vi.mock('@/services/api', () => ({
+  loadDataApi: vi.fn(async () => ({ data: [] })),
+  saveObjectApi: vi.fn(),
+  nextIdApi: vi.fn(),
+  describeApi: vi.fn(async () => ({ data: [] })),
+}))
+
+const StubDraggable = {
+  name: 'draggable',
+  props: {
+    list: { type: Array, default: () => [] },
+    itemKey: { type: String, default: undefined },
+  },
+  emits: ['start', 'end'],
+  template: `
+    <div class="stub-draggable">
+      <template v-for="el in list" :key="el[itemKey || 'key']">
+        <slot name="item" :element="el" />
+      </template>
+      <slot name="footer" />
+    </div>
+  `,
+}
+
+function mountEmptyPanel() {
+  return mount(ModuleFormEditPanel, {
+    props: {
+      moduleId: 'm1',
+      editConfig: [],
+      listConfig: [],
+      fields: [],
+      groups: [],
+      editMode: 'form',
+      loading: false,
+      active: true,
+    },
+    global: { stubs: { draggable: StubDraggable } },
+  })
+}
+
+const fields = [
+  { b_id: '1', b_name: '姓名', b_field: 'name', b_type: 'input' },
+  { b_id: '2', b_name: '年龄', b_field: 'age', b_type: 'number' },
+]
+const groups = [
+  { b_id: 'g1', b_module_id: 'm1', b_parent_id: null, b_title: '基本信息', b_xh: 10, b_canuse: 1 },
+]
+const editConfig = [
+  { b_id: 'e1', b_module_id: 'm1', b_field_id: '1', b_group_id: 'g1', b_visible: 1, b_required: 0, b_readonly: 0, b_disabled: 0, b_colspan: 24, b_height: null, b_placeholder: null, b_xh: 10 },
+  { b_id: 'e2', b_module_id: 'm1', b_field_id: '2', b_group_id: null, b_visible: 1, b_required: 0, b_readonly: 0, b_disabled: 0, b_colspan: 24, b_height: null, b_placeholder: null, b_xh: 20 },
+]
+
+describe('FormEditPanel 空模块挂载', () => {
+  it('从空挂载不触发递归更新', async () => {
+    setActivePinia(createPinia())
+    const wrapper = mountEmptyPanel()
+    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick()
+    expect(wrapper.exists()).toBe(true)
+    wrapper.unmount()
+  })
+
+  it('已有数据模块切到空草稿（新建模块序列）不触发递归更新', async () => {
+    setActivePinia(createPinia())
+    const wrapper = mount(ModuleFormEditPanel, {
+      props: {
+        moduleId: 'm1',
+        editConfig: editConfig.map((r) => ({ ...r })),
+        listConfig: [],
+        fields,
+        groups: groups.map((g) => ({ ...g })),
+        editMode: 'form',
+        loading: false,
+        active: true,
+      },
+      global: { stubs: { draggable: StubDraggable } },
+    })
+    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick()
+    // 模拟 addModule：drafts 整体替换为空草稿，props 全部变为空数组
+    await wrapper.setProps({ editConfig: [], fields: [], groups: [] })
+    await wrapper.vm.$nextTick()
+    await new Promise((r) => setTimeout(r, 30))
+    expect(wrapper.exists()).toBe(true)
+    wrapper.unmount()
+  })
+})
diff --git a/code/fms/fms-vue/tests/unit/module-list-config-panel-dnd.spec.js b/code/fms/fms-vue/tests/unit/module-list-config-panel-dnd.spec.js
new file mode 100644
index 00000000..24c3b343
--- /dev/null
+++ b/code/fms/fms-vue/tests/unit/module-list-config-panel-dnd.spec.js
@@ -0,0 +1,291 @@
+import { mount } from '@vue/test-utils'
+import { describe, expect, it, vi, beforeEach } from 'vitest'
+import { createPinia, setActivePinia } from 'pinia'
+import ModuleListConfigPanel from '@/views/system/module-management/components/ModuleListConfigPanel.vue'
+
+/**
+ * 列表配置面板与子表设计共用 useStructureEditing / ModuleStructureTree / TablePreview，
+ * 拖拽语义与 module-table-edit-panel-dnd.spec 同源；本文件聚焦：
+ * 1) 共用语义在列表侧（s_field_view 行）同样成立；
+ * 2) 列表侧 features 差异（无分组启停菜单、列节点无删除按钮）；
+ * 3) 分组删除经 update-groups(groups, removedGroupIds) 上抛级联清理。
+ */
+
+const fields = [
+  { b_id: '1', b_name: '姓名', b_field: 'name', b_type: 'input', b_i18n: 'field.sys.name' },
+  { b_id: '2', b_name: '年龄', b_field: 'age', b_type: 'number', b_i18n: 'field.sys.age' },
+  { b_id: '3', b_name: '状态', b_field: 'status', b_type: 'select', b_i18n: 'field.sys.status' },
+  { b_id: '4', b_name: '备注', b_field: 'remark', b_type: 'textarea', b_i18n: 'field.sys.remark' },
+]
+const groups = [
+  { b_id: 'g1', b_module_id: 'm1', b_parent_id: null, b_title: '基本信息', b_xh: 10, b_canuse: 1 },
+  { b_id: 'g2', b_module_id: 'm1', b_parent_id: null, b_title: '扩展信息', b_xh: 20, b_canuse: 1 },
+]
+const listConfig = [
+  { b_id: 'v1', b_module_id: 'm1', b_field_id: '1', b_group_id: null, b_i18n: null, b_visible: 1, b_width: 120, b_xh: 10 },
+  { b_id: 'v2', b_module_id: 'm1', b_field_id: '2', b_group_id: 'g1', b_i18n: null, b_visible: 1, b_width: 100, b_xh: 20 },
+  { b_id: 'v3', b_module_id: 'm1', b_field_id: '3', b_group_id: 'g1', b_i18n: null, b_visible: 1, b_width: 160, b_xh: 30 },
+]
+
+const StubDraggable = {
+  name: 'draggable',
+  props: {
+    list: { type: Array, default: () => [] },
+    itemKey: { type: String, default: undefined },
+  },
+  emits: ['start', 'end'],
+  template: `
+    <div class="stub-draggable">
+      <template v-for="el in list" :key="el[itemKey || 'key']">
+        <slot name="item" :element="el" />
+      </template>
+      <slot name="footer" />
+    </div>
+  `,
+}
+
+class FakeDataTransfer {
+  constructor() {
+    this.store = new Map()
+    this.types = []
+    this.effectAllowed = 'none'
+    this.dropEffect = 'none'
+  }
+  setData(type, value) {
+    if (!this.types.includes(type)) this.types.push(type)
+    this.store.set(type, String(value))
+  }
+  getData(type) {
+    return this.store.has(type) ? this.store.get(type) : ''
+  }
+}
+
+function mountPanel(extraProps = {}) {
+  return mount(ModuleListConfigPanel, {
+    props: {
+      moduleId: 'm1',
+      moduleCode: 'sys_user',
+      listConfig: listConfig.map((r) => ({ ...r })),
+      fields,
+      groups: groups.map((g) => ({ ...g })),
+      ...extraProps,
+    },
+    global: { stubs: { draggable: StubDraggable } },
+  })
+}
+
+function treeRow(wrapper, title) {
+  const row = wrapper.findAll('.mst-node').find((w) => w.text().includes(title))
+  expect(row, `未找到树节点：${title}`).toBeTruthy()
+  return row.element
+}
+
+function fireMouse(el, type, { clientX = 0, clientY = 20, button = 0 } = {}) {
+  const ev = new Event(type, { bubbles: true, cancelable: true })
+  Object.defineProperty(ev, 'clientX', { value: clientX })
+  Object.defineProperty(ev, 'clientY', { value: clientY })
+  Object.defineProperty(ev, 'button', { value: button })
+  el.dispatchEvent(ev)
+}
+
+/* VTU trigger 会把 dragover/drop 构造为 DragEvent（坐标只有 getter），手工注入 */
+function fireDrag(el, type, { clientX = 10, clientY = 20, dataTransfer } = {}) {
+  const ev = new Event(type, { bubbles: true, cancelable: true })
+  Object.defineProperty(ev, 'clientX', { value: clientX })
+  Object.defineProperty(ev, 'clientY', { value: clientY })
+  Object.defineProperty(ev, 'dataTransfer', { value: dataTransfer })
+  el.dispatchEvent(ev)
+}
+
+let hitElement = null
+
+function startMouseDrag(wrapper, srcTitle) {
+  const row = treeRow(wrapper, srcTitle)
+  const nodeKey = row.getAttribute('data-key')
+  expect(nodeKey, `节点缺少 data-key：${srcTitle}`).toBeTruthy()
+  wrapper.findComponent({ name: 'draggable' }).vm.$emit('start', {
+    item: { dataset: { key: nodeKey } },
+  })
+}
+
+function moveMouseTo(wrapper, targetTitle, { clientX = 0, clientY = 20 } = {}) {
+  const row = treeRow(wrapper, targetTitle)
+  hitElement = row.querySelector('.mst-node__label') || row
+  fireMouse(window, 'mousemove', { clientX, clientY })
+}
+
+function endMouseDrag(wrapper) {
+  wrapper.findComponent({ name: 'draggable' }).vm.$emit('end')
+}
+
+function lastUpdate(wrapper) {
+  const updates = wrapper.emitted('update')
+  expect(updates?.length).toBeGreaterThan(0)
+  return updates.at(-1)[0]
+}
+
+describe('ModuleListConfigPanel 结构编辑（与子表设计共用内核）', () => {
+  beforeEach(() => {
+    setActivePinia(createPinia())
+    document.elementFromPoint = () => hitElement
+    Element.prototype.getBoundingClientRect = () => ({
+      top: 0,
+      bottom: 40,
+      left: 0,
+      right: 200,
+      width: 200,
+      height: 40,
+      x: 0,
+      y: 0,
+      toJSON: () => ({}),
+    })
+    Element.prototype.scrollIntoView = vi.fn()
+  })
+
+  it('列拖到分组节点（inside）：移入该分组直属列末尾', () => {
+    const wrapper = mountPanel()
+    // 姓名(v1，未分组) 拖到分组「扩展信息」(g2) 行中部
+    startMouseDrag(wrapper, '姓名')
+    moveMouseTo(wrapper, '扩展信息', { clientY: 20 })
+    endMouseDrag(wrapper)
+
+    const rows = lastUpdate(wrapper)
+    expect(rows.find((r) => r.b_field_id === '1').b_group_id).toBe('g2')
+    expect(rows.map((r) => r.b_field_id)).toEqual(['2', '3', '1'])
+  })
+
+  it('列拖到「未分组」收纳节点：移出分组', () => {
+    const wrapper = mountPanel()
+    // 年龄(v2，属 g1) 拖到「未分组」
+    startMouseDrag(wrapper, '年龄')
+    moveMouseTo(wrapper, '未分组', { clientY: 20 })
+    endMouseDrag(wrapper)
+
+    const rows = lastUpdate(wrapper)
+    expect(rows.find((r) => r.b_field_id === '2').b_group_id).toBeNull()
+    expect(rows.map((r) => r.b_field_id)).toEqual(['1', '2', '3'])
+  })
+
+  it('分组拖到分组带上（inside）：嵌套（b_parent_id 指向目标）', () => {
+    const wrapper = mountPanel()
+    // 分组「扩展信息」(g2) 拖到分组「基本信息」(g1) 行中部
+    startMouseDrag(wrapper, '扩展信息')
+    moveMouseTo(wrapper, '基本信息', { clientY: 20 })
+    endMouseDrag(wrapper)
+
+    const groupUpdates = wrapper.emitted('updateGroups')
+    expect(groupUpdates?.length).toBeGreaterThan(0)
+    const nextGroups = groupUpdates.at(-1)[0]
+    expect(nextGroups.find((g) => g.b_id === 'g2').b_parent_id).toBe('g1')
+  })
+
+  it('删除分组：update-groups 带 removedGroupIds，组内行归未分组', () => {
+    const wrapper = mountPanel()
+    // 树上「基本信息」(g1) 节点常驻删除按钮
+    const row = wrapper.findAll('.mst-node').find((w) => w.text().includes('基本信息'))
+    expect(row).toBeTruthy()
+    const delBtn = row.findAll('button').find((b) => b.attributes('title') === '删除')
+    expect(delBtn).toBeTruthy()
+    delBtn.trigger('click')
+
+    const groupUpdates = wrapper.emitted('updateGroups')
+    expect(groupUpdates?.length).toBeGreaterThan(0)
+    const [nextGroups, removedIds] = groupUpdates.at(-1)
+    expect(nextGroups.map((g) => g.b_id)).toEqual(['g2'])
+    expect(removedIds).toEqual(['g1'])
+
+    // g1 下的行（年龄/状态）归未分组并重排
+    const rows = lastUpdate(wrapper)
+    expect(rows.every((r) => r.b_group_id == null)).toBe(true)
+    expect(rows.map((r) => r.b_xh)).toEqual([10, 20, 30])
+  })
+
+  it('列表侧 features：分组右键无「启停」，列节点有删除按钮（同表格设计）', async () => {
+    const wrapper = mountPanel()
+    // 列节点（姓名）渲染删除按钮
+    const colRow = wrapper.findAll('.mst-node').find((w) => w.text().includes('姓名'))
+    expect(colRow).toBeTruthy()
+    expect(colRow.findAll('button').some((b) => b.attributes('title') === '删除')).toBe(true)
+    // 分组节点也有删除按钮
+    const groupRow = wrapper.findAll('.mst-node').find((w) => w.text().includes('基本信息'))
+    expect(groupRow.findAll('button').some((b) => b.attributes('title') === '删除')).toBe(true)
+  })
+
+  it('树中列节点删除按钮：删除 = 隐藏（b_visible=0），行保留', async () => {
+    const wrapper = mountPanel()
+    const colRow = wrapper.findAll('.mst-node').find((w) => w.text().includes('姓名'))
+    const delBtn = colRow.findAll('button').find((b) => b.attributes('title') === '删除')
+    expect(delBtn).toBeTruthy()
+    await delBtn.trigger('click')
+
+    const rows = lastUpdate(wrapper)
+    // 行不删（启用字段始终有配置行），仅置隐藏；预览该列置灰带「隐藏」标记
+    expect(rows.map((r) => r.b_field_id)).toEqual(['1', '2', '3'])
+    expect(rows.find((r) => r.b_field_id === '1').b_visible).toBe(0)
+  })
+
+  it('预览表渲染多级表头：band 行含分组标题，列头含字段名', () => {
+    const wrapper = mountPanel()
+    const bands = wrapper.findAll('th.mm-tdesign__band')
+    expect(bands.map((th) => th.text())).toContain('基本信息')
+    // 未分组列（姓名）表头贯穿 band 行
+    const ungroupedCell = wrapper
+      .findAll('th.mm-tdesign__cell--ungrouped')
+      .find((th) => th.attributes('data-field-id') === '1')
+    expect(ungroupedCell).toBeTruthy()
+    expect(ungroupedCell.text()).toContain('姓名')
+  })
+
+  it('字段库字段点击加入：未加入字段点击后生成配置行并选中', async () => {
+    const wrapper = mountPanel()
+    const libItem = wrapper
+      .findAll('.mm-fdesign__lib-item')
+      .find((w) => w.attributes('data-field-id') === '4')
+    expect(libItem).toBeTruthy()
+    await libItem.trigger('click')
+
+    const rows = lastUpdate(wrapper)
+    // 新列归未分组区（未分组在前），备注为 textarea：默认隐藏、列宽 160
+    expect(rows.map((r) => r.b_field_id)).toEqual(['1', '4', '2', '3'])
+    expect(rows.find((r) => r.b_field_id === '4').b_group_id).toBeNull()
+    expect(rows.find((r) => r.b_field_id === '4').b_visible).toBe(0)
+    expect(rows.find((r) => r.b_field_id === '4').b_width).toBe(160)
+  })
+
+  it('字段库字段拖入分组带（inside）：加入该分组直属列末尾', () => {
+    const wrapper = mountPanel()
+    const libItem = wrapper
+      .findAll('.mm-fdesign__lib-item')
+      .find((w) => w.attributes('data-field-id') === '4')
+    expect(libItem).toBeTruthy()
+    const dt = new FakeDataTransfer()
+    fireDrag(libItem.element, 'dragstart', { dataTransfer: dt })
+    fireDrag(treeRow(wrapper, '基本信息'), 'dragover', { dataTransfer: dt, clientY: 20 })
+    fireDrag(treeRow(wrapper, '基本信息'), 'drop', { dataTransfer: dt })
+
+    const rows = lastUpdate(wrapper)
+    expect(rows.map((r) => r.b_field_id)).toEqual(['1', '2', '3', '4'])
+    expect(rows.find((r) => r.b_field_id === '4').b_group_id).toBe('g1')
+  })
+
+  it('属性面板：选中列显示列属性（无状态开关），删除列 = 隐藏', async () => {
+    const wrapper = mountPanel()
+    // 树中点击列节点 → Inspector 显示列属性
+    const treeRow = wrapper.findAll('.mst-node').find((w) => w.text().includes('姓名'))
+    expect(treeRow).toBeTruthy()
+    await treeRow.trigger('click')
+    const inspector = wrapper.find('.mm-fdesign__inspector')
+    expect(inspector.exists()).toBe(true)
+    expect(inspector.text()).toContain('姓名')
+    // 列表侧无状态开关（显示/必填等是子表编辑语义）
+    expect(inspector.findAll('.mm-fdesign__status-chip')).toHaveLength(0)
+    // 删除列按钮：点击隐藏该列（行保留）
+    const delBtn = inspector.findAll('button').find((b) => b.text().includes('删除列'))
+    expect(delBtn).toBeTruthy()
+    await delBtn.trigger('click')
+
+    const rows = lastUpdate(wrapper)
+    expect(rows.map((r) => r.b_field_id)).toEqual(['1', '2', '3'])
+    expect(rows.find((r) => r.b_field_id === '1').b_visible).toBe(0)
+  })
+})
diff --git a/code/fms/fms-vue/tests/unit/module-save-orchestration.spec.js b/code/fms/fms-vue/tests/unit/module-save-orchestration.spec.js
new file mode 100644
index 00000000..d734288b
--- /dev/null
+++ b/code/fms/fms-vue/tests/unit/module-save-orchestration.spec.js
@@ -0,0 +1,213 @@
+/**
+ * useModuleSave 保存编排测试：守护跨表保存的关键不变量。
+ * 这些顺序约束此前只存在于注释中，被改动时不会有任何报警：
+ * 1. 校验失败时不产生任何保存请求，且定位到对应分节；
+ * 2. s_module 有修改走 updates、新建走 inserts；
+ * 3. 临时 id 先分配真实主键，再跨表重映射 b_field_id（req 行与草稿行同引用）；
+ * 4. s_autocode 的 updates 剥离服务端维护的 b_currentperiod / b_currentvalue；
+ * 5. i18n inserts 分配真实主键并回写面板，避免二次保存重复插入。
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import { ref } from 'vue'
+import { useModuleSave } from '@/views/system/module-management/composables/useModuleSave'
+import { saveObjectApi, nextIdApi } from '@/services/api'
+import { Message } from '@/components/ui'
+
+vi.mock('@/services/api', () => ({
+  saveObjectApi: vi.fn(),
+  nextIdApi: vi.fn(),
+}))
+vi.mock('@/components/ui', () => ({
+  Message: { success: vi.fn(), error: vi.fn(), warning: vi.fn(), info: vi.fn() },
+}))
+
+let idSeq
+beforeEach(() => {
+  vi.clearAllMocks()
+  idSeq = 9000
+  nextIdApi.mockImplementation(async (count) => {
+    const ids = []
+    for (let i = 0; i < count; i++) ids.push(String(++idSeq))
+    return { data: ids }
+  })
+})
+
+function baseDrafts(over = {}) {
+  const drafts = {
+    // b_i18n 与 buildModuleI18nKey('data', 'demo') 派生值一致：saveModule 每次保存都会物化该键
+    module: { b_id: '1', b_code: 'demo', b_name: '演示模块', b_module_type: 'data', b_i18n: 'module.demo' },
+    fields: [],
+    groups: [],
+    listConfig: [],
+    editConfig: [],
+    queryConfig: [],
+    autoCode: [],
+    powers: [],
+  }
+  return Object.assign(drafts, over)
+}
+
+function setup({ drafts, originals, basicPanel = null, autoCodePanel = null, i18nPanel = null }) {
+  const unsavedModuleIds = new Set()
+  const deps = {
+    selectedModule: ref({ b_id: '1', b_code: 'demo', b_name: '演示模块' }),
+    drafts: ref(drafts),
+    originals: ref(originals),
+    loadedModuleId: ref('1'),
+    moduleSelectedId: ref('1'),
+    unsavedModuleIds,
+    configSaving: ref(false),
+    busy: ref(false),
+    activeSection: ref('basic'),
+    moduleTreeData: ref([]),
+    findModuleNode: () => null,
+    basicPanelRef: ref(basicPanel),
+    autoCodePanelRef: ref(autoCodePanel),
+    i18nPanelRef: ref(i18nPanel),
+    getFinalI18nItems: () => [{ key: 'module.demo', managed: true, id: 'module:demo' }],
+  }
+  return { saveModule: useModuleSave(deps).saveModule, unsavedModuleIds, activeSection: deps.activeSection }
+}
+
+function reqOf(table) {
+  return saveObjectApi.mock.calls.at(-1)[0].find((req) => req.table === table)
+}
+
+describe('useModuleSave 保存编排', () => {
+  it('无变更时不发请求并提示', async () => {
+    const drafts = baseDrafts()
+    const { saveModule } = setup({ drafts, originals: JSON.parse(JSON.stringify(drafts)) })
+
+    const ok = await saveModule()
+
+    expect(ok).toBe(true)
+    expect(saveObjectApi).not.toHaveBeenCalled()
+    expect(Message.info).toHaveBeenCalledWith('没有需要保存的变更')
+  })
+
+  it('基础面板校验失败：不发请求，定位到 basic 分节', async () => {
+    const drafts = baseDrafts()
+    const { saveModule, activeSection } = setup({
+      drafts,
+      originals: JSON.parse(JSON.stringify(drafts)),
+      basicPanel: { validate: async () => ['编码不能为空'] },
+    })
+
+    const ok = await saveModule()
+
+    expect(ok).toBe(false)
+    expect(saveObjectApi).not.toHaveBeenCalled()
+    expect(activeSection.value).toBe('basic')
+    expect(Message.warning).toHaveBeenCalled()
+  })
+
+  it('s_module 修改走 updates，新建走 inserts', async () => {
+    const drafts = baseDrafts({ module: { b_id: '1', b_code: 'demo', b_name: '改名后' } })
+    const originals = baseDrafts()
+    const { saveModule } = setup({ drafts, originals })
+    await saveModule()
+    expect(reqOf('s_module').updates[0].b_name).toBe('改名后')
+
+    const { saveModule: saveNew, unsavedModuleIds } = setup({
+      drafts: baseDrafts(),
+      originals: baseDrafts(),
+    })
+    unsavedModuleIds.add('1')
+    await saveNew()
+    expect(reqOf('s_module').inserts[0].b_code).toBe('demo')
+  })
+
+  it('临时 id 分配真实主键并跨表重映射 b_field_id', async () => {
+    // 新字段（临时 id -1）+ 引用它的列表列：编辑行同引用，重映射必须同时落到请求与草稿
+    const listRow = { b_id: '100', b_module_id: '1', b_field_id: '-1', b_visible: 1, b_xh: 10 }
+    const drafts = baseDrafts({
+      fields: [{ b_id: '-1', b_module_id: '1', b_field: 'name', b_name: '姓名' }],
+      listConfig: [listRow],
+    })
+    const originals = baseDrafts({
+      listConfig: [{ b_id: '100', b_module_id: '1', b_field_id: '9999', b_visible: 1, b_xh: 10 }],
+    })
+    const { saveModule } = setup({ drafts, originals })
+
+    const ok = await saveModule()
+
+    expect(ok).toBe(true)
+    expect(nextIdApi).toHaveBeenCalled()
+    const fieldReq = reqOf('s_field')
+    expect(fieldReq.inserts[0].b_id).toBe('9001')
+    // 列表列由旧字段改挂新字段：update 行内的临时外键必须已换成真实 id
+    const viewReq = reqOf('s_field_view')
+    expect(viewReq.updates[0].b_field_id).toBe('9001')
+    // 草稿行与请求行同引用：重映射后草稿也持有真实 id
+    expect(drafts.listConfig[0].b_field_id).toBe('9001')
+  })
+
+  it('s_autocode updates 剥离服务端维护的期间/当前值', async () => {
+    const rule = {
+      b_id: '200',
+      b_module_id: '1',
+      b_field_id: '100',
+      b_canuse: 1,
+      b_currentperiod: 2026,
+      b_currentvalue: 5,
+    }
+    const drafts = baseDrafts({
+      autoCode: [rule],
+      module: { b_id: '1', b_code: 'demo', b_name: '演示模块', b_module_type: 'data', b_i18n: 'module.demo', b_savetable: 't_demo' },
+    })
+    const { saveModule } = setup({
+      drafts,
+      // 原件行与草稿行存在差异（当前值不同）才会产生 update，从而走到剥离逻辑
+      originals: baseDrafts({ autoCode: [{ ...rule, b_currentvalue: 4 }] }),
+    })
+
+    await saveModule()
+
+    const update = reqOf('s_autocode').updates[0]
+    expect(update).not.toHaveProperty('b_currentperiod')
+    expect(update).not.toHaveProperty('b_currentvalue')
+    expect(update.b_field_id).toBe('100')
+  })
+
+  it('i18n inserts 分配真实主键并回写面板，事务内提交', async () => {
+    const drafts = baseDrafts({ module: { b_id: '1', b_code: 'demo', b_name: '新名称' } })
+    const originals = baseDrafts()
+    const i18nPanel = {
+      reconcileManagedRows: vi.fn(),
+      buildSaveRequest: vi.fn(() => ({
+        table: 's_i18n',
+        key_field: 'b_id',
+        inserts: [{ b_id: '-9', b_key: 'module.demo', b_locale: 'zh-CN', b_value: '新名称' }],
+      })),
+      applyInsertedIds: vi.fn(),
+      markSaved: vi.fn(),
+    }
+    const { saveModule } = setup({ drafts, originals, i18nPanel })
+
+    const ok = await saveModule()
+
+    expect(ok).toBe(true)
+    // 受管键 reconcile 在构建请求前执行
+    expect(i18nPanel.reconcileManagedRows).toHaveBeenCalledWith([
+      { key: 'module.demo', managed: true, id: 'module:demo' },
+    ])
+    // 临时主键分配后回写面板，避免二次保存重复插入
+    expect(i18nPanel.applyInsertedIds).toHaveBeenCalledWith([
+      expect.objectContaining({ b_id: '9001', b_key: 'module.demo' }),
+    ])
+    expect(reqOf('s_i18n').inserts[0].b_id).toBe('9001')
+    expect(i18nPanel.markSaved).toHaveBeenCalled()
+  })
+
+  it('跨面板校验前置：启用自动编码但未配置保存表则拦截', async () => {
+    const rule = { b_id: '200', b_module_id: '1', b_field_id: '100', b_canuse: 1 }
+    const drafts = baseDrafts({ autoCode: [rule] })
+    const { saveModule } = setup({ drafts, originals: baseDrafts() })
+
+    const ok = await saveModule()
+
+    expect(ok).toBe(false)
+    expect(saveObjectApi).not.toHaveBeenCalled()
+    expect(Message.warning).toHaveBeenCalledWith('启用自动编码前请先配置保存表')
+  })
+})
diff --git a/code/fms/fms-vue/vite.config.js b/code/fms/fms-vue/vite.config.js
index 90080e8d..8d9cf41c 100644
--- a/code/fms/fms-vue/vite.config.js
+++ b/code/fms/fms-vue/vite.config.js
@@ -18,9 +18,10 @@ export default defineConfig({
       ignored: [/[\\/]\.tmpdir[\\/]/, /\.tmp$/],
     },
     // 开发环境将 /api 请求代理到后端服务（与 fms-vue-old2 保持一致）
+    // 可用 VITE_PROXY_TARGET 覆盖（如本地并行调试第二个后端实例）
     proxy: {
       '/api': {
-        target: 'http://127.0.0.1:8088',
+        target: process.env.VITE_PROXY_TARGET || 'http://127.0.0.1:8088',
         changeOrigin: true,
       },
     },