adtec-core-package 1.4.7 → 1.4.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/RichTextEditor/RichTextEditor.vue

@@ -70,7 +70,7 @@ const fontSizes = [
   { name: "小初", pt: 36, px: 42 },
   { name: "初号", pt: 42, px: 49 }
 ];
-function convertPxToPt(html: string) {
+function convertPxToPt(html) {
   const regex = /font-size: (\d+)px/g;
   return html.replace(regex, (match, pxValue) => {
     const px = parseInt(pxValue, 10);
@@ -81,7 +81,7 @@ function convertPxToPt(html: string) {
     return match;
   });
 }
-function convertPtToPx(html: string) {
+function convertPtToPx(html) {
   const regex = /font-size: (\d+)pt/g;
   return html.replace(regex, (match, ptValue) => {
     const pt = parseFloat(ptValue);
@@ -146,31 +146,30 @@ const defaultConfig = {
  * 修改样式
  */
 function setContent() {
-  calcImagesHeight()
-  model.value = convertPxToPt(model.value)
-  // console.log('modelvalue', model.value)
+  let html = aiEditor!.getHtml()
+  html = calcImagesHeight(html)
+  model.value = convertPxToPt(html)
 }
 
 /**
  * 计算富文本框中图片的高度并赋值
  */
-function calcImagesHeight() {
+function calcImagesHeight(html: string) {
   const map = new Map()
   const imageElements = divRef.value.querySelectorAll('img.resize-obj');
   if (imageElements.length > 0) {
-    imageElements.forEach((imageElement: any) => {
+    imageElements.forEach((imageElement) => {
       const width = imageElement.offsetWidth;
       const height = imageElement.offsetHeight;
       if (width > 1 && height > 1) {
         map.set(imageElement.src.length > 100 ? imageElement.src.substring(0,100) : imageElement.src, height)
       }
     });
-    let res = aiEditor!.getHtml()
     for (const [key, value] of map) {
-      res = customStringReplacement(res, `${key}`, '>', `height="auto"`, `height="${value}"`)
+      html = customStringReplacement(html, `${key}`, '>', `height="auto"`, `height="${value}"`)
     }
-    model.value = res
   }
+  return html
 }
 
 
@@ -212,7 +211,7 @@ function customStringReplacement(str: string, startMarker: string, endMarker: st
 //     }
 //   },
 // )
-function initHtml(html: string) {
+function initHtml(html) {
   html = customStringReplacement(html, '<img', '>', 'height="[0-9]+"', 'height="auto"')
   return convertPtToPx(html)
 }