vxe-pc-ui 4.14.29 → 4.14.30

package/dist/all.esm.js

@@ -41699,16 +41699,6 @@ function calcContentWH(contList) {
         contentHeight
     };
 }
-function calcCanvasWH(contentWidth, opts) {
-    const { gap } = opts;
-    const [gapX = 0, gapY = 0] = gap ? ((XEUtils.isArray(gap) ? gap : [gap, gap])) : [];
-    const canvasWidth = contentWidth + XEUtils.toNumber(gapX);
-    const canvasHeight = contentWidth + XEUtils.toNumber(gapY);
-    return {
-        canvasWidth,
-        canvasHeight
-    };
-}
 function getFontConf(item, key, opts) {
     return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -41761,24 +41751,38 @@ function getContentUrl(content, defaultFontSize, options) {
         }
         const ctx = canvasEl.getContext('2d');
         if (ctx && contList.length) {
-            const { contentWidth, contentHeight } = calcContentWH(contList);
-            const { canvasWidth, canvasHeight } = calcCanvasWH(contentWidth, opts);
+            const { gap } = opts;
+            const gapList = gap ? ((XEUtils.isArray(gap) ? gap : [gap, gap])) : [];
+            const gapX = XEUtils.toNumber(gapList[0]);
+            const gapY = XEUtils.toNumber(gapList[1]);
+            const { contentWidth } = calcContentWH(contList);
+            const canvasWidth = contentWidth * 2 + gapX * 2 + (gapX / 2);
+            const canvasHeight = contentWidth * 2 + gapY;
             canvasEl.width = canvasWidth;
             canvasEl.height = canvasHeight;
-            const x = (canvasWidth - contentWidth) / 2;
-            const y = (canvasHeight - contentHeight) / 2;
-            const drayX = x + (contentWidth / 2);
-            const drayY = y + (contentHeight / 2);
+            const drayX = (gapX / 2);
+            const drayY = contentWidth + (gapY / 2);
             ctx.save();
             ctx.translate(drayX, drayY);
             ctx.rotate(deg * Math.PI / 180);
             ctx.translate(-drayX, -drayY);
-            let offsetHeight = 0;
+            let txtOffsetY = 0;
+            contList.forEach((item) => {
+                drayFont(ctx, item, opts);
+                const txtX = drayX;
+                const txtY = drayY + txtOffsetY;
+                ctx.fillText(item.text, txtX, txtY, contentWidth);
+                txtOffsetY += item.height;
+            });
+            const offsetX = gapX;
+            const offsetY = gapY + contentWidth;
+            txtOffsetY = 0;
             contList.forEach((item) => {
-                const align = getFontConf(item, 'align', opts);
                 drayFont(ctx, item, opts);
-                ctx.fillText(item.text, x + (align === 'center' ? (contentWidth - item.width) / 2 : 0), y + (contentHeight + contentHeight) / 2 + offsetHeight, contentWidth);
-                offsetHeight += item.height;
+                const txtX = drayX + offsetX;
+                const txtY = drayY + txtOffsetY + offsetY;
+                ctx.fillText(item.text, txtX, txtY, contentWidth);
+                txtOffsetY += item.height;
             });
             ctx.restore();
             resolve(canvasEl.toDataURL());

package/es/watermark/src/util.js

@@ -52,16 +52,6 @@ function calcContentWH(contList) {
         contentHeight
     };
 }
-function calcCanvasWH(contentWidth, opts) {
-    const { gap } = opts;
-    const [gapX = 0, gapY = 0] = gap ? ((XEUtils.isArray(gap) ? gap : [gap, gap])) : [];
-    const canvasWidth = contentWidth + XEUtils.toNumber(gapX);
-    const canvasHeight = contentWidth + XEUtils.toNumber(gapY);
-    return {
-        canvasWidth,
-        canvasHeight
-    };
-}
 function getFontConf(item, key, opts) {
     return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -114,24 +104,38 @@ export function getContentUrl(content, defaultFontSize, options) {
         }
         const ctx = canvasEl.getContext('2d');
         if (ctx && contList.length) {
-            const { contentWidth, contentHeight } = calcContentWH(contList);
-            const { canvasWidth, canvasHeight } = calcCanvasWH(contentWidth, opts);
+            const { gap } = opts;
+            const gapList = gap ? ((XEUtils.isArray(gap) ? gap : [gap, gap])) : [];
+            const gapX = XEUtils.toNumber(gapList[0]);
+            const gapY = XEUtils.toNumber(gapList[1]);
+            const { contentWidth } = calcContentWH(contList);
+            const canvasWidth = contentWidth * 2 + gapX * 2 + (gapX / 2);
+            const canvasHeight = contentWidth * 2 + gapY;
             canvasEl.width = canvasWidth;
             canvasEl.height = canvasHeight;
-            const x = (canvasWidth - contentWidth) / 2;
-            const y = (canvasHeight - contentHeight) / 2;
-            const drayX = x + (contentWidth / 2);
-            const drayY = y + (contentHeight / 2);
+            const drayX = (gapX / 2);
+            const drayY = contentWidth + (gapY / 2);
             ctx.save();
             ctx.translate(drayX, drayY);
             ctx.rotate(deg * Math.PI / 180);
             ctx.translate(-drayX, -drayY);
-            let offsetHeight = 0;
+            let txtOffsetY = 0;
+            contList.forEach((item) => {
+                drayFont(ctx, item, opts);
+                const txtX = drayX;
+                const txtY = drayY + txtOffsetY;
+                ctx.fillText(item.text, txtX, txtY, contentWidth);
+                txtOffsetY += item.height;
+            });
+            const offsetX = gapX;
+            const offsetY = gapY + contentWidth;
+            txtOffsetY = 0;
             contList.forEach((item) => {
-                const align = getFontConf(item, 'align', opts);
                 drayFont(ctx, item, opts);
-                ctx.fillText(item.text, x + (align === 'center' ? (contentWidth - item.width) / 2 : 0), y + (contentHeight + contentHeight) / 2 + offsetHeight, contentWidth);
-                offsetHeight += item.height;
+                const txtX = drayX + offsetX;
+                const txtY = drayY + txtOffsetY + offsetY;
+                ctx.fillText(item.text, txtX, txtY, contentWidth);
+                txtOffsetY += item.height;
             });
             ctx.restore();
             resolve(canvasEl.toDataURL());

package/lib/index.umd.js

@@ -50807,18 +50807,6 @@ function calcContentWH(contList) {
     contentHeight
   };
 }
-function calcCanvasWH(contentWidth, opts) {
-  const {
-    gap
-  } = opts;
-  const [gapX = 0, gapY = 0] = gap ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gap) ? gap : [gap, gap] : [];
-  const canvasWidth = contentWidth + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapX);
-  const canvasHeight = contentWidth + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapY);
-  return {
-    canvasWidth,
-    canvasHeight
-  };
-}
 function getFontConf(item, key, opts) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -50874,29 +50862,41 @@ function getContentUrl(content, defaultFontSize, options) {
     const ctx = canvasEl.getContext('2d');
     if (ctx && contList.length) {
       const {
-        contentWidth,
-        contentHeight
-      } = calcContentWH(contList);
+        gap
+      } = opts;
+      const gapList = gap ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gap) ? gap : [gap, gap] : [];
+      const gapX = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapList[0]);
+      const gapY = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapList[1]);
       const {
-        canvasWidth,
-        canvasHeight
-      } = calcCanvasWH(contentWidth, opts);
+        contentWidth
+      } = calcContentWH(contList);
+      const canvasWidth = contentWidth * 2 + gapX * 2 + gapX / 2;
+      const canvasHeight = contentWidth * 2 + gapY;
       canvasEl.width = canvasWidth;
       canvasEl.height = canvasHeight;
