@hailin-zheng/editor-core 1.1.21 → 1.1.23

package/index.js

@@ -2,8 +2,8 @@ import { nanoid } from 'nanoid';
 import moment from 'moment';
 import * as acor from 'acorn';
 import { generate } from 'astring';
-import * as estraverse from 'estraverse';
-import bwipjs from 'bwip-js';
+import estraverse from 'estraverse';
+import * as bwipjs from 'bwip-js';
 import moment$1 from 'moment/moment';
 
 /**
@@ -4090,7 +4090,6 @@ class DocumentContainerRender extends BlockContainerRenderObject {
 
 class TextGroupElement extends LeafElement {
     textMeasures = [];
-    fontBoundingBox;
     isMeasure = false;
     constructor() {
         super('text');
@@ -4130,7 +4129,7 @@ class TextGroupElement extends LeafElement {
     createRenderObject(data) {
         if (!this.isMeasure || this.modifyFlag !== ModifyFlag$1.None || !this.cacheRender) {
             data.renderCtx.contentContext.measureTextUnits(this.textMeasures, this.props);
-            this.fontBoundingBox = data.renderCtx.contentContext.measureTextMetrics(this.props.getFont());
+            //data.renderCtx.contentContext.measureTextMetrics(this.props.getFont());
             this.isMeasure = true;
         }
         const render = new TextGroupRenderObject(this);
@@ -4204,7 +4203,7 @@ class TextGroupRenderObject extends LeafRenderObject {
         if (this.element.props.border) {
             render.contentContext.strokeRect(position.x, position.y, this.rect.width, this.rect.height);
         }
-        render.contentContext.drawTextUnits(this, position.x, position.y, this.element.fontBoundingBox.fontBoundingBoxAscent);
+        render.contentContext.drawTextUnits(this, position.x, position.y + (this.rect.height - this.element.props.fontSize) / 2);
     }
     constructor(element) {
         super(element);
@@ -4223,7 +4222,8 @@ class TextGroupRenderObject extends LeafRenderObject {
     }
     measure() {
         this.rect.width = this.textMeasures.reduce((prev, curr) => prev + curr.actualSize, 0);
-        this.rect.height = this.element.fontBoundingBox.fontBoundingBoxAscent + this.element.fontBoundingBox.fontBoundingBoxDescent;
+        this.rect.height = Math.ceil(this.element.props.fontSize * 1.4);
+        // this.element.fontBoundingBox.fontBoundingBoxAscent + this.element.fontBoundingBox.fontBoundingBoxDescent;
     }
 }
 class TextGroupFactory extends ElementFactory {
@@ -4563,7 +4563,7 @@ class DocumentCursor {
                         if (['superscript', 'subscript'].indexOf(ele.props.vertAlign) >= 0) {
                             rect.height -= ele.props.fontSize / 2;
                             if (ele.props.vertAlign === 'subscript') {
-                                rect.y += rect.height;
+                                rect.y += rect.height * 2 / 5;
                             }
                         }
                         rect.x += horX;
@@ -7781,7 +7781,7 @@ class PaintContent {
         this.init();
     }
     init() {
-        this.ctx.textBaseline = 'alphabetic';
+        this.ctx.textBaseline = 'top';
     }
     setGlobalAlpha(alpha) {
         this.ctx.globalAlpha = alpha;
@@ -7800,8 +7800,8 @@ class PaintContent {
         this.ctx.save();
         this.ctx.fillStyle = textProps.color;
         this.ctx.font = textProps.getFont();
-        const vertHeight = textProps.vertAlign === 'superscript' ? 0 : height;
-        this.ctx.fillText(text, x, y + vertHeight - height / 7);
+        const vertHeight = 0; // textProps.vertAlign === 'superscript' ? 0 : height;
+        this.ctx.fillText(text, x, y + vertHeight);
         this.ctx.restore();
         if (textProps.linethrough) {
             this.drawHoriLine(x, y + (Math.ceil(height / 2)), width, textProps.color, 1);
@@ -7821,7 +7821,7 @@ class PaintContent {
         this.ctx.fill();
         this.ctx.restore();
     }
-    drawTextUnits(textGroupRender, x, y, baseLine) {
+    drawTextUnits(textGroupRender, x, y) {
         const textEle = textGroupRender.element;
         const textProps = textEle.props;
         const { width, height } = textGroupRender.rect;
@@ -7844,10 +7844,10 @@ class PaintContent {
             this.drawHoriLine(x, y, width, textProps.color, 1);
         }
         let horX = 0;
-        let vertHeight = baseLine;
-        if (textProps.vertAlign === 'superscript') {
+        let vertHeight = 0; //baseLine;
+        if (textProps.vertAlign === 'subscript') {
             //到top
-            vertHeight -= textProps.fontSize * 2 / 5;
+            vertHeight += textProps.fontSize * 2 / 5;
         }
         for (let i = 0; i < textGroupRender.textMeasures.length; i++) {
             const unit = textGroupRender.textMeasures[i];
@@ -11508,10 +11508,14 @@ class ParagraphMeasure {
     setAlignJustify(render, count, spaceWidth) {
         if (render instanceof BranchRenderObject) {
             let width = 0;
+            //累计元素的偏移量
+            let offset = 0;
             for (let i = 0; i < render.length; i++) {
                 const currRender = render.getChild(i);
+                const currWidth = currRender.rect.width;
                 count += this.setAlignJustify(currRender, count, spaceWidth);
-                currRender.rect.x += width;
+                currRender.rect.x += offset;
+                offset += currRender.rect.width - currWidth;
                 width += currRender.rect.width;
             }
             render.rect.width = width;
@@ -19299,8 +19303,8 @@ class SurfaceView extends NodeItems {
 class LabelNode extends TextBase {
     constructor() {
         super();
-        this.border = 1;
-        this.borderColor = '#000';
+        // this.border=1;
+        // this.borderColor='#000';
     }
     _textWrapping = 'no';
     get textWrapping() {
@@ -20651,7 +20655,7 @@ class TimelineControl extends AbsolutePanel {
         }, 0);
         return finalSize;
     }
-    rebuild() {
+    reBuild() {
         treeForEach(this, item => {
             if (item instanceof NodeItems) {
                 return item.controls;
@@ -20835,7 +20839,7 @@ class TimelineGridControl extends TimelineBaseControl {
                     value: this.randomNum(70, 150)
                 });
             }
-            this.eventData.push({ date: moment$1(this.startTime).add(i, 'days').toDate(), value: '入\r\n院' });
+            this.eventData.push({ date: moment$1(this.startTime).add(i, 'days').toDate(), value: '入\r\n院\r\n111' });
         }
         this.temperatureData.sort((prev, curr) => {
             return curr.date > prev.date ? 1 : -1;
@@ -20843,6 +20847,10 @@ class TimelineGridControl extends TimelineBaseControl {
         this.heartRateData.sort((prev, curr) => curr.date > prev.date ? 1 : -1);
     }
     buildOverride(e) {
+        this.temperatureData.length = 0;
+        this.heartRateData.length = 0;
+        this.eventData.length = 0;
+        this.init();
         this.buildTemperature(e);
         this.buildHearRate(e);
         this.buildStampUnit(e);
@@ -21625,7 +21633,7 @@ function createTimeline() {
     const timeGridContainer = new TimeGridContainer();
     //timeGridContainer.y = 80;
     const timelineGridControl = timeGridContainer.timelineGridControl; //new TimeLineControl();
-    timelineGridControl.showDays = 30;
+    timelineGridControl.showDays = 100;
     timelineGridControl.width = timelineGridControl.getLayoutWidth();
     timelineGridControl.height = 300;
     timelineGridControl.init();
@@ -22615,6 +22623,11 @@ class CanvasTextEditor extends AbsolutePanel {
         surface.addChild(scrollView);
         surface.addChild(rule2);
         //surface.addChild(win);
+        //
+        // setInterval(()=>{
+        //     timeLineControl.reBuild();
+        //     this.onChanged();
+        // },20)
         surface.start();
     }
     /**