@hailin-zheng/editor-core 2.2.8 → 2.2.10

package/editor.css

@@ -9,6 +9,9 @@
 .svg-container * {
 	white-space: pre;
 }
+.svg-container svg{
+	pointer-events: none;
+}
 
 .drop-container {
 	position: absolute;

package/index-cjs.js

@@ -1537,12 +1537,19 @@ class BranchElement extends Element {
         }
         return len;
     }
-    treeFilter(predicate) {
+    treeFilter(predicate, options) {
+        if (!options) {
+            options = { includeChildren: true };
+        }
         const items = [];
         for (let i = 0; i < this.length; i++) {
             const item = this.getChild(i);
             if (predicate(item)) {
                 items.push(item);
+                //已经匹配节点，不需要匹配当前元素的子节点
+                if (!options.includeChildren) {
+                    continue;
+                }
             }
             if (item instanceof BranchElement) {
                 items.push(...item.treeFilter(predicate));
@@ -2870,15 +2877,7 @@ class ValidateProps {
         return clone;
     }
 }
-class DataElementGroupProps extends DataEleBaseProps {
-    clone(dest) {
-        const clone = dest ?? new DataElementGroupProps();
-        super.cloneBaseProps(clone);
-    }
-    getSerializeProps(options) {
-        const props = {};
-        return this.getBaseProps(props, options);
-    }
+class DataElementGroupProps extends DataEleBaseTextProps {
 }
 class DataElementBarcodeProps {
     type = 'code128';
@@ -8647,6 +8646,61 @@ class DataElementDateFactory extends DataElementBaseFactory {
     }
 }
 
+class BreakElement extends LeafElement {
+    textProps;
+    constructor() {
+        super('br');
+        this.textProps = new TextProps();
+        this.textProps.fontSize = 14;
+        this.textProps.fontName = '宋体';
+        this.textProps.color = '#595959';
+    }
+    createRenderObject() {
+        const symbol = new BreakRenderObject(this);
+        symbol.rect.height = 14;
+        symbol.rect.width = 7;
+        return symbol;
+    }
+    serialize() {
+        return {
+            type: 'br',
+            props: {}
+        };
+    }
+    clone() {
+        const clone = new BreakElement();
+        cloneElementBase(this, clone);
+        return clone;
+    }
+}
+class BreakRenderObject extends LeafRenderObject {
+    exportSVG(event) {
+        if (!event.options.showEnterSymbol || event.mode === 'print') {
+            return null;
+        }
+        return ElementUtil.createSvgText('↓', { 'dominant-baseline': 'hanging',
+            'font-family': 'Courier',
+            'font-size': this.rect.height,
+            x: this.rect.x + 4,
+            y: this.rect.y,
+            fill: 'green' });
+    }
+    clone() {
+        const render = new BreakRenderObject(this.element);
+        render.rect = ElementUtil.cloneRect(this.rect);
+        return render;
+    }
+}
+class BreakFactory extends ElementFactory {
+    match(type) {
+        return type === 'br';
+    }
+    createElement(data) {
+        const ele = new BreakElement();
+        return ele;
+    }
+}
+
 class DataElementGroupElement extends InlineGroupInputElement {
     constructor() {
         super('data-group');
@@ -8660,6 +8714,37 @@ class DataElementGroupElement extends InlineGroupInputElement {
             this.refreshView();
         });
     }
+    setValue(val) {
+        if (val === null || val === undefined) {
+            val = '';
+        }
+        if (this.getValue() === val) {
+            return;
+        }
+        this.pubOnChange('self');
+        this.clearInnerItems();
+        if (typeof val !== 'string') {
+            val += '';
+        }
+        if (val) {
+            const items = val.split('<br/>');
+            if (items.length) {
+                items.forEach((item, index) => {
+                    const valueText = new TextGroupElement();
+                    this.props.valueTextProps.clone(valueText.props);
+                    valueText.text = item + '';
+                    this.addChild(valueText, this.length - 1);
+                    if (index < items.length - 1) {
+                        const brElement = new BreakElement();
+                        this.addChild(brElement, this.length - 1);
+                    }
+                });
+            }
+        }
+    }
+    getValue() {
+        return ElementSerialize.serializeString(this, { all: false });
+    }
     clone(data) {
         return super.cloneSelf(data, DataElementGroupElement);
     }
@@ -8695,9 +8780,33 @@ class DataElementGroupFactory extends DataElementBaseFactory {
     createElement(data) {
         const props = data.props;
         const ele = new DataElementGroupElement();
-        ElementUtil.readEleBaseProps(ele.props, props);
+        this.createDataEleProps(ele.props, props);
         return ele;
     }
+    createDataEleProps(dest, props) {
+        const dataEleProps = dest;
+        ElementUtil.readEleBaseProps(dataEleProps, props);
+        dataEleProps.nullText = props.nullText;
+        dataEleProps.nullTextProps = ElementUtil.readTextProps(null, props.nullTextProps, this.options);
+        dataEleProps.valueTextProps = ElementUtil.readTextProps(null, props.valueTextProps, this.options);
+        dataEleProps.dataType = props.dataType;
+        return dataEleProps;
+    }
+}
+/**
+ * 是否在数据组内部
+ * @param control
+ * @param offset
+ */
+function IsInSideDataGroup(control, offset) {
+    const mathEle = ElementUtil.getParent(control, (item) => item instanceof DataElementGroupElement);
+    if (mathEle) {
+        if ((control === mathEle.startDecorate && offset === 0) || (control === mathEle.endDecorate && offset === 1)) {
+            return false;
+        }
+        return true;
+    }
+    return false;
 }
 
 class DataElementImage extends DataElementLeaf {
@@ -8939,61 +9048,6 @@ class DataElementListFactory extends DataElementBaseFactory {
     }
 }
 
-class BreakElement extends LeafElement {
-    textProps;
-    constructor() {
-        super('br');
-        this.textProps = new TextProps();
-        this.textProps.fontSize = 14;
-        this.textProps.fontName = '宋体';
-        this.textProps.color = '#595959';
-    }
-    createRenderObject() {
-        const symbol = new BreakRenderObject(this);
-        symbol.rect.height = 14;
-        symbol.rect.width = 7;
-        return symbol;
-    }
-    serialize() {
-        return {
-            type: 'br',
-            props: {}
-        };
-    }
-    clone() {
-        const clone = new BreakElement();
-        cloneElementBase(this, clone);
-        return clone;
-    }
-}
-class BreakRenderObject extends LeafRenderObject {
-    exportSVG(event) {
-        if (!event.options.showEnterSymbol || event.mode === 'print') {
-            return null;
-        }
-        return ElementUtil.createSvgText('↓', { 'dominant-baseline': 'hanging',
-            'font-family': 'Courier',
-            'font-size': this.rect.height,
-            x: this.rect.x + 4,
-            y: this.rect.y,
-            fill: 'green' });
-    }
-    clone() {
-        const render = new BreakRenderObject(this.element);
-        render.rect = ElementUtil.cloneRect(this.rect);
-        return render;
-    }
-}
-class BreakFactory extends ElementFactory {
-    match(type) {
-        return type === 'br';
-    }
-    createElement(data) {
-        const ele = new BreakElement();
-        return ele;
-    }
-}
-
 class DataElementText extends DataElementInlineGroup {
     //props: DataEleBaseTextProps;
     constructor() {
@@ -12485,6 +12539,14 @@ class ElementUtil {
     static getDataElement(ele) {
         return this.getParent(ele, item => item instanceof DataElementInlineGroup);
     }
+    /**
+    * 向上查找类型为数据元的父级
+    * @param ele
+    * @returns
+    */
+    static getDataGroupElement(ele) {
+        return this.getParent(ele, item => item instanceof DataElementGroupElement);
+    }
     static getOSPlatform() {
         const userAgent = navigator.userAgent;
         if (userAgent.indexOf('Windows') > -1) {
@@ -12633,23 +12695,35 @@ class ElementUtil {
         if (startControl.paintRenders.length === 0) {
             return false;
         }
+        if (!ElementUtil.verifyHitable(startControl)) {
+            return false;
+        }
         if (viewOptions.docMode === exports.DocMode.Design) {
             return true;
         }
-        //表单模式下，如果不在数据元素中，则不显示光标
+        //表单模式下
         if (viewOptions.docMode === exports.DocMode.FormEdit) {
-            if (!IsInSideDataElement(startControl, startOffset)) {
-                return false;
+            //如果光标在数据元素中，判断是否可编辑
+            if (IsInSideDataElement(startControl, startOffset)) {
+                const dataEle = ElementUtil.getDataElement(startControl);
+                //数据元不可编辑
+                if (dataEle && !dataEle.props.editable) {
+                    return false;
+                }
+                return true;
             }
-        }
-        if (!ElementUtil.verifyHitable(startControl)) {
-            return false;
-        }
-        //表单模式下，数据元不可编辑
-        if (viewOptions.docMode === exports.DocMode.FormEdit && IsInSideDataElement(startControl, startOffset)) {
-            const dataEle = ElementUtil.getDataElement(startControl);
-            if (dataEle && !dataEle.props.editable) {
-                return false;
+            else {
+                //不在数据元中，需要判断是否在数据组中
+                if (IsInSideDataGroup(startControl, startOffset)) {
+                    const dataGroup = ElementUtil.getDataGroupElement(startControl);
+                    //数据元不可编辑
+                    if (dataGroup && !dataGroup.props.editable) {
+                        return false;
+                    }
+                }
+                else {
+                    return false;
+                }
             }
         }
         return true;
@@ -13332,8 +13406,8 @@ class DocumentContext {
         const dataEleList = this.ctx.treeFilter(item => validateDataEle(item));
         return dataEleList.map(item => item.props.id);
     }
-    getControlInstanceList() {
-        return this.ctx.treeFilter(item => validateDataEle(item));
+    getControlInstanceList(options) {
+        return this.ctx.treeFilter(item => validateDataEle(item), options);
     }
     getControlById(id) {
         return this.ctx.treeFind(item => validateDataEle(item) && item['props']['id'] === id);
@@ -13356,8 +13430,9 @@ class DocumentContext {
      * 获取数据元结构以及get\set闭包调用函数
      * @returns
      */
-    getDataElementModelList() {
-        const dataEleList = this.ctx.treeFilter(item => validateDataEle(item) || item instanceof DataElementInlineGroup);
+    getDataElementModelList(options) {
+        const dataEleList = this.ctx.treeFilter(item => validateDataEle(item), options);
+        //数据元、数据组
         const dataInlineGroups = dataEleList.filter(item => item instanceof DataElementInlineGroup);
         const dataLeafs = dataEleList.filter(item => item instanceof DataElementLeaf);
         //复选框数据元
@@ -13366,7 +13441,7 @@ class DocumentContext {
         const dataOtherLeafValues = CommonUtil.removeUnionSet(dataLeafs, dataCheckList).map(item => ({
             id: item.props.id,
             name: item.props.name,
-            fieldName: item.props.field,
+            fieldName: item.props.fieldName,
             item,
             getValue: () => {
                 return item.getValue();
@@ -17490,8 +17565,12 @@ class DocumentChange {
      * @private
      */
     canDeleteInlineGroup(dataEle) {
+        //当前编辑模式为表单模式，单独的数据元不可删除
+        //存在于数据组内的数据元可以删除
         if (this.viewOptions.docMode === exports.DocMode.FormEdit) {
-            return false;
+            if (dataEle.parent.type !== 'data-group') {
+                return false;
+            }
         }
         return dataEle.length === 2;
     }
@@ -18421,9 +18500,13 @@ class DocumentChange {
     }
     getCursorElementByDeleteAction(control) {
         if (this.viewOptions.docMode === exports.DocMode.FormEdit) {
-            if (control.parent instanceof DataElementInlineGroup) {
+            //是否属于数据元或者数据组区域
+            const isInDataAre = (ele) => {
+                return ele.parent instanceof DataElementInlineGroup || ele.parent instanceof DataElementGroupElement;
+            };
+            if (isInDataAre(control)) {
                 const prevLeafElementInPara = ElementUtil.getRecursionPrevSiblingElement(control, true, true, this.viewOptions);
-                if (prevLeafElementInPara && ElementUtil.getParent(prevLeafElementInPara, item => item instanceof DataElementInlineGroup)) {
+                if (prevLeafElementInPara && isInDataAre(prevLeafElementInPara)) {
                     return {
                         ele: prevLeafElementInPara,
                         offset: ElementUtil.getElementEndOffset(prevLeafElementInPara)
@@ -18431,7 +18514,7 @@ class DocumentChange {
                 }
                 else {
                     return {
-                        ele: control.parent.startDecorate,
+                        ele: (control.parent).startDecorate,
                         offset: 1
                     };
                 }
@@ -20904,7 +20987,7 @@ class DocEditor {
         this.onDblClickEvent.next(evt);
     }
     /**
-     * 获取当前光标所在的数据元
+     * 获取当前光标所在的数据元或者数据组
      * @returns
      */
     getCurrentDataElement() {
@@ -21943,7 +22026,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.8";
+        return "2.2.10";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -27798,6 +27881,7 @@ exports.InlineGroupRenderObject = InlineGroupRenderObject;
 exports.InlineMuiltBlockLineRenderObject = InlineMuiltBlockLineRenderObject;
 exports.InputElementEvent = InputElementEvent;
 exports.IsInSideDataElement = IsInSideDataElement;
+exports.IsInSideDataGroup = IsInSideDataGroup;
 exports.IsInSideInlineGroupInputElement = IsInSideInlineGroupInputElement;
 exports.KeyboradElementEvent = KeyboradElementEvent;
 exports.LeafElement = LeafElement;