@hailin-zheng/editor-core 2.2.0 → 2.2.2

package/index-cjs.js

@@ -833,28 +833,21 @@ function getDocCtx(ele) {
     if (!doc) {
         return null;
     }
-    const options = doc['viewOptions'];
-    if (!options || !options.enableTrackHistory) {
-        return null;
-    }
-    return {
-        doc,
-        options: doc['viewOptions']
-    };
+    return doc;
 }
 function insertEle(ele) {
     if (ele.type === 'psym') {
         return;
     }
-    const options = getDocCtx(ele);
-    if (!options) {
+    const docCtx = getDocCtx(ele);
+    if (!docCtx) {
         return;
     }
     // const serializeObj = getEleSerializeFunc(ele, options);
     // if (!serializeObj) {
     //     return;
     // }
-    appendToOps(options.doc, ele, {
+    appendToOps(docCtx, ele, {
         //如果当前插入的为单元格，由于新插入的单元格，内部的内容没有补足，导致后续计算索引会出现问题
         //之前为ele.clone(true);
         insert: ele
@@ -864,11 +857,11 @@ function removeEle(ele) {
     if (ele.type === 'psym') {
         return;
     }
-    const options = getDocCtx(ele);
-    if (!options) {
+    const docCtx = getDocCtx(ele);
+    if (!docCtx) {
         return;
     }
-    appendToOps(options.doc, ele, {
+    appendToOps(docCtx, ele, {
         delete: ele.clone(true),
     });
 }
@@ -891,15 +884,15 @@ function getOpsLog(ele, ops) {
     };
 }
 function inputText(ele, startIndex, input) {
-    const options = getDocCtx(ele);
-    if (!options) {
+    const docCtx = getDocCtx(ele);
+    if (!docCtx) {
         return;
     }
     if (!input) {
         return;
     }
     //处理修复：如果当前的文字刚插入，这时候输入的文字内容已经被序列化到操作日志中了，就不需要生成操作日志
-    let array = docOpsMap.get(options.doc);
+    let array = docOpsMap.get(docCtx);
     if (array) {
         const lastLog = array[array.length - 1];
         if (lastLog && 'insert' in lastLog.ops) {
@@ -908,7 +901,7 @@ function inputText(ele, startIndex, input) {
             }
         }
     }
-    appendToOps(options.doc, ele, {
+    appendToOps(docCtx, ele, {
         insText: {
             index: startIndex,
             length: input.length
@@ -917,14 +910,14 @@ function inputText(ele, startIndex, input) {
     });
 }
 function removeText(ele, index, length, content) {
-    const options = getDocCtx(ele);
-    if (!options) {
+    const docCtx = getDocCtx(ele);
+    if (!docCtx) {
         return;
     }
     if (!length) {
         return;
     }
-    appendToOps(options.doc, ele, {
+    appendToOps(docCtx, ele, {
         delText: {
             index,
             length
@@ -939,15 +932,15 @@ function removeText(ele, index, length, content) {
  * @returns
  */
 function formatEle(ele, props) {
-    const options = getDocCtx(ele);
-    if (!options) {
+    const docCtx = getDocCtx(ele);
+    if (!docCtx) {
         return;
     }
     const updateKeys = Object.keys(props);
     if (!updateKeys.length) {
         return;
     }
-    appendToOps(options.doc, ele, {
+    appendToOps(docCtx, ele, {
         format: getExactDiffProps(ele.props, props)
     });
 }
@@ -959,11 +952,11 @@ function formatEle(ele, props) {
  * @param newValue
  */
 function logUpdateEleProps(ele, p, oldValue, newValue) {
-    const options = getDocCtx(ele);
-    if (!options) {
+    const docCtx = getDocCtx(ele);
+    if (!docCtx) {
         return;
     }
-    appendToOps(options.doc, ele, {
+    appendToOps(docCtx, ele, {
         format: {
             [p]: {
                 oldValue,
@@ -2142,7 +2135,6 @@ class DocumentProps extends INotifyPropertyChanged {
     createUserId;
     createUserName;
     createDate;
-    scripts;
     columns = 1;
     version;
     clone(dest) {
@@ -2153,7 +2145,6 @@ class DocumentProps extends INotifyPropertyChanged {
         clone.padding = this.padding.clone();
         clone.headerLine = this.headerLine;
         clone.footerLine = this.footerLine;
-        clone.scripts = this.scripts;
         clone.createUserId = this.createUserId;
         clone.createUserName = this.createUserName;
         clone.createDate = this.createDate;
@@ -2173,9 +2164,6 @@ class DocumentProps extends INotifyPropertyChanged {
             createUserName: this.createUserName,
             createUserId: this.createUserId,
         };
-        if (this.scripts) {
-            props['scripts'] = this.scripts;
-        }
         if (this.orient && this.orient !== 'portrait') {
             props['orient'] = this.orient;
         }
@@ -2409,7 +2397,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
     printable;
     secretBrowse;
     editable = true;
-    deleteable;
     minLength;
     underline;
     expression;
@@ -2425,7 +2412,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
         target.fieldName = source.fieldName;
         target.required = source.required;
         target.editable = source.editable;
-        target.deleteable = source.deleteable;
         target.secretBrowse = source.secretBrowse;
         target.printable = source.printable;
         target.minLength = source.minLength;
@@ -2455,9 +2441,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
         if (!this.editable) {
             props['editable'] = this.editable;
         }
-        if (this.deleteable) {
-            props["deleteable"] = this.deleteable;
-        }
         if (this.minLength) {
             props["minLength"] = this.minLength;
         }
@@ -3681,7 +3664,8 @@ class DocumentRenderObject extends BlockContainerRenderObject {
                     width: this.rect.width,
                     height: this.rect.height - 1,
                     viewBox: `0 0 ${this.rect.width} ${this.rect.height - 1}`,
-                    overflow: "hidden"
+                    overflow: "hidden",
+                    "shape-rendering": "optimizeSpeed"
                 },
             },
             children: [
@@ -3731,7 +3715,6 @@ class DocumentFactory extends ElementFactory {
         docProps.padding = new PaddingProps(props.padding.top, props.padding.bottom, props.padding.left, props.padding.right);
         docProps.headerLine = props.headerLine ?? 12;
         docProps.footerLine = props.footerLine ?? 12;
-        docProps.scripts = props.scripts;
         docProps.createUserId = props.createUserId;
         docProps.createUserName = props.createUserName;
         docProps.createDate = props.createDate;
@@ -3973,6 +3956,7 @@ class DataElementRenderObject extends InlineGroupRenderObject {
                 }
             });
         }
+        renderErrorTip(event, this);
         return node;
     }
 }
@@ -4028,6 +4012,11 @@ class DataElementBaseFactory extends ElementFactory {
         }
     }
 }
+/**
+ * 渲染数据元背景修饰
+ * @param event
+ * @param r
+ */
 function exportDecoratorHTML(event, r) {
     const canPaint = r.element.isMouseenter || r.element.isFocused;
     if (!canPaint) {
@@ -4072,10 +4061,12 @@ function exportDecoratorHTML(event, r) {
                 const sharpPoints1 = CommonUtil.resharpPoints(rightPoints);
                 const sharpPoints = CommonUtil.resharpPoints([...leftPoints.reverse()]);
                 const path = [...sharpPoints, ...sharpPoints1, sharpPoints[0]].map((item, index) => ((index === 0) ? 'M' : "L") + item.x + " " + item.y).join(" ");
-                event.highlights.push(ElementUtil.createSvgPath({ d: path,
+                event.highlights.push(ElementUtil.createSvgPath({
+                    d: path,
                     stroke: color,
                     fill: 'none',
-                    'stroke-width': 1 }));
+                    'stroke-width': 1
+                }));
                 return;
             }
         }
@@ -4090,6 +4081,110 @@ function exportDecoratorHTML(event, r) {
         }
     }
 }
+/**
+ * 渲染数据源验证错误提示框
+ */
+function renderErrorTip(event, r) {
+    if (!event.options.enableDataEleInputValidate || event.mode === 'print') {
+        return;
+    }
+    const ele = r.element;
+    //元素调用内部验证
+    ele.onChangedValidate();
+    if (!ele.errorTip) {
+        return;
+    }
+    //渲染底部波浪线
+    renderUnderWavyLine(event, r, 'red');
+    if (ele.paintRenders.indexOf(r) !== 0) {
+        return;
+    }
+    const { x, y } = event.globalPos;
+    const docRender = ElementUtil.getParentRender(r, DocumentRenderObject);
+    const content = ele.errorTip;
+    let left = ele.isFocused ? -10 : 5;
+    //显示在文档的右测
+    left += docRender.rect.x + docRender.rect.width + 20;
+    let sel = 'div.tg-container';
+    if (ele.isFocused) {
+        sel += '.tg-container--selected';
+    }
+    const node = {
+        sel,
+        key: ele.props.id,
+        data: {
+            style: {
+                left: `${left}px`,
+                top: `${y}px`
+            },
+            dataset: {
+                key: ele.key
+            }
+        },
+        children: [{
+                sel: 'div.header',
+                data: {},
+                children: [{
+                        sel: 'span.header-user',
+                        data: {},
+                        text: ele.props.caption,
+                    }]
+            }, {
+                sel: 'div.content',
+                data: {},
+                text: content
+            }]
+    };
+    event.addChangeTips(node);
+    const triangleTipX = x + r.rect.width / 2;
+    const tipLineAWidth = docRender.rect.x + docRender.rect.width - triangleTipX;
+    const tipLineA = {
+        sel: 'div.doc-triangle-line',
+        data: {
+            style: {
+                left: `${triangleTipX}px`,
+                top: `${y + r.rect.height}px`,
+                width: tipLineAWidth + 'px'
+            }
+        }
+    };
+    const tipLineB = {
+        sel: 'div.doc-triangle-line',
+        data: {
+            style: {
+                left: `${triangleTipX + tipLineAWidth}px`,
+                top: `${y + r.rect.height}px`,
+                width: 20 + 'px'
+            },
+            dataset: {
+                key: ele.key
+            }
+        }
+    };
+    const triangleTip = {
+        sel: `div.doc-triangle`,
+        data: {
+            style: {
+                left: `${triangleTipX}px`,
+                top: `${y + r.rect.height * 2 / 3}px`
+            }
+        }
+    };
+    event.addChangeTips(triangleTip);
+    event.addChangeTips(tipLineA);
+    event.addChangeTips(tipLineB);
+}
+/**
+ * 渲染底部波浪线
+ */
+function renderUnderWavyLine(event, r, color) {
+    const { x, y } = event.relativePagePos;
+    let d = `M ${x} ${y + r.rect.height - 2} q 1.5,2, `;
+    const width = r.rect.width;
+    d += Array(Math.ceil(width / 3)).fill("3,0").join(' t ');
+    const path = ElementUtil.createSvgPath({ d, fill: 'none', stroke: color });
+    event.highlights.push(path);
+}
 /**
  * 获取渲染元素相对稳当的位置
  * @param render
@@ -6830,7 +6925,7 @@ class CommentElement extends LeafElement {
     constructor() {
         super('comm');
         //this.isDecorate = true;
-        this.disableClick = true;
+        //this.disableClick = true;
         this.props = new CommProps();
         this.color = CommonUtil.randomRgbColor(0.5);
     }
@@ -6860,6 +6955,9 @@ class CommentElement extends LeafElement {
 }
 class CommentRenderObject extends LeafRenderObject {
     exportSVG(event) {
+        if (event.mode === 'print') {
+            return;
+        }
         const renderPos = { ...event.relativePagePos };
         const paraLinePos = ElementUtil.getParaLinePos(this, { x: renderPos.x, y: renderPos.y });
         const color = '#ff4d4f';
@@ -8366,9 +8464,6 @@ class DataElementDate extends DataElementInlineGroup {
         this.onChangedValidate();
     }
     isValid(val, format) {
-        if (!format) {
-            format = this.props.format ?? 'YYYY-MM-DD';
-        }
         const date = moment__default["default"](val, format);
         return date.isValid();
     }
@@ -8383,8 +8478,7 @@ class DataElementDate extends DataElementInlineGroup {
         if (res) {
             return res;
         }
-        const format = this.props.format ?? 'YYYY-MM-DD';
-        const date = moment__default["default"](this.getValue(), format, true);
+        const date = moment__default["default"](this.getValue(), true);
         if (!date.isValid()) {
             return '日期格式不正确';
         }
@@ -10754,7 +10848,6 @@ class ElementUtil {
         dest.printable = props.printable ?? true;
         dest.required = props.required;
         dest.secretBrowse = props.secretBrowse;
-        dest.deleteable = props.deleteable;
         dest.underline = props.underline;
         dest.expression = props.expression;
         dest.hidden = props.hidden;
@@ -12840,54 +12933,6 @@ class PaintContent {
     }
 }
 
-class DocumentEvalFunc {
-    docCtx;
-    constructor(docCtx) {
-        this.docCtx = docCtx;
-    }
-    scriptsFunc;
-    /**
-     * 实例化动态脚本
-     */
-    initScripts(scripts) {
-        this.destroyScripts();
-        if (scripts) {
-            try {
-                const func = new Function("docCtx", scripts);
-                this.scriptsFunc = func(this.docCtx);
-            }
-            catch (e) {
-                console.error("自定义标本解析错误", e);
-            }
-        }
-        // const func = (docCtx: DocumentContext) => {
-        //     const sexELe = docCtx.getControlById('NqoYI')
-        //     const dyEle = docCtx.getControlById('gTuBI');
-        //     return () => {
-        //         if (sexELe && dyEle) {
-        //             const sexValue = sexELe.getValue();
-        //             const dyValue = sexValue === '1' ? '男的吗' : sexValue === '2' ? '女的吗' : '难道是人妖吗';
-        //             dyEle.setValue(dyValue);
-        //         }
-        //     };
-        // };
-    }
-    /**
-     * 销毁动态脚本实例
-     */
-    destroyScripts() {
-        if (this.scriptsFunc) {
-            this.scriptsFunc = null;
-        }
-    }
-    /**
-     * 触发动态脚本
-     */
-    invokedScripts() {
-        this.scriptsFunc?.();
-    }
-}
-
 /**
  * 当前打开的文档的上下文信息，当前文档所有的属性设置都暴露在上下文中
  */
@@ -12898,22 +12943,29 @@ class EditorContext {
     cursorRect;
     _document;
     syncRefresh;
-    dynamicFunc;
     docChange;
     clearPrevDocCb;
     //绘制结束之后回调函数
-    nextViewFn;
+    nextViewFns = [];
+    //批注元素存在的标志,用于判断文档空间进行布局
+    commentFlag = false;
+    //留痕元素存在的标志,用于判断文档空间进行布局
+    trackFlag = false;
     constructor(selectionState, viewOptions) {
         this.selectionState = selectionState;
         this.viewOptions = viewOptions;
-        this.dynamicFunc = new DocumentEvalFunc(this);
         //this.imageLoader = new DocumentImagesLoader();
         this.selectionState.onChangedEvent.subscribe(() => {
             this.syncRefresh?.();
         });
     }
     onNextView(cb) {
-        this.nextViewFn = cb;
+        if (!cb) {
+            this.nextViewFns.length = 0;
+            return;
+        }
+        //this.nextViewFn = cb;
+        this.nextViewFns.push(cb);
     }
     get document() {
         return this._document;
@@ -12921,7 +12973,6 @@ class EditorContext {
     set document(value) {
         this.clearPrevDocCb?.();
         this._document = value;
-        this.initScripts();
         // this.refSub = this._document.refreshSubject.subscribe((data) => {
         //     data = data ?? 'content';
         //     this.isDirty = this.isDirty || data === 'content';
@@ -12949,8 +13000,6 @@ class EditorContext {
     }
     clear() {
         this.selectionState.clear();
-        //this.imageLoader.clear();
-        this.dynamicFunc.destroyScripts();
         this.isDirty = false;
         //this.clearEleDepMaps();
     }
@@ -13002,12 +13051,6 @@ class EditorContext {
         this.document.viewOptions.textRowLineMode = !this.document.viewOptions.textRowLineMode;
         this.syncRefresh();
     }
-    /**
-     * 实例化动态脚本
-     */
-    initScripts() {
-        this.dynamicFunc.initScripts(this.document.props.scripts);
-    }
     /**
      * 替换数据元
      */
@@ -13026,6 +13069,15 @@ class EditorContext {
         }
         return this._document.modifyFlag === exports.ModifyFlag.None ? 'appearance' : 'content';
     }
+    adaptiveScale() {
+        if (this.viewOptions.pageLayoutMode !== 'fit-page') {
+            return this.viewOptions.scale;
+        }
+        const docWidth = this.viewOptions.contentWidth;
+        const viewWidth = this.viewOptions.viewSettings.width;
+        const availableWidth = viewWidth * 0.9;
+        return Math.round(availableWidth * 100 / docWidth) / 100;
+    }
 }
 /**
  * 文档上下文
@@ -14191,9 +14243,7 @@ class DocumentArrange {
                 execute: this.execute,
                 createParaFn: () => this.createDefaultPara()
             };
-            doc.clearMarkItems();
-            this.clearPaintCache(doc, data);
-            //this.docCtx.viewOptions.showReviewWindow = this.docCtx.document.commentsContainerElement.markPairs.length > 0;
+            this.reset(data);
             const docRenders = this.arrangeDoc();
             this.setMeasureCompletedModifyFlag(doc);
             this.cacheDocRenders(docRenders);
@@ -14201,7 +14251,17 @@ class DocumentArrange {
             return docRenders;
         });
     }
-    //commentsRender!: CommsContainerRenderObject;
+    /**
+     * 重置文档测量的相关信息
+     * @param data
+     * @private
+     */
+    reset(data) {
+        this.docCtx.document.clearMarkItems();
+        this.docCtx.trackFlag = false;
+        this.docCtx.commentFlag = false;
+        this.clearPaintCache(data.doc, data);
+    }
     arrangeDoc() {
         const doc = this.docCtx.document;
         const docRender = doc.createRenderObject();
@@ -14745,8 +14805,12 @@ class DocumentArrange {
     }
     identifyComment(ele) {
         if (ele instanceof CommentElement) {
+            this.docCtx.commentFlag = true;
             this.docCtx.document.identifyCommMark(ele);
         }
+        else if (ele instanceof TrackRunElement) {
+            this.docCtx.trackFlag = true;
+        }
     }
     cacheDoc;
     cacheDocRenders(docs) {
@@ -14827,8 +14891,31 @@ class DocumentPaginator {
         this.docContainer.rect.width = this.viewOptions.docPageSettings.width;
         const newMeasure = new DocumentArrange(this.docCtx, this.renderContext, this.seo);
         this.docPages = newMeasure.measureDoc();
+        this.adjustTipLayoutWidth();
         this.layoutPages();
     }
+    /**
+     * 处理计算提示框布局宽度
+     * @private
+     */
+    adjustTipLayoutWidth() {
+        let layoutFlag = false;
+        if (this.docCtx.trackFlag && this.docCtx.viewOptions.showTrackChangesTip || this.docCtx.commentFlag) {
+            layoutFlag = true;
+        }
+        if (layoutFlag) {
+            if (this.viewOptions.reviewWindowWidth === 0) {
+                this.viewOptions.reviewWindowWidth = 250;
+                this.viewOptions.scale = this.docCtx.adaptiveScale();
+            }
+        }
+        else {
+            if (this.viewOptions.reviewWindowWidth > 0) {
+                this.viewOptions.reviewWindowWidth = 0;
+                this.viewOptions.scale = this.docCtx.adaptiveScale();
+            }
+        }
+    }
     /**
      * 文档页面显示布局
      */
@@ -16836,7 +16923,7 @@ class DocumentChange {
         if (res && res.isCancel) {
             return;
         }
-        this.docComment.syncUpdateComments();
+        //this.docComment.syncUpdateComments();
         if (collapsed) {
             this.onBackspaceElement(startControl, startOffset);
         }
@@ -18478,6 +18565,7 @@ class ElementTrackManage {
      */
     generateTrack() {
         if (!this.docCtx.viewOptions.enableTrackHistory) {
+            clearTraces(this.docCtx.document);
             return;
         }
         const ops = generatePatch(this.docCtx.document);
@@ -20255,8 +20343,6 @@ class DocEditor {
     trackChangeState = true;
     flushToSchedule() {
         if (this.docCtx.refreshType === 'content') {
-            //触发动态脚本
-            this.docCtx.dynamicFunc.invokedScripts();
             this.triggerDocChange();
         }
         if (this.flushTask) {
@@ -20267,10 +20353,11 @@ class DocEditor {
             this.readDocChangeLog();
             this.refreshDocument();
             this.flushTask = null;
-            let cb = this.docCtx.nextViewFn;
-            if (cb) {
+            //回调
+            let cbs = [...this.docCtx.nextViewFns];
+            if (cbs.length) {
                 this.docCtx.onNextView(null);
-                cb();
+                cbs.forEach(cb => cb());
                 return;
             }
             this.historyMange.generateTrack();
@@ -20431,7 +20518,7 @@ class DocEditor {
         this.editInput.style.left = position.x + 'px';
         this.editInput.style.top = position.y + 'px';
         this.editInput.style.height = position.height + 'px';
-        this.editInput.style.width = "2px";
+        this.editInput.style.width = "1.6px";
         this.editInput.readOnly = false;
         this.setCursorVisibility(true);
         //判断光标位置是否被可见，如果不可见，需要将其设置到可见区域
@@ -20614,14 +20701,7 @@ class DocEditor {
      * @private
      */
     adaptiveScale() {
-        if (this.viewOptions.pageLayoutMode !== 'fit-page') {
-            return;
-        }
-        const docWidth = this.docCtx.viewOptions.docPageSettings.width;
-        const viewWidth = this.docCtx.viewOptions.viewSettings.width;
-        const availableWidth = viewWidth * 0.9;
-        const scale = Math.round(availableWidth * 100 / docWidth) / 100;
-        this.viewOptions.scale = scale;
+        this.viewOptions.scale = this.docCtx.adaptiveScale();
     }
     /**
      * 缩放视图
@@ -21220,12 +21300,20 @@ class DocEditor {
                     },
                     children: []
                 };
+                const scaleFitContainer = {
+                    sel: 'div#scale-fit-container',
+                    data: {
+                        style: { overflow: 'hidden', height: '0px', }
+                    },
+                    children: [docContent]
+                };
                 if (!this.documentPaginator?.docContainer) {
-                    return docContent;
+                    return scaleFitContainer;
                 }
                 const tipsContainer = this.createChangeTipContainer();
                 this.tipContainer = tipsContainer;
                 docContent.data.style.height = this.documentPaginator.getDocumentContainerHeight().height + 'px';
+                scaleFitContainer.data.style['height'] = this.documentPaginator.getDocumentContainerHeight().height * this.viewOptions.scale + 'px';
                 const docRenders = this.documentPaginator.docContainer.getItems();
                 const svgGenerator = new DocumentSvg(this.viewOptions, this.selectionOverlays, this.renderContext);
                 const vNode = svgGenerator.getHTMLVNode(docRenders);
@@ -21233,12 +21321,12 @@ class DocEditor {
                 children.push(tipsContainer);
                 children.push(...vNode);
                 tipsContainer.children?.push(...svgGenerator.changeTips);
-                this.updateTipLayoutWidth();
+                //this.updateTipLayoutWidth();
                 const sub = this.afterNodePatch.subscribe(() => {
                     this.updateTipLayoutAfterPatch();
                     sub.unsubscribe();
                 });
-                return docContent;
+                return scaleFitContainer;
             }
         };
     }
@@ -21252,14 +21340,14 @@ class DocEditor {
             if (this.viewOptions.reviewWindowWidth > 0) {
                 this.viewOptions.reviewWindowWidth = 0;
                 //刷新页面
-                this.adjustPageLayout();
+                this.docCtx.onNextView(() => { this.adjustPageLayout(); });
             }
         }
         else {
             if (this.viewOptions.reviewWindowWidth === 0) {
                 this.viewOptions.reviewWindowWidth = 250;
                 //刷新页面
-                this.adjustPageLayout();
+                this.docCtx.onNextView(() => { this.adjustPageLayout(); });
             }
         }
     }
@@ -21347,30 +21435,21 @@ class DocEditor {
                     };
                     const itemsVNode = options.map(item => {
                         const ckbVNode = {
-                            sel: multiSelect ? 'input.magic-checkbox' : 'input.magic-radio',
-                            data: {
-                                attrs: {
-                                    type: 'checkbox',
-                                    name: 'data-list',
-                                }
-                            }
+                            sel: multiSelect ? 'div.editor-list-checkbox' : 'div.editor-list-radiobox',
+                            data: {}
                         };
                         if (item.checked) {
-                            ckbVNode.data.attrs['checked'] = true;
+                            ckbVNode.sel += '.checked';
+                            //ckbVNode.data.attrs['checked'] = true;
                         }
                         return {
-                            sel: 'div', data: {}, children: [ckbVNode, {
+                            sel: 'div', data: { on: {
+                                    click: () => {
+                                        onChangeHandler(item.code);
+                                    }
+                                } }, children: [ckbVNode, {
                                     sel: 'label',
-                                    data: {
-                                        attrs: {
-                                        //for:"data-list-"+item.code,
-                                        },
-                                        on: {
-                                            click: (evt) => {
-                                                onChangeHandler(item.code);
-                                            }
-                                        }
-                                    },
+                                    data: {},
                                     text: item.value
                                 }]
                         };
@@ -21534,7 +21613,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.0";
+        return "2.2.2";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -21684,6 +21763,54 @@ class DocumentCombine {
     }
 }
 
+class DocumentEvalFunc {
+    docCtx;
+    constructor(docCtx) {
+        this.docCtx = docCtx;
+    }
+    scriptsFunc;
+    /**
+     * 实例化动态脚本
+     */
+    initScripts(scripts) {
+        this.destroyScripts();
+        if (scripts) {
+            try {
+                const func = new Function("docCtx", scripts);
+                this.scriptsFunc = func(this.docCtx);
+            }
+            catch (e) {
+                console.error("自定义标本解析错误", e);
+            }
+        }
+        // const func = (docCtx: DocumentContext) => {
+        //     const sexELe = docCtx.getControlById('NqoYI')
+        //     const dyEle = docCtx.getControlById('gTuBI');
+        //     return () => {
+        //         if (sexELe && dyEle) {
+        //             const sexValue = sexELe.getValue();
+        //             const dyValue = sexValue === '1' ? '男的吗' : sexValue === '2' ? '女的吗' : '难道是人妖吗';
+        //             dyEle.setValue(dyValue);
+        //         }
+        //     };
+        // };
+    }
+    /**
+     * 销毁动态脚本实例
+     */
+    destroyScripts() {
+        if (this.scriptsFunc) {
+            this.scriptsFunc = null;
+        }
+    }
+    /**
+     * 触发动态脚本
+     */
+    invokedScripts() {
+        this.scriptsFunc?.();
+    }
+}
+
 function createPrintTemplate({ width, height, orient }) {
     return `
     <!DOCTYPE html>
@@ -27272,6 +27399,8 @@ exports.parser = parser;
 exports.reactiveMap = reactiveMap;
 exports.removeEle = removeEle;
 exports.removeText = removeText;
+exports.renderErrorTip = renderErrorTip;
+exports.renderUnderWavyLine = renderUnderWavyLine;
 exports.runTextLineRender = runTextLineRender;
 exports.setChildrenModifyFlag = setChildrenModifyFlag;
 exports.setDataElementProps = setDataElementProps;