-      const x = (canvasWidth - contentWidth) / 2;
-      const y = (canvasHeight - contentHeight) / 2;
-      const drayX = x + contentWidth / 2;
-      const drayY = y + contentHeight / 2;
+      const drayX = gapX / 2;
+      const drayY = contentWidth + gapY / 2;
       ctx.save();
       ctx.translate(drayX, drayY);
       ctx.rotate(deg * Math.PI / 180);
       ctx.translate(-drayX, -drayY);
-      let offsetHeight = 0;
+      let txtOffsetY = 0;
+      contList.forEach(item => {
+        drayFont(ctx, item, opts);
+        const txtX = drayX;
+        const txtY = drayY + txtOffsetY;
+        ctx.fillText(item.text, txtX, txtY, contentWidth);
+        txtOffsetY += item.height;
+      });
+      const offsetX = gapX;
+      const offsetY = gapY + contentWidth;
+      txtOffsetY = 0;
       contList.forEach(item => {
-        const align = getFontConf(item, 'align', opts);
         drayFont(ctx, item, opts);
-        ctx.fillText(item.text, x + (align === 'center' ? (contentWidth - item.width) / 2 : 0), y + (contentHeight + contentHeight) / 2 + offsetHeight, contentWidth);
-        offsetHeight += item.height;
+        const txtX = drayX + offsetX;
+        const txtY = drayY + txtOffsetY + offsetY;
+        ctx.fillText(item.text, txtX, txtY, contentWidth);
+        txtOffsetY += item.height;
       });
       ctx.restore();
       resolve(canvasEl.toDataURL());