@hailin-zheng/editor-core 1.1.0 → 1.1.2

package/index.js

@@ -1444,6 +1444,8 @@ class ViewOptions {
     trackHistoryMaxLength = 500;
     //开启动态脚本功能
     enableDyExpression = false;
+    //是否显示标尺
+    showRule = true;
     //整页模式，不分页
     _fullPageView = false;
     get fullPageView() {
@@ -4453,7 +4455,7 @@ class PSymbolElement extends LeafElement {
         super('psym');
         this.textProps = new TextProps();
         this.textProps.fontSize = this.defaultHeight;
-        this.textProps.fontName = '楷体';
+        this.textProps.fontName = 'sans-serif';
         this.textProps.color = '#8c8c8c';
     }
     createRenderObject() {
@@ -4480,7 +4482,7 @@ class PSymbolRenderObject extends LeafRenderObject {
         if (render.drawMode === 'print') {
             return;
         }
-        render.contentContext.drawText('⤶', this.element.textProps, position.x, position.y, 20, this.rect.height);
+        render.contentContext.drawText('↩', this.element.textProps, position.x, position.y, 20, this.rect.height);
     }
     //绘制段落符号
     clone() {
@@ -11834,7 +11836,17 @@ class DynamicContextParser {
         return condition() ? truePart() : falsePart();
     }
     Number(val) {
-        return Number.parseInt(val);
+        if (typeof val === 'number') {
+            return val;
+        }
+        else if (typeof val === 'string') {
+            const parseVal = Number.parseInt(val.trim());
+            if (Number.isNaN(parseVal)) {
+                return 0;
+            }
+            return parseVal;
+        }
+        return 0;
     }
     TableData(tableId, startRow, startCol, endRow, endCol) {
         const tb = this.doc.treeFind(item => item instanceof TableElement && item.props.id === tableId);
@@ -12065,7 +12077,6 @@ class ParagraphMeasure {
      */
     setParaTextAlign(counter, paraLineIndex, paraElement, limitWidth, paraLineRender) {
         let indent = paraLineRender.startX;
-        paraLineRender.line.rect.width = limitWidth;
         if (paraElement.props.textAlign === 'center') {
             const remainSpace = limitWidth - paraLineRender.line.rect.width;
             const startX = Math.ceil(remainSpace / 2) + indent;
@@ -12089,6 +12100,7 @@ class ParagraphMeasure {
             //return indent;
         }
         else ;
+        paraLineRender.line.rect.width = limitWidth;
     }
     /**
      * 设置两端对齐
@@ -14207,7 +14219,7 @@ class PageBreakRenderObject extends LeafRenderObject {
         if (render.drawMode === 'print') {
             return;
         }
-        render.contentContext.drawText('⤶', this.element.textProps, position.x, position.y, 20, this.rect.height);
+        render.contentContext.drawText('↩', this.element.textProps, position.x, position.y, 20, this.rect.height);
     }
     clone() {
         const render = new PageBreakRenderObject(this.element);
@@ -14730,7 +14742,8 @@ class DocumentEvent {
                 };
             }
         }
-        if (!this.ismousedown) {
+        //只有设计模式时，才需要进行边界判断，方可调整表格列宽等
+        if (!this.ismousedown && this.viewOptions.docMode === DocMode.Design) {
             this.edgeRenderInfo = edgeRenderInfo;
         }
         //存在边界元素，并且当前边界处于鼠标按下状态
@@ -18590,6 +18603,7 @@ class ButtonBase extends TextBase {
 
 const ViewConfig = {
     surfaceBgColor: '#f0f0f0',
+    showMousePositionLine: false,
     primaryColor: '#6750A4',
     onPrimaryColor: '#FFFFFF',
     themeSecondaryColor: '#2b88d8',
@@ -19411,8 +19425,8 @@ class ViewPaint {
             let { x, y } = lines[i];
             x = Math.ceil(x);
             y = Math.ceil(y);
-            x += 0.5;
-            y += 0.5;
+            // x += 0.5;
+            // y += 0.5;
             if (i === 0) {
                 this.ctx.moveTo(x, y);
             }
@@ -19435,8 +19449,8 @@ class ViewPaint {
         }
     }
     drawRadioBox(x, y, width, height, isChecked) {
-        x = x + Math.floor(width / 2);
-        y = y + Math.floor(height / 2);
+        // x = x + Math.floor(width / 2);
+        // y = y + Math.floor(height / 2);
         width = Math.floor(width / 2);
         this.ctx.save();
         this.ctx.strokeStyle = 'black';
@@ -19580,6 +19594,13 @@ class SurfaceView extends NodeItems {
             this.reLayout = false;
         }
         e.render.fillRect(0, 0, this.finalRect.width, this.finalRect.height, ViewConfig.surfaceBgColor);
+        e.next(e.render);
+        this.drawMouseLinePosition(e);
+    }
+    drawMouseLinePosition(e) {
+        {
+            return;
+        }
     }
     start() {
         this.renderSchedule = renderApp(this, this.renderCtx, this.nodeEvent);
@@ -20864,8 +20885,6 @@ class CanvasTextEditor extends NodeItems {
             pagePL = left;
             pagePR = right;
         }
-        // this.docRule.setRuleOptions({width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft});
-        // this.docRule.refreshRule();
         this.rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     createDocViewer() {
@@ -20964,12 +20983,17 @@ class CanvasTextEditor extends NodeItems {
                 this.documentPaint.rePages();
             });
             this.updateDocSize();
-            //页面高度
-            // this.documentSelection.updateSelectionState();
-            // this.selectionOverlays.getSelectionTreeData();
-            // this.beforeRenderSubject.next();
         }
-        //生成选区内容对象
+        this.updateSelection();
+        this.refreshDocRule();
+        this.onChanged();
+        //this.refreshView();
+    }
+    /**
+     * 计算选区内容对象
+     * @private
+     */
+    updateSelection() {
         let ssChanged = false;
         try {
             //防止由于选区不正确导致的错误，导致后续的当前任务无法释放
@@ -20980,18 +21004,12 @@ class CanvasTextEditor extends NodeItems {
         }
         this.selectionOverlays.getSelectionTreeData();
         ssChanged && this.selectionChanged.next(this.documentSelection.selectionState);
-        this.refreshDocRule();
-        this.onChanged();
-        //this.refreshView();
     }
     /**
      * 刷新绘制文档
      * @param rePaint
      */
     refreshView() {
-        // const ssChanged = this.documentSelection.updateSelectionState();
-        // this.selectionOverlays.getSelectionTreeData();
-        // ssChanged && this.selectionChanged.next(this.documentSelection.selectionState);
         this.documentPaint.refreshView();
         this.setCursor();
     }
@@ -21183,8 +21201,6 @@ class CanvasTextEditor extends NodeItems {
         let minDocViewWidth = pageWidth + this.viewOptions.docSpace * 2;
         let maxDocViewWidth = this.surfaceView.width;
         this.width = Math.max(minDocViewWidth, maxDocViewWidth) - ScrollBarSize;
-        // this.viewOptions.viewSettings.width = this.width;
-        // this.viewOptions.viewSettings.height = this.scrollView.height as number;
         const docSize = this.documentPaint.getDocumentContainerHeight();
         this.height = docSize.height;
         this.updateRenderCtx();
@@ -21197,6 +21213,7 @@ class CanvasTextEditor extends NodeItems {
         this.updateRenderCtx();
         this.documentPaint.layoutPages();
         this.refreshDocument();
+        this.updateLayout();
     }
     /**
      * 缩放视图
@@ -21685,7 +21702,6 @@ class CanvasTextEditor extends NodeItems {
             this.viewOptions.viewSettings.height = data.height;
             this.updateDocSize();
             this.resetViewer();
-            this.updateLayout();
         });
         surface.addChild(scrollView);
         const rule2 = new RuleControl(this.docCtx);
@@ -21695,6 +21711,7 @@ class CanvasTextEditor extends NodeItems {
         rule2.x = 20;
         rule2.y = 500;
         surface.addChild(rule2);
+        //surface.addChild(win);
         surface.start();
     }
     /**
@@ -21704,7 +21721,18 @@ class CanvasTextEditor extends NodeItems {
         this.rule.x = (this.viewOptions.viewSettings.width - this.rule.width) / 2;
         this.rule.y = 0;
         this.rule.width = this.viewOptions.docPageSettings.width;
-        this.scrollView.height = this.viewOptions.viewSettings.height - this.rule.ruleSize;
+        if (!this.viewOptions.showRule) {
+            this.rule.visible = false;
+            this.rule.height = 0;
+            this.scrollView.y = 0;
+            this.scrollView.height = this.viewOptions.viewSettings.height - this.scrollView.y;
+        }
+        else {
+            this.rule.height = 30;
+            this.rule.visible = true;
+            this.scrollView.y = this.rule.ruleSize;
+            this.scrollView.height = this.viewOptions.viewSettings.height - this.scrollView.y;
+        }
     }
     createMenu() {
         const menu = new Menu();