@textbus/xnote 0.0.5 → 0.0.7

package/bundles/index.esm.js

@@ -1,15 +1,16 @@
 import { jsxs, jsx, Fragment } from '@viewfly/core/jsx-runtime';
 import { withScopedCSS } from '@viewfly/scoped-css';
-import { Injectable, InjectFlags, Injector, inject, createSignal, onUnmounted, createRef, withAnnotation, onUpdated, onMounted, InjectionToken, getCurrentInstance, ReflectiveInjector, createDynamicRef, jsx as jsx$1, viewfly, watch } from '@viewfly/core';
+import { Injectable, InjectFlags, Injector, inject, createSignal, onUnmounted, createRef, withAnnotation, onUpdated, onMounted, InjectionToken, getCurrentInstance, ReflectiveInjector, createDynamicRef, jsx as jsx$1, viewfly, Fragment as Fragment$1, watch } from '@viewfly/core';
 import { Subject, Selection, fromEvent, Subscription, Attribute, Keyboard, Commander, Controller, useContext, onBreak, onContentInsert, ContentType, merge, createVNode, Slot, Component, Registry, Query, QueryStateType, BehaviorSubject, onSlotApplyFormat, onSlotSetAttribute, onPaste, onFocus, onBlur, useDynamicShortcut, VTextNode, onFocusIn, onFocusOut, onDestroy, onGetRanges, Formatter, onParentSlotUpdated, Textbus, RootComponentRef, filter, map, distinctUntilChanged, sampleTime, debounceTime, throttleTime, delay, onContentInserted, onContentDeleted, switchMap, fromPromise, onCompositionStart } from '@textbus/core';
 import { VIEW_CONTAINER, isMac, DomAdapter, Input, SelectionBridge, BrowserModule, VIEW_DOCUMENT, CollaborateSelectionAwarenessDelegate, isMobileBrowser, CollaborateCursor, Parser } from '@textbus/platform-browser';
 import { createPortal, createApp, DomRenderer, HTMLRenderer, OutputTranslator } from '@viewfly/platform-browser';
 import { useProduce } from '@viewfly/hooks';
 import highlightjs from 'highlight.js';
+import { v4 } from 'uuid';
 import Katex from 'katex';
 import { ViewflyAdapter, ViewflyVDomAdapter } from '@textbus/adapter-viewfly';
 import { any2Hsl, hsl2Rgb } from '@tanbo/color';
-import { CollaborateModule, UserActivity } from '@textbus/collaborate';
+import { MessageBus, CollaborateModule } from '@textbus/collaborate';
 
 var scopedId$n = "vf-d94b56";
 
