xydata-tools 1.1.35 → 1.1.36

package/dist/components/uploadFile/index.js

@@ -1,10 +1,16 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["beforeUpload"];
 var _templateObject;
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,35 +24,37 @@ import { ConfigProvider, message, Upload, Image, FormItemProps, FormProps, Uploa
 import { useState } from 'react';
 import zhCN from 'antd/es/locale/zh_CN';
 import styled from 'styled-components';
+import { applyImageWatermark, isImageFile, normalizeWatermarkConfig, resolveWatermarkError, toUploadFile } from "../../utils/watermark.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var StyleBox = styled.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t.readonly {\n\t\t.ant-upload {\n\t\t\tdisplay: none;\n\t\t}\n\t}\n"])));
 
-/**
- * 附件上传组件
- * @preserve
- * @param  {Object} props 组件的属性
- * @param  {FormProps} props.form 表单实例
- * @param  {string} props.label 表单标签
- * @param  {string} props.name 表单字段
- * @param  {Array<Object>} props.rules 表单校验规则
- * @param  {string} props.accept 接受上传的文件类型
- * @param  {string} props.action 上传的地址, 默认为："/api/file/upload?type=openFile"
- * @param  {number} props.max 最大上传数量, 超过最大数量就会隐藏上传按钮
- * @param  {boolean} props.multiple 是否支持多选文件，开启后按住 ctrl 可选择多个文件
- * @param  {React.ReactNode} props.icon Button 或 Dragger 的图标
- * @param  {React.ReactNode} props.title Button 或 Dragger 的标题
- * @param  {React.ReactNode} props.description 当 listType 为 dragger 时的描述
- * @param  {string} props.listType 上传列表的内建样式, 可选值: text, picture, picture-card, dragger
- * @param  {Object|boolean} props.showUploadList 是否展示文件列表, 可设为一个对象，用于单独设定 showPreviewIcon, showRemoveIcon 等
- * @param  {boolean} props.readonly 是否只读
- * @param  {boolean} props.disabled 是否禁用
- * @param  {Object} props.checkFile 文件校验配置
- * @param  {Array<string>} [props.checkFile.suffixs] 限制的文件格式, 示例：["png", "jpg"]
- * @param  {number} [props.checkFile.maxSize] 限制的文件大小 (单位: KB), 示例：1024 表示限制 1MB
- * @param  {Function} props.onChange 上传文件改变时的回调
- * @param  {FormItemProps} props.formItemOptions 表单项配置
- * @param  {UploadProps} props.uploadOptions 上传配置
- * @param  {ButtonProps} props.buttonOptions 上传按钮的配置
+/**
+ * 附件上传组件
+ * @preserve
+ * @param  {Object} props 组件的属性
+ * @param  {FormProps} props.form 表单实例
+ * @param  {string} props.label 表单标签
+ * @param  {string} props.name 表单字段
+ * @param  {Array<Object>} props.rules 表单校验规则
+ * @param  {string} props.accept 接受上传的文件类型
+ * @param  {string} props.action 上传的地址, 默认为："/api/file/upload?type=openFile"
+ * @param  {number} props.max 最大上传数量, 超过最大数量就会隐藏上传按钮
+ * @param  {boolean} props.multiple 是否支持多选文件，开启后按住 ctrl 可选择多个文件
+ * @param  {React.ReactNode} props.icon Button 或 Dragger 的图标
+ * @param  {React.ReactNode} props.title Button 或 Dragger 的标题
+ * @param  {React.ReactNode} props.description 当 listType 为 dragger 时的描述
+ * @param  {string} props.listType 上传列表的内建样式, 可选值: text, picture, picture-card, dragger
+ * @param  {Object|boolean} props.showUploadList 是否展示文件列表, 可设为一个对象，用于单独设定 showPreviewIcon, showRemoveIcon 等
+ * @param  {boolean} props.readonly 是否只读
+ * @param  {boolean} props.disabled 是否禁用
+ * @param  {Object} props.checkFile 文件校验配置
+ * @param  {Array<string>} [props.checkFile.suffixs] 限制的文件格式, 示例：["png", "jpg"]
+ * @param  {number} [props.checkFile.maxSize] 限制的文件大小 (单位: KB), 示例：1024 表示限制 1MB
+ * @param  {Function} props.onChange 上传文件改变时的回调
+ * @param  {Object} props.watermark 图片/视频上传前水印配置
+ * @param  {FormItemProps} props.formItemOptions 表单项配置
+ * @param  {UploadProps} props.uploadOptions 上传配置
+ * @param  {ButtonProps} props.buttonOptions 上传按钮的配置
  */
 var UploadFile = function UploadFile(props) {
   var _useState = useState(false),
@@ -68,8 +76,11 @@ var UploadFile = function UploadFile(props) {
     _props$buttonOptions = props.buttonOptions,
     buttonOptions = _props$buttonOptions === void 0 ? {} : _props$buttonOptions,
     checkFile = props.checkFile,
+    watermark = props.watermark,
     onFileChange = props.onChange,
     form = props.form;
+  var userBeforeUpload = uploadOptions.beforeUpload,
+    restUploadOptions = _objectWithoutProperties(uploadOptions, _excluded);
   var formItemProps = _objectSpread({
     label: props.label || '',
     name: props.name || 'file',
@@ -91,8 +102,8 @@ var UploadFile = function UploadFile(props) {
       SID: SID,
       service: SERVICE_NAME || 'unknow'
     },
-    beforeUpload: function beforeUpload(e) {
-      return beforeUploadHandle(e);
+    beforeUpload: function beforeUpload(file, fileList) {
+      return beforeUploadHandle(file, fileList);
     },
     onPreview: function onPreview(file) {
       return handlePreview(file, props.name);
@@ -108,7 +119,7 @@ var UploadFile = function UploadFile(props) {
       }
     },
     maxCount: props.max
-  }, uploadOptions);
+  }, restUploadOptions);
 
   // 上传的组件类型
   var listType = uploadProps.listType ? uploadProps.listType : props.listType || 'text';
@@ -136,26 +147,135 @@ var UploadFile = function UploadFile(props) {
   };
 
   // 上传前校验
-  var beforeUploadHandle = function beforeUploadHandle(file) {
-    var _ref = checkFile || {},
-      suffixs = _ref.suffixs,
-      maxSize = _ref.maxSize;
-    if (suffixs) {
-      var _file$name;
-      var name = (_file$name = file.name) === null || _file$name === void 0 || (_file$name = _file$name.split('.')) === null || _file$name === void 0 ? void 0 : _file$name.splice(-1)[0];
-      if (!suffixs.includes(name.toLocaleLowerCase())) {
-        message.error("\u4E0D\u652F\u6301".concat(file.name, "\u8BE5\u79CD\u683C\u5F0F\u6587\u4EF6"));
-        return Upload.LIST_IGNORE;
-      }
-    }
-    if (maxSize > 0) {
-      if (file.size / 1024 > maxSize) {
-        message.error("\u8BF7\u9009\u62E9\u5C0F\u4E8E".concat(maxSize / 1024, "MB\u7684\u6587\u4EF6!"));
-        return Upload.LIST_IGNORE;
-      }
-    }
-    return Promise.resolve(file);
-  };
+  var beforeUploadHandle = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file, fileList) {
+      var _ref2, suffixs, maxSize, _file$name, name, targetFile, beforeUploadResult, normalizedWatermark, _targetFile, _targetFile2, _targetFile3, resultFile, processorResult, fallbackResult;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _ref2 = checkFile || {}, suffixs = _ref2.suffixs, maxSize = _ref2.maxSize;
+            if (!suffixs) {
+              _context.next = 6;
+              break;
+            }
+            name = (_file$name = file.name) === null || _file$name === void 0 || (_file$name = _file$name.split('.')) === null || _file$name === void 0 ? void 0 : _file$name.splice(-1)[0];
+            if (suffixs.includes(name.toLocaleLowerCase())) {
+              _context.next = 6;
+              break;
+            }
+            message.error("\u4E0D\u652F\u6301".concat(file.name, "\u8BE5\u79CD\u683C\u5F0F\u6587\u4EF6"));
+            return _context.abrupt("return", Upload.LIST_IGNORE);
+          case 6:
+            if (!(maxSize > 0)) {
+              _context.next = 10;
+              break;
+            }
+            if (!(file.size / 1024 > maxSize)) {
+              _context.next = 10;
+              break;
+            }
+            message.error("\u8BF7\u9009\u62E9\u5C0F\u4E8E".concat(maxSize / 1024, "MB\u7684\u6587\u4EF6!"));
+            return _context.abrupt("return", Upload.LIST_IGNORE);
+          case 10:
+            targetFile = file;
+            if (!(typeof userBeforeUpload === 'function')) {
+              _context.next = 18;
+              break;
+            }
+            _context.next = 14;
+            return userBeforeUpload(targetFile, fileList);
+          case 14:
+            beforeUploadResult = _context.sent;
+            if (!(beforeUploadResult === false || beforeUploadResult === Upload.LIST_IGNORE)) {
+              _context.next = 17;
+              break;
+            }
+            return _context.abrupt("return", beforeUploadResult);
+          case 17:
+            if (beforeUploadResult instanceof Blob) {
+              targetFile = toUploadFile(beforeUploadResult, targetFile);
+            }
+          case 18:
+            normalizedWatermark = normalizeWatermarkConfig(watermark);
+            if (watermark !== null && watermark !== void 0 && watermark.debug) {
+              console.log('[UploadFile watermark beforeUpload]', {
+                rawItems: watermark === null || watermark === void 0 ? void 0 : watermark.items,
+                normalizedItems: normalizedWatermark === null || normalizedWatermark === void 0 ? void 0 : normalizedWatermark.items,
+                file: {
+                  name: (_targetFile = targetFile) === null || _targetFile === void 0 ? void 0 : _targetFile.name,
+                  type: (_targetFile2 = targetFile) === null || _targetFile2 === void 0 ? void 0 : _targetFile2.type,
+                  size: (_targetFile3 = targetFile) === null || _targetFile3 === void 0 ? void 0 : _targetFile3.size
+                }
+              });
+            }
+            if (!(!normalizedWatermark || !isImageFile(targetFile))) {
+              _context.next = 22;
+              break;
+            }
+            return _context.abrupt("return", targetFile);
+          case 22:
+            setLoading(true);
+            _context.prev = 23;
+            if (!(typeof normalizedWatermark.processor === 'function')) {
+              _context.next = 31;
+              break;
+            }
+            _context.next = 27;
+            return normalizedWatermark.processor(targetFile, {
+              file: targetFile,
+              originFile: file,
+              fileList: fileList,
+              watermark: normalizedWatermark
+            });
+          case 27:
+            processorResult = _context.sent;
+            resultFile = processorResult instanceof Blob ? toUploadFile(processorResult, targetFile) : processorResult || targetFile;
+            _context.next = 34;
+            break;
+          case 31:
+            _context.next = 33;
+            return applyImageWatermark(targetFile, normalizedWatermark);
+          case 33:
+            resultFile = _context.sent;
+          case 34:
+            setLoading(false);
+            return _context.abrupt("return", resultFile);
+          case 38:
+            _context.prev = 38;
+            _context.t0 = _context["catch"](23);
+            setLoading(false);
+            _context.next = 43;
+            return resolveWatermarkError(_context.t0, {
+              file: targetFile,
+              originFile: file,
+              fileList: fileList,
+              watermark: normalizedWatermark
+            });
+          case 43:
+            fallbackResult = _context.sent;
+            if (!(fallbackResult === false)) {
+              _context.next = 46;
+              break;
+            }
+            return _context.abrupt("return", Upload.LIST_IGNORE);
+          case 46:
+            if (!(fallbackResult instanceof Blob)) {
+              _context.next = 48;
+              break;
+            }
+            return _context.abrupt("return", toUploadFile(fallbackResult, targetFile));
+          case 48:
+            return _context.abrupt("return", targetFile);
+          case 49:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[23, 38]]);
+    }));
+    return function beforeUploadHandle(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   // 获取当前预览下标
   var getCurrent = function getCurrent() {

package/dist/types/components/uploadFile/index.d.ts

@@ -22,6 +22,7 @@ export default UploadFile;
  * @param  {Array<string>} [props.checkFile.suffixs] 限制的文件格式, 示例：["png", "jpg"]
  * @param  {number} [props.checkFile.maxSize] 限制的文件大小 (单位: KB), 示例：1024 表示限制 1MB
  * @param  {Function} props.onChange 上传文件改变时的回调
+ * @param  {Object} props.watermark 图片/视频上传前水印配置
  * @param  {FormItemProps} props.formItemOptions 表单项配置
  * @param  {UploadProps} props.uploadOptions 上传配置
  * @param  {ButtonProps} props.buttonOptions 上传按钮的配置
@@ -47,6 +48,7 @@ declare function UploadFile(props: {
         maxSize?: number;
     };
     onChange: Function;
+    watermark: any;
     formItemOptions: FormItemProps;
     uploadOptions: UploadProps;
     buttonOptions: ButtonProps;

package/dist/types/utils/watermark.d.ts

@@ -0,0 +1,5 @@
+export function toUploadFile(blob: any, sourceFile: any, fileName: any): any;
+export function isImageFile(file: any): any;
+export function normalizeWatermarkConfig(watermark: any): any;
+export function applyImageWatermark(file: any, watermark: any): Promise<any>;
+export function resolveWatermarkError(error: any, context: any): Promise<any>;

package/dist/utils/watermark.js

@@ -0,0 +1,582 @@
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var DEFAULT_WATERMARK = {
+  enabled: true,
+  margin: 24,
+  items: []
+};
+var DEFAULT_WATERMARK_ITEM = {
+  type: 'text',
+  position: 'bottom-right',
+  mode: undefined,
+  fontSize: 24,
+  fontScale: undefined,
+  minFontSize: undefined,
+  maxFontSize: undefined,
+  spacing: undefined,
+  width: undefined,
+  height: undefined,
+  aspectRatio: undefined,
+  lockAspectRatio: true,
+  color: 'rgba(255,255,255,0.8)',
+  fontFamily: 'sans-serif',
+  opacity: 1,
+  rotate: 0
+};
+var IMAGE_EXTENSIONS = ['jpg', 'jpeg', 'png', 'webp', 'bmp', 'gif'];
+var getFileExtension = function getFileExtension(file) {
+  var name = (file === null || file === void 0 ? void 0 : file.name) || '';
+  var ext = name.split('.').pop();
+  return ext ? ext.toLowerCase() : '';
+};
+var createObjectUrl = function createObjectUrl(file) {
+  if (!window.URL || !window.URL.createObjectURL) {
+    throw new Error('当前浏览器不支持读取本地文件');
+  }
+  return window.URL.createObjectURL(file);
+};
+var revokeObjectUrl = function revokeObjectUrl(url) {
+  var _window$URL;
+  if (url && (_window$URL = window.URL) !== null && _window$URL !== void 0 && _window$URL.revokeObjectURL) {
+    window.URL.revokeObjectURL(url);
+  }
+};
+var blobToFile = function blobToFile(blob, sourceFile, fileName) {
+  var name = fileName || (blob === null || blob === void 0 ? void 0 : blob.name) || (sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.name) || "watermark_".concat(Date.now());
+  var options = {
+    type: blob.type || (sourceFile === null || sourceFile === void 0 ? void 0 : sourceFile.type) || '',
+    lastModified: Date.now()
+  };
+  if (typeof File === 'function') {
+    return new File([blob], name, options);
+  }
+  blob.name = name;
+  blob.lastModified = options.lastModified;
+  return blob;
+};
+export var toUploadFile = function toUploadFile(blob, sourceFile, fileName) {
+  return blobToFile(blob, sourceFile, fileName);
+};
+export var isImageFile = function isImageFile(file) {
+  var type = (file === null || file === void 0 ? void 0 : file.type) || '';
+  var ext = getFileExtension(file);
+  return type.startsWith('image/') || IMAGE_EXTENSIONS.includes(ext);
+};
+export var normalizeWatermarkConfig = function normalizeWatermarkConfig(watermark) {
+  if (!watermark || watermark.enabled === false) {
+    return null;
+  }
+  var items = Array.isArray(watermark.items) ? watermark.items : [];
+  var normalizedItems = items.filter(function (item) {
+    if (!item) {
+      return false;
+    }
+    if (item.type === 'image') {
+      return !!(item.src || item.url || item.imageUrl);
+    }
+    return typeof item.text !== 'undefined' && "".concat(item.text).trim();
+  }).map(function (item) {
+    return _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_WATERMARK_ITEM), item), {}, {
+      text: typeof item.text === 'undefined' ? '' : "".concat(item.text)
+    });
+  });
+  if (!normalizedItems.length) {
+    return null;
+  }
+  return _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_WATERMARK), watermark), {}, {
+    items: normalizedItems
+  });
+};
+var parseInsetCoordinate = function parseInsetCoordinate(value, base) {
+  var scale = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var isAdaptive = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+  if (value === undefined || value === null) {
+    return undefined;
+  }
+  if (typeof value === 'number') {
+    if (value > 0 && value < 1) {
+      return base * value;
+    }
+    if (isAdaptive) {
+      return value * scale;
+    }
+    return value;
+  }
+  if (typeof value === 'string') {
+    var cleanVal = value.trim();
+    if (!cleanVal) {
+      return undefined;
+    }
+    if (cleanVal.endsWith('!')) {
+      var numStr = cleanVal.slice(0, -1).trim();
+      if (numStr.endsWith('px')) {
+        numStr = numStr.slice(0, -2).trim();
+      }
+      var _num = parseFloat(numStr);
+      return Number.isFinite(_num) ? _num : undefined;
+    }
+    if (cleanVal.endsWith('%')) {
+      var _num2 = parseFloat(cleanVal.slice(0, -1));
+      return Number.isFinite(_num2) ? base * (_num2 / 100) : undefined;
+    }
+    if (cleanVal.endsWith('px')) {
+      var _num3 = parseFloat(cleanVal.slice(0, -2));
+      if (Number.isFinite(_num3)) {
+        return isAdaptive ? _num3 * scale : _num3;
+      }
+      return undefined;
+    }
+    var num = parseFloat(cleanVal);
+    if (Number.isFinite(num)) {
+      if (num > 0 && num < 1) {
+        return base * num;
+      }
+      return isAdaptive ? num * scale : num;
+    }
+  }
+  return undefined;
+};
+var isFullscreenWatermarkItem = function isFullscreenWatermarkItem(item) {
+  return (item === null || item === void 0 ? void 0 : item.mode) === 'fullscreen' || (item === null || item === void 0 ? void 0 : item.fullscreen) === true;
+};
+var isImageWatermarkItem = function isImageWatermarkItem(item) {
+  return (item === null || item === void 0 ? void 0 : item.type) === 'image';
+};
+var resolveSpacing = function resolveSpacing(canvas, item) {
+  var _ref, _item$spacing;
+  var shortSide = Math.min(canvas.width, canvas.height);
+  var scale = shortSide / 1000;
+  var rawSpacing = (_ref = (_item$spacing = item.spacing) !== null && _item$spacing !== void 0 ? _item$spacing : item.gap) !== null && _ref !== void 0 ? _ref : 160;
+  var spacing = parseInsetCoordinate(rawSpacing, shortSide, scale, item.adaptive === true);
+  return typeof spacing === 'number' && spacing >= 0 ? spacing : 160;
+};
+var resolveTextPosition = function resolveTextPosition(canvas, item, margin) {
+  var position = item.position || 'bottom-right';
+  var isAdaptive = item.adaptive === true;
+  var shortSide = Math.min(canvas.width, canvas.height);
+  var scale = shortSide / 1000;
+  if (_typeof(position) === 'object' && position !== null) {
+    var hasInsetPosition = ['left', 'right', 'top', 'bottom'].some(function (key) {
+      return position[key] !== undefined && position[key] !== null && "".concat(position[key]).trim() !== '';
+    });
+    if (hasInsetPosition) {
+      var right = parseInsetCoordinate(position.right, canvas.width, scale, isAdaptive);
+      var left = parseInsetCoordinate(position.left, canvas.width, scale, isAdaptive);
+      var bottom = parseInsetCoordinate(position.bottom, canvas.height, scale, isAdaptive);
+      var top = parseInsetCoordinate(position.top, canvas.height, scale, isAdaptive);
+      var _resolvedMargin = isAdaptive ? margin * scale : margin;
+      var x = typeof right === 'number' ? canvas.width - right : typeof left === 'number' ? left : _resolvedMargin;
+      var y = typeof bottom === 'number' ? canvas.height - bottom : typeof top === 'number' ? top : _resolvedMargin;
+      return {
+        x: x,
+        y: y,
+        textAlign: item.textAlign || (position.right !== undefined && position.right !== null && "".concat(position.right).trim() !== '' ? 'right' : 'left'),
+        textBaseline: item.textBaseline || (position.bottom !== undefined && position.bottom !== null && "".concat(position.bottom).trim() !== '' ? 'bottom' : 'top')
+      };
+    }
+    return {
+      x: parseInsetCoordinate(position.x, canvas.width, scale, isAdaptive) || 0,
+      y: parseInsetCoordinate(position.y, canvas.height, scale, isAdaptive) || 0,
+      textAlign: item.textAlign || 'left',
+      textBaseline: item.textBaseline || 'top'
+    };
+  }
+  var resolvedMargin = isAdaptive ? margin * scale : margin;
+  var positions = {
+    'top-left': {
+      x: resolvedMargin,
+      y: resolvedMargin,
+      textAlign: 'left',
+      textBaseline: 'top'
+    },
+    'top-right': {
+      x: canvas.width - resolvedMargin,
+      y: resolvedMargin,
+      textAlign: 'right',
+      textBaseline: 'top'
+    },
+    'bottom-left': {
+      x: resolvedMargin,
+      y: canvas.height - resolvedMargin,
+      textAlign: 'left',
+      textBaseline: 'bottom'
+    },
+    'bottom-right': {
+      x: canvas.width - resolvedMargin,
+      y: canvas.height - resolvedMargin,
+      textAlign: 'right',
+      textBaseline: 'bottom'
+    },
+    center: {
+      x: canvas.width / 2,
+      y: canvas.height / 2,
+      textAlign: 'center',
+      textBaseline: 'middle'
+    }
+  };
+  return positions[position] || positions['bottom-right'];
+};
+var loadWatermarkImage = function loadWatermarkImage(src) {
+  return new Promise(function (resolve, reject) {
+    var img = new window.Image();
+    if (!src.startsWith('blob:') && !src.startsWith('data:')) {
+      img.crossOrigin = 'anonymous';
+    }
+    img.onload = function () {
+      return resolve(img);
+    };
+    img.onerror = function () {
+      return reject(new Error('图片水印资源加载失败'));
+    };
+    img.src = src;
+  });
+};
+var resolveImageSize = function resolveImageSize(canvas, item, image) {
+  var shortSide = Math.min(canvas.width, canvas.height);
+  var scale = shortSide / 1000;
+  var naturalWidth = image.naturalWidth || image.width || 1;
+  var naturalHeight = image.naturalHeight || image.height || 1;
+  var configuredAspectRatio = Number(item.aspectRatio);
+  var aspectRatio = Number.isFinite(configuredAspectRatio) && configuredAspectRatio > 0 ? configuredAspectRatio : naturalWidth / naturalHeight;
+  var heightRatio = 1 / aspectRatio;
+  var width = parseInsetCoordinate(item.width, canvas.width, scale, item.adaptive === true);
+  var height = parseInsetCoordinate(item.height, canvas.height, scale, item.adaptive === true);
+  if (item.lockAspectRatio !== false) {
+    if (typeof width === 'number' && width > 0) {
+      return {
+        width: width,
+        height: width * heightRatio
+      };
+    }
+    if (typeof height === 'number' && height > 0) {
+      return {
+        width: height / heightRatio,
+        height: height
+      };
+    }
+  }
+  if (typeof width === 'number' && width > 0 && typeof height === 'number' && height > 0) {
+    return {
+      width: width,
+      height: height
+    };
+  }
+  if (typeof width === 'number' && width > 0) {
+    return {
+      width: width,
+      height: width * heightRatio
+    };
+  }
+  if (typeof height === 'number' && height > 0) {
+    return {
+      width: height / heightRatio,
+      height: height
+    };
+  }
+  var fallbackWidth = item.adaptive === true ? 160 * scale : 160;
+  return {
+    width: fallbackWidth,
+    height: fallbackWidth * heightRatio
+  };
+};
+var resolveBoxPosition = function resolveBoxPosition(canvas, item, margin, boxWidth, boxHeight) {
+  var position = item.position || 'bottom-right';
+  var isAdaptive = item.adaptive === true;
+  var shortSide = Math.min(canvas.width, canvas.height);
+  var scale = shortSide / 1000;
+  var resolvedMargin = isAdaptive ? margin * scale : margin;
+  if (_typeof(position) === 'object' && position !== null) {
+    var right = parseInsetCoordinate(position.right, canvas.width, scale, isAdaptive);
+    var left = parseInsetCoordinate(position.left, canvas.width, scale, isAdaptive);
+    var bottom = parseInsetCoordinate(position.bottom, canvas.height, scale, isAdaptive);
+    var top = parseInsetCoordinate(position.top, canvas.height, scale, isAdaptive);
+    var x = typeof right === 'number' ? canvas.width - right - boxWidth : typeof left === 'number' ? left : resolvedMargin;
+    var y = typeof bottom === 'number' ? canvas.height - bottom - boxHeight : typeof top === 'number' ? top : resolvedMargin;
+    return {
+      x: x,
+      y: y
+    };
+  }
+  var positions = {
+    'top-left': {
+      x: resolvedMargin,
+      y: resolvedMargin
+    },
+    'top-right': {
+      x: canvas.width - resolvedMargin - boxWidth,
+      y: resolvedMargin
+    },
+    'bottom-left': {
+      x: resolvedMargin,
+      y: canvas.height - resolvedMargin - boxHeight
+    },
+    'bottom-right': {
+      x: canvas.width - resolvedMargin - boxWidth,
+      y: canvas.height - resolvedMargin - boxHeight
+    },
+    center: {
+      x: (canvas.width - boxWidth) / 2,
+      y: (canvas.height - boxHeight) / 2
+    }
+  };
+  return positions[position] || positions['bottom-right'];
+};
+var clampNumber = function clampNumber(value, min, max) {
+  var result = value;
+  if (typeof min === 'number') {
+    result = Math.max(min, result);
+  }
+  if (typeof max === 'number') {
+    result = Math.min(max, result);
+  }
+  return result;
+};
+var resolveFontSize = function resolveFontSize(canvas, item) {
+  if (typeof item.fontScale === 'number' && item.fontScale > 0) {
+    var shortSide = Math.min(canvas.width, canvas.height);
+    var scaledSize = shortSide * item.fontScale;
+    var fallbackMin = typeof item.fontSize === 'number' ? item.fontSize : undefined;
+    return clampNumber(scaledSize, typeof item.minFontSize === 'number' ? item.minFontSize : fallbackMin, typeof item.maxFontSize === 'number' ? item.maxFontSize : undefined);
+  }
+  var baseFontSize = 24;
+  var isFixed = false;
+  if (typeof item.fontSize === 'number') {
+    baseFontSize = item.fontSize;
+  } else if (typeof item.fontSize === 'string') {
+    var cleanVal = item.fontSize.trim();
+    if (cleanVal.endsWith('!')) {
+      isFixed = true;
+      cleanVal = cleanVal.slice(0, -1).trim();
+    }
+    if (cleanVal.endsWith('px')) {
+      cleanVal = cleanVal.slice(0, -2).trim();
+    }
+    var parsed = parseFloat(cleanVal);
+    if (Number.isFinite(parsed)) {
+      baseFontSize = parsed;
+    }
+  }
+  if (item.adaptive === true && !isFixed) {
+    var _shortSide = Math.min(canvas.width, canvas.height);
+    var resolvedSize = baseFontSize * (_shortSide / 1000);
+    return resolvedSize > 0 ? resolvedSize : baseFontSize;
+  }
+  return baseFontSize;
+};
+var drawWatermarkItems = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ctx, canvas, watermark) {
+    var _iterator, _step, item, margin, fontSize, point, src, watermarkImage, size, box, spacing, textWidth, stepX, stepY, overflow, y, x;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _iterator = _createForOfIteratorHelper(watermark.items);
+          _context.prev = 1;
+          _iterator.s();
+        case 3:
+          if ((_step = _iterator.n()).done) {
+            _context.next = 29;
+            break;
+          }
+          item = _step.value;
+          margin = typeof item.margin === 'number' ? item.margin : watermark.margin;
+          fontSize = resolveFontSize(canvas, item);
+          point = resolveTextPosition(canvas, item, margin);
+          if (watermark.debug) {
+            console.log('[UploadFile watermark]', {
+              text: item.text,
+              type: item.type,
+              src: item.src || item.url || item.imageUrl,
+              mode: item.mode,
+              position: item.position,
+              margin: margin,
+              spacing: item.spacing,
+              width: item.width,
+              height: item.height,
+              fontSize: fontSize,
+              fontScale: item.fontScale,
+              minFontSize: item.minFontSize,
+              maxFontSize: item.maxFontSize,
+              canvas: {
+                width: canvas.width,
+                height: canvas.height
+              },
+              resolved: point
+            });
+          }
+          ctx.save();
+          ctx.globalAlpha = item.opacity;
+          if (!isImageWatermarkItem(item)) {
+            _context.next = 23;
+            break;
+          }
+          src = item.src || item.url || item.imageUrl;
+          _context.next = 15;
+          return loadWatermarkImage(src);
+        case 15:
+          watermarkImage = _context.sent;
+          size = resolveImageSize(canvas, item, watermarkImage);
+          box = resolveBoxPosition(canvas, item, margin, size.width, size.height);
+          ctx.translate(box.x + size.width / 2, box.y + size.height / 2);
+          ctx.rotate((item.rotate || 0) * Math.PI / 180);
+          ctx.drawImage(watermarkImage, -size.width / 2, -size.height / 2, size.width, size.height);
+          ctx.restore();
+          return _context.abrupt("continue", 27);
+        case 23:
+          ctx.font = "".concat(fontSize, "px ").concat(item.fontFamily);
+          ctx.fillStyle = item.color;
+          if (isFullscreenWatermarkItem(item)) {
+            spacing = resolveSpacing(canvas, item);
+            textWidth = ctx.measureText(item.text).width;
+            stepX = Math.max(textWidth + spacing, fontSize * 4);
+            stepY = Math.max(fontSize + spacing, fontSize * 3);
+            overflow = Math.max(canvas.width, canvas.height);
+            ctx.textAlign = 'center';
+            ctx.textBaseline = 'middle';
+            for (y = -overflow; y <= canvas.height + overflow; y += stepY) {
+              for (x = -overflow; x <= canvas.width + overflow; x += stepX) {
+                ctx.save();
+                ctx.translate(x, y);
+                ctx.rotate((item.rotate || 0) * Math.PI / 180);
+                ctx.fillText(item.text, 0, 0);
+                ctx.restore();
+              }
+            }
+          } else {
+            ctx.textAlign = point.textAlign;
+            ctx.textBaseline = point.textBaseline;
+            ctx.translate(point.x, point.y);
+            ctx.rotate((item.rotate || 0) * Math.PI / 180);
+            ctx.fillText(item.text, 0, 0);
+          }
+          ctx.restore();
+        case 27:
+          _context.next = 3;
+          break;
+        case 29:
+          _context.next = 34;
+          break;
+        case 31:
+          _context.prev = 31;
+          _context.t0 = _context["catch"](1);
+          _iterator.e(_context.t0);
+        case 34:
+          _context.prev = 34;
+          _iterator.f();
+          return _context.finish(34);
+        case 37:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[1, 31, 34, 37]]);
+  }));
+  return function drawWatermarkItems(_x, _x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var canvasToBlob = function canvasToBlob(canvas, type) {
+  var quality = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0.92;
+  return new Promise(function (resolve, reject) {
+    if (!canvas.toBlob) {
+      reject(new Error('当前浏览器不支持 Canvas 文件导出'));
+      return;
+    }
+    canvas.toBlob(function (blob) {
+      if (blob) {
+        resolve(blob);
+      } else {
+        reject(new Error('水印图片生成失败'));
+      }
+    }, type, quality);
+  });
+};
+export var applyImageWatermark = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, watermark) {
+    var url, image, canvas, ctx, outputType, blob;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          url = createObjectUrl(file);
+          _context2.prev = 1;
+          _context2.next = 4;
+          return new Promise(function (resolve, reject) {
+            var img = new window.Image();
+            img.onload = function () {
+              return resolve(img);
+            };
+            img.onerror = function () {
+              return reject(new Error('图片加载失败，无法添加水印'));
+            };
+            img.src = url;
+          });
+        case 4:
+          image = _context2.sent;
+          canvas = document.createElement('canvas');
+          canvas.width = image.naturalWidth || image.width;
+          canvas.height = image.naturalHeight || image.height;
+          ctx = canvas.getContext('2d');
+          if (ctx) {
+            _context2.next = 11;
+            break;
+          }
+          throw new Error('当前浏览器不支持 Canvas 绘制');
+        case 11:
+          ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+          _context2.next = 14;
+          return drawWatermarkItems(ctx, canvas, watermark);
+        case 14:
+          outputType = file.type && file.type !== 'image/svg+xml' ? file.type : 'image/png';
+          _context2.next = 17;
+          return canvasToBlob(canvas, outputType);
+        case 17:
+          blob = _context2.sent;
+          return _context2.abrupt("return", blobToFile(blob, file, file.name));
+        case 19:
+          _context2.prev = 19;
+          revokeObjectUrl(url);
+          return _context2.finish(19);
+        case 22:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[1,, 19, 22]]);
+  }));
+  return function applyImageWatermark(_x4, _x5) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+export var resolveWatermarkError = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(error, context) {
+    var _context$watermark;
+    var handler;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          console.error('[UploadFile watermark error]', error);
+          handler = context === null || context === void 0 || (_context$watermark = context.watermark) === null || _context$watermark === void 0 ? void 0 : _context$watermark.onWatermarkError;
+          if (!(typeof handler !== 'function')) {
+            _context3.next = 4;
+            break;
+          }
+          return _context3.abrupt("return", true);
+        case 4:
+          return _context3.abrupt("return", handler(error, context));
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return function resolveWatermarkError(_x6, _x7) {
+    return _ref4.apply(this, arguments);
+  };
+}();

