@ccs-ui/rc-pro 1.2.1-beta-4 → 1.2.1-beta-5

package/es/dialog/DialogSelfOkButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "onOk" | "extraBtn"> & {
+declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onOk" | "onCancel" | "extraBtn"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/result/index.js

@@ -19,7 +19,9 @@ function Basic(_ref) {
     token = _theme$useToken.token;
   return /*#__PURE__*/_jsxs("div", {
     style: _objectSpread({
-      textAlign: 'center',
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
       padding: 16
     }, style),
     children: [/*#__PURE__*/_jsx("img", {

package/es/upload/index.d.ts

@@ -1,12 +1,13 @@
 import { UploadProps } from 'antd';
+import { RecordType } from '../ccs';
 import { ImageUpload } from './upload-image';
 export type CcsUploadProps = Pick<UploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'action' | 'name' | 'headers'> & {
-    tokenKey?: string;
     maxFileSize?: number;
     uploadText?: string;
     onChange?: (value: any) => void;
+    uploadRequest: <T = any>(file: File, options?: RecordType) => Promise<T>;
 };
-declare function CcsUpload({ tokenKey, uploadText, maxCount, maxFileSize, onChange, ...otherProps }: CcsUploadProps): import("react/jsx-runtime").JSX.Element;
+declare function CcsUpload({ uploadText, maxCount, maxFileSize, uploadRequest, onChange, ...otherProps }: CcsUploadProps): import("react/jsx-runtime").JSX.Element;
 declare namespace CcsUpload {
     var Image: typeof ImageUpload;
 }

package/es/upload/index.js

@@ -1,10 +1,13 @@
 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 = ["tokenKey", "uploadText", "maxCount", "maxFileSize", "onChange"];
+var _excluded = ["uploadText", "maxCount", "maxFileSize", "uploadRequest", "onChange"];
 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 _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 _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); }
@@ -19,12 +22,12 @@ import { useState } from 'react';
 import { ImageUpload } from "./upload-image";
 import { jsx as _jsx } from "react/jsx-runtime";
 function CcsUpload(_ref) {
-  var tokenKey = _ref.tokenKey,
-    uploadText = _ref.uploadText,
+  var uploadText = _ref.uploadText,
     _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 1 : _ref$maxCount,
     _ref$maxFileSize = _ref.maxFileSize,
     maxFileSize = _ref$maxFileSize === void 0 ? 10 : _ref$maxFileSize,
+    uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState([]),
@@ -33,8 +36,14 @@ function CcsUpload(_ref) {
     setFiles = _useState2[1];
   var handleOnChange = function handleOnChange(_ref2) {
     var fileList = _ref2.fileList;
+    console.log('fileList', fileList);
     setFiles(fileList);
     if (!onChange) return;
+
+    // 文件上传中，不更新结果
+    if (fileList.find(function (f) {
+      return f.status === 'uploading';
+    })) return;
     if (maxFileSize === 1) {
       var _fileList$;
       // 只能上传一个文件
@@ -58,13 +67,42 @@ function CcsUpload(_ref) {
     }
     return isLt2M;
   };
-  var uploadProps = {
-    name: 'fileName',
-    headers: {
-      token: tokenKey ? sessionStorage.getItem(tokenKey) : ''
-    }
-  };
-  return /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread(_objectSpread({}, uploadProps), {}, {
+  var onCustomRequest = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+      var file, onSuccess, onError, result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            file = _ref3.file, onSuccess = _ref3.onSuccess, onError = _ref3.onError;
+            _context.next = 3;
+            return uploadRequest(file);
+          case 3:
+            result = _context.sent;
+            // 上传成功
+            if (result.success && onSuccess) {
+              onSuccess(result);
+            }
+            // 上传失败
+            if (!result.success && onError) {
+              onError({
+                status: 500,
+                name: '出错了',
+                message: result.msg || '上传失败'
+              });
+            }
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onCustomRequest(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread({
+    customRequest: onCustomRequest,
+    name: "fileName",
     onChange: handleOnChange,
     beforeUpload: beforeUpload,
     fileList: files,

package/es/upload/upload-image.d.ts

@@ -3,5 +3,5 @@ type CcsImageUploadProps = CcsUploadProps & {
     crop?: boolean;
     tokenKey?: string;
 };
-export declare function ImageUpload({ crop, tokenKey, uploadText, maxCount, maxFileSize, onChange, ...otherProps }: CcsImageUploadProps): import("react/jsx-runtime").JSX.Element;
+export declare function ImageUpload({ uploadText, maxCount, maxFileSize, crop, uploadRequest, onChange, ...otherProps }: CcsImageUploadProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/upload/upload-image.js

@@ -1,5 +1,5 @@
 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 = ["crop", "tokenKey", "uploadText", "maxCount", "maxFileSize", "onChange"];
+var _excluded = ["uploadText", "maxCount", "maxFileSize", "crop", "uploadRequest", "onChange"];
 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; }
@@ -17,7 +17,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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; }
 import { PlusOutlined } from '@ant-design/icons';
-import { Upload, message } from 'antd';
+import { message, Upload } from 'antd';
 import ImgCrop from 'antd-img-crop';
 import { useState } from 'react';
 import CcsDialog from "../dialog";
@@ -37,13 +37,13 @@ var getBase64 = function getBase64(file) {
   });
 };
 export function ImageUpload(_ref) {
-  var crop = _ref.crop,
-    tokenKey = _ref.tokenKey,
-    uploadText = _ref.uploadText,
+  var uploadText = _ref.uploadText,
     _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 1 : _ref$maxCount,
     _ref$maxFileSize = _ref.maxFileSize,
     maxFileSize = _ref$maxFileSize === void 0 ? 10 : _ref$maxFileSize,
+    crop = _ref.crop,
+    uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState([]),
@@ -51,14 +51,19 @@ export function ImageUpload(_ref) {
     files = _useState2[0],
     setFiles = _useState2[1];
   var _CcsDialog$useDialog = CcsDialog.useDialog(),
-    openModal = _CcsDialog$useDialog.openModal,
-    contextHolder = _CcsDialog$useDialog.contextHolder;
+    contextHolder = _CcsDialog$useDialog.contextHolder,
+    openModal = _CcsDialog$useDialog.openModal;
   var handleOnChange = function handleOnChange(_ref2) {
     var fileList = _ref2.fileList;
     setFiles(fileList.filter(function (f) {
       return f.status;
     }));
     if (!onChange) return;
+
+    // 文件上传中，不更新结果
+    if (fileList.find(function (f) {
+      return f.status === 'uploading';
+    })) return;
     if (maxCount === 1) {
       var _fileList$;
       // 只能上传一个文件
@@ -117,13 +122,42 @@ export function ImageUpload(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  var uploadProps = {
-    name: 'fileName',
-    headers: {
-      token: tokenKey ? sessionStorage.getItem(tokenKey) : ''
-    }
-  };
-  var renderUpload = /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread(_objectSpread({}, uploadProps), {}, {
+  var onCustomRequest = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
+      var file, onSuccess, onError, result;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            file = _ref4.file, onSuccess = _ref4.onSuccess, onError = _ref4.onError;
+            _context2.next = 3;
+            return uploadRequest(file);
+          case 3:
+            result = _context2.sent;
+            // 上传成功
+            if (result.success && onSuccess) {
+              onSuccess(result);
+            }
+            // 上传失败
+            if (!result.success && onError) {
+              onError({
+                status: 500,
+                name: '出错了',
+                message: result.msg || '上传失败'
+              });
+            }
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onCustomRequest(_x2) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var renderUpload = /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread({
+    customRequest: onCustomRequest,
+    name: "fileName",
     onChange: handleOnChange,
     beforeUpload: beforeUpload,
     fileList: files,
@@ -141,10 +175,10 @@ export function ImageUpload(_ref) {
     })
   }));
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [crop ? /*#__PURE__*/_jsx(ImgCrop, {
+    children: [contextHolder, crop ? /*#__PURE__*/_jsx(ImgCrop, {
       minZoom: 0.5,
       rotationSlider: true,
       children: renderUpload
-    }) : renderUpload, contextHolder]
+    }) : renderUpload]
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.2.1-beta-4",
+  "version": "1.2.1-beta-5",
   "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;CcsDialog不适应contextHolder也能打开;移除utils,独立存在@ccs-ui/utils;添加属性isEnableToolbar;table可以隐藏toolbar; CcsDialog 添加异步关闭确认方法;",
   "license": "MIT",
   "author": {
@@ -93,7 +93,7 @@
     "@types/shortid": "^0.0.29",
     "@umijs/lint": "^4.0.0",
     "ahooks": "^3.7.7",
-    "antd": "^5.19.2",
+    "antd": "^5.20.0",
     "classnames": "^2.3.2",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.7",
@@ -120,7 +120,7 @@
     "@ant-design/icons": "^5.1.4",
     "@ccs-ui/utils": "^0.0.2",
     "ahooks": "^3.7.7",
-    "antd": "^5.19.2",
+    "antd": "^5.20.0",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.7",
     "rc-menu": "^9.15.1",