@hailin-zheng/editor-core 2.2.0 → 2.2.1

package/editor.css

@@ -219,6 +219,7 @@
     background: #fff;
     cursor: default;
     user-select: none;
+    font-size: 12px;
 }
 
 .editor-calendar-header {
@@ -522,7 +523,7 @@
 }
 .editor-input-cursor{
     position: absolute;
-    width: 2px;
+    width: 1.6px;
     padding: 0;
     border: none;
     outline: none;

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,
@@ -2409,7 +2402,6 @@ class DataEleBaseProps extends INotifyPropertyChanged {
     printable;
     secretBrowse;
     editable = true;
-    deleteable;
     minLength;
     underline;
     expression;
@@ -2425,7 +2417,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 +2446,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 +3669,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: [
@@ -3973,6 +3962,7 @@ class DataElementRenderObject extends InlineGroupRenderObject {
                 }
             });
         }
+        renderErrorTip(event, this);
         return node;
     }
 }
@@ -4028,6 +4018,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 +4067,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 +4087,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
@@ -6860,6 +6961,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 +8470,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 +8484,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 +10854,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;
@@ -12902,7 +13001,8 @@ class EditorContext {
     docChange;
     clearPrevDocCb;
     //绘制结束之后回调函数
-    nextViewFn;
+    //nextViewFn!: (() => void) | null;
+    nextViewFns = [];
     constructor(selectionState, viewOptions) {
         this.selectionState = selectionState;
         this.viewOptions = viewOptions;
@@ -12913,7 +13013,12 @@ class EditorContext {
         });
     }
     onNextView(cb) {
-        this.nextViewFn = cb;
+        if (!cb) {
+            this.nextViewFns.length = 0;
+            return;
+        }
+        //this.nextViewFn = cb;
+        this.nextViewFns.push(cb);
     }
     get document() {
         return this._document;
@@ -18478,6 +18583,7 @@ class ElementTrackManage {
      */
     generateTrack() {
         if (!this.docCtx.viewOptions.enableTrackHistory) {
+            clearTraces(this.docCtx.document);
             return;
         }
         const ops = generatePatch(this.docCtx.document);
@@ -20267,10 +20373,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 +20538,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);
         //判断光标位置是否被可见，如果不可见，需要将其设置到可见区域
@@ -21252,14 +21359,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(); });
             }
         }
     }
@@ -21534,7 +21641,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.2.0";
+        return "2.2.1";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);
@@ -27272,6 +27379,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;