zartui 1.0.19 → 1.0.21

package/lib/zart.js

@@ -55081,6 +55081,7 @@ __webpack_require__.d(__webpack_exports__, "Cell", function() { return /* reexpo
 __webpack_require__.d(__webpack_exports__, "CellGroup", function() { return /* reexport */ cell_group; });
 __webpack_require__.d(__webpack_exports__, "Checkbox", function() { return /* reexport */ es_checkbox; });
 __webpack_require__.d(__webpack_exports__, "CheckboxGroup", function() { return /* reexport */ checkbox_group; });
+__webpack_require__.d(__webpack_exports__, "Circle", function() { return /* reexport */ circle; });
 __webpack_require__.d(__webpack_exports__, "Col", function() { return /* reexport */ col; });
 __webpack_require__.d(__webpack_exports__, "Collapse", function() { return /* reexport */ collapse; });
 __webpack_require__.d(__webpack_exports__, "CollapseItem", function() { return /* reexport */ collapse_item; });
@@ -55123,7 +55124,7 @@ __webpack_require__.d(__webpack_exports__, "Popup", function() { return /* reexp
 __webpack_require__.d(__webpack_exports__, "PullRefresh", function() { return /* reexport */ pull_refresh; });
 __webpack_require__.d(__webpack_exports__, "Radio", function() { return /* reexport */ es_radio; });
 __webpack_require__.d(__webpack_exports__, "RadioGroup", function() { return /* reexport */ radio_group; });
-__webpack_require__.d(__webpack_exports__, "Rate", function() { return /* reexport */ rate; });
+__webpack_require__.d(__webpack_exports__, "Rate", function() { return /* reexport */ es_rate; });
 __webpack_require__.d(__webpack_exports__, "Row", function() { return /* reexport */ row; });
 __webpack_require__.d(__webpack_exports__, "Search", function() { return /* reexport */ search; });
 __webpack_require__.d(__webpack_exports__, "Signature", function() { return /* reexport */ signature; });
@@ -62121,6 +62122,182 @@ var checkbox_group_createNamespace = Object(utils["b" /* createNamespace */])('c
     }, [this.slots()]);
   }
 }));
+// CONCATENATED MODULE: ./es/circle/index.js
+
+
+
+var circle_createNamespace = Object(utils["b" /* createNamespace */])('circle'),
+    circle_createComponent = circle_createNamespace[0],
+    circle_bem = circle_createNamespace[1];
+
+var PERIMETER = 3140;
+var circle_uid = 0;
+
+function circle_format(rate) {
+  return Math.min(Math.max(rate, 0), 100);
+}
+
+function getPath(clockwise, viewBoxSize) {
+  var sweepFlag = clockwise ? 1 : 0;
+  return "M " + viewBoxSize / 2 + " " + viewBoxSize / 2 + " m 0, -500 a 500, 500 0 1, " + sweepFlag + " 0, 1000 a 500, 500 0 1, " + sweepFlag + " 0, -1000";
+}
+
+/* harmony default export */ var circle = (circle_createComponent({
+  props: {
+    text: String,
+    size: [Number, String],
+    color: [String, Object],
+    layerColor: String,
+    strokeLinecap: String,
+    value: {
+      type: Number,
+      default: 0
+    },
+    speed: {
+      type: [Number, String],
+      default: 0
+    },
+    fill: {
+      type: String,
+      default: 'none'
+    },
+    rate: {
+      type: [Number, String],
+      default: 100
+    },
+    strokeWidth: {
+      type: [Number, String],
+      default: 40
+    },
+    clockwise: {
+      type: Boolean,
+      default: true
+    }
+  },
+  beforeCreate: function beforeCreate() {
+    this.uid = "zt-circle-gradient-" + circle_uid++;
+  },
+  computed: {
+    style: function style() {
+      var size = Object(utils["a" /* addUnit */])(this.size);
+      return {
+        width: size,
+        height: size
+      };
+    },
+    path: function path() {
+      return getPath(this.clockwise, this.viewBoxSize);
+    },
+    viewBoxSize: function viewBoxSize() {
+      return +this.strokeWidth + 1000;
+    },
+    layerStyle: function layerStyle() {
+      return {
+        fill: "" + this.fill,
+        stroke: "" + this.layerColor,
+        strokeWidth: this.strokeWidth + "px"
+      };
+    },
+    hoverStyle: function hoverStyle() {
+      var offset = PERIMETER * this.value / 100;
+      return {
+        stroke: "" + (this.gradient ? "url(#" + this.uid + ")" : this.color),
+        strokeWidth: +this.strokeWidth + 1 + "px",
+        strokeLinecap: this.strokeLinecap,
+        strokeDasharray: offset + "px " + PERIMETER + "px"
+      };
+    },
+    gradient: function gradient() {
+      return Object(utils["g" /* isObject */])(this.color);
+    },
+    LinearGradient: function LinearGradient() {
+      var _this = this;
+
+      var h = this.$createElement;
+
+      if (!this.gradient) {
+        return;
+      }
+
+      var Stops = Object.keys(this.color).sort(function (a, b) {
+        return parseFloat(a) - parseFloat(b);
+      }).map(function (key, index) {
+        return h("stop", {
+          "key": index,
+          "attrs": {
+            "offset": key,
+            "stop-color": _this.color[key]
+          }
+        });
+      });
+      return h("defs", [h("linearGradient", {
+        "attrs": {
+          "id": this.uid,
+          "x1": "100%",
+          "y1": "0%",
+          "x2": "0%",
+          "y2": "0%"
+        }
+      }, [Stops])]);
+    }
+  },
+  watch: {
+    rate: {
+      handler: function handler(rate) {
+        this.startTime = Date.now();
+        this.startRate = this.value;
+        this.endRate = circle_format(rate);
+        this.increase = this.endRate > this.startRate;
+        this.duration = Math.abs((this.startRate - this.endRate) * 1000 / this.speed);
+
+        if (this.speed) {
+          Object(dom_raf["a" /* cancelRaf */])(this.rafId);
+          this.rafId = Object(dom_raf["c" /* raf */])(this.animate);
+        } else {
+          this.$emit('input', this.endRate);
+        }
+      },
+      immediate: true
+    }
+  },
+  methods: {
+    animate: function animate() {
+      var now = Date.now();
+      var progress = Math.min((now - this.startTime) / this.duration, 1);
+      var rate = progress * (this.endRate - this.startRate) + this.startRate;
+      this.$emit('input', circle_format(parseFloat(rate.toFixed(1))));
+
+      if (this.increase ? rate < this.endRate : rate > this.endRate) {
+        this.rafId = Object(dom_raf["c" /* raf */])(this.animate);
+      }
+    }
+  },
+  render: function render() {
+    var h = arguments[0];
+    return h("div", {
+      "class": circle_bem(),
+      "style": this.style
+    }, [h("svg", {
+      "attrs": {
+        "viewBox": "0 0 " + this.viewBoxSize + " " + this.viewBoxSize
+      }
+    }, [this.LinearGradient, h("path", {
+      "class": circle_bem('layer'),
+      "style": this.layerStyle,
+      "attrs": {
+        "d": this.path
+      }
+    }), h("path", {
+      "attrs": {
+        "d": this.path
+      },
+      "class": circle_bem('hover'),
+      "style": this.hoverStyle
+    })]), this.slots() || this.text && h("div", {
+      "class": circle_bem('text')
+    }, [this.text])]);
+  }
+}));
 // CONCATENATED MODULE: ./es/col/index.js
 
 
