@hailin-zheng/editor-core 1.0.7 → 1.0.10

package/{lib/framework/element-serialize.js → src/med_editor/framework/element-serialize.ts}

@@ -1,23 +1,25 @@
-import { BranchElement } from "./element-define";
+import { SelectionState } from "./document-selection";
+import { BranchElement, Element, SerializeProps, ViewOptions } from "./element-define";
 import { ElementUtil } from "./element-util";
 import { validateDataEle } from "./impl/data-element/data-element-base-impl";
 import { TextGroupElement } from "./impl/text/text-impl";
 import { TrackRunElement, TrackRunTypeEnum } from "./impl/text/track-run-impl";
+
 export class ElementSerialize {
-    static serialize(element, viewOptions) {
+    static serialize(element: Element, viewOptions: ViewOptions): SerializeProps | null {
         if (element instanceof BranchElement) {
             const result = element.serialize(viewOptions);
             if (!result || result.complete) {
                 return result;
             }
             result.children = [];
-            let prevEle = null;
+            let prevEle: { ele: Element, props: any } | null = null;
             for (let i = 0; i < element.length; i++) {
                 const child = element.getChild(i);
                 const serializeChild = this.serialize(child, viewOptions);
                 if (child.type === 'text' && prevEle && prevEle.ele.type === 'text') {
-                    if (child.props.equals(prevEle.ele.props)) {
-                        prevEle.props.content += serializeChild.content;
+                    if ((<TextGroupElement>child).props.equals((<TextGroupElement>prevEle.ele).props)) {
+                        prevEle.props.content += (<any>serializeChild).content;
                         continue;
                     }
                 }
@@ -25,7 +27,7 @@ export class ElementSerialize {
                     delete serializeChild.complete;
                     serializeChild.props = serializeChild.props || {};
                     if (Object.keys(serializeChild.props).length === 0) {
-                        delete serializeChild.props;
+                        delete serializeChild.props
                     }
                     if (serializeChild.children && serializeChild.children.length === 0) {
                         delete serializeChild.children;
@@ -35,12 +37,12 @@ export class ElementSerialize {
                 }
             }
             return result;
-        }
-        else {
+        } else {
             return element.serialize(viewOptions);
         }
     }
-    static serializeString(element, options = { all: false }) {
+
+    static serializeString(element: Element, options: { all: boolean } = { all: false }): string {
         if (!options.all && element instanceof TrackRunElement && element.type === TrackRunTypeEnum.Deleted) {
             return '';
         }
@@ -48,7 +50,7 @@ export class ElementSerialize {
             return element.text;
         }
         if (element instanceof BranchElement) {
-            const items = [];
+            const items: Array<string> = [];
             for (let i = 0; i < element.length; i++) {
                 const item = element.getChild(i);
                 items.push(this.serializeString(item, options));
@@ -57,46 +59,49 @@ export class ElementSerialize {
         }
         return "";
     }
+
+
     /**
      * 获取选中的结构
      * @param ss
      * @param viewOptions
      */
-    static getSelectedStruct(ss, viewOptions) {
+    static getSelectedStruct(ss: SelectionState, viewOptions: ViewOptions): Element | null {
         if (ss.collapsed || !ss.startControl || !ss.selectedRange) {
             return null;
         }
         const range = ss.selectedRange;
         return ElementUtil.cloneRange(range, false, 'copy');
     }
+
     /**
      * 选中的文本
      * @param ss
      * @param viewOptions
      */
-    static getSelectedText(ss, viewOptions) {
-        const selectedStruct = this.getSelectedStruct(ss, viewOptions);
+    static getSelectedText(ss: SelectionState, viewOptions: ViewOptions): string {
+        const selectedStruct = this.getSelectedStruct(ss, viewOptions) as BranchElement;
         if (selectedStruct) {
-            return this.serializeString(selectedStruct);
-        }
-        else {
+            return this.serializeString(selectedStruct,);
+        } else {
             return '';
         }
     }
-    static getSelectedJSON(ss, viewOptions) {
-        const selectedStruct = this.getSelectedStruct(ss, viewOptions);
+
+    static getSelectedJSON(ss: SelectionState, viewOptions: ViewOptions): string {
+        const selectedStruct = this.getSelectedStruct(ss, viewOptions) as BranchElement;
         if (selectedStruct) {
             return JSON.stringify(this.serialize(selectedStruct, viewOptions));
-        }
-        else {
+        } else {
             return '';
         }
     }
+
     /**
      * 遍历指定元素内部所有数据元列表
      */
-    static getDataElements(element) {
-        const array = [];
+    static getDataElements(element: BranchElement): Array<Element> {
+        const array: Array<Element> = [];
         for (let i = 0; i < element.length; i++) {
             const item = element.getChild(i);
             if (validateDataEle(item)) {
@@ -104,10 +109,18 @@ export class ElementSerialize {
                 continue;
             }
             if (item instanceof BranchElement) {
-                array.push(...this.getDataElements(item));
+                array.push(...this.getDataElements(item))
             }
         }
         return array;
     }
+
+
+
+}
+
+export interface DataElementValueStruct {
+    id: string,
+    name: string,
+    value: string
 }
-//# sourceMappingURL=element-serialize.js.map