@@ -27,7 +28,7 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
+/* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
 
 function __rest(s, e) {
@@ -480,7 +481,7 @@ var scopedId$h = "vf-c32a7b";
 function Keymap(props) {
     const arr = [];
     const keymap = props.keymap;
-    if (keymap.ctrlKey) {
+    if (keymap.modKey) {
         arr.push(isMac() ? jsx("span", { class: "xnote-icon-command" }) : jsx("span", { children: "Ctrl" }));
     }
     if (keymap.shiftKey) {
@@ -502,6 +503,9 @@ function Keymap(props) {
         if (Array.isArray(keymap.key)) {
             arr.push(jsx("span", { children: keymap.key.join('/') }));
         }
+        else if (typeof keymap.key === 'object') {
+            arr.push(jsx("span", { children: keymap.key.name }));
+        }
         else {
             arr.push(jsx("span", { children: keymap.key }));
         }
@@ -602,7 +606,7 @@ function registerTextAlignShortcut(textbus) {
     keyboard.addShortcut({
         keymap: {
             key: 'lrej'.split(''),
-            ctrlKey: true
+            modKey: true
         },
         action(key) {
             const valueMap = {
@@ -660,7 +664,7 @@ function registerHeadingShortcut(textbus) {
     keyboard.addShortcut({
         keymap: {
             key: '0123456'.split(''),
-            ctrlKey: true
+            modKey: true
         },
         action(key) {
             if (key === '0') {
@@ -821,7 +825,7 @@ function registerBlockquoteShortcut(textbus) {
     const keyboard = textbus.get(Keyboard);
     keyboard.addShortcut({
         keymap: {
-            ctrlKey: true,
+            modKey: true,
             key: '\''
         },
         action() {
@@ -987,7 +991,8 @@ function ParagraphView(props) {
 }
 const paragraphComponentLoader = {
     match(element, returnableContentTypes) {
-        return returnableContentTypes.includes(ContentType.BlockComponent) && (element.dataset.component === ParagraphComponent.componentName || /^P|H[1-6]$/.test(element.tagName));
+        return returnableContentTypes.includes(ContentType.BlockComponent) &&
+            (element.dataset.component === ParagraphComponent.componentName || /^P|H[1-6]$/.test(element.tagName));
     },
     read(element, textbus, slotParser) {
         let content;
@@ -1768,16 +1773,16 @@ function AttrTool(props) {
         const states = checkStates();
         return (jsx(Dropdown, { width: 'auto', style: props.style, abreast: props.abreast, onCheck: updateAttr, trigger: 'hover', menu: [
                 {
-                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-left" }), desc: jsx(Keymap, { keymap: { key: 'L', ctrlKey: true } }), checked: states.textAlign === 'left', children: "\u5DE6\u5BF9\u9F50" }),
+                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-left" }), desc: jsx(Keymap, { keymap: { key: 'L', modKey: true } }), checked: states.textAlign === 'left', children: "\u5DE6\u5BF9\u9F50" }),
                     value: 't-l'
                 }, {
-                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-right" }), desc: jsx(Keymap, { keymap: { key: 'R', ctrlKey: true } }), checked: states.textAlign === 'right', children: "\u53F3\u5BF9\u9F50" }),
+                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-right" }), desc: jsx(Keymap, { keymap: { key: 'R', modKey: true } }), checked: states.textAlign === 'right', children: "\u53F3\u5BF9\u9F50" }),
                     value: 't-r'
                 }, {
-                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-center" }), desc: jsx(Keymap, { keymap: { key: 'E', ctrlKey: true } }), checked: states.textAlign === 'center', children: "\u5C45\u4E2D\u5BF9\u9F50" }),
+                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-center" }), desc: jsx(Keymap, { keymap: { key: 'E', modKey: true } }), checked: states.textAlign === 'center', children: "\u5C45\u4E2D\u5BF9\u9F50" }),
                     value: 't-c'
                 }, {
-                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-justify" }), desc: jsx(Keymap, { keymap: { key: 'J', ctrlKey: true } }), checked: states.textAlign === 'justify', children: "\u5206\u6563\u5BF9\u9F50" }),
+                    label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-paragraph-justify" }), desc: jsx(Keymap, { keymap: { key: 'J', modKey: true } }), checked: states.textAlign === 'justify', children: "\u5206\u6563\u5BF9\u9F50" }),
                     value: 't-j'
                 }, {
                     label: jsx(Divider, {}),
@@ -1793,20 +1798,99 @@ function AttrTool(props) {
     });
 }
 
+class Rectangle {
+    constructor(x1, y1, x2, y2) {
+        this.x1 = x1;
+        this.y1 = y1;
+        this.x2 = x2;
+        this.y2 = y2;
+    }
+    intersects(other) {
+        return this.x1 < other.x2 && this.x2 > other.x1 && this.y1 < other.y2 && this.y2 > other.y1;
+    }
+    merge(other) {
+        return new Rectangle(Math.min(this.x1, other.x1), Math.min(this.y1, other.y1), Math.max(this.x2, other.x2), Math.max(this.y2, other.y2));
+    }
+}
+function findNonIntersectingRectangles(rectangles) {
+    const merged = [];
+    const remaining = [...rectangles];
+    while (remaining.length > 0) {
+        const current = remaining.shift();
+        let mergedWithCurrent = false;
+        for (let i = 0; i < merged.length; i++) {
+            if (current.intersects(merged[i])) {
+                merged[i] = current.merge(merged[i]);
+                mergedWithCurrent = true;
+                break;
+            }
+        }
+        if (!mergedWithCurrent) {
+            merged.push(current);
+        }
+    }
+    return merged;
+}
+function getMaxRectangle(start, rectangles) {
+    let merged = start;
+    const remaining = [...rectangles];
+    while (remaining.length > 0) {
+        const current = remaining.shift();
+        if (current.intersects(merged)) {
+            merged = current.merge(merged);
+        }
+    }
+    return merged;
+}
+function applyRectangles(rows, rectangles) {
+    const table = rows.map(row => {
+        return {
+            row,
+            cells: row.cells.map(cell => {
+                return {
+                    rowspan: 1,
+                    colspan: 1,
+                    visible: true,
+                    raw: cell
+                };
+            })
+        };
+    });
+    rectangles.forEach(rect => {
+        const { x1, y1, x2, y2 } = rect;
+        const rowspan = y2 - y1;
+        const colspan = x2 - x1;
+        for (let i = y1; i < y2; i++) {
+            for (let j = x1; j < x2; j++) {
+                const item = table[i].cells[j];
+                if (i === y1 && j === x1) {
+                    item.visible = true;
+                    item.rowspan = rowspan;
+                    item.colspan = colspan;
+                }
+                else {
+                    item.visible = false;
+                }
+            }
+        }
+    });
+    return table;
+}
+
 const defaultRowHeight = 30;
 const defaultColumnWidth = 100;
 class TableComponent extends Component {
     static fromJSON(textbus, json) {
         const registry = textbus.get(Registry);
         return new TableComponent(textbus, {
-            layoutWidth: json.layoutWidth || [],
+            columnsConfig: json.columnsConfig || [],
+            mergeConfig: json.mergeConfig || [],
             rows: json.rows.map(row => {
                 return {
                     height: row.height,
                     cells: row.cells.map(cell => {
                         return {
-                            colspan: cell.colspan,
-                            rowspan: cell.rowspan,
+                            id: cell.id,
                             slot: registry.createSlot(cell.slot)
                         };
                     })
@@ -1815,7 +1899,8 @@ class TableComponent extends Component {
         });
     }
     constructor(textbus, state = {
-        layoutWidth: Array.from({ length: 5 }).fill(100),
+        columnsConfig: Array.from({ length: 5 }).fill(defaultColumnWidth),
+        mergeConfig: {},
         rows: Array.from({ length: 3 }).map(() => {
             return {
                 height: defaultRowHeight,
@@ -1824,9 +1909,8 @@ class TableComponent extends Component {
                     const slot = new Slot([ContentType.BlockComponent]);
                     slot.insert(p);
                     return {
-                        rowspan: 1,
-                        colspan: 1,
-                        slot
+                        slot,
+                        id: v4()
                     };
                 })
             };
@@ -1834,11 +1918,236 @@ class TableComponent extends Component {
     }) {
         super(textbus, state);
         this.selection = this.textbus.get(Selection);
+        this.commander = this.textbus.get(Commander);
         this.focus = new Subject();
         this.tableSelection = createSignal(null);
+        this.ignoreSelectionChanges = false;
+        this.normalizedData = [];
     }
     getSlots() {
-        return this.state.rows.map(i => i.cells.map(j => j.slot)).flat();
+        return this.normalizedData.map(item => {
+            return item.cells.filter(i => i.visible).map(i => i.raw.slot);
+        }).flat();
+    }
+    mergeCellBySelection() {
+        var _a, _b, _c, _d;
+        const slots = this.getSelectedNormalizedSlots();
+        if (slots) {
+            const start = (_b = (_a = slots.at(0)) === null || _a === void 0 ? void 0 : _a.cells.at(0)) === null || _b === void 0 ? void 0 : _b.raw;
+            const end = (_d = (_c = slots.at(-1)) === null || _c === void 0 ? void 0 : _c.cells.at(-1)) === null || _d === void 0 ? void 0 : _d.raw;
+            if (start && end) {
+                slots.forEach(item => {
+                    item.cells.forEach(cell => {
+                        if (cell.raw.id === start.id) {
+                            return;
+                        }
+                        cell.raw.slot.cleanFormats();
+                        cell.raw.slot.cleanAttributes();
+                        cell.raw.slot.retain(0);
+                        cell.raw.slot.delete(cell.raw.slot.length);
+                        Reflect.deleteProperty(this.state.mergeConfig, cell.raw.id);
+                    });
+                });
+                this.state.mergeConfig[start.id] = end.id;
+            }
+        }
+        this.selection.collapse(true);
+    }
+    splitCellsBySelection() {
+        var _a, _b, _c, _d;
+        const slots = this.getSelectedNormalizedSlots();
+        if (slots) {
+            slots.forEach(item => {
+                item.cells.forEach(cell => {
+                    Reflect.deleteProperty(this.state.mergeConfig, cell.raw.id);
+                });
+            });
+            const start = (_b = (_a = slots.at(0)) === null || _a === void 0 ? void 0 : _a.cells.at(0)) === null || _b === void 0 ? void 0 : _b.raw;
+            const end = (_d = (_c = slots.at(-1)) === null || _c === void 0 ? void 0 : _c.cells.at(-1)) === null || _d === void 0 ? void 0 : _d.raw;
+            if (start && end) {
+                this.selection.setBaseAndExtent(start.slot, 0, end.slot, end.slot.length);
+            }
+        }
+    }
+    getMaxRectangle(startSlot, endSlot) {
+        let index1 = -1;
+        let index2 = -1;
+        let x1 = -1;
+        let x2 = -1;
+        let y1 = -1;
+        let y2 = -1;
+        let index = 0;
+        for (let i = 0; i < this.state.rows.length; i++) {
+            const row = this.state.rows[i];
+            for (let j = 0; j < row.cells.length; j++) {
+                const item = row.cells[j];
+                if (item.slot === startSlot) {
+                    index1 = index;
+                    x1 = j;
+                    y1 = i;
+                }
+                if (item.slot === endSlot) {
+                    index2 = index;
+                    x2 = j;
+                    y2 = i;
+                }
+                index++;
+            }
+        }
+        if (index1 === -1 || index2 === -1) {
+            return null;
+        }
+        if (x1 > x2) {
+            [x1, x2] = [x2, x1];
+        }
+        if (y1 > y2) {
+            [y1, y2] = [y2, y1];
+        }
+        return getMaxRectangle(new Rectangle(x1, y1, x2 + 1, y2 + 1), this.getMergedRectangles());
+    }
+    getSelectedNormalizedSlots() {
+        const rect = this.getSelectedRect();
+        if (rect) {
+            return this.getSelectedNormalizedSlotsByRectangle(rect);
+        }
+        return null;
+    }
+    getSelectedRect() {
+        const getSelfSlot = (slot) => {
+            let cell = slot;
+            while ((cell === null || cell === void 0 ? void 0 : cell.parent) && cell.parent !== this) {
+                cell = cell.parentSlot;
+            }
+            return cell;
+        };
+        const start = getSelfSlot(this.selection.startSlot);
+        const end = getSelfSlot(this.selection.endSlot);
+        if (start && end) {
+            return this.getMaxRectangle(start, end);
+        }
+        return null;
+    }
+    getSelectedNormalizedSlotsByRectangle(rectangle) {
+        return this.normalizedData.slice(rectangle.y1, rectangle.y2).map(item => {
+            return {
+                row: item.row,
+                cells: item.cells.slice(rectangle.x1, rectangle.x2)
+            };
+        });
+    }
+    getCellBySlot(slot) {
+        for (const row of this.state.rows) {
+            for (const cell of row.cells) {
+                if (cell.slot === slot) {
+                    return cell;
+                }
+            }
+        }
+        return null;
+    }
+    getNormalizedData() {
+        if (!this.changeMarker.dirty) {
+            return this.normalizedData;
+        }
+        const nonIntersectingRectangles = this.getMergedRectangles();
+        this.normalizedData = applyRectangles(this.state.rows, nonIntersectingRectangles);
+        return this.normalizedData;
+    }
+    selectRow(startIndex, endIndex = startIndex + 1) {
+        if (startIndex > endIndex) {
+            [startIndex, endIndex] = [endIndex, startIndex];
+        }
+        if (startIndex === endIndex) {
+            endIndex++;
+        }
+        const selectedSlots = [];
+        const rows = this.getNormalizedData();
+        rows.slice(startIndex, endIndex).forEach(row => {
+            selectedSlots.push(...row.cells.filter(i => i.visible).map(i => i.raw.slot));
+        });
+        this.ignoreSelectionChanges = true;
+        const slotRanges = selectedSlots.map(i => {
+            return {
+                slot: i,
+                startIndex: 0,
+                endIndex: i.length
+            };
+        });
+        this.selection.setSelectedRanges(slotRanges);
+        this.tableSelection.set({
+            startColumn: 0,
+            endColumn: this.state.columnsConfig.length,
+            startRow: startIndex,
+            endRow: endIndex,
+        });
+        this.focus.next(true);
+        if (slotRanges.length) {
+            setTimeout(() => {
+                this.selection.restore();
+                this.textbus.focus();
+            });
+        }
+    }
+    selectColumn(startIndex, endIndex = startIndex + 1) {
+        if (startIndex > endIndex) {
+            [startIndex, endIndex] = [endIndex, startIndex];
+        }
+        if (startIndex === endIndex) {
+            endIndex++;
+        }
+        const selectedSlots = [];
+        const rows = this.getNormalizedData();
+        rows.forEach(row => {
+            selectedSlots.push(...row.cells.slice(startIndex, endIndex).filter(i => i.visible).map(i => i.raw.slot));
+        });
+        this.ignoreSelectionChanges = true;
+        const slotRanges = selectedSlots.map(i => {
+            return {
+                slot: i,
+                startIndex: 0,
+                endIndex: i.length
+            };
+        });
+        this.selection.setSelectedRanges(slotRanges);
+        this.tableSelection.set({
+            startColumn: startIndex,
+            endColumn: endIndex,
+            startRow: 0,
+            endRow: this.state.rows.length,
+        });
+        this.focus.next(true);
+        this.selection.restore();
+        this.textbus.focus();
+        // if (slotRanges.length) {
+        //   setTimeout(() => {
+        //     this.selection.restore()
+        //     this.textbus.focus()
+        //   })
+        // }
+    }
+    getMergedRectangles() {
+        const rectangles = [];
+        Object.entries(this.state.mergeConfig).forEach(([key, value]) => {
+            const p1 = this.getCoordinateById(key);
+            if (p1) {
+                const p2 = this.getCoordinateById(value);
+                if (p2) {
+                    rectangles.push(new Rectangle(p1[0], p1[1], p2[0] + 1, p2[1] + 1));
+                }
+            }
+        });
+        return findNonIntersectingRectangles(rectangles);
+    }
+    getCoordinateById(id) {
+        const rows = this.state.rows;
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            const colIndex = row.cells.findIndex(i => i.id === id);
+            if (colIndex > -1) {
+                return [colIndex, i];
+            }
+        }
+        return null;
     }
     setup() {
         const selection = useContext(Selection);
@@ -1852,6 +2161,9 @@ class TableComponent extends Component {
             return slot.parent === this;
         });
         const sub = selection.onChange.subscribe(() => {
+            if (this.ignoreSelectionChanges) {
+                return;
+            }
             if (selection.commonAncestorComponent !== this || selection.isCollapsed) {
                 this.tableSelection.set(null);
             }
@@ -1859,115 +2171,109 @@ class TableComponent extends Component {
         onDestroy(() => {
             sub.unsubscribe();
         });
-        const findPosition = (slot) => {
-            let cell = slot;
-            while ((cell === null || cell === void 0 ? void 0 : cell.parent) && cell.parent !== this) {
-                cell = cell.parentSlot;
+        onGetRanges(ev => {
+            if (this.selection.isCollapsed || this.ignoreSelectionChanges) {
+                return;
             }
-            if (cell) {
-                const rows = this.state.rows;
-                for (let rowIndex = 0; rowIndex < rows.length; rowIndex++) {
-                    const row = rows[rowIndex].cells;
-                    for (let colIndex = 0; colIndex < row.length; colIndex++) {
-                        const item = row[colIndex].slot;
-                        if (item === cell) {
-                            return {
-                                rowIndex,
-                                colIndex
-                            };
-                        }
-                    }
+            const rect = this.getSelectedRect();
+            if (rect) {
+                this.tableSelection.set({
+                    startColumn: rect.x1,
+                    endColumn: rect.x2,
+                    startRow: rect.y1,
+                    endRow: rect.y2
+                });
+                const selectedSlots = this.getSelectedNormalizedSlotsByRectangle(rect);
+                const slotRanges = selectedSlots.map(item => {
+                    return item.cells.filter(i => {
+                        return i.visible;
+                    }).map(i => {
+                        return {
+                            startIndex: 0,
+                            endIndex: i.raw.slot.length,
+                            slot: i.raw.slot
+                        };
+                    });
+                }).flat();
+                if (slotRanges.length > 1) {
+                    ev.useRanges(slotRanges);
                 }
             }
-            return null;
-        };
-        const select = (ev, selectPosition) => {
-            this.tableSelection.set(selectPosition);
-            if (selectPosition) {
-                const cells = [];
-                this.state.rows.slice(selectPosition.startRow, selectPosition.endRow).forEach(row => {
-                    cells.push(...row.cells.slice(selectPosition.startColumn, selectPosition.endColumn).map(i => i.slot));
-                });
-                ev.useRanges(cells.map(i => {
-                    return {
-                        slot: i,
-                        startIndex: 0,
-                        endIndex: i.length
-                    };
-                }));
-                ev.preventDefault();
+        });
+    }
+    deleteColumns() {
+        const selection = this.tableSelection();
+        if (selection) {
+            const { startColumn, endColumn } = selection;
+            if (startColumn === 0 && endColumn === this.state.columnsConfig.length) {
+                this.commander.removeComponent(this);
+                return;
             }
-        };
-        onGetRanges(ev => {
-            var _a;
-            const startPosition = findPosition(selection.startSlot);
-            const endPosition = findPosition(selection.endSlot);
-            if (startPosition && endPosition) {
-                if (startPosition.rowIndex === endPosition.rowIndex && startPosition.colIndex === endPosition.colIndex) {
-                    if (selection.startSlot === selection.endSlot && selection.startOffset === 0 && selection.endOffset === ((_a = selection.startSlot) === null || _a === void 0 ? void 0 : _a.length)) {
-                        select(ev, {
-                            startColumn: startPosition.colIndex,
-                            startRow: startPosition.rowIndex,
-                            endColumn: endPosition.colIndex + 1,
-                            endRow: endPosition.rowIndex + 1
+            this.state.columnsConfig.splice(startColumn, endColumn - startColumn);
+            const mergeConfig = this.state.mergeConfig;
+            const keys = Object.keys(mergeConfig);
+            this.state.rows.forEach(row => {
+                const before = row.cells.at(startColumn - 1);
+                const after = row.cells.at(endColumn);
+                const cells = row.cells.splice(startColumn, endColumn - startColumn);
+                cells.forEach(cell => {
+                    if (keys.includes(cell.id)) {
+                        if (after) {
+                            mergeConfig[after.id] = mergeConfig[cell.id];
+                        }
+                        Reflect.deleteProperty(mergeConfig, cell.id);
+                    }
+                    if (before) {
+                        keys.forEach(key => {
+                            if (mergeConfig[key] === cell.id) {
+                                mergeConfig[key] = before.id;
+                            }
                         });
-                        return;
                     }
-                    select(ev, null);
-                    return;
-                }
-                const [startColumn, endColumn] = [startPosition.colIndex, endPosition.colIndex].sort((a, b) => a - b);
-                const [startRow, endRow] = [startPosition.rowIndex, endPosition.rowIndex].sort((a, b) => a - b);
-                select(ev, {
-                    startColumn,
-                    startRow,
-                    endColumn: endColumn + 1,
-                    endRow: endRow + 1
                 });
-            }
-            else {
-                select(ev, null);
-            }
-        });
-    }
-    // afterContentCheck() {
-    //   const selection = this.selection
-    //   const rows = this.state.rows
-    //   rows.forEach(row => {
-    //     row.cells.forEach(cell => {
-    //       const slot = cell.slot
-    //       if (slot.isEmpty) {
-    //         const childSlot = new Slot([
-    //           ContentType.Text,
-    //           ContentType.InlineComponent
-    //         ])
-    //         const p = new ParagraphComponent(this.textbus, {
-    //           slot: childSlot
-    //         })
-    //         slot.insert(p)
-    //         if (slot === selection.anchorSlot) {
-    //           selection.setAnchor(childSlot, 0)
-    //         }
-    //         if (slot === selection.focusSlot) {
-    //           selection.setFocus(childSlot, 0)
-    //         }
-    //       }
-    //     })
-    //   })
-    // }
-    deleteColumn(index) {
-        this.state.layoutWidth.splice(index, 1);
-        this.state.rows.forEach(row => {
-            row.cells.splice(index, 1);
-        });
+            });
+        }
+        this.tableSelection.set(null);
         this.selection.unSelect();
     }
-    deleteRow(index) {
-        this.state.rows.splice(index, 1);
+    deleteRows() {
+        const selection = this.tableSelection();
+        if (selection) {
+            const { startRow, endRow } = selection;
+            if (startRow === 0 && endRow === this.state.rows.length) {
+                this.commander.removeComponent(this);
+                return;
+            }
+            const mergeConfig = this.state.mergeConfig;
+            const keys = Object.keys(mergeConfig);
+            const rows = this.state.rows;
+            const deletedRows = rows.splice(startRow, endRow - startRow);
+            deletedRows.forEach(row => {
+                row.cells.forEach((cell, colIndex) => {
+                    var _a, _b;
+                    const before = (_a = rows.at(startRow - 1)) === null || _a === void 0 ? void 0 : _a.cells.at(colIndex);
+                    const after = (_b = rows.at(startRow)) === null || _b === void 0 ? void 0 : _b.cells.at(colIndex);
+                    if (keys.includes(cell.id)) {
+                        if (after) {
+                            mergeConfig[after.id] = mergeConfig[cell.id];
+                        }
+                        Reflect.deleteProperty(mergeConfig, cell.id);
+                    }
+                    if (before) {
+                        keys.forEach(key => {
+                            if (mergeConfig[key] === cell.id) {
+                                mergeConfig[key] = before.id;
+                            }
+                        });
+                    }
+                });
+            });
+        }
+        this.tableSelection.set(null);
         this.selection.unSelect();
     }
     insertColumn(index) {
-        this.state.layoutWidth.splice(index, 0, defaultColumnWidth);
+        this.state.columnsConfig.splice(index, 0, defaultColumnWidth);
         this.state.rows.forEach(row => {
             const slot = new Slot([
                 ContentType.BlockComponent,
@@ -1979,14 +2285,12 @@ class TableComponent extends Component {
                 ])
             }));
             row.cells.splice(index, 0, {
-                rowspan: 1,
-                colspan: 1,
+                id: v4(),
                 slot
             });
         });
         this.textbus.nextTick(() => {
-            var _a;
-            const slot = (_a = this.state.rows[0].cells[index]) === null || _a === void 0 ? void 0 : _a.slot;
+            const slot = this.state.rows[0].cells[index].slot;
             if (slot) {
                 this.selection.selectFirstPosition(slot.getContentAtIndex(0));
             }
@@ -1995,7 +2299,7 @@ class TableComponent extends Component {
     insertRow(index) {
         this.state.rows.splice(index, 0, {
             height: defaultRowHeight,
-            cells: this.state.layoutWidth.map(() => {
+            cells: this.state.columnsConfig.map(() => {
                 const slot = new Slot([
                     ContentType.BlockComponent,
                 ]);
@@ -2006,15 +2310,13 @@ class TableComponent extends Component {
                     ])
                 }));
                 return {
-                    rowspan: 1,
-                    colspan: 1,
+                    id: v4(),
                     slot
                 };
             })
         });
         this.textbus.nextTick(() => {
-            var _a;
-            const slot = (_a = this.state.rows[index].cells[0]) === null || _a === void 0 ? void 0 : _a.slot;
+            const slot = this.state.rows[index].cells[0].slot;
             if (slot) {
                 this.selection.selectFirstPosition(slot.getContentAtIndex(0));
             }
@@ -2049,7 +2351,7 @@ function registerStrikeThroughShortcut(textbus) {
     const keyboard = textbus.get(Keyboard);
     keyboard.addShortcut({
         keymap: {
-            ctrlKey: true,
+            modKey: true,
             key: 'd'
         },
         action: () => {
@@ -2233,7 +2535,7 @@ function registerListShortcut(textbus) {
     keyboard.addShortcut({
         keymap: {
             key: ['o', 'u'],
-            ctrlKey: true,
+            modKey: true,
             shiftKey: true
         },
         action(key) {
@@ -2765,43 +3067,43 @@ function BlockTool() {
         return (jsx(Dropdown, { width: 'auto', onCheck: transform, trigger: 'hover', menu: [
                 {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-pilcrow" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '0'
                             } }), checked: states.paragraph, children: "\u6B63\u6587" }),
                     value: 'paragraph'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-heading-h1" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '1'
                             } }), checked: states.h1, children: "\u4E00\u7EA7\u6807\u9898" }),
                     value: 'h1'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-heading-h2" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '2'
                             } }), checked: states.h2, children: "\u4E8C\u7EA7\u6807\u9898" }),
                     value: 'h2'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-heading-h3" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '3'
                             } }), checked: states.h3, children: "\u4E09\u7EA7\u6807\u9898" }),
                     value: 'h3'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-heading-h4" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '4'
                             } }), checked: states.h4, children: "\u56DB\u7EA7\u6807\u9898" }),
                     value: 'h4'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-heading-h5" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '5'
                             } }), checked: states.h5, children: "\u4E94\u7EA7\u6807\u9898" }),
                     value: 'h5'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-heading-h6" }), desc: jsx(Keymap, { keymap: {
-                                ctrlKey: true,
+                                modKey: true,
                                 key: '6'
                             } }), checked: states.h6, children: "\u516D\u7EA7\u6807\u9898" }),
                     value: 'h6'
@@ -2812,13 +3114,13 @@ function BlockTool() {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-checkbox-checked" }), checked: states.todolist, children: "\u5F85\u529E\u4E8B\u9879" }),
                     value: 'todolist'
                 }, {
-                    label: jsx(MenuItem, { desc: jsx(Keymap, { keymap: { key: 'O', shiftKey: true, ctrlKey: true } }), icon: jsx("span", { class: "xnote-icon-list-numbered" }), checked: states.orderedList, children: "\u6709\u5E8F\u5217\u8868" }),
+                    label: jsx(MenuItem, { desc: jsx(Keymap, { keymap: { key: 'O', shiftKey: true, modKey: true } }), icon: jsx("span", { class: "xnote-icon-list-numbered" }), checked: states.orderedList, children: "\u6709\u5E8F\u5217\u8868" }),
                     value: 'ol'
                 }, {
-                    label: jsx(MenuItem, { desc: jsx(Keymap, { keymap: { key: 'U', shiftKey: true, ctrlKey: true } }), icon: jsx("span", { class: "xnote-icon-list" }), checked: states.unorderedList, children: "\u65E0\u5E8F\u5217\u8868" }),
+                    label: jsx(MenuItem, { desc: jsx(Keymap, { keymap: { key: 'U', shiftKey: true, modKey: true } }), icon: jsx("span", { class: "xnote-icon-list" }), checked: states.unorderedList, children: "\u65E0\u5E8F\u5217\u8868" }),
                     value: 'ul'
                 }, {
-                    label: jsx(MenuItem, { desc: jsx(Keymap, { keymap: { key: '\'', ctrlKey: true } }), icon: jsx("span", { class: "xnote-icon-quotes-right" }), checked: states.blockquote, children: "\u5F15\u7528" }),
+                    label: jsx(MenuItem, { desc: jsx(Keymap, { keymap: { key: '\'', modKey: true } }), icon: jsx("span", { class: "xnote-icon-quotes-right" }), checked: states.blockquote, children: "\u5F15\u7528" }),
                     value: 'blockquote'
                 }, {
                     label: jsx(MenuItem, { icon: jsx("span", { class: "xnote-icon-source-code" }), checked: states.sourceCode, children: "\u4EE3\u7801\u5757" }),
@@ -2878,7 +3180,7 @@ function registerBoldShortcut(textbus) {
     const keyboard = textbus.get(Keyboard);
     keyboard.addShortcut({
         keymap: {
-            ctrlKey: true,
+            modKey: true,
             key: 'b'
         },
         action: () => {
@@ -2925,7 +3227,7 @@ function registerCodeShortcut(textbus) {
     const keyboard = textbus.get(Keyboard);
     keyboard.addShortcut({
         keymap: {
-            ctrlKey: true,
+            modKey: true,
             key: ','
         },
         action: () => {
@@ -3035,7 +3337,7 @@ function registerItalicShortcut(textbus) {
     const keyboard = textbus.get(Keyboard);
     keyboard.addShortcut({
         keymap: {
-            ctrlKey: true,
+            modKey: true,
             key: 'i'
         },
         action: () => {
@@ -3118,7 +3420,7 @@ function registerUnderlineShortcut(textbus) {
     const keyboard = textbus.get(Keyboard);
     keyboard.addShortcut({
         keymap: {
-            ctrlKey: true,
+            modKey: true,
             key: 'u'
         },
         action: () => {
@@ -3594,6 +3896,171 @@ function UnderlineTool() {
     };
 }
 
+const cellAlignAttr = new Attribute('cellAlign', {
+    render(node, formatValue) {
+        node.styles.set('verticalAlign', formatValue);
+    }
+});
+const cellAlignAttrLoader = {
+    match(element) {
+        return element instanceof HTMLTableCellElement && !!element.style.verticalAlign;
+    },
+    read(element) {
+        return {
+            attribute: cellAlignAttr,
+            value: element.style.verticalAlign
+        };
+    }
+};
+
+function CellAlignTool() {
+    const currentValue = createSignal('');
+    const selection = inject(Selection);
+    function check(v) {
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        if (commonAncestorComponent instanceof TableComponent) {
+            const slots = commonAncestorComponent.getSelectedNormalizedSlots();
+            slots.forEach(item => {
+                item.cells.forEach(cell => {
+                    if (cell.visible) {
+                        cell.raw.slot.setAttribute(cellAlignAttr, v);
+                    }
+                });
+            });
+        }
+    }
+    const refreshService = inject(RefreshService);
+    const query = inject(Query);
+    const highlight = createSignal(false);
+    const subscription = refreshService.onRefresh.subscribe(() => {
+        const result = query.queryAttribute(cellAlignAttr);
+        const isHighlight = result.state === QueryStateType.Enabled;
+        highlight.set(isHighlight);
+        currentValue.set(isHighlight ? result.value : 'middle');
+    });
+    onUnmounted(() => {
+        subscription.unsubscribe();
+    });
+    return () => {
+        return (jsx(Dropdown, { onCheck: check, menu: [
+                {
+                    label: jsx(MenuItem, { checked: currentValue() === 'top', icon: jsx("span", { class: "xnote-icon-align-top" }), children: "\u9876\u90E8\u5BF9\u9F50" }),
+                    value: 'top'
+                },
+                {
+                    label: jsx(MenuItem, { checked: currentValue() === 'middle', icon: jsx("span", { class: "xnote-icon-align-middle" }), children: "\u5782\u76F4\u5C45\u4E2D" }),
+                    value: 'middle'
+                },
+                {
+                    label: jsx(MenuItem, { checked: currentValue() === 'bottom', icon: jsx("span", { class: "xnote-icon-align-bottom" }), children: "\u5E95\u90E8\u5BF9\u9F50" }),
+                    value: 'bottom'
+                }
+            ], children: jsx(Button, { arrow: true, highlight: highlight(), children: jsx("span", { class: 'xnote-icon-align-' + (currentValue() || 'middle') }) }) }));
+    };
+}
+
+function CellBackgroundTool() {
+    const refreshService = inject(RefreshService);
+    const selection = inject(Selection);
+    const [viewModel, update] = useProduce({
+        highlight: false,
+        disabled: false,
+    });
+    function split() {
+        // const commonAncestorComponent = selection.commonAncestorComponent
+        // if (commonAncestorComponent instanceof TableComponent) {
+        //   const scopes = selection.getSelectedScopes()
+        //   if (scopes.length) {
+        //     const start = commonAncestorComponent.getCellBySlot(scopes.at(0)!.slot)
+        //     const end = commonAncestorComponent.getCellBySlot(scopes.at(-1)!.slot)
+        //     // Re
+        //   }
+        // }
+    }
+    const sub = refreshService.onRefresh.subscribe(() => {
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        update(draft => {
+            draft.disabled = !(commonAncestorComponent instanceof TableComponent);
+        });
+    });
+    onUnmounted(() => {
+        sub.unsubscribe();
+    });
+    return () => {
+        const vm = viewModel();
+        return jsx(Button, { highlight: vm.highlight, disabled: vm.disabled, onClick: split, children: jsx("span", { class: "xnote-icon-palette" }) });
+    };
+}
+
+function MergeCellsTool() {
+    const refreshService = inject(RefreshService);
+    const selection = inject(Selection);
+    const [viewModel, update] = useProduce({
+        highlight: false,
+        disabled: false,
+    });
+    function merge() {
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        if (commonAncestorComponent instanceof TableComponent) {
+            commonAncestorComponent.mergeCellBySelection();
+        }
+    }
+    const sub = refreshService.onRefresh.subscribe(() => {
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        update(draft => {
+            draft.disabled = !(commonAncestorComponent instanceof TableComponent);
+        });
+    });
+    onUnmounted(() => {
+        sub.unsubscribe();
+    });
+    return () => {
+        const vm = viewModel();
+        return jsx(Button, { highlight: vm.highlight, disabled: vm.disabled, onClick: merge, children: jsx("span", { class: "xnote-icon-merge-cells" }) });
+    };
+}
+
+function SplitCellsTool() {
+    const refreshService = inject(RefreshService);
+    const selection = inject(Selection);
+    const [viewModel, update] = useProduce({
+        highlight: false,
+        disabled: false,
+    });
+    function split() {
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        if (commonAncestorComponent instanceof TableComponent) {
+            commonAncestorComponent.splitCellsBySelection();
+        }
+    }
+    const sub = refreshService.onRefresh.subscribe(() => {
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        update(draft => {
+            if (commonAncestorComponent instanceof TableComponent) {
+                const slots = commonAncestorComponent.getSelectedNormalizedSlots();
+                if (slots) {
+                    for (const item of slots) {
+                        for (const cell of item.cells) {
+                            if (cell.visible && cell.colspan > 1 || cell.colspan > 1) {
+                                draft.disabled = false;
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+            draft.disabled = true;
+        });
+    });
+    onUnmounted(() => {
+        sub.unsubscribe();
+    });
+    return () => {
+        const vm = viewModel();
+        return jsx(Button, { highlight: vm.highlight, disabled: vm.disabled, onClick: split, children: jsx("span", { class: "xnote-icon-split-cells" }) });
+    };
+}
+
 var scopedId$9 = "vf-cf8e1c";
 
 class FileUploader {
@@ -4376,6 +4843,10 @@ function LinkJump() {
 
 var scopedId$6 = "vf-fee98b";
 
+function sum(numbers) {
+    return numbers.reduce((a, b) => a + b, 0);
+}
+
 const Toolbar = withAnnotation({
     providers: [RefreshService]
 }, function Toolbar() {
@@ -4406,10 +4877,35 @@ const Toolbar = withAnnotation({
         const docRect = viewDocument.getBoundingClientRect();
         const toolbarHeight = 36;
         // const documentHeight = document.documentElement.clientHeight
-        const selectionFocusRect = bridge.getRect({
-            slot: selection.focusSlot,
-            offset: selection.focusOffset
-        });
+        let selectionFocusRect = null;
+        const commonAncestorComponent = selection.commonAncestorComponent;
+        if (commonAncestorComponent instanceof TableComponent) {
+            const slots = commonAncestorComponent.getSelectedNormalizedSlots().map(item => {
+                return item.cells.filter(i => {
+                    return i.visible;
+                }).map(cell => {
+                    return cell.raw.slot;
+                });
+            }).flat();
+            const startSlot = slots.at(0);
+            const endSlot = slots.at(-1);
+            const rect = commonAncestorComponent.getSelectedRect();
+            const startRect = adapter.getNativeNodeBySlot(startSlot).getBoundingClientRect();
+            const endEle = adapter.getNativeNodeBySlot(endSlot).getBoundingClientRect();
+            const width = sum(commonAncestorComponent.state.columnsConfig.slice(rect.x1, rect.x2));
+            selectionFocusRect = {
+                left: startRect.left + width / 2,
+                top: startRect.top,
+                height: endEle.bottom - startRect.top,
+                width
+            };
+        }
+        else {
+            selectionFocusRect = bridge.getRect({
+                slot: selection.focusSlot,
+                offset: selection.focusOffset
+            });
+        }
         if (!selectionFocusRect) {
             return null;
         }
@@ -4440,7 +4936,13 @@ const Toolbar = withAnnotation({
     });
     function bindMouseup() {
         const docElement = adapter.getNativeNodeByComponent(rootComponentRef.component);
-        mouseupSubscription = fromEvent(docElement, 'mouseup').pipe(filter(ev => {
+        mouseupSubscription = fromEvent(docElement, 'mouseup').pipe(delay(), filter(ev => {
+            const c = selection.commonAncestorComponent;
+            if (c instanceof TableComponent) {
+                const b = !c.ignoreSelectionChanges;
+                c.ignoreSelectionChanges = false;
+                return b;
+            }
             return !ev.composedPath().includes(toolbarRef.current);
         }), delay(100), filter(() => {
             return !selection.isCollapsed && !(selection.commonAncestorComponent instanceof SourceCodeComponent);
@@ -4484,7 +4986,7 @@ const Toolbar = withAnnotation({
                 opacity: p.opacity,
                 display: editorService.hideInlineToolbar ? 'none' : '',
                 transitionDuration: p.transitionDuration + 's'
-            }, children: [jsx(ToolbarItem, { children: jsx(BlockTool, {}) }), jsx(ToolbarItem, { children: jsx(AttrTool, {}) }), jsx(ToolbarItem, { children: jsx(BoldTool, {}) }), jsx(ToolbarItem, { children: jsx(ItalicTool, {}) }), jsx(ToolbarItem, { children: jsx(StrikeThroughTool, {}) }), jsx(ToolbarItem, { children: jsx(UnderlineTool, {}) }), jsx(ToolbarItem, { children: jsx(FontSizeTool, {}) }), jsx(ToolbarItem, { children: jsx(FontFamilyTool, {}) }), jsx(ToolbarItem, { children: jsx(LinkTool, { hideToolbar: hideToolbar }) }), jsx(ToolbarItem, { children: jsx(CodeTool, {}) }), jsx(ToolbarItem, { children: jsx(ColorTool, {}) })] }));
+            }, children: [selection.commonAncestorComponent instanceof TableComponent && jsxs(Fragment$1, { children: [jsx(ToolbarItem, { children: jsx(MergeCellsTool, {}) }), jsx(ToolbarItem, { children: jsx(SplitCellsTool, {}) }), jsx(ToolbarItem, { children: jsx(CellAlignTool, {}) })] }, "table"), jsx(ToolbarItem, { children: jsx(BlockTool, {}) }), jsx(ToolbarItem, { children: jsx(AttrTool, {}) }), jsx(ToolbarItem, { children: jsx(BoldTool, {}) }), jsx(ToolbarItem, { children: jsx(ItalicTool, {}) }), jsx(ToolbarItem, { children: jsx(StrikeThroughTool, {}) }), jsx(ToolbarItem, { children: jsx(UnderlineTool, {}) }), jsx(ToolbarItem, { children: jsx(FontSizeTool, {}) }), jsx(ToolbarItem, { children: jsx(FontFamilyTool, {}) }), jsx(ToolbarItem, { children: jsx(LinkTool, { hideToolbar: hideToolbar }) }), jsx(ToolbarItem, { children: jsx(CodeTool, {}) }), jsx(ToolbarItem, { children: jsx(ColorTool, {}) })] }));
     });
 });
 
@@ -4915,8 +5417,8 @@ let TableService = class TableService {
     constructor() {
         this.onInsertRowBefore = new Subject();
         this.onInsertColumnBefore = new Subject();
-        this.onSelectColumns = new Subject();
-        this.onSelectRows = new Subject();
+        // onSelectColumns = new Subject<{ start: number, end: number } | null>()
+        // onSelectRows = new Subject<{ start: number, end: number } | null>()
         this.onScroll = new Subject();
     }
 };
@@ -4936,7 +5438,11 @@ function ResizeColumn(props) {
             ignoreMove = true;
         }).add(fromEvent(document, 'mouseup').subscribe(() => {
             ignoreMove = false;
-        })).add(fromEvent(tableRef.current.parentNode, 'mousemove').subscribe(ev => {
+        })).add(fromEvent(tableRef.current.parentNode, 'mouseleave').subscribe(() => {
+            if (!isDrag) {
+                dragLineRef.current.style.display = 'none';
+            }
+        }), fromEvent(tableRef.current.parentNode, 'mousemove').subscribe(ev => {
             if (isDrag || ignoreMove) {
                 return;
             }
@@ -4944,7 +5450,7 @@ function ResizeColumn(props) {
             const leftDistance = ev.clientX - tableRect.x;
             const state = props.component.state;
             let x = 0;
-            for (let i = 0; i < state.layoutWidth.length + 1; i++) {
+            for (let i = 0; i < state.columnsConfig.length + 1; i++) {
                 const n = leftDistance - x;
                 if (i > 0 && Math.abs(n) < 5) {
                     Object.assign(dragLineRef.current.style, {
@@ -4956,14 +5462,14 @@ function ResizeColumn(props) {
                 }
                 activeCol = null;
                 dragLineRef.current.style.display = 'none';
-                x += state.layoutWidth[i];
+                x += state.columnsConfig[i] || 0;
             }
         })).add(fromEvent(dragLineRef.current, 'mousedown').subscribe(downEvent => {
             isDrag = true;
             editorService.changeLeftToolbarVisible(false);
             props.onActiveStateChange(true);
             const x = downEvent.clientX;
-            const layoutWidth = props.component.state.layoutWidth;
+            const layoutWidth = props.component.state.columnsConfig;
             const initWidth = layoutWidth[activeCol - 1];
             const initLeft = layoutWidth.slice(0, activeCol).reduce((a, b) => a + b, 0);
             const minWidth = 30;
@@ -4980,8 +5486,8 @@ function ResizeColumn(props) {
                 props.onActiveStateChange(false);
                 moveEvent.unsubscribe();
                 const distanceX = upEvent.clientX - x;
-                props.component.state.layoutWidth[activeCol - 1] = Math.max(initWidth + distanceX, minWidth);
-                props.layoutWidth.set(props.component.state.layoutWidth);
+                props.component.state.columnsConfig[activeCol - 1] = Math.max(initWidth + distanceX, minWidth);
+                props.layoutWidth.set(props.component.state.columnsConfig.slice());
             }));
         }));
         return () => {
@@ -4996,7 +5502,7 @@ function ResizeColumn(props) {
                 return;
             }
             const state = props.component.state;
-            const left = state.layoutWidth.slice(0, n).reduce((a, b) => a + b, 0) - 0.5;
+            const left = state.columnsConfig.slice(0, n).reduce((a, b) => a + b, 0) - 0.5;
             dragLineRef.current.style.display = 'block';
             dragLineRef.current.style.left = left + 'px';
         });
@@ -5011,9 +5517,7 @@ var scopedId$4 = "vf-39cb2c";
 
 function TopBar(props) {
     const editorService = inject(EditorService);
-    const selection = inject(Selection);
     const tableService = inject(TableService);
-    const textbus = inject(Textbus);
     const selectedColumnRange = createSignal(null);
     function selectColumn(index, isMultiple) {
         editorService.hideInlineToolbar = true;
@@ -5029,24 +5533,11 @@ function TopBar(props) {
                 startIndex: index, endIndex: index
             });
         }
-        const range = selectedColumnRange();
-        const [startIndex, endIndex] = [range.startIndex, range.endIndex].sort((a, b) => a - b);
-        const selectedSlots = [];
-        const rows = props.component.state.rows;
-        rows.forEach(row => {
-            selectedSlots.push(...row.cells.slice(startIndex, endIndex + 1).map(i => i.slot));
-        });
-        textbus.nextTick(() => {
-            selection.setSelectedRanges(selectedSlots.map(i => {
-                return {
-                    slot: i,
-                    startIndex: 0,
-                    endIndex: i.length
-                };
-            }));
-            selection.restore();
-            textbus.focus();
-        });
+        let { startIndex, endIndex } = selectedColumnRange();
+        if (startIndex > endIndex) {
+            [startIndex, endIndex] = [endIndex, startIndex];
+        }
+        props.component.selectColumn(startIndex, endIndex + 1);
     }
     let mouseDownFromToolbar = false;
     onMounted(() => {
@@ -5055,7 +5546,6 @@ function TopBar(props) {
                 mouseDownFromToolbar = false;
                 return;
             }
-            deleteIndex.set(null);
             selectedColumnRange.set(null);
         });
         return () => sub.unsubscribe();
@@ -5074,49 +5564,53 @@ function TopBar(props) {
     onUnmounted(() => {
         s.unsubscribe();
     });
-    const deleteIndex = createSignal(null);
+    function refreshLayoutWidth() {
+        props.layoutWidth.set(props.component.state.columnsConfig.slice());
+    }
     return withScopedCSS(scopedId$4, () => {
         const { state, tableSelection } = props.component;
         const position = tableSelection();
+        const range = selectedColumnRange();
+        let left = 0;
+        if (range) {
+            left = sum(props.component.state.columnsConfig.slice(0, Math.min(range.startIndex, range.endIndex)));
+            left += sum(props.component.state.columnsConfig.slice(Math.min(range.startIndex, range.endIndex), Math.max(range.startIndex, range.endIndex) + 1)) / 2;
+        }
         return (jsx("div", { class: ['top-bar', {
                     active: props.isFocus()
-                }], children: jsxs("div", { class: "toolbar-wrapper", children: [jsx("div", { class: "insert-bar", children: jsx("table", { style: {
-                                transform: `translateX(${-leftDistance()}px)`
-                            }, children: jsx("tbody", { children: jsx("tr", { children: props.layoutWidth().map((i, index) => {
-                                        return (jsx("td", { style: { width: i + 'px', minWidth: i + 'px' }, children: jsxs("div", { class: "tool-container", children: [index === 0 && (jsx("span", { onMouseenter: () => {
-                                                            tableService.onInsertColumnBefore.next(0);
-                                                        }, onMouseleave: () => {
-                                                            tableService.onInsertColumnBefore.next(null);
-                                                        }, class: "insert-btn-wrap", style: {
-                                                            left: '-10px'
-                                                        }, onClick: () => {
-                                                            props.component.insertColumn(0);
-                                                        }, children: jsx("button", { class: "insert-btn", type: "button", children: "+" }) })), jsx("span", { class: "insert-btn-wrap", onMouseenter: () => {
-                                                            tableService.onInsertColumnBefore.next(index + 1);
-                                                        }, onMouseleave: () => {
-                                                            tableService.onInsertColumnBefore.next(null);
-                                                        }, onClick: () => {
-                                                            props.component.insertColumn(index + 1);
-                                                        }, children: jsx("button", { class: "insert-btn", type: "button", children: "+" }) }), jsx(ComponentToolbar, { style: {
-                                                            display: deleteIndex() === index ? 'inline-block' : 'none',
-                                                            left: '50%',
-                                                        }, innerStyle: {
-                                                            transform: 'translateX(-50%)'
-                                                        }, visible: deleteIndex() === index, children: jsx(ToolbarItem, { children: jsx(Button, { onClick: () => {
-                                                                    props.component.deleteColumn(index);
-                                                                    deleteIndex.set(null);
-                                                                }, children: jsx("span", { class: "xnote-icon-bin" }) }) }) })] }) }));
-                                    }) }) }) }) }), jsx("div", { class: ['action-bar', { active: props.isFocus() }], children: jsx("table", { style: {
+                }], children: jsxs("div", { class: "toolbar-wrapper", children: [jsxs("div", { class: "insert-bar", children: [jsx(ComponentToolbar, { style: {
+                                    left: left - leftDistance() + 'px',
+                                    display: selectedColumnRange() ? 'inline-block' : 'none',
+                                }, innerStyle: {
+                                    transform: 'translateX(-50%)'
+                                }, visible: !!selectedColumnRange(), children: jsx(ToolbarItem, { children: jsx(Button, { onClick: () => {
+                                            props.component.deleteColumns();
+                                            refreshLayoutWidth();
+                                        }, children: jsx("span", { class: "xnote-icon-bin" }) }) }) }), jsx("table", { style: {
+                                    transform: `translateX(${-leftDistance()}px)`
+                                }, children: jsx("tbody", { children: jsx("tr", { children: props.layoutWidth().map((i, index) => {
+                                            return (jsx("td", { style: { width: i + 'px', minWidth: i + 'px' }, children: jsxs("div", { class: "tool-container", children: [index === 0 && (jsx("span", { onMouseenter: () => {
+                                                                tableService.onInsertColumnBefore.next(0);
+                                                            }, onMouseleave: () => {
+                                                                tableService.onInsertColumnBefore.next(null);
+                                                            }, class: "insert-btn-wrap", style: {
+                                                                left: '-10px'
+                                                            }, onClick: () => {
+                                                                props.component.insertColumn(0);
+                                                                refreshLayoutWidth();
+                                                            }, children: jsx("button", { class: "insert-btn", type: "button", children: "+" }) })), jsx("span", { class: "insert-btn-wrap", onMouseenter: () => {
+                                                                tableService.onInsertColumnBefore.next(index + 1);
+                                                            }, onMouseleave: () => {
+                                                                tableService.onInsertColumnBefore.next(null);
+                                                            }, onClick: () => {
+                                                                props.component.insertColumn(index + 1);
+                                                                refreshLayoutWidth();
+                                                            }, children: jsx("button", { class: "insert-btn", type: "button", children: "+" }) })] }) }));
+                                        }) }) }) })] }), jsx("div", { class: ['action-bar', { active: props.isFocus() }], children: jsx("table", { style: {
                                 transform: `translateX(${-leftDistance()}px)`
                             }, children: jsx("tbody", { children: jsx("tr", { children: props.layoutWidth().map((i, index) => {
-                                        return jsx("td", { onClick: ev => {
+                                        return jsx("td", { onMousedown: ev => ev.preventDefault(), onClick: ev => {
                                                 mouseDownFromToolbar = true;
-                                                if (!ev.shiftKey) {
-                                                    deleteIndex.set(index);
-                                                }
-                                                else {
-                                                    deleteIndex.set(null);
-                                                }
                                                 selectColumn(index, ev.shiftKey);
                                             }, class: {
                                                 active: !position ? false :
@@ -5178,10 +5672,8 @@ var scopedId$2 = "vf-aaece0";
 
 function LeftBar(props) {
     const editorService = inject(EditorService);
-    const selection = inject(Selection);
     const actionBarRef = createRef();
     const insertBarRef = createRef();
-    const textbus = inject(Textbus);
     const tableService = inject(TableService);
     // 同步行高度
     onUpdated(() => {
@@ -5189,8 +5681,10 @@ function LeftBar(props) {
         const actionBarRows = actionBarRef.current.rows;
         setTimeout(() => {
             Array.from(props.tableRef.current.rows).forEach((tr, i) => {
-                insertBarRows.item(i).style.height = tr.getBoundingClientRect().height + 'px';
-                actionBarRows.item(i).style.height = tr.getBoundingClientRect().height + 'px';
+                const height = tr.offsetHeight ||
+                    Math.min(...Array.from(tr.children).map(i => i.offsetHeight)) || 0;
+                insertBarRows.item(i).style.height = height + 'px';
+                actionBarRows.item(i).style.height = height + 'px';
             });
         });
     });
@@ -5229,30 +5723,27 @@ function LeftBar(props) {
                 startIndex: index, endIndex: index
             });
         }
-        const range = selectedRowRange();
-        const [startIndex, endIndex] = [range.startIndex, range.endIndex].sort((a, b) => a - b);
-        const selectedSlots = [];
-        const rows = props.component.state.rows;
-        rows.slice(startIndex, endIndex + 1).forEach(row => {
-            selectedSlots.push(...row.cells.map(i => i.slot));
-        });
-        textbus.nextTick(() => {
-            selection.setSelectedRanges(selectedSlots.map(i => {
-                return {
-                    slot: i,
-                    startIndex: 0,
-                    endIndex: i.length
-                };
-            }));
-            selection.restore();
-            textbus.focus();
-        });
+        let { startIndex, endIndex } = selectedRowRange();
+        if (startIndex > endIndex) {
+            [startIndex, endIndex] = [endIndex, startIndex];
+        }
+        deleteIndex.set(startIndex);
+        props.component.selectRow(startIndex, endIndex + 1);
     }
     return withScopedCSS(scopedId$2, () => {
-        const { state, tableSelection } = props.component;
-        const position = tableSelection();
-        return (jsxs("div", { class: ['left-bar', { active: props.isFocus() }], children: [jsx("div", { class: "insert-bar", children: jsx("table", { ref: insertBarRef, children: jsx("tbody", { children: state.rows.map((_, index) => {
-                                return (jsx("tr", { children: jsx("td", { children: jsxs("div", { class: "toolbar-item", children: [index === 0 && (jsx("span", { onMouseenter: () => {
+        const position = props.component.tableSelection();
+        const normalizedData = props.component.getNormalizedData();
+        return (jsxs("div", { class: ['left-bar', { active: props.isFocus() }], children: [jsx("div", { class: "insert-bar", children: jsx("table", { ref: insertBarRef, children: jsx("tbody", { children: normalizedData.map((row, index) => {
+                                let b = false;
+                                for (const item of row.cells) {
+                                    if (item.visible) {
+                                        b = true;
+                                        break;
+                                    }
+                                }
+                                return (jsx("tr", { style: {
+                                        display: b ? '' : 'none'
+                                    }, children: jsx("td", { children: jsxs("div", { class: "toolbar-item", children: [index === 0 && (jsx("span", { onMouseenter: () => {
                                                         tableService.onInsertRowBefore.next(-1);
                                                     }, onMouseleave: () => {
                                                         tableService.onInsertRowBefore.next(null);
@@ -5265,6 +5756,11 @@ function LeftBar(props) {
                                                     }, onMouseleave: () => {
                                                         tableService.onInsertRowBefore.next(null);
                                                     }, class: "insert-btn-wrap", onClick: () => {
+                                                        const cells = row.cells.filter(i => i.visible);
+                                                        if (cells.length < 2) {
+                                                            props.component.insertRow(index + row.cells.at(0).rowspan);
+                                                            return;
+                                                        }
                                                         props.component.insertRow(index + 1);
                                                     }, children: jsx("button", { class: "insert-btn", type: "button", children: "+" }) }), jsx(ComponentToolbar, { style: {
                                                         display: deleteIndex() === index ? 'inline-block' : 'none',
@@ -5273,23 +5769,26 @@ function LeftBar(props) {
                                                         top: 0,
                                                         transform: 'translateY(-50%)'
                                                     }, visible: deleteIndex() === index, children: jsx(ToolbarItem, { children: jsx(Button, { onClick: () => {
-                                                                props.component.deleteRow(index);
+                                                                props.component.deleteRows();
                                                                 deleteIndex.set(null);
                                                             }, children: jsx("span", { class: "xnote-icon-bin" }) }) }) })] }) }) }));
-                            }) }) }) }), jsx("div", { class: "action-bar", children: jsx("table", { ref: actionBarRef, children: jsx("tbody", { children: props.component.state.rows.map((_, index) => {
-                                return jsx("tr", { children: jsx("td", { onMousedown: (ev) => {
+                            }) }) }) }), jsx("div", { class: "action-bar", children: jsx("table", { ref: actionBarRef, children: jsx("tbody", { children: normalizedData.map((row, index) => {
+                                let b = false;
+                                for (const item of row.cells) {
+                                    if (item.visible) {
+                                        b = true;
+                                        break;
+                                    }
+                                }
+                                return jsx("tr", { style: {
+                                        display: b ? '' : 'none'
+                                    }, children: jsx("td", { onMousedown: ev => ev.preventDefault(), onClick: (ev) => {
                                             mouseDownFromToolbar = true;
-                                            if (!ev.shiftKey) {
-                                                deleteIndex.set(index);
-                                            }
-                                            else {
-                                                deleteIndex.set(null);
-                                            }
                                             selectRow(index, ev.shiftKey);
                                         }, class: {
                                             active: !position ? false :
                                                 (position.startColumn === 0 &&
-                                                    position.endColumn === state.layoutWidth.length &&
+                                                    position.endColumn === props.component.state.columnsConfig.length &&
                                                     index >= position.startRow && index < position.endRow)
                                         } }) });
                             }) }) }) })] }));
@@ -5298,10 +5797,6 @@ function LeftBar(props) {
 
 var scopedId$1 = "vf-d4c4a9";
 
-function sum(numbers) {
-    return numbers.reduce((a, b) => a + b, 0);
-}
-
 function ResizeRow(props) {
     const dragLineRef = createRef();
     const tableService = inject(TableService);
@@ -5333,7 +5828,7 @@ function ResizeRow(props) {
         return jsx("div", { ref: dragLineRef, style: {
                 display: styles().visible ? 'block' : 'none',
                 top: styles().top + 'px',
-                width: sum(props.component.state.layoutWidth) + 'px'
+                width: sum(props.component.state.columnsConfig) + 'px'
             }, class: 'drag-line' });
     });
 }
@@ -5367,16 +5862,19 @@ function SelectionMask(props) {
             if (selection.startRow > 0) {
                 heightCompensation = -1;
             }
-            if (selection.endRow === state.rows.length) {
+            if (selection.endRow + 1 === state.rows.length) {
                 heightCompensation += 0.5;
             }
             const trs = Array.from(props.tableRef.current.rows);
             updateStyles(draft => {
+                var _a;
+                const height = trs[selection.endRow - 1].offsetHeight ||
+                    ((_a = trs[selection.endRow - 1].children[0]) === null || _a === void 0 ? void 0 : _a.offsetHeight) || 0;
                 draft.visible = true;
-                draft.left = sum(state.layoutWidth.slice(0, selection.startColumn));
+                draft.left = sum(state.columnsConfig.slice(0, selection.startColumn));
                 draft.top = trs[selection.startRow].offsetTop + topCompensation;
-                draft.width = sum(state.layoutWidth.slice(selection.startColumn, selection.endColumn)) - 1 + 'px';
-                draft.height = trs[selection.endRow - 1].offsetTop + trs[selection.endRow - 1].offsetHeight + heightCompensation - draft.top + 'px';
+                draft.width = sum(state.columnsConfig.slice(selection.startColumn, selection.endColumn)) - 1 + 'px';
+                draft.height = trs[selection.endRow - 1].offsetTop + height + heightCompensation - draft.top + 'px';
             });
         }
         else {
@@ -5405,14 +5903,106 @@ function SelectionMask(props) {
     });
 }
 
-// import { SlotRender } from '../SlotRender'
+/**
+ * 修复不规范表格，并补全空位
+ * @param table
+ */
+function autoComplete(table) {
+    const newTable = [];
+    table.forEach((tr, rowIndex) => {
+        let row = newTable[rowIndex];
+        if (!row) {
+            row = [];
+            newTable[rowIndex] = row;
+        }
+        let startColumnIndex = 0;
+        tr.forEach(td => {
+            while (row[startColumnIndex]) {
+                startColumnIndex++;
+            }
+            let maxColspan = 1;
+            while (maxColspan < td.colspan) {
+                if (!row[startColumnIndex + maxColspan]) {
+                    maxColspan++;
+                }
+                else {
+                    break;
+                }
+            }
+            td.colspan = maxColspan;
+            for (let i = rowIndex, len = td.rowspan + rowIndex; i < len; i++) {
+                let row = newTable[i];
+                if (!row) {
+                    row = [];
+                    newTable[i] = row;
+                }
+                for (let j = startColumnIndex, max = startColumnIndex + maxColspan; j < max; j++) {
+                    row[j] = td;
+                }
+            }
+            startColumnIndex += maxColspan;
+        });
+    });
+    const maxColumns = Math.max(...newTable.map(i => i.length));
+    newTable.forEach(tr => {
+        for (let i = 0; i < maxColumns; i++) {
+            if (!tr[i]) {
+                tr[i] = {
+                    id: v4(),
+                    rowspan: 1,
+                    colspan: 1,
+                    slot: new Slot([
+                        ContentType.BlockComponent
+                    ])
+                };
+            }
+        }
+    });
+    const ids = [];
+    const mergedConfig = {};
+    const normalizedTable = newTable.map(tr => {
+        return tr.map(td => {
+            const is = ids.includes(td.id);
+            if (is) {
+                return {
+                    id: v4(),
+                    slot: new Slot([
+                        ContentType.BlockComponent,
+                    ])
+                };
+            }
+            ids.push(td.id);
+            return {
+                id: td.id,
+                slot: td.slot
+            };
+        });
+    });
+    ids.length = 0;
+    newTable.forEach((tr, rowIndex) => {
+        tr.forEach((td, colIndex) => {
+            if (td.rowspan > 1 || td.colspan > 1) {
+                if (ids.includes(td.id)) {
+                    return;
+                }
+                ids.push(td.id);
+                mergedConfig[td.id] = normalizedTable[rowIndex + td.rowspan - 1][colIndex + td.colspan - 1].id;
+            }
+        });
+    });
+    return {
+        mergedConfig,
+        table: normalizedTable
+    };
+}
+
 const TableComponentView = withAnnotation({
     providers: [TableService]
 }, function TableComponentView(props) {
     const adapter = inject(DomAdapter);
     const editorService = inject(EditorService);
     const isFocus = createSignal(false);
-    const layoutWidth = createSignal(props.component.state.layoutWidth);
+    const layoutWidth = createSignal(props.component.state.columnsConfig);
     const subscription = props.component.focus.subscribe(b => {
         isFocus.set(b);
         if (!b) {
@@ -5422,53 +6012,63 @@ const TableComponentView = withAnnotation({
     onUnmounted(() => {
         subscription.unsubscribe();
     });
+    function resetIgnore() {
+        props.component.ignoreSelectionChanges = false;
+    }
     const tableRef = createRef();
     const isResizeColumn = createSignal(false);
     const rowMapping = new WeakMap();
     const readonly = useReadonly();
     const output = useOutput();
     return () => {
+        const normalizedData = props.component.getNormalizedData();
         const state = props.component.state;
-        const rows = state.rows;
-        rows.forEach(row => {
-            if (rowMapping.has(row)) {
+        // const rows = state.rows
+        normalizedData.forEach(row => {
+            if (rowMapping.has(row.row)) {
                 return;
             }
-            rowMapping.set(row, Math.random());
+            rowMapping.set(row.row, Math.random());
         });
         if (readonly() || output()) {
-            return (jsx("div", { class: "xnote-table", "data-component": props.component.name, "data-layout-width": state.layoutWidth, children: jsx("div", { class: "xnote-table-inner", ref: props.rootRef, children: jsx("div", { class: "xnote-table-container", children: jsxs("table", { class: [
+            return (jsx("div", { class: "xnote-table", "data-component": props.component.name, "data-layout-width": `[${state.columnsConfig.join(',')}]`, children: jsx("div", { class: "xnote-table-inner", ref: props.rootRef, children: jsx("div", { class: "xnote-table-container", children: jsxs("table", { class: [
                                 'xnote-table-content',
                                 {
                                     'hide-selection': props.component.tableSelection()
                                 }
-                            ], children: [jsx("colgroup", { children: layoutWidth().map(w => {
+                            ], children: [jsx("colgroup", { children: state.columnsConfig.map(w => {
                                         return jsx("col", { style: { width: w + 'px', minWidth: w + 'px' } });
-                                    }) }), jsx("tbody", { children: rows.map((row) => {
+                                    }) }), jsx("tbody", { children: normalizedData.map((row) => {
                                         return (jsx("tr", { children: row.cells.map(cell => {
-                                                return adapter.slotRender(cell.slot, children => {
+                                                return adapter.slotRender(cell.raw.slot, children => {
                                                     return createVNode('td', {
-                                                        key: cell.slot.id
+                                                        key: cell.raw.id,
+                                                        rowspan: cell.rowspan,
+                                                        colspan: cell.colspan
                                                     }, children);
                                                 }, readonly() || output());
-                                            }) }, rowMapping.get(row)));
+                                            }) }, rowMapping.get(row.row)));
                                     }) })] }) }) }) }));
         }
-        return (jsx("div", { class: "xnote-table", "data-component": props.component.name, "data-layout-width": `[${state.layoutWidth.join(',')}]`, children: jsxs("div", { class: "xnote-table-inner", ref: props.rootRef, children: [jsx(TopBar, { isFocus: isFocus, layoutWidth: layoutWidth, component: props.component }), jsx(LeftBar, { tableRef: tableRef, isFocus: isFocus, component: props.component }), jsx(Scroll, { isFocus: isFocus, children: jsxs("div", { class: "xnote-table-container", children: [jsxs("table", { ref: tableRef, class: [
+        return (jsx("div", { class: "xnote-table", "data-component": props.component.name, "data-layout-width": `[${state.columnsConfig.join(',')}]`, children: jsxs("div", { class: "xnote-table-inner", ref: props.rootRef, children: [jsx(TopBar, { isFocus: isFocus, layoutWidth: layoutWidth, component: props.component }), jsx(LeftBar, { tableRef: tableRef, isFocus: isFocus, component: props.component }), jsx(Scroll, { isFocus: isFocus, children: jsxs("div", { class: "xnote-table-container", children: [jsxs("table", { ref: tableRef, class: [
                                         'xnote-table-content',
                                         {
                                             'hide-selection': props.component.tableSelection()
                                         }
                                     ], children: [jsx("colgroup", { children: layoutWidth().map(w => {
                                                 return jsx("col", { style: { width: w + 'px', minWidth: w + 'px' } });
-                                            }) }), jsx("tbody", { children: rows.map((row) => {
-                                                return (jsx("tr", { children: row.cells.map(cell => {
-                                                        return adapter.slotRender(cell.slot, children => {
+                                            }) }), jsx("tbody", { onMousedown: resetIgnore, children: normalizedData.map((row) => {
+                                                return (jsx("tr", { children: row.cells.filter(i => {
+                                                        return i.visible;
+                                                    }).map(cell => {
+                                                        return adapter.slotRender(cell.raw.slot, children => {
                                                             return createVNode('td', {
-                                                                key: cell.slot.id
+                                                                key: cell.raw.id,
+                                                                rowspan: cell.rowspan,
+                                                                colspan: cell.colspan
                                                             }, children);
                                                         }, readonly() || output());
-                                                    }) }, rowMapping.get(row)));
+                                                    }) }, rowMapping.get(row.row)));
                                             }) })] }), jsx(ResizeColumn, { tableRef: tableRef, component: props.component, layoutWidth: layoutWidth, onActiveStateChange: isActive => {
                                         isResizeColumn.set(isActive);
                                     } }), jsx(SelectionMask, { tableRef: tableRef, component: props.component })] }) }), jsx(ResizeRow, { component: props.component, tableRef: tableRef })] }) }));
@@ -5495,6 +6095,7 @@ const tableComponentLoader = {
                         ContentType.BlockComponent,
                     ]);
                     arr.push({
+                        id: v4(),
                         slot,
                         rowspan: cell.rowSpan,
                         colspan: cell.colSpan
@@ -5522,6 +6123,7 @@ const tableComponentLoader = {
                         ContentType.BlockComponent,
                     ]);
                     arr.push({
+                        id: v4(),
                         slot,
                         rowspan: cell.rowSpan,
                         colspan: cell.colSpan
@@ -5540,7 +6142,7 @@ const tableComponentLoader = {
         }
         bodies.unshift(...headers);
         const cells = autoComplete(bodies);
-        let layoutWidth = null;
+        let layoutWidth = [];
         try {
             const columnWidth = JSON.parse(element.dataset.layoutWidth || '');
             if (Array.isArray(columnWidth)) {
@@ -5550,80 +6152,23 @@ const tableComponentLoader = {
         catch (e) {
             //
         }
-        if (!layoutWidth) {
-            layoutWidth = Array.from({ length: cells[0].length }).fill(100);
+        const length = cells.table[0].length;
+        for (let i = 0; i < length; i++) {
+            layoutWidth[i] = layoutWidth[i] || 100;
         }
+        layoutWidth.length = length;
         return new TableComponent(textbus, {
-            rows: cells.map(i => {
+            columnsConfig: layoutWidth,
+            mergeConfig: cells.mergedConfig,
+            rows: cells.table.map(i => {
                 return {
                     height: 30,
                     cells: i
                 };
-            }),
-            layoutWidth
+            })
         });
     }
 };
-function autoComplete(table) {
-    const newTable = [];
-    table.forEach((tr, rowIndex) => {
-        if (!newTable[rowIndex]) {
-            newTable[rowIndex] = [];
-        }
-        const row = newTable[rowIndex];
-        let startColumnIndex = 0;
-        tr.forEach(td => {
-            while (row[startColumnIndex]) {
-                startColumnIndex++;
-            }
-            let maxColspan = 1;
-            while (maxColspan < td.colspan) {
-                if (!row[startColumnIndex + maxColspan]) {
-                    maxColspan++;
-                }
-                else {
-                    break;
-                }
-            }
-            td.colspan = maxColspan;
-            for (let i = rowIndex, len = td.rowspan + rowIndex; i < len; i++) {
-                if (!newTable[i]) {
-                    newTable[i] = [];
-                }
-                const row = newTable[i];
-                for (let j = startColumnIndex, max = startColumnIndex + maxColspan; j < max; j++) {
-                    row[j] = td;
-                }
-            }
-            startColumnIndex += maxColspan;
-        });
-    });
-    const maxColumns = Math.max(...newTable.map(i => i.length));
-    newTable.forEach(tr => {
-        for (let i = 0; i < maxColumns; i++) {
-            if (!tr[i]) {
-                tr[i] = {
-                    rowspan: 1,
-                    colspan: 1,
-                    slot: new Slot([
-                        ContentType.BlockComponent
-                    ])
-                };
-            }
-        }
-    });
-    const recordCells = [];
-    return newTable.map(tr => {
-        return tr.filter(td => {
-            const is = recordCells.includes(td);
-            if (is) {
-                return false;
-            }
-            recordCells.push(td);
-            return true;
-        });
-    });
-}
 
 function findFocusCell(table, slot) {
     var _a;
@@ -5641,7 +6186,7 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
         this.domAdapter = domAdapter;
         this.selection = selection;
     }
-    getRects(abstractSelection) {
+    getRects(abstractSelection, _, data) {
         const { focusSlot, anchorSlot } = abstractSelection;
         const focusPaths = this.selection.getPathsBySlot(focusSlot);
         const anchorPaths = this.selection.getPathsBySlot(anchorSlot);
@@ -5660,18 +6205,25 @@ let TableSelectionAwarenessDelegate = class TableSelectionAwarenessDelegate exte
         if (!(commonAncestorComponent instanceof TableComponent)) {
             return false;
         }
-        const range = getSelectedRanges(commonAncestorComponent, findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
-        const rows = commonAncestorComponent.state.rows;
-        const startFocusSlot = rows[range.startRow].cells[range.startColumn].slot;
-        const endFocusSlot = rows[range.endRow].cells[range.endColumn].slot;
+        const rect = data.data || commonAncestorComponent.getMaxRectangle(findFocusCell(commonAncestorComponent, startSlot), findFocusCell(commonAncestorComponent, endSlot));
         const renderer = this.domAdapter;
-        const startRect = renderer.getNativeNodeBySlot(startFocusSlot).getBoundingClientRect();
-        const endRect = renderer.getNativeNodeBySlot(endFocusSlot).getBoundingClientRect();
+        if (!rect) {
+            return false;
+        }
+        const normalizedSlots = commonAncestorComponent.getSelectedNormalizedSlotsByRectangle(rect);
+        const rects = normalizedSlots.map(row => {
+            return row.cells.filter(i => i.visible).map(i => {
+                const td = renderer.getNativeNodeBySlot(i.raw.slot);
+                return td.getBoundingClientRect();
+            });
+        }).flat();
+        const left = Math.min(...rects.map(i => i.left));
+        const top = Math.min(...rects.map(i => i.top));
         return [{
-                left: startRect.left,
-                top: startRect.top,
-                width: endRect.left + endRect.width - startRect.left,
-                height: endRect.top + endRect.height - startRect.top
+                left,
+                top,
+                width: Math.max(...rects.map(i => i.right)) - left,
+                height: Math.max(...rects.map(i => i.bottom)) - top
             }];
     }
 };
@@ -5680,32 +6232,6 @@ TableSelectionAwarenessDelegate = __decorate([
     __metadata("design:paramtypes", [DomAdapter,
         Selection])
 ], TableSelectionAwarenessDelegate);
-function getSelectedRanges(component, startSlot, endSlot) {
-    const p1 = finedPosition(component, startSlot);
-    const p2 = finedPosition(component, endSlot);
-    return {
-        startRow: Math.min(p1.rowIndex, p2.rowIndex),
-        endRow: Math.max(p1.rowIndex, p2.rowIndex),
-        startColumn: Math.min(p1.columnIndex, p2.columnIndex),
-        endColumn: Math.max(p1.columnIndex, p2.columnIndex)
-    };
-}
-function finedPosition(component, slot) {
-    const rows = component.state.rows;
-    for (let i = 0; i < rows.length; i++) {
-        const row = rows[i];
-        for (let j = 0; j < row.cells.length; j++) {
-            const cell = row.cells[j].slot;
-            if (cell === slot) {
-                return {
-                    rowIndex: i,
-                    columnIndex: j
-                };
-            }
-        }
-    }
-    return null;
-}
 
 function TimelineComponentView(props) {
     const adapter = inject(DomAdapter);
@@ -5813,6 +6339,30 @@ const stepComponentLoader = {
     }
 };
 
+class XNoteMessageBug extends MessageBus {
+    constructor(selection, collaborateCursor, userinfo) {
+        super();
+        this.selection = selection;
+        this.collaborateCursor = collaborateCursor;
+        this.userinfo = userinfo;
+        this.messageChangeEvent = new Subject();
+        this.onMessageChange = this.messageChangeEvent.asObservable();
+    }
+    get() {
+        const selection = this.selection;
+        const c = selection.commonAncestorComponent;
+        return Object.assign(Object.assign({}, this.userinfo), { selection: selection.getPaths(), data: (!selection.isCollapsed && c instanceof TableComponent) ? c.getSelectedRect() : null });
+    }
+    consume(message) {
+        this.messageChangeEvent.next([...message]);
+        this.collaborateCursor.draw(message.filter(item => {
+            return item.message.id !== this.userinfo.id;
+        }).map(item => {
+            return item.message;
+        }));
+    }
+}
+
 class Editor extends Textbus {
     constructor(editorConfig = {}) {
         const adapter = new ViewflyAdapter({
@@ -5870,6 +6420,7 @@ class Editor extends Textbus {
                 strikeThroughFormatLoader,
                 underlineFormatLoader
             ], attributeLoaders: [
+                cellAlignAttrLoader,
                 headingAttrLoader,
                 textAlignAttrLoader,
                 textIndentAttrLoader
@@ -5877,9 +6428,20 @@ class Editor extends Textbus {
         const modules = [browserModule];
         if (editorConfig.collaborateConfig) {
             modules.push(new CollaborateModule(editorConfig.collaborateConfig));
-            browserModule.providers.push({
-                provide: CollaborateSelectionAwarenessDelegate,
-                useClass: TableSelectionAwarenessDelegate
+            modules.push({
+                providers: [{
+                        provide: CollaborateSelectionAwarenessDelegate,
+                        useClass: TableSelectionAwarenessDelegate
+                    }, {
+                        provide: MessageBus,
+                        useFactory: (selection, collaborateCursor) => {
+                            return new XNoteMessageBug(selection, collaborateCursor, editorConfig.collaborateConfig.userinfo);
+                        },
+                        deps: [
+                            Selection,
+                            CollaborateCursor
+                        ]
+                    }]
             });
         }
         const vDomAdapter = new ViewflyVDomAdapter({
@@ -5942,25 +6504,14 @@ class Editor extends Textbus {
                 strikeThroughFormatter,
                 underlineFormatter
             ], attributes: [
+                cellAlignAttr,
                 headingAttr,
                 textAlignAttr,
                 textIndentAttr
             ], plugins: [
                 new LeftToolbarPlugin(),
                 new ToolbarPlugin(),
-            ], setup(textbus) {
-                if (editorConfig.collaborateConfig) {
-                    const activity = textbus.get(UserActivity);
-                    const collabCursor = textbus.get(CollaborateCursor);
-                    const sub = activity.onStateChange.subscribe(ev => {
-                        collabCursor.draw(ev);
-                    });
-                    return () => {
-                        sub.unsubscribe();
-                    };
-                }
-            },
-            onAfterStartup(textbus) {
+            ], onAfterStartup(textbus) {
                 registerBoldShortcut(textbus);
                 registerCodeShortcut(textbus);
                 registerItalicShortcut(textbus);
@@ -6013,4 +6564,4 @@ class Editor extends Textbus {
     }
 }
 
-export { AtComponent, AtComponentView, AttrTool, BlockTool, BlockquoteComponent, BlockquoteView, BoldTool, Button, CodeTool, ColorTool, ComponentToolbar, Divider, DragResize, Dropdown, DropdownContextService, DropdownMenuPortal, DropdownService, Editor, EditorService, FileUploader, FontFamilyTool, FontSizeTool, HighlightBoxComponent, HighlightBoxView, ImageComponent, ImageView, InsertTool, ItalicTool, KatexComponent, KatexComponentView, Keymap, LeftToolbar, LeftToolbarPlugin, LinkJump, LinkTool, ListComponent, ListComponentView, Matcher, MenuHeading, MenuItem, Organization, OutputInjectionToken, ParagraphComponent, ParagraphView, Popup, RefreshService, RootComponent, RootView, SourceCodeComponent, SourceCodeView, StrikeThroughTool, TableComponent, TableComponentView, TodolistComponent, TodolistView, Toolbar, ToolbarItem, ToolbarPlugin, UnderlineTool, VideoComponent, VideoView, atComponentLoader, autoComplete, backgroundColorFormatLoader, backgroundColorFormatter, blockquoteComponentLoader, boldFormatLoader, boldFormatter, codeFormatLoader, codeFormatter, colorFormatLoader, colorFormatter, deltaToBlock, fontFamilyFormatLoader, fontFamilyFormatter, fontSizeFormatLoader, fontSizeFormatter, headingAttr, headingAttrLoader, highlightBoxComponentLoader, imageComponentLoader, isSupportFont, italicFormatLoader, italicFormatter, katexComponentLoader, languageList, linkFormatLoader, linkFormatter, listComponentLoader, paragraphComponentLoader, registerAtShortcut, registerBlockquoteShortcut, registerBoldShortcut, registerCodeShortcut, registerHeadingShortcut, registerItalicShortcut, registerListShortcut, registerStrikeThroughShortcut, registerTextAlignShortcut, registerTextIndentShortcut, registerUnderlineShortcut, rootComponentLoader, sourceCodeComponentLoader, sourceCodeThemes, strikeThroughFormatLoader, strikeThroughFormatter, tableComponentLoader, textAlignAttr, textAlignAttrLoader, textIndentAttr, textIndentAttrLoader, toBlockquote, toList, todolistComponentLoader, toggleBold, toggleCode, toggleItalic, toggleStrikeThrough, toggleUnderline, underlineFormatLoader, underlineFormatter, useActiveBlock, useBlockContent, useBlockTransform, useOutput, useReadonly, videoComponentLoader };
+export { AtComponent, AtComponentView, AttrTool, BlockTool, BlockquoteComponent, BlockquoteView, BoldTool, Button, CellAlignTool, CellBackgroundTool, CodeTool, ColorTool, ComponentToolbar, Divider, DragResize, Dropdown, DropdownContextService, DropdownMenuPortal, DropdownService, Editor, EditorService, FileUploader, FontFamilyTool, FontSizeTool, HighlightBoxComponent, HighlightBoxView, ImageComponent, ImageView, InsertTool, ItalicTool, KatexComponent, KatexComponentView, Keymap, LeftToolbar, LeftToolbarPlugin, LinkJump, LinkTool, ListComponent, ListComponentView, Matcher, MenuHeading, MenuItem, MergeCellsTool, Organization, OutputInjectionToken, ParagraphComponent, ParagraphView, Popup, RefreshService, RootComponent, RootView, SourceCodeComponent, SourceCodeView, SplitCellsTool, StrikeThroughTool, TableComponent, TableComponentView, TodolistComponent, TodolistView, Toolbar, ToolbarItem, ToolbarPlugin, UnderlineTool, VideoComponent, VideoView, atComponentLoader, backgroundColorFormatLoader, backgroundColorFormatter, blockquoteComponentLoader, boldFormatLoader, boldFormatter, cellAlignAttr, cellAlignAttrLoader, codeFormatLoader, codeFormatter, colorFormatLoader, colorFormatter, deltaToBlock, fontFamilyFormatLoader, fontFamilyFormatter, fontSizeFormatLoader, fontSizeFormatter, headingAttr, headingAttrLoader, highlightBoxComponentLoader, imageComponentLoader, isSupportFont, italicFormatLoader, italicFormatter, katexComponentLoader, languageList, linkFormatLoader, linkFormatter, listComponentLoader, paragraphComponentLoader, registerAtShortcut, registerBlockquoteShortcut, registerBoldShortcut, registerCodeShortcut, registerHeadingShortcut, registerItalicShortcut, registerListShortcut, registerStrikeThroughShortcut, registerTextAlignShortcut, registerTextIndentShortcut, registerUnderlineShortcut, rootComponentLoader, sourceCodeComponentLoader, sourceCodeThemes, strikeThroughFormatLoader, strikeThroughFormatter, tableComponentLoader, textAlignAttr, textAlignAttrLoader, textIndentAttr, textIndentAttrLoader, toBlockquote, toList, todolistComponentLoader, toggleBold, toggleCode, toggleItalic, toggleStrikeThrough, toggleUnderline, underlineFormatLoader, underlineFormatter, useActiveBlock, useBlockContent, useBlockTransform, useOutput, useReadonly, videoComponentLoader };