@hailin-zheng/editor-core 2.2.2 → 2.2.4

package/index.js

@@ -40,9 +40,9 @@ class ElementEvent {
     }
 }
 class ContentMenuItem {
-    icon;
     caption;
-    eventObj;
+    checked;
+    click = () => { };
     subItems = [];
 }
 /**
@@ -973,6 +973,12 @@ function generatePatch(doc, clear = true) {
         if ('insert' in op.ops) {
             insertOpsMap.set(ele, op);
         }
+        //当前为新插入的元素
+        if ('insText' in op.ops) {
+            if (insertOpsMap.has(ele)) {
+                continue;
+            }
+        }
         // if ('insert' in op.ops) {
         //     op.ops.insert = ele.clone(true);
         //     const log = getOpsLog(ele, op.ops);
@@ -1028,7 +1034,11 @@ class Subscription {
 class EventSourceCore {
     closed = false;
     subs = [];
+    state = 'running';
     next(data) {
+        if (this.state === 'pause') {
+            return;
+        }
         const subs = [...this.subs];
         subs.forEach((sub) => {
             sub.invoke(data);
@@ -1172,6 +1182,8 @@ class Rect {
     width = 0;
     height = 0;
 }
+// 定义文本占用高度系数
+const TEXT_HEIGHT_FACTOR = 1.4;
 /**
  * 修改标志
  */
