@hailin-zheng/editor-core 2.2.9 → 2.2.11

package/index-cjs.js

@@ -1539,7 +1539,7 @@ class BranchElement extends Element {
     }
     treeFilter(predicate, options) {
         if (!options) {
-            options = { includeChildren: true };
+            options = { includeChildren: false };
         }
         const items = [];
         for (let i = 0; i < this.length; i++) {
@@ -1552,7 +1552,7 @@ class BranchElement extends Element {
                 }
             }
             if (item instanceof BranchElement) {
-                items.push(...item.treeFilter(predicate));
+                items.push(...item.treeFilter(predicate, options));
             }
         }
         return items;
@@ -1737,6 +1737,8 @@ class ViewOptions {
     dataDecoratorNormalColor = '#0050b3';
     dataDecoratorMouseEnterColor = '#0050b3';
     dataDecoratorFocusedColor = '#0050b3';
+    //是否显示数据元修饰符
+    showDataEleDecorator = true;
     //数据元没有输入值时背景颜色
     dataEleEmptyBgColor = '';
     //数据元鼠标悬浮颜色
@@ -1747,7 +1749,14 @@ class ViewOptions {
     dataEleFocusedBgColor = '#d9d9d9';
     //数据元正常背景颜色
     dataEleNormalBgColor = '#fafafa';
+    //数据元错误背景颜色
     dataEleErrorBgColor = '#ff4d4f';
+    //数据元正常背景颜色
+    dataGroupEleNormalBgColor = '';
+    //数据元鼠标悬浮颜色
+    dataGroupMouseEnterBgColor = '';
+    //数据元只读背景颜色
+    dataGroupFocusedBgColor = '';
     viewBackcolor = 'rgb(230,230,230)';
     paraSymbolColor = 'rgb(128,128,128)';
     dataGroupColor = 'rgb(0,80,179)';
@@ -8701,7 +8710,7 @@ class BreakFactory extends ElementFactory {
     }
 }
 
-class DataElementGroupElement extends DataElementInlineGroup {
+class DataElementGroupElement extends InlineGroupInputElement {
     constructor() {
         super('data-group');
         this.props = new DataElementGroupProps();
@@ -8741,7 +8750,6 @@ class DataElementGroupElement extends DataElementInlineGroup {
                 });
             }
         }
-        this.onChangedValidate();
     }
     getValue() {
         return ElementSerialize.serializeString(this, { all: false });
@@ -8793,6 +8801,24 @@ 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;
+}
+function validateDataGroup(control) {
+    return control instanceof DataElementGroupElement;
 }
 
 class DataElementImage extends DataElementLeaf {
@@ -12525,6 +12551,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 +12707,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;
@@ -13369,17 +13415,20 @@ class DocumentContext {
         this.ss = ss;
     }
     getControlIDList() {
-        const dataEleList = this.ctx.treeFilter(item => validateDataEle(item));
+        const dataEleList = this.ctx.treeFilter(item => this.isDataEle(item));
         return dataEleList.map(item => item.props.id);
     }
     getControlInstanceList(options) {
-        return this.ctx.treeFilter(item => validateDataEle(item), options);
+        return this.ctx.treeFilter(item => this.isDataEle(item), options);
     }
     getControlById(id) {
-        return this.ctx.treeFind(item => validateDataEle(item) && item['props']['id'] === id);
+        return this.ctx.treeFind(item => this.isDataEle(item) && item['props']['id'] === id);
+    }
+    isDataEle(ele) {
+        return validateDataEle(ele) || ele instanceof DataElementGroupElement;
     }
     getControlByName(name) {
-        return this.ctx.treeFind(item => validateDataEle(item) && item['props']['name'] === name);
+        return this.ctx.treeFind(item => this.isDataEle(item) && item['props']['name'] === name);
     }
     /**
      * 获取数据元值集合
@@ -13397,7 +13446,7 @@ class DocumentContext {
      * @returns
      */
     getDataElementModelList(options) {
-        const dataEleList = this.ctx.treeFilter(item => validateDataEle(item), options);
+        const dataEleList = this.ctx.treeFilter(item => this.isDataEle(item), options);
         //数据元、数据组
         const dataInlineGroups = dataEleList.filter(item => item instanceof DataElementInlineGroup);
         const dataLeafs = dataEleList.filter(item => item instanceof DataElementLeaf);
@@ -15471,12 +15520,12 @@ class DocumentEvent {
             },
             mouseup: (evt) => {
                 this.mouseup(evt, ElementUtil.getMousePos(evt, scale));
-                this.mouseClickHandle(evt);
+                //this.mouseClickHandle(evt);
             },
             click: (evt) => {
                 //nulltext 不触发 click 事件，暂且这么处理
                 //移到 mouseup 事件中处理
-                //this.mouseClickHandle(evt);
+                this.mouseClickHandle(evt);
             },
             mousemove: (evt) => {
                 this.mousemove(evt, ElementUtil.getMousePos(evt, scale));
@@ -16703,6 +16752,30 @@ class DocumentEvent {
         }
         return null;
     }
+    /**
+  * 获取当前光标所在的数据组
+  * @returns
+  */
+    getCurrentDataGroupElement(mode = 'strict') {
+        const selectionState = this.selectionState;
+        const { startControl, startOffset, collapsed, ancestorCommonControl } = selectionState;
+        if (startControl && collapsed) {
+            // if (!ElementUtil.verifyHitable(startControl)) {
+            //     return null;
+            // }
+            const dataEle = ElementUtil.getParent(startControl, validateDataGroup);
+            if (mode === 'free' || IsInSideDataGroup(startControl, startOffset)) {
+                return dataEle;
+            }
+            else {
+                return null;
+            }
+        }
+        else if (!collapsed && ancestorCommonControl) {
+            return ElementUtil.getParent(ancestorCommonControl, validateDataGroup);
+        }
+        return null;
+    }
 }
 
 /**
@@ -17531,8 +17604,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;
     }
@@ -17847,6 +17924,14 @@ class DocumentChange {
             }
             return;
         }
+        const dataGroup = ElementUtil.getDataGroupElement(range.target);
+        if (dataGroup) {
+            this.deleteRange(range);
+            if (!startPointElement || ElementUtil.getParent(startPointElement, item => validateDataGroup(item)) !== dataGroup) {
+                this.selectionState.resetRange(dataGroup.startDecorate, 1);
+            }
+            return;
+        }
         //在数据元外删除
         else {
             this.loopForDelDataEleRange(range);
@@ -18462,9 +18547,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 +18561,7 @@ class DocumentChange {
                 }
                 else {
                     return {
-                        ele: control.parent.startDecorate,
+                        ele: (control.parent).startDecorate,
                         offset: 1
                     };
                 }
@@ -20951,6 +21040,13 @@ class DocEditor {
     getCurrentDataElement() {
         return this.documentEvent.getCurrentDataElement();
     }
+    /**
+     * 回去当前光标所在数据组
+     * @returns
+     */
+    getCurrentDataGroupElement() {
+        return this.documentEvent.getCurrentDataGroupElement();
+    }
     /**
      * 移动光标到下一个数据元素上
      */
@@ -21984,7 +22080,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.9";
+        return "2.2.11";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -27839,6 +27935,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;
@@ -27965,6 +28062,7 @@ exports.toTypeString = toTypeString;
 exports.trueChar = trueChar;
 exports.validateDataEle = validateDataEle;
 exports.validateDataEleRenderObj = validateDataEleRenderObj;
+exports.validateDataGroup = validateDataGroup;
 exports.validateInlineInputRenderObj = validateInlineInputRenderObj;
 exports.watchChanged = watchChanged;
 //# sourceMappingURL=index-cjs.js.map