package/package.json

@@ -1,69 +1,69 @@
-{
-	"name": "xydata-tools",
-	"version": "1.1.35",
-	"description": "xydata tools",
-	"main": "dist/index.js",
-	"module": "dist/index.js",
-	"types": "dist/types/index.d.ts",
-	"repository": {
-		"type": "git",
-		"url": "https://172.16.1.252/wuxiaohu/xydata-tools.git"
-	},
-	"homepage": "https://172.16.1.252/wuxiaohu/xydata-tools",
-	"scripts": {
-		"dev": "father dev",
-		"build": "father build",
-		"generate-types": "tsc --emitDeclarationOnly --project tsconfig.json",
-		"prepublishOnly": "npm run build && npm run generate-types"
-	},
-	"keywords": [],
-	"authors": [],
-	"license": "MIT",
-	"sideEffects": [
-		"*.css",
-		"*.less"
-	],
-	"files": [
-		"/dist"
-	],
-	"publishConfig": {
-		"access": "public"
-	},
-	"peerDependencies": {
-		"@ant-design/icons": "^4.5.0",
-		"@ant-design/pro-form": "^1.69.4",
-		"@ant-design/pro-table": "^2.80.8",
-		"antd": "^4.24.16",
-		"moment": "^2.30.1",
-		"react": "^17.0.0",
-		"react-dom": "^17.0.0",
-		"umi": "^3.5.20"
-	},
-	"devDependencies": {
-		"@ant-design/icons": "^4.5.0",
-		"@ant-design/pro-form": "^1.69.4",
-		"@ant-design/pro-table": "^2.80.8",
-		"@babel/core": "7.24.9",
-		"@babel/preset-env": "7.24.8",
-		"@babel/preset-react": "7.24.7",
-		"@vitejs/plugin-vue2": "2.3.1",
-		"antd": "^4.24.16",
-		"cross-env": "^10.1.0",
-		"dva": "^2.6.0-beta.23",
-		"father": "4.1.5",
-		"moment": "^2.30.1",
-		"react": "^17.0.0",
-		"react-dom": "^17.0.0",
-		"terser": "5.31.3",
-		"umi": "^3.5.20",
-		"vue": "2.7.16",
-		"vue-loader": "15.11.1",
-		"vue-template-compiler": "2.7.16"
-	},
-	"dependencies": {
-		"@zhengxs/js.tree": "0.5.0",
-		"querystring": "0.2.1",
-		"react-json-view": "^1.21.3",
-		"styled-components": "4.4.1"
-	}
-}
+{
+	"name": "xydata-tools",
+	"version": "1.1.36",
+	"description": "xydata tools",
+	"main": "dist/index.js",
+	"module": "dist/index.js",
+	"types": "dist/types/index.d.ts",
+	"repository": {
+		"type": "git",
+		"url": "https://172.16.1.252/wuxiaohu/xydata-tools.git"
+	},
+	"homepage": "https://172.16.1.252/wuxiaohu/xydata-tools",
+	"scripts": {
+		"dev": "father dev",
+		"build": "father build",
+		"generate-types": "tsc --emitDeclarationOnly --project tsconfig.json",
+		"prepublishOnly": "npm run build && npm run generate-types"
+	},
+	"keywords": [],
+	"authors": [],
+	"license": "MIT",
+	"sideEffects": [
+		"*.css",
+		"*.less"
+	],
+	"files": [
+		"/dist"
+	],
+	"publishConfig": {
+		"access": "public"
+	},
+	"peerDependencies": {
+		"@ant-design/icons": "^4.5.0",
+		"@ant-design/pro-form": "^1.69.4",
+		"@ant-design/pro-table": "^2.80.8",
+		"antd": "^4.24.16",
+		"moment": "^2.30.1",
+		"react": "^17.0.0",
+		"react-dom": "^17.0.0",
+		"umi": "^3.5.20"
+	},
+	"devDependencies": {
+		"@ant-design/icons": "^4.5.0",
+		"@ant-design/pro-form": "^1.69.4",
+		"@ant-design/pro-table": "^2.80.8",
+		"@babel/core": "7.24.9",
+		"@babel/preset-env": "7.24.8",
+		"@babel/preset-react": "7.24.7",
+		"@vitejs/plugin-vue2": "2.3.1",
+		"antd": "^4.24.16",
+		"cross-env": "^10.1.0",
+		"dva": "^2.6.0-beta.23",
+		"father": "4.1.5",
+		"moment": "^2.30.1",
+		"react": "^17.0.0",
+		"react-dom": "^17.0.0",
+		"terser": "5.31.3",
+		"umi": "^3.5.20",
+		"vue": "2.7.16",
+		"vue-loader": "15.11.1",
+		"vue-template-compiler": "2.7.16"
+	},
+	"dependencies": {
+		"@zhengxs/js.tree": "0.5.0",
+		"querystring": "0.2.1",
+		"react-json-view": "^1.21.3",
+		"styled-components": "4.4.1"
+	}
+}