vxe-pc-ui 3.14.29 → 3.14.31

package/es/ui/index.js

@@ -1,7 +1,7 @@
 import { VxeUI, setConfig, setIcon } from '@vxe-ui/core';
 import { dynamicApp } from '../dynamics';
 import { warnLog } from './src/log';
-export const version = "3.14.30";
+export const version = "3.14.31";
 VxeUI.uiVersion = version;
 VxeUI.dynamicApp = dynamicApp;
 export function config(options) {

package/es/ui/src/log.js

@@ -1,4 +1,4 @@
 import { log } from '@vxe-ui/core';
-const version = `ui v${"3.14.30"}`;
+const version = `ui v${"3.14.31"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

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

@@ -13214,7 +13214,7 @@ function checkDynamic() {
 }
 ;// ./packages/ui/src/log.ts
 
-var log_version = "ui v".concat("3.14.30");
+var log_version = "ui v".concat("3.14.31");
 var warnLog = log.create('warn', log_version);
 var errLog = log.create('error', log_version);
 ;// ./packages/ui/index.ts
@@ -13222,7 +13222,7 @@ var errLog = log.create('error', log_version);
 
 
 
-var ui_version = "3.14.30";
+var ui_version = "3.14.31";
 VxeUI.uiVersion = ui_version;
 VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -63416,21 +63416,6 @@ function calcContentWH(contList) {
     contentHeight: contentHeight
   };
 }
-function calcCanvasWH(contentWidth, opts) {
-  var gap = opts.gap;
-  var _ref = gap ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gap) ? gap : [gap, gap] : [],
-    _ref2 = _slicedToArray(_ref, 2),
-    _ref2$ = _ref2[0],
-    gapX = _ref2$ === void 0 ? 0 : _ref2$,
-    _ref2$2 = _ref2[1],
-    gapY = _ref2$2 === void 0 ? 0 : _ref2$2;
-  var canvasWidth = contentWidth + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapX);
-  var canvasHeight = contentWidth + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapY);
-  return {
-    canvasWidth: canvasWidth,
-    canvasHeight: canvasHeight
-  };
-}
 function getFontConf(item, key, opts) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -63438,12 +63423,12 @@ function createMarkFont(contConf, defaultFontSize, opts) {
   var offset = opts.offset;
   var text = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(contConf.textContent);
   var fontSize = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getFontConf(contConf, 'fontSize', opts) || defaultFontSize) || 14;
-  var _ref3 = offset ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(offset) ? offset : [offset, offset] : [],
-    _ref4 = _slicedToArray(_ref3, 2),
-    _ref4$ = _ref4[0],
-    offsetX = _ref4$ === void 0 ? 0 : _ref4$,
-    _ref4$2 = _ref4[1],
-    offsetY = _ref4$2 === void 0 ? 0 : _ref4$2;
+  var _ref = offset ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(offset) ? offset : [offset, offset] : [],
+    _ref2 = _slicedToArray(_ref, 2),
+    _ref2$ = _ref2[0],
+    offsetX = _ref2$ === void 0 ? 0 : _ref2$,
+    _ref2$2 = _ref2[1],
+    offsetY = _ref2$2 === void 0 ? 0 : _ref2$2;
   var _calcFontWH = calcFontWH(text, fontSize),
     width = _calcFontWH.width,
     height = _calcFontWH.height;
@@ -63485,28 +63470,39 @@ function getContentUrl(content, defaultFontSize, options) {
     }
     var ctx = canvasEl.getContext('2d');
     if (ctx && contList.length) {
+      var gap = opts.gap;
+      var gapList = gap ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(gap) ? gap : [gap, gap] : [];
+      var gapX = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapList[0]);
+      var gapY = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(gapList[1]);
       var _calcContentWH = calcContentWH(contList),
-        contentWidth = _calcContentWH.contentWidth,
-        contentHeight = _calcContentWH.contentHeight;
-      var _calcCanvasWH = calcCanvasWH(contentWidth, opts),
-        canvasWidth = _calcCanvasWH.canvasWidth,
-        canvasHeight = _calcCanvasWH.canvasHeight;
+        contentWidth = _calcContentWH.contentWidth;
+      var canvasWidth = contentWidth * 2 + gapX * 2 + gapX / 2;
+      var canvasHeight = contentWidth * 2 + gapY;
       canvasEl.width = canvasWidth;
       canvasEl.height = canvasHeight;
-      var x = (canvasWidth - contentWidth) / 2;
-      var y = (canvasHeight - contentHeight) / 2;
-      var drayX = x + contentWidth / 2;
-      var drayY = y + contentHeight / 2;
+      var drayX = gapX / 2;
+      var drayY = contentWidth + gapY / 2;
       ctx.save();
       ctx.translate(drayX, drayY);
       ctx.rotate(deg * Math.PI / 180);
       ctx.translate(-drayX, -drayY);
-      var offsetHeight = 0;
+      var txtOffsetY = 0;
+      contList.forEach(function (item) {
+        drayFont(ctx, item, opts);
+        var txtX = drayX;
+        var txtY = drayY + txtOffsetY;
+        ctx.fillText(item.text, txtX, txtY, contentWidth);
+        txtOffsetY += item.height;
+      });
+      var offsetX = gapX;
+      var offsetY = gapY + contentWidth;
+      txtOffsetY = 0;
       contList.forEach(function (item) {
-        var 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;
+        var txtX = drayX + offsetX;
+        var txtY = drayY + txtOffsetY + offsetY;
+        ctx.fillText(item.text, txtX, txtY, contentWidth);
+        txtOffsetY += item.height;
       });
       ctx.restore();
       resolve(canvasEl.toDataURL());