@hailin-zheng/editor-core 2.2.9 → 2.2.10

package/index-cjs.js

@@ -8701,7 +8701,7 @@ class BreakFactory extends ElementFactory {
     }
 }
 
-class DataElementGroupElement extends DataElementInlineGroup {
+class DataElementGroupElement extends InlineGroupInputElement {
     constructor() {
         super('data-group');
         this.props = new DataElementGroupProps();
@@ -8741,7 +8741,6 @@ class DataElementGroupElement extends DataElementInlineGroup {
                 });
             }
         }
-        this.onChangedValidate();
     }
     getValue() {
         return ElementSerialize.serializeString(this, { all: false });
@@ -8793,6 +8792,21 @@ class DataElementGroupFactory extends DataElementBaseFactory {
         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 {
@@ -12525,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) {
@@ -12673,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;
@@ -17531,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;
     }
@@ -18462,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)
@@ -18472,7 +18514,7 @@ class DocumentChange {
                 }
                 else {
                     return {
-                        ele: control.parent.startDecorate,
+                        ele: (control.parent).startDecorate,
                         offset: 1
                     };
                 }
@@ -20945,7 +20987,7 @@ class DocEditor {
         this.onDblClickEvent.next(evt);
     }
     /**
-     * 获取当前光标所在的数据元
+     * 获取当前光标所在的数据元或者数据组
      * @returns
      */
     getCurrentDataElement() {
@@ -21984,7 +22026,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.9";
+        return "2.2.10";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -27839,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;