@hailin-zheng/editor-core 2.2.29 → 2.2.30

package/index.js

@@ -4229,12 +4229,15 @@ class DataElementInlineGroup extends InlineGroupInputElement {
             const depEleMap = new Map();
             let compliedCode = parser(this.props.expression, depIdItems);
             compliedCode = addReturn(compliedCode);
+            const executeCtx = execute.setExecuteCtx(this);
             this.parserExpress = {
                 compliedCode,
                 func: new Function(`with(this){ ${compliedCode} }`),
-                depItems: depEleMap
+                depItems: depEleMap,
+                executeCtx
             };
             if (depIdItems.length) {
+                //设置执行上下文,doc或者doc-part
                 depIdItems.forEach(dep => {
                     const refCtx = execute.getObject(dep);
                     if (refCtx.ref) {
@@ -4258,6 +4261,8 @@ class DataElementInlineGroup extends InlineGroupInputElement {
                                             return;
                                         }
                                         const tempExecuter = execute.create();
+                                        //设置执行上下文,doc或者doc-part
+                                        tempExecuter.setExecuteCtx(this.parserExpress.executeCtx);
                                         tempExecuter.setCurrentCtx(this, this.parserExpress.depItems);
                                         const fn = func.bind(tempExecuter);
                                         fn();
@@ -14148,6 +14153,15 @@ class DynamicExecute {
     create() {
         return new DynamicExecute(this.doc, this.ss);
     }
+    /**
+     * 设置当前执行上下文
+     * 一般情况下为document,但是如果为病程录文档，需要设置为当前病程录part
+     */
+    setExecuteCtx(parseEle) {
+        const parentCtx = ElementUtil.getParent(parseEle, (item) => item.type === 'doc' || item.type === 'body-part');
+        this.doc = parentCtx;
+        return this.doc;
+    }
     setCurrentCtx(ele, depItems) {
         this.current = ele;
         this.depItems = depItems;
@@ -14841,6 +14855,8 @@ class ParagraphMeasure {
             const depEleMap = new Map();
             let compliedCode = parser(ele.attribute?.visibleExpr, depIdItems);
             compliedCode = addReturn(compliedCode);
+            //设置执行上下文,doc或者doc-part
+            const executeCtx = execute.setExecuteCtx(ele);
             if (depIdItems.length) {
                 depIdItems.forEach(dep => {
                     const refCtx = execute.getObject(dep);
@@ -14862,7 +14878,7 @@ class ParagraphMeasure {
                     }
                 });
             }
-            ele.visibleExpr = { compliedCode, func: new Function(`with(this){ ${compliedCode} }`), depItems: depEleMap };
+            ele.visibleExpr = { compliedCode, func: new Function(`with(this){ ${compliedCode} }`), depItems: depEleMap, executeCtx };
         }
         catch (e) {
             console.error('解析表达式出错', ele.attribute?.visibleExpr);
@@ -14933,6 +14949,8 @@ class ParagraphMeasure {
     evalVisibleExpr(ele, executeCtx) {
         if (ele.visibleExpr && ele.visibleExpr.func) {
             try {
+                //设置执行上下文,doc或者doc-part
+                executeCtx.setExecuteCtx(ele.visibleExpr.executeCtx);
                 executeCtx.setCurrentCtx(ele, ele.visibleExpr.depItems);
                 const func = ele.visibleExpr.func.bind(executeCtx);
                 return func() === true;
@@ -23141,7 +23159,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.29";
+        return "2.2.30";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);