@veltra/sheet 2.2.0 → 2.3.0

package/src/components/report/__test__/use-report-designer.test.ts

@@ -35,6 +35,7 @@ const PG: DataConnection = {
 
 const ORDER_FIELDS: DatasetField[] = [
   { name: 'customer', label: '客户', type: 'string' },
+  { name: 'orderNo', label: '订单号', type: 'string' },
   { name: 'amount', label: '金额', type: 'number' }
 ]
 
@@ -94,6 +95,18 @@ function createDesigner(
   return { scope, designer, connections, workbook, calls }
 }
 
+function bindGroupHeader(
+  designer: UseReportDesignerReturn,
+  workbook: Workbook,
+  datasetId: string,
+  addr: { row: number; col: number },
+  field = 'customer'
+): void {
+  designer.bindField(datasetId, field, addr)
+  workbook.activeSheet.selectCell(addr)
+  designer.patchActiveBinding(roleBindingDefaults('groupHeader'))
+}
+
 describe('useReportDesigner：连接 / 数据集 CRUD 与连接器调用', () => {
   it('连接 CRUD 全走 v-model 代理；删除连接级联删除其数据集', () => {
     const { designer, connections } = createDesigner()
@@ -132,7 +145,7 @@ describe('useReportDesigner：连接 / 数据集 CRUD 与连接器调用', () =>
 
     const catalog = designer.catalog.value
     expect(catalog).toHaveLength(1)
-    expect(catalog[0]!.fields.map((field) => field.label)).toEqual(['客户名称', '金额'])
+    expect(catalog[0]!.fields.map((field) => field.label)).toEqual(['客户名称', '订单号', '金额'])
   })
 
   it('describeDataset 业务错误整体透传且不写字段缓存', async () => {
@@ -220,7 +233,7 @@ describe('useReportDesigner：拖拽落格写 Cell Meta', () => {
     const inventory = await seedDataset(designer, 'c2')
 
     designer.bindField(orders.id, 'customer', { row: 1, col: 0 })
-    designer.bindField(inventory.id, 'amount', { row: 2, col: 0 })
+    designer.bindField(inventory.id, 'orderNo', { row: 2, col: 0 })
 
     const detail = workbook.activeSheet.getCellMeta<ReportBinding>(
       { row: 2, col: 0 },
@@ -228,7 +241,7 @@ describe('useReportDesigner：拖拽落格写 Cell Meta', () => {
     )
     expect(detail).toMatchObject({
       dataset: inventory.id,
-      field: 'amount',
+      field: 'orderNo',
       rowParent: { row: 1, col: 0 }
     })
   })
@@ -237,7 +250,7 @@ describe('useReportDesigner：拖拽落格写 Cell Meta', () => {
     const { designer, workbook } = createDesigner()
     const dataset = await seedDataset(designer)
 
-    designer.bindField(dataset.id, 'customer', { row: 1, col: 0 })
+    bindGroupHeader(designer, workbook, dataset.id, { row: 1, col: 0 })
     designer.bindField(dataset.id, 'amount', { row: 2, col: 0 })
 
     const subtotal = workbook.activeSheet.getCellMeta<ReportBinding>(
@@ -252,6 +265,66 @@ describe('useReportDesigner：拖拽落格写 Cell Meta', () => {
     })
   })
 
+  it('同行明细落格把 rowParent 推到左侧分组头', async () => {
+    const { designer, workbook } = createDesigner()
+    const dataset = await seedDataset(designer)
+
+    bindGroupHeader(designer, workbook, dataset.id, { row: 1, col: 0 })
+    designer.bindField(dataset.id, 'orderNo', { row: 1, col: 2 })
+
+    const detail = workbook.activeSheet.getCellMeta<ReportBinding>(
+      { row: 1, col: 2 },
+      REPORT_META_NAMESPACE
+    )
+    expect(detail).toMatchObject({
+      field: 'orderNo',
+      preset: 'detail',
+      rowParent: { row: 1, col: 0 }
+    })
+  })
+
+  it('下方跨列小计落格推到行分组头而不是同列 list', async () => {
+    const { designer, workbook } = createDesigner()
+    const dataset = await seedDataset(designer)
+
+    bindGroupHeader(designer, workbook, dataset.id, { row: 1, col: 0 })
+    designer.bindField(dataset.id, 'orderNo', { row: 1, col: 2 })
+    designer.bindField(dataset.id, 'amount', { row: 2, col: 2 })
+
+    const subtotal = workbook.activeSheet.getCellMeta<ReportBinding>(
+      { row: 2, col: 2 },
+      REPORT_META_NAMESPACE
+    )
+    expect(subtotal).toMatchObject({
+      preset: 'subtotal',
+      aggregate: 'sum',
+      expand: 'none',
+      rowParent: { row: 1, col: 0 }
+    })
+    expect(subtotal?.colParent).toBeUndefined()
+  })
+
+  it('右侧列小计落格推到列分组头', async () => {
+    const { designer, workbook } = createDesigner()
+    const dataset = await seedDataset(designer)
+
+    designer.bindField(dataset.id, 'customer', { row: 0, col: 1 })
+    workbook.activeSheet.selectCell({ row: 0, col: 1 })
+    designer.patchActiveBinding({ preset: 'groupHeader', aggregate: 'group', expand: 'right' })
+    designer.bindField(dataset.id, 'amount', { row: 0, col: 2 })
+
+    const subtotal = workbook.activeSheet.getCellMeta<ReportBinding>(
+      { row: 0, col: 2 },
+      REPORT_META_NAMESPACE
+    )
+    expect(subtotal).toMatchObject({
+      preset: 'subtotal',
+      aggregate: 'sum',
+      expand: 'none',
+      colParent: { row: 0, col: 1 }
+    })
+  })
+
   it('未给落点地址时回退到当前选区', async () => {
     const { designer, workbook } = createDesigner()
     const dataset = await seedDataset(designer)
@@ -282,7 +355,7 @@ describe('useReportDesigner：角色徽章渲染 hook（ADR-0004 首个消费者
     expect(layout!.rootContainer.attribute.fill).toBeUndefined()
 
     const style = designer.resolveCellStyle({ row: 0, col: 0 }, undefined)
-    expect(style?.fill).toEqual({ color: '#d1fae5' })
+    expect(style?.fill).toEqual({ color: '#effaf3' })
 
     // 模型与快照无 renderer 残留
     expect(workbook.activeSheet.getCellData({ row: 0, col: 0 })).toBeUndefined()
@@ -347,7 +420,7 @@ describe('useReportDesigner：Action Pill 就地编辑（角色 / 聚合 / 条
     return dataset
   }
 
-  it('预设切换写入 presetBindingDefaults 组合值；聚合切换同步 expand 缺省', async () => {
+  it('预设切换写入 presetBindingDefaults 组合值；同族聚合切换保留预设', async () => {
     const { designer, workbook } = createDesigner()
     await seedAndBind(designer, { row: 0, col: 0 })
     workbook.activeSheet.selectCell({ row: 0, col: 0 })
@@ -358,8 +431,17 @@ describe('useReportDesigner：Action Pill 就地编辑（角色 / 聚合 / 条
 
     designer.patchActiveBinding({ aggregate: 'avg', expand: 'none' })
     binding = designer.activeBinding.value
-    expect(binding).toMatchObject({ aggregate: 'avg', expand: 'none' })
-    expect(binding?.preset).toBeUndefined()
+    expect(binding).toMatchObject({ preset: 'subtotal', aggregate: 'avg', expand: 'none' })
+  })
+
+  it('聚合/展开偏离预设族时清除 preset', async () => {
+    const { designer, workbook } = createDesigner()
+    await seedAndBind(designer, { row: 0, col: 0 })
+    workbook.activeSheet.selectCell({ row: 0, col: 0 })
+
+    designer.patchActiveBinding(roleBindingDefaults('subtotal'))
+    designer.patchActiveBinding({ aggregate: 'list', expand: 'down' })
+    expect(designer.activeBinding.value?.preset).toBeUndefined()
   })
 
   it('条件规则与排序经 patch 写入绑定；拓扑条目跟随 meta 变更', async () => {
@@ -393,6 +475,8 @@ describe('useReportDesigner：Action Pill 就地编辑（角色 / 聚合 / 条
     designer.bindField(dataset.id, 'customer', { row: 1, col: 0 })
     designer.bindField(dataset.id, 'amount', { row: 2, col: 1 })
 
+    workbook.activeSheet.selectCell({ row: 1, col: 0 })
+    designer.patchActiveBinding(roleBindingDefaults('groupHeader'))
     workbook.activeSheet.selectCell({ row: 2, col: 1 })
     designer.startParentPick('row')
     designer.pickParentAt({ row: 1, col: 0 })
@@ -405,14 +489,62 @@ describe('useReportDesigner：Action Pill 就地编辑（角色 / 聚合 / 条
     expect(designer.parentPick.value).toBeNull()
   })
 
+  it('切换小计行时纠正指向 list 的父格', async () => {
+    const { designer, workbook } = createDesigner()
+    const dataset = designer.addDataset('c1')
+    designer.updateDataset(dataset.id, { sql: 'SELECT customer, amount FROM orders' })
+    await designer.describeDataset(dataset.id)
+
+    designer.bindField(dataset.id, 'customer', { row: 1, col: 0 })
+    workbook.activeSheet.selectCell({ row: 1, col: 0 })
+    designer.patchActiveBinding(roleBindingDefaults('groupHeader'))
+    designer.bindField(dataset.id, 'orderNo', { row: 1, col: 2 })
+    designer.bindField(dataset.id, 'amount', { row: 2, col: 2 })
+
+    workbook.activeSheet.selectCell({ row: 2, col: 2 })
+    designer.patchActiveBinding({ rowParent: { row: 1, col: 2 } })
+    expect(designer.activeBinding.value?.rowParent).toEqual({ row: 1, col: 2 })
+
+    designer.patchActiveBinding(roleBindingDefaults('subtotal'))
+    expect(designer.activeBinding.value).toMatchObject({
+      preset: 'subtotal',
+      rowParent: { row: 1, col: 0 }
+    })
+  })
+
+  it('非法点选父格时选区弹回源格且保持拾取态', async () => {
+    const { designer, workbook } = createDesigner()
+    const dataset = designer.addDataset('c1')
+    designer.updateDataset(dataset.id, { sql: 'SELECT customer, amount FROM orders' })
+    await designer.describeDataset(dataset.id)
+
+    designer.bindField(dataset.id, 'customer', { row: 1, col: 0 })
+    workbook.activeSheet.selectCell({ row: 1, col: 0 })
+    designer.patchActiveBinding(roleBindingDefaults('groupHeader'))
+    designer.bindField(dataset.id, 'amount', { row: 2, col: 2 })
+
+    workbook.activeSheet.selectCell({ row: 2, col: 2 })
+    designer.startParentPick('row')
+    designer.pickParentAt({ row: 0, col: 3 })
+
+    expect(designer.parentPick.value).toEqual({ mode: 'row', source: { row: 2, col: 2 } })
+    expect(workbook.activeSheet.getSelection().activeCell).toEqual({ row: 2, col: 2 })
+    expect(
+      workbook.activeSheet.getCellMeta<ReportBinding>({ row: 2, col: 2 }, REPORT_META_NAMESPACE)
+        ?.rowParent
+    ).toEqual({ row: 1, col: 0 })
+  })
+
   it('清除绑定移除 Cell Meta；行 / 列方向父格标签读取绑定存储值', async () => {
     const { designer, workbook } = createDesigner()
     const dataset = designer.addDataset('c1')
     designer.updateDataset(dataset.id, { sql: 'SELECT customer, amount FROM orders' })
     await designer.describeDataset(dataset.id)
 
-    // 同列上方纵向扩展绑定 + 下方明细（rowParent 推断到上方格）
+    // 同列上方分组头 + 下方小计（rowParent 推断到分组头）
     designer.bindField(dataset.id, 'customer', { row: 1, col: 0 })
+    workbook.activeSheet.selectCell({ row: 1, col: 0 })
+    designer.patchActiveBinding(roleBindingDefaults('groupHeader'))
     designer.bindField(dataset.id, 'amount', { row: 2, col: 0 })
 
     workbook.activeSheet.selectCell({ row: 2, col: 0 })
@@ -542,7 +674,7 @@ describe('useReportDesigner：template prop 载入既有模板', () => {
 
     // catalog 应用 fieldOverrides（字段面板与徽章 label 数据源）
     const catalog = designer.catalog.value
-    expect(catalog[0]!.fields.map((field) => field.label)).toEqual(['客户名称', '金额'])
+    expect(catalog[0]!.fields.map((field) => field.label)).toEqual(['客户名称', '订单号', '金额'])
   })
 
   it('载入后 getTemplate 往返保持绑定与数据集定义；宿主已有同 id 连接时不覆盖', async () => {

package/src/components/report/binding-badge.ts

@@ -5,24 +5,35 @@ import {
   type ResolveCellStyleHook
 } from '@veltra/sheet-core'
 
-import { formatBindingPlaceholder, inferReportPreset } from '../../report/binding'
+import { formatBindingPlaceholderParts, inferReportPreset } from '../../report/binding'
 import type { ReportBinding, ReportPreset } from '../../report/types'
 
-/** 绑定徽章预设配色（设计态富渲染徽章；canvas 绘制需具体色值，无法消费 CSS 变量） */
-export const REPORT_PRESET_BADGE_COLORS: Record<ReportPreset, { bg: string; fg: string }> = {
-  groupHeader: { bg: '#dbeafe', fg: '#1d4ed8' },
-  detail: { bg: '#d1fae5', fg: '#047857' },
-  subtotal: { bg: '#fef3c7', fg: '#b45309' },
-  grandTotal: { bg: '#ffe4e6', fg: '#be123c' },
-  cross: { bg: '#ede9fe', fg: '#6d28d9' }
+/**
+ * 绑定徽章预设配色（设计态富渲染徽章；canvas 绘制需具体色值，无法消费 CSS 变量）。
+ * `cell` 为整格极浅底色，`fg` 为强调色（聚合标签徽章底色）。
+ */
+export interface ReportBadgeColors {
+  cell: string
+  fg: string
+}
+
+export const REPORT_PRESET_BADGE_COLORS: Record<ReportPreset, ReportBadgeColors> = {
+  groupHeader: { cell: '#eef4ff', fg: '#2f54eb' },
+  detail: { cell: '#effaf3', fg: '#1f9254' },
+  subtotal: { cell: '#fff7e6', fg: '#d46b08' },
+  grandTotal: { cell: '#fff1f0', fg: '#cf1322' },
+  cross: { cell: '#f8f5ff', fg: '#5f3dc4' }
 }
 
-const CUSTOM_PRESET_BADGE_COLOR = { bg: '#f3f4f6', fg: '#374151' }
+const CUSTOM_PRESET_BADGE_COLOR: ReportBadgeColors = { cell: '#f7f8fa', fg: '#495057' }
+
+/** 徽章字段标签文字色（中性深灰，与强调色形成层次） */
+const BADGE_LABEL_COLOR = '#343a40'
 
 /** @deprecated 05 将更名 */
 export const REPORT_ROLE_BADGE_COLORS = REPORT_PRESET_BADGE_COLORS
 
-function resolveBadgeColor(binding: ReportBinding): { bg: string; fg: string } {
+function resolveBadgeColor(binding: ReportBinding): ReportBadgeColors {
   const preset = inferReportPreset(binding)
   return preset ? REPORT_PRESET_BADGE_COLORS[preset] : CUSTOM_PRESET_BADGE_COLOR
 }
@@ -35,14 +46,14 @@ export function createBindingBadgeStyleResolver(
     const binding = getBindingAt(addr)
     if (!binding) return base
 
-    const { bg } = resolveBadgeColor(binding)
-    return { ...base, fill: { color: bg } }
+    const { cell } = resolveBadgeColor(binding)
+    return { ...base, fill: { color: cell } }
   }
 }
 
 /**
  * 绑定格富渲染徽章（ADR-0004 `resolveCellRenderer` 首个消费者）：
- * 绑定单元格由纯文本占位符升级为带预设色彩的徽章（底色 + 占位文案），
+ * 绑定单元格渲染为左对齐徽章（强调色聚合标签 + 中性色字段标签），
  * 未绑定格返回 `undefined` 回落默认渲染。
  */
 export function createBindingBadgeRenderer(
@@ -54,19 +65,27 @@ export function createBindingBadgeRenderer(
     if (!binding) return undefined
 
     const { fg } = resolveBadgeColor(binding)
+    const { tag, label } = formatBindingPlaceholderParts(binding, resolveLabel)
+
     const rootContainer = new CustomLayout.Container({
       display: 'flex',
       flexDirection: 'row',
-      justifyContent: 'center',
+      justifyContent: 'flex-start',
       alignItems: 'center'
     })
+    // VTable 布局层 Tag 组件（vrender-components）与其 INode 声明存在结构性类型偏差，
+    // 运行时完全兼容（VTable 官方 customLayout 徽章用法即如此），此处仅收敛类型
+    const tagEl = new CustomLayout.Tag({
+      text: tag,
+      textStyle: { fontSize: 10, fontWeight: 600, fill: '#ffffff' },
+      panel: { visible: true, fill: fg, cornerRadius: 3 },
+      padding: [1, 4, 1, 4],
+      marginLeft: 6,
+      marginRight: 5
+    })
+    rootContainer.add(tagEl as unknown as Parameters<typeof rootContainer.add>[0])
     rootContainer.add(
-      new CustomLayout.Text({
-        text: formatBindingPlaceholder(binding, resolveLabel),
-        fontSize: 11,
-        fontWeight: 600,
-        fill: fg
-      })
+      new CustomLayout.Text({ text: label, fontSize: 11, fontWeight: 500, fill: BADGE_LABEL_COLOR })
     )
     return { rootContainer, renderDefault: false }
   }

package/src/components/report/designer/col-widths.ts

@@ -1,27 +1,49 @@
+import type { Sheet } from '@veltra/sheet-core'
+
 import type { ReportColWidthEntry } from '../../../report/export-xlsx'
-import { TABLE_ADDR_OFFSET } from './cell-coords'
 
-/** 列宽读写目标：SheetGrid.getTable() 的最小接口（headless 测试可桩）。
- *  sheet-core 列宽未进 SheetSnapshot，只能经 VTable 运行时 set/getColWidth。 */
-export type ColWidthTarget = {
-  getTable: () => {
-    setColWidth: (col: number, width: number) => void
-    getColWidth: (col: number) => number
-  }
+/** VTable 列宽读写所需的最小表接口（含行号列探测，隐藏行头时偏移为 0） */
+type VTableColWidthApi = {
+  setColWidth: (col: number, width: number) => void
+  getColWidth: (col: number) => number
+  readonly colCount: number
+  readonly columnHeaderLevelCount: number
+  isSeriesNumber: (col: number, row: number) => boolean
+}
+
+/** 列宽读写目标：Sheet 模型或 SheetGrid.getTable() 的最小接口（headless 测试可桩） */
+export type ColWidthTarget = { getTable: () => VTableColWidthApi }
+
+/** 行号列数（隐藏行头时为 0；与 GridCoords 探测一致） */
+function seriesNumberColCount(table: VTableColWidthApi): number {
+  const rowOffset = table.columnHeaderLevelCount
+  let col = 0
+  while (col < table.colCount && table.isSeriesNumber(col, rowOffset)) col++
+  return col
 }
 
-/** 经 SheetGrid → VTable 写入指定列宽 */
+/** 将模型列宽写入 VTable（模型 → grid 同步辅助） */
 export function applyGridColWidths(
   grid: ColWidthTarget | undefined | null,
   widths: ReadonlyArray<ReportColWidthEntry>
 ): void {
   if (!grid) return
   const table = grid.getTable()
+  const colOffset = seriesNumberColCount(table)
   for (const [sheetCol, width] of widths) {
-    table.setColWidth(sheetCol + TABLE_ADDR_OFFSET, width)
+    table.setColWidth(sheetCol + colOffset, width)
   }
 }
 
+/** 把列宽条目写入 Sheet 模型（不进 undo，对称 setColWidth） */
+export function applySheetColWidths(
+  sheet: Sheet | undefined | null,
+  widths: ReadonlyArray<ReportColWidthEntry>
+): void {
+  if (!sheet) return
+  for (const [col, width] of widths) sheet.setColWidth(col, width)
+}
+
 /** 从当前网格读取指定模型列宽度；网格未就绪时返回 null */
 export function readGridColWidths(
   grid: ColWidthTarget | undefined | null,
@@ -29,5 +51,6 @@ export function readGridColWidths(
 ): Array<[number, number]> | null {
   if (!grid) return null
   const table = grid.getTable()
-  return cols.map((sheetCol) => [sheetCol, table.getColWidth(sheetCol + TABLE_ADDR_OFFSET)])
+  const colOffset = seriesNumberColCount(table)
+  return cols.map((sheetCol) => [sheetCol, table.getColWidth(sheetCol + colOffset)])
 }

package/src/components/report/designer/conditional-rules/helpers.ts

@@ -20,13 +20,16 @@ export const RULE_SCOPE_OPTIONS = [
   { value: 'row' as const, label: '整行' }
 ]
 
+/** 求值字段下拉的「本格字段」哨兵值（USelect 无法匹配 undefined） */
+export const SELF_FIELD_VALUE = ''
+
 /** 求值字段下拉：缺省项表示本格绑定字段 */
 export function ruleEvalFieldOptions(
   bindingField: string,
   datasetFields: readonly DatasetField[]
-): Array<{ value: string | undefined; label: string }> {
+): Array<{ value: string; label: string }> {
   return [
-    { value: undefined, label: '本格字段' },
+    { value: SELF_FIELD_VALUE, label: '本格字段' },
     ...datasetFields
       .filter((field) => field.name !== bindingField)
       .map((field) => ({ value: field.name, label: field.label || field.name }))
@@ -79,7 +82,7 @@ export function defaultRuleValue(
 }
 
 export function defaultRuleStyle(): ConditionalRule['style'] {
-  return { fill: { color: '#FEE2E2' }, font: { color: '#DC2626' } }
+  return { fill: { color: '#FEF3C7' }, font: { color: '#B45309' } }
 }
 
 export function createDraftItem(

package/src/components/report/designer/float-panel.vue

@@ -21,6 +21,7 @@
           @update:model-value="onPreset"
         />
         <u-select
+          v-if="showAggregateSelect"
           size="small"
           :class="[cls.e('select'), cls.em('select', 'aggregate')]"
           :model-value="binding.aggregate"
@@ -28,6 +29,7 @@
           @update:model-value="onAggregate"
         />
         <u-select
+          v-if="showExpandSelect"
           size="small"
           :class="[cls.e('select'), cls.em('select', 'expand')]"
           :model-value="binding.expand"
@@ -35,6 +37,7 @@
           @update:model-value="onExpand"
         />
         <u-button size="small" plain @click="emit('open-rules')">条件样式</u-button>
+        <u-button size="small" text type="danger" @click="emit('remove')">删除绑定</u-button>
         <u-button
           size="small"
           text
@@ -138,11 +141,8 @@
         </div>
       </section>
 
-      <footer :class="cls.e('footer')">
-        <u-button v-if="parentPickMode" size="small" plain @click="emit('cancel-parent-pick')">
-          取消点选
-        </u-button>
-        <u-button size="small" type="danger" plain @click="emit('remove')">删除绑定</u-button>
+      <footer v-if="parentPickMode" :class="cls.e('footer')">
+        <u-button size="small" plain @click="emit('cancel-parent-pick')">取消点选</u-button>
       </footer>
     </div>
   </div>
@@ -157,7 +157,9 @@ import { computed, nextTick, ref, toRef, watch } from 'vue'
 import {
   formatBindingPlaceholder,
   formatCellAddress,
-  inferReportPreset
+  formatParentCandidateLabel,
+  inferReportPreset,
+  isReductionAggregate
 } from '../../../report/binding'
 import type {
   ReportAggregate,
@@ -188,6 +190,7 @@ const props = defineProps<{
   rowParentCandidates: CellAddress[]
   colParentCandidates: CellAddress[]
   resolveFieldLabel?: (datasetId: string, fieldName: string) => string
+  getBindingAt?: (addr: CellAddress) => ReportBinding | undefined
   hostEl: HTMLElement | null
   getGrid: () => SheetGrid | undefined
 }>()
@@ -216,7 +219,7 @@ const presetOptions = computed(() => {
   return options
 })
 
-const aggregateOptions = [
+const ALL_AGGREGATE_OPTIONS = [
   { value: 'list' as const, label: '明细' },
   { value: 'group' as const, label: '分组' },
   { value: 'sum' as const, label: '求和' },
@@ -226,6 +229,10 @@ const aggregateOptions = [
   { value: 'min' as const, label: '最小' }
 ]
 
+const REDUCTION_AGGREGATE_OPTIONS = ALL_AGGREGATE_OPTIONS.filter((item) =>
+  isReductionAggregate(item.value)
+)
+
 const expandOptions = [
   { value: 'down' as const, label: '向下' },
   { value: 'right' as const, label: '向右' },
@@ -247,24 +254,59 @@ const currentPresetValue = computed(() => {
   return inferReportPreset(props.binding) ?? CUSTOM_PRESET_VALUE
 })
 
+const showAggregateSelect = computed(() => {
+  const preset = currentPresetValue.value
+  return (
+    preset === CUSTOM_PRESET_VALUE ||
+    preset === 'subtotal' ||
+    preset === 'grandTotal' ||
+    preset === 'cross'
+  )
+})
+
+const showExpandSelect = computed(() => {
+  const preset = currentPresetValue.value
+  return preset === CUSTOM_PRESET_VALUE || preset === 'groupHeader' || preset === 'detail'
+})
+
+const aggregateOptions = computed(() =>
+  currentPresetValue.value === CUSTOM_PRESET_VALUE
+    ? ALL_AGGREGATE_OPTIONS
+    : REDUCTION_AGGREGATE_OPTIONS
+)
+
 const summaryText = computed(() => {
   if (!props.binding) return ''
-  return formatBindingPlaceholder(props.binding, props.resolveFieldLabel)
+  const parts = [formatBindingPlaceholder(props.binding, props.resolveFieldLabel)]
+  if (props.binding.rowParent && props.resolvedRowParentLabel !== '—') {
+    const parent = props.getBindingAt?.(props.binding.rowParent)
+    const name = parent
+      ? (props.resolveFieldLabel?.(parent.dataset, parent.field) ?? parent.field)
+      : props.resolvedRowParentLabel
+    parts.push(`行父格 ${name} ${props.resolvedRowParentLabel}`)
+  }
+  if (props.binding.colParent && props.resolvedColParentLabel !== '—') {
+    const parent = props.getBindingAt?.(props.binding.colParent)
+    const name = parent
+      ? (props.resolveFieldLabel?.(parent.dataset, parent.field) ?? parent.field)
+      : props.resolvedColParentLabel
+    parts.push(`列父格 ${name} ${props.resolvedColParentLabel}`)
+  }
+  return parts.join(' · ')
 })
 
-const rowParentOptions = computed(() =>
-  props.rowParentCandidates.map((addr) => ({
-    value: formatCellAddress(addr),
-    label: formatCellAddress(addr)
-  }))
-)
+function candidateOption(addr: CellAddress): { value: string; label: string } {
+  const value = formatCellAddress(addr)
+  const binding = props.getBindingAt?.(addr)
+  return {
+    value,
+    label: binding ? formatParentCandidateLabel(addr, binding, props.resolveFieldLabel) : value
+  }
+}
 
-const colParentOptions = computed(() =>
-  props.colParentCandidates.map((addr) => ({
-    value: formatCellAddress(addr),
-    label: formatCellAddress(addr)
-  }))
-)
+const rowParentOptions = computed(() => props.rowParentCandidates.map(candidateOption))
+
+const colParentOptions = computed(() => props.colParentCandidates.map(candidateOption))
 
 const rowParentSelectValue = computed(() =>
   props.binding?.rowParent ? formatCellAddress(props.binding.rowParent) : undefined
@@ -281,10 +323,18 @@ const panelStyle = computed(() => ({ left: `${panelLeft.value}px`, top: `${panel
 watch(
   () => [props.cell?.row, props.cell?.col] as const,
   () => {
+    if (props.parentPickMode) return
     expanded.value = false
   }
 )
 
+watch(
+  () => props.parentPickMode,
+  (mode) => {
+    if (mode) expanded.value = true
+  }
+)
+
 watch(expanded, () => {
   nextTick(() => updatePosition())
 })
@@ -300,13 +350,7 @@ function onPreset(preset: ReportPreset | typeof CUSTOM_PRESET_VALUE): void {
 }
 
 function aggregateDefaultExpand(aggregate: ReportAggregate): ReportExpand {
-  return aggregate === 'sum' ||
-    aggregate === 'avg' ||
-    aggregate === 'count' ||
-    aggregate === 'max' ||
-    aggregate === 'min'
-    ? 'none'
-    : 'down'
+  return isReductionAggregate(aggregate) ? 'none' : 'down'
 }
 
 function onAggregate(aggregate: ReportAggregate): void {