iglooform 2.4.9 → 2.4.13

package/lib/upload/index.js

@@ -37,15 +37,17 @@ var _locale = require("../locale");
 
 var _media = _interopRequireDefault(require("../upload-preview/media"));
 
-var _excluded = ["className", "placeholder", "handleUpload", "value", "onChange", "limit", "limitErrorMessage", "containerRef", "setFieldError", "descriptions", "validateField"];
+var _formContext = _interopRequireDefault(require("../form-context"));
+
+var _excluded = ["value", "limit", "limitErrorMessage", "descriptions", "onChange", "bizKey", "handleUpload", "setFieldError", "className", "validateField", "containerRef", "placeholder"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -57,10 +59,6 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-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."); }
@@ -73,31 +71,79 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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 _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; }
 
 var Dragger = _upload.default.Dragger;
 
-var IglooUpload = function IglooUpload(_ref) {
-  var className = _ref.className,
-      placeholder = _ref.placeholder,
-      handleUpload = _ref.handleUpload,
-      _ref$value = _ref.value,
-      value = _ref$value === void 0 ? [] : _ref$value,
-      onChange = _ref.onChange,
-      limit = _ref.limit,
-      limitErrorMessage = _ref.limitErrorMessage,
-      containerRef = _ref.containerRef,
-      setFieldError = _ref.setFieldError,
-      descriptions = _ref.descriptions,
-      validateField = _ref.validateField,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
+var IglooUpload = function IglooUpload(props) {
   var limitNumError = (0, _react.useRef)();
   var DomRef = (0, _react.useRef)();
   var dataUrlRef = (0, _react.useRef)([]);
 
+  var _useContext = (0, _react.useContext)(_formContext.default),
+      uploadApi = _useContext.uploadApi;
+
+  (0, _invariant.default)(typeof props.handleUpload === 'function' || uploadApi, '"handleUpload" should be a function. Or uploadApi should be set at Form/FreeForm');
+  (0, _invariant.default)(!uploadApi || props.bizKey, '"bizKey" should be set if Upload is used with uploadApi');
+
+  var _props$value = props.value,
+      value = _props$value === void 0 ? [] : _props$value,
+      limit = props.limit,
+      limitErrorMessage = props.limitErrorMessage,
+      descriptions = props.descriptions,
+      onChange = props.onChange,
+      bizKey = props.bizKey,
+      _props$handleUpload = props.handleUpload,
+      handleUpload = _props$handleUpload === void 0 ? /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(file) {
+      var formData, response, rst;
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              formData = new FormData();
+              formData.append('file', file);
+              formData.append('biz_key', bizKey);
+              _context.next = 5;
+              return fetch(uploadApi, {
+                method: 'post',
+                body: formData
+              });
+
+            case 5:
+              response = _context.sent;
+              _context.next = 8;
+              return response.json();
+
+            case 8:
+              rst = _context.sent;
+              return _context.abrupt("return", rst.url);
+
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }() : _props$handleUpload,
+      setFieldError = props.setFieldError,
+      className = props.className,
+      validateField = props.validateField,
+      containerRef = props.containerRef,
+      placeholder = props.placeholder,
+      rest = _objectWithoutProperties(props, _excluded);
+
   var _useState = (0, _react.useState)(value.map(function (url, index) {
     return {
       url: url,
@@ -119,7 +165,7 @@ var IglooUpload = function IglooUpload(_ref) {
         return;
       }
 
-      if (!DomRef.current.contains(e.target) && limitNumError.current) {
+      if (DomRef.current && !DomRef.current.contains(e.target) && limitNumError.current) {
         validateField && validateField();
         limitNumError.current = undefined;
       }
@@ -137,8 +183,8 @@ var IglooUpload = function IglooUpload(_ref) {
     }
   });
 
-  var _useContext = (0, _react.useContext)(_locale.LocaleContext),
-      formatMessage = _useContext.formatMessage;
+  var _useContext2 = (0, _react.useContext)(_locale.LocaleContext),
+      formatMessage = _useContext2.formatMessage;
 
   (0, _react.useEffect)(function () {
     return function () {
@@ -147,22 +193,21 @@ var IglooUpload = function IglooUpload(_ref) {
       });
     };
   }, []);
-  (0, _invariant.default)(typeof handleUpload === 'function', '"handleUpload" should be a function.');
   (0, _invariant.default)(limit === undefined || limit > 0, "\"limit\" should be a pasitive number.");
 
   var onUpload = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(file) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
       var dataUrl, name, size, type, uid, errorMsg;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               dataUrl = URL.createObjectURL(file);
               dataUrlRef.current.push(dataUrl);
               name = file.name, size = file.size, type = file.type, uid = file.uid;
 
               if (!(limit && files.length >= limit)) {
-                _context.next = 8;
+                _context2.next = 8;
                 break;
               }
 
@@ -174,7 +219,7 @@ var IglooUpload = function IglooUpload(_ref) {
               });
               limitNumError.current = errorMsg;
               setFieldError && setFieldError(errorMsg);
-              return _context.abrupt("return", Promise.reject(errorMsg));
+              return _context2.abrupt("return", Promise.reject(errorMsg));
 
             case 8:
               limitNumError.current = undefined;
@@ -190,7 +235,7 @@ var IglooUpload = function IglooUpload(_ref) {
                 }]);
               }); // 符合文件个数限制之后 上传时的错误处理
 
