@hailin-zheng/editor-core 2.2.26 → 2.2.28

package/index-cjs.js

@@ -2604,9 +2604,9 @@ class DataEleListProps extends DataEleBaseTextProps {
     }
     options = [];
     /**
-     * 是否保存选项到病历文件里面
+     * 是否持久化选项到病历文件里面
      */
-    saveOptions = true;
+    persistItems = true;
     dropDownStyle;
     /**
      * 是否允许多选
@@ -2620,28 +2620,41 @@ class DataEleListProps extends DataEleBaseTextProps {
         clone.dropDownStyle = this.dropDownStyle;
         clone.multiSelect = this.multiSelect;
         clone.displayField = this.displayField;
+        clone.persistItems = this.persistItems;
         return clone;
     }
     getSerializeProps(options) {
         const props = {
-            options: [...this.options],
             multiSelect: this.multiSelect,
             dropDownStyle: this.dropDownStyle,
+            persistItems: this.persistItems,
         };
         if (this.displayField && this.displayField !== 'value') {
             props['displayField'] = this.displayField;
         }
+        if (this.persistItems) {
+            props.options = [...this.options];
+        }
         super.getBaseProps(props, options);
         return props;
     }
     updateProps(props) {
         super.updateProps(props);
-        this.options = props.options;
-        this.multiSelect = props.multiSelect;
-        this.dropDownStyle = props.dropDownStyle;
-        this.displayField = props.displayField;
+        updatePartialProps(this, props);
     }
 }
+function updatePartialProps(destProps, sourceProps) {
+    const destPropsKeys = Object.keys(destProps);
+    const sourcePropsKeys = Object.keys(sourceProps);
+    sourcePropsKeys.forEach(key => {
+        if (destPropsKeys.includes(key)) {
+            if (destProps[key] === sourceProps[key]) {
+                return;
+            }
+            destProps[key] = sourceProps[key];
+        }
+    });
+}
 class CommContentProps extends INotifyPropertyChanged {
     id;
     createId;
@@ -6984,6 +6997,9 @@ class DocumentSelection {
         if (!this.snapshotSelectionState) {
             return true;
         }
+        if (this.selectionState.editable !== this.snapshotSelectionState.editable) {
+            return true;
+        }
         if (this.selectionState.startControl !== this.snapshotSelectionState.startControl || this.selectionState.startOffset !== this.snapshotSelectionState.startOffset) {
             return true;
         }
@@ -9408,6 +9424,7 @@ class DataElementListFactory extends DataElementBaseFactory {
         dataEleProps.options = [...options];
         dataEleProps.dropDownStyle = props.dropDownStyle;
         dataEleProps.displayField = props.displayField ?? 'value';
+        dataEleProps.persistItems = props.persistItems ?? true;
         return dataEleProps;
     }
 }
@@ -18653,18 +18670,45 @@ class DocumentChange {
      */
     insertElement(targetElement, targetOffset, destEleArray) {
         let lastEle;
+        //创建文本元素并插入
+        const insertNewText = (text, parent, index) => {
+            const inputTextProps = this.getDefaultTextPropsByOptions();
+            const newTextEle = ElementUtil.getNewTextGroup(inputTextProps);
+            newTextEle.text = text;
+            parent.addChild(newTextEle, index);
+        };
         if (targetElement instanceof TextGroupElement) {
             const { leftElement, rightElement } = this.splitText(targetElement, targetOffset);
             if (leftElement) {
                 for (let i = 0; i < destEleArray.length; i++) {
                     lastEle = destEleArray[i];
-                    leftElement.parent.addChild(lastEle, leftElement.getIndex() + 1 + i);
+                    //判断是否可以插入元素
+                    if (this.canInsertElement(leftElement.parent, lastEle)) {
+                        leftElement.parent.addChild(lastEle, leftElement.getIndex() + 1 + i);
+                    }
+                    else {
+                        //序列化为纯文本
+                        const serializeString = ElementSerialize.serializeString(lastEle);
+                        if (serializeString) {
+                            insertNewText(serializeString, leftElement.parent, leftElement.getIndex() + 1 + i);
+                        }
+                    }
                 }
             }
             else if (rightElement) {
                 for (let i = 0; i < destEleArray.length; i++) {
                     lastEle = destEleArray[i];
-                    rightElement.parent.addChild(lastEle, rightElement.getIndex());
+                    //判断是否可以插入元素
+                    if (this.canInsertElement(rightElement.parent, lastEle)) {
+                        rightElement.parent.addChild(lastEle, rightElement.getIndex());
+                    }
+                    else {
+                        //序列化为纯文本
+                        const serializeString = ElementSerialize.serializeString(lastEle);
+                        if (serializeString) {
+                            insertNewText(serializeString, rightElement.parent, rightElement.getIndex());
+                        }
+                    }
                 }
             }
         }
@@ -18673,13 +18717,39 @@ class DocumentChange {
             let insertTargetOffset = targetOffset;
             for (let i = 0; i < destEleArray.length; i++) {
                 lastEle = destEleArray[i];
-                insertTarget.parent.addChild(lastEle, insertTarget.getIndex() + insertTargetOffset);
-                insertTarget = lastEle;
-                insertTargetOffset = 1;
+                //判断是否可以插入元素
+                if (this.canInsertElement(insertTarget.parent, lastEle)) {
+                    insertTarget.parent.addChild(lastEle, insertTarget.getIndex() + insertTargetOffset);
+                    insertTarget = lastEle;
+                    insertTargetOffset = 1;
+                }
             }
         }
         return lastEle;
     }
