cloud-b2b 1.1.38 → 1.1.39

package/es/SuperUpload/SuperUpload.js

@@ -4,6 +4,9 @@ import _Button from "antd/es/button";
 import _Icon from "antd/es/icon";
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || 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) { var _context7; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context7 = Object.prototype.toString.call(o)).call(_context7, 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; }
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(source), !0)).call(_context5, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context6 = ownKeys(Object(source))).call(_context6, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -17,6 +20,11 @@ import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/inst
 import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
 import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
+import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/slice";
+import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
+import _Symbol from "@babel/runtime-corejs3/core-js-stable/symbol";
+import _getIteratorMethod from "@babel/runtime-corejs3/core-js/get-iterator-method";
+import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import helper from '../helper';
@@ -76,6 +84,8 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
   var onChange = function onChange(_ref) {
     var file = _ref.file,
       fileList = _ref.fileList;
+    var limitNumber = props.limitNumber;
+    if (fileList.length > limitNumber) return helper.showError("\u6587\u4EF6\u6700\u591A\u53EF\u4E0A\u4F20".concat(limitNumber, "\u4E2A"));
     if (!file) return; //过滤掉不符合条件的响应
     var newList = [];
     if (file.response && file.response.returnCode !== 0) {
@@ -184,37 +194,88 @@ function SuperUpload(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     fileList = _useState4[0],
     setFileList = _useState4[1];
+  var initFileList = [];
   useEffect(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
     }
     function _fetchImgData() {
       _fetchImgData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var initFileList;
+        var _iterator, _step, item;
         return _regeneratorRuntime.wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              if (!(props.fileList.length > 0)) {
+                _context3.next = 35;
+                break;
+              }
+              _iterator = _createForOfIteratorHelper(props.fileList);
+              _context3.prev = 2;
+              _iterator.s();
+            case 4:
+              if ((_step = _iterator.n()).done) {
+                _context3.next = 27;
+                break;
+              }
+              item = _step.value;
+              if (!(item.fileUrl == '')) {
+                _context3.next = 17;
+                break;
+              }
               if (!props.getFileList) {
-                _context3.next = 6;
+                _context3.next = 13;
                 break;
               }
-              _context3.next = 3;
-              return props.getFileList(props.fileList);
-            case 3:
+              _context3.next = 10;
+              return props.getFileList(fileList);
+            case 10:
               _context3.t0 = _context3.sent;
-              _context3.next = 7;
+              _context3.next = 14;
               break;
-            case 6:
+            case 13:
               _context3.t0 = [];
-            case 7:
+            case 14:
               initFileList = _context3.t0;
-              setFileList(initFileList);
+              _context3.next = 25;
+              break;
+            case 17:
+              if (!props.getFileList) {
+                _context3.next = 23;
+                break;
+              }
+              _context3.next = 20;
+              return props.getFileList(props.fileList);
+            case 20:
+              _context3.t1 = _context3.sent;
+              _context3.next = 24;
+              break;
+            case 23:
+              _context3.t1 = [];
+            case 24:
+              initFileList = _context3.t1;
+            case 25:
+              _context3.next = 4;
+              break;
+            case 27:
+              _context3.next = 32;
+              break;
+            case 29:
+              _context3.prev = 29;
+              _context3.t2 = _context3["catch"](2);
+              _iterator.e(_context3.t2);
+            case 32:
+              _context3.prev = 32;
+              _iterator.f();
+              return _context3.finish(32);
+            case 35:
+              //const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
+              setFileList(initFileList ? initFileList : []);
               setLoading(false);
-            case 10:
+            case 37:
             case "end":
               return _context3.stop();
           }
-        }, _callee2);
+        }, _callee2, null, [[2, 29, 32, 35]]);
       }));
       return _fetchImgData.apply(this, arguments);
     }
