@hailin-zheng/editor-core 2.1.25 → 2.1.26

package/editor.css

@@ -170,6 +170,7 @@
 }
 
 .tg-container {
+    font-size: 14px;
     border: 1px solid #ccc;
     margin: 10px 0;
     padding: 10px;
@@ -540,4 +541,4 @@
     100% {
         opacity: 1;
     }
-}
+}

package/index-cjs.js

@@ -1819,6 +1819,8 @@ class ViewOptions {
     docMode = exports.DocMode.Design;
     //是否显示审阅痕迹
     _showTrackChanges = true;
+    //是否显示审阅痕迹提示
+    _showTrackChangesTip = true;
     get showTrackChanges() {
         return this._showTrackChanges;
     }
@@ -1829,6 +1831,16 @@ class ViewOptions {
         this._showTrackChanges = value;
         this.onChange.next('force');
     }
+    get showTrackChangesTip() {
+        return this._showTrackChangesTip;
+    }
+    set showTrackChangesTip(value) {
+        if (this._showTrackChangesTip === value) {
+            return;
+        }
+        this._showTrackChangesTip = value;
+        this.onChange.next('force');
+    }
     //医嘱打印模式，文字行模式,将表格多行对象转换为多个表格行对象
     textRowLineMode = false;
     editUser = { id: '', name: '' };
@@ -4492,6 +4504,7 @@ class TableCellFactory extends ElementFactory {
     }
 }
 
+const RowMinHeight = 20;
 class TableRowElement extends BlockContainerElement {
     //props: TableRowProps;
     constructor() {
@@ -10636,6 +10649,9 @@ class TrackRunRenderObject extends InlineGroupRenderObject {
         if (this.element.paintRenders.indexOf(this) !== 0) {
             return;
         }
+        if (!event.options.showTrackChangesTip) {
+            return;
+        }
         const opType = this.element.type === 'ins-run' ? '插入:' : '删除:';
         const content = ElementSerialize.serializeString(this.element, { all: true });
         const left = this.element.gotFocus ? -10 : 5;
@@ -10672,27 +10688,6 @@ class TrackRunRenderObject extends InlineGroupRenderObject {
         };
         event.addChangeTips(node);
     }
-    //根据时间显示中文日时间提示范围
-    getTipsDate(date) {
-        const now = new Date();
-        const diff = now.getTime() - date.getTime();
-        if (diff < 60 * 1000) {
-            return '刚刚';
-        }
-        if (diff < 60 * 60 * 1000) {
-            return `${Math.floor(diff / 60 / 1000)}分钟前`;
-        }
-        if (diff < 24 * 60 * 60 * 1000) {
-            return `${Math.floor(diff / 60 / 60 / 1000)}小时前`;
-        }
-        if (diff < 30 * 24 * 60 * 60 * 1000) {
-            return `${Math.floor(diff / 24 / 60 / 60 / 1000)}天前`;
-        }
-        if (diff < 12 * 30 * 24 * 60 * 60 * 1000) {
-            return `${Math.floor(diff / 30 / 24 / 60 / 60 / 1000)}月前`;
-        }
-        return `${Math.floor(diff / 12 / 30 / 24 / 60 / 60 / 1000)}年前`;
-    }
     clone() {
         const cloneRender = new TrackRunRenderObject(this.element);
         cloneRender.rect = ElementUtil.cloneRect(this.rect);
@@ -13913,18 +13908,21 @@ class ParagraphMeasure {
      * @param lineEmpty
      */
     patchHandlePostPunctuation(render, i, inCloseBody, lineEmpty) {
-        if (inCloseBody && this.containPostPunctuation(render.textMeasures[i]?.char)) {
-            if (this.containPostPunctuation(render.textMeasures[i + 1]?.char)) {
-                i--;
-            }
-            else {
-                i++;
-            }
+        if (i === 1 && lineEmpty) {
+            return i;
         }
-        else {
-            if (i > 1 && this.containPostPunctuation(render.textMeasures[i]?.char)) {
-                i--;
-            }
+        //判断当前行最后一个字符是否是后置标点
+        //const currCharIsPostPunctuation = this.containPostPunctuation(render.textMeasures[i]?.char);
+        //判断下一个字符是否是后置标点,如果不是，直接返回
+        const nextCharIsPostPunctuation = this.containPostPunctuation(render.textMeasures[i]?.char);
+        if (!nextCharIsPostPunctuation) {
+            return i;
+        }
+        if (inCloseBody) {
+            return ++i;
+        }
+        if (i > 0) {
+            return --i;
         }
         return i;
     }
@@ -14579,6 +14577,9 @@ class DocumentArrange {
         // if (render.element.props.minHeight > 0 && render.rect.height < limitHeight) {
         //     return null;
         // }
+        if (limitHeight < RowMinHeight) {
+            return null;
+        }
         render.remeasureState = true;
         const cloneRowRender = render.element.createRenderObject();
         if (cloneRowRender.minHeight > 0 && render.minHeight <= 0) {
@@ -27253,7 +27254,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.25";
+        return "2.1.26";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -27697,6 +27698,7 @@ exports.Rect = Rect;
 exports.RenderContext = RenderContext;
 exports.RenderObject = RenderObject;
 exports.ResizeLeafRenderObject = ResizeLeafRenderObject;
+exports.RowMinHeight = RowMinHeight;
 exports.RunElementFactory = RunElementFactory;
 exports.SVGElement = SVGElement;
 exports.SVGFactory = SVGFactory;