-              return _context.abrupt("return", handleUploadPromise(file, function (url) {
+              return _context2.abrupt("return", handleUploadPromise(file, function (url) {
                 var urls = [];
                 setFiles(function (files) {
                   return files.map(function (f) {
@@ -254,64 +299,64 @@ var IglooUpload = function IglooUpload(_ref) {
 
             case 11:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
-    return function onUpload(_x) {
+    return function onUpload(_x2) {
       return _ref2.apply(this, arguments);
     };
   }();
 
   var handleUploadPromise = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file, onSuccess, onFailed) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(file, onSuccess, onFailed) {
       var rst, errorMsg;
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.prev = 0;
-              _context2.next = 3;
+              _context3.prev = 0;
+              _context3.next = 3;
               return handleUpload(file);
 
             case 3:
-              rst = _context2.sent;
+              rst = _context3.sent;
               onSuccess(rst);
-              return _context2.abrupt("return", Promise.resolve(rst));
+              return _context3.abrupt("return", Promise.resolve(rst));
 
             case 8:
-              _context2.prev = 8;
-              _context2.t0 = _context2["catch"](0);
-              errorMsg = _typeof(_context2.t0) === 'object' ? _context2.t0.message : _context2.t0;
+              _context3.prev = 8;
+              _context3.t0 = _context3["catch"](0);
+              errorMsg = _typeof(_context3.t0) === 'object' ? _context3.t0.message : _context3.t0;
               onFailed(errorMsg);
-              return _context2.abrupt("return", Promise.reject(errorMsg));
+              return _context3.abrupt("return", Promise.reject(errorMsg));
 
             case 13:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, null, [[0, 8]]);
+      }, _callee3, null, [[0, 8]]);
     }));
 
-    return function handleUploadPromise(_x2, _x3, _x4) {
+    return function handleUploadPromise(_x3, _x4, _x5) {
       return _ref3.apply(this, arguments);
     };
   }(); // 错误提示的优先级，上传报错 > 'quantity of files should be less than {limit}' > 'Please re-upload this file:{name}'
 
 
   var handleDelete = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(index) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(index) {
       var arr, hasError, rst;
-      return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      return regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               limitNumError.current = null;
               arr = files;
-              _context3.next = 4;
+              _context4.next = 4;
               return setFiles(function (files) {
                 var newArr = files.filter(function (_, i) {
                   return i !== index;
@@ -327,7 +372,7 @@ var IglooUpload = function IglooUpload(_ref) {
               });
 
               if (!hasError) {
-                _context3.next = 8;
+                _context4.next = 8;
                 break;
               }
 
@@ -340,7 +385,7 @@ var IglooUpload = function IglooUpload(_ref) {
 
                 return f.url;
               });
-              return _context3.abrupt("return", typeof onChange === 'function' && onChange(rst));
+              return _context4.abrupt("return", typeof onChange === 'function' && onChange(rst));
 
             case 8:
               typeof onChange === 'function' && onChange(arr.map(function (_ref5) {
@@ -350,36 +395,36 @@ var IglooUpload = function IglooUpload(_ref) {
 
             case 9:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3);
+      }, _callee4);
     }));
 
-    return function handleDelete(_x5) {
+    return function handleDelete(_x6) {
       return _ref4.apply(this, arguments);
     };
   }();
 
   var handleReUpload = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(index) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5(index) {
       var _files$index, originFile, reUpUid, rst, latestFiles, fileListWithError, newList, _rst;
 
-      return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      return regeneratorRuntime.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               _files$index = files[index], originFile = _files$index.originFile, reUpUid = _files$index.uid;
 
               if (originFile) {
-                _context4.next = 3;
+                _context5.next = 3;
                 break;
               }
 
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
 
             case 3:
-              _context4.next = 5;
+              _context5.next = 5;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
@@ -388,14 +433,14 @@ var IglooUpload = function IglooUpload(_ref) {
               });
 
             case 5:
-              _context4.prev = 5;
-              _context4.next = 8;
+              _context5.prev = 5;
+              _context5.next = 8;
               return handleUpload(originFile);
 
             case 8:
-              rst = _context4.sent;
+              rst = _context5.sent;
               latestFiles = [];
-              _context4.next = 12;
+              _context5.next = 12;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
@@ -423,19 +468,19 @@ var IglooUpload = function IglooUpload(_ref) {
                 return url;
               });
               onChange && onChange(fileListWithError);
-              _context4.next = 23;
+              _context5.next = 23;
               break;
 
             case 16:
-              _context4.prev = 16;
-              _context4.t0 = _context4["catch"](5);
+              _context5.prev = 16;
+              _context5.t0 = _context5["catch"](5);
               newList = [];
-              _context4.next = 21;
+              _context5.next = 21;
               return setFiles(function (files) {
                 var newFiles = _toConsumableArray(files);
 
                 newFiles[index].status = 'failed';
-                newFiles[index].errorMsg = _context4.t0;
+                newFiles[index].errorMsg = _context5.t0;
                 newList = newFiles;
                 return newFiles;
               });
@@ -461,13 +506,13 @@ var IglooUpload = function IglooUpload(_ref) {
 
             case 23:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, null, [[5, 16]]);
+      }, _callee5, null, [[5, 16]]);
     }));
 
-    return function handleReUpload(_x6) {
+    return function handleReUpload(_x7) {
       return _ref6.apply(this, arguments);
     };
   }();

package/lib/upload-photo/index.d.ts

@@ -1,7 +1,7 @@
 import { FC, IglooComponentProps } from '../types';
 import './style/index.less';
 export interface Props extends IglooComponentProps {
-    handleUpload(file: File): PromiseLike<string>;
+    handleUpload?(file: File): PromiseLike<string>;
     value?: (string | {
         name: string;
         status: 'failed';
@@ -15,6 +15,7 @@ export interface Props extends IglooComponentProps {
     samples?: Sample[];
     className?: any;
     id?: string;
+    bizKey?: string;
 }
 export declare type Sample = {
     src: string;