xiaodao-spreader 0.1.35 → 0.1.36

package/dist/types/components/spreader/components/spreader.vue.d.ts

@@ -47,6 +47,7 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {}, {},
         sortMenuOpen: boolean;
         cachedSortOrder: import("@/components/spreader/core/sort-core.ts").SortOrder;
         canSort: boolean;
+        outlineMenuOpen: boolean;
         canFilter: boolean;
         filterActive: boolean;
         selHAlign: string;
@@ -103,12 +104,14 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {}, {},
         "onNumber-format-change"?: ((v: string) => any) | undefined;
         "onFreeze-change"?: ((v: string) => any) | undefined;
         "onCf-preset"?: ((v: string) => any) | undefined;
+        "onOutline-action"?: ((v: string) => any) | undefined;
         "onFont-size-keydown"?: ((ev: KeyboardEvent) => any) | undefined;
         "onUpdate:font-size-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:text-color-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:fill-color-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:border-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:sort-menu-open"?: ((v: boolean) => any) | undefined;
+        "onUpdate:outline-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:merge-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:calc-menu-open"?: ((v: boolean) => any) | undefined;
         "onBorder-change"?: ((v: import("@/components/spreader/components/pickers/border-picker.vue").BorderType) => any) | undefined;
@@ -156,12 +159,14 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {}, {},
         "number-format-change": (v: string) => void;
         "freeze-change": (v: string) => void;
         "cf-preset": (v: string) => void;
+        "outline-action": (v: string) => void;
         "font-size-keydown": (ev: KeyboardEvent) => void;
         "update:font-size-menu-open": (v: boolean) => void;
         "update:text-color-menu-open": (v: boolean) => void;
         "update:fill-color-menu-open": (v: boolean) => void;
         "update:border-menu-open": (v: boolean) => void;
         "update:sort-menu-open": (v: boolean) => void;
+        "update:outline-menu-open": (v: boolean) => void;
         "update:merge-menu-open": (v: boolean) => void;
         "update:calc-menu-open": (v: boolean) => void;
         "border-change": (v: import("@/components/spreader/components/pickers/border-picker.vue").BorderType) => void;
@@ -177,6 +182,7 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {}, {},
         mergeArrowRef: HTMLButtonElement;
         calcArrowRef: HTMLButtonElement;
         sortArrowRef: HTMLButtonElement;
