@hailin-zheng/editor-core 2.1.15 → 2.1.17

package/index.js

@@ -2646,7 +2646,7 @@ class ValidateProps {
         return clone;
     }
 }
-class DataElementGroupProps {
+class DataElementGroupProps extends INotifyPropertyChanged {
     id;
     name;
     hidden;
@@ -8269,8 +8269,9 @@ class DataElementBarcode extends DataElementLeaf {
     }
     createRenderObject() {
         const render = new DataElementBarcodeRenderObject(this);
-        render.rect.width = this.props.width + 2;
-        render.rect.height = this.props.height + 2;
+        const { width, height } = render.measureSize();
+        render.rect.width = width + 2;
+        render.rect.height = height + 2;
         return render;
     }
     serialize(options) {
@@ -8341,11 +8342,27 @@ class DataElementBarcodeRenderObject extends ResizeLeafRenderObject {
         else {
             const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
             JsBarcode(svg, this.element.props.text);
+            const width = Number.parseInt(svg.getAttribute('width').replace('px', ''));
+            const height = Number.parseInt(svg.getAttribute('height').replace('px', ''));
+            svg.setAttribute('width', this.element.props.width + 'px');
+            svg.setAttribute('height', height * (this.element.props.width / width) + 'px');
             const vNode = toVNode(svg);
             t.children = [vNode];
         }
         return t;
     }
+    measureSize() {
+        if (this.element.props.type === 'qrcode') {
+            return { width: this.element.props.width, height: this.element.props.height };
+        }
+        else {
+            const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+            JsBarcode(svg, this.element.props.text);
+            const width = Number.parseInt(svg.getAttribute('width').replace('px', ''));
+            const height = Number.parseInt(svg.getAttribute('height').replace('px', ''));
+            return { width: this.element.props.width, height: height * (this.element.props.width / width) };
+        }
+    }
     toSvgString(qr, border, lightColor, darkColor) {
         let parts = [];
         for (let y = 0; y < qr.size; y++) {
@@ -28542,8 +28559,7 @@ class DocEditor {
         });
         offPrint.afterPrint.subscribe(() => {
         });
-        const html = offPrint.getSvgNodes(this.docCtx.document.paintRenders);
-        console.log(html);
+        return offPrint.getSvgNodes(this.docCtx.document.paintRenders);
     }
     /**
      * 设置光标在数据元内容末尾
@@ -28789,7 +28805,7 @@ class DocEditor {
         rule.setRuleOptions({ width: this.viewOptions.docPageSettings.width, pagePL, pagePR, docLeft });
     }
     version() {
-        return "2.1.15";
+        return "2.1.17";
     }
     switchPageHeaderEditor() {
         this.docCtx.document.switchPageHeaderEditor(this.selectionState, null);