@@ -1674,6 +1686,7 @@ class PageOptions {
 }
 class ViewOptions {
     copyRightInfo;
+    trialVersion = false;
     watermark;
     drawLineRectColor = "rgb(0,0,0)";
     drawCharRectColor = "rgb(0,0,0)";
@@ -1682,6 +1695,8 @@ class ViewOptions {
     editorVersion = '';
     defaultFontSize = 14;
     defaultColor = "#000000";
+    currentFontSize = 14;
+    currentFontName = '宋体';
     selectionOverlaysColor = 'rgb(131,175,155,0.5)';
     dataEleOverlaysColor = 'rgb(131,175,155,0.5)';
     dataEleFocusedBgColor = 'rgb(131,175,155,0.8)';
@@ -1732,6 +1747,7 @@ class ViewOptions {
     //显示段落回车符号
     showEnterSymbol = false;
     enableVisibleExpression = false;
+    shapeRendering = 'auto';
     get fullPageView() {
         return this._fullPageView;
     }
@@ -1779,6 +1795,8 @@ class ViewOptions {
     _showTrackChanges = true;
     //是否显示审阅痕迹提示
     _showTrackChangesTip = true;
+    //是否开启留痕
+    enableTrackChanges = false;
     get showTrackChanges() {
         return this._showTrackChanges;
     }
@@ -1807,6 +1825,8 @@ class ViewOptions {
     onChange = new Subject();
     //打印模式，普通模式，续打模式
     printMode = 'normal';
+    //是否开启候选词输入联想
+    enableSuggestions = false;
     constructor() {
     }
 }
@@ -2889,7 +2909,7 @@ class DataDecorateElement extends LeafElement {
     createRenderObject() {
         const render = new DataDecorateRenderObject(this);
         //render.rect.width = this.dProps.size / 2;
-        render.rect.width = 3;
+        render.rect.width = 1;
         render.rect.height = 14;
         return render;
     }
@@ -3626,6 +3646,7 @@ class DocumentRenderObject extends BlockContainerRenderObject {
         };
         const pageCorner = this.exportPageCornerHTML(event);
         const pageNum = this.exportPageNumHTML(event);
+        const copyright = this.exportCopyRight(event);
         return {
             sel: "svg",
             isCompleted: true,
@@ -3636,11 +3657,11 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                     height: this.rect.height - 1,
                     viewBox: `0 0 ${this.rect.width} ${this.rect.height - 1}`,
                     overflow: "hidden",
-                    "shape-rendering": "optimizeSpeed"
+                    "shape-rendering": event.options.shapeRendering
                 },
             },
             children: [
-                pageCorner, highlight, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, selection
+                pageCorner, copyright, highlight, ...CommonUtil.toArray(event.getChildNodes(this)), pageNum, selection
             ]
         };
     }
@@ -3672,6 +3693,41 @@ class DocumentRenderObject extends BlockContainerRenderObject {
         pageCorner.children?.push(ElementUtil.getStrokeSvgPath(`M ${paddingPos.x + lineWidth} ${paddingPos.y} L ${paddingPos.x} ${paddingPos.y} L ${paddingPos.x} ${paddingPos.y + lineWidth}`, "grey", drawLineWidth));
         return pageCorner;
     }
+    exportCopyRight(event) {
+        if (!event.options.trialVersion) {
+            return null;
+        }
+        const str = "\u6f14\u793a\u7248\u672c";
+        const textProps = new TextProps();
+        textProps.color = "#000";
+        textProps.fontName = '仿宋';
+        textProps.fontSize = 80;
+        textProps.fontStyle = 'italic';
+        event.renderCtx.contentContext.measureText(str, textProps);
+        const getTextRotationAngle = (width, height) => {
+            return Math.atan(height / width) * 180 / Math.PI;
+        };
+        const angle = getTextRotationAngle(this.rect.width, this.rect.height);
+        return {
+            sel: 'text',
+            text: str,
+            data: {
+                ns: "http://www.w3.org/2000/svg",
+                attrs: {
+                    transform: `rotate(${360 - angle})`,
+                    'transform-origin': 'center',
+                    'dominant-baseline': 'Hanging',
+                    'text-anchor': 'middle',
+                    'font-family': textProps.fontName,
+                    'font-size': textProps.fontSize,
+                    "stroke": textProps.color,
+                    'fill': '#fff',
+                    x: this.rect.width / 2,
+                    y: this.rect.height / 2,
+                }
+            },
+        };
+    }
 }
 class DocumentFactory extends ElementFactory {
     match(type) {
@@ -4182,8 +4238,6 @@ function getCurrentParaGroupRenders(r) {
 }
 
 class DocumentBodyElement extends BlockContainerElement {
-    //当前区域内是否留痕
-    trackChanges = false;
     constructor() {
         super('body');
         //this.editMode = EditMode.Free;
@@ -4308,7 +4362,6 @@ class TableCellElement extends BlockContainerElement {
         //this.addPropValueChangedSub(this.props);
     }
     beginMeasure(data) {
-        //不被合并的单元格
         if (!this.length) {
             this.addChild(data.createParaFn());
         }
@@ -4678,7 +4731,7 @@ class TextGroupRenderObject extends LeafRenderObject {
     }
     measure() {
         this.rect.width = this.textMeasures.reduce((prev, curr) => prev + curr.actualSize, 0);
-        this.rect.height = Math.ceil(this.element.props.fontSize * 1.4);
+        this.rect.height = Math.ceil(this.element.props.fontSize * TEXT_HEIGHT_FACTOR);
         // this.element.fontBoundingBox.fontBoundingBoxAscent + this.element.fontBoundingBox.fontBoundingBoxDescent;
     }
     exportSVG(event) {
@@ -6600,17 +6653,20 @@ class DocumentSelection {
         ss.endOffset = range.endOffset;
         ss.endControlIndex = ElementUtil.getControlIndex(range.endControl);
         ss.ancestorCommonControl = DocumentSelection.getAncestorCommonControl(ss.startControl, ss.endControl);
-        ss.enableTrackChanges = this.getEnableTrackChanges(range.startControl);
         ss.rangeDirty = false;
         return true;
     }
-    /**
-     * 获取当前选区区域内是否支持留痕
-     * @private
-     */
-    getEnableTrackChanges(ele) {
-        const body = ElementUtil.getParentByType(ele, DocumentBodyElement);
-        return body?.trackChanges || false;
+    isSelectionChanged() {
+        if (!this.snapshotSelectionState) {
+            return true;
+        }
+        if (this.selectionState.startControl !== this.snapshotSelectionState.startControl || this.selectionState.startOffset !== this.snapshotSelectionState.startOffset) {
+            return true;
+        }
+        if (this.selectionState.endControl !== this.snapshotSelectionState.endControl || this.selectionState.endOffset !== this.snapshotSelectionState.endOffset) {
+            return true;
+        }
+        return false;
     }
     /**
      * 转换选区内容
@@ -6707,8 +6763,6 @@ class SelectionState {
     renderContainer;
     //光标所在的位置，当前位置时相对文档的位置，而非DOM页面中的位置
     cursorPos;
-    //当前选区的上下文是否支持留痕修改
-    enableTrackChanges = false;
     constructor() {
         this.clear();
     }
@@ -8416,7 +8470,10 @@ class DataElementDate extends DataElementInlineGroup {
             this.props.value = '';
             return;
         }
-        const format = this.props.format ?? 'YYYY-MM-DD';
+        let format = 'YYYY-MM-DD';
+        if (this.props.format) {
+            format = this.props.format;
+        }
         const date = moment(val, format);
         if (!date.isValid()) {
             return;
@@ -8947,6 +9004,102 @@ class DataElementTextFactory extends DataElementBaseFactory {
     }
 }
 
+/**
+ * 数据块容器,包裹多个段落
+ */
+class DataContainerElement extends BlockContainerElement {
+    constructor() {
+        super('data-container');
+        this.props = new DataContainerProps();
+        this.addEvent('GotCursor', (evt) => {
+            this.isFocused = true;
+            this.refreshView();
+        });
+        this.addEvent('LostCursor', (evt) => {
+            this.isFocused = false;
+            this.refreshView();
+        });
+    }
+    createRenderObject() {
+        return new DataContainerRenderObject(this);
+    }
+    beginMeasure(data) {
+        if (!this.length) {
+            this.addChild(data.createParaFn());
+        }
+        super.beginMeasure(data);
+    }
+    serialize() {
+        const p = {
+            type: this.type,
+            props: {}
+        };
+        if (this.props.id) {
+            p['id'] = this.props.id;
+        }
+        if (this.props.name) {
+            p['name'] = this.props.name;
+        }
+        if (this.props.caption) {
+            p['caption'] = this.props.caption;
+        }
+        return p;
+    }
+    clone(data) {
+        const clone = new DataContainerElement();
+        clone.props.id = this.props.id;
+        clone.props.name = this.props.name;
+        clone.props.caption = this.props.caption;
+        cloneElementBase(this, clone);
+        cloneChildren(this, clone, data);
+        return clone;
+    }
+}
+class DataContainerRenderObject extends MuiltBlockLineRenderObject {
+    clone(cloneData = true) {
+        const cloneRender = new DataContainerRenderObject(this.element);
+        cloneRender.rect = ElementUtil.cloneRect(this.rect);
+        if (cloneData) {
+            for (let i = 0; i < this.length; i++) {
+                cloneRender.addChild(this.getChild(i).clone());
+            }
+        }
+        return cloneRender;
+    }
+    exportSVG(event) {
+        const t = super.exportSVG(event);
+        if (event.mode === 'view') {
+            const border = ElementUtil.getStrokeSvgPath(ElementUtil.getRectPath(0, 0, this.rect.width, this.rect.height), '#000', 0.5);
+            t.children = [border];
+        }
+        return t;
+    }
+}
+class DataContainerFactory extends ElementFactory {
+    match(type) {
+        return type === 'data-container';
+    }
+    createElement(data) {
+        const element = new DataContainerElement();
+        const props = data.props;
+        if (props?.id) {
+            element.props.id = props.id;
+        }
+        if (props?.name) {
+            element.props.name = props.name;
+        }
+        if (props?.caption) {
+            element.props.caption = props.caption;
+        }
+        return element;
+    }
+}
+class DataContainerProps {
+    caption;
+    id;
+    name;
+}
+
 /**
  * 当前数据元内容长度小于最小长度时，需要当前元素撑开以达到最小长度
  */
@@ -12904,6 +13057,29 @@ class PaintContent {
     }
 }
 
+/**
+ * 处理文档输入联想
+ */
+class DocInputSuggestions {
+    currentInputTextGroup;
+    currentMatchedText = '';
+    currentInputOffset = 0;
+    suggestionsList = [];
+    prepareSuggestions = [];
+    selectedIndex = -1;
+    clear() {
+        this.prepareSuggestions.length = 0;
+        this.currentInputTextGroup = undefined;
+        this.selectedIndex = -1;
+        this.currentInputOffset = 0;
+        this.currentMatchedText = '';
+    }
+    destroy() {
+        this.clear();
+        this.suggestionsList.length = 0;
+    }
+}
+
 /**
  * 当前打开的文档的上下文信息，当前文档所有的属性设置都暴露在上下文中
  */
@@ -12922,6 +13098,10 @@ class EditorContext {
     commentFlag = false;
     //留痕元素存在的标志,用于判断文档空间进行布局
     trackFlag = false;
+    //suggestionsList: Array<ISuggestionData> = [];
+    //currentSuggestionsList: Array<ISuggestionData> = [];
+    suggestions = new DocInputSuggestions();
+    onKeyDownEvent = new Subject();
     constructor(selectionState, viewOptions) {
         this.selectionState = selectionState;
         this.viewOptions = viewOptions;
@@ -12972,6 +13152,7 @@ class EditorContext {
     clear() {
         this.selectionState.clear();
         this.isDirty = false;
+        this.suggestions.clear();
         //this.clearEleDepMaps();
     }
     get defaultCtx() {
@@ -13014,6 +13195,7 @@ class EditorContext {
         //this.ele_types_handlers.length = 0;
         //this.imageLoader.clear();
         this._document = null;
+        this.suggestions.destroy();
     }
     /**
      * 切换行打印模式
@@ -13034,6 +13216,7 @@ class EditorContext {
         //删除旧节点
         oldDataElement.remove();
     }
+    currentRefreshType = null;
     get refreshType() {
         if (!this._document) {
             return null;
@@ -13491,6 +13674,10 @@ class ParagraphMeasure {
                         child.rect.width = tab - currTabX;
                     }
                 }
+                //如果当前段落行只包含当前换行元素或者段落元素，则根据当前输入设置，自动将行高度撑开到理想高度font-size*1.4
+                if (this.lineLength() === 1 && child.element && (child.element.type === 'br' || child.element.type === 'psym')) {
+                    child.rect.height = Math.ceil(options.defaultFontSize * TEXT_HEIGHT_FACTOR);
+                }
                 this.arrange();
                 this.updateHeight(child);
             },
@@ -15016,6 +15203,7 @@ class ElementReader {
         this.addFactory(TabFactory);
         this.addFactory(PermanentTeethFactory);
         this.addFactory(SVGFactory);
+        this.addFactory(DataContainerFactory);
         // this.registerReadFunc<TrackRunProps>('ins-run', (data) => {
         //     const props = new TrackRunProps(data.type);
         //     props.userId = data.userId;
@@ -15174,26 +15362,37 @@ class DocumentEvent {
         };
     }
     bindEvent() {
-        this.documentInput.onLeftEvent.subscribe(() => {
-            this.moveCursorToLeft();
-        });
-        this.documentInput.onRightEvent.subscribe(() => {
-            this.moveCursorToRight();
-        });
-        this.documentInput.onSelectAllEvent.subscribe(() => {
-            this.selectAll();
-        });
-        this.documentInput.onHomeEvent.subscribe(() => {
-            this.moveCursorToLineStart();
-        });
-        this.documentInput.onEndEvent.subscribe(() => {
-            this.moveCursorToLineEnd();
-        });
-        this.documentInput.onUpEvent.subscribe(() => {
-            this.moveCursorToUpOrDown(true);
-        });
-        this.documentInput.onDownEvent.subscribe(() => {
-            this.moveCursorToUpOrDown(false);
+        this.docCtx.onKeyDownEvent.subscribe(evt => {
+            if (!this.docCtx.selectionState.editable) {
+                return;
+            }
+            const os = ElementUtil.getOSPlatform();
+            if (evt.keyCode === 37) {
+                this.moveCursorToLeft();
+            }
+            else if (evt.keyCode === 39) {
+                this.moveCursorToRight();
+            }
+            else if (evt.keyCode === 38) {
+                this.moveCursorToUpOrDown(true);
+            }
+            else if (evt.keyCode === 40) {
+                this.moveCursorToUpOrDown(false);
+            }
+            else if (evt.keyCode === 36) {
+                this.moveCursorToLineStart();
+            }
+            else if (evt.keyCode === 35) {
+                this.moveCursorToLineEnd();
+            }
+            else if (evt.ctrlKey && evt.keyCode === 65 && os !== 'Mac') {
+                evt.preventDefault();
+                this.selectAll();
+            }
+            else if (evt.metaKey && evt.keyCode === 65 && os === 'Mac') {
+                evt.preventDefault();
+                this.selectAll();
+            }
         });
     }
     addSubEvent(sub) {
@@ -16383,15 +16582,15 @@ class DocumentInput {
     //输入内容事件
     onInputEvent = new Subject();
     //backspace 键盘事件
-    onBackspaceEvent = new Subject();
+    //onBackspaceEvent: Subject<KeyboardEvent> = new Subject();
     //delete 键盘事件
-    onDeleteEvent = new Subject();
+    //onDeleteEvent: Subject<KeyboardEvent> = new Subject();
     //enter 键盘事件
-    onEnterEvent = new Subject();
+    //onEnterEvent: Subject<void> = new Subject();
     //左键
-    onLeftEvent = new Subject();
+    //onLeftEvent: Subject<void> = new Subject();
     //右键
-    onRightEvent = new Subject();
+    //onRightEvent: Subject<void> = new Subject();
     //复制
     onCopyEvent = new Subject();
     //剪切
@@ -16399,30 +16598,31 @@ class DocumentInput {
     //粘贴
     onPasteEvent = new Subject();
     //插入换行符
-    onInsertBr = new Subject();
+    //onInsertBr: Subject<void> = new Subject();
     //ctrl+A 全选事件
-    onSelectAllEvent = new Subject();
+    //onSelectAllEvent: Subject<void> = new Subject();
     //home 事件
-    onHomeEvent = new Subject();
+    //onHomeEvent: Subject<void> = new Subject();
     //end 事件
-    onEndEvent = new Subject();
-    onUpEvent = new Subject();
-    onDownEvent = new Subject();
-    onTabKeyEvent = new Subject();
+    //onEndEvent: Subject<void> = new Subject();
+    //onUpEvent: Subject<void> = new Subject();
+    //onDownEvent: Subject<void> = new Subject();
+    //onTabKeyEvent: Subject<void> = new Subject();
+    onKeyDownEvent = new Subject();
     constructor(docCtx) {
         this.docCtx = docCtx;
     }
     composition = false;
     inputTargetStrPosition = -1;
-    inputTargetStr = undefined;
+    inputTargetStrLength = 0;
     inputEle;
     correctInputEle(ele, str, pos) {
         this.inputTargetStrPosition = pos;
-        this.inputTargetStr = str;
+        this.inputTargetStrLength = str ? str.length : 0;
         this.inputEle = ele;
     }
     getEventListener() {
-        const os = ElementUtil.getOSPlatform();
+        ElementUtil.getOSPlatform();
         return {
             input: (evt) => {
                 const target = evt.target;
@@ -16440,7 +16640,7 @@ class DocumentInput {
                 this.inputTargetStrPosition = startOffset;
                 this.inputEle = startControl;
                 if (startControl instanceof TextGroupElement) {
-                    this.inputTargetStr = startControl.text;
+                    this.inputTargetStrLength = startControl.text.length;
                 }
             },
             compositionupdate: (evt) => {
@@ -16460,60 +16660,48 @@ class DocumentInput {
                 this.composition = false;
                 this.inputEle = null;
                 this.inputTargetStrPosition = -1;
-                this.inputTargetStr = undefined;
+                this.inputTargetStrLength = 0;
             },
             keydown: (evt) => {
+                this.onKeyDownEvent.next(evt);
+                if (evt.defaultPrevented) {
+                    return;
+                }
                 const keyEvent = new KeyboradElementEvent(this.docCtx);
                 keyEvent.sourceEvent = evt;
                 if (DocumentEvent.invokeEvent('ElementKeyDown', this.docCtx.selectionState.startControl, keyEvent, 'All')) {
                     return;
                 }
-                if (!this.docCtx.selectionState.editable) {
-                    return;
-                }
-                if (evt.keyCode === 8) {
-                    this.onBackspaceEvent.next(evt);
-                }
-                else if (evt.keyCode === 13 && !evt.shiftKey) {
-                    this.onEnterEvent.next();
-                }
-                else if (evt.keyCode === 37) {
-                    this.onLeftEvent.next();
-                }
-                else if (evt.keyCode === 39) {
-                    this.onRightEvent.next();
-                }
-                else if (evt.keyCode === 38) {
-                    this.onUpEvent.next();
-                }
-                else if (evt.keyCode === 40) {
-                    this.onDownEvent.next();
-                }
-                else if (evt.keyCode === 9) {
-                    evt.preventDefault();
-                    this.onTabKeyEvent.next();
-                }
-                else if (evt.keyCode === 13 && evt.shiftKey) {
-                    evt.preventDefault();
-                    this.onInsertBr.next();
-                }
-                else if (evt.keyCode === 46) {
-                    this.onDeleteEvent.next(evt);
-                }
-                else if (evt.ctrlKey && evt.keyCode === 65 && os !== 'Mac') {
-                    evt.preventDefault();
-                    this.onSelectAllEvent.next();
-                }
-                else if (evt.metaKey && evt.keyCode === 65 && os === 'Mac') {
-                    evt.preventDefault();
-                    this.onSelectAllEvent.next();
-                }
-                else if (evt.keyCode === 36) {
-                    this.onHomeEvent.next();
-                }
-                else if (evt.keyCode === 35) {
-                    this.onEndEvent.next();
-                }
+                // if (!this.docCtx.selectionState.editable) {
+                //     return;
+                // }
+                // if (evt.keyCode === 8) {
+                //     //this.onBackspaceEvent.next(evt);
+                // } else if (evt.keyCode === 13 && !evt.shiftKey) {
+                //     //this.onEnterEvent.next();
+                // } else if (evt.keyCode === 37) {
+                //     //this.onLeftEvent.next();
+                // } else if (evt.keyCode === 39) {
+                //     //this.onRightEvent.next();
+                // } else if (evt.keyCode === 9) {
+                //     // evt.preventDefault();
+                //     // this.onTabKeyEvent.next();
+                // } else if (evt.keyCode === 13 && evt.shiftKey) {
+                //     // evt.preventDefault();
+                //     // this.onInsertBr.next();
+                // } else if (evt.keyCode === 46) {
+                //     //this.onDeleteEvent.next(evt);
+                // } else if (evt.ctrlKey && evt.keyCode === 65 && os !== 'Mac') {
+                //     // evt.preventDefault();
+                //     // this.onSelectAllEvent.next();
+                // } else if (evt.metaKey && evt.keyCode === 65 && os === 'Mac') {
+                //     // evt.preventDefault();
+                //     // this.onSelectAllEvent.next();
+                // } else if (evt.keyCode === 36) {
+                //     //this.onHomeEvent.next();
+                // } else if (evt.keyCode === 35) {
+                //     //this.onEndEvent.next();
+                // }
             },
             copy: (evt) => {
                 const event = new CopyElementEvent(this.docCtx);
@@ -16540,7 +16728,7 @@ class DocumentInput {
         const { startControl, startOffset } = this.docCtx.selectionState;
         this.onInputEvent.next({
             data: data,
-            prevInputData: this.inputTargetStr,
+            prevInputDataLength: this.inputTargetStrLength,
             composition: this.composition,
             compositionStartInfo: {
                 element: startControl,
@@ -16570,12 +16758,34 @@ class DocumentChange {
         this.documentInput.onInputEvent.subscribe(data => {
             this.newInput(data);
         });
-        this.documentInput.onBackspaceEvent.subscribe((evt) => {
-            this.onBackspace(evt);
-        });
-        this.documentInput.onEnterEvent.subscribe(() => {
-            this.onEnter();
+        this.docCtx.onKeyDownEvent.subscribe(evt => {
+            if (!this.docCtx.selectionState.editable) {
+                return;
+            }
+            if (evt.keyCode === 8) {
+                this.onBackspace(evt);
+            }
+            else if (evt.keyCode === 13 && !evt.shiftKey) {
+                this.onEnter();
+            }
+            if (evt.keyCode === 13 && evt.shiftKey) {
+                evt.preventDefault();
+                this.insertSoftBr();
+            }
+            else if (evt.keyCode === 46) {
+                this.onDeleteKeyHandler(evt);
+            }
+            if (evt.keyCode === 9) {
+                evt.preventDefault();
+                this.insertTabElement();
+            }
         });
+        /*        this.documentInput.onBackspaceEvent.subscribe((evt) => {
+                    this.onBackspace(evt)
+                });*/
+        // this.documentInput.onEnterEvent.subscribe(() => {
+        //     this.onEnter()
+        // });
         this.documentInput.onCopyEvent.subscribe((evt) => {
             this.onCopy(evt);
         });
@@ -16585,21 +16795,10 @@ class DocumentChange {
         this.documentInput.onPasteEvent.subscribe((evt) => {
             this.onPaste(evt);
         });
-        this.documentInput.onInsertBr.subscribe(() => {
-            this.insertSoftBr();
-        });
-        this.documentInput.onDeleteEvent.subscribe((evt) => {
-            this.onDeleteKeyHandler(evt);
-        });
-        this.documentInput.onTabKeyEvent.subscribe(() => {
-            this.insertTabElement();
-        });
     }
     newInput(data) {
-        if (data.composition && data.data === '啊') {
-            debugger;
-        }
-        const { startControl, startOffset, collapsed, enableTrackChanges } = this.selectionState;
+        const { startControl, startOffset, collapsed } = this.selectionState;
+        const enableTrackChanges = this.viewOptions.enableTrackChanges;
         if (!collapsed) {
             this.onInputBySelectRange(data);
             return;
@@ -16618,12 +16817,7 @@ class DocumentChange {
         //当前输入节点是在留痕区域中，但是当前关闭了审阅模式，需要拆分留痕区域，创建新输入节点
         if (!enableTrackChanges && this.isInTrackBlock(startControl)) {
             const newInput = this.splitTrackElement(startControl, startOffset);
-            const comp = data.compositionStartInfo;
-            comp.element = newInput;
-            comp.offset = 0;
-            //修正数据
-            if (data.composition)
-                this.documentInput.correctInputEle(newInput, newInput.text, 0);
+            this.correctInputEle(newInput, newInput.text, 0, data);
             this.inputTextGroup(newInput, data);
             return;
         }
@@ -16633,26 +16827,27 @@ class DocumentChange {
             }
             const siblingTextEle = startOffset === 1 ? ElementUtil.getNextSiblingElement(startControl) : ElementUtil.getPrevSiblingElement(startControl);
             if (siblingTextEle instanceof TextGroupElement) {
-                data.compositionStartInfo.offset = startOffset === 0 ? siblingTextEle.text.length : 0;
-                //修正数据
-                if (data.composition) {
-                    this.documentInput.correctInputEle(siblingTextEle, siblingTextEle.text, data.compositionStartInfo.offset);
-                }
+                const pos = startOffset === 0 ? siblingTextEle.text.length : 0;
+                this.correctInputEle(siblingTextEle, siblingTextEle.text, pos, data);
                 this.inputTextGroup(siblingTextEle, data);
             }
             else {
                 const inputTextProps = this.getDefaultTextProps(startControl, startOffset);
                 const newTextGroup = ElementUtil.getNewTextGroup(inputTextProps);
                 startControl.parent.addChild(newTextGroup, startControl.getIndex() + startOffset);
-                if (data.composition) {
-                    this.documentInput.correctInputEle(newTextGroup, '', 0);
-                }
+                this.correctInputEle(newTextGroup, '', 0, data);
                 this.inputTextGroup(newTextGroup, data);
             }
             return;
         }
         this.inputTextGroup(startControl, data);
     }
+    correctInputEle(ele, str, pos, data) {
+        this.documentInput.correctInputEle(ele, str, pos);
+        data.compositionStartInfo.element = ele;
+        data.compositionStartInfo.offset = pos;
+        data.prevInputDataLength = str.length;
+    }
     /**
      * 选中区域后进行输入
      * 需要处理将选中的区域删除后，进行输入的情况
@@ -16710,24 +16905,20 @@ class DocumentChange {
      */
     newInputTrackChanges(data, startControl, startOffset) {
         this.viewOptions.editUser.id;
-        const compInfo = data.compositionStartInfo;
+        data.compositionStartInfo;
         if (this.isInCorrectTrackRegion(startControl, TrackRunTypeEnum.Inserted)) {
             return;
         }
         if (this.isInTrackBlock(startControl)) {
             const newInput = this.createNewTrackInput(startControl, startOffset, TrackRunTypeEnum.Inserted);
-            compInfo.offset = 0;
-            compInfo.element = newInput;
-            this.documentInput.correctInputEle(newInput, '', 0);
+            this.correctInputEle(newInput, '', 0, data);
             this.inputTextGroup(newInput, data);
             return;
         }
         else {
             const { trackElement, newTextGroup } = this.createTextTrackElement(startControl, null, TrackRunTypeEnum.Inserted);
             this.insertElement(startControl, startOffset, [trackElement]);
-            compInfo.offset = 0;
-            compInfo.element = newTextGroup;
-            this.documentInput.correctInputEle(newTextGroup, '', 0);
+            this.correctInputEle(newTextGroup, '', 0, data);
             this.inputTextGroup(newTextGroup, data);
             return;
         }
@@ -16770,24 +16961,23 @@ class DocumentChange {
      * @returns
      */
     getDefaultTextProps(startControl, offset) {
-        let textProps = this.getDefaultTextPropsByOptions();
-        if (startControl instanceof TextGroupElement) {
-            textProps = startControl.props;
-        }
         const dataEle = ElementUtil.getDataElement(startControl);
         if (dataEle && IsInSideDataElement(startControl, offset)) {
             return dataEle.props.valueTextProps;
         }
-        return textProps;
+        else {
+            return this.getDefaultTextPropsByOptions();
+        }
     }
     /**
      * 根据选项配置返回创建文本的默认文本属性
      * @private
      */
     getDefaultTextPropsByOptions() {
+        const { defaultFontSize, defaultFontName, currentFontSize, currentFontName } = this.viewOptions;
         const props = new TextProps();
-        props.fontName = this.viewOptions.defaultFontName;
-        props.fontSize = this.viewOptions.defaultFontSize;
+        props.fontSize = currentFontSize > 0 ? currentFontSize : defaultFontSize;
+        props.fontName = currentFontName ? currentFontName : defaultFontName;
         props.color = this.viewOptions.defaultColor;
         return props;
     }
@@ -16850,15 +17040,20 @@ class DocumentChange {
         return trackElement;
     }
     inputTextGroup(text, data) {
-        const prevInputData = data.prevInputData || '';
-        const prevInputDataLength = prevInputData.length;
-        if (!data.compositionStartInfo) {
-            throw new Error('compositionStartInfo is null');
-        }
+        const prevInputDataLength = data.prevInputDataLength ?? 0;
         const { element, offset } = data.compositionStartInfo;
+        //处理当前输入字体大小和名称；当前手动更改了字体信息,需要重新创建文本元素进行输入处理
+        if (text.props.fontSize !== this.viewOptions.currentFontSize || text.props.fontName !== this.viewOptions.currentFontName) {
+            //创建新输入项
+            const newInput = this.createNewInputText();
+            //插入到文档
+            this.insertElement(element, offset, [newInput]);
+            this.correctInputEle(newInput, '', 0, data);
+            this.inputTextGroup(newInput, data);
+            return;
+        }
         let startInputOffset = offset;
         const deleteCount = data.composition ? text.textMeasures.length - prevInputDataLength : 0;
-        //startInputOffset -= prevInputDataLength;
         if (!(element instanceof TextGroupElement)) {
             //当前选中元素位于输入元素是起始还是结束位置，如果位于起始位置，则输入偏移量为0,否则为未变更之前的内容length
             if (ElementUtil.getNextSiblingElement(element) === text) {
@@ -17061,7 +17256,7 @@ class DocumentChange {
                 const currPara = ElementUtil.getParentByType(control, ParagraphElement);
                 //表明是紧挨着的两个段落，要进行段落合并
                 if (ElementUtil.getPrevSiblingElement(currPara) === prevPara) {
-                    if (this.selectionState.enableTrackChanges) {
+                    if (this.viewOptions.enableTrackChanges) {
                         this.selectionState.resetRange(prevEle, -1);
                         return;
                     }
@@ -17152,7 +17347,7 @@ class DocumentChange {
                 const currPara = ElementUtil.getParentByType(control, ParagraphElement);
                 //表明是紧挨着的两个段落，要进行段落合并
                 if (ElementUtil.getNextSiblingElement(currPara) === nextPara) {
-                    if (this.selectionState.enableTrackChanges) {
+                    if (this.viewOptions.enableTrackChanges) {
                         this.selectionState.resetRange(nextEle, 0);
                         return;
                     }
@@ -17214,7 +17409,7 @@ class DocumentChange {
         return dataEle.length === 2;
     }
     onDeleteText(text, offset, len) {
-        if (this.selectionState.enableTrackChanges) {
+        if (this.viewOptions.enableTrackChanges) {
             this.updateDeletedTrackText(text, offset, len);
         }
         else {
@@ -17222,7 +17417,7 @@ class DocumentChange {
         }
     }
     onDeleteItem(item) {
-        if (this.selectionState.enableTrackChanges) {
+        if (this.viewOptions.enableTrackChanges) {
             //删除符号不进行留痕
             if (item.type === 'psym') {
                 return;
@@ -17313,6 +17508,16 @@ class DocumentChange {
             return newTextGroup;
         }
     }
+    /**
+     * 创建一个待输入的文本元素
+     * @private
+     */
+    createNewInputText() {
+        const { startControl, startOffset } = this.selectionState;
+        const textProps = this.getDefaultTextProps(startControl, startOffset);
+        const newInput = ElementUtil.getNewTextGroup(textProps);
+        return newInput;
+    }
     getNextTrackElement(target, trackType) {
         let trackElement = ElementUtil.getNextSiblingTrackElement(target, trackType, this.viewOptions.editUser.id);
         if (!trackElement) {
@@ -17402,9 +17607,16 @@ class DocumentChange {
      * @returns
      */
     insertTable(tb) {
+        this.insertLayoutContainer(tb);
+    }
+    /**
+     * 插入布局容器，比如表格、数据容器等
+     * @param ele
+     */
+    insertLayoutContainer(ele) {
         const breakPara = this.splitCurrentParagraph();
-        breakPara.parent.addChild(tb, breakPara.getIndex());
-        this.selectionState.resetRange(tb, 0);
+        breakPara.parent.addChild(ele, breakPara.getIndex());
+        this.selectionState.resetRange(ele, 0);
     }
     /**
      * 分割当前段落用于插入表格或者粘贴的内容
@@ -17466,7 +17678,7 @@ class DocumentChange {
             }
             else if (childTarget instanceof BranchElement) {
                 //留痕模式
-                if (this.selectionState.enableTrackChanges) {
+                if (this.viewOptions.enableTrackChanges) {
                     this.deleteRange(childRange);
                 }
                 else {
@@ -17974,7 +18186,7 @@ class DocumentChange {
                 data: text,
                 compositionStartInfo: {
                     element: startControl,
-                    offset: startOffset
+                    offset: startOffset,
                 }
             });
         }
@@ -17991,6 +18203,31 @@ class DocumentChange {
             this.selectionState.resetRange(breakPara, 0);
         }
     }
+    /**
+     * 向当前光标追加文本
+     * @param appendStr
+     * @param inputOffset
+     * @param replaceLength
+     * @private
+     */
+    appendText(appendStr, replaceText) {
+        const { startControl, startOffset } = this.selectionState;
+        if (startControl instanceof TextGroupElement) {
+            const data = {
+                data: appendStr,
+                prevInputDataLength: startControl.text.length - replaceText.length,
+                composition: true,
+                compositionStartInfo: {
+                    element: startControl,
+                    offset: startOffset - replaceText.length
+                }
+            };
+            this.inputTextGroup(startControl, data);
+        }
+        else {
+            console.warn("当前光标所在的元素类型不正确，不能进行追加文本操作");
+        }
+    }
     /**
      * 设置当前段落项目符号类型
      */
@@ -18018,7 +18255,7 @@ class DocumentChange {
     /**
      * 插入批注
      */
-    insertComment() {
+    insertComment(text) {
         const { startControl, startOffset, endControl, endOffset, collapsed } = this.selectionState;
         if (collapsed || !startControl || !endControl) {
             return;
@@ -18035,7 +18272,7 @@ class DocumentChange {
         endCommMark.props.markType = 'end';
         this.insertElement(endControl, endOffset, [endCommMark]);
         this.insertElement(startControl, startOffset, [startCommMark]);
-        startCommMark.props.text = '插入测试批注信息' + new Date();
+        startCommMark.props.text = text;
         // const commContent = new CommContentElement();
         // commContent.props.id = id;
         // commContent.props.createId = this.viewOptions.editUser.id;
@@ -18640,13 +18877,19 @@ class ElementTrackManage {
             //前后是连续的操作
             const { format: currFormat } = currOp.ops;
             const { format: prevFormat } = prevOp.ops;
+            //const applyProps = {};
             Object.keys(currFormat).forEach(key => {
                 const currValue = currFormat[key].newValue;
-                const prevValue = prevFormat[key].newValue;
-                if (CommonUtil.isEqual(currValue, prevValue)) {
+                if (prevFormat[key] && CommonUtil.isEqual(currValue, prevFormat[key])) {
                     return;
                 }
-                prevFormat[key].newValue = currValue;
+                if (prevFormat[key]) {
+                    prevFormat[key].newValue = currValue;
+                }
+                else {
+                    prevFormat[key] = { oldValue: currFormat[key].oldValue, newValue: currValue };
+                }
+                //applyProps[key] = currValue;
             });
             return true;
         }
@@ -20089,7 +20332,8 @@ function calculateDistance(a, b) {
 
 class DocEditor {
     svgContainer;
-    //private docContent!: HTMLElement;
+    //设置vue 不允许代理
+    __v_skip = true;
     contentCtx;
     viewOptions;
     docCtx;
@@ -20123,10 +20367,18 @@ class DocEditor {
     onDestroy = new Subject();
     beforeNodePatch = new Subject();
     afterNodePatch = new Subject();
+    //文档内容输入改变的时候，触发此事件(输入、删除文字)，可以监听该事件，实现候选词、联想词等功能
+    onTextChanged = new Subject();
+    //联想词处理：文档处理之前
+    onSuggestionsProcess = new Subject();
     //自定义事件传递消息
     eventBus;
     editInput;
     scrollContainer;
+    // //输入候选建议词列表
+    // private suggestions: Array<ISuggestionData> = [];
+    //光标keydown事件
+    onKeyDownEvent = new Subject();
     constructor(svgContainer) {
         this.svgContainer = svgContainer;
         this.createCanvasContext();
@@ -20181,6 +20433,17 @@ class DocEditor {
         });
         this.documentEvent.trackTipsChanged.subscribe(data => {
         });
+        this.documentInput.onKeyDownEvent.subscribe((evt) => {
+            this.onKeyDownEvent.next(evt);
+            if (evt.defaultPrevented) {
+                return;
+            }
+            this.processKeyDownEvent(evt);
+            if (evt.defaultPrevented) {
+                return;
+            }
+            this.docCtx.onKeyDownEvent.next(evt);
+        });
         this.docCtx.docChange = this.documentChange;
         this.docCtx.syncRefresh = () => {
             this.flushToSchedule();
@@ -20197,14 +20460,19 @@ class DocEditor {
         const docPagesFunc = this.getVNode();
         const calendarFunc = this.renderCalendar();
         const menuFunc = this.renderContextmenu();
+        const suggestionFunc = this.renderSuggestions();
         const ruleFunc = new DocRule(this.docCtx);
         const onSizeChange = () => {
             this.adjustPageLayout();
         };
-        window.addEventListener('resize', onSizeChange);
+        // window.addEventListener('resize', onSizeChange);
         this.onDestroy.subscribe(() => {
-            window.removeEventListener('resize', onSizeChange);
+            ro.unobserve(this.svgContainer);
+        });
+        const ro = new ResizeObserver(entries => {
+            onSizeChange();
         });
+        ro.observe(this.svgContainer);
         return {
             render: () => {
                 const docContentVNode = docPagesFunc.render();
@@ -20233,7 +20501,7 @@ class DocEditor {
                             'transform': `scale(${this.viewOptions.scale})`
                         }
                     },
-                    children: [inputVNode, listVNode.render(), calendarFunc.render(), menuFunc.render()]
+                    children: [inputVNode, listVNode.render(), calendarFunc.render(), menuFunc.render(), suggestionFunc.render()]
                 };
                 return {
                     sel: 'div.svg-container',
@@ -20244,8 +20512,14 @@ class DocEditor {
                         hook: {
                             insert: (vNode) => {
                                 this.svgContainer = vNode.elm;
+                                ro.observe(this.svgContainer);
                                 this.updateViewOption();
                             }
+                        },
+                        on: {
+                            resize: () => {
+                                console.log('resize');
+                            }
                         }
                     },
                     children: [
@@ -20255,7 +20529,7 @@ class DocEditor {
                                 style: {
                                     overflow: 'auto',
                                     position: 'relative',
-                                    height: this.viewOptions.viewSettings.height + 'px'
+                                    height: "100%"
                                 },
                                 on: {
                                     scroll: (evt) => {
@@ -20263,6 +20537,9 @@ class DocEditor {
                                         this.viewOptions.pageOffset.x = target.scrollLeft;
                                         this.viewOptions.pageOffset.y = target.scrollTop;
                                         this.onChange();
+                                    },
+                                    resize: () => {
+                                        console.log('resize');
                                     }
                                 },
                                 hook: {
@@ -20381,10 +20658,9 @@ class DocEditor {
         if (this.docCtx.refreshType === null) {
             return;
         }
-        let rePaint = this.docCtx.refreshType === 'content';
-        if (rePaint) {
+        this.docCtx.currentRefreshType = this.docCtx.refreshType;
+        if (this.docCtx.currentRefreshType) {
             this.onBeforeRefreshDocument.next();
-            this.documentSelection.clearSnapshot();
             this.docComment.readComments();
             suppressTracking(() => {
                 this.documentPaginator.rePages();
@@ -20404,14 +20680,33 @@ class DocEditor {
         let ssChanged = false;
         try {
             //防止由于选区不正确导致的错误，导致后续的当前任务无法释放
-            ssChanged = this.documentSelection.updateSelectionState();
+            this.documentSelection.updateSelectionState();
+            ssChanged = this.documentSelection.isSelectionChanged();
         }
         catch (e) {
             console.error(e);
         }
         this.selectionOverlays.getSelectionTreeData();
+        ssChanged && this.updateInputFont();
         ssChanged && this.selectionChanged.next(this.documentSelection.selectionState);
         ssChanged && this.documentEvent.invokeCursor(this.selectionState.startControl);
+        this.documentSelection.clearSnapshot();
+        this.documentSelection.takeSnapshot();
+    }
+    /**
+     * 根据当前选区，更新待输入文本字体信息
+     * @private
+     */
+    updateInputFont() {
+        const { startControl } = this.selectionState;
+        if (startControl instanceof TextGroupElement) {
+            this.viewOptions.currentFontSize = startControl.props.fontSize;
+            this.viewOptions.currentFontName = startControl.props.fontName;
+        }
+        else {
+            this.viewOptions.currentFontSize = this.viewOptions.defaultFontSize;
+            this.viewOptions.currentFontName = this.viewOptions.defaultFontName;
+        }
     }
     hitInfoChanged(hitInfo) {
         this.documentSelection.setSelectionState(hitInfo);
@@ -20707,6 +21002,9 @@ class DocEditor {
         this.documentChange.insertTable(tb);
         return tb;
     }
+    insertLayoutContainer(ele) {
+        this.documentChange.insertLayoutContainer(ele);
+    }
     /**
      * 插入软换行符
      */
@@ -20891,8 +21189,8 @@ class DocEditor {
     /**
      * 插入批注
      */
-    insertComment() {
-        this.documentChange.insertComment();
+    insertComment(text) {
+        this.documentChange.insertComment(text);
     }
     /**
      * 清除所有批注
@@ -20957,16 +21255,12 @@ class DocEditor {
     canRedo() {
         return this.historyMange.canRedo;
     }
-    switchTrackChanges(eleCtx = null) {
+    /**
+     * 切换文档留痕开关
+     */
+    switchTrackChanges() {
         this.selectionState.clear();
-        eleCtx = eleCtx || this.docCtx.document;
-        const body = eleCtx.treeFind(item => item instanceof DocumentBodyElement);
-        if (body) {
-            body.trackChanges = !body.trackChanges;
-        }
-        else {
-            throw new Error('未找到doc-body');
-        }
+        this.viewOptions.enableTrackChanges = !this.viewOptions.enableTrackChanges;
     }
     get trackTipsChanged() {
         return this.documentEvent.trackTipsChanged;
@@ -21311,14 +21605,18 @@ class DocEditor {
             if (this.viewOptions.reviewWindowWidth > 0) {
                 this.viewOptions.reviewWindowWidth = 0;
                 //刷新页面
-                this.docCtx.onNextView(() => { this.adjustPageLayout(); });
+                this.docCtx.onNextView(() => {
+                    this.adjustPageLayout();
+                });
             }
         }
         else {
             if (this.viewOptions.reviewWindowWidth === 0) {
                 this.viewOptions.reviewWindowWidth = 250;
                 //刷新页面
-                this.docCtx.onNextView(() => { this.adjustPageLayout(); });
+                this.docCtx.onNextView(() => {
+                    this.adjustPageLayout();
+                });
             }
         }
     }
@@ -21414,11 +21712,13 @@ class DocEditor {
                             //ckbVNode.data.attrs['checked'] = true;
                         }
                         return {
-                            sel: 'div', data: { on: {
+                            sel: 'div', data: {
+                                on: {
                                     click: () => {
                                         onChangeHandler(item.code);
                                     }
-                                } }, children: [ckbVNode, {
+                                }
+                            }, children: [ckbVNode, {
                                     sel: 'label',
                                     data: {},
                                     text: item.value
@@ -21426,18 +21726,12 @@ class DocEditor {
                         };
                     });
                     return {
-                        sel: 'div#data-list-container',
+                        sel: 'div.data-list-container',
                         data: {
                             style: {
                                 position: 'absolute',
                                 left: (position.x - 10) + 'px',
                                 top: position.y + 5 + position.height + 'px',
-                                'min-width': '100px',
-                                'background-color': 'white',
-                                'z-index': '1000',
-                                'border-radius': '5px',
-                                'box-shadow': '0 0 5px 0 rgba(0,0,0,0.2)',
-                                'user-select': 'none',
                             },
                             hook: {
                                 insert: (vnode) => {
@@ -21534,6 +21828,44 @@ class DocEditor {
                 if (!editor.menusData) {
                     return null;
                 }
+                const renderMenu = (menus) => {
+                    if (!menus) {
+                        return [];
+                    }
+                    return [
+                        {
+                            sel: 'ul.editor-overlays-menus',
+                            data: {},
+                            children: menus.map((menu) => renderMenuItem(menu))
+                        }
+                    ];
+                };
+                const renderSubItems = (menu) => {
+                    if (!menu.subItems)
+                        return [];
+                    return renderMenu(menu.subItems);
+                };
+                const renderMenuItem = (menu) => {
+                    return {
+                        sel: 'li' + (menu.subItems && menu.subItems.length ? '.sub' : ''),
+                        data: {
+                            on: {
+                                click: () => {
+                                    menu.click?.();
+                                    editor.menusData = null;
+                                    editor.onChange();
+                                }
+                            }
+                        },
+                        children: [{
+                                sel: 'span',
+                                data: {},
+                                text: menu.caption
+                            },
+                            ...renderSubItems(menu)
+                        ]
+                    };
+                };
                 return {
                     sel: 'div.editor-contextmenu',
                     data: {
@@ -21542,27 +21874,7 @@ class DocEditor {
                             top: editor.menusData.position.y + 'px',
                         }
                     },
-                    children: [
-                        {
-                            sel: 'ul.editor-overlays-menus',
-                            data: {},
-                            children: editor.menusData.menus.map((menu) => {
-                                return {
-                                    sel: 'li',
-                                    data: {
-                                        on: {
-                                            click: (evt) => {
-                                                menu.eventObj["onClick"]();
-                                                editor.menusData = null;
-                                                editor.onChange();
-                                            }
-                                        }
-                                    },
-                                    text: menu.caption
-                                };
-                            })
-                        }
-                    ]
+                    children: renderMenu(editor.menusData.menus)
                 };
             }
         };
@@ -21584,7 +21896,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.2";
+        return "2.2.4";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -21667,6 +21979,7 @@ class DocEditor {
     readDocChangeLog() {
         //获取文档的变更日志
         const ops = generatePatch(this.docCtx.document, false);
+        //1.处理批注删除不对称的问题
         for (let i = 0; i < ops.length; i++) {
             const op = ops[i];
             if ('delete' in op.ops) {
@@ -21693,6 +22006,192 @@ class DocEditor {
                 }
             }
         }
+        //处理文字输入
+        if (this.viewOptions.enableSuggestions && ops.length && ops.every(op => 'delText' in op.ops || 'insText' in op.ops || ('insert' in op.ops && op.ops.insert.type === 'text'))) {
+            this.processSuggestionsHandle();
+        }
+        else {
+            this.docCtx.suggestions.clear();
+        }
+    }
+    /**
+     * 处理候选词
+     * @private
+     */
+    processSuggestionsHandle() {
+        this.docCtx.suggestions.clear();
+        //this.suggestionSelectIndex.value = -1;
+        const sub = this.selectionChanged.subscribe(() => {
+            this.createAutoCompleteOptions();
+        });
+        sub.once = true;
+    }
+    createAutoCompleteOptions() {
+        if (!this.viewOptions.enableSuggestions || !this.selectionState.editable) {
+            return;
+        }
+        if (this.selectionState.collapsed && this.selectionState.startControl instanceof TextGroupElement) {
+            const { startControl, startOffset } = this.selectionState;
+            const text = startControl.text;
+            //根据标点符号分割文本
+            let findText = text.substring(0, startOffset);
+            //循环当前字符串，根据startOffset向前寻找，直到找到标点符号
+            for (let i = startOffset; i >= 0; i--) {
+                const char = text.charAt(i);
+                if (char.match(/[\s,，。？！；：、]/)) {
+                    findText = text.substring(i + 1, startOffset);
+                    break;
+                }
+            }
+            //结尾为标点符号
+            if (!findText.length) {
+                return;
+            }
+            const filterSuggestions = this.docCtx.suggestions.suggestionsList.filter(item => item.label.includes(findText));
+            const data = {
+                filterSuggestions,
+                inputTextGroup: startControl,
+                inputOffset: startOffset,
+                findText
+            };
+            this.onSuggestionsProcess.next(data);
+            this.docCtx.suggestions.prepareSuggestions.push(...data.filterSuggestions);
+            this.docCtx.suggestions.currentInputTextGroup = data.inputTextGroup;
+            this.docCtx.suggestions.currentInputOffset = data.inputOffset;
+            this.docCtx.suggestions.currentMatchedText = data.findText;
+            //this.suggestions.push('文本输入1', '文本输入2', '文本输入3');
+        }
+    }
+    processKeyDownEvent(evt) {
+        if (evt.keyCode === 38 || evt.keyCode === 40) {
+            if (this.docCtx.suggestions.prepareSuggestions.length) {
+                this.onSuggestionsKeydown(evt);
+            }
+        }
+        else if (evt.keyCode === 27) {
+            if (this.docCtx.suggestions.prepareSuggestions.length) {
+                evt.preventDefault();
+                this.docCtx.suggestions.clear();
+                this.onPatchVNodeSubject.next();
+            }
+        }
+        else if (evt.keyCode === 13) {
+            if (this.docCtx.suggestions.prepareSuggestions.length) {
+                evt.preventDefault();
+                const suggestions = this.docCtx.suggestions;
+                const suggestion = suggestions.prepareSuggestions[suggestions.selectedIndex];
+                if (suggestion) {
+                    this.insertSuggestion(suggestion);
+                    suggestions.clear();
+                    this.onPatchVNodeSubject.next();
+                }
+                else {
+                    suggestions.clear();
+                    this.onPatchVNodeSubject.next();
+                }
+            }
+        }
+    }
+    /**
+     * 处理候选词，键盘选择定位
+     * @private
+     */
+    onSuggestionsKeydown(evt) {
+        evt.preventDefault();
+        let index = this.docCtx.suggestions.selectedIndex;
+        if (evt.keyCode === 38) {
+            index--;
+        }
+        else {
+            index++;
+        }
+        if (index < 0) {
+            index = this.docCtx.suggestions.prepareSuggestions.length - 1;
+        }
+        else if (index >= this.docCtx.suggestions.prepareSuggestions.length) {
+            index = 0;
+        }
+        this.docCtx.suggestions.selectedIndex = index;
+        this.onPatchVNodeSubject.next();
+    }
+    /**
+     * 渲染联想、候选词
+     * @private
+     */
+    renderSuggestions() {
+        const editor = this;
+        return {
+            render() {
+                if (!editor.docCtx.suggestions.prepareSuggestions || !editor.viewOptions.enableSuggestions) {
+                    editor.docCtx.suggestions.clear();
+                    return null;
+                }
+                const cursorPos = editor.selectionState.cursorPos;
+                if (!cursorPos) {
+                    return null;
+                }
+                const renderSuggestion = (suggestions) => {
+                    if (!suggestions || !suggestions.length) {
+                        return [];
+                    }
+                    return [
+                        {
+                            sel: 'ul.editor-suggestions',
+                            data: {
+                                hook: {
+                                    insert: (vNode) => {
+                                        const elm = vNode.elm;
+                                        elm.focus();
+                                    }
+                                },
+                                on: {
+                                    keydown: (evt) => {
+                                        console.log("ul.editor-suggestions", evt);
+                                    }
+                                }
+                            },
+                            children: suggestions.map((suggestion, index) => renderSuggestionItem(suggestion, index))
+                        }
+                    ];
+                };
+                const renderSuggestionItem = (suggestion, index) => {
+                    return {
+                        sel: 'li' + (index === editor.docCtx.suggestions.selectedIndex ? '.hovered' : ''),
+                        data: {
+                            on: {
+                                click: () => {
+                                    editor.insertSuggestion(suggestion);
+                                }
+                            }
+                        },
+                        children: [{
+                                sel: 'span',
+                                data: {},
+                                text: suggestion.label
+                            }]
+                    };
+                };
+                return {
+                    sel: 'div.editor-suggestions-container',
+                    data: {
+                        style: {
+                            left: cursorPos.x + 'px',
+                            top: cursorPos.y + cursorPos.height + 'px',
+                        }
+                    },
+                    children: renderSuggestion(editor.docCtx.suggestions.prepareSuggestions)
+                };
+            }
+        };
+    }
+    insertSuggestion(suggestion) {
+        if (suggestion.action) {
+            suggestion.action(suggestion);
+        }
+        else {
+            const text = suggestion.value ? suggestion.value : suggestion.label;
+            this.documentChange.appendText(text, this.docCtx.suggestions.currentMatchedText);
+        }
     }
 }
 
@@ -26845,7 +27344,7 @@ class DocumentPrintOffscreenBase {
     afterPrint = new Subject();
     constructor() {
         this.viewOptions = new ViewOptions();
-        this.viewOptions.copyRightInfo = '万达信息电子病历编辑器,www.wondersgroup.com';
+        this.viewOptions.copyRightInfo = '';
         this.viewOptions.showCharRect = true;
         this.viewOptions.drawCharRectColor = 'green';
         this.viewOptions.showLineRect = true;
@@ -27004,27 +27503,25 @@ function runTextLineRender(ele, data) {
 const deleteCurrentParagraph = (evt) => {
     const { selectionState, ctx: { viewOptions }, currentElement } = evt;
     evt.menus.push({
-        icon: 'DeleteTable', caption: '删除段落', eventObj: {
-            onClick: (cevt) => {
-                selectionState.clear();
-                const psymbol = ElementUtil.getLastLeafElement(currentElement);
-                const nextFocusableEle = ElementUtil.getRecursionNextSiblingElement(psymbol, false, true, viewOptions);
-                const parentContainer = currentElement.parent;
-                if (nextFocusableEle) {
-                    if (nextFocusableEle.parent === parentContainer) {
-                        selectionState.resetRange(nextFocusableEle, 0);
-                    }
-                    else {
-                        selectionState.resetRange(parentContainer, 0);
-                    }
+        caption: '删除段落', click: () => {
+            selectionState.clear();
+            const psymbol = ElementUtil.getLastLeafElement(currentElement);
+            const nextFocusableEle = ElementUtil.getRecursionNextSiblingElement(psymbol, false, true, viewOptions);
+            const parentContainer = currentElement.parent;
+            if (nextFocusableEle) {
+                if (nextFocusableEle.parent === parentContainer) {
+                    selectionState.resetRange(nextFocusableEle, 0);
                 }
                 else {
                     selectionState.resetRange(parentContainer, 0);
-                    //selectionState.clear();
                 }
-                currentElement.remove();
-                currentElement.destroy();
             }
+            else {
+                selectionState.resetRange(parentContainer, 0);
+                //selectionState.clear();
+            }
+            currentElement.remove();
+            currentElement.destroy();
         }
     });
 };
@@ -27048,39 +27545,24 @@ const deleteCurrentParagraph = (evt) => {
 //         }
 //     });
 // };
-const setDataElementProps = (evt) => {
-    evt.menus.push({
-        icon: 'Settings', caption: '内容控制设置', eventObj: {
-            onClick: (e) => {
-                console.log('点击了');
-            }
-        }
-    });
-};
 const onTableContextmenu = (evt) => {
     const { selectionState, ctx: { viewOptions }, currentElement } = evt;
     if (TableUtil.canDeleteTable(selectionState)) {
         evt.menus.push({
-            icon: 'DeleteTable', caption: '删除表格', eventObj: {
-                onClick: (cevt) => {
-                    selectionState.clear();
-                    const prevEle = ElementUtil.getRecursionPrevSiblingElement(currentElement, false, true, viewOptions);
-                    if (prevEle) {
-                        selectionState.resetRange(prevEle, -1);
-                    }
-                    currentElement.remove();
-                    currentElement.destroy();
+            caption: '删除表格', click: () => {
+                selectionState.clear();
+                const prevEle = ElementUtil.getRecursionPrevSiblingElement(currentElement, false, true, viewOptions);
+                if (prevEle) {
+                    selectionState.resetRange(prevEle, -1);
                 }
+                currentElement.remove();
+                currentElement.destroy();
             }
         });
     }
     if (TableUtil.canMergeCells(selectionState)) {
         evt.menus.push({
-            icon: 'MergeDuplicate', caption: '合并单元格', eventObj: {
-                onClick: (cevt) => {
-                    TableUtil.mergeCells(selectionState);
-                }
-            }
+            caption: '合并单元格', click: () => { TableUtil.mergeCells(selectionState); }
         });
     }
     if (TableUtil.canSplitCell(selectionState)) {
@@ -27092,27 +27574,19 @@ const onTableContextmenu = (evt) => {
         //     }
         // });
         evt.menus.push({
-            icon: 'Combine', caption: '合并单元格还原', eventObj: {
-                onClick: (cevt) => {
-                    TableUtil.restoreCell(selectionState);
-                }
-            }
+            caption: '拆分单元格', click: () => { TableUtil.restoreCell(selectionState); }
         });
     }
     evt.menus.push({
-        icon: "Insert", caption: '上方插入段落', eventObj: {
-            onClick: (cevt) => {
-                currentElement.parent.addChild(ParagraphElement.createElement(), currentElement.getIndex());
-                currentElement.refreshView();
-            }
+        caption: '上方插入段落', click: () => {
+            currentElement.parent.addChild(ParagraphElement.createElement(), currentElement.getIndex());
+            currentElement.refreshView();
         }
     });
     evt.menus.push({
-        icon: "Insert", caption: '下方插入段落', eventObj: {
-            onClick: (cevt) => {
-                currentElement.parent.addChild(ParagraphElement.createElement(), currentElement.getIndex() + 1);
-                currentElement.refreshView();
-            }
+        caption: '下方插入段落', click: () => {
+            currentElement.parent.addChild(ParagraphElement.createElement(), currentElement.getIndex() + 1);
+            currentElement.refreshView();
         }
     });
     evt.menus = removeDuplicatesEvent(evt.menus);
@@ -27128,5 +27602,5 @@ function removeDuplicatesEvent(events) {
     return arr;
 }
 
-export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, CopyElementEvent, DOMEventSource, DOMSubscription, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocEditor, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentInput, DocumentPaginator, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementReader, ElementSerialize, ElementUtil, EventBus, EventMap, EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageBreakElement, PageBreakFactory, PageBreakRenderObject, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PasteElementEvent, PermanentTeethElement, PermanentTeethFactory, PermanentTeethProps, PermanentTeethRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RowMinHeight, RunElementFactory, SVGElement, SVGFactory, SVGProps, SVGRenderObject, SelectionOverlays, SelectionRange, SelectionState, Subject, SubjectSubscription, Subscription, TabElement, TabFactory, TabRenderObject, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TextUnitsHolder, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, addReturn, clearChildrenRenderCache, clearTraces, cloneChildren, cloneElementBase, defaultParaHanging, deleteCurrentParagraph, docOpsMap, elementTypeEventHandler, exportDecoratorHTML, falseChar, fontMapFunc, formatEle, fromEvent, generatePatch, getCalleeName, getFocusTextSegment, inputText, insertEle, invokeTypeHandler, isDate, logUpdateEleProps, objectToString$4 as objectToString, onTableContextmenu, onceTask, parser, reactiveMap, removeEle, removeText, renderErrorTip, renderUnderWavyLine, runTextLineRender, setChildrenModifyFlag, setDataElementProps, setNotifyChangedCallback, setTraceTrackingFlag, suppressTracking, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
+export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, CopyElementEvent, DOMEventSource, DOMSubscription, DataContainerElement, DataContainerFactory, DataContainerProps, DataContainerRenderObject, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocEditor, DocInputSuggestions, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentInput, DocumentPaginator, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementReader, ElementSerialize, ElementUtil, EventBus, EventMap, EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LostCursorEvent, MarginProps, ModifyFlag, MouseElementEvent, MousedownElementEvent, MuiltBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageBreakElement, PageBreakFactory, PageBreakRenderObject, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PasteElementEvent, PermanentTeethElement, PermanentTeethFactory, PermanentTeethProps, PermanentTeethRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RowMinHeight, RunElementFactory, SVGElement, SVGFactory, SVGProps, SVGRenderObject, SelectionOverlays, SelectionRange, SelectionState, Subject, SubjectSubscription, Subscription, TEXT_HEIGHT_FACTOR, TabElement, TabFactory, TabRenderObject, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TextUnitsHolder, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, addReturn, clearChildrenRenderCache, clearTraces, cloneChildren, cloneElementBase, defaultParaHanging, deleteCurrentParagraph, docOpsMap, elementTypeEventHandler, exportDecoratorHTML, falseChar, fontMapFunc, formatEle, fromEvent, generatePatch, getCalleeName, getFocusTextSegment, inputText, insertEle, invokeTypeHandler, isDate, logUpdateEleProps, objectToString$4 as objectToString, onTableContextmenu, onceTask, parser, reactiveMap, removeEle, removeText, renderErrorTip, renderUnderWavyLine, runTextLineRender, setChildrenModifyFlag, setNotifyChangedCallback, setTraceTrackingFlag, suppressTracking, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, validateDataEle, validateDataEleRenderObj, validateInlineInputRenderObj, watchChanged };
 //# sourceMappingURL=index.js.map