+    /**
+     * 校验容器是否允许插入元素
+     * @param container
+     * @param ele
+     * @returns
+     */
+    canInsertElement(container, ele) {
+        //是否为数据元
+        const isDataEle = container instanceof DataElementInlineGroup;
+        //数据元内部不能嵌套数据元
+        if (isDataEle && ele instanceof DataElementInlineGroup) {
+            return false;
+        }
+        //非布局元素不可以插入段落
+        if (!(container instanceof BlockContainerElement) && ele instanceof BlockContentElement) {
+            return false;
+        }
+        //段落内容内不能插入布局元素
+        if (!(container instanceof BlockContentElement) && ele instanceof BlockContainerElement) {
+            return false;
+        }
+        return true;
+    }
     /**
      * 根据开始位置和结束位置，将字符切割成指定的区间
      * @param text
@@ -18935,10 +19005,7 @@ class DocumentChange {
         }
         //表单模式:如果复制的是单格式的文本，需要序列化为纯文本处理
         if (this.viewOptions.docMode === exports.DocMode.FormEdit) {
-            const pasteString = pasteEles.map(item => ElementSerialize.serializeString(item)).join('');
-            if (pasteString) {
-                this.pastePlainText(pasteString);
-            }
+            this.handlePasteInFormEditMode(pasteEles);
             return;
         }
         //复制的内容为表格，且操作位于单元格内
@@ -18966,6 +19033,23 @@ class DocumentChange {
             this.selectionState.resetRange(lastEle, -1);
         }
     }
+    /**
+     * 处理表单模式下的粘贴事件
+     * @param data 要粘贴的元素
+     */
+    handlePasteInFormEditMode(data) {
+        // if (data.some(item => this.canInsertElement()))
+        //     const pasteString = data.map(item => ElementSerialize.serializeString(item)).join('');
+        // if (pasteString) {
+        //     this.pastePlainText(pasteString);
+        // }
+        const { startControl, startOffset } = this.selectionState;
+        const lastEle = this.insertElement(startControl, startOffset, data);
+        this.selectionState.clear();
+        if (lastEle && lastEle.parent) {
+            this.selectionState.resetRange(lastEle, -1);
+        }
+    }
     /**
      * 复制单元格向另一个单元格粘贴
      * @private
@@ -22042,6 +22126,14 @@ class DocEditor {
     getDocSchema() {
         return ElementSerialize.serialize(this.docCtx.document, this.viewOptions);
     }
+    /**
+     * 获取元素模型
+     * @param ele
+     * @returns
+     */
+    getEleSchemaJSON(ele) {
+        return JSON.stringify(ElementSerialize.serialize(ele, this.viewOptions));
+    }
     getDocSchemaJSON() {
         const res = JSON.stringify(this.getDocSchema());
         return res;
@@ -23052,7 +23144,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.26";
+        return "2.2.28";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -29087,6 +29179,7 @@ exports.textLineRenderMode = textLineRenderMode;
 exports.toRawType = toRawType;
 exports.toTypeString = toTypeString;
 exports.trueChar = trueChar;
+exports.updatePartialProps = updatePartialProps;
 exports.validateDataEle = validateDataEle;
 exports.validateDataEleRenderObj = validateDataEleRenderObj;
 exports.validateDataGroup = validateDataGroup;