vxe-pc-ui 3.14.29 → 3.14.30

package/lib/watermark/src/util.js

@@ -65,21 +65,6 @@ function calcContentWH(contList) {
     contentHeight: contentHeight
   };
 }
-function calcCanvasWH(contentWidth, opts) {
-  var gap = opts.gap;
-  var _ref = gap ? _xeUtils.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 + _xeUtils.default.toNumber(gapX);
-  var canvasHeight = contentWidth + _xeUtils.default.toNumber(gapY);
-  return {
-    canvasWidth: canvasWidth,
-    canvasHeight: canvasHeight
-  };
-}
 function getFontConf(item, key, opts) {
   return (item.font ? item.font[key] : '') || (opts.font ? opts.font[key] : '');
 }
@@ -87,12 +72,12 @@ function createMarkFont(contConf, defaultFontSize, opts) {
   var offset = opts.offset;
   var text = _xeUtils.default.toValueString(contConf.textContent);
   var fontSize = _xeUtils.default.toNumber(getFontConf(contConf, 'fontSize', opts) || defaultFontSize) || 14;
-  var _ref3 = offset ? _xeUtils.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 ? _xeUtils.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;
@@ -134,28 +119,39 @@ function getContentUrl(content, defaultFontSize, options) {
     }
     var ctx = canvasEl.getContext('2d');
     if (ctx && contList.length) {
+      var gap = opts.gap;
+      var gapList = gap ? _xeUtils.default.isArray(gap) ? gap : [gap, gap] : [];
+      var gapX = _xeUtils.default.toNumber(gapList[0]);
+      var gapY = _xeUtils.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());

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}}function _slicedToArray(t,e){return _arrayWithHoles(t)||_iterableToArrayLimit(t,e)||_unsupportedIterableToArray(t,e)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(t,e){var n;if(t)return"string"==typeof t?_arrayLikeToArray(t,e):"Map"===(n="Object"===(n={}.toString.call(t).slice(8,-1))&&t.constructor?t.constructor.name:n)||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(t,e):void 0}function _arrayLikeToArray(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=Array(e);n<e;n++)r[n]=t[n];return r}function _iterableToArrayLimit(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=n){var r,o,a,l,i=[],c=!0,f=!1;try{if(a=(n=n.call(t)).next,0===e){if(Object(n)!==n)return;c=!1}else for(;!(c=(r=a.call(n)).done)&&(i.push(r.value),i.length!==e);c=!0);}catch(t){f=!0,o=t}finally{try{if(!c&&null!=n.return&&(l=n.return(),Object(l)!==l))return}finally{if(f)throw o}}return i}}function _arrayWithHoles(t){if(Array.isArray(t))return t}var 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="".concat(e,"_").concat(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){var e=0,n=0;return t.forEach(function(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=_slicedToArray(e?_xeUtils.default.isArray(e)?e:[e,e]:[],2),n=e[0],e=e[1],e=void 0===e?0:e;return{canvasWidth:t+_xeUtils.default.toNumber(void 0===n?0:n),canvasHeight:t+_xeUtils.default.toNumber(e)}}function getFontConf(t,e,n){return(t.font?t.font[e]:"")||(n.font?n.font[e]:"")}function createMarkFont(t,e,n){var r=n.offset,o=_xeUtils.default.toValueString(t.textContent),n=_xeUtils.default.toNumber(getFontConf(t,"fontSize",n)||e)||14,e=_slicedToArray(r?_xeUtils.default.isArray(r)?r:[r,r]:[],2),r=e[0],r=void 0===r?0:r,e=e[1],e=void 0===e?0:e,a=calcFontWH(o,n),l=a.width,a=a.height;return{text:o,fontSize:n,font:t.font,width:l+_xeUtils.default.toNumber(r),height:a+_xeUtils.default.toNumber(e)}}function drayFont(t,e,n){var r=getFontConf(e,"fontWeight",n);t.fillStyle="".concat(getFontConf(e,"color",n)||"rgba(0, 0, 0, 0.15)"),t.font=[getFontConf(e,"fontStyle",n)||"normal","bold"===r||"bolder"===r?"bold":"",(0,_dom.toCssUnit)(e.fontSize),getFontConf(e,"fontFamily",n)||"sans-serif"].join(" ")}function getContentUrl(t,e,n){var u=Object.assign({},n),n=u.rotate,s=_xeUtils.default.toNumber(n),d=(_xeUtils.default.isArray(t)?t:[t]).map(function(t){return t?t.textContent?createMarkFont(t,e,u):createMarkFont({textContent:"".concat(t)},e,u):createMarkFont({textContent:""},e,u)});return removeMarkElement(fontEl),new Promise(function(t){var n,r,o,a,e,l,i,c=getMarkCanvas(),f=(c.parentNode||document.body.append(c),c.getContext("2d"));f&&d.length?(l=calcContentWH(d),n=l.contentWidth,r=l.contentHeight,e=(l=calcCanvasWH(n,u)).canvasWidth,l=l.canvasHeight,c.width=e,c.height=l,e=(o=(e-n)/2)+n/2,l=(a=(l-r)/2)+r/2,f.save(),f.translate(e,l),f.rotate(s*Math.PI/180),f.translate(-e,-l),i=0,d.forEach(function(t){var e=getFontConf(t,"align",u);drayFont(f,t,u),f.fillText(t.text,o+("center"===e?(n-t.width)/2:0),a+(r+r)/2+i,n),i+=t.height}),f.restore(),t(c.toDataURL())):t(""),removeMarkElement(c)})}
+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}}function _slicedToArray(t,e){return _arrayWithHoles(t)||_iterableToArrayLimit(t,e)||_unsupportedIterableToArray(t,e)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(t,e){var n;if(t)return"string"==typeof t?_arrayLikeToArray(t,e):"Map"===(n="Object"===(n={}.toString.call(t).slice(8,-1))&&t.constructor?t.constructor.name:n)||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?_arrayLikeToArray(t,e):void 0}function _arrayLikeToArray(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=Array(e);n<e;n++)r[n]=t[n];return r}function _iterableToArrayLimit(t,e){var n=null==t?null:"undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(null!=n){var r,o,a,l,i=[],f=!0,u=!1;try{if(a=(n=n.call(t)).next,0===e){if(Object(n)!==n)return;f=!1}else for(;!(f=(r=a.call(n)).done)&&(i.push(r.value),i.length!==e);f=!0);}catch(t){u=!0,o=t}finally{try{if(!f&&null!=n.return&&(l=n.return(),Object(l)!==l))return}finally{if(u)throw o}}return i}}function _arrayWithHoles(t){if(Array.isArray(t))return t}var 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="".concat(e,"_").concat(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){var e=0,n=0;return t.forEach(function(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 r=n.offset,o=_xeUtils.default.toValueString(t.textContent),n=_xeUtils.default.toNumber(getFontConf(t,"fontSize",n)||e)||14,e=_slicedToArray(r?_xeUtils.default.isArray(r)?r:[r,r]:[],2),r=e[0],r=void 0===r?0:r,e=e[1],e=void 0===e?0:e,a=calcFontWH(o,n),l=a.width,a=a.height;return{text:o,fontSize:n,font:t.font,width:l+_xeUtils.default.toNumber(r),height:a+_xeUtils.default.toNumber(e)}}function drayFont(t,e,n){var r=getFontConf(e,"fontWeight",n);t.fillStyle="".concat(getFontConf(e,"color",n)||"rgba(0, 0, 0, 0.15)"),t.font=[getFontConf(e,"fontStyle",n)||"normal","bold"===r||"bolder"===r?"bold":"",(0,_dom.toCssUnit)(e.fontSize),getFontConf(e,"fontFamily",n)||"sans-serif"].join(" ")}function getContentUrl(t,e,n){var d=Object.assign({},n),n=d.rotate,h=_xeUtils.default.toNumber(n),y=(_xeUtils.default.isArray(t)?t:[t]).map(function(t){return t?t.textContent?createMarkFont(t,e,d):createMarkFont({textContent:"".concat(t)},e,d):createMarkFont({textContent:""},e,d)});return removeMarkElement(fontEl),new Promise(function(t){var e,n,r,o,a,l,i,f,u,c=getMarkCanvas(),s=(c.parentNode||document.body.append(c),c.getContext("2d"));s&&y.length?(n=(n=d.gap)?_xeUtils.default.isArray(n)?n:[n,n]:[],e=_xeUtils.default.toNumber(n[0]),n=_xeUtils.default.toNumber(n[1]),o=2*(r=calcContentWH(y).contentWidth)+n,c.width=2*r+2*e+e/2,c.height=o,a=e/2,l=r+n/2,s.save(),s.translate(a,l),s.rotate(h*Math.PI/180),s.translate(-a,-l),u=0,y.forEach(function(t){drayFont(s,t,d);var e=l+u;s.fillText(t.text,a,e,r),u+=t.height}),i=e,f=n+r,u=0,y.forEach(function(t){drayFont(s,t,d);var e=l+u+f;s.fillText(t.text,a+i,e,r),u+=t.height}),s.restore(),t(c.toDataURL())):t(""),removeMarkElement(c)})}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "3.14.29",
+  "version": "3.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

@@ -4165,6 +4165,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