+        outlineArrowRef: HTMLButtonElement;
         moreBtnEl: HTMLButtonElement;
         overflowMenuEl: HTMLDivElement;
     }, any, import("vue").ComponentProvideOptions, {
@@ -213,6 +219,7 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {}, {},
         sortMenuOpen: boolean;
         cachedSortOrder: import("@/components/spreader/core/sort-core.ts").SortOrder;
         canSort: boolean;
+        outlineMenuOpen: boolean;
         canFilter: boolean;
         filterActive: boolean;
         selHAlign: string;
@@ -269,12 +276,14 @@ declare const _default: import("vue").DefineComponent<__VLS_PublicProps, {}, {},
         "onNumber-format-change"?: ((v: string) => any) | undefined;
         "onFreeze-change"?: ((v: string) => any) | undefined;
         "onCf-preset"?: ((v: string) => any) | undefined;
+        "onOutline-action"?: ((v: string) => any) | undefined;
         "onFont-size-keydown"?: ((ev: KeyboardEvent) => any) | undefined;
         "onUpdate:font-size-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:text-color-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:fill-color-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:border-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:sort-menu-open"?: ((v: boolean) => any) | undefined;
+        "onUpdate:outline-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:merge-menu-open"?: ((v: boolean) => any) | undefined;
         "onUpdate:calc-menu-open"?: ((v: boolean) => any) | undefined;
         "onBorder-change"?: ((v: import("@/components/spreader/components/pickers/border-picker.vue").BorderType) => any) | undefined;

package/dist/types/components/spreader/components/toolbar.vue.d.ts

@@ -30,6 +30,7 @@ type __VLS_Props = {
     sortMenuOpen: boolean;
     cachedSortOrder: SortOrder;
     canSort: boolean;
+    outlineMenuOpen: boolean;
     /** 工具栏「筛选」按钮是否可用（单选合并单元格且无筛选态时禁用） */
     canFilter: boolean;
     /** 当前 worksheet 是否已启用筛选 */
@@ -93,12 +94,14 @@ declare const _default: import("vue").DefineComponent<__VLS_Props, {
     "number-format-change": (v: string) => void;
     "freeze-change": (v: string) => void;
     "cf-preset": (v: string) => void;
+    "outline-action": (v: string) => void;
     "font-size-keydown": (ev: KeyboardEvent) => void;
     "update:font-size-menu-open": (v: boolean) => void;
     "update:text-color-menu-open": (v: boolean) => void;
     "update:fill-color-menu-open": (v: boolean) => void;
     "update:border-menu-open": (v: boolean) => void;
     "update:sort-menu-open": (v: boolean) => void;
+    "update:outline-menu-open": (v: boolean) => void;
     "update:merge-menu-open": (v: boolean) => void;
     "update:calc-menu-open": (v: boolean) => void;
     "border-change": (v: BorderType) => void;
@@ -144,12 +147,14 @@ declare const _default: import("vue").DefineComponent<__VLS_Props, {
     "onNumber-format-change"?: ((v: string) => any) | undefined;
     "onFreeze-change"?: ((v: string) => any) | undefined;
     "onCf-preset"?: ((v: string) => any) | undefined;
+    "onOutline-action"?: ((v: string) => any) | undefined;
     "onFont-size-keydown"?: ((ev: KeyboardEvent) => any) | undefined;
     "onUpdate:font-size-menu-open"?: ((v: boolean) => any) | undefined;
     "onUpdate:text-color-menu-open"?: ((v: boolean) => any) | undefined;
     "onUpdate:fill-color-menu-open"?: ((v: boolean) => any) | undefined;
     "onUpdate:border-menu-open"?: ((v: boolean) => any) | undefined;
     "onUpdate:sort-menu-open"?: ((v: boolean) => any) | undefined;
+    "onUpdate:outline-menu-open"?: ((v: boolean) => any) | undefined;
     "onUpdate:merge-menu-open"?: ((v: boolean) => any) | undefined;
     "onUpdate:calc-menu-open"?: ((v: boolean) => any) | undefined;
     "onBorder-change"?: ((v: BorderType) => any) | undefined;
@@ -165,6 +170,7 @@ declare const _default: import("vue").DefineComponent<__VLS_Props, {
     mergeArrowRef: HTMLButtonElement;
     calcArrowRef: HTMLButtonElement;
     sortArrowRef: HTMLButtonElement;
+    outlineArrowRef: HTMLButtonElement;
     moreBtnEl: HTMLButtonElement;
     overflowMenuEl: HTMLDivElement;
 }, any>;

package/dist/types/components/spreader/composables/core-state.d.ts

@@ -1,7 +1,8 @@
 import { type ComputedRef, type Ref } from 'vue';
 import { FormulaDeps } from '../core/formula';
-import type { CellCoord, CellData, CellStyle, SelectionRange, BorderStyle, BorderSide, FreezePane, ViewportRegion, SheetFilter, FilterColumn, ConditionalFormattingRule, ConditionalFormattingFormat, DataValidationRule, DataValidationResult, DataValidationSeverity } from '../core/types';
+import type { CellCoord, CellData, CellStyle, SelectionRange, BorderStyle, BorderSide, FreezePane, ViewportRegion, SheetFilter, FilterColumn, ConditionalFormattingRule, ConditionalFormattingFormat, DataValidationRule, DataValidationResult, DataValidationSeverity, DimensionOutline } from '../core/types';
 import { type FilterCandidates } from '../core/filter-core';
+import { type OutlineValidationResult } from '../core/outline-core';
 /** 选区触发方式，影响「合并单元格是否扩大选区」。
  *  - 'cell'：单元格点击/拖动（默认）→ 保持现有 expandSelectionForMerges 行为
  *  - 'row' ：行头点击/拖动 → Excel 风格「穿透」合并，选区矩形保持用户点击的行范围
@@ -102,6 +103,45 @@ export interface CoreState {
     getVisibleRowCount: () => number;
     getVisibleRowAt: (index: number) => number;
     getVisibleRowIndex: (row: number) => number;
+    /** 当前工作表行分组集合（稳定 ID，展开/折叠状态） */
+    getRowOutlines: () => DimensionOutline[];
+    /** 当前工作表列分组集合 */
+    getColumnOutlines: () => DimensionOutline[];
+    /** 在某组上创建分组；返回是否成功（失败给出提示码） */
+    addRowGroup: (start: number, end: number) => OutlineValidationResult;
+    addColumnGroup: (start: number, end: number) => OutlineValidationResult;
+    /** 取消组合：完整覆盖某个分组才允许 Ungroup，返回是否成功 */
+    removeOutline: (id: string) => boolean;
+    clearRowGroups: () => void;
+    clearColumnGroups: () => void;
+    clearAllOutlines: () => void;
+    /** 设置分组折叠状态（一次一个视图状态操作，不影响结构） */
+    setOutlineCollapsed: (id: string, collapsed: boolean, silent?: boolean) => void;
+    toggleOutline: (id: string) => void;
+    /** 当前最大分组层级（0 = 无分组） */
+    getOutlineLevel: (axis: 'row' | 'column') => number;
+    /** Outline gutter 总尺寸：无分组为 0；否则 = 等级控件条 + 层级数×单级宽度。axis='row' → 左侧 gutter 宽，axis='column' → 顶部 gutter 高 */
+    getOutlineGutterSize: (axis: 'row' | 'column') => number;
+    /** 逻辑行/列当前所处的分组层级（0 = 不在任何分组内） */
+    getRowOutlineLevel: (row: number) => number;
+    getColumnOutlineLevel: (col: number) => number;
+    /** 逻辑行/列当前是否被折叠分组隐藏 */
+    isRowCollapsed: (row: number) => boolean;
+    isColumnCollapsed: (col: number) => boolean;
+    /** 逻辑行列是否可见（Filter + Outline 组合） */
+    isRowVisible: (row: number) => boolean;
+    isColumnVisible: (col: number) => boolean;
+    /** 列是否隐藏（当前仅由列分组折叠决定） */
+    isColHidden: (col: number) => boolean;
+    /** 逻辑列宽（折叠列返回 0，供布局/命中测试使用） */
+    getColWidth: (c: number) => number;
+    /** outline 引擎注入：行列增删后的结构调整（由 sheets-ops 调用） */
+    adjustOutlinesForInsertRows: (index: number, count: number) => void;
+    adjustOutlinesForDeleteRows: (index: number, count: number) => void;
+    adjustOutlinesForInsertCols: (index: number, count: number) => void;
+    adjustOutlinesForDeleteCols: (index: number, count: number) => void;
+    /** 设置当前工作表的分组集合（加载/撤销恢复等受控场景；同时重算层级） */
+    syncOutlines: (rowOutlines: DimensionOutline[] | undefined, columnOutlines: DimensionOutline[] | undefined) => void;
     /** 基于真实行高/列宽计算冻结区域尺寸 */
     getFrozenMetrics: () => {
         frozenRowsHeight: number;

package/dist/types/components/spreader/composables/interactions.d.ts

@@ -83,6 +83,16 @@ export interface InteractionsState {
     onDimBlur: () => void;
     applyDimPanel: () => void;
     closeDimPanel: () => void;
+    outlineGroupRows: () => boolean;
+    outlineGroupCols: () => boolean;
+    outlineUngroupRows: () => boolean;
+    outlineUngroupCols: () => boolean;
+    outlineExpandRows: () => void;
+    outlineCollapseRows: () => void;
+    outlineExpandCols: () => void;
+    outlineCollapseCols: () => void;
+    /** 分组校验提示：由宿主注入的应用内对话框；未注入时回退 window.alert */
+    showOutlineAlert?: (message: string) => void;
     editInputStyle: ComputedRef<Record<string, string | number | undefined>>;
     hScrollbarW: ComputedRef<number>;
     vScrollbarH: ComputedRef<number>;

package/dist/types/components/spreader/core/autofill.d.ts

@@ -104,12 +104,21 @@ export declare function computeTargetRange(sourceRange: SelectionRange, draggedC
  * 平移公式引用以适配目标单元格（$ 绝对引用由 shiftFormulaRefs 处理）。
  */
 export declare function translateFormulaForTarget(sourceFormula: string, sourceCell: CellCoord, targetCell: CellCoord, colCount: number, rowCount: number, colToLabelFn: (col: number) => string): string;
+/** 合并兼容性校验结果：
+ * - 'ok'：兼容；
+ * - 'source-overlap'：源区域与某合并格部分相交（既非完全包含也非不相交）；
+ * - 'target-merge-size'：目标区域命中的合并格跨距不一致（对齐 Excel「要执行此操作，所有合并单元格必须大小相同」）。
+ */
+export type MergeCompatibilityResult = {
+    ok: boolean;
+    reason: 'ok' | 'source-overlap' | 'target-merge-size';
+};
 /**
  * 校验源/目标区域与已有合并的兼容性：
  * - 源区域不能与任何 merge 部分相交（要么完全包含，要么不相交）；
- * - 目标区域不能与任何已有 merge 相交（会破坏 merge）。
+ * - 目标区域与「未被源完全包含」的 merge 相交时，要求这些 merge 行/列跨距全部一致。
  */
-export declare function validateMergeCompatibility(sourceRange: SelectionRange, targetRange: SelectionRange, merges: Record<string, SelectionRange>): boolean;
+export declare function validateMergeCompatibility(sourceRange: SelectionRange, targetRange: SelectionRange, merges: Record<string, SelectionRange>): MergeCompatibilityResult;
 /**
  * 自动填充核心：根据源/目标区域与方向生成填充增量（纯函数，不 mutate sheet）。
  * - down/right：正向延伸；up/left：反向延伸。

package/dist/types/components/spreader/core/constants.d.ts

@@ -13,6 +13,8 @@ export declare const SCROLL_STEP = 50;
 export declare const FILL_HANDLE_SIZE = 6;
 export declare const FILL_HANDLE_HIT_PADDING = 4;
 export declare const UNDO_MAX = 50;
+export declare const OUTLINE_PANEL = 16;
+export declare const OUTLINE_GUTTER = 15;
 export declare const i18n: Record<string, Record<string, string>>;
 export declare function t(locale: string, key: string): string;
 export declare const DEFAULT_FONT_FAMILY = "-apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Microsoft YaHei\", sans-serif";

package/dist/types/components/spreader/core/outline-core.d.ts

@@ -0,0 +1,64 @@
+import type { DimensionOutline } from './types';
+/** 分组校验失败的原因 */
+export type OutlineValidationCode = 'outlineMinSize' | 'outlineCrossing' | 'outlineTooDeep' | 'outlineInvalid';
+export interface OutlineValidationResult {
+    ok: boolean;
+    code?: OutlineValidationCode;
+    /** 通过校验时，根据嵌套关系算出的层级（1 起） */
+    level?: number;
+}
+/** 范围内包含多少既有分组（严格包含该范围的组越多，层级越深） */
+export declare function countContaining(outlines: DimensionOutline[], start: number, end: number): number;
+/**
+ * 校验一个新分组（start/end 为 0-based 闭区间）是否可在既有分组集合上创建。
+ * 规则：
+ *   - start <= end
+ *   - 至少连续 2 个维度
+ *   - 与既有分组要么不相交要么完全包含，禁止部分重叠
+ *   - 层级（countContaining + 1）不超过 MAX_OUTLINE_LEVEL
+ */
+export declare function validateGroup(existing: DimensionOutline[], start: number, end: number): OutlineValidationResult;
+/** 创建分组后的新集合（校验失败返回原集合，同时给出校验结果供调用方提示） */
+export declare function addOutline(existing: DimensionOutline[], axis: 'row' | 'column', start: number, end: number, id: string, opts?: {
+    collapsed?: boolean;
+}): {
+    outlines: DimensionOutline[];
+    validation: OutlineValidationResult;
+};
+/** 设置某个分组的折叠状态 */
+export declare function setOutlineCollapsed(outlines: DimensionOutline[], id: string, collapsed: boolean): DimensionOutline[];
+/** 删除某个分组（返回新集合） */
+export declare function removeOutline(outlines: DimensionOutline[], id: string): DimensionOutline[];
+/** 清除全部（某方向）分组 */
+export declare function clearOutlines(): DimensionOutline[];
+/** 插入 count 个维度到 index 处后，调整既有分组范围（完全遵循 Range 插入语义） */
+export declare function addOutlineForInsert(outlines: DimensionOutline[], index: number, count: number): DimensionOutline[];
+/** 删除 [index, index+count-1] 这段维度后，调整既有分组；空组自动移除 */
+export declare function addOutlineForDelete(outlines: DimensionOutline[], index: number, count: number): DimensionOutline[];
+/**
+ * 根据嵌套关系重建每个分组的 level：
+ * level = (严格包含该分组的其它分组数量) + 1
+ * 注意：必须排除自身，否则每个分组都会被自己计数导致层级 +1。
+ */
+export declare function recomputeOutlineLevels(outlines: DimensionOutline[]): DimensionOutline[];
+/**
+ * 维度可见性索引。
+ *  - levels[i]   : 维度 i 所处的 outline 层级（0 = 不在任何分组内）
+ *  - hidden[i]   : 维度 i 是否被某个「已折叠分组」包含（不可见）
+ *  - maxLevel    : 当前分组最深层级（≥1）；无分组为 0
+ */
+export interface OutlineIndex {
+    levels: number[];
+    hidden: boolean[];
+    maxLevel: number;
+}
+/** 构建线性维度（行/列）的 outline 索引。count = 维度总数 */
+export declare function buildOutlineIndex(outlines: DimensionOutline[], count: number): OutlineIndex;
+/** 维度 i 所处的 outline 层级（无分组为 0） */
+export declare function outlineLevelAt(outlines: DimensionOutline[], i: number): number;
+/** 维度 i 是否被某个已折叠分组包含（不可见） */
+export declare function isOutlineCollapsedAt(outlines: DimensionOutline[], i: number): boolean;
+/** 是否已存在跨过该分组 cell 的既有分组（按 cell 命中） */
+export declare function hasOutlineInRange(outlines: DimensionOutline[], start: number, end: number): boolean;
+/** 生成稳定唯一分组 ID（避免与既有 ID 冲突） */
+export declare function genOutlineId(existing: DimensionOutline[], axis: 'row' | 'column'): string;

package/dist/types/components/spreader/core/types.d.ts

@@ -252,6 +252,20 @@ export interface DataValidationResult {
     title?: string;
     message?: string;
 }
+/** 单个行列分组的最大支持层级（与 Excel 一致，最多 8 级） */
+export declare const MAX_OUTLINE_LEVEL = 8;
+/** 维度分组：属于 Sheet 的结构元数据。start/end 为 0-based 闭区间，且 start <= end */
+export interface DimensionOutline {
+    /** 稳定唯一 ID（禁止数组 index） */
+    id: string;
+    axis: 'row' | 'column';
+    start: number;
+    end: number;
+    /** 由嵌套关系计算得到的层级（1 起），非用户手工输入 */
+    level: number;
+    /** 是否折叠（折叠时隐藏组内 Detail，逻辑行列仍存在） */
+    collapsed: boolean;
+}
 export interface SheetModelData {
     name: string;
     /** 表格级样式池：styles[0] 始终为默认空样式 {} */
@@ -278,6 +292,10 @@ export interface SheetModelData {
     conditionalFormats?: ConditionalFormattingRule[];
     /** 数据验证规则集合；旧数据缺省视为无数据验证 */
     dataValidations?: DataValidationRule[];
+    /** 行分组集合；旧数据缺省视为无分组 */
+    rowOutlines?: DimensionOutline[];
+    /** 列分组集合；旧数据缺省视为无分组 */
+    columnOutlines?: DimensionOutline[];
 }
 export interface SheetState {
     id: string;
@@ -306,6 +324,10 @@ export interface SheetState {
     conditionalFormats: ConditionalFormattingRule[];
     /** 数据验证规则集合；缺省为空数组 */
     dataValidations: DataValidationRule[];
+    /** 行分组集合；缺省为空数组 */
+    rowOutlines: DimensionOutline[];
+    /** 列分组集合；缺省为空数组 */
+    columnOutlines: DimensionOutline[];
 }
 /** 视口区域：冻结窗格将画布划分为四个独立滚动区域 */
 export interface ViewportRegion {
@@ -341,6 +363,8 @@ export interface ThemeColors {
     gridLine: string;
     selectionBg: string;
     activeCellBorder: string;
+    outlineGroupBg1: string;
+    outlineGroupBg2: string;
     cellText: string;
     scrollTrack: string;
     scrollThumb: string;