@hailin-zheng/editor-core 1.0.7 → 1.0.10

package/{lib/framework/document-combine.js → src/med_editor/framework/document-combine.ts}

@@ -1,5 +1,7 @@
 import { DocumentBodyElement } from "./impl/document/doc-body-impl";
 import { DocumentBodyPartElement } from "./impl/document/doc-body-part-impl";
+import { DocumentElement } from "./impl/document/doc-impl";
+
 /**
  * 文档合并
  */
@@ -8,33 +10,35 @@ export class DocumentCombine {
      * 合并模板文档
      * 用于设置合并后，页眉页脚等统一部分
      */
-    mainTemplate;
-    docParts = [];
+    mainTemplate!: DocumentElement
+
+    docParts: Array<{ doc: DocumentElement, docId: string }> = [];
     /**
      * 添加需要合并的文档部分
      */
-    add(docPart, id) {
-        this.docParts.push({ doc: docPart, docId: id });
+    add(docPart: DocumentElement, id: string): void {
+        this.docParts.push({ doc: docPart, docId: id })
     }
-    dispose() {
+
+    dispose(): void {
         this.docParts.length = 0;
     }
+
     /**
      * 用于合并文档计算
      */
-    load() {
+    load(): DocumentElement {
         const template = this.mainTemplate.clone();
-        const body = template.find((item) => item instanceof DocumentBodyElement);
+        const body = template.find((item) => item instanceof DocumentBodyElement) as DocumentBodyElement;
         body.clearItems();
         for (let i = 0; i < this.docParts.length; i++) {
             const part = this.docParts[i];
             const docPartContainer = new DocumentBodyPartElement();
             docPartContainer.props.partId = part.docId;
-            const docPartBody = part.doc.find(item => item instanceof DocumentBodyElement);
+            const docPartBody = part.doc.find(item => item instanceof DocumentBodyElement) as DocumentBodyElement
             docPartContainer.addChild(docPartBody.clone(true));
-            body.addChild(docPartContainer);
+            body.addChild(docPartContainer)
         }
         return template;
     }
-}
-//# sourceMappingURL=document-combine.js.map
+}

package/{lib/framework/document-comment.js → src/med_editor/framework/document-comment.ts}

@@ -1,55 +1,57 @@
+import { EditorContext } from "./document-context";
 import { ElementUtil } from "./element-util";
+import { CommContentBaseElement, CommContentElement } from "./impl/comments/comment-content-impl";
 import { CommentElement } from "./impl/comments/comment-element-impl";
 import { TextGroupElement } from "./impl/text/text-impl";
 import { RangeUtil } from "./range-util";
+
 /**
  * 处理文档批注
  */
 export class DocumentComment {
-    docCtx;
-    commMarkList = [];
-    commContentList = [];
-    isDirty = true;
-    constructor(docCtx) {
-        this.docCtx = docCtx;
-    }
+    commMarkList: Array<CommentElement> = [];
+    commContentList: Array<CommContentBaseElement> = [];
+    isDirty: boolean = true;
+    constructor(public docCtx: EditorContext) { }
+
     /**
     * 读取审阅标记符号
     */
-    readComments() {
+    readComments(): void {
         if (!this.isDirty) {
             return;
         }
-        const commList = this.docCtx.document.treeFilter(item => item.type === 'comm');
+        const commList = this.docCtx.document.treeFilter(item => item.type === 'comm') as Array<CommentElement>;
         const startCommList = commList.filter(item => item.props.markType === "start");
         const endCommList = commList.filter(item => item.props.markType === "end");
         const commMaps = startCommList.map(startItem => {
             const end = endCommList.find(endItem => endItem.props.id === startItem.props.id);
             if (!end) {
-                throw new Error('未找到匹配的结束审阅符号');
+                throw new Error('未找到匹配的结束审阅符号')
             }
-            return { start: startItem, end };
-        });
-        const commContentList = [];
+            return { start: startItem, end }
+        })
+        const commContentList: Array<CommContentBaseElement> = [];
         for (let i = 0; i < this.docCtx.document.commentsContainerElement.length; i++) {
-            const commContent = this.docCtx.document.commentsContainerElement.getChild(i);
+            const commContent = this.docCtx.document.commentsContainerElement.getChild(i) as CommContentBaseElement;
             const commMap = commMaps.find(item => item.start.props.id === commContent.props.id);
             if (!commMap) {
                 throw new Error('未找到审阅内容对应的审阅符号');
             }
             commContent.startMark = commMap.start;
             commContent.endMark = commMap.end;
-            commContentList.push(commContent);
+            commContentList.push(commContent)
         }
         this.commMarkList = commList;
         this.commContentList = commContentList;
         this.docCtx.viewOptions.showReviewWindow = this.commContentList.length > 0;
         this.isDirty = false;
     }
+
     /**
      * 执行删除前，需要更新批注节点位置
      */
-    updateComments() {
+    updateComments(): void {
         const { selectionState } = this.docCtx;
         const { startControl, startOffset, collapsed, selectedRange } = selectionState;
         if (collapsed) {
@@ -63,39 +65,37 @@ export class DocumentComment {
                     if (startControl.textMeasures.length === startOffset) {
                         this.removeComment(nextSiblingEle.props.id);
                     }
-                }
-                else {
+                } else {
                     this.removeComment(nextSiblingEle.props.id);
                 }
             }
-        }
-        else {
+        } else {
             //如果开始批注被选中，则需要移动开始批注元素到选区末尾
             //如果结束批注被选中，则需要删除当前批注
             if (!selectedRange) {
-                return;
+                return
             }
             const endRange = RangeUtil.getEndRangeTarget(selectedRange);
             if (!endRange) {
-                return;
+                return
             }
-            const commPairs = [];
+            const commPairs: Array<CommMarkSelectedStatus> = [];
             for (let i = 0; i < this.commContentList.length; i++) {
                 const { startMark, endMark } = this.commContentList[i];
-                const commPair = {
+                const commPair: CommMarkSelectedStatus = {
                     startMark,
                     endMark,
                     startMarkStatus: RangeUtil.checkElementFullInRange(selectedRange, startMark),
                     endMarkStatus: RangeUtil.checkElementFullInRange(selectedRange, endMark),
                 };
-                commPairs.push(commPair);
+                commPairs.push(commPair)
             }
+
             for (let i = 0; i < commPairs.length; i++) {
                 const commPair = commPairs[i];
                 if (commPair.endMarkStatus) {
                     this.removeComment(commPair.endMark.props.id);
-                }
-                else if (commPair.startMarkStatus) {
+                } else if (commPair.startMarkStatus) {
                     // const newStartMark = new CommentElement();
                     // newStartMark.props.id = commPair.startMark.props.id;
                     // commPair.startMark.isDecorate = false;
@@ -104,45 +104,60 @@ export class DocumentComment {
             }
         }
     }
+
+
     /**
      * 删除批注
-     * @param id
+     * @param id 
      */
-    removeComment(id) {
+    removeComment(id: string): void {
         const commentMarks = this.commMarkList.filter(item => item.props.id === id);
         const commentContent = this.commContentList.find(item => item.props.id === id);
-        commentMarks.forEach(item => item.remove());
+        commentMarks.forEach(item => item.remove())
         commentContent?.remove();
         this.afterCommentsChanged();
     }
-    getCommMarkIndex(commMark) {
+
+    getCommMarkIndex(commMark: CommentElement): number {
         const markType = commMark.props.markType;
-        const commList = this.docCtx.document.treeFilter(item => item.type === 'comm');
+        const commList = this.docCtx.document.treeFilter(item => item.type === 'comm') as Array<CommentElement>;
         const startCommList = commList.filter(item => item.props.markType === markType);
         return startCommList.indexOf(commMark);
     }
+
     /**
      * 清除所有批注
      */
-    clearAllComments() {
+    clearAllComments(): void {
         this.readComments();
         for (let i = 0; i < this.commContentList.length; i++) {
             this.removeComment(this.commContentList[i].props.id);
         }
         this.docCtx.selectionState.clear();
     }
+
     /**
      * 清除所有的验证批注
      */
-    clearAllValidates() {
-        this.docCtx.document.treeFilter(item => item.type === 'validate').forEach(item => { this.removeComment(item.props.id); });
+    clearAllValidates(): void {
+        this.docCtx.document.treeFilter(item => item.type === 'validate').forEach(item => { this.removeComment(item.props.id) })
     }
+
     /**
      * 批注修改后事件
      * 用于标注当前文档的批注发生更改了，不再重复读取批注，提高性能
      */
-    afterCommentsChanged() {
+    afterCommentsChanged(): void {
         this.isDirty = true;
     }
+
+
+}
+
+
+export interface CommMarkSelectedStatus {
+    startMark: CommentElement,
+    endMark: CommentElement,
+    startMarkStatus: boolean,
+    endMarkStatus: boolean
 }
-//# sourceMappingURL=document-comment.js.map