@hailin-zheng/editor-core 2.0.39 → 2.0.41

package/index.js

@@ -3870,7 +3870,7 @@ function drawDecorator(e, r) {
 }
 function exportDecoratorHTML(event, r) {
     const canPaint = r.element.isMouseenter || r.element.isFocused;
-    if (canPaint && r.element.paintRenders.indexOf(r) === 0) {
+    if (canPaint) {
         const strokeColor = '#0050b3';
         const verOffset = 0;
         const renderPosMap = getCurrentParaGroupRenders(r).map(item => ({ pos: getRenderPosToDoc(item), render: item }));
@@ -4113,9 +4113,7 @@ class DocumentFooterRenderObject extends BlockContainerRenderObject {
     }
     exportHTML(event) {
         const t = super.exportHTML(event);
-        if (this.element.disableClick && event.mode === 'view') {
-            t.data.attrs.opacity = 0.5;
-        }
+        if (this.element.disableClick && event.mode === 'view') ;
         if (event.options.printHeaderFooterLine) {
             t.children = [{
                     sel: 'path',
@@ -4245,9 +4243,9 @@ class DocumentHeaderRenderObject extends BlockContainerRenderObject {
             },
             children: []
         };
-        if (this.element.disableClick && event.mode === 'view') {
-            t.data.attrs.opacity = 0.5;
-        }
+        // if (this.element.disableClick && event.mode === 'view') {
+        //     t.data.attrs.opacity = 0.5;
+        // }
         if (headerLine) {
             t.children = [headerLine];
         }
@@ -14757,7 +14755,7 @@ class DocumentArrange {
                     if (cutRow) {
                         cloneTbRender.addChild(cutRow);
                         sumHeight += cutRow.rect.height;
-                        if (currRow.getItems().every(item => item.length !== 0)) {
+                        if (currRow.getItems().some(item => item.length !== 0)) {
                             cutRows.push(currRow);
                         }
                         else {
@@ -18774,6 +18772,7 @@ class DocumentChange {
         if (!selectedRange) {
             throw new Error('selectionRange is null');
         }
+        this.selectionState.clear();
         //用于刷新后定位光标
         let startPointElement;
         let startPointOffset = 0;
@@ -18824,7 +18823,10 @@ class DocumentChange {
             this.deleteRange(selectedRange);
         }
         if (startPointElement) {
-            this.selectionState.resetRange(startPointElement, startPointOffset);
+            //如果其他位置设置过选区对象，则以启动位置设置的选区为准
+            if (!this.selectionState.range) {
+                this.selectionState.resetRange(startPointElement, startPointOffset);
+            }
         }
         //return {cursorEle: startPointElement, cursorOffset: startPointOffset};
     }
@@ -28326,7 +28328,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.0.39";
+        return "2.0.41";
     }
 }