@hailin-zheng/editor-core 2.2.30 → 2.2.32

package/index-cjs.js

@@ -1335,6 +1335,7 @@ class Element {
         this.disposed = true;
         this.visibleExpr = null;
         this.effectExpr = null;
+        this._onChangeEvent.unsubscribe();
     }
     addEvent(event, handle, useCapture = false) {
         if (!this._eventMap) {
@@ -4237,7 +4238,7 @@ class DataElementInlineGroup extends InlineGroupInputElement {
         //     this.expressFn = new Function();
         // }
     }
-    parserExpress;
+    parserExpr;
     /**
      * 解析表达式
      * @param ele
@@ -4250,7 +4251,7 @@ class DataElementInlineGroup extends InlineGroupInputElement {
         if (!this.props.expression || !data.options.enableDyExpression)
             return;
         //存在表达式，并且已经解析过，不再做处理
-        if (this.parserExpress)
+        if (this.parserExpr)
             return;
         const reactiveMode = data.renderCtx.drawMode !== 'print';
         try {
@@ -4259,7 +4260,7 @@ class DataElementInlineGroup extends InlineGroupInputElement {
             let compliedCode = parser(this.props.expression, depIdItems);
             compliedCode = addReturn(compliedCode);
             const executeCtx = execute.setExecuteCtx(this);
-            this.parserExpress = {
+            this.parserExpr = {
                 compliedCode,
                 func: new Function(`with(this){ ${compliedCode} }`),
                 depItems: depEleMap,
@@ -4285,20 +4286,20 @@ class DataElementInlineGroup extends InlineGroupInputElement {
                                 try {
                                     data.onNextView(() => {
                                         //当前元素可能被删除
-                                        const func = this.parserExpress.func;
+                                        const func = this.parserExpr?.func;
                                         if (!func) {
                                             return;
                                         }
                                         const tempExecuter = execute.create();
                                         //设置执行上下文,doc或者doc-part
-                                        tempExecuter.setExecuteCtx(this.parserExpress.executeCtx);
-                                        tempExecuter.setCurrentCtx(this, this.parserExpress.depItems);
+                                        tempExecuter.setExecuteCtx(this.parserExpr.executeCtx);
+                                        tempExecuter.setCurrentCtx(this, this.parserExpr.depItems);
                                         const fn = func.bind(tempExecuter);
                                         fn();
                                     });
                                 }
                                 catch (e) {
-                                    console.error(e, "表达式执行出错", this.parserExpress.compliedCode);
+                                    console.error(e, "表达式执行出错", this.parserExpr.compliedCode);
                                 }
                             });
                         });
@@ -4317,14 +4318,14 @@ class DataElementInlineGroup extends InlineGroupInputElement {
      * @private
      */
     evalEleExpr(executeCtx) {
-        if (this.parserExpress && this.parserExpress.func) {
+        if (this.parserExpr && this.parserExpr.func) {
             try {
-                executeCtx.setCurrentCtx(this, this.parserExpress.depItems);
-                const func = this.parserExpress.func.bind(executeCtx);
+                executeCtx.setCurrentCtx(this, this.parserExpr.depItems);
+                const func = this.parserExpr.func.bind(executeCtx);
                 func();
             }
             catch (e) {
-                console.error(e, "表达式执行出错:evalVisibleExpr", this.parserExpress.compliedCode);
+                console.error(e, "表达式执行出错:evalVisibleExpr", this.parserExpr.compliedCode);
             }
             finally {
                 executeCtx.clearCurrentCtx();
@@ -4342,6 +4343,11 @@ class DataElementInlineGroup extends InlineGroupInputElement {
         }
         this.errorTip = this.validate();
     }
+    destroy() {
+        this.visibleExpr = undefined;
+        this.parserExpr = undefined;
+        super.destroy();
+    }
 }
 function getCurrOptions(ele) {
     const doc = ElementUtil.getParent(ele, item => item.type === 'doc');
@@ -9362,6 +9368,9 @@ class DataElementList extends DataElementInlineGroup {
             this.clearInnerItems();
             return;
         }
+        if (typeof vals === 'string' && vals) {
+            vals = vals.split(';');
+        }
         if (!Array.isArray(vals)) {
             vals = [vals];
         }
@@ -11077,6 +11086,97 @@ class SVGFactory extends ElementFactory {
     }
 }
 
+class LineElement extends LeafElement {
+    constructor() {
+        super('line');
+        this.props = new LineProps();
+    }
+    createRenderObject() {
+        const symbol = new LineRenderObject(this);
+        symbol.rect.height = Math.ceil(14 * TEXT_HEIGHT_FACTOR);
+        symbol.rect.width = 20;
+        return symbol;
+    }
+    serialize(options) {
+        return {
+            type: 'line',
+            props: this.props.getSerializeProps(options)
+        };
+    }
+    clone() {
+        const clone = new LineElement();
+        cloneElementBase(this, clone);
+        this.props.clone(clone.props);
+        return clone;
+    }
+}
+class LineRenderObject extends LeafRenderObject {
+    exportSVG(event) {
+        return ElementUtil.createSvgLine({
+            x1: this.rect.x,
+            y1: this.rect.y,
+            x2: this.rect.x + this.rect.width,
+            y2: this.rect.y + this.rect.height,
+            'stroke-width': this.element.props.thickness,
+            stroke: this.element.props.color,
+            'stroke-dasharray': this.element.props.type === LineType.Dashed ? '5,5' : ''
+        });
+    }
+    clone() {
+        const render = new LineRenderObject(this.element);
+        render.rect = ElementUtil.cloneRect(this.rect);
+        return render;
+    }
+}
+class LineFactory extends ElementFactory {
+    match(type) {
+        return type === 'line';
+    }
+    createElement(data) {
+        const ele = new LineElement();
+        ele.props.width = data.props.width;
+        ele.props.type = data.props.type ?? LineType.Solid;
+        ele.props.thickness = data.props.thickness ?? 1;
+        ele.props.color = data.props.color ?? '#000000';
+        return ele;
+    }
+}
+// 定义线段类型的枚举
+var LineType;
+(function (LineType) {
+    LineType["Solid"] = "solid";
+    LineType["Dashed"] = "dashed";
+    LineType["Dotted"] = "dotted";
+    LineType["DashDot"] = "dash-dot";
+})(LineType || (LineType = {}));
+class LineProps {
+    width; // 线段的宽度，例如 '50%', '100px'
+    type = LineType.Solid; // 线段的类型，例如 LineType.Solid
+    thickness = 1; // 线段的粗细，例如 '2px'
+    color = '#000000'; // 线段的颜色，例如 '#000000'
+    clone(dest) {
+        const clone = dest ?? new LineProps();
+        clone.width = this.width;
+        clone.type = this.type;
+        clone.thickness = this.thickness;
+        clone.color = this.color;
+        return clone;
+    }
+    getSerializeProps(viewOptions) {
+        const props = {};
+        if (this.color !== '#000000') {
+            props.color = this.color;
+        }
+        if (this.type !== LineType.Solid) {
+            props.type = this.type;
+        }
+        if (this.thickness !== 1) {
+            props.thickness = this.thickness;
+        }
+        return props;
+    }
+}
+
 class ElementSerialize {
     /**
      * 将当前文档对象构建并输出到标准的JSON对象
@@ -13831,6 +13931,14 @@ class EditorContext {
     getCtx(ele) {
         return new DocumentContext(ele, this.selectionState);
     }
+    /**
+     * 注入右键菜单事件处理器
+     * @param elementType 元素类型
+     * @param eventName 事件名称
+     * @param handler 回调处理函数
+     * @param useCapture 是否为捕获阶段
+     * @returns
+     */
     registerTypeHandlers(elementType, eventName, handler, useCapture = false) {
         if (elementTypeEventHandler.find(item => item.ctx === this && item.elementType === elementType && item.eventName === eventName && item.useCapture === useCapture)) {
             return;
@@ -20356,6 +20464,9 @@ class EditorCalendarVNode {
     }
     render(position, dataValue, format = 'YYYY-MM-DD HH:mm:ss') {
         format = format ?? 'YYYY-MM-DD HH:mm:ss';
+        if (dataValue !== this.currentDate) {
+            this.reset();
+        }
         if (!this.currentDate && dataValue) {
             const currDataValue = moment__default["default"](dataValue, format);
             this.currYear.value = currDataValue.year();
@@ -23188,7 +23299,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.30";
+        return "2.2.32";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -29099,6 +29210,10 @@ exports.IsInSideInlineGroupInputElement = IsInSideInlineGroupInputElement;
 exports.KeyboradElementEvent = KeyboradElementEvent;
 exports.LeafElement = LeafElement;
 exports.LeafRenderObject = LeafRenderObject;
+exports.LineElement = LineElement;
+exports.LineFactory = LineFactory;
+exports.LineProps = LineProps;
+exports.LineRenderObject = LineRenderObject;
 exports.LostCursorEvent = LostCursorEvent;
 exports.MarginProps = MarginProps;
 exports.MouseElementEvent = MouseElementEvent;