@hailin-zheng/editor-core 2.2.1 → 2.2.2

package/editor.css

@@ -17,7 +17,20 @@
 }
 
 .data-list > div {
-    margin: 15px 10px;
+    padding: 10px 6px;
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    border-bottom: 1px solid #ccc;
+    cursor: default;
+}
+
+.data-list > div:hover {
+    background-color: #ccc;
+}
+
+.data-list > div:last-child {
+    border-bottom: none; /* 去掉最后一个列表项的底部边框线 */
 }
 
 @keyframes hover-color {
@@ -163,6 +176,44 @@
     border: #c9e2f9;
     background: #c9e2f9;
 }
+/* 样式化 radio box 的外观 */
+.editor-list-radiobox {
+    width: 16px;
+    height: 16px;
+    border: 1px solid #000;
+    border-radius: 50%;
+    cursor: pointer;
+    display: inline-block;
+    position: relative;
+}
+/* 选中状态的样式 */
+.editor-list-radiobox.checked::after {
+    content: "";
+    width: 8px;
+    height: 8px;
+    background-color: #007bff;
+    border-radius: 50%;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+}
+/* 样式化 checkbox 的外观 */
+.editor-list-checkbox {
+    width: 16px;
+    height: 16px;
+    border: 1px solid #000;
+    cursor: pointer;
+}
+/* 选中状态的样式 */
+.editor-list-checkbox.checked::after {
+    content: "✔";
+    font-size: 14px;
+    color: #007bff;
+    display: block;
+    text-align: center;
+    line-height: 16px;
+}
 
 .decorate-container {
     position: absolute;

package/index-cjs.js

@@ -2135,7 +2135,6 @@ class DocumentProps extends INotifyPropertyChanged {
     createUserId;
     createUserName;
     createDate;
-    scripts;
     columns = 1;
     version;
     clone(dest) {
@@ -2146,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;
@@ -2166,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;
         }
@@ -3720,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;
@@ -6931,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);
     }
@@ -12939,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?.();
-    }
-}
-
 /**
  * 当前打开的文档的上下文信息，当前文档所有的属性设置都暴露在上下文中
  */
@@ -12997,16 +12943,17 @@ class EditorContext {
     cursorRect;
     _document;
     syncRefresh;
-    dynamicFunc;
     docChange;
     clearPrevDocCb;
     //绘制结束之后回调函数
-    //nextViewFn!: (() => void) | null;
     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?.();
@@ -13026,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';
@@ -13054,8 +13000,6 @@ class EditorContext {
     }
     clear() {
         this.selectionState.clear();
-        //this.imageLoader.clear();
-        this.dynamicFunc.destroyScripts();
         this.isDirty = false;
         //this.clearEleDepMaps();
     }
@@ -13107,12 +13051,6 @@ class EditorContext {
         this.document.viewOptions.textRowLineMode = !this.document.viewOptions.textRowLineMode;
         this.syncRefresh();
     }
-    /**
-     * 实例化动态脚本
-     */
-    initScripts() {
-        this.dynamicFunc.initScripts(this.document.props.scripts);
-    }
     /**
      * 替换数据元
      */
@@ -13131,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;
+    }
 }
 /**
  * 文档上下文
@@ -14296,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);
@@ -14306,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();
@@ -14850,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) {
@@ -14932,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();
+            }
+        }
+    }
     /**
      * 文档页面显示布局
      */
@@ -16941,7 +16923,7 @@ class DocumentChange {
         if (res && res.isCancel) {
             return;
         }
-        this.docComment.syncUpdateComments();
+        //this.docComment.syncUpdateComments();
         if (collapsed) {
             this.onBackspaceElement(startControl, startOffset);
         }
@@ -20361,8 +20343,6 @@ class DocEditor {
     trackChangeState = true;
     flushToSchedule() {
         if (this.docCtx.refreshType === 'content') {
-            //触发动态脚本
-            this.docCtx.dynamicFunc.invokedScripts();
             this.triggerDocChange();
         }
         if (this.flushTask) {
@@ -20721,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();
     }
     /**
      * 缩放视图
@@ -21327,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);
@@ -21340,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;
             }
         };
     }
@@ -21454,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
                                 }]
                         };
@@ -21641,7 +21613,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.1";
+        return "2.2.2";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -21791,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>