@hailin-zheng/editor-core 1.0.58 → 1.0.61

package/index.js

@@ -1416,6 +1416,7 @@ class ViewOptions {
     viewBackcolor = 'rgb(230,230,230)';
     paraSymbolColor = 'rgb(128,128,128)';
     dataGroupColor = 'rgb(0,80,179)';
+    defaultLineHeight = 1.3;
     //新增-留痕块文本颜色
     trackInsColor = '#ff4d4f';
     //删除-留痕块文本颜色
@@ -1753,7 +1754,7 @@ class ParagraphProps extends INotifyPropertyChanged {
         if (this.hanging) {
             props["hanging"] = this.hanging;
         }
-        if (this.lineHeight && this.lineHeight !== 1.3) {
+        if (this.lineHeight && this.lineHeight !== viewOptions.defaultLineHeight) {
             props["lineHeight"] = this.lineHeight;
         }
         if (this.textAlign && this.textAlign !== "left") {
@@ -3384,7 +3385,7 @@ class ParagraphFactory extends ElementFactory {
         paraElement.props.hanging = props?.hanging ?? 0;
         paraElement.props.textAlign = props?.textAlign ?? 'left';
         paraElement.props.numberType = props?.numberType ?? -1;
-        paraElement.props.lineHeight = props?.lineHeight ?? 1.3;
+        paraElement.props.lineHeight = props?.lineHeight ?? this.options.defaultLineHeight;
         paraElement.props.pageBreak = props?.pageBreak ?? false;
         return paraElement;
     }
@@ -3475,7 +3476,7 @@ class TableCellElement extends BlockContainerElement {
         const cellRender = new TableCellRenderObject(this);
         cellRender.rect.width = cellWidth;
         cellRender.rect.maxWidth = cellWidth;
-        cellRender.padding = new PaddingProps(0, 0, 5, 5);
+        cellRender.padding = new PaddingProps(2, 2, 5, 5);
         cellRender.rect.x = cellOffset;
         return cellRender;
     }
@@ -6657,9 +6658,9 @@ class DocumentSelection {
         if (!this.selectionState.rangeDirty) {
             return false;
         }
-        const range = this.selectionState.range;
         //转换选区
         this.transformRange();
+        const range = this.selectionState.range;
         this.selectionState.clear();
         if (!range) {
             return false;
@@ -10065,7 +10066,7 @@ class ElementMeasure {
             const innerLineRect = innerLineRects[i];
             innerLineRect.rect.x = this.getParaLineRectStartX(innerLineRects.length, i, paragraph, render, innerLineRect);
             //限制最大行高
-            const maxLineHeight = Math.floor(14 * 1.3);
+            const maxLineHeight = paragraph.props.lineHeight !== this.options.defaultLineHeight ? 100 : Math.floor(14 * 2);
             //fillLineHeight填充行高
             let fillLineHeight = Math.ceil(innerLineRect.rect.height * (paragraph.props.lineHeight - 1));
             fillLineHeight = fillLineHeight > maxLineHeight ? maxLineHeight : fillLineHeight;
@@ -15250,13 +15251,15 @@ class DocumentContext {
      */
     searchText(text) {
         const docTextData = this.getElementTextData(this.ctx);
-        const matchData = [];
         for (let i = 0; i < docTextData.length; i++) {
-            if (docTextData[i].text.indexOf(text) >= 0) {
-                matchData.push(docTextData[i]);
+            // if (docTextData[i].text.indexOf(text) >= 0) {
+            //     matchData.push(docTextData[i]);
+            // }
+            const matchAll = docTextData[i].text.matchAll(new RegExp(`${text}`, 'g'));
+            for (let regExpMatchArray of matchAll) {
+                console.log(regExpMatchArray);
             }
         }
-        console.log(matchData);
     }
     getElementTextData(ele) {
         const arr = [];
@@ -15877,7 +15880,7 @@ class CanvasTextEditor {
         this.viewOptions = new ViewOptions();
         this.documentSelection = new DocumentSelection();
         this.docCtx = new EditorContext(this.documentSelection.selectionState, this.viewOptions);
-        this.viewOptions.copyRightInfo = '万达信息电子病历编辑器,www.wondersgroup.com';
+        this.viewOptions.copyRightInfo = '电子病历编辑器(XXX版权所有)';
         this.viewOptions.drawCharRectColor = 'green';
         this.viewOptions.showLineRect = true;
         this.viewOptions.docSpace = 20;
@@ -16396,6 +16399,9 @@ class CanvasTextEditor {
             return null;
         }
         const para = ElementUtil.getParentByType(selectionState.startControl, ParagraphElement);
+        if (!para) {
+            return null;
+        }
         return para.props;
     }
     setTextFormat(newProps) {
@@ -16622,6 +16628,14 @@ class CanvasTextEditor {
         }
         return this.documentChange.insertElement(targetElement, targetOffset, destEleArray);
     }
+    /**
+     * 插入新元素
+     * @param ele
+     */
+    insertNewElement(ele) {
+        const { startControl, startOffset } = this.selectionState;
+        this.insertElement(startControl, startOffset, [ele]);
+    }
     showHistory() {
         //console.log(History.ops);
         const newPara = new ParagraphElement();