zartui 2.0.49 → 2.0.50

package/es/index.js

@@ -74,7 +74,7 @@ import Tag from './tag';
 import Timeline from './timeline';
 import Toast from './toast';
 import Uploader from './uploader';
-var version = '2.0.49';
+var version = '2.0.50';
 
 function install(Vue) {
   var components = [ActionSheet, Area, Avatar, BackTop, Badge, Button, Calendar, Cascader, Cell, CellGroup, Checkbox, CheckboxGroup, Col, Collapse, CollapseItem, CountDown, DatetimePicker, Dialog, Divider, DropdownItem, DropdownMenu, Empty, Field, FoldDialog, Form, Grid, GridItem, HierarchySelect, Icon, Image, ImagePreview, IndexAnchor, IndexBar, Info, Lazyload, List, Loading, Locale, MediaPicker, MediaPlayer, MultiplePicker, NavBar, NoticeBar, NumberKeyboard, Overlay, PasswordInput, Picker, Popover, Popup, PullRefresh, Radio, RadioGroup, Rate, Row, Search, Signature, Skeleton, Slider, Step, Stepper, Steps, Sticky, Swipe, SwipeCell, SwipeItem, Switch, SwitchCell, Tab, Tabbar, TabbarItem, Table, Tabs, Tag, Timeline, Toast, Uploader];

package/es/media-picker/index.js

@@ -512,7 +512,7 @@ export default createComponent({
             watermarkConfigString: watermarkEnabled ? _this4.watermarkOptions.watermarkConfigString : '',
             context: {
               address: _this4.watermarkOptions.address || "",
-              humanName: _this4.watermarkOptions.humanName || "",
+              humanName: _this4.watermarkOptions.humanName || _this4.watermarkOptions.humanname || "",
               projectName: _this4.watermarkOptions.projectName || "",
               logo: _this4.watermarkOptions.logo || "",
               applicationName: _this4.watermarkOptions.applicationName || "",

package/lib/index.js

@@ -309,7 +309,7 @@ exports.Toast = _toast.default;
 var _uploader = _interopRequireDefault(require("./uploader"));
 
 exports.Uploader = _uploader.default;
-var version = '2.0.49';
+var version = '2.0.50';
 exports.version = version;
 
 function install(Vue) {

package/lib/media-picker/index.js

@@ -558,7 +558,7 @@ var _default2 = createComponent({
             watermarkConfigString: watermarkEnabled ? _this4.watermarkOptions.watermarkConfigString : '',
             context: {
               address: _this4.watermarkOptions.address || "",
-              humanName: _this4.watermarkOptions.humanName || "",
+              humanName: _this4.watermarkOptions.humanName || _this4.watermarkOptions.humanname || "",
               projectName: _this4.watermarkOptions.projectName || "",
               logo: _this4.watermarkOptions.logo || "",
               applicationName: _this4.watermarkOptions.applicationName || "",

package/lib/zart.js

@@ -91,7 +91,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 11);
+/******/ 	return __webpack_require__(__webpack_require__.s = 13);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -434,7 +434,7 @@ function doubleRaf(fn) {
 function cancelRaf(id) {
   iCancel.call(root, id);
 }
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(10)))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(11)))
 
 /***/ }),
 /* 4 */
@@ -805,12 +805,18 @@ defineReactive(proto, '$zartMessages', {
 
 /***/ }),
 /* 9 */
+/***/ (function(module, exports, __webpack_require__) {
+
+!function(t,e){ true?module.exports=e():undefined}(this,(function(){"use strict";var t=1e3,e=6e4,n=36e5,r="millisecond",i="second",s="minute",u="hour",a="day",o="week",f="month",h="quarter",c="year",d="date",l="Invalid Date",$=/^(\d{4})[-/]?(\d{1,2})?[-/]?(\d{0,2})[Tt\s]*(\d{1,2})?:?(\d{1,2})?:?(\d{1,2})?[.:]?(\d+)?$/,y=/\[([^\]]+)]|Y{1,4}|M{1,4}|D{1,2}|d{1,4}|H{1,2}|h{1,2}|a|A|m{1,2}|s{1,2}|Z{1,2}|SSS/g,M={name:"en",weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),ordinal:function(t){var e=["th","st","nd","rd"],n=t%100;return"["+t+(e[(n-20)%10]||e[n]||e[0])+"]"}},m=function(t,e,n){var r=String(t);return!r||r.length>=e?t:""+Array(e+1-r.length).join(n)+t},v={s:m,z:function(t){var e=-t.utcOffset(),n=Math.abs(e),r=Math.floor(n/60),i=n%60;return(e<=0?"+":"-")+m(r,2,"0")+":"+m(i,2,"0")},m:function t(e,n){if(e.date()<n.date())return-t(n,e);var r=12*(n.year()-e.year())+(n.month()-e.month()),i=e.clone().add(r,f),s=n-i<0,u=e.clone().add(r+(s?-1:1),f);return+(-(r+(n-i)/(s?i-u:u-i))||0)},a:function(t){return t<0?Math.ceil(t)||0:Math.floor(t)},p:function(t){return{M:f,y:c,w:o,d:a,D:d,h:u,m:s,s:i,ms:r,Q:h}[t]||String(t||"").toLowerCase().replace(/s$/,"")},u:function(t){return void 0===t}},g="en",D={};D[g]=M;var p=function(t){return t instanceof _},S=function t(e,n,r){var i;if(!e)return g;if("string"==typeof e){var s=e.toLowerCase();D[s]&&(i=s),n&&(D[s]=n,i=s);var u=e.split("-");if(!i&&u.length>1)return t(u[0])}else{var a=e.name;D[a]=e,i=a}return!r&&i&&(g=i),i||!r&&g},w=function(t,e){if(p(t))return t.clone();var n="object"==typeof e?e:{};return n.date=t,n.args=arguments,new _(n)},O=v;O.l=S,O.i=p,O.w=function(t,e){return w(t,{locale:e.$L,utc:e.$u,x:e.$x,$offset:e.$offset})};var _=function(){function M(t){this.$L=S(t.locale,null,!0),this.parse(t)}var m=M.prototype;return m.parse=function(t){this.$d=function(t){var e=t.date,n=t.utc;if(null===e)return new Date(NaN);if(O.u(e))return new Date;if(e instanceof Date)return new Date(e);if("string"==typeof e&&!/Z$/i.test(e)){var r=e.match($);if(r){var i=r[2]-1||0,s=(r[7]||"0").substring(0,3);return n?new Date(Date.UTC(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)):new Date(r[1],i,r[3]||1,r[4]||0,r[5]||0,r[6]||0,s)}}return new Date(e)}(t),this.$x=t.x||{},this.init()},m.init=function(){var t=this.$d;this.$y=t.getFullYear(),this.$M=t.getMonth(),this.$D=t.getDate(),this.$W=t.getDay(),this.$H=t.getHours(),this.$m=t.getMinutes(),this.$s=t.getSeconds(),this.$ms=t.getMilliseconds()},m.$utils=function(){return O},m.isValid=function(){return!(this.$d.toString()===l)},m.isSame=function(t,e){var n=w(t);return this.startOf(e)<=n&&n<=this.endOf(e)},m.isAfter=function(t,e){return w(t)<this.startOf(e)},m.isBefore=function(t,e){return this.endOf(e)<w(t)},m.$g=function(t,e,n){return O.u(t)?this[e]:this.set(n,t)},m.unix=function(){return Math.floor(this.valueOf()/1e3)},m.valueOf=function(){return this.$d.getTime()},m.startOf=function(t,e){var n=this,r=!!O.u(e)||e,h=O.p(t),l=function(t,e){var i=O.w(n.$u?Date.UTC(n.$y,e,t):new Date(n.$y,e,t),n);return r?i:i.endOf(a)},$=function(t,e){return O.w(n.toDate()[t].apply(n.toDate("s"),(r?[0,0,0,0]:[23,59,59,999]).slice(e)),n)},y=this.$W,M=this.$M,m=this.$D,v="set"+(this.$u?"UTC":"");switch(h){case c:return r?l(1,0):l(31,11);case f:return r?l(1,M):l(0,M+1);case o:var g=this.$locale().weekStart||0,D=(y<g?y+7:y)-g;return l(r?m-D:m+(6-D),M);case a:case d:return $(v+"Hours",0);case u:return $(v+"Minutes",1);case s:return $(v+"Seconds",2);case i:return $(v+"Milliseconds",3);default:return this.clone()}},m.endOf=function(t){return this.startOf(t,!1)},m.$set=function(t,e){var n,o=O.p(t),h="set"+(this.$u?"UTC":""),l=(n={},n[a]=h+"Date",n[d]=h+"Date",n[f]=h+"Month",n[c]=h+"FullYear",n[u]=h+"Hours",n[s]=h+"Minutes",n[i]=h+"Seconds",n[r]=h+"Milliseconds",n)[o],$=o===a?this.$D+(e-this.$W):e;if(o===f||o===c){var y=this.clone().set(d,1);y.$d[l]($),y.init(),this.$d=y.set(d,Math.min(this.$D,y.daysInMonth())).$d}else l&&this.$d[l]($);return this.init(),this},m.set=function(t,e){return this.clone().$set(t,e)},m.get=function(t){return this[O.p(t)]()},m.add=function(r,h){var d,l=this;r=Number(r);var $=O.p(h),y=function(t){var e=w(l);return O.w(e.date(e.date()+Math.round(t*r)),l)};if($===f)return this.set(f,this.$M+r);if($===c)return this.set(c,this.$y+r);if($===a)return y(1);if($===o)return y(7);var M=(d={},d[s]=e,d[u]=n,d[i]=t,d)[$]||1,m=this.$d.getTime()+r*M;return O.w(m,this)},m.subtract=function(t,e){return this.add(-1*t,e)},m.format=function(t){var e=this,n=this.$locale();if(!this.isValid())return n.invalidDate||l;var r=t||"YYYY-MM-DDTHH:mm:ssZ",i=O.z(this),s=this.$H,u=this.$m,a=this.$M,o=n.weekdays,f=n.months,h=function(t,n,i,s){return t&&(t[n]||t(e,r))||i[n].slice(0,s)},c=function(t){return O.s(s%12||12,t,"0")},d=n.meridiem||function(t,e,n){var r=t<12?"AM":"PM";return n?r.toLowerCase():r},$={YY:String(this.$y).slice(-2),YYYY:O.s(this.$y,4,"0"),M:a+1,MM:O.s(a+1,2,"0"),MMM:h(n.monthsShort,a,f,3),MMMM:h(f,a),D:this.$D,DD:O.s(this.$D,2,"0"),d:String(this.$W),dd:h(n.weekdaysMin,this.$W,o,2),ddd:h(n.weekdaysShort,this.$W,o,3),dddd:o[this.$W],H:String(s),HH:O.s(s,2,"0"),h:c(1),hh:c(2),a:d(s,u,!0),A:d(s,u,!1),m:String(u),mm:O.s(u,2,"0"),s:String(this.$s),ss:O.s(this.$s,2,"0"),SSS:O.s(this.$ms,3,"0"),Z:i};return r.replace(y,(function(t,e){return e||$[t]||i.replace(":","")}))},m.utcOffset=function(){return 15*-Math.round(this.$d.getTimezoneOffset()/15)},m.diff=function(r,d,l){var $,y=O.p(d),M=w(r),m=(M.utcOffset()-this.utcOffset())*e,v=this-M,g=O.m(this,M);return g=($={},$[c]=g/12,$[f]=g,$[h]=g/3,$[o]=(v-m)/6048e5,$[a]=(v-m)/864e5,$[u]=v/n,$[s]=v/e,$[i]=v/t,$)[y]||v,l?g:O.a(g)},m.daysInMonth=function(){return this.endOf(f).$D},m.$locale=function(){return D[this.$L]},m.locale=function(t,e){if(!t)return this.$L;var n=this.clone(),r=S(t,e,!0);return r&&(n.$L=r),n},m.clone=function(){return O.w(this.$d,this)},m.toDate=function(){return new Date(this.valueOf())},m.toJSON=function(){return this.isValid()?this.toISOString():null},m.toISOString=function(){return this.$d.toISOString()},m.toString=function(){return this.$d.toUTCString()},M}(),T=_.prototype;return w.prototype=T,[["$ms",r],["$s",i],["$m",s],["$H",u],["$W",a],["$M",f],["$y",c],["$D",d]].forEach((function(t){T[t[1]]=function(e){return this.$g(e,t[0],t[1])}})),w.extend=function(t,e){return t.$i||(t(e,_,w),t.$i=!0),w},w.locale=S,w.isDayjs=p,w.unix=function(t){return w(1e3*t)},w.en=D[g],w.Ls=D,w.p={},w}));
+
+/***/ }),
+/* 10 */
 /***/ (function(module, exports) {
 
 module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAABqlBMVEUAAAA0kNL////////7/v+Hy/QYiMjq9f////8Og8UchcxDndYgjcoThsYXickQg8YVh8cZicgXiseZ1fkAPqHl9f79/v9Rqd0IgMQUh8j8/v8YicoGd70aiMoANKFssuEsmdXI6f6W1v6d2PuP0fiJzPRXreAOgsQGfsIWiMgAdb4MgcQci8oZicoHfMIYickUhMcokM4cisshjM4AYrP3+/8fjcsukNEvldAAZ7AxktQej8zq9f+k2/3g8/7s+P39/v+w3vv////1+vze8fuU0/m/5fzq9//r9fvU7fyU1Pyh2vzu9vvk8fj////U7v73+/6Ax/OOz/fi9P+Hy/WZ1fqOz/desuN9xPDF5vlert3o8vpXqtm74Peo1/IikMxQqNwRhMd/wOSJw+QjkMyXzez7/f265P1Uq+CHxOo/ntYAeL94vuWY0/f///8AesEoj8tHptvW7/+y3/z///9wveql1/sViMj///8AbbY2ltBptOHf///////V7//e8//t+f/z+//R7v/8/v+w4f+s4P+o3v74/f/h9P/g8/+55P+a2P/o9v7Y8P4dinW0AAAAfXRSTlMABf3vEOMnBPyGDweRYlhTMiAS8hH5262CdnVbORkWCwr9+fXs5a6Mh357eGdgXU1ANjMuIx4eGxUVDwwL/fr49vbz8/Pz8vDw7+/r6urm5uHh1cvDwLawrqqmo6KemJWTj42MjImFhYJ5cWxqY11aWVZQT0pJRzw6MSURCANUIXAAAAF1SURBVDjLzZFlbwJBEED3rgWOu/asUKBQd2+B4nV3d3d3l8Gh/p97pKQke8DnvmQ/vZfNZAb9LzyZf3iS+byMBP37ct/SASTEId9bbzVFWJA5Hgx64wQjJUemfAIr7manFApFeblCYlKnr1cyCMPJ1arVNTVqCb2+mpUFKgffyHLbWxxrNBrZRl5EOITLrlmG10WrUhCEfJpAMlRoDygqsFrgIuIW93lAAVD+tYLC5P4MSBKk59+NF5i/oWI+VnwdapIUD13gDwAE/EBC24mGka16DLQfg93w1tkDVKjv0sngA4a00dKVUfCV6bTQHl54dGA/XBVHS3SVA+Ar3VwqDn9WnFvwa53ObVTtjIAvZ/34YGa+0nBPIwxrg6FuQgqy6kymBkM278Y8Y29uas6NBdkWm7nJLDs3Imjx+TdQFrlFOum2X3LB2ysFCYkz/R0pSxtcDw9VVNWnCdDTRW01Z0sdqGie5XgapYYRBUEkUDoImU7PD8EVT/CfgxPfAAAAAElFTkSuQmCC"
 
 /***/ }),
