@hailin-zheng/editor-core 2.2.37 → 2.2.38

package/index.js

@@ -300,6 +300,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;
+    }
+}
 /**
  * 叶子节点渲染元素
  */
@@ -1890,6 +1917,8 @@ class ViewOptions {
     shapeRendering = 'auto';
     //是否开启快速测量
     enableFastMeasure = false;
+    //数据组双击选择模式
+    dataGroupDblClickMode = 'default';
     get fullPageView() {
         return this._fullPageView;
     }
@@ -11265,7 +11294,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 === TrackRunTypeEnum.Deleted) {
+            return null;
+        }
         const result = element.serialize(viewOptions);
         if (!result) {
             return null;
@@ -11307,7 +11340,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 === TrackRunTypeEnum.Deleted) {
             return '';
         }
@@ -11321,6 +11357,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);
@@ -11405,7 +11444,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 '';
@@ -19277,6 +19317,8 @@ class DocumentChange {
                 console.log('粘贴反序列化数据失败', item);
             }
         });
+        //清理track-run数据
+        this.cleanTrackRun(pasteEles);
         if (!pasteEles.length) {
             return;
         }
@@ -19310,6 +19352,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 要粘贴的元素
@@ -19320,6 +19395,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();
@@ -20586,10 +20669,13 @@ class EditorCalendarVNode {
         this.currMonth.value = new Date().getMonth();
         this.currCalendarMode.value = 'day';
         this.selectedDate.value = moment().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) {
@@ -20604,9 +20690,7 @@ class EditorCalendarVNode {
             this.currTime.value = currDataValue.format('HH:mm:ss');
             this.selectedTime.value = this.currTime.value;
         }
-        if (!this.currentDate) {
-            this.currentDate = moment().format('YYYY-MM-DD');
-        }
+        if (!this.currentDate) ;
         if (!this.currTime.value) {
             this.currTime.value = moment().format('HH:mm:ss');
             this.selectedTime.value = this.currTime.value;
@@ -21055,7 +21139,7 @@ class EditorCalendarVNode {
     }
     getDays() {
         const days = [];
-        const nowStr = moment(this.currentDate).format('YYYY-MM-DD');
+        const nowStr = moment().format('YYYY-MM-DD');
         //获取本月的第一天日期
         const firstDay = moment().set({ 'year': this.currYear.value, 'month': this.currMonth.value, 'date': 1 });
         firstDay.locale('zh-cn');
@@ -22337,6 +22421,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);
@@ -22344,6 +22430,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);
@@ -23339,7 +23432,7 @@ class DocEditor {
                     }
                     return calendar.render(position, currVal);
                 }
-                calendar.reset();
+                calendar.clear();
                 return null;
             }
         };
@@ -23419,7 +23512,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.37";
+        return "2.2.38";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -29190,5 +29283,5 @@ function removeDuplicatesEvent(events) {
     return arr;
 }
 
