ds-web-all 1.0.1-beta.94 → 1.0.1-beta.96

package/lib/components/button/upload.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("antd/es/spin/style");
+var _spin = _interopRequireDefault(require("antd/es/spin"));
 require("antd/es/upload/style");
 var _upload = _interopRequireDefault(require("antd/es/upload"));
 require("antd/es/button/style");
@@ -15,7 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _fileRequest = _interopRequireDefault(require("../../common/fileRequest"));
 require("./index.less");
 var _Confirm = _interopRequireDefault(require("../Confirm"));
-var _excluded = ["onFinish", "listType", "multiple", "accept", "value", "text", "buttonProps", "requestUrl", "confirmProps", "onError", "requestTimeout", "defaultErrorMsg"];
+var _reactDom = require("react-dom");
+var _excluded = ["onFinish", "listType", "multiple", "accept", "value", "text", "buttonProps", "requestUrl", "confirmProps", "onError", "requestTimeout", "defaultErrorMsg", "fullLoading", "fullLoadTip"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -53,6 +56,9 @@ var BaseUpload = function BaseUpload(_ref) {
     requestTimeout = _ref$requestTimeout === void 0 ? 30000 : _ref$requestTimeout,
     _ref$defaultErrorMsg = _ref.defaultErrorMsg,
     defaultErrorMsg = _ref$defaultErrorMsg === void 0 ? '上传失败' : _ref$defaultErrorMsg,
+    _ref$fullLoading = _ref.fullLoading,
+    fullLoading = _ref$fullLoading === void 0 ? false : _ref$fullLoading,
+    fullLoadTip = _ref.fullLoadTip,
     props = _objectWithoutProperties(_ref, _excluded);
   var headers = {
     Authorization: window.token
@@ -106,13 +112,16 @@ var BaseUpload = function BaseUpload(_ref) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            console.log(222);
             setLoading(true);
             formData = new FormData();
             uploadFiles.forEach(function (file) {
               formData.append("file", file);
+              formData.append("file", file);
             });
-            _context.prev = 3;
-            _context.next = 6;
+            console.log(formData);
+            _context.prev = 5;
+            _context.next = 8;
             return (0, _fileRequest.default)(requestUrl, {
               method: 'POST',
               headers: {
@@ -121,33 +130,42 @@ var BaseUpload = function BaseUpload(_ref) {
               data: formData,
               timeout: requestTimeout
             });
-          case 6:
+          case 8:
             res = _context.sent;
             onFinish(res);
-            _context.next = 16;
+            _context.next = 18;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](3);
+          case 12:
+            _context.prev = 12;
+            _context.t0 = _context["catch"](5);
             errorMessage = (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$response = _context.t0.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : _error$response$data.message) || (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || defaultErrorMsg;
             _message2.default.error(errorMessage);
             onError === null || onError === void 0 ? void 0 : onError(_context.t0);
             console.error('Upload error:', _context.t0);
-          case 16:
-            _context.prev = 16;
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(16);
-          case 19:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[3, 10, 16, 19]]);
+      }, _callee, null, [[5, 12, 18, 21]]);
     }));
     return function customRequest() {
       return _ref2.apply(this, arguments);
     };
   }();
   var beforeUpload = function beforeUpload(file, FileList) {
+    var reg = new RegExp("(".concat(_accept.split(',').map(function (el) {
+      return el.replace(/^\./, '\\.');
+    }).join('|'), ")$"));
+    if (!reg.test(file.name || '')) {
+      _message2.default.error("\u4EC5\u652F\u6301".concat(_accept.split(',').map(function (el) {
+        return el.replace(/^\./, '');
+      }).join('、'), "\u683C\u5F0F\u6587\u4EF6"));
+      return false;
+    }
     setUploadFiles(FileList);
     return false;
   };
@@ -164,7 +182,7 @@ var BaseUpload = function BaseUpload(_ref) {
       customRequest();
     }
   }, [uploadFiles]);
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "upload-container",
     "data-disabled": !!confirmProps,
     onClick: onClick
@@ -172,6 +190,17 @@ var BaseUpload = function BaseUpload(_ref) {
     loading: loading
   }, buttonProps, {
     ref: btnRef
-  }), text)));
+  }), text))), fullLoading && loading && /*#__PURE__*/(0, _reactDom.createPortal)(/*#__PURE__*/_react.default.createElement("div", {
+    className: "ant-modal-mask",
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      backgroundColor: 'rgba(255,255,255,0.45)'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_spin.default, {
+    spinning: true,
+    tip: fullLoadTip
+  })), document.body));
 };
 var _default = exports.default = BaseUpload;

package/lib/components/compose-form/mod/uploadFile/index.js

@@ -177,37 +177,50 @@ var uploadFIle = function uploadFIle(_ref) {
   };
   var beforeUpload = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
-      var size, type, fileDuration;
+      var reg, errMsg, size, type, fileDuration;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            reg = new RegExp("(".concat(_accept.split(',').map(function (el) {
+              return el.replace(/^\./, '\\.');
+            }).join('|'), ")$"));
+            if (reg.test(file.name || '')) {
+              _context.next = 5;
+              break;
+            }
+            errMsg = "\u4EC5\u652F\u6301".concat(_accept.split(',').map(function (el) {
+              return el.replace(/^\./, '');
+            }).join('、'), "\u683C\u5F0F\u6587\u4EF6");
+            _message2.default.error(errMsg);
+            throw new Error(errMsg);
+          case 5:
             size = file.size, type = file.type;
             if (!(size > maxSize * 1024 * 1024)) {
-              _context.next = 4;
+              _context.next = 9;
               break;
             }
             _message2.default.error("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u5F97\u8D85\u8FC7".concat(maxSize, "M"));
             throw new Error("\u4E0A\u4F20\u6587\u4EF6\u4E0D\u5F97\u8D85\u8FC7".concat(maxSize, "M"));
-          case 4:
+          case 9:
             if (maxCount * 1 === 1) {
               setGroupId(0);
             }
             if (!/^video\//.test(type)) {
-              _context.next = 12;
+              _context.next = 17;
               break;
             }
-            _context.next = 8;
+            _context.next = 13;
             return (0, _util.getVideoDuration)(file);
-          case 8:
+          case 13:
             fileDuration = _context.sent;
             setDuration(fileDuration);
-            _context.next = 13;
+            _context.next = 18;
             break;
-          case 12:
+          case 17:
             setDuration(0);
-          case 13:
+          case 18:
             return _context.abrupt("return", file);
-          case 14:
+          case 19:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "ds-web-all",
-  "version": "1.0.1-beta.94",
+  "version": "1.0.1-beta.96",
   "scripts": {
     "start": "cross-env BUILD_ENV=dev && dumi dev",
     "docs:build": "cross-env BUILD_ENV=production && dumi build",