vxe-pc-ui 4.14.29 → 4.14.30

package/lib/watermark/src/util.js

@@ -59,18 +59,6 @@ function calcContentWH(contList) {
     contentHeight
   };
 }
-function calcCanvasWH(contentWidth, opts) {
-  const {
-    gap
-  } = opts;
-  const [gapX = 0, gapY = 0] = gap ? _xeUtils.default.isArray(gap) ? gap : [gap, gap] : [];
-  const canvasWidth = contentWidth + _xeUtils.default.toNumber(gapX);
-  const canvasHeight = contentWidth + _xeUtils.default.toNumber(gapY);
-  return {
-    canvasWidth,
-    canvasHeight
-  };
-}
 function getFontConf(item, key, opts) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -126,29 +114,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 ? _xeUtils.default.isArray(gap) ? gap : [gap, gap] : [];
+      const gapX = _xeUtils.default.toNumber(gapList[0]);
+      const gapY = _xeUtils.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());

package/lib/watermark/src/util.min.js

@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:!0}),exports.getContentUrl=getContentUrl;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}let canvasEl=null,fontEl=null,fontCacheMaps={};function getMarkCanvas(){return canvasEl||((canvasEl=document.createElement("canvas")).style.position="absolute",canvasEl.style.top="0",canvasEl.style.left="0"),canvasEl}function removeMarkElement(t){var e;t&&(e=t.parentNode)&&e.removeChild(t)}function calcFontWH(t,e){var n=e+"_"+t;return fontCacheMaps[n]||((fontEl=fontEl||document.createElement("span")).parentNode||document.body.append(fontEl),fontEl.textContent=t,fontEl.style.fontSize=(0,_dom.toCssUnit)(e),t=fontEl.offsetWidth,e=fontEl.offsetHeight,fontCacheMaps[n]={width:t,height:e}),fontCacheMaps[n]}function calcContentWH(t){let e=0,n=0;return t.forEach(t=>{e=Math.max(t.width,e),n=Math.max(t.height,n)}),{contentWidth:e,contentHeight:n}}function calcCanvasWH(t,e){var e=e.gap,[e=0,n=0]=e?_xeUtils.default.isArray(e)?e:[e,e]:[];return{canvasWidth:t+_xeUtils.default.toNumber(e),canvasHeight:t+_xeUtils.default.toNumber(n)}}function getFontConf(t,e,n){return(t.font?t.font[e]:"")||(n.font?n.font[e]:"")}function createMarkFont(t,e,n){var o=n.offset,a=_xeUtils.default.toValueString(t.textContent),n=_xeUtils.default.toNumber(getFontConf(t,"fontSize",n)||e)||14,[e=0,o=0]=o?_xeUtils.default.isArray(o)?o:[o,o]:[],{width:l,height:r}=calcFontWH(a,n);return{text:a,fontSize:n,font:t.font,width:l+_xeUtils.default.toNumber(e),height:r+_xeUtils.default.toNumber(o)}}function drayFont(t,e,n){var o=getFontConf(e,"fontWeight",n);t.fillStyle=""+(getFontConf(e,"color",n)||"rgba(0, 0, 0, 0.15)"),t.font=[getFontConf(e,"fontStyle",n)||"normal","bold"===o||"bolder"===o?"bold":"",(0,_dom.toCssUnit)(e.fontSize),getFontConf(e,"fontFamily",n)||"sans-serif"].join(" ")}function getContentUrl(t,e,n){let c=Object.assign({},n);n=c.rotate;let u=_xeUtils.default.toNumber(n),d=(_xeUtils.default.isArray(t)?t:[t]).map(t=>t?t.textContent?createMarkFont(t,e,c):createMarkFont({textContent:""+t},e,c):createMarkFont({textContent:""},e,c));return removeMarkElement(fontEl),new Promise(t=>{var e=getMarkCanvas();e.parentNode||document.body.append(e);let i=e.getContext("2d");if(i&&d.length){let{contentWidth:n,contentHeight:o}=calcContentWH(d);var{canvasWidth:f,canvasHeight:s}=calcCanvasWH(n,c);e.width=f,e.height=s;let a=(f-n)/2,l=(s-o)/2;f=a+n/2,s=l+o/2;i.save(),i.translate(f,s),i.rotate(u*Math.PI/180),i.translate(-f,-s);let r=0;d.forEach(t=>{var e=getFontConf(t,"align",c);drayFont(i,t,c),i.fillText(t.text,a+("center"===e?(n-t.width)/2:0),l+(o+o)/2+r,n),r+=t.height}),i.restore(),t(e.toDataURL())}else t("");removeMarkElement(e)})}
+Object.defineProperty(exports,"__esModule",{value:!0}),exports.getContentUrl=getContentUrl;var _xeUtils=_interopRequireDefault(require("xe-utils")),_dom=require("../../ui/src/dom");function _interopRequireDefault(t){return t&&t.__esModule?t:{default:t}}let canvasEl=null,fontEl=null,fontCacheMaps={};function getMarkCanvas(){return canvasEl||((canvasEl=document.createElement("canvas")).style.position="absolute",canvasEl.style.top="0",canvasEl.style.left="0"),canvasEl}function removeMarkElement(t){var e;t&&(e=t.parentNode)&&e.removeChild(t)}function calcFontWH(t,e){var n=e+"_"+t;return fontCacheMaps[n]||((fontEl=fontEl||document.createElement("span")).parentNode||document.body.append(fontEl),fontEl.textContent=t,fontEl.style.fontSize=(0,_dom.toCssUnit)(e),t=fontEl.offsetWidth,e=fontEl.offsetHeight,fontCacheMaps[n]={width:t,height:e}),fontCacheMaps[n]}function calcContentWH(t){let e=0,n=0;return t.forEach(t=>{e=Math.max(t.width,e),n=Math.max(t.height,n)}),{contentWidth:e,contentHeight:n}}function getFontConf(t,e,n){return(t.font?t.font[e]:"")||(n.font?n.font[e]:"")}function createMarkFont(t,e,n){var o=n.offset,a=_xeUtils.default.toValueString(t.textContent),n=_xeUtils.default.toNumber(getFontConf(t,"fontSize",n)||e)||14,[e=0,o=0]=o?_xeUtils.default.isArray(o)?o:[o,o]:[],{width:r,height:l}=calcFontWH(a,n);return{text:a,fontSize:n,font:t.font,width:r+_xeUtils.default.toNumber(e),height:l+_xeUtils.default.toNumber(o)}}function drayFont(t,e,n){var o=getFontConf(e,"fontWeight",n);t.fillStyle=""+(getFontConf(e,"color",n)||"rgba(0, 0, 0, 0.15)"),t.font=[getFontConf(e,"fontStyle",n)||"normal","bold"===o||"bolder"===o?"bold":"",(0,_dom.toCssUnit)(e.fontSize),getFontConf(e,"fontFamily",n)||"sans-serif"].join(" ")}function getContentUrl(t,e,n){let h=Object.assign({},n);n=h.rotate;let m=_xeUtils.default.toNumber(n),g=(_xeUtils.default.isArray(t)?t:[t]).map(t=>t?t.textContent?createMarkFont(t,e,h):createMarkFont({textContent:""+t},e,h):createMarkFont({textContent:""},e,h));return removeMarkElement(fontEl),new Promise(t=>{var e=getMarkCanvas();e.parentNode||document.body.append(e);let s=e.getContext("2d");if(s&&g.length){var n=h.gap,n=n?_xeUtils.default.isArray(n)?n:[n,n]:[],u=_xeUtils.default.toNumber(n[0]),n=_xeUtils.default.toNumber(n[1]);let o=calcContentWH(g).contentWidth;var c=2*o+2*u+u/2,d=2*o+n;e.width=c,e.height=d;let a=u/2,r=o+n/2,l=(s.save(),s.translate(a,r),s.rotate(m*Math.PI/180),s.translate(-a,-r),0),f=(g.forEach(t=>{drayFont(s,t,h);var e=a,n=r+l;s.fillText(t.text,e,n,o),l+=t.height}),u),i=n+o;l=0,g.forEach(t=>{drayFont(s,t,h);var e=a+f,n=r+l+i;s.fillText(t.text,e,n,o),l+=t.height}),s.restore(),t(e.toDataURL())}else t("");removeMarkElement(e)})}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.14.29",
+  "version": "4.14.30",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/watermark/src/util.ts

@@ -71,17 +71,6 @@ function calcContentWH (contList: VxeWatermarkDefines.ContentObj[]) {
   }
 }
 
-function calcCanvasWH (contentWidth: number, opts: ContentMarkOptions) {
-  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: VxeWatermarkDefines.ContentObj | VxeWatermarkDefines.ContentConf, key: keyof VxeWatermarkPropTypes.Font, opts: ContentMarkOptions) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '')
 }
@@ -139,31 +128,46 @@ export function getContentUrl (content: VxeWatermarkPropTypes.Content, defaultFo
     }
     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) => {
-        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
+        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) => {
+        drayFont(ctx, item, opts)
+        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/types/components/table.d.ts

@@ -4136,6 +4136,7 @@ export interface TableInternalData<D = any> {
   sourceDataRowIdData: Record<string, D>
   fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem<D>>
   fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem<D>>
+  fullCellHeightMaps: Record<string, Record<string, number>>
 
   // 当前行
   currentRow: D | null