@hailin-zheng/editor-core 1.1.0 → 1.1.1

package/index.js

@@ -1444,6 +1444,8 @@ class ViewOptions {
     trackHistoryMaxLength = 500;
     //开启动态脚本功能
     enableDyExpression = false;
+    //是否显示标尺
+    showRule = true;
     //整页模式，不分页
     _fullPageView = false;
     get fullPageView() {
@@ -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);
@@ -21704,7 +21716,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();