@hailin-zheng/editor-core 1.1.22 → 1.1.24

package/index-cjs.js

@@ -32,8 +32,8 @@ function _interopNamespace(e) {
 
 var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
 var acor__namespace = /*#__PURE__*/_interopNamespace(acor);
-var estraverse__namespace = /*#__PURE__*/_interopNamespace(estraverse);
-var bwipjs__default = /*#__PURE__*/_interopDefaultLegacy(bwipjs);
+var estraverse__default = /*#__PURE__*/_interopDefaultLegacy(estraverse);
+var bwipjs__namespace = /*#__PURE__*/_interopNamespace(bwipjs);
 var moment__default$1 = /*#__PURE__*/_interopDefaultLegacy(moment$1);
 
 /**
@@ -2746,7 +2746,7 @@ class DataDecorateRenderObject extends LeafRenderObject {
 
 function parser(code) {
     const node = acor__namespace.parse(code, { ecmaVersion: 'latest' });
-    estraverse__namespace.traverse(node, {
+    estraverse__default["default"].traverse(node, {
         enter: (child, parent) => {
             if (child.type === 'Identifier') {
                 const identifierName = child['name'];
@@ -2756,7 +2756,7 @@ function parser(code) {
             }
         }
     });
-    estraverse__namespace.replace(node, {
+    estraverse__default["default"].replace(node, {
         leave: (child) => {
             //函数调用
             if (child.type == 'CallExpression') {
@@ -4120,7 +4120,6 @@ class DocumentContainerRender extends BlockContainerRenderObject {
 
 class TextGroupElement extends LeafElement {
     textMeasures = [];
-    fontBoundingBox;
     isMeasure = false;
     constructor() {
         super('text');
@@ -4160,7 +4159,7 @@ class TextGroupElement extends LeafElement {
     createRenderObject(data) {
         if (!this.isMeasure || this.modifyFlag !== exports.ModifyFlag.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);
@@ -4234,7 +4233,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);
@@ -4253,7 +4252,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 {
@@ -4593,7 +4593,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;
@@ -7811,7 +7811,7 @@ class PaintContent {
         this.init();
     }
     init() {
-        this.ctx.textBaseline = 'alphabetic';
+        this.ctx.textBaseline = 'top';
     }
     setGlobalAlpha(alpha) {
         this.ctx.globalAlpha = alpha;
@@ -7830,8 +7830,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);
@@ -7851,7 +7851,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;
@@ -7874,10 +7874,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];
@@ -8618,7 +8618,7 @@ class DataElementBarcode extends DataElementLeaf {
         if (!this.barCodeCanvas) {
             this.barCodeCanvas = document.createElement('canvas');
         }
-        this.barCodeCanvas = bwipjs__default["default"].toCanvas(this.barCodeCanvas, {
+        this.barCodeCanvas = bwipjs__namespace.toCanvas(this.barCodeCanvas, {
             bcid: this.props.type,
             text: this.props.text || "0123456789",
             height: 10,
@@ -11722,8 +11722,13 @@ class ParagraphMeasure {
                 return;
             }
             else {
-                parentLine.add(render);
-                parentLine.applyNewLine();
+                if (parentLine.lineWidth() === 0) {
+                    parentLine.add(render);
+                }
+                else {
+                    parentLine.applyNewLine();
+                    this.arrangeLeafRender(parentLine, render);
+                }
             }
         }
         else {