-/* 10 */
+/* 11 */
 /***/ (function(module, exports) {
 
 var g;
@@ -836,7 +842,13 @@ module.exports = g;
 
 
 /***/ }),
-/* 11 */
+/* 12 */
+/***/ (function(module, exports, __webpack_require__) {
+
+!function(e,_){ true?module.exports=_(__webpack_require__(9)):undefined}(this,(function(e){"use strict";function _(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var t=_(e),d={name:"zh-cn",weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),ordinal:function(e,_){return"W"===_?e+"周":e+"日"},weekStart:1,yearStart:4,formats:{LT:"HH:mm",LTS:"HH:mm:ss",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah点mm分",LLLL:"YYYY年M月D日ddddAh点mm分",l:"YYYY/M/D",ll:"YYYY年M月D日",lll:"YYYY年M月D日 HH:mm",llll:"YYYY年M月D日dddd HH:mm"},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},meridiem:function(e,_){var t=100*e+_;return t<600?"凌晨":t<900?"早上":t<1100?"上午":t<1300?"中午":t<1800?"下午":"晚上"}};return t.default.locale(d,null,!0),d}));
+
+/***/ }),
+/* 13 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4329,7 +4341,7 @@ var back_top_createNamespace = Object(utils["b" /* createNamespace */])('back-to
       "style": this.blurStyle
     }, [h("img", {
       "attrs": {
-        "src": __webpack_require__(9)
+        "src": __webpack_require__(10)
       }
     })]);
   }
@@ -19217,6 +19229,13 @@ function checkIsWindows() {
 
 
 //# sourceMappingURL=index.js.map
+// EXTERNAL MODULE: ./node_modules/dayjs/dayjs.min.js
+var dayjs_min = __webpack_require__(9);
+var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
+
+// EXTERNAL MODULE: ./node_modules/dayjs/locale/zh-cn.js
+var zh_cn = __webpack_require__(12);
+
 // CONCATENATED MODULE: ./node_modules/@egova/media/lib/watermark.js
 /**
  * 水印配置 {@link http://faq.egova.com.cn:7777/projects/redmine/wiki/%E6%8B%8D%E7%85%A7%E6%B0%B4%E5%8D%B0%E9%85%8D%E7%BD%AE|文档}
@@ -19261,6 +19280,9 @@ var __generator = (undefined && undefined.__generator) || function (thisArg, bod
     }
 };
 
+
+
+dayjs_min_default.a.locale("zh-cn");
 var WatermarkImageEnum;
 (function (WatermarkImageEnum) {
     WatermarkImageEnum[WatermarkImageEnum["POSITION_LEFT"] = 0] = "POSITION_LEFT";
@@ -19311,8 +19333,7 @@ var WatermarkFontWeight;
     WatermarkFontWeight["Normal"] = "normal";
     WatermarkFontWeight["Bold"] = "bold";
 })(WatermarkFontWeight || (WatermarkFontWeight = {}));
-var DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-var DEFAULT_TIME_FORMAT = "HH:mm";
+var DEFAULT_ADDRESS_ICON = "data:image/png;base64,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";
 var WatermarkContent;
 (function (WatermarkContent) {
     WatermarkContent["Raw"] = "";
@@ -19364,6 +19385,7 @@ var DEFAULT_PADDING = 2;
 var DEFAULT_FONT_SIZE = 25.0;
 var DEFAULT_CANVAS_SIZE = 480.0;
 var DEFAULT_BACKGROUND_OPACITY = 128;
+var LOGO_DEFAULT_PADDING = 4;
 var WatermarkStyle = /** @class */ (function () {
     /**
      * Watermark Style
@@ -19459,16 +19481,24 @@ var WatermarkOptions = /** @class */ (function () {
  * 画水印默认使用黑体
  * @see {@link https://www.zhihu.com/question/19911793|使用黑体}
  */
-function getHeitiFontFamily() {
+function getHeitiFontFamily(fontFamily) {
+    if (fontFamily === void 0) { fontFamily = ""; }
+    var defaultFontFamily;
     if (checkIsAndroid()) {
-        return "'Roboto Black', 'Droid Sans'";
+        defaultFontFamily = "'Roboto Black', 'Droid Sans'";
     }
     else if (checkIsIOS()) {
-        return "'PingFang SC Medium'";
+        // ios对黑体的行高绘制有问题
+        if (fontFamily.includes("黑体")) {
+            fontFamily = "";
+        }
+        defaultFontFamily = "'PingFang SC Medium'";
     }
     else {
-        return '"PingFang SC Medium", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
+        defaultFontFamily =
+            '"PingFang SC Medium", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
     }
+    return fontFamily ? fontFamily + ", " + defaultFontFamily : defaultFontFamily;
 }
 function parseWatermarkStyle(styleString, canvasSize) {
     if (!checkIsStringValid(styleString)) {
@@ -19624,6 +19654,19 @@ var watermark_TextScanner = /** @class */ (function () {
     return TextScanner;
 }());
 
+function transformFormatString(format) {
+    var transformString = format;
+    if (format.includes("d")) {
+        transformString = transformString.replace(/d/g, "D");
+    }
+    if (format.includes("y")) {
+        transformString = transformString.replace(/y/g, "Y");
+    }
+    if (format.includes("E")) {
+        transformString = transformString.replace(/E/g, "d");
+    }
+    return transformString;
+}
 function buildContent(contentConfigString, watermarkContext, style) {
     var content = "";
     var watermarkImage = new WatermarkImage();
@@ -19645,65 +19688,66 @@ function buildContent(contentConfigString, watermarkContext, style) {
                 watermarkImage.height = imgWidthHeight;
                 watermarkImage.width = imgWidthHeight;
             }
-            var applicationName = contentConfigString.replace(logoConfigWithBrace, "");
-            if (applicationName) {
-                content = watermarkContext.applicationName;
-            }
-        }
-    }
-    else {
-        var scanner = new watermark_TextScanner(contentConfigString);
-        var steps = 0;
-        while (scanner.hasNext() &&
-            /* 防止scanner代码错误产生无限循环，设置一个最大scan步数*/
-            steps < contentConfigString.length) {
-            var dateRegex = new RegExp(WatermarkContent.Date);
-            if (scanner.hasNext(dateRegex)) {
-                var regexResult = scanner.next(dateRegex);
-                if (regexResult) {
-                    var matchResults = regexResult;
-                    var format = date_FORMAT.FORMAT_YMD;
-                    if (matchResults && matchResults.length >= 2) {
-                        if (checkIsStringValid(matchResults[1])) {
-                            format = matchResults[1];
-                        }
+            contentConfigString = contentConfigString.replace(logoConfigWithBrace, "");
+        }
+    }
+    var scanner = new watermark_TextScanner(contentConfigString);
+    var steps = 0;
+    while (scanner.hasNext() &&
+        /* 防止scanner代码错误产生无限循环，设置一个最大scan步数*/
+        steps < contentConfigString.length) {
+        var dateRegex = new RegExp(WatermarkContent.Date);
+        if (scanner.hasNext(dateRegex)) {
+            var regexResult = scanner.next(dateRegex);
+            if (regexResult) {
+                var matchResults = regexResult;
+                var format = date_FORMAT.FORMAT_YMD;
+                if (matchResults && matchResults.length >= 2) {
+                    if (checkIsStringValid(matchResults[1])) {
+                        format = matchResults[1];
                     }
-                    content += date_formatDate(watermarkContext.watermarkTime, format);
-                    scanner.skip(matchResults.input);
                 }
+                content += dayjs_min_default()(watermarkContext.watermarkTime).format(transformFormatString(format));
+                scanner.skip(matchResults.input);
             }
-            else if (scanner.hasNext(WatermarkContent.Time)) {
-                var value = date_formatDate(watermarkContext.watermarkTime, date_FORMAT.FORMAT_HM);
-                content += value;
-                scanner.skip(WatermarkContent.Time);
-            }
-            else if (scanner.hasNext(WatermarkContent.Address)) {
-                content += watermarkContext.address;
-                scanner.skip(WatermarkContent.Address);
-            }
-            else if (scanner.hasNext(WatermarkContent.HumanName)) {
-                content += watermarkContext.humanName;
-                scanner.skip(WatermarkContent.HumanName);
-            }
-            else if (scanner.hasNext(WatermarkContent.ProjectName)) {
-                content += watermarkContext.projectName;
-                scanner.skip(WatermarkContent.ProjectName);
-            }
-            else if (scanner.hasNext(WatermarkContent.ApplicationName)) {
-                content += watermarkContext.applicationName;
-                scanner.skip(WatermarkContent.ApplicationName);
+        }
+        else if (scanner.hasNext(WatermarkContent.Time)) {
+            var value = dayjs_min_default()(watermarkContext.watermarkTime).format(date_FORMAT.FORMAT_HM);
+            content += value;
+            scanner.skip(WatermarkContent.Time);
+        }
+        else if (scanner.hasNext(WatermarkContent.Address)) {
+            content += watermarkContext.address;
+            if (!watermarkImage.image) {
+                var imgWidthHeight = (style === null || style === void 0 ? void 0 : style.fontSize) || 20;
+                watermarkImage.image = DEFAULT_ADDRESS_ICON;
+                watermarkImage.height = imgWidthHeight;
+                watermarkImage.width = imgWidthHeight;
             }
-            else {
-                var nextChar = scanner.next();
-                // console.log(`next out "${nextChar}"`)
-                if (checkIsString(nextChar)) {
-                    // console.log(`next in "${nextChar}"`)
-                    content += nextChar;
-                }
-                scanner.skip();
+            scanner.skip(WatermarkContent.Address);
+        }
+        else if (scanner.hasNext(WatermarkContent.HumanName)) {
+            content += watermarkContext.humanName;
+            scanner.skip(WatermarkContent.HumanName);
+        }
+        else if (scanner.hasNext(WatermarkContent.ProjectName)) {
+            content += watermarkContext.projectName;
+            scanner.skip(WatermarkContent.ProjectName);
+        }
+        else if (scanner.hasNext(WatermarkContent.ApplicationName)) {
+            content += watermarkContext.applicationName;
+            scanner.skip(WatermarkContent.ApplicationName);
+        }
+        else {
+            var nextChar = scanner.next();
+            // console.log(`next out "${nextChar}"`)
+            if (checkIsString(nextChar)) {
+                // console.log(`next in "${nextChar}"`)
+                content += nextChar;
             }
-            steps++;
+            scanner.skip();
         }
+        steps++;
     }
     return { content: content, watermarkImage: watermarkImage };
 }
@@ -19756,21 +19800,27 @@ function buildTile(canvas, watermark) {
     if (!ctx) {
         return null;
     }
+    var imageWidth = 0;
+    if (watermarkImage.image) {
+        imageWidth = watermarkImage.width + LOGO_DEFAULT_PADDING * style.scale;
+    }
     ctx.font = style.fontWeight + " " + style.fontSize + "px " + style.fontName;
     var contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
-    var contentWidth = canvas.width - contentPadding * 2;
+    var contentWidth = canvas.width - contentPadding * 2 - imageWidth;
     // @see {@link https://stackoverflow.com/questions/1134586/how-can-you-find-the-height-of-text-on-an-html-canvas}
     var lineHeight = ctx.measureText("M").width;
     var lineWidths = [];
-    // content超过宽度就换行
+    // content超过宽度的前一位就换行，已经超出可能会导致超出屏幕
     var temp = "";
     var lastWidth = 0;
     for (var i = 0; i < content.length; i++) {
         var lineWidth = ctx.measureText(temp).width;
         if (lineWidth >= contentWidth) {
-            lines.push(temp);
-            lineWidths.push(lineWidth);
-            temp = "";
+            var line = temp.substring(0, temp.length - 1);
+            var preLineWidth = ctx.measureText(line).width;
+            lines.push(line);
+            lineWidths.push(preLineWidth);
+            temp = temp.substring(temp.length - 1);
         }
         lastWidth = lineWidth;
         temp += content[i];
@@ -19781,65 +19831,8 @@ function buildTile(canvas, watermark) {
     size.height = lines.length * lineHeight;
     return new Tile(origin, size, lineHeight, lineWidths, lines, style, watermarkImage);
 }
-/**
- * 画文字，默认{@link https://stackoverflow.com/questions/43242709/how-can-i-draw-text-that-looks-embossed-using-kinetic-js-and-canvas|浮雕效果}
- * @param canvas
- * @param text
- */
-// function getEmbossTextImageData(text: string, size: Size): ImageData | null {
-//   // constants
-//   const canvas = document.createElement('canvas');
-//   document.body.appendChild(canvas);
-//   const ctx = canvas.getContext("2d");
-//   if (!ctx) {
-//     return null
-//   }
-//
-//   canvas.width = size.width;
-//   canvas.height = size.height;
-//
-//   // constants
-//   const blur = 2;
-//   const highLight = "rgba(100,190,256,0.75)";
-//   const shadow = "rgba(0,0,0,0.65)";
-//   const font = "84px arial black";
-//   const background = "linear-gradient(to right,  #1e5799 0%,#3096e5 100%)";
-//   const border = "2px solid #6CF"
-//
-// // create canvas add styles and put on page
-//
-//   const w = (canvas.width = innerWidth - 24) / 2;  // set size and get centers
-//   const h = (canvas.height = innerHeight - 24) / 2;
-//   canvas.style.background = background;
-//   canvas.style.border = border;
-//
-//
-// // set up font and font rendering alignment
-//   ctx.font = font;
-//   ctx.textAlign = "center";
-//   ctx.textBaseline = "middle";
-//
-// // draw dark shadow
-//   ctx.shadowBlur = blur; // shadow
-//   ctx.fillStyle = ctx.shadowColor = shadow;
-//   ctx.shadowOffsetY = ctx.shadowOffsetX = blur;
-//   ctx.fillText(text, w, h);
-//
-// // draw highLight
-//   ctx.fillStyle = ctx.shadowColor = highLight;
-//   ctx.shadowOffsetY = ctx.shadowOffsetX = -blur;
-//   ctx.fillText(text,  w, h);
-//
-// // draw center text that removes pixels
-//   ctx.shadowColor = "rgba(0,0,0,0.0)";               // turn off shadow
-//   ctx.fillStyle = "black";
-//   ctx.globalCompositeOperation = "destination-out"; // New pixels will remove old pixels making them transparent
-//   ctx.fillText(text,  w, h);
-//   ctx.globalCompositeOperation = "source-over";     // restore default composite operation.
-//
-//   return  ctx.getImageData(0, 0, size.width, size.height)
-// }
-function getAxisPoint(canvasWidth, width, origin, style, watermarkImage) {
+function getAxisPoint(canvasWidth, width, tile, origin) {
+    var style = tile.style, watermarkImage = tile.watermarkImage, lines = tile.lines, lineHeight = tile.lineHeight;
     var padding = (CONTENT_PADDING + DEFAULT_PADDING) * style.scale;
     var axisPoint = new Point(padding, origin.y);
     if (style.position.startsWith("center")) {
@@ -19852,29 +19845,75 @@ function getAxisPoint(canvasWidth, width, origin, style, watermarkImage) {
     if (watermarkImage.image) {
         if (watermarkImage.position === WatermarkImageEnum.POSITION_LEFT) {
             if (style.position.startsWith("left")) {
-                axisPoint.x = axisPoint.x + watermarkImage.width;
+                axisPoint.x =
+                    axisPoint.x +
+                        watermarkImage.width +
+                        LOGO_DEFAULT_PADDING * style.scale;
             }
             else if (style.position.startsWith("center")) {
-                axisPoint.x = axisPoint.x + watermarkImage.width / 2;
-                imagePoint.x = imagePoint.x - width / 2 - watermarkImage.width;
+                axisPoint.x =
+                    axisPoint.x +
+                        watermarkImage.width / 2 +
+                        (LOGO_DEFAULT_PADDING / 2) * style.scale;
+                imagePoint.x =
+                    lines.length === 1
+                        ? imagePoint.x -
+                            width / 2 -
+                            watermarkImage.width -
+                            (LOGO_DEFAULT_PADDING / 2) * style.scale
+                        : imagePoint.x -
+                            width / 2 -
+                            watermarkImage.width / 2 -
+                            (LOGO_DEFAULT_PADDING / 2) * style.scale;
             }
             else {
-                imagePoint.x = imagePoint.x - width - 2 * watermarkImage.width;
+                imagePoint.x =
+                    lines.length === 1
+                        ? imagePoint.x -
+                            width -
+                            2 * watermarkImage.width -
+                            (LOGO_DEFAULT_PADDING / 2) * style.scale
+                        : imagePoint.x -
+                            width -
+                            watermarkImage.width -
+                            (LOGO_DEFAULT_PADDING / 2) * style.scale;
             }
         }
         else {
             if (style.position.startsWith("left")) {
-                imagePoint.x = axisPoint.x + width + watermarkImage.width;
+                imagePoint.x =
+                    lines.length === 1
+                        ? axisPoint.x +
+                            width +
+                            watermarkImage.width +
+                            LOGO_DEFAULT_PADDING * style.scale
+                        : axisPoint.x + width + LOGO_DEFAULT_PADDING * style.scale;
             }
             else if (style.position.startsWith("center")) {
                 axisPoint.x = axisPoint.x - watermarkImage.width / 2;
-                imagePoint.x = imagePoint.x + width / 2;
+                imagePoint.x =
+                    lines.length === 1
+                        ? imagePoint.x + width / 2 + LOGO_DEFAULT_PADDING * style.scale
+                        : imagePoint.x +
+                            width / 2 -
+                            watermarkImage.width / 2 +
+                            LOGO_DEFAULT_PADDING * style.scale;
             }
             else {
                 axisPoint.x = axisPoint.x - watermarkImage.width;
-                imagePoint.x = imagePoint.x - watermarkImage.width;
+                imagePoint.x =
+                    imagePoint.x -
+                        watermarkImage.width +
+                        (LOGO_DEFAULT_PADDING / 2) * style.scale;
             }
         }
+        // 多行文本时图标上下居中
+        if (lines.length > 1) {
+            imagePoint.y =
+                imagePoint.y +
+                    (lines.length * lineHeight) / 2 -
+                    watermarkImage.height / 2;
+        }
     }
     return {
         text: axisPoint,
@@ -19907,7 +19946,7 @@ function loadImage(url) {
         };
     });
 }
-function drawLine(canvas, line, width, origin, tile) {
+function drawLine(canvas, line, width, origin, tile, drawImage) {
     return __awaiter(this, void 0, void 0, function () {
         var ctx, style, watermarkImage, point, image, offset;
         return __generator(this, function (_a) {
@@ -19925,9 +19964,9 @@ function drawLine(canvas, line, width, origin, tile) {
                      */
                     ctx.textBaseline = "top";
                     ctx.font = style.fontWeight + " " + style.fontSize + "px " + style.fontName;
-                    point = getAxisPoint(canvas.width, width, origin, style, watermarkImage);
+                    point = getAxisPoint(canvas.width, width, tile, origin);
                     ctx.textAlign = getTextAlign(style);
-                    if (!watermarkImage.image) return [3 /*break*/, 2];
+                    if (!(watermarkImage.image && drawImage)) return [3 /*break*/, 2];
                     return [4 /*yield*/, loadImage(watermarkImage.image)];
                 case 1:
                     image = _a.sent();
@@ -19971,14 +20010,14 @@ function drawBackground(canvas, tile) {
     if (backgroundOpacity > 255) {
         backgroundOpacity = 255;
     }
-    var paddingTop = 2;
-    var paddingBottom = 10;
+    var style = tile.style;
+    var paddingTop = tile.style.paddingTop;
+    var paddingBottom = tile.style.paddingBottom;
     if (backgroundColor !== "transparent") {
         if (backgroundColor.startsWith("#") && backgroundOpacity >= 0) {
             backgroundColor = hexToRGB(backgroundColor, backgroundOpacity / 255.0);
         }
         ctx.fillStyle = backgroundColor;
-        var style = tile.style;
         var padding = (CONTENT_PADDING + DEFAULT_PADDING) * style.scale;
         var paddingScale = tile.style.fontSize / DEFAULT_FONT_SIZE;
         for (var j = 0; j < tile.lineWidths.length; j++) {
@@ -20024,7 +20063,7 @@ function drawTile(canvas, tile) {
                 case 1:
                     if (!(i < tile.lines.length)) return [3 /*break*/, 4];
                     origin_1 = new Point(tile.origin.x, i * tile.lineHeight + tile.origin.y);
-                    return [4 /*yield*/, drawLine(canvas, tile.lines[i], tile.lineWidths[i], origin_1, tile)];
+                    return [4 /*yield*/, drawLine(canvas, tile.lines[i], tile.lineWidths[i], origin_1, tile, i === 0)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
@@ -22132,7 +22171,7 @@ var media_picker_createNamespace = Object(utils["b" /* createNamespace */])('med
             watermarkConfigString: watermarkEnabled ? _this4.watermarkOptions.watermarkConfigString : '',
             context: {
               address: _this4.watermarkOptions.address || "",
-              humanName: _this4.watermarkOptions.humanName || "",
+              humanName: _this4.watermarkOptions.humanName || _this4.watermarkOptions.humanname || "",
               projectName: _this4.watermarkOptions.projectName || "",
               logo: _this4.watermarkOptions.logo || "",
               applicationName: _this4.watermarkOptions.applicationName || "",
@@ -29884,7 +29923,7 @@ var uploader_createNamespace = Object(utils["b" /* createNamespace */])('uploade
 
 
 
-var version = '2.0.49';
+var version = '2.0.50';
 
 function install(Vue) {
   var components = [action_sheet, es_area, avatar, back_top, badge, es_button, calendar, cascader, cell, cell_group, es_checkbox, checkbox_group, col, collapse, collapse_item, count_down, datetime_picker, dialog, divider, dropdown_item, dropdown_menu, empty, es_field, fold_dialog, es_form, grid, grid_item, hierarchy_select, es_icon, es_image, image_preview, index_anchor, index_bar, es_info, lazyload, es_list, es_loading, locale["a" /* default */], media_picker, media_player, multiple_picker, nav_bar, notice_bar, number_keyboard, es_overlay, password_input, es_picker, popover, popup, pull_refresh, es_radio, radio_group, rate, row, search, signature, skeleton, slider, es_step, stepper, es_steps, es_sticky, swipe, swipe_cell, swipe_item, es_switch, switch_cell, tab, tabbar, tabbar_item, table, tabs, es_tag, timeline, es_toast, uploader];