@hailin-zheng/editor-core 2.2.37 → 2.2.39

package/index-cjs.js

@@ -329,6 +329,33 @@ class RenderObject {
         };
     }
 }
+const NS = "http://www.w3.org/2000/svg";
+function HLNode(sel, attrs, child) {
+    attrs = attrs || {};
+    if (typeof child === 'string') {
+        return {
+            sel,
+            data: {
+                ns: NS,
+                ...attrs
+            },
+            text: child
+        };
+    }
+    else {
+        const node = {
+            sel,
+            data: {
+                ns: NS,
+                ...attrs
+            }
+        };
+        if (child && child.length > 0) {
+            node.children = child;
+        }
+        return node;
+    }
+}
 /**
  * 叶子节点渲染元素
  */
@@ -1919,6 +1946,8 @@ class ViewOptions {
     shapeRendering = 'auto';
     //是否开启快速测量
     enableFastMeasure = false;
+    //数据组双击选择模式
+    dataGroupDblClickMode = 'default';
     get fullPageView() {
         return this._fullPageView;
     }
@@ -11294,7 +11323,11 @@ class ElementSerialize {
      * @param element
      * @param viewOptions
      */
-    static serialize(element, viewOptions) {
+    static serialize(element, viewOptions, serializeOptions) {
+        serializeOptions = serializeOptions || {};
+        if (serializeOptions.excludeDel && element instanceof TrackRunElement && element.type === exports.TrackRunTypeEnum.Deleted) {
+            return null;
+        }
         const result = element.serialize(viewOptions);
         if (!result) {
             return null;
@@ -11336,7 +11369,10 @@ class ElementSerialize {
         }
         return result;
     }
-    static serializeString(element, options = { includeRunDel: false }) {
+    static serializeString(element, options) {
+        options = options || {};
+        options.includeRunDel = options.includeRunDel || false;
+        options.dataEleValueMode = options.dataEleValueMode || 'text';
         if (!options.includeRunDel && element instanceof TrackRunElement && element.type === exports.TrackRunTypeEnum.Deleted) {
             return '';
         }
@@ -11350,6 +11386,9 @@ class ElementSerialize {
             return '\n';
         }
         if (element instanceof BranchElement) {
+            if (element instanceof DataElementInlineGroup && options.dataEleValueMode === 'value') {
+                return element.getValue();
+            }
             const items = [];
             for (let i = 0; i < element.length; i++) {
                 const item = element.getChild(i);
@@ -11434,7 +11473,8 @@ class ElementSerialize {
         const selectedStructs = this.getSelectedStruct(ss, viewOptions);
         if (selectedStructs) {
             //return JSON.stringify(this.serialize(selectedStructs, viewOptions));
-            return JSON.stringify(selectedStructs.map(item => this.serialize(item, viewOptions)).filter(item => item));
+            const serOptions = { excludeDel: true };
+            return JSON.stringify(selectedStructs.map(item => this.serialize(item, viewOptions, serOptions)).filter(item => item));
         }
         else {
             return '';
@@ -17870,6 +17910,11 @@ class DocumentInput {
                 this.onPasteEvent.next(evt);
             },
             cut: (evt) => {
+                const event = new CopyElementEvent(this.docCtx);
+                event.sourceEvent = evt;
+                if (DocumentEvent.invokeEvent('ElementCut', this.docCtx.selectionState.startControl, event, 'All')) {
+                    return;
+                }
                 this.onCutEvent.next(evt);
             }
         };
@@ -19306,6 +19351,8 @@ class DocumentChange {
                 console.log('粘贴反序列化数据失败', item);
             }
         });
+        //清理track-run数据
+        this.cleanTrackRun(pasteEles);
         if (!pasteEles.length) {
             return;
         }
@@ -19339,6 +19386,39 @@ class DocumentChange {
             this.selectionState.resetRange(lastEle, -1);
         }
     }
+    /**
+     * 整理数据：如果复制的数据包含留痕，需要把留痕的块替换为里面的文本内容
+     * @param eles
+     */
+    cleanTrackRun(eles) {
+        if (Array.isArray(eles)) {
+            for (let i = 0; i < eles.length; i++) {
+                const ele = eles[i];
+                if (ele instanceof TrackRunElement) {
+                    const children = ElementUtil.getChildrenElements(ele).map(item => item.clone(true));
+                    eles.splice(i, 1, ...children);
+                    i--;
+                    continue;
+                }
+                this.cleanTrackRun(ele);
+            }
+        }
+        else {
+            if (eles instanceof BranchElement) {
+                for (let j = 0; j < eles.length; j++) {
+                    const ele = eles.getChild(j);
+                    if (ele instanceof TrackRunElement) {
+                        const children = ElementUtil.getChildrenElements(ele).map(item => item.clone(true));
+                        children.forEach(item => ele.addChild(item, ele.getIndex()));
+                        eles.removeChild(ele);
+                        j--;
+                        continue;
+                    }
+                    this.cleanTrackRun(ele);
+                }
+            }
+        }
+    }
     /**
      * 处理表单模式下的粘贴事件
      * @param data 要粘贴的元素
@@ -19349,6 +19429,14 @@ class DocumentChange {
         // if (pasteString) {
         //     this.pastePlainText(pasteString);
         // }
+        //留痕模式下不支持粘贴格式
+        if (this.viewOptions.enableTrackChanges) {
+            const pasteString = data.map(item => ElementSerialize.serializeString(item)).join('');
+            if (pasteString) {
+                this.pastePlainText(pasteString);
+            }
+            return;
+        }
         const { startControl, startOffset } = this.selectionState;
         const lastEle = this.insertElement(startControl, startOffset, data);
         this.selectionState.clear();
@@ -20615,10 +20703,13 @@ class EditorCalendarVNode {
         this.currMonth.value = new Date().getMonth();
         this.currCalendarMode.value = 'day';
         this.selectedDate.value = moment__default["default"]().format('YYYY-MM-DD');
-        this.currentDate = '';
         this.currTime.value = null;
         this.selectedTime.value = null;
     }
+    clear() {
+        this.reset();
+        this.currentDate = '';
+    }
     render(position, dataValue, format = 'YYYY-MM-DD HH:mm:ss') {
         format = format ?? 'YYYY-MM-DD HH:mm:ss';
         if (dataValue !== this.currentDate) {
@@ -20633,9 +20724,7 @@ class EditorCalendarVNode {
             this.currTime.value = currDataValue.format('HH:mm:ss');
             this.selectedTime.value = this.currTime.value;
         }
-        if (!this.currentDate) {
-            this.currentDate = moment__default["default"]().format('YYYY-MM-DD');
-        }
+        if (!this.currentDate) ;
         if (!this.currTime.value) {
             this.currTime.value = moment__default["default"]().format('HH:mm:ss');
             this.selectedTime.value = this.currTime.value;
@@ -21084,7 +21173,7 @@ class EditorCalendarVNode {
     }
     getDays() {
         const days = [];
-        const nowStr = moment__default["default"](this.currentDate).format('YYYY-MM-DD');
+        const nowStr = moment__default["default"]().format('YYYY-MM-DD');
         //获取本月的第一天日期
         const firstDay = moment__default["default"]().set({ 'year': this.currYear.value, 'month': this.currMonth.value, 'date': 1 });
         firstDay.locale('zh-cn');
@@ -22366,6 +22455,8 @@ class DocEditor {
     docDblClickHandle(evt) {
         //1.如果在数据元中双击，则默认选中数据元内部的所有内容
         const currDataEle = this.getCurrentDataElement();
+        //双击是否全选数据组内容
+        const currDataGroup = this.viewOptions.dataGroupDblClickMode === 'selectall' ? this.getCurrentDataGroupElement() : null;
         if (currDataEle && currDataEle instanceof DataElementInlineGroup && currDataEle.length > 2 && this.selectionState.startControl instanceof TextGroupElement) {
             const range = new SelectionRange();
             range.setStart(currDataEle.startDecorate, 1);
@@ -22373,6 +22464,13 @@ class DocEditor {
             this.selectionState.addRange(range);
             this.flushToSchedule();
         }
+        else if (currDataGroup && this.selectionState.startControl instanceof TextGroupElement) {
+            const range = new SelectionRange();
+            range.setStart(currDataGroup.startDecorate, 1);
+            range.setEnd(currDataGroup.endDecorate, 0);
+            this.selectionState.addRange(range);
+            this.flushToSchedule();
+        }
         else {
             //2.默认选词
             const res = getFocusTextSegment(this.selectionState);
@@ -23368,7 +23466,7 @@ class DocEditor {
                     }
                     return calendar.render(position, currVal);
                 }
-                calendar.reset();
+                calendar.clear();
                 return null;
             }
         };
@@ -23448,7 +23546,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.37";
+        return "2.2.39";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -29346,6 +29444,7 @@ exports.FillNullSpaceElement = FillNullSpaceElement;
 exports.FillNullSpaceRenderObject = FillNullSpaceRenderObject;
 exports.GetTrackTipsEvent = GetTrackTipsEvent;
 exports.GotCursorEvent = GotCursorEvent;
+exports.HLNode = HLNode;
 exports.IDispose = IDispose;
 exports.INotifyPropertyChanged = INotifyPropertyChanged;
 exports.InlineBlockContainer = InlineBlockContainer;
@@ -29369,6 +29468,7 @@ exports.MarginProps = MarginProps;
 exports.MouseElementEvent = MouseElementEvent;
 exports.MousedownElementEvent = MousedownElementEvent;
 exports.MultiBlockLineRenderObject = MultiBlockLineRenderObject;
+exports.NS = NS;
 exports.OnceSubject = OnceSubject;
 exports.PSymbolElement = PSymbolElement;
 exports.PSymbolRenderObject = PSymbolRenderObject;