@@ -243,8 +304,8 @@ function SuperUpload(props) {
     limitNumber = _props$limitNumber === void 0 ? 10 : _props$limitNumber,
     readonly = props.readonly,
     title = props.title;
-  var className = listType === 'picture-card' && fileList.length < limitNumber ? variables('SuperUpload') : variables('SuperUpload2');
-  var canUpload = fileList.length >= limitNumber;
+  var className = listType === 'picture-card' && (fileList === null || fileList === void 0 ? void 0 : fileList.length) < limitNumber ? variables('SuperUpload') : variables('SuperUpload2');
+  var canUpload = (fileList === null || fileList === void 0 ? void 0 : fileList.length) >= limitNumber;
   return loading ? /*#__PURE__*/React.createElement("div", null, "loading...") : /*#__PURE__*/React.createElement("div", {
     className: className
   }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/React.createElement(Title, {

package/lib/SuperUpload/SuperUpload.js

@@ -9,6 +9,11 @@ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/in
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
 var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
+var _Array$isArray = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 _Object$defineProperty(exports, "__esModule", {
@@ -32,6 +37,9 @@ var _Title = _interopRequireDefault(require("../Title"));
 var _variables = _interopRequireDefault(require("../variables"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || 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) { var _context7; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context7 = Object.prototype.toString.call(o)).call(_context7, 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 ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(symbols).call(symbols, 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 _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(source), !0)).call(_context5, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context6 = ownKeys(Object(source))).call(_context6, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FORMATS = ['image/jpeg', 'image/gif', 'image/bmp', 'image/jpg', 'image/png', 'image/tiff', 'image/gif', 'image/pcx', 'image/tga', 'image/exif', 'image/fpx', 'image/svg', 'image/psd', 'image/cdr', 'image/pcd', 'image/dxf', 'image/ufo', 'image/eps', 'image/ai', 'image/raw', 'image/WMF', 'video/mp4'];
@@ -88,6 +96,8 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
   var onChange = function onChange(_ref) {
     var file = _ref.file,
       fileList = _ref.fileList;
+    var limitNumber = props.limitNumber;
+    if (fileList.length > limitNumber) return _helper["default"].showError("\u6587\u4EF6\u6700\u591A\u53EF\u4E0A\u4F20".concat(limitNumber, "\u4E2A"));
     if (!file) return; //过滤掉不符合条件的响应
     var newList = [];
     if (file.response && file.response.returnCode !== 0) {
@@ -196,37 +206,88 @@ function SuperUpload(props) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     fileList = _useState4[0],
     setFileList = _useState4[1];
+  var initFileList = [];
   (0, _react.useEffect)(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
     }
     function _fetchImgData() {
       _fetchImgData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var initFileList;
+        var _iterator, _step, item;
         return _regenerator["default"].wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              if (!(props.fileList.length > 0)) {
+                _context3.next = 35;
+                break;
+              }
+              _iterator = _createForOfIteratorHelper(props.fileList);
+              _context3.prev = 2;
+              _iterator.s();
+            case 4:
+              if ((_step = _iterator.n()).done) {
+                _context3.next = 27;
+                break;
+              }
+              item = _step.value;
+              if (!(item.fileUrl == '')) {
+                _context3.next = 17;
+                break;
+              }
               if (!props.getFileList) {
-                _context3.next = 6;
+                _context3.next = 13;
                 break;
               }
-              _context3.next = 3;
-              return props.getFileList(props.fileList);
-            case 3:
+              _context3.next = 10;
+              return props.getFileList(fileList);
+            case 10:
               _context3.t0 = _context3.sent;
-              _context3.next = 7;
+              _context3.next = 14;
               break;
-            case 6:
+            case 13:
               _context3.t0 = [];
-            case 7:
+            case 14:
               initFileList = _context3.t0;
-              setFileList(initFileList);
+              _context3.next = 25;
+              break;
+            case 17:
+              if (!props.getFileList) {
+                _context3.next = 23;
+                break;
+              }
+              _context3.next = 20;
+              return props.getFileList(props.fileList);
+            case 20:
+              _context3.t1 = _context3.sent;
+              _context3.next = 24;
+              break;
+            case 23:
+              _context3.t1 = [];
+            case 24:
+              initFileList = _context3.t1;
+            case 25:
+              _context3.next = 4;
+              break;
+            case 27:
+              _context3.next = 32;
+              break;
+            case 29:
+              _context3.prev = 29;
+              _context3.t2 = _context3["catch"](2);
+              _iterator.e(_context3.t2);
+            case 32:
+              _context3.prev = 32;
+              _iterator.f();
+              return _context3.finish(32);
+            case 35:
+              //const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
+              setFileList(initFileList ? initFileList : []);
               setLoading(false);
-            case 10:
+            case 37:
             case "end":
               return _context3.stop();
           }
-        }, _callee2);
+        }, _callee2, null, [[2, 29, 32, 35]]);
       }));
       return _fetchImgData.apply(this, arguments);
     }
@@ -255,8 +316,8 @@ function SuperUpload(props) {
     limitNumber = _props$limitNumber === void 0 ? 10 : _props$limitNumber,
     readonly = props.readonly,
     title = props.title;
-  var className = listType === 'picture-card' && fileList.length < limitNumber ? (0, _variables["default"])('SuperUpload') : (0, _variables["default"])('SuperUpload2');
-  var canUpload = fileList.length >= limitNumber;
+  var className = listType === 'picture-card' && (fileList === null || fileList === void 0 ? void 0 : fileList.length) < limitNumber ? (0, _variables["default"])('SuperUpload') : (0, _variables["default"])('SuperUpload2');
+  var canUpload = (fileList === null || fileList === void 0 ? void 0 : fileList.length) >= limitNumber;
   return loading ? /*#__PURE__*/_react["default"].createElement("div", null, "loading...") : /*#__PURE__*/_react["default"].createElement("div", {
     className: className
   }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/_react["default"].createElement(_Title["default"], {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloud-b2b",
-  "version": "1.1.38",
+  "version": "1.1.39",
   "description": "A react component library dependent antd",
   "keywords": [
     "react",