@@ -74627,1036 +74804,1272 @@ function checkIsWindows() {
 
 //# sourceMappingURL=index.js.map
 // 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|文档}
- * @description 水印渲染类
- * @author Jiaji Yin
- * @date 2021-11-05
- */
-
-var Point = /** @class */ (function () {
-    function Point(x, y) {
-        this.x = x;
-        this.y = y;
-    }
-    return Point;
-}());
-var Size = /** @class */ (function () {
-    function Size(width, height) {
-        this.width = width;
-        this.height = height;
-    }
-    return Size;
-}());
-var clamp = function (value, min, max) { return Math.min(Math.max(value, min), max); };
-var subString = function (str, startIndex, length) {
-    if (checkIsUndefinedOrNull(length)) {
-        return str.substring(startIndex);
-    }
-    else {
-        return str.substring(startIndex, startIndex + length);
-    }
-};
-/**
- * {@link http://faq.egova.com.cn:7777/files/ueditor/image/20180621/1529574697677847.png|水印位置图}
- */
-var WatermarkPosition;
-(function (WatermarkPosition) {
-    WatermarkPosition["LeftTop"] = "lefttop";
-    WatermarkPosition["CenterTop"] = "centertop";
-    WatermarkPosition["RightTop"] = "righttop";
-    WatermarkPosition["LeftCenter"] = "leftcenter";
-    WatermarkPosition["Center"] = "center";
-    WatermarkPosition["RightCenter"] = "rightcenter";
-    WatermarkPosition["LeftBottom"] = "leftbottom";
-    WatermarkPosition["CenterBottom"] = "centerbottom";
-    WatermarkPosition["RightBottom"] = "rightbottom";
-})(WatermarkPosition || (WatermarkPosition = {}));
-var WatermarkFontWeight;
-(function (WatermarkFontWeight) {
-    WatermarkFontWeight["Normal"] = "normal";
-    WatermarkFontWeight["Bold"] = "bold";
-})(WatermarkFontWeight || (WatermarkFontWeight = {}));
-var DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
-var DEFAULT_TIME_FORMAT = "HH:mm";
-var WatermarkContent;
-(function (WatermarkContent) {
-    WatermarkContent["Raw"] = "";
-    WatermarkContent["Date"] = "date{(.*?)}|date";
-    WatermarkContent["Time"] = "time";
-    WatermarkContent["Address"] = "address";
-    WatermarkContent["HumanName"] = "humanname";
-    WatermarkContent["ProjectName"] = "projectName";
-    WatermarkContent["Logo"] = "{logo}";
-})(WatermarkContent || (WatermarkContent = {}));
-var ColorMap = {
-    "transparent": "#00000000",
-    "white": "#FFFFFF",
-    "black": "#000000",
-    "darkgray": "#444444",
-    "gray": "#888888",
-    "lightgray": "#CCCCCC",
-    "darkgrey": "#444444",
-    "grey": "#888888",
-    "lightgrey": "#CCCCCC",
-    "red": "#FF0000",
-    "green": "#00FF00",
-    "blue": "#0000FF",
-    "yellow": "#FFFF00",
-    "cyan": "#00FFFF",
-    "magenta": "#FF00FF",
-    "aqua": "#00FFFF",
-    "fuchsia": "#FF00FF",
-    "lime": "#00FF00",
-    "maroon": "#800000",
-    "navy": "#000080",
-    "olive": "#808000",
-    "purple": "#800080",
-    "silver": "#C0C0C0",
-    "teal": "#008080",
-    "orange": "#FF9933",
-};
-function getColorValue(key) {
-    for (var _i = 0, _a = Object.getOwnPropertyNames(ColorMap); _i < _a.length; _i++) {
-        var k = _a[_i];
-        if (k === key) {
-            return ColorMap[k];
-        }
-    }
-    return null;
-}
-var CONTENT_PADDING = 10;
-var DEFAULT_PADDING = 2;
-var DEFAULT_FONT_SIZE = 25.0;
-var DEFAULT_CANVAS_SIZE = 480.0;
-var DEFAULT_BACKGROUND_OPACITY = 128;
-var WatermarkStyle = /** @class */ (function () {
-    /**
-     * Watermark Style
-     * @param fontName
-     * @param fontWeight
-     * @param fontColor
-     * @param fontSize
-     * @param backgroundColor
-     * @param backgroundOpacity
-     * @param paddingTop
-     * @param paddingBottom
-     * @param position
-     * @param scale
-     * @param simplified
-     */
-    function WatermarkStyle(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, simplified) {
-        this.fontName = fontName;
-        this.fontWeight = fontWeight;
-        this.fontColor = fontColor;
-        this.fontSize = fontSize;
-        this.backgroundColor = backgroundColor;
-        this.backgroundOpacity = backgroundOpacity;
-        this.paddingTop = paddingTop;
-        this.paddingBottom = paddingBottom;
-        this.position = position;
-        this.scale = scale;
-        this.simplified = simplified;
-    }
-    return WatermarkStyle;
-}());
-var WatermarkImage = /** @class */ (function () {
-    function WatermarkImage(image) {
-        this.image = image;
-    }
-    return WatermarkImage;
-}());
-var Watermark = /** @class */ (function () {
-    /**
-     * 水印对象，包含需要渲染的文本、图像，以及相应的style
-     * @param content
-     * @param watermarkStyle
-     */
-    function Watermark(content, watermarkStyle) {
-        this.content = content;
-        this.style = watermarkStyle;
-    }
-    return Watermark;
-}());
-var WatermarkContext = /** @class */ (function () {
-    /**
-     * 打水印需要的环境信息
-     * @param address
-     * @param watermarkTime
-     * @param humanName
-     * @param projectName
-     * @param logo
-     */
-    function WatermarkContext(params) {
-        this.address = params.address;
-        this.watermarkTime = params.watermarkTime;
-        this.humanName = params.humanName;
-        this.projectName = params.projectName;
-        this.logo = params.logo;
-    }
-    return WatermarkContext;
-}());
-
-var WatermarkOptions = /** @class */ (function () {
-    /**
-     * 水印配置项
-     * @param enabled， 是否开启水印
-     * @param watermarkConfigString，水印配置的字符串
-     * @param context，打水印需要的环境信息
-     */
-    function WatermarkOptions(params) {
-        this.enabled = params.enabled;
-        this.watermarkConfigString = params.watermarkConfigString;
-        this.context = params.context;
-    }
-    return WatermarkOptions;
-}());
-
-function parseWatermarkStyle(styleString, canvasSize) {
-    if (!checkIsStringValid(styleString)) {
-        return null;
-    }
-    var styleParts = styleString.split("$");
-    if (styleParts.length <= 0) {
-        return null;
-    }
-    var scale = Math.min(canvasSize.width, canvasSize.height) / DEFAULT_CANVAS_SIZE;
-    /**
-     1. 20190314版本开始可以使用简化版配置，格式为[文字大小]$[水印位置]$[上下padding]*#*[水印内容]          其中[上下padding]一般不设置，如需设置，格式为"上padding_下padding"，下padding可省略
-     2. 简化版配置使用条件：字体（黑体）、字体样式（normal）、文字颜色（transparent）、背景颜色（transparent）、背景不透明度（128）全部使用默认值（括号中的值）
-     */
-    if (parseInteger(styleParts[0], -1) !== -1) { // 第一项为数字，则为新的简化配置
-        var fontSize = Math.round(parseDecimal(styleParts[0], DEFAULT_FONT_SIZE) * scale);
-        var position = WatermarkPosition.LeftTop;
-        if (styleParts[1]) {
-            position = styleParts[1];
-        }
-        var paddingTop = DEFAULT_PADDING * scale;
-        var paddingBottom = DEFAULT_PADDING * scale;
-        if (styleParts[2]) {
-            var paddingParts = styleParts[2].split("_");
-            paddingTop = parseInteger(paddingParts[0], DEFAULT_PADDING) * scale;
-            if (paddingParts[1]) {
-                paddingBottom = parseInteger(paddingParts[1], DEFAULT_PADDING) * scale;
-            }
-        }
-        var fontName = getHeitiFontFamily();
-        var fontWeight = WatermarkFontWeight.Normal;
-        var fontColor = ColorMap.transparent;
-        var backgroundColor = ColorMap.transparent;
-        var backgroundOpacity = 128;
-        return new WatermarkStyle(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, true);
-    }
-    else { // [字体]$[文字样式]$[文字颜色]$[文字大小]$[背景颜色]$[水印位置]$[背景不透明度]$[上下padding]*#*[水印内容]
-        var fontName = styleParts[0] + ', ' + getHeitiFontFamily();
-        var fontWeight = WatermarkFontWeight.Normal;
-        if (styleParts[1]) {
-            fontWeight = styleParts[1];
-        }
-        var fontColor = ColorMap.white;
-        if (styleParts[2]) {
-            var color = getColorValue(styleParts[2]);
-            if (color) {
-                fontColor = color;
-            }
-        }
-        var fontSize = Math.round(DEFAULT_FONT_SIZE * scale);
-        if (styleParts[3]) {
-            fontSize = Math.round(parseDecimal(styleParts[3], DEFAULT_FONT_SIZE) * scale);
-        }
-        var backgroundColor = ColorMap.blue;
-        if (styleParts[4]) {
-            var color = getColorValue(styleParts[4]);
-            if (color) {
-                backgroundColor = color;
-            }
-        }
-        var position = WatermarkPosition.LeftTop;
-        if (styleParts[5]) {
-            position = styleParts[5];
-        }
-        var backgroundOpacity = 255;
-        if (styleParts[6]) {
-            var opacity = parseInteger(styleParts[6], DEFAULT_BACKGROUND_OPACITY);
-            opacity = clamp(opacity, 0, 255);
-            backgroundOpacity = opacity;
-        }
-        var paddingTop = DEFAULT_PADDING * scale;
-        var paddingBottom = DEFAULT_PADDING * scale;
-        if (styleParts[7]) {
-            var paddingParts = styleParts[7].split("_");
-            paddingTop = parseInteger(paddingParts[0], DEFAULT_PADDING) * scale;
-            if (paddingParts[1]) {
-                paddingBottom = parseInteger(paddingParts[1], DEFAULT_PADDING) * scale;
-            }
-        }
-        return new WatermarkStyle(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, false);
-    }
-}
-/**
- * A JavaScript Scanner like Java's
- * @see java.util.Scanner
- */
-var watermark_TextScanner = /** @class */ (function () {
-    /**
-     * The content to scan
-     * @param text
-     */
-    function TextScanner(text) {
-        this.text = text;
-        this.cursor = 0;
-    }
-    TextScanner.prototype.hasNext = function (obj) {
-        if (checkIsUndefinedOrNull(obj)) {
-            return this.cursor < this.text.length;
-        }
-        else if (checkIsString(obj)) {
-            var str = obj;
-            var current = subString(this.text, this.cursor, str.length);
-            if (current === str) {
-                return true;
-            }
-        }
-        else if (checkIsRegExp(obj)) {
-            var regex = obj;
-            var subText = subString(this.text, this.cursor);
-            var matchResults = subText.match(regex);
-            if (matchResults) {
-                if (matchResults.index === 0) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    };
-    TextScanner.prototype.next = function (obj) {
-        if (checkIsUndefinedOrNull(obj)) {
-            return subString(this.text, this.cursor, 1);
-        }
-        else if (checkIsString(obj)) {
-            var str = obj;
-            if (subString(this.text, this.cursor, str.length) === str) {
-                return str;
-            }
-        }
-        else if (checkIsRegExp(obj)) {
-            var regex = obj;
-            var subText = subString(this.text, this.cursor);
-            var matchResults = subText.match(regex);
-            if (matchResults) {
-                if (matchResults.index === 0) {
-                    return matchResults;
-                }
-            }
-        }
-        return null;
-    };
-    TextScanner.prototype.skip = function (obj) {
-        if (checkIsUndefinedOrNull(obj)) {
-            this.cursor += 1;
-        }
-        else if (checkIsStringValid(obj)) {
-            var str = obj;
-            this.cursor += str.length;
-        }
-        return this;
-    };
-    return TextScanner;
-}());
-
-function buildContent(contentConfigString, watermarkContext) {
-    var content = "";
-    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);
-            }
-        }
-        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.Logo)) {
-            console.error("watermark logo ignored");
-            scanner.skip(WatermarkContent.Logo);
-        }
-        else {
-            var nextChar = scanner.next();
-            // console.log(`next out "${nextChar}"`)
-            if (checkIsString(nextChar)) {
-                // console.log(`next in "${nextChar}"`)
-                content += nextChar;
-            }
-            scanner.skip();
-        }
-        steps++;
-    }
-    return content;
-}
-function parseWatermarks(watermarkConfigString, canvasSize, watermarkContext) {
-    var watermarks = [];
-    var configStringArray = watermarkConfigString.split("###");
-    for (var i = 0; i < configStringArray.length; i++) {
-        var configString = configStringArray[i];
-        //console.log('config string ' + configString);
-        var configParts = configString.split("*#*");
-        //console.log(JSON.stringify(configParts));
-        if (configParts.length === 2) {
-            var styleString = configParts[0];
-            var contentString = configParts[1];
-            var style = parseWatermarkStyle(styleString, canvasSize);
-            var content = buildContent(contentString, watermarkContext);
-            if (style && content) {
-                var watermark = new Watermark(content, style);
-                watermarks.push(watermark);
-            }
-        }
-    }
-    return watermarks;
-}
-/**
- * 画水印默认使用黑体
- * @see {@link https://www.zhihu.com/question/19911793|使用黑体}
- */
-function getHeitiFontFamily() {
-    if (checkIsAndroid()) {
-        return "'Roboto Black', 'Droid Sans'";
-    }
-    else if (checkIsIOS()) {
-        return "'PingFang SC Medium'";
-    }
-    else {
-        return '"PingFang SC Medium", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
-    }
-}
-/**
- * 可以渲染的内容
- */
-var Tile = /** @class */ (function () {
-    function Tile(origin, size, lineHeight, lineWidths, lines, style) {
-        this.origin = origin;
-        this.size = size;
-        this.lineHeight = lineHeight;
-        this.lineWidths = lineWidths;
-        this.lines = lines;
-        this.style = style;
-    }
-    return Tile;
-}());
-function buildTile(canvas, content, style) {
-    var origin = new Point(0, 0);
-    var size = new Size(0, 0);
-    var lines = [];
-    var ctx = canvas.getContext("2d");
-    if (!ctx) {
-        return null;
-    }
-    ctx.font = style.fontWeight + " " + style.fontSize + "px " + style.fontName;
-    var contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
-    var contentWidth = canvas.width - contentPadding * 2;
-    // @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超过宽度就换行
-    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 = "";
-        }
-        lastWidth = lineWidth;
-        temp += content[i];
-    }
-    lines.push(temp);
-    lineWidths.push(lastWidth);
-    size.width = contentWidth;
-    size.height = lines.length * lineHeight;
-    return new Tile(origin, size, lineHeight, lineWidths, lines, style);
-}
-/**
- * 画文字，默认{@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, origin, style) {
-    var padding = (CONTENT_PADDING + DEFAULT_PADDING) * style.scale;
-    var axisPoint = new Point(padding, origin.y);
-    if (style.position.startsWith("center")) {
-        axisPoint = new Point(canvasWidth / 2, origin.y);
-    }
-    else if (style.position.startsWith("right")) {
-        axisPoint = new Point(canvasWidth - padding, origin.y);
-    }
-    return axisPoint;
-}
-function getTextAlign(style) {
-    var align = "left";
-    if (style.position.startsWith("center")) {
-        align = "center";
-    }
-    else if (style.position.startsWith("right")) {
-        align = "right";
-    }
-    return align;
-}
-function drawLine(canvas, line, origin, style) {
-    var ctx = canvas.getContext("2d");
-    if (!ctx) {
-        return;
-    }
-    /**
-     * The fillText's second argument is the Y coordinate for the baseline of the text (the default textBaseline is "alphabetic") ,
-     * so the text is being drawn above the visible canvas element when you use 0.
-     * @see {@link https://stackoverflow.com/questions/14289331/html5-canvas-doesnt-fill-text-at-coordinates-0-0}
-     */
-    ctx.textBaseline = "top";
-    ctx.font = style.fontWeight + " " + style.fontSize + "px " + style.fontName;
-    var axisPoint = getAxisPoint(canvas.width, origin, style);
-    ctx.textAlign = getTextAlign(style);
-    if (style.simplified) {
-        ctx.shadowBlur = 4; // shadow
-        // ctx.shadowColor = "rgba(220,220,220,0.75)";
-        ctx.shadowColor = "rgba(0, 0, 0, 0.5)";
-        var offset = clamp(style.fontSize / 40, 2, 4);
-        ctx.shadowOffsetY = offset;
-        ctx.shadowOffsetX = offset;
-        ctx.fillStyle = "rgba(255,255,255, 0.5)";
-    }
-    else {
-        ctx.fillStyle = style.fontColor;
-    }
-    ctx.fillText(line, Math.round(axisPoint.x), Math.round(axisPoint.y));
-}
-function hexToRGB(hex, alpha) {
-    var r = parseInt(hex.slice(1, 3), 16), g = parseInt(hex.slice(3, 5), 16), b = parseInt(hex.slice(5, 7), 16);
-    if (alpha) {
-        return "rgba(" + r + ", " + g + ", " + b + ", " + alpha + ")";
-    }
-    else {
-        return "rgb(" + r + ", " + g + ", " + b + ")";
-    }
-}
-function drawBackground(canvas, tile) {
-    var ctx = canvas.getContext("2d");
-    if (!ctx) {
-        return;
-    }
-    var backgroundColor = tile.style.backgroundColor;
-    var backgroundOpacity = parseDecimal(String(tile.style.backgroundOpacity), -1);
-    if (backgroundOpacity > 255) {
-        backgroundOpacity = 255;
-    }
-    var paddingTop = 2;
-    var paddingBottom = 10;
-    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++) {
-            var lineHeight = tile.lineHeight;
-            var lineWidth = tile.lineWidths[j];
-            var paddingRight = 30 * paddingScale;
-            var paddingLeft = 10 * paddingScale;
-            var axisPoint = new Point(padding - paddingLeft, tile.origin.y);
-            if (style.position.startsWith("center")) {
-                paddingLeft = 20 * paddingScale;
-                paddingRight = 20 * paddingScale;
-                axisPoint = new Point((canvas.width - lineWidth) / 2 - paddingLeft, tile.origin.y);
-            }
-            else if (style.position.startsWith("right")) {
-                paddingLeft = 30 * paddingScale;
-                paddingRight = 10 * paddingScale;
-                axisPoint = new Point(canvas.width - lineWidth - padding - paddingLeft, tile.origin.y);
-            }
-            // padding top
-            if (j === 0) {
-                ctx.fillRect(axisPoint.x, (axisPoint.y - paddingTop > 0) ? (axisPoint.y - paddingTop) : 0, paddingLeft + lineWidth + paddingRight, paddingTop);
-            }
-            ctx.fillRect(axisPoint.x, axisPoint.y + j * lineHeight, paddingLeft + lineWidth + paddingRight, lineHeight);
-            // padding bottom
-            if (j === tile.lineWidths.length - 1) {
-                ctx.fillRect(axisPoint.x, axisPoint.y + (j + 1) * lineHeight, paddingLeft + lineWidth + paddingRight, paddingBottom);
-            }
-        }
-    }
-}
-function drawTile(canvas, tile) {
-    if (!tile.style.simplified) { // 复杂配置绘制背景颜色
-        drawBackground(canvas, tile);
-    }
-    for (var i = 0; i < tile.lines.length; i++) {
-        var origin_1 = new Point(tile.origin.x, i * tile.lineHeight + tile.origin.y);
-        drawLine(canvas, tile.lines[i], origin_1, tile.style);
-    }
-}
-function getCanvasScale(canvas, len) {
-    var min = Math.min(canvas.width, canvas.height);
-    return min / DEFAULT_CANVAS_SIZE * len;
-}
-var GroupPosition;
-(function (GroupPosition) {
-    GroupPosition["Top"] = "top";
-    GroupPosition["Center"] = "center";
-    GroupPosition["Bottom"] = "bottom";
-})(GroupPosition || (GroupPosition = {}));
-function drawGroupedWatermarks(canvas, watermarks, groupPosition) {
-    if (!watermarks || watermarks.length === 0) {
-        return;
-    }
-    var tiles = [];
-    //NOTE: 每个watermark 都占满整个宽度，一行只放一个watermark
-    var totalHeight = 0;
-    for (var i = 0; i < watermarks.length; i++) {
-        var watermark = watermarks[i];
-        var tile = buildTile(canvas, watermark.content, watermark.style);
-        if (tile) {
-            tiles.push(tile);
-            totalHeight += tile.size.height;
-        }
-    }
-    if (totalHeight <= 0) {
-        // no need draw
-        console.error('watermarks height ' + totalHeight);
-        console.error(JSON.stringify(watermarks));
-        return;
-    }
-    var contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
-    var baseOrigin = new Point(contentPadding, contentPadding);
-    if (groupPosition === GroupPosition.Center) {
-        baseOrigin = new Point(contentPadding, Math.round((canvas.height - totalHeight) / 2));
-    }
-    else if (groupPosition === GroupPosition.Bottom) {
-        baseOrigin = new Point(contentPadding, canvas.height - totalHeight - contentPadding);
-    }
-    else if (groupPosition === GroupPosition.Top) {
-        baseOrigin = new Point(contentPadding, contentPadding);
-    }
-    // update all the tiles' origin
-    var lastMarginTop = 0;
-    for (var i = 0; i < tiles.length; i++) {
-        var tile = tiles[i];
-        lastMarginTop += tile.style.paddingTop;
-        tile.origin = new Point(tile.origin.x + baseOrigin.x, lastMarginTop + baseOrigin.y);
-        lastMarginTop += tile.size.height;
-        lastMarginTop += tile.style.paddingBottom;
-    }
-    // draw all tiles
-    for (var i = 0; i < tiles.length; i++) {
-        var tile = tiles[i];
-        drawTile(canvas, tile);
-    }
-}
-/**
- * 把watermark 分为 上、中、三组
- * @param watermarks
- */
-function groupingWatermarks(watermarks) {
-    var _a;
-    var topList = [];
-    var centerList = [];
-    var bottomList = [];
-    for (var i = 0; i < watermarks.length; i++) {
-        var watermark = watermarks[i];
-        if (watermark.style.position.endsWith("top")) {
-            topList.push(watermark);
-        }
-        else if (watermark.style.position.endsWith("center")) {
-            centerList.push(watermark);
-        }
-        else if (watermark.style.position.endsWith("bottom")) {
-            bottomList.push(watermark);
-        }
-    }
-    return _a = {},
-        _a[GroupPosition.Top] = topList,
-        _a[GroupPosition.Center] = centerList,
-        _a[GroupPosition.Bottom] = bottomList,
-        _a;
-}
-function renderWatermark(canvas, options) {
-    // console.log("canvas width " + canvas.width);
-    // console.log("canvas height " + canvas.height);
-    if (!options.enabled || options.watermarkConfigString === "no") {
-        return Promise.resolve(canvas);
-    }
-    var watermarkConfigString = options.watermarkConfigString;
-    if (watermarkConfigString === "default") {
-        watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
-    }
-    var watermarks = parseWatermarks(watermarkConfigString, new Size(canvas.width, canvas.height), options.context);
-    var groupedWatermarks = groupingWatermarks(watermarks);
-    drawGroupedWatermarks(canvas, groupedWatermarks[GroupPosition.Top], GroupPosition.Top);
-    drawGroupedWatermarks(canvas, groupedWatermarks[GroupPosition.Center], GroupPosition.Center);
-    drawGroupedWatermarks(canvas, groupedWatermarks[GroupPosition.Bottom], GroupPosition.Bottom);
-    return Promise.resolve(canvas);
-}
-function checkWatermarkConfigSupported(watermarkConfigString) {
-    if (watermarkConfigString.indexOf("{logo}") > -1) {
-        console.error("水印不支持logo");
-        return false;
-    }
-    var configStringArray = watermarkConfigString.split("###");
-    for (var i = 0; i < configStringArray.length; i++) {
-        var configString = configStringArray[i];
-        //console.log('config string ' + configString);
-        var configParts = configString.split("*#*");
-        //console.log(JSON.stringify(configParts));
-        if (configParts.length === 2) {
-            var styleString = configParts[0];
-            var styleParts = styleString.split("$");
-            if (styleParts.length <= 0) {
-                console.error("水印配置不合法");
-                return false;
-            }
-        }
-    }
-    return true;
-}
-//# sourceMappingURL=watermark.js.map
-// CONCATENATED MODULE: ./node_modules/@egova/media/lib/image-util.js
-/**
- * Convert File to data schema url
- * @param file
- */
-function file2DataURL(file) {
-    return new Promise(function (resolve, reject) {
-        var a = new FileReader();
-        a.onload = function (res) {
-            if (res && res.target) {
-                resolve(res.target.result);
-            }
-            else {
-                reject(new Error('读取文件url失败'));
-            }
-        };
-        a.readAsDataURL(file);
-    });
-}
-/**
- * Convert file to image
- * @param file
- */
-function file2Image(file) {
-    return new Promise(function (resolve, reject) {
-        file2DataURL(file).then(function (url) {
-            var img = new Image();
-            img.src = url;
-            img.onload = function (e) {
-                if (img.complete) {
-                    resolve(img);
-                }
-                else {
-                    reject(new Error('文件加载失败'));
-                }
-            };
-        }).catch(reject);
-    });
-}
-function image2file(img, fileName, lastModified, type, quality) {
-    if (type === void 0) { type = "image/jpeg"; }
-    if (quality === void 0) { quality = 0.8; }
-    return image2Canvas(img, type).then(function (canvas) {
-        return canvas2File(canvas, fileName, lastModified, type, quality);
-    });
-}
-/**
- * Draw image on canvas
- * @param img
- * @param width
- * @param height
- */
-function image2Canvas(img, type, width, height) {
-    var canvas = document.createElement('canvas');
-    if (!width) {
-        width = img.width;
-    }
-    if (!height) {
-        height = img.height;
-    }
-    canvas.width = width;
-    canvas.height = height;
-    var ctx = canvas.getContext('2d');
-    if (ctx) {
-        // png经canvas.toDataURL转换后背景变成黑色，这里提前填充白色
-        ctx.fillStyle = 'transparent';
-        if (type === 'image/jpeg') {
-            ctx.fillStyle = '#fff';
-        }
-        ctx.drawImage(img, 0, 0, width, height);
-        return Promise.resolve(canvas);
-    }
-    else {
-        return Promise.reject(null);
-    }
-}
-/**
- * Export Image from canvas
- * @param canvas
- * @param type
- * @param quality
- * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
- */
-function canvas2Image(canvas, type, quality) {
-    if (type === void 0) { type = "image/jpeg"; }
-    if (quality === void 0) { quality = 0.8; }
-    var image = new Image();
-    image.src = canvas.toDataURL(type, quality);
-    return Promise.resolve(image);
-}
-/**
- * Export File from canvas
- * @param canvas
- * @param fileName
- * @param lastModified
- * @param type
- * @param quality
- * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
- */
-function canvas2File(canvas, fileName, lastModified, type, quality) {
-    if (type === void 0) { type = "image/jpeg"; }
-    if (quality === void 0) { quality = 0.8; }
-    return new Promise(function (resolve, reject) {
-        canvas.toBlob(function (blob) {
-            if (!blob) {
-                reject(new Error('canvas文件导出失败'));
-            }
-            else {
-                var file = new File([blob], fileName, { lastModified: lastModified, type: type });
-                // console.log("file size " + file.size / 1024 + "kb");
-                // console.log(file)
-                resolve(file);
-            }
-        }, type, quality);
-    });
-}
-/**
- * 缩放图片
- * @param img：HTMLImageElement 图片对象
- * @param inputType 图片类型
- * @param imageWidth 图片宽度
- * @param imageHeight 图片高度
- * @param equalProportion 是否等比例拉伸，默认是，目前只支持等比例拉伸
- * @param sideLengthLimit 图片边长限制
- * @param baseOnShortSide 是否以短边为限制
- * @param resultType: ResizeResultType, "image" | "canvas"
- */
-function resize(img, _a) {
-    var _b = _a.inputType, inputType = _b === void 0 ? 'image/jpeg' : _b, _c = _a.imageWidth, imageWidth = _c === void 0 ? -1 : _c, _d = _a.imageHeight, imageHeight = _d === void 0 ? -1 : _d, _e = _a.equalProportion, equalProportion = _e === void 0 ? true : _e, //等比例拉伸
-    _f = _a.sideLengthLimit, //等比例拉伸
-    sideLengthLimit = _f === void 0 ? 640 : _f, _g = _a.baseOnShortSide, baseOnShortSide = _g === void 0 ? true : _g, // 是否以短边为基准缩放
-    _h = _a.resultType, // 是否以短边为基准缩放
-    resultType = _h === void 0 ? "image" : _h;
-    var scale = 1;
-    var scaleBaseFunc = baseOnShortSide ? Math.min : Math.max;
-    if (imageWidth > 0 && imageHeight > 0) {
-        scale = sideLengthLimit / scaleBaseFunc(imageWidth, imageHeight);
-    }
-    else if (img.width > 0 && img.height > 0) {
-        scale = sideLengthLimit / scaleBaseFunc(img.width, img.height);
-        imageWidth = img.width;
-        imageHeight = img.height;
-    }
-    else {
-        return Promise.reject(new Error('image width/height 无效'));
-    }
-    var targetWidth = scale > 1 ? imageWidth : imageWidth * scale;
-    var targetHeight = scale > 1 ? imageHeight : imageHeight * scale;
-    if (resultType === "image") {
-        return image2Canvas(img, inputType, targetWidth, targetHeight).then(function (canvas) {
-            return canvas2Image(canvas);
-        });
-    }
-    else {
-        return image2Canvas(img, inputType, targetWidth, targetHeight);
-    }
-}
-//# sourceMappingURL=image-util.js.map
+/**
+ * 水印配置 {@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|文档}
+ * @description 水印渲染类
+ * @author Jiaji Yin
+ * @date 2021-11-05
+ */
+var __awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (undefined && undefined.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+
+var WatermarkImageEnum;
+(function (WatermarkImageEnum) {
+    WatermarkImageEnum[WatermarkImageEnum["POSITION_LEFT"] = 0] = "POSITION_LEFT";
+    WatermarkImageEnum[WatermarkImageEnum["POSITION_RIGHT"] = 1] = "POSITION_RIGHT";
+})(WatermarkImageEnum || (WatermarkImageEnum = {}));
+var Point = /** @class */ (function () {
+    function Point(x, y) {
+        this.x = x;
+        this.y = y;
+    }
+    return Point;
+}());
+var Size = /** @class */ (function () {
+    function Size(width, height) {
+        this.width = width;
+        this.height = height;
+    }
+    return Size;
+}());
+var clamp = function (value, min, max) {
+    return Math.min(Math.max(value, min), max);
+};
+var subString = function (str, startIndex, length) {
+    if (checkIsUndefinedOrNull(length)) {
+        return str.substring(startIndex);
+    }
+    else {
+        return str.substring(startIndex, startIndex + length);
+    }
+};
+/**
+ * {@link http://faq.egova.com.cn:7777/files/ueditor/image/20180621/1529574697677847.png|水印位置图}
+ */
+var WatermarkPosition;
+(function (WatermarkPosition) {
+    WatermarkPosition["LeftTop"] = "lefttop";
+    WatermarkPosition["CenterTop"] = "centertop";
+    WatermarkPosition["RightTop"] = "righttop";
+    WatermarkPosition["LeftCenter"] = "leftcenter";
+    WatermarkPosition["Center"] = "center";
+    WatermarkPosition["RightCenter"] = "rightcenter";
+    WatermarkPosition["LeftBottom"] = "leftbottom";
+    WatermarkPosition["CenterBottom"] = "centerbottom";
+    WatermarkPosition["RightBottom"] = "rightbottom";
+})(WatermarkPosition || (WatermarkPosition = {}));
+var WatermarkFontWeight;
+(function (WatermarkFontWeight) {
+    WatermarkFontWeight["Normal"] = "normal";
+    WatermarkFontWeight["Bold"] = "bold";
+})(WatermarkFontWeight || (WatermarkFontWeight = {}));
+var DEFAULT_DATE_FORMAT = "yyyy-MM-dd";
+var DEFAULT_TIME_FORMAT = "HH:mm";
+var WatermarkContent;
+(function (WatermarkContent) {
+    WatermarkContent["Raw"] = "";
+    WatermarkContent["Date"] = "date{(.*?)}|date";
+    WatermarkContent["Time"] = "time";
+    WatermarkContent["Address"] = "address";
+    WatermarkContent["HumanName"] = "humanname";
+    WatermarkContent["ProjectName"] = "projectName";
+    WatermarkContent["ApplicationName"] = "applicationName";
+})(WatermarkContent || (WatermarkContent = {}));
+var ColorMap = {
+    transparent: "#00000000",
+    white: "#FFFFFF",
+    black: "#000000",
+    darkgray: "#444444",
+    gray: "#888888",
+    lightgray: "#CCCCCC",
+    darkgrey: "#444444",
+    grey: "#888888",
+    lightgrey: "#CCCCCC",
+    red: "#FF0000",
+    green: "#00FF00",
+    blue: "#0000FF",
+    yellow: "#FFFF00",
+    cyan: "#00FFFF",
+    magenta: "#FF00FF",
+    aqua: "#00FFFF",
+    fuchsia: "#FF00FF",
+    lime: "#00FF00",
+    maroon: "#800000",
+    navy: "#000080",
+    olive: "#808000",
+    purple: "#800080",
+    silver: "#C0C0C0",
+    teal: "#008080",
+    orange: "#FF9933",
+};
+function getColorValue(key) {
+    for (var _i = 0, _a = Object.getOwnPropertyNames(ColorMap); _i < _a.length; _i++) {
+        var k = _a[_i];
+        if (k === key) {
+            return ColorMap[k];
+        }
+    }
+    return null;
+}
+var CONTENT_PADDING = 10;
+var DEFAULT_PADDING = 2;
+var DEFAULT_FONT_SIZE = 25.0;
+var DEFAULT_CANVAS_SIZE = 480.0;
+var DEFAULT_BACKGROUND_OPACITY = 128;
+var WatermarkStyle = /** @class */ (function () {
+    /**
+     * Watermark Style
+     * @param fontName
+     * @param fontWeight
+     * @param fontColor
+     * @param fontSize
+     * @param backgroundColor
+     * @param backgroundOpacity
+     * @param paddingTop
+     * @param paddingBottom
+     * @param position
+     * @param scale
+     * @param simplified
+     */
+    function WatermarkStyle(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, simplified) {
+        this.fontName = fontName;
+        this.fontWeight = fontWeight;
+        this.fontColor = fontColor;
+        this.fontSize = fontSize;
+        this.backgroundColor = backgroundColor;
+        this.backgroundOpacity = backgroundOpacity;
+        this.paddingTop = paddingTop;
+        this.paddingBottom = paddingBottom;
+        this.position = position;
+        this.scale = scale;
+        this.simplified = simplified;
+    }
+    return WatermarkStyle;
+}());
+var WatermarkImage = /** @class */ (function () {
+    function WatermarkImage(image, width, height, position) {
+        if (image === void 0) { image = ""; }
+        if (width === void 0) { width = 20; }
+        if (height === void 0) { height = 20; }
+        if (position === void 0) { position = WatermarkImageEnum.POSITION_LEFT; }
+        this.image = image;
+        this.width = width;
+        this.height = height;
+        this.position = position;
+    }
+    return WatermarkImage;
+}());
+var Watermark = /** @class */ (function () {
+    /**
+     * 水印对象，包含需要渲染的文本、图像，以及相应的style
+     * @param content
+     * @param watermarkStyle
+     */
+    function Watermark(content, watermarkStyle, watermarkImage) {
+        this.content = content;
+        this.style = watermarkStyle;
+        this.watermarkImage = watermarkImage;
+    }
+    return Watermark;
+}());
+var WatermarkContext = /** @class */ (function () {
+    /**
+     * 打水印需要的环境信息
+     * @param address
+     * @param watermarkTime
+     * @param humanName
+     * @param projectName
+     * @param logo
+     */
+    function WatermarkContext(params) {
+        this.address = params.address;
+        this.watermarkTime = params.watermarkTime;
+        this.humanName = params.humanName;
+        this.projectName = params.projectName;
+        this.logo = params.logo;
+        this.applicationName = params.applicationName;
+    }
+    return WatermarkContext;
+}());
+
+var WatermarkOptions = /** @class */ (function () {
+    /**
+     * 水印配置项
+     * @param enabled， 是否开启水印
+     * @param watermarkConfigString，水印配置的字符串
+     * @param context，打水印需要的环境信息
+     */
+    function WatermarkOptions(params) {
+        this.enabled = params.enabled;
+        this.watermarkConfigString = params.watermarkConfigString;
+        this.context = params.context;
+    }
+    return WatermarkOptions;
+}());
+
+/**
+ * 画水印默认使用黑体
+ * @see {@link https://www.zhihu.com/question/19911793|使用黑体}
+ */
+function getHeitiFontFamily() {
+    if (checkIsAndroid()) {
+        return "'Roboto Black', 'Droid Sans'";
+    }
+    else if (checkIsIOS()) {
+        return "'PingFang SC Medium'";
+    }
+    else {
+        return '"PingFang SC Medium", "Hiragino Sans GB", "Microsoft YaHei", "WenQuanYi Micro Hei", sans-serif';
+    }
+}
+function parseWatermarkStyle(styleString, canvasSize) {
+    if (!checkIsStringValid(styleString)) {
+        return null;
+    }
+    var styleParts = styleString.split("$");
+    if (styleParts.length <= 0) {
+        return null;
+    }
+    var scale = Math.min(canvasSize.width, canvasSize.height) / DEFAULT_CANVAS_SIZE;
+    /**
+     1. 20190314版本开始可以使用简化版配置，格式为[文字大小]$[水印位置]$[上下padding]*#*[水印内容]          其中[上下padding]一般不设置，如需设置，格式为"上padding_下padding"，下padding可省略
+     2. 简化版配置使用条件：字体（黑体）、字体样式（normal）、文字颜色（transparent）、背景颜色（transparent）、背景不透明度（128）全部使用默认值（括号中的值）
+     */
+    if (parseInteger(styleParts[0], -1) !== -1) {
+        // 第一项为数字，则为新的简化配置
+        var fontSize = Math.round(parseDecimal(styleParts[0], DEFAULT_FONT_SIZE) * scale);
+        var position = WatermarkPosition.LeftTop;
+        if (styleParts[1]) {
+            position = styleParts[1];
+        }
+        var paddingTop = DEFAULT_PADDING * scale;
+        var paddingBottom = DEFAULT_PADDING * scale;
+        if (styleParts[2]) {
+            var paddingParts = styleParts[2].split("_");
+            paddingTop = parseInteger(paddingParts[0], DEFAULT_PADDING) * scale;
+            if (paddingParts[1]) {
+                paddingBottom = parseInteger(paddingParts[1], DEFAULT_PADDING) * scale;
+            }
+        }
+        var fontName = getHeitiFontFamily();
+        var fontWeight = WatermarkFontWeight.Normal;
+        var fontColor = ColorMap.transparent;
+        var backgroundColor = ColorMap.transparent;
+        var backgroundOpacity = 128;
+        return new WatermarkStyle(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, true);
+    }
+    else {
+        // [字体]$[文字样式]$[文字颜色]$[文字大小]$[背景颜色]$[水印位置]$[背景不透明度]$[上下padding]*#*[水印内容]
+        var fontName = styleParts[0] + ", " + getHeitiFontFamily();
+        var fontWeight = WatermarkFontWeight.Normal;
+        if (styleParts[1]) {
+            fontWeight = styleParts[1];
+        }
+        var fontColor = ColorMap.white;
+        if (styleParts[2]) {
+            var color = getColorValue(styleParts[2]);
+            if (color) {
+                fontColor = color;
+            }
+        }
+        var fontSize = Math.round(DEFAULT_FONT_SIZE * scale);
+        if (styleParts[3]) {
+            fontSize = Math.round(parseDecimal(styleParts[3], DEFAULT_FONT_SIZE) * scale);
+        }
+        var backgroundColor = ColorMap.blue;
+        if (styleParts[4]) {
+            var color = getColorValue(styleParts[4]);
+            if (color) {
+                backgroundColor = color;
+            }
+        }
+        var position = WatermarkPosition.LeftTop;
+        if (styleParts[5]) {
+            position = styleParts[5];
+        }
+        var backgroundOpacity = 255;
+        if (styleParts[6]) {
+            var opacity = parseInteger(styleParts[6], DEFAULT_BACKGROUND_OPACITY);
+            opacity = clamp(opacity, 0, 255);
+            backgroundOpacity = opacity;
+        }
+        var paddingTop = DEFAULT_PADDING * scale;
+        var paddingBottom = DEFAULT_PADDING * scale;
+        if (styleParts[7]) {
+            var paddingParts = styleParts[7].split("_");
+            paddingTop = parseInteger(paddingParts[0], DEFAULT_PADDING) * scale;
+            if (paddingParts[1]) {
+                paddingBottom = parseInteger(paddingParts[1], DEFAULT_PADDING) * scale;
+            }
+        }
+        return new WatermarkStyle(fontName, fontWeight, fontColor, fontSize, backgroundColor, backgroundOpacity, paddingTop, paddingBottom, position, scale, false);
+    }
+}
+/**
+ * A JavaScript Scanner like Java's
+ * @see java.util.Scanner
+ */
+var watermark_TextScanner = /** @class */ (function () {
+    /**
+     * The content to scan
+     * @param text
+     */
+    function TextScanner(text) {
+        this.text = text;
+        this.cursor = 0;
+    }
+    TextScanner.prototype.hasNext = function (obj) {
+        if (checkIsUndefinedOrNull(obj)) {
+            return this.cursor < this.text.length;
+        }
+        else if (checkIsString(obj)) {
+            var str = obj;
+            var current = subString(this.text, this.cursor, str.length);
+            if (current === str) {
+                return true;
+            }
+        }
+        else if (checkIsRegExp(obj)) {
+            var regex = obj;
+            var subText = subString(this.text, this.cursor);
+            var matchResults = subText.match(regex);
+            if (matchResults) {
+                if (matchResults.index === 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    };
+    TextScanner.prototype.next = function (obj) {
+        if (checkIsUndefinedOrNull(obj)) {
+            return subString(this.text, this.cursor, 1);
+        }
+        else if (checkIsString(obj)) {
+            var str = obj;
+            if (subString(this.text, this.cursor, str.length) === str) {
+                return str;
+            }
+        }
+        else if (checkIsRegExp(obj)) {
+            var regex = obj;
+            var subText = subString(this.text, this.cursor);
+            var matchResults = subText.match(regex);
+            if (matchResults) {
+                if (matchResults.index === 0) {
+                    return matchResults;
+                }
+            }
+        }
+        return null;
+    };
+    TextScanner.prototype.skip = function (obj) {
+        if (checkIsUndefinedOrNull(obj)) {
+            this.cursor += 1;
+        }
+        else if (checkIsStringValid(obj)) {
+            var str = obj;
+            this.cursor += str.length;
+        }
+        return this;
+    };
+    return TextScanner;
+}());
+
+function buildContent(contentConfigString, watermarkContext, style) {
+    var content = "";
+    var watermarkImage = new WatermarkImage();
+    if (contentConfigString.includes("{logo")) {
+        var start = contentConfigString.indexOf("{logo");
+        var end = contentConfigString.indexOf("}", start);
+        if (end != -1) {
+            var logoConfigWithBrace = contentConfigString.substring(start, end + 1);
+            if (contentConfigString.startsWith(logoConfigWithBrace) ||
+                contentConfigString.endsWith(logoConfigWithBrace)) {
+                if (contentConfigString.startsWith(logoConfigWithBrace)) {
+                    watermarkImage.position = WatermarkImageEnum.POSITION_LEFT;
+                }
+                else {
+                    watermarkImage.position = WatermarkImageEnum.POSITION_RIGHT;
+                }
+                var imgWidthHeight = (style === null || style === void 0 ? void 0 : style.fontSize) || 20;
+                watermarkImage.image = watermarkContext.logo;
+                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];
+                        }
+                    }
+                    content += date_formatDate(watermarkContext.watermarkTime, 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 {
+                var nextChar = scanner.next();
+                // console.log(`next out "${nextChar}"`)
+                if (checkIsString(nextChar)) {
+                    // console.log(`next in "${nextChar}"`)
+                    content += nextChar;
+                }
+                scanner.skip();
+            }
+            steps++;
+        }
+    }
+    return { content: content, watermarkImage: watermarkImage };
+}
+function parseWatermarks(watermarkConfigString, canvasSize, watermarkContext) {
+    var watermarks = [];
+    var configStringArray = watermarkConfigString.split("###");
+    for (var i = 0; i < configStringArray.length; i++) {
+        var configString = configStringArray[i];
+        //console.log('config string ' + configString);
+        var configParts = configString.split("*#*");
+        //console.log(JSON.stringify(configParts));
+        if (configParts.length === 2) {
+            var styleString = configParts[0];
+            var contentString = configParts[1];
+            var style = parseWatermarkStyle(styleString, canvasSize);
+            var data = buildContent(contentString, watermarkContext, style);
+            if (style && (data.content || data.watermarkImage.image)) {
+                var watermark = new Watermark(data.content, style, data.watermarkImage);
+                watermarks.push(watermark);
+            }
+        }
+    }
+    return watermarks;
+}
+/**
+ * 可以渲染的内容
+ */
+var Tile = /** @class */ (function () {
+    function Tile(origin, size, lineHeight, lineWidths, lines, style, watermarkImage) {
+        this.origin = origin;
+        this.size = size;
+        this.lineHeight = lineHeight;
+        this.lineWidths = lineWidths;
+        this.lines = lines;
+        this.style = style;
+        this.watermarkImage = watermarkImage;
+    }
+    return Tile;
+}());
+function getCanvasScale(canvas, len) {
+    var min = Math.min(canvas.width, canvas.height);
+    return (min / DEFAULT_CANVAS_SIZE) * len;
+}
+function buildTile(canvas, watermark) {
+    var content = watermark.content, style = watermark.style, watermarkImage = watermark.watermarkImage;
+    var origin = new Point(0, 0);
+    var size = new Size(0, 0);
+    var lines = [];
+    var ctx = canvas.getContext("2d");
+    if (!ctx) {
+        return null;
+    }
+    ctx.font = style.fontWeight + " " + style.fontSize + "px " + style.fontName;
+    var contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
+    var contentWidth = canvas.width - contentPadding * 2;
+    // @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超过宽度就换行
+    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 = "";
+        }
+        lastWidth = lineWidth;
+        temp += content[i];
+    }
+    lines.push(temp);
+    lineWidths.push(lastWidth);
+    size.width = contentWidth;
+    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) {
+    var padding = (CONTENT_PADDING + DEFAULT_PADDING) * style.scale;
+    var axisPoint = new Point(padding, origin.y);
+    if (style.position.startsWith("center")) {
+        axisPoint = new Point(canvasWidth / 2, origin.y);
+    }
+    else if (style.position.startsWith("right")) {
+        axisPoint = new Point(canvasWidth - padding, origin.y);
+    }
+    var imagePoint = new Point(axisPoint.x, axisPoint.y);
+    if (watermarkImage.image) {
+        if (watermarkImage.position === WatermarkImageEnum.POSITION_LEFT) {
+            if (style.position.startsWith("left")) {
+                axisPoint.x = axisPoint.x + watermarkImage.width;
+            }
+            else if (style.position.startsWith("center")) {
+                axisPoint.x = axisPoint.x + watermarkImage.width / 2;
+                imagePoint.x = imagePoint.x - width / 2 - watermarkImage.width;
+            }
+            else {
+                imagePoint.x = imagePoint.x - width - 2 * watermarkImage.width;
+            }
+        }
+        else {
+            if (style.position.startsWith("left")) {
+                imagePoint.x = axisPoint.x + width + watermarkImage.width;
+            }
+            else if (style.position.startsWith("center")) {
+                axisPoint.x = axisPoint.x - watermarkImage.width / 2;
+                imagePoint.x = imagePoint.x + width / 2;
+            }
+            else {
+                axisPoint.x = axisPoint.x - watermarkImage.width;
+                imagePoint.x = imagePoint.x - watermarkImage.width;
+            }
+        }
+    }
+    return {
+        text: axisPoint,
+        image: imagePoint,
+    };
+}
+function getTextAlign(style) {
+    var align = "left";
+    if (style.position.startsWith("center")) {
+        align = "center";
+    }
+    else if (style.position.startsWith("right")) {
+        align = "right";
+    }
+    return align;
+}
+function loadImage(url) {
+    return new Promise(function (resolve, reject) {
+        var img = new Image();
+        img.src = url;
+        img.crossOrigin = "anonymous";
+        img.onload = function (e) {
+            if (img.complete) {
+                resolve(img);
+            }
+            else {
+                console.error(e);
+                reject(new Error("文件加载失败"));
+            }
+        };
+    });
+}
+function drawLine(canvas, line, width, origin, tile) {
+    return __awaiter(this, void 0, void 0, function () {
+        var ctx, style, watermarkImage, point, image, offset;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ctx = canvas.getContext("2d");
+                    if (!ctx) {
+                        return [2 /*return*/];
+                    }
+                    style = tile.style, watermarkImage = tile.watermarkImage;
+                    /**
+                     * The fillText's second argument is the Y coordinate for the baseline of the text (the default textBaseline is "alphabetic") ,
+                     * so the text is being drawn above the visible canvas element when you use 0.
+                     * @see {@link https://stackoverflow.com/questions/14289331/html5-canvas-doesnt-fill-text-at-coordinates-0-0}
+                     */
+                    ctx.textBaseline = "top";
+                    ctx.font = style.fontWeight + " " + style.fontSize + "px " + style.fontName;
+                    point = getAxisPoint(canvas.width, width, origin, style, watermarkImage);
+                    ctx.textAlign = getTextAlign(style);
+                    if (!watermarkImage.image) return [3 /*break*/, 2];
+                    return [4 /*yield*/, loadImage(watermarkImage.image)];
+                case 1:
+                    image = _a.sent();
+                    ctx.drawImage(image, Math.round(point.image.x), Math.round(point.image.y), watermarkImage.width, watermarkImage.height);
+                    _a.label = 2;
+                case 2:
+                    if (style.simplified) {
+                        ctx.shadowBlur = 4; // shadow
+                        // ctx.shadowColor = "rgba(220,220,220,0.75)";
+                        ctx.shadowColor = "rgba(0, 0, 0, 0.5)";
+                        offset = clamp(style.fontSize / 40, 2, 4);
+                        ctx.shadowOffsetY = offset;
+                        ctx.shadowOffsetX = offset;
+                        ctx.fillStyle = "rgba(255,255,255, 0.5)";
+                    }
+                    else {
+                        ctx.fillStyle = style.fontColor;
+                    }
+                    ctx.fillText(line, Math.round(point.text.x), Math.round(point.text.y));
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+function hexToRGB(hex, alpha) {
+    var r = parseInt(hex.slice(1, 3), 16), g = parseInt(hex.slice(3, 5), 16), b = parseInt(hex.slice(5, 7), 16);
+    if (alpha) {
+        return "rgba(" + r + ", " + g + ", " + b + ", " + alpha + ")";
+    }
+    else {
+        return "rgb(" + r + ", " + g + ", " + b + ")";
+    }
+}
+function drawBackground(canvas, tile) {
+    var ctx = canvas.getContext("2d");
+    if (!ctx) {
+        return;
+    }
+    var backgroundColor = tile.style.backgroundColor;
+    var backgroundOpacity = parseDecimal(String(tile.style.backgroundOpacity), -1);
+    if (backgroundOpacity > 255) {
+        backgroundOpacity = 255;
+    }
+    var paddingTop = 2;
+    var paddingBottom = 10;
+    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++) {
+            var lineHeight = tile.lineHeight;
+            var lineWidth = tile.lineWidths[j];
+            var paddingRight = 30 * paddingScale;
+            var paddingLeft = 10 * paddingScale;
+            var axisPoint = new Point(padding - paddingLeft, tile.origin.y);
+            if (style.position.startsWith("center")) {
+                paddingLeft = 20 * paddingScale;
+                paddingRight = 20 * paddingScale;
+                axisPoint = new Point((canvas.width - lineWidth) / 2 - paddingLeft, tile.origin.y);
+            }
+            else if (style.position.startsWith("right")) {
+                paddingLeft = 30 * paddingScale;
+                paddingRight = 10 * paddingScale;
+                axisPoint = new Point(canvas.width - lineWidth - padding - paddingLeft, tile.origin.y);
+            }
+            // padding top
+            if (j === 0) {
+                ctx.fillRect(axisPoint.x, axisPoint.y - paddingTop > 0 ? axisPoint.y - paddingTop : 0, paddingLeft + lineWidth + paddingRight, paddingTop);
+            }
+            ctx.fillRect(axisPoint.x, axisPoint.y + j * lineHeight, paddingLeft + lineWidth + paddingRight, lineHeight);
+            // padding bottom
+            if (j === tile.lineWidths.length - 1) {
+                ctx.fillRect(axisPoint.x, axisPoint.y + (j + 1) * lineHeight, paddingLeft + lineWidth + paddingRight, paddingBottom);
+            }
+        }
+    }
+}
+function drawTile(canvas, tile) {
+    return __awaiter(this, void 0, void 0, function () {
+        var i, origin_1;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!tile.style.simplified) {
+                        // 复杂配置绘制背景颜色
+                        drawBackground(canvas, tile);
+                    }
+                    i = 0;
+                    _a.label = 1;
+                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)];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+var GroupPosition;
+(function (GroupPosition) {
+    GroupPosition["Top"] = "top";
+    GroupPosition["Center"] = "center";
+    GroupPosition["Bottom"] = "bottom";
+})(GroupPosition || (GroupPosition = {}));
+function drawGroupedWatermarks(canvas, watermarks, groupPosition) {
+    return __awaiter(this, void 0, void 0, function () {
+        var tiles, totalHeight, i, watermark, tile, contentPadding, baseOrigin, lastMarginTop, i, tile, i, tile;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!watermarks || watermarks.length === 0) {
+                        return [2 /*return*/];
+                    }
+                    tiles = [];
+                    totalHeight = 0;
+                    for (i = 0; i < watermarks.length; i++) {
+                        watermark = watermarks[i];
+                        tile = buildTile(canvas, watermark);
+                        if (tile) {
+                            tiles.push(tile);
+                            totalHeight += tile.size.height + CONTENT_PADDING;
+                        }
+                    }
+                    if (totalHeight <= 0) {
+                        // no need draw
+                        console.error("watermarks height " + totalHeight);
+                        console.error(JSON.stringify(watermarks));
+                        return [2 /*return*/];
+                    }
+                    contentPadding = getCanvasScale(canvas, CONTENT_PADDING);
+                    baseOrigin = new Point(contentPadding, contentPadding);
+                    if (groupPosition === GroupPosition.Center) {
+                        baseOrigin = new Point(contentPadding, Math.round((canvas.height - totalHeight) / 2));
+                    }
+                    else if (groupPosition === GroupPosition.Bottom) {
+                        baseOrigin = new Point(contentPadding, canvas.height - totalHeight - contentPadding);
+                    }
+                    else if (groupPosition === GroupPosition.Top) {
+                        baseOrigin = new Point(contentPadding, contentPadding);
+                    }
+                    lastMarginTop = 0;
+                    for (i = 0; i < tiles.length; i++) {
+                        tile = tiles[i];
+                        lastMarginTop += tile.style.paddingTop;
+                        tile.origin = new Point(tile.origin.x + baseOrigin.x, lastMarginTop + baseOrigin.y);
+                        lastMarginTop += tile.size.height;
+                        lastMarginTop += tile.style.paddingBottom;
+                    }
+                    i = 0;
+                    _a.label = 1;
+                case 1:
+                    if (!(i < tiles.length)) return [3 /*break*/, 4];
+                    tile = tiles[i];
+                    return [4 /*yield*/, drawTile(canvas, tile)];
+                case 2:
+                    _a.sent();
+                    _a.label = 3;
+                case 3:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+/**
+ * 把watermark 分为 上、中、三组
+ * @param watermarks
+ */
+function groupingWatermarks(watermarks) {
+    var _a;
+    var topList = [];
+    var centerList = [];
+    var bottomList = [];
+    for (var i = 0; i < watermarks.length; i++) {
+        var watermark = watermarks[i];
+        if (watermark.style.position.endsWith("top")) {
+            topList.push(watermark);
+        }
+        else if (watermark.style.position.endsWith("center")) {
+            centerList.push(watermark);
+        }
+        else if (watermark.style.position.endsWith("bottom")) {
+            bottomList.push(watermark);
+        }
+    }
+    return _a = {},
+        _a[GroupPosition.Top] = topList,
+        _a[GroupPosition.Center] = centerList,
+        _a[GroupPosition.Bottom] = bottomList,
+        _a;
+}
+function renderWatermark(canvas, options) {
+    return __awaiter(this, void 0, void 0, function () {
+        var watermarkConfigString, watermarks, groupedWatermarks;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    // console.log("canvas width " + canvas.width);
+                    // console.log("canvas height " + canvas.height);
+                    if (!options.enabled || options.watermarkConfigString === "no") {
+                        return [2 /*return*/, Promise.resolve(canvas)];
+                    }
+                    watermarkConfigString = options.watermarkConfigString;
+                    if (watermarkConfigString === "default") {
+                        watermarkConfigString = "50$lefttop$50*#*time###25$lefttop*#*date";
+                    }
+                    watermarks = parseWatermarks(watermarkConfigString, new Size(canvas.width, canvas.height), options.context);
+                    groupedWatermarks = groupingWatermarks(watermarks);
+                    return [4 /*yield*/, drawGroupedWatermarks(canvas, groupedWatermarks[GroupPosition.Top], GroupPosition.Top)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, drawGroupedWatermarks(canvas, groupedWatermarks[GroupPosition.Center], GroupPosition.Center)];
+                case 2:
+                    _a.sent();
+                    return [4 /*yield*/, drawGroupedWatermarks(canvas, groupedWatermarks[GroupPosition.Bottom], GroupPosition.Bottom)];
+                case 3:
+                    _a.sent();
+                    return [2 /*return*/, Promise.resolve(canvas)];
+            }
+        });
+    });
+}
+function checkWatermarkConfigSupported(watermarkConfigString) {
+    var configStringArray = watermarkConfigString.split("###");
+    for (var i = 0; i < configStringArray.length; i++) {
+        var configString = configStringArray[i];
+        //console.log('config string ' + configString);
+        var configParts = configString.split("*#*");
+        //console.log(JSON.stringify(configParts));
+        if (configParts.length === 2) {
+            var styleString = configParts[0];
+            var styleParts = styleString.split("$");
+            if (styleParts.length <= 0) {
+                console.error("水印配置不合法");
+                return false;
+            }
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=watermark.js.map
+// CONCATENATED MODULE: ./node_modules/@egova/media/lib/image-util.js
+/**
+ * Convert File to data schema url
+ * @param file
+ */
+function file2DataURL(file) {
+    return new Promise(function (resolve, reject) {
+        var a = new FileReader();
+        a.onload = function (res) {
+            if (res && res.target) {
+                resolve(res.target.result);
+            }
+            else {
+                reject(new Error('读取文件url失败'));
+            }
+        };
+        a.readAsDataURL(file);
+    });
+}
+/**
+ * Convert file to image
+ * @param file
+ */
+function file2Image(file) {
+    return new Promise(function (resolve, reject) {
+        file2DataURL(file).then(function (url) {
+            var img = new Image();
+            img.src = url;
+            img.onload = function (e) {
+                if (img.complete) {
+                    resolve(img);
+                }
+                else {
+                    reject(new Error('文件加载失败'));
+                }
+            };
+        }).catch(reject);
+    });
+}
+function image2file(img, fileName, lastModified, type, quality) {
+    if (type === void 0) { type = "image/jpeg"; }
+    if (quality === void 0) { quality = 0.8; }
+    return image2Canvas(img, type).then(function (canvas) {
+        return canvas2File(canvas, fileName, lastModified, type, quality);
+    });
+}
+/**
+ * Draw image on canvas
+ * @param img
+ * @param width
+ * @param height
+ */
+function image2Canvas(img, type, width, height) {
+    var canvas = document.createElement('canvas');
+    if (!width) {
+        width = img.width;
+    }
+    if (!height) {
+        height = img.height;
+    }
+    canvas.width = width;
+    canvas.height = height;
+    var ctx = canvas.getContext('2d');
+    if (ctx) {
+        // png经canvas.toDataURL转换后背景变成黑色，这里提前填充白色
+        ctx.fillStyle = 'transparent';
+        if (type === 'image/jpeg') {
+            ctx.fillStyle = '#fff';
+        }
+        ctx.drawImage(img, 0, 0, width, height);
+        return Promise.resolve(canvas);
+    }
+    else {
+        return Promise.reject(null);
+    }
+}
+/**
+ * Export Image from canvas
+ * @param canvas
+ * @param type
+ * @param quality
+ * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
+ */
+function canvas2Image(canvas, type, quality) {
+    if (type === void 0) { type = "image/jpeg"; }
+    if (quality === void 0) { quality = 0.8; }
+    var image = new Image();
+    image.src = canvas.toDataURL(type, quality);
+    return Promise.resolve(image);
+}
+/**
+ * Export File from canvas
+ * @param canvas
+ * @param fileName
+ * @param lastModified
+ * @param type
+ * @param quality
+ * @see {@link https://meshworld.in/convert-canvas-to-an-image-using-javascript/}
+ */
+function canvas2File(canvas, fileName, lastModified, type, quality) {
+    if (type === void 0) { type = "image/jpeg"; }
+    if (quality === void 0) { quality = 0.8; }
+    return new Promise(function (resolve, reject) {
+        canvas.toBlob(function (blob) {
+            if (!blob) {
+                reject(new Error('canvas文件导出失败'));
+            }
+            else {
+                var file = new File([blob], fileName, { lastModified: lastModified, type: type });
+                // console.log("file size " + file.size / 1024 + "kb");
+                // console.log(file)
+                resolve(file);
+            }
+        }, type, quality);
+    });
+}
+/**
+ * 缩放图片
+ * @param img：HTMLImageElement 图片对象
+ * @param inputType 图片类型
+ * @param imageWidth 图片宽度
+ * @param imageHeight 图片高度
+ * @param equalProportion 是否等比例拉伸，默认是，目前只支持等比例拉伸
+ * @param sideLengthLimit 图片边长限制
+ * @param baseOnShortSide 是否以短边为限制
+ * @param resultType: ResizeResultType, "image" | "canvas"
+ */
+function resize(img, _a) {
+    var _b = _a.inputType, inputType = _b === void 0 ? 'image/jpeg' : _b, _c = _a.imageWidth, imageWidth = _c === void 0 ? -1 : _c, _d = _a.imageHeight, imageHeight = _d === void 0 ? -1 : _d, _e = _a.equalProportion, equalProportion = _e === void 0 ? true : _e, //等比例拉伸
+    _f = _a.sideLengthLimit, //等比例拉伸
+    sideLengthLimit = _f === void 0 ? 640 : _f, _g = _a.baseOnShortSide, baseOnShortSide = _g === void 0 ? true : _g, // 是否以短边为基准缩放
+    _h = _a.resultType, // 是否以短边为基准缩放
+    resultType = _h === void 0 ? "image" : _h;
+    var scale = 1;
+    var scaleBaseFunc = baseOnShortSide ? Math.min : Math.max;
+    if (imageWidth > 0 && imageHeight > 0) {
+        scale = sideLengthLimit / scaleBaseFunc(imageWidth, imageHeight);
+    }
+    else if (img.width > 0 && img.height > 0) {
+        scale = sideLengthLimit / scaleBaseFunc(img.width, img.height);
+        imageWidth = img.width;
+        imageHeight = img.height;
+    }
+    else {
+        return Promise.reject(new Error('image width/height 无效'));
+    }
+    var targetWidth = scale > 1 ? imageWidth : imageWidth * scale;
+    var targetHeight = scale > 1 ? imageHeight : imageHeight * scale;
+    if (resultType === "image") {
+        return image2Canvas(img, inputType, targetWidth, targetHeight).then(function (canvas) {
+            return canvas2Image(canvas);
+        });
+    }
+    else {
+        return image2Canvas(img, inputType, targetWidth, targetHeight);
+    }
+}
+//# sourceMappingURL=image-util.js.map
 // CONCATENATED MODULE: ./node_modules/@egova/media/lib/image-processor.js
-
-
-
-var MAX_SIDE_LENGTH = 1920;
-var MIN_SIDE_LEnGTH = 480;
-var PHOTO_FILE_SIZE_LIMIT = 1000; // 1000kb
-var DEFAULT_JPEG_QUALITY = 0.8;
-var MIN_JPEG_QUALITY = 0.1;
-var JPEG_QUALITY_STEP = 0.05;
-var image_processor_ResizeOptions = /** @class */ (function () {
-    function ResizeOptions(maxSideLength) {
-        if (checkIsUndefinedOrNull(maxSideLength)) {
-            this.maxSideLength = MAX_SIDE_LENGTH;
-        }
-        else {
-            this.maxSideLength = maxSideLength;
-            if (this.maxSideLength > MAX_SIDE_LENGTH) {
-                this.maxSideLength = MAX_SIDE_LENGTH;
-            }
-            else if (this.maxSideLength < MIN_SIDE_LEnGTH) {
-                this.maxSideLength = MIN_SIDE_LEnGTH;
-            }
-        }
-    }
-    return ResizeOptions;
-}());
-
-var image_processor_CompressOptions = /** @class */ (function () {
-    function CompressOptions(photoFileSizeLimit) {
-        if (checkIsUndefinedOrNull(photoFileSizeLimit)) {
-            this.photoFileSizeLimit = PHOTO_FILE_SIZE_LIMIT;
-        }
-        else {
-            this.photoFileSizeLimit = photoFileSizeLimit;
-        }
-    }
-    return CompressOptions;
-}());
-
-var image_processor_ImageProcessor = /** @class */ (function () {
-    function ImageProcessor(file, resizeOptions, watermarkOptions, compressOptions) {
-        this.file = file;
-        this.resizeOptions = resizeOptions;
-        this.watermarkOptions = watermarkOptions;
-        this.compressOptions = compressOptions;
-    }
-    ImageProcessor.prototype.process = function () {
-        var _this = this;
-        var filename = this.file.name;
-        var lastModified = this.file.lastModified;
-        var fileType = this.file.type;
-        if (this.file.size > this.compressOptions.photoFileSizeLimit * 1024) {
-            fileType = 'image/jpeg';
-        }
-        if (fileType === 'image/gif') {
-            fileType = 'image/png';
-        }
-        return file2Image(this.file).then(function (img) {
-            //第一步 resize image
-            return resize(img, {
-                inputType: fileType,
-                sideLengthLimit: _this.resizeOptions.maxSideLength,
-                resultType: "canvas"
-            });
-        }).then(function (result) {
-            var canvas = result;
-            //第二步 打水印
-            return renderWatermark(canvas, _this.watermarkOptions);
-        }).then(function (canvas) {
-            var exportFilename = filename.replace(/\./g, "-") + '.jpg';
-            return _this.compress(canvas, exportFilename, lastModified, fileType, DEFAULT_JPEG_QUALITY);
-        });
-    };
-    ImageProcessor.prototype.compress = function (canvas, filename, lastModified, type, quality) {
-        var _this = this;
-        return canvas2File(canvas, filename, lastModified, type, quality).then(function (file) {
-            if (file.size > _this.compressOptions.photoFileSizeLimit * 1024 &&
-                quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
-                return _this.compress(canvas, filename, lastModified, type, quality - JPEG_QUALITY_STEP);
-            }
-            else {
-                return Promise.resolve(file);
-            }
-        });
-    };
-    return ImageProcessor;
-}());
-
+var image_processor_awaiter = (undefined && undefined.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var image_processor_generator = (undefined && undefined.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+
+
+
+var MAX_SIDE_LENGTH = 1920;
+var MIN_SIDE_LENGTH = 480;
+var PHOTO_FILE_SIZE_LIMIT = 1000; // 1000kb
+var DEFAULT_JPEG_QUALITY = 0.8;
+var MIN_JPEG_QUALITY = 0.1;
+var JPEG_QUALITY_STEP = 0.05;
+var image_processor_ResizeOptions = /** @class */ (function () {
+    function ResizeOptions(maxSideLength) {
+        if (checkIsUndefinedOrNull(maxSideLength)) {
+            this.maxSideLength = MAX_SIDE_LENGTH;
+        }
+        else {
+            this.maxSideLength = maxSideLength;
+            if (this.maxSideLength > MAX_SIDE_LENGTH) {
+                this.maxSideLength = MAX_SIDE_LENGTH;
+            }
+            else if (this.maxSideLength < MIN_SIDE_LENGTH) {
+                this.maxSideLength = MIN_SIDE_LENGTH;
+            }
+        }
+    }
+    return ResizeOptions;
+}());
+
+var image_processor_CompressOptions = /** @class */ (function () {
+    function CompressOptions(photoFileSizeLimit) {
+        if (checkIsUndefinedOrNull(photoFileSizeLimit)) {
+            this.photoFileSizeLimit = PHOTO_FILE_SIZE_LIMIT;
+        }
+        else {
+            this.photoFileSizeLimit = photoFileSizeLimit;
+        }
+    }
+    return CompressOptions;
+}());
+
+var image_processor_ImageProcessor = /** @class */ (function () {
+    function ImageProcessor(file, resizeOptions, watermarkOptions, compressOptions) {
+        this.file = file;
+        this.resizeOptions = resizeOptions;
+        this.watermarkOptions = watermarkOptions;
+        this.compressOptions = compressOptions;
+    }
+    ImageProcessor.prototype.process = function () {
+        var _this = this;
+        var filename = this.file.name;
+        var lastModified = this.file.lastModified;
+        var fileType = this.file.type;
+        if (this.file.size > this.compressOptions.photoFileSizeLimit * 1024) {
+            fileType = "image/jpeg";
+        }
+        if (fileType === "image/gif") {
+            fileType = "image/png";
+        }
+        return file2Image(this.file)
+            .then(function (img) {
+            //第一步 resize image
+            return resize(img, {
+                inputType: fileType,
+                sideLengthLimit: _this.resizeOptions.maxSideLength,
+                resultType: "canvas",
+            });
+        })
+            .then(function (result) { return image_processor_awaiter(_this, void 0, void 0, function () {
+            var canvas;
+            return image_processor_generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        canvas = result;
+                        return [4 /*yield*/, renderWatermark(canvas, this.watermarkOptions)];
+                    case 1: 
+                    //第二步 打水印
+                    return [2 /*return*/, _a.sent()];
+                }
+            });
+        }); })
+            .then(function (canvas) {
+            var exportFilename = filename.replace(/\./g, "-") + ".jpg";
+            return _this.compress(canvas, exportFilename, lastModified, fileType, DEFAULT_JPEG_QUALITY);
+        });
+    };
+    ImageProcessor.prototype.compress = function (canvas, filename, lastModified, type, quality) {
+        var _this = this;
+        return canvas2File(canvas, filename, lastModified, type, quality).then(function (file) {
+            if (file.size > _this.compressOptions.photoFileSizeLimit * 1024 &&
+                quality - JPEG_QUALITY_STEP > MIN_JPEG_QUALITY) {
+                return _this.compress(canvas, filename, lastModified, type, quality - JPEG_QUALITY_STEP);
+            }
+            else {
+                return Promise.resolve(file);
+            }
+        });
+    };
+    return ImageProcessor;
+}());
+
 //# sourceMappingURL=image-processor.js.map
 // CONCATENATED MODULE: ./node_modules/@egova/media/lib/index.js
-/**
- * @description 水印渲染类
- * @author Jiaji Yin
- * @date 2021-11-05
- */
-
-
-
+/**
+ * @description 水印渲染类
+ * @author Jiaji Yin
+ * @date 2021-11-05
+ */
+
+
+
 //# sourceMappingURL=index.js.map
 // CONCATENATED MODULE: ./es/media-picker/image/TakePhotoIcon.js
 /* harmony default export */ var TakePhotoIcon = ({
@@ -76847,6 +77260,8 @@ var media_picker_createNamespace = Object(utils["b" /* createNamespace */])('med
               address: _this4.watermarkOptions.address || "",
               humanName: _this4.watermarkOptions.humanName || "",
               projectName: _this4.watermarkOptions.projectName || "",
+              logo: _this4.watermarkOptions.logo || "",
+              applicationName: _this4.watermarkOptions.applicationName || "",
               watermarkTime: new Date()
             }
           });
@@ -79605,6 +80020,7 @@ var pdf_viewer_v2_createNamespace = Object(utils["b" /* createNamespace */])('pd
 
 
 
+
 var pdf_viewer_v2_ = __webpack_require__(19);
 
 var pdf_viewer_v2_defaultData = function defaultData() {
@@ -79615,7 +80031,11 @@ var pdf_viewer_v2_defaultData = function defaultData() {
     loading: false,
     PDFJS: null,
     pageChangeByButton: false,
-    showPicker: false
+    showPicker: false,
+    // 进度范围：0~100
+    progress: 0,
+    // circle绑定值
+    circleProgress: 0
   };
 };
 
@@ -79645,7 +80065,8 @@ var pdf_viewer_v2_defaultData = function defaultData() {
       default: function _default() {
         return {};
       }
-    }
+    },
+    showProgress: Boolean
   },
   data: function data() {
     return pdf_viewer_v2_defaultData();
@@ -79821,6 +80242,14 @@ var pdf_viewer_v2_defaultData = function defaultData() {
           cMapUrl: this.cMapUrl,
           cMapPacked: true
         });
+
+        pdfLoadingTask.onProgress = function (progressData) {
+          // 返回的进度可能会超过100
+          _this4.progress = Math.min(100, Math.floor(progressData.loaded * 100 / progressData.total));
+
+          _this4.$emit('progress', _this4.progress);
+        };
+
         pdfLoadingTask.promise.then(function (pdfDoc) {
           if (pdfDoc && pdfViewerDom) {
             // 缓存pdf内容
@@ -79881,6 +80310,8 @@ var pdf_viewer_v2_defaultData = function defaultData() {
     }
   },
   render: function render(h) {
+    var _this5 = this;
+
     return h("div", {
       "class": pdf_viewer_v2_bem(),
       "ref": "pdfContainer"
@@ -79894,7 +80325,7 @@ var pdf_viewer_v2_defaultData = function defaultData() {
     }, [h(es_loading, {
       "directives": [{
         name: "show",
-        value: this.loading
+        value: !this.showProgress && this.loading
       }],
       "class": pdf_viewer_v2_bem('loading-icon')
     }), h("div", {
@@ -79904,7 +80335,21 @@ var pdf_viewer_v2_defaultData = function defaultData() {
       }],
       "ref": "pdfViewerContainer",
       "class": pdf_viewer_v2_bem("container")
-    })])]), this.totalPage ? h("div", {
+    })])]), this.showProgress && this.progress < 100 ? h("div", {
+      "class": pdf_viewer_v2_bem("loadding-circle")
+    }, [h(circle, {
+      "attrs": {
+        "rate": this.progress,
+        "speed": "100",
+        "text": this.progress + '%'
+      },
+      "model": {
+        value: _this5.circleProgress,
+        callback: function callback($$v) {
+          _this5.circleProgress = $$v;
+        }
+      }
+    })]) : "", this.totalPage ? h("div", {
       "class": pdf_viewer_v2_bem("page-box")
     }, [h("span", {
       "class": pdf_viewer_v2_bem("pre"),
@@ -80231,10 +80676,10 @@ var right = 'right';
 var esm_left = 'left';
 var auto = 'auto';
 var basePlacements = [esm_top, esm_bottom, right, esm_left];
-var start = 'start';
-var end = 'end';
+var esm_start = 'start';
+var esm_end = 'end';
 var placements = /*#__PURE__*/[].concat(basePlacements, [auto]).reduce(function (acc, placement) {
-  return acc.concat([placement, placement + "-" + start, placement + "-" + end]);
+  return acc.concat([placement, placement + "-" + esm_start, placement + "-" + esm_end]);
 }, []); // modifiers that need to read the DOM
 
 var beforeRead = 'beforeRead';
@@ -80487,11 +80932,11 @@ function computeOffsets(_ref) {
     var len = mainAxis === 'y' ? 'height' : 'width';
 
     switch (variation) {
-      case start:
+      case esm_start:
         offsets[mainAxis] = offsets[mainAxis] - (reference[len] / 2 - element[len] / 2);
         break;
 
-      case end:
+      case esm_end:
         offsets[mainAxis] = offsets[mainAxis] + (reference[len] / 2 - element[len] / 2);
         break;
     }
@@ -81582,7 +82027,7 @@ function getRateStatus(value, index, allowHalf) {
   return 'void';
 }
 
-/* harmony default export */ var rate = (rate_createComponent({
+/* harmony default export */ var es_rate = (rate_createComponent({
   mixins: [TouchMixin, FieldMixin],
   props: {
     size: [Number, String],
@@ -84757,7 +85202,9 @@ var uploader_createNamespace = Object(utils["b" /* createNamespace */])('uploade
               address: _this.watermarkOptions.address || "",
               watermarkTime: new Date(),
               humanName: _this.watermarkOptions.humanName || "",
-              projectName: _this.watermarkOptions.projectName || ""
+              projectName: _this.watermarkOptions.projectName || "",
+              logo: _this.watermarkOptions.logo || "",
+              applicationName: _this.watermarkOptions.applicationName || ""
             });
             var watermarkOptions = new WatermarkOptions({
               enabled: true,
@@ -85243,10 +85690,11 @@ var uploader_createNamespace = Object(utils["b" /* createNamespace */])('uploade
 
 
 
-var version = '1.0.19';
+
+var version = '1.0.21';
 
 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, pdf_viewer, pdf_viewer_v2, 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];
+  var components = [action_sheet, es_area, avatar, back_top, badge, es_button, calendar, cascader, cell, cell_group, es_checkbox, checkbox_group, circle, 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, pdf_viewer, pdf_viewer_v2, es_picker, popover, popup, pull_refresh, es_radio, radio_group, es_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];
   components.forEach(function (item) {
     if (item.install) {
       Vue.use(item);