@hailin-zheng/editor-core 2.2.6 → 2.2.7

package/index.js

@@ -1717,7 +1717,7 @@ class ViewOptions {
     showCharRect;
     //数据元交互修饰模式
     dataEleDecoratorMode = 'outline';
-    dataEleDecoratorColor = '#0050b3';
+    dataEleDecoratorColor = '#ddd';
     showTabChar;
     showSpaceChar;
     showLineBreak;
@@ -2499,6 +2499,10 @@ class DataEleListProps extends DataEleBaseTextProps {
         super();
     }
     options = [];
+    /**
+     * 是否保存选项到病历文件里面
+     */
+    saveOptions = true;
     dropDownStyle;
     /**
      * 是否允许多选
@@ -2829,28 +2833,14 @@ class ValidateProps {
         return clone;
     }
 }
-class DataElementGroupProps extends INotifyPropertyChanged {
-    id;
-    name;
-    hidden;
+class DataElementGroupProps extends DataEleBaseProps {
     clone(dest) {
-        dest = dest ?? new DataElementGroupProps();
-        dest.id = this.id;
-        dest.name = this.name;
-        dest.hidden = this.hidden;
+        const clone = dest ?? new DataElementGroupProps();
+        super.cloneBaseProps(clone);
     }
-    getSerializeProps() {
+    getSerializeProps(options) {
         const props = {};
-        if (this.id) {
-            props.id = this.id;
-        }
-        if (this.name) {
-            props.name = this.name;
-        }
-        if (this.hidden) {
-            props.hidden = this.hidden;
-        }
-        return props;
+        return this.getBaseProps(props, options);
     }
 }
 class DataElementBarcodeProps {
@@ -2933,6 +2923,9 @@ class DataDecorateRenderObject extends LeafRenderObject {
         if (event.mode === 'print') {
             return null;
         }
+        // if(this.element.parent.parent.type==='data-group'){
+        //     return null;
+        // }
         const element = this.element;
         const lineWidth = 3;
         let path = '';
@@ -3933,19 +3926,83 @@ class DataElementInlineGroup extends InlineGroupInputElement {
     expressFn;
     beginMeasure(data) {
         super.beginMeasure(data);
-        if (!this.props.expression || !data.viewOptions.enableDyExpression) {
+        // if (!this.props.expression || !data.options.enableDyExpression) {
+        //     return;
+        // }
+        // try {
+        //     if (!this.expressFn) {
+        //         const code = parser(this.props.expression);
+        //         this.expressFn = new Function(`with(this){ ${code} }`);
+        //     }
+        //     this.expressFn.bind(data.execute)();
+        //     //this.expressFn();
+        // } catch (e) {
+        //     this.expressFn = new Function();
+        // }
+    }
+    parserExpress;
+    /**
+     * 解析可见性表达式
+     * @param ele
+     * @param execute
+     * @private
+     */
+    parseEleExpression(data) {
+        const execute = data.execute;
+        //不存在表达式，或者不启用表达式，不做处理
+        if (!this.props.expression || !data.options.enableDyExpression)
             return;
-        }
+        //存在表达式，并且已经解析过，不再做处理
+        if (this.parserExpress)
+            return;
+        const reactiveMode = data.renderCtx.drawMode !== 'print';
         try {
-            if (!this.expressFn) {
-                const code = parser(this.props.expression);
-                this.expressFn = new Function(`with(this){ ${code} }`);
+            const depIdItems = [];
+            const depEleMap = new Map();
+            let compliedCode = parser(this.props.expression, depIdItems);
+            compliedCode = addReturn(compliedCode);
+            if (depIdItems.length) {
+                depIdItems.forEach(dep => {
+                    const refCtx = execute.getObject(dep);
+                    if (refCtx.ref) {
+                        const refEle = refCtx.ref.item;
+                        depEleMap.set(dep, refCtx);
+                        //当前有可能是checkbox数组
+                        const refEles = Array.isArray(refEle) ? refEle : [refEle];
+                        reactiveMode && refEles.forEach(item => {
+                            //求值依赖元素更改的时候，发布当前元素重新计算的指令
+                            item.onChangeSubject.subscribe(() => {
+                                this.pubOnChange('self');
+                            });
+                        });
+                    }
+                });
             }
-            this.expressFn.bind(data.execute)();
-            //this.expressFn();
+            this.parserExpress = { compliedCode, func: new Function(`with(this){ ${compliedCode} }`), depItems: depEleMap };
         }
         catch (e) {
-            this.expressFn = new Function();
+            console.error('解析表达式出错,parseEleExpression', this.props.expression);
+        }
+    }
+    /**
+     * 元素可见行求值
+     * @param ele
+     * @param executeCtx
+     * @private
+     */
+    evalEleExpr(executeCtx) {
+        if (this.parserExpress && this.parserExpress.func) {
+            try {
+                executeCtx.setCurrentCtx(this, this.parserExpress.depItems);
+                const func = this.parserExpress.func.bind(executeCtx);
+                func();
+            }
+            catch (e) {
+                console.error(e, "表达式执行出错:evalVisibleExpr", this.parserExpress.compliedCode);
+            }
+            finally {
+                executeCtx.clearCurrentCtx();
+            }
         }
     }
     /**
@@ -8580,7 +8637,7 @@ class DataElementGroupElement extends InlineGroupInputElement {
         return {
             type: this.type,
             props: {
-                ...this.props.getSerializeProps()
+                ...this.props.getSerializeProps(viewOptions)
             }
         };
     }
@@ -8602,9 +8659,7 @@ class DataElementGroupFactory extends DataElementBaseFactory {
     createElement(data) {
         const props = data.props;
         const ele = new DataElementGroupElement();
-        ele.props.id = props.id;
-        ele.props.name = props.name;
-        ele.props.hidden = Boolean(props.hidden);
+        ElementUtil.readEleBaseProps(ele.props, props);
         return ele;
     }
 }
@@ -8909,7 +8964,11 @@ class DataElementText extends DataElementInlineGroup {
         super('data-ele-text');
         this.props = new DataEleBaseTextProps();
     }
-    createRenderObject() {
+    createRenderObject(data) {
+        if (data.options.enableDyExpression) {
+            this.parseEleExpression(data);
+            this.evalEleExpr(data.execute);
+        }
         return new DataElementTextRenderObject(this);
     }
     serialize(viewOptions) {
@@ -13867,7 +13926,7 @@ class ParagraphMeasure {
         }
     }
     arrangeInlineGroupElement(parentLine, ele) {
-        const { options, renderCtx } = this;
+        const { options, renderCtx, execute } = this;
         let render = this.createRenderObject(ele);
         //记录多行情况下的渲染对象，用于计算总长度，生成fill-null-space
         const inlineGroupRenders = [];
@@ -13903,7 +13962,7 @@ class ParagraphMeasure {
             isCloseToBody: parentLine.isCloseToBody,
             applyNewLine() {
                 parentLine.applyNewLine();
-                render = ele.createRenderObject({ options, renderCtx });
+                render = ele.createRenderObject({ options, renderCtx, execute });
                 parentLine.add(render);
                 inlineGroupRenders.push(render);
             },
@@ -14238,7 +14297,8 @@ class ParagraphMeasure {
         }
         return element.createRenderObject({
             options: this.options,
-            renderCtx: this.renderCtx
+            renderCtx: this.renderCtx,
+            execute: this.execute
         });
     }
 }
@@ -14397,8 +14457,9 @@ class DocumentArrange {
             this.pMeasure = new ParagraphMeasure(this.options, this.renderCtx, this.execute);
             const data = {
                 doc,
-                viewOptions: this.options,
+                options: this.options,
                 execute: this.execute,
+                renderCtx: this.renderCtx,
                 createParaFn: () => this.createDefaultPara()
             };
             this.reset(data);
@@ -14601,7 +14662,7 @@ class DocumentArrange {
         if (this.options.textRowLineMode && ele instanceof TableElement && ele.cacheRender) {
             const cacheRender = ele.cacheRender;
             clearChildrenRenderCache(ele);
-            textLineRenderMode(cacheRender, { options: this.options, renderCtx: this.renderCtx });
+            textLineRenderMode(cacheRender, { options: this.options, renderCtx: this.renderCtx, execute: this.execute });
         }
     }
     getDocInnerRect(documentRender) {
@@ -19419,7 +19480,7 @@ class EditorCalendarVNode {
             data: {
                 style: {
                     position: 'absolute',
-                    left: (position.x - 10) + 'px',
+                    left: (position.x) + 'px',
                     top: position.y + 5 + position.height + 'px',
                     'min-width': '100px',
                     'background-color': 'white',
@@ -19555,6 +19616,9 @@ class EditorCalendarVNode {
                                         on: {
                                             click: () => {
                                                 this.onClickDayItem(day.date);
+                                            },
+                                            dblclick: () => {
+                                                this.onSave();
                                             }
                                         }
                                     },
@@ -19612,12 +19676,7 @@ class EditorCalendarVNode {
                                     data: {
                                         on: {
                                             click: () => {
-                                                if (!this.selectedDate.value) {
-                                                    this.onSetValue.next(new Date());
-                                                }
-                                                else {
-                                                    this.onSetValue.next(moment(this.selectedDate.value + ' ' + this.selectedTime.value).toDate());
-                                                }
+                                                this.onSave();
                                             }
                                         }
                                     },
@@ -19637,6 +19696,14 @@ class EditorCalendarVNode {
             ]
         };
     }
+    onSave() {
+        if (!this.selectedDate.value) {
+            this.onSetValue.next(new Date());
+        }
+        else {
+            this.onSetValue.next(moment(this.selectedDate.value + ' ' + this.selectedTime.value).toDate());
+        }
+    }
     navigateToToday() {
         this.currYear.value = new Date().getFullYear();
         this.currMonth.value = new Date().getMonth();
@@ -20349,7 +20416,6 @@ class DocEditor {
     beforeRenderSubject = new Subject();
     afterRenderSubject = new Subject();
     onBeforeSetCursorSubject = new Subject();
-    contentChanged = new Subject();
     onPatchVNodeSubject = new Subject();
     selectionState;
     onDblClickEvent = new Subject();
@@ -20641,10 +20707,12 @@ class DocEditor {
     }
     loadDoc(data) {
         suppressTracking(() => {
-            this.adjustPageLayout();
-            this.elementReader.read(data);
-            this.refreshDocument();
-            this.historyMange.clear();
+            this.noEffectChange(() => {
+                this.adjustPageLayout();
+                this.elementReader.read(data);
+                this.refreshDocument();
+                this.historyMange.clear();
+            });
         });
     }
     /**
@@ -20662,7 +20730,6 @@ class DocEditor {
             suppressTracking(() => {
                 this.documentPaginator.rePages();
             });
-            this.contentChanged.next();
         }
         this.updateSelection();
         this.setCursor();
@@ -21565,7 +21632,7 @@ class DocEditor {
                 const scaleFitContainer = {
                     sel: 'div#scale-fit-container',
                     data: {
-                        style: { overflow: 'hidden', height: '0px', }
+                        style: { height: '0px', }
                     },
                     children: [docContent]
                 };
@@ -21727,7 +21794,7 @@ class DocEditor {
                         data: {
                             style: {
                                 position: 'absolute',
-                                left: (position.x - 10) + 'px',
+                                left: (position.x) + 'px',
                                 top: position.y + 5 + position.height + 'px',
                             },
                             hook: {
@@ -21893,7 +21960,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.6";
+        return "2.2.7";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -22196,6 +22263,13 @@ class DocEditor {
             this.documentChange.appendText(text, this.docCtx.suggestions.currentMatchedText);
         }
     }
+    parser(code, returnProcess = false) {
+        const res = parser(code);
+        if (returnProcess) {
+            return addReturn(res);
+        }
+        return res;
+    }
 }
 
 /**