-export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, CopyElementEvent, DOMEventSource, DOMSubscription, DataContainerElement, DataContainerFactory, DataContainerProps, DataContainerRenderObject, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocEditor, DocInputSuggestions, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentInput, DocumentPaginator, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementReader, ElementSerialize, ElementUtil, EventBus, EventMap, EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideDataGroup, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LineElement, LineFactory, LineProps, LineRenderObject, LostCursorEvent, MarginProps, ModifyFlag, MouseElementEvent, MousedownElementEvent, MultiBlockLineRenderObject, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageBreakElement, PageBreakFactory, PageBreakRenderObject, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PasteElementEvent, PermanentTeethElement, PermanentTeethFactory, PermanentTeethProps, PermanentTeethRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RowMinHeight, RunElementFactory, SVGElement, SVGFactory, SVGProps, SVGRenderObject, SelectionOverlays, SelectionRange, SelectionState, Subject, SubjectSubscription, Subscription, TEXT_HEIGHT_FACTOR, TabElement, TabFactory, TabRenderObject, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TextUnitsHolder, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, addReturn, clearChildrenRenderCache, clearTraces, cloneChildren, cloneElementBase, defaultParaHanging, deleteCurrentParagraph, docOpsMap, elementTypeEventHandler, exportDataEleDecoratorSVG$1 as exportDataEleDecoratorSVG, falseChar, fontMapFunc, formatEle, fromEvent, generatePatch, getCalleeName, getCurrentParaGroupRenders, getFocusTextSegment, getRenderPosToDoc, inputText, insertEle, invokeTypeHandler, isDate, logUpdateEleProps, objectToString$4 as objectToString, onTableContextmenu, onceTask, parser, reactiveMap, refreshEditor, removeEle, removeText, renderErrorTip, renderUnderWavyLine, renderUnderline, runTextLineRender, setChildrenModifyFlag, setNotifyChangedCallback, setTraceTrackingFlag, suppressTracking, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, updatePartialProps, validateDataEle, validateDataEleRenderObj, validateDataGroup, validateInlineDataEle, validateInlineInputRenderObj, watchChanged };
+export { BlockContainerElement, BlockContainerRenderObject, BlockContentElement, BlockContentRenderObject, BlockLineRectRenderObject, BodyPartProps, BooleanEnum, BorderProps, BranchElement, BranchRenderObject, BreakElement, BreakFactory, BreakRenderObject, CheckBoxElement, CheckBoxFactory, CheckBoxProps, CheckBoxRenderObject, ColumnPatchUtil, CommContentBaseElement, CommContentBaseRenderObject, CommContentElement, CommContentProps, CommContentRenderObject, CommProps, CommentContentFactory, CommentElement, CommentFactory, CommentRenderObject, CommentsFactory, CommonUtil, CommsContainerElement, CommsContainerRenderObject, ContentMenuItem, ContextMenuElementEvent, CopyElementEvent, DOMEventSource, DOMSubscription, DataContainerElement, DataContainerFactory, DataContainerProps, DataContainerRenderObject, DataDecorateElement, DataDecorateProps, DataDecorateRenderObject, DataEleBaseProps, DataEleBaseTextProps, DataEleCheckProps, DataEleDateProps, DataEleImageProps, DataEleListProps, DataEleMHProps, DataElementBarcode, DataElementBarcodeFactory, DataElementBarcodeProps, DataElementBarcodeRenderObject, DataElementBaseFactory, DataElementCheck, DataElementCheckFactory, DataElementCheckRenderObject, DataElementDate, DataElementDateFactory, DataElementDateRenderObject, DataElementGroupElement, DataElementGroupFactory, DataElementGroupProps, DataElementGroupRenderObject, DataElementImage, DataElementImgFactory, DataElementInlineGroup, DataElementLeaf, DataElementList, DataElementListFactory, DataElementListRenderObject, DataElementMH, DataElementMHFactory, DataElementRenderObject, DataElementText, DataElementTextFactory, DataElementTextRenderObject, DataImageRenderObject, DataRenderMH, DocEditor, DocInputSuggestions, DocMode, DocumentBodyElement, DocumentBodyFactory, DocumentBodyPartElement, DocumentBodyPartFactory, DocumentBodyPartRenderObject, DocumentBodyRenderObject, DocumentChange, DocumentCombine, DocumentComment, DocumentContainerRender, DocumentContext, DocumentCursor, DocumentElement, DocumentEvalFunc, DocumentEvent, DocumentFactory, DocumentFooterElement, DocumentFooterFactory, DocumentFooterRenderObject, DocumentHeaderElement, DocumentHeaderFactory, DocumentHeaderRenderObject, DocumentInput, DocumentPaginator, DocumentPrintOffscreen, DocumentPrintOffscreenBase, DocumentProps, DocumentRenderObject, DocumentSelection, DocumentTemplate, DropElementEvent, EditMode, EditorContext, Element, ElementEvent, ElementFactory, ElementReader, ElementSerialize, ElementUtil, EventBus, EventMap, EventSourceCore, FillNullSpaceElement, FillNullSpaceRenderObject, GetTrackTipsEvent, GotCursorEvent, HLNode, IDispose, INotifyPropertyChanged, InlineBlockContainer, InlineGroupElement, InlineGroupInputElement, InlineGroupRenderObject, InlineMuiltBlockLineRenderObject, InputElementEvent, IsInSideDataElement, IsInSideDataGroup, IsInSideInlineGroupInputElement, KeyboradElementEvent, LeafElement, LeafRenderObject, LineElement, LineFactory, LineProps, LineRenderObject, LostCursorEvent, MarginProps, ModifyFlag, MouseElementEvent, MousedownElementEvent, MultiBlockLineRenderObject, NS, OnceSubject, PSymbolElement, PSymbolRenderObject, PaddingProps, PageBreakElement, PageBreakFactory, PageBreakRenderObject, PageOptions, PaintContent, ParagraphElement, ParagraphFactory, ParagraphLineRectRenderObject, ParagraphNumberType, ParagraphProps, ParagraphRenderObject, PasteElementEvent, PermanentTeethElement, PermanentTeethFactory, PermanentTeethProps, PermanentTeethRenderObject, PictureElement, PictureFactory, PictureProps, PictureRenderObject, RadioBoxElement, RadioBoxFactory, RadioBoxProps, RadioBoxRenderObject, RangeUtil, Rect, RenderContext, RenderObject, RenderObjectType, ResizeLeafRenderObject, RowMinHeight, RunElementFactory, SVGElement, SVGFactory, SVGProps, SVGRenderObject, SelectionOverlays, SelectionRange, SelectionState, Subject, SubjectSubscription, Subscription, TEXT_HEIGHT_FACTOR, TabElement, TabFactory, TabRenderObject, TableCellElement, TableCellFactory, TableCellProps, TableCellRenderObject, TableElement, TableFactory, TableProps, TableRenderObject, TableRowElement, TableRowFactory, TableRowProps, TableRowRenderObject, TableSplitCell, TableUtil, TextGroupElement, TextGroupFactory, TextGroupRenderObject, TextProps, TextUnitsHolder, TrackRunElement, TrackRunProps, TrackRunRenderObject, TrackRunTypeEnum, ValidateCondition, ValidateElement, ValidateProps, ValidateRenderObject, ViewOptions, addReturn, clearChildrenRenderCache, clearTraces, cloneChildren, cloneElementBase, defaultParaHanging, deleteCurrentParagraph, docOpsMap, elementTypeEventHandler, exportDataEleDecoratorSVG$1 as exportDataEleDecoratorSVG, falseChar, fontMapFunc, formatEle, fromEvent, generatePatch, getCalleeName, getCurrentParaGroupRenders, getFocusTextSegment, getRenderPosToDoc, inputText, insertEle, invokeTypeHandler, isDate, logUpdateEleProps, objectToString$4 as objectToString, onTableContextmenu, onceTask, parser, reactiveMap, refreshEditor, removeEle, removeText, renderErrorTip, renderUnderWavyLine, renderUnderline, runTextLineRender, setChildrenModifyFlag, setNotifyChangedCallback, setTraceTrackingFlag, suppressTracking, targetMaps, textLineRenderMode, toRawType, toTypeString, trueChar, updatePartialProps, validateDataEle, validateDataEleRenderObj, validateDataGroup, validateInlineDataEle, validateInlineInputRenderObj, watchChanged };
 //# sourceMappingURL=index.js.map