wargerm 0.5.25 → 0.5.26

package/dist/components/Upload/example/demo2.d.ts

@@ -0,0 +1,3 @@
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
+export default _default;

package/dist/index.esm.js

@@ -11,12 +11,11 @@ import 'antd/es/input/style';
 import _Input from 'antd/es/input';
 import 'antd/es/modal/style';
 import _Modal from 'antd/es/modal';
-import 'antd/es/progress/style';
-import _Progress from 'antd/es/progress';
-import 'antd/es/upload/style';
-import _Upload from 'antd/es/upload';
 import 'antd/es/message/style';
 import _message from 'antd/es/message';
+import 'antd/es/upload/style';
+import _Upload from 'antd/es/upload';
+import FileViewer from 'react-file-viewer';
 import 'antd/es/input-number/style';
 import _InputNumber from 'antd/es/input-number';
 import 'antd/es/pagination/style';
@@ -586,7 +585,8 @@ var Index = WInput;
 Index.TextArea = _Input.TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
+var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
+var Dragger = _Upload.Dragger;
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
@@ -599,6 +599,7 @@ function Index$1(_ref, ref) {
       splitStr = _ref$splitStr === void 0 ? ',' : _ref$splitStr,
       fetchMethod = _ref.fetchMethod,
       getFileList = _ref.getFileList,
+      type = _ref.type,
       props = _objectWithoutProperties(_ref, _excluded$1);
 
   var _useState = useState([]),
@@ -615,13 +616,14 @@ function Index$1(_ref, ref) {
     setFileList(value ? value.split(splitStr).map(function (url) {
       return {
         uid: Math.random().toString(36).slice(2, 36),
-        name: '',
+        name: url,
         status: 'done',
         url: url
       };
     }) : []);
   }, [value]);
   useEffect(function () {
+    console.log(fileList);
     getFileList && getFileList(fileList.map(function (file) {
       return file.url;
     }), fileList);
@@ -675,30 +677,53 @@ function Index$1(_ref, ref) {
     }
 
     return beforeUpload ? beforeUpload(file) : isJpgOrPng && isLt2M;
-  }; // const handleChange: UploadProps['onChange'] = async ({ file, fileList: newFileList }) => {
-  //   if (file.status === 'done') {
-  //     file.url = file.response;
-  //     const urls = newFileList.map(file => file.url).join(splitStr)
-  //     onChange && onChange(urls)
-  //   }
-  //   setFileList(newFileList)
-  // };
-
+  };
 
-  var request = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(options) {
-      var onSuccess, onError, file, onProgress, url, fileObj, newFileList, urls;
+  var handleChange = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) {
+      var file, newFileList, urls;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
+            case 0:
+              file = _ref2.file, newFileList = _ref2.fileList;
+
+              if (file.status === 'done' || file.status === 'removed') {
+                file.url = file.response;
+                urls = newFileList.map(function (file) {
+                  return file.url;
+                }).join(splitStr);
+                onChange && onChange(urls);
+              } // setFileList(newFileList)
+
+
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleChange(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
+  var request = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(options) {
+      var onSuccess, onError, file, onProgress, url, fileObj, newFileList;
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               onSuccess = options.onSuccess, onError = options.onError, file = options.file, onProgress = options.onProgress;
-              _context.prev = 1;
-              _context.next = 4;
+              _context2.prev = 1;
+              _context2.next = 4;
               return fetchMethod ? fetchMethod(file) : getBase64(file);
 
             case 4:
-              url = _context.sent;
+              url = _context2.sent;
 
               if (url) {
                 fileObj = {
@@ -711,35 +736,31 @@ function Index$1(_ref, ref) {
                   xhr: onProgress
                 };
                 newFileList = [].concat(_toConsumableArray(fileList), [fileObj]);
-                urls = newFileList.map(function (file) {
-                  return file.url;
-                }).join(splitStr);
-                onChange && onChange(urls);
                 setFileList(newFileList);
                 onSuccess(url, file);
               }
 
-              _context.next = 12;
+              _context2.next = 12;
               break;
 
             case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](1);
-              console.log("Eroor: ", _context.t0);
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](1);
+              console.log("Eroor: ", _context2.t0);
               onError({
-                err: _context.t0
+                err: _context2.t0
               });
 
             case 12:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[1, 8]]);
+      }, _callee2, null, [[1, 8]]);
     }));
 
-    return function request(_x) {
-      return _ref2.apply(this, arguments);
+    return function request(_x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
 
@@ -760,21 +781,21 @@ function Index$1(_ref, ref) {
   };
 
   var handlePreview = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(file) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!(!file.url && !file.preview)) {
-                _context2.next = 4;
+                _context3.next = 4;
                 break;
               }
 
-              _context2.next = 3;
+              _context3.next = 3;
               return getBase64(file.originFileObj);
 
             case 3:
-              file.preview = _context2.sent;
+              file.preview = _context3.sent;
 
             case 4:
               setPreviewImage(file.url || file.preview);
@@ -783,14 +804,14 @@ function Index$1(_ref, ref) {
 
             case 7:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
 
-    return function handlePreview(_x2) {
-      return _ref3.apply(this, arguments);
+    return function handlePreview(_x3) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -804,17 +825,35 @@ function Index$1(_ref, ref) {
       fileList: fileList
     };
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Upload, _objectSpread2({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, type == 'dragger' ? /*#__PURE__*/React.createElement(Dragger, _objectSpread2({
+    fileList: fileList,
+    onPreview: handlePreview,
+    onChange: handleChange,
+    onRemove: handleronRemove,
+    customRequest: request,
+    onProgress: function onProgress(_ref6) {
+      var percent = _ref6.percent;
+      console.log("progre...", percent);
+
+      if (percent === 100) {
+        setTimeout(function () {
+          return setProgress(0);
+        }, 1000);
+      }
+
+      return setProgress(Math.floor(percent));
+    }
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom) : /*#__PURE__*/React.createElement(_Upload, _objectSpread2({
     accept: "image/*",
     fileList: fileList,
     listType: "picture-card",
     beforeUpload: beforeUploadIn,
     onPreview: handlePreview,
-    // onChange={handleChange}
+    onChange: handleChange,
     onRemove: handleronRemove,
     customRequest: request,
-    onProgress: function onProgress(_ref4) {
-      var percent = _ref4.percent;
+    onProgress: function onProgress(_ref7) {
+      var percent = _ref7.percent;
       console.log("progre...", percent);
 
       if (percent === 100) {
@@ -825,14 +864,19 @@ function Index$1(_ref, ref) {
 
       return setProgress(Math.floor(percent));
     }
-  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), progress > 0 ? /*#__PURE__*/React.createElement(_Progress, {
-    percent: progress
-  }) : null, /*#__PURE__*/React.createElement(_Modal, {
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React.createElement(_Modal, {
     visible: previewVisible,
     title: previewTitle,
     footer: null,
     onCancel: handleCancel
-  }, /*#__PURE__*/React.createElement("img", {
+  }, type == 'dragger' ? /*#__PURE__*/React.createElement(FileViewer, {
+    fileType: previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '',
+    filePath: previewImage,
+    errorComponent: /*#__PURE__*/React.createElement(React.Fragment, null, "".concat(previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '', " \u7C7B\u578B\u4E0D\u652F\u6301\u9884\u89C8\uFF01")),
+    onError: function onError(err) {
+      console.log(err);
+    }
+  }) : /*#__PURE__*/React.createElement("img", {
     alt: "example",
     style: {
       width: '100%'

package/dist/index.js

@@ -15,12 +15,11 @@ require('antd/es/input/style');
 var _Input = require('antd/es/input');
 require('antd/es/modal/style');
 var _Modal = require('antd/es/modal');
-require('antd/es/progress/style');
-var _Progress = require('antd/es/progress');
-require('antd/es/upload/style');
-var _Upload = require('antd/es/upload');
 require('antd/es/message/style');
 var _message = require('antd/es/message');
+require('antd/es/upload/style');
+var _Upload = require('antd/es/upload');
+var FileViewer = require('react-file-viewer');
 require('antd/es/input-number/style');
 var _InputNumber = require('antd/es/input-number');
 require('antd/es/pagination/style');
@@ -95,9 +94,9 @@ var _Dropdown__default = /*#__PURE__*/_interopDefaultLegacy(_Dropdown);
 var _Menu__default = /*#__PURE__*/_interopDefaultLegacy(_Menu);
 var _Input__default = /*#__PURE__*/_interopDefaultLegacy(_Input);
 var _Modal__default = /*#__PURE__*/_interopDefaultLegacy(_Modal);
-var _Progress__default = /*#__PURE__*/_interopDefaultLegacy(_Progress);
-var _Upload__default = /*#__PURE__*/_interopDefaultLegacy(_Upload);
 var _message__default = /*#__PURE__*/_interopDefaultLegacy(_message);
+var _Upload__default = /*#__PURE__*/_interopDefaultLegacy(_Upload);
+var FileViewer__default = /*#__PURE__*/_interopDefaultLegacy(FileViewer);
 var _InputNumber__default = /*#__PURE__*/_interopDefaultLegacy(_InputNumber);
 var _Pagination__default = /*#__PURE__*/_interopDefaultLegacy(_Pagination);
 var _Spin__default = /*#__PURE__*/_interopDefaultLegacy(_Spin);
@@ -647,7 +646,8 @@ var Index = WInput;
 Index.TextArea = _Input__default['default'].TextArea;
 WInput.defaultProps = {};
 
-var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList"];
+var _excluded$1 = ["value", "onChange", "onRemove", "beforeUpload", "uploadButton", "maxCount", "splitStr", "fetchMethod", "getFileList", "type"];
+var Dragger = _Upload__default['default'].Dragger;
 
 function Index$1(_ref, ref) {
   var value = _ref.value,
@@ -660,6 +660,7 @@ function Index$1(_ref, ref) {
       splitStr = _ref$splitStr === void 0 ? ',' : _ref$splitStr,
       fetchMethod = _ref.fetchMethod,
       getFileList = _ref.getFileList,
+      type = _ref.type,
       props = _objectWithoutProperties(_ref, _excluded$1);
 
   var _useState = React.useState([]),
@@ -676,13 +677,14 @@ function Index$1(_ref, ref) {
     setFileList(value ? value.split(splitStr).map(function (url) {
       return {
         uid: Math.random().toString(36).slice(2, 36),
-        name: '',
+        name: url,
         status: 'done',
         url: url
       };
     }) : []);
   }, [value]);
   React.useEffect(function () {
+    console.log(fileList);
     getFileList && getFileList(fileList.map(function (file) {
       return file.url;
     }), fileList);
@@ -736,30 +738,53 @@ function Index$1(_ref, ref) {
     }
 
     return beforeUpload ? beforeUpload(file) : isJpgOrPng && isLt2M;
-  }; // const handleChange: UploadProps['onChange'] = async ({ file, fileList: newFileList }) => {
-  //   if (file.status === 'done') {
-  //     file.url = file.response;
-  //     const urls = newFileList.map(file => file.url).join(splitStr)
-  //     onChange && onChange(urls)
-  //   }
-  //   setFileList(newFileList)
-  // };
-
+  };
 
-  var request = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(options) {
-      var onSuccess, onError, file, onProgress, url, fileObj, newFileList, urls;
+  var handleChange = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(_ref2) {
+      var file, newFileList, urls;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
+            case 0:
+              file = _ref2.file, newFileList = _ref2.fileList;
+
+              if (file.status === 'done' || file.status === 'removed') {
+                file.url = file.response;
+                urls = newFileList.map(function (file) {
+                  return file.url;
+                }).join(splitStr);
+                onChange && onChange(urls);
+              } // setFileList(newFileList)
+
+
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+
+    return function handleChange(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
+  var request = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(options) {
+      var onSuccess, onError, file, onProgress, url, fileObj, newFileList;
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               onSuccess = options.onSuccess, onError = options.onError, file = options.file, onProgress = options.onProgress;
-              _context.prev = 1;
-              _context.next = 4;
+              _context2.prev = 1;
+              _context2.next = 4;
               return fetchMethod ? fetchMethod(file) : getBase64(file);
 
             case 4:
-              url = _context.sent;
+              url = _context2.sent;
 
               if (url) {
                 fileObj = {
@@ -772,35 +797,31 @@ function Index$1(_ref, ref) {
                   xhr: onProgress
                 };
                 newFileList = [].concat(_toConsumableArray(fileList), [fileObj]);
-                urls = newFileList.map(function (file) {
-                  return file.url;
-                }).join(splitStr);
-                onChange && onChange(urls);
                 setFileList(newFileList);
                 onSuccess(url, file);
               }
 
-              _context.next = 12;
+              _context2.next = 12;
               break;
 
             case 8:
-              _context.prev = 8;
-              _context.t0 = _context["catch"](1);
-              console.log("Eroor: ", _context.t0);
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](1);
+              console.log("Eroor: ", _context2.t0);
               onError({
-                err: _context.t0
+                err: _context2.t0
               });
 
             case 12:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, null, [[1, 8]]);
+      }, _callee2, null, [[1, 8]]);
     }));
 
-    return function request(_x) {
-      return _ref2.apply(this, arguments);
+    return function request(_x2) {
+      return _ref4.apply(this, arguments);
     };
   }();
 
@@ -821,21 +842,21 @@ function Index$1(_ref, ref) {
   };
 
   var handlePreview = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(file) {
-      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(file) {
+      return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
               if (!(!file.url && !file.preview)) {
-                _context2.next = 4;
+                _context3.next = 4;
                 break;
               }
 
-              _context2.next = 3;
+              _context3.next = 3;
               return getBase64(file.originFileObj);
 
             case 3:
-              file.preview = _context2.sent;
+              file.preview = _context3.sent;
 
             case 4:
               setPreviewImage(file.url || file.preview);
@@ -844,14 +865,14 @@ function Index$1(_ref, ref) {
 
             case 7:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2);
+      }, _callee3);
     }));
 
-    return function handlePreview(_x2) {
-      return _ref3.apply(this, arguments);
+    return function handlePreview(_x3) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -865,17 +886,35 @@ function Index$1(_ref, ref) {
       fileList: fileList
     };
   });
-  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(_Upload__default['default'], _objectSpread2({
+  return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, type == 'dragger' ? /*#__PURE__*/React__default['default'].createElement(Dragger, _objectSpread2({
+    fileList: fileList,
+    onPreview: handlePreview,
+    onChange: handleChange,
+    onRemove: handleronRemove,
+    customRequest: request,
+    onProgress: function onProgress(_ref6) {
+      var percent = _ref6.percent;
+      console.log("progre...", percent);
+
+      if (percent === 100) {
+        setTimeout(function () {
+          return setProgress(0);
+        }, 1000);
+      }
+
+      return setProgress(Math.floor(percent));
+    }
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom) : /*#__PURE__*/React__default['default'].createElement(_Upload__default['default'], _objectSpread2({
     accept: "image/*",
     fileList: fileList,
     listType: "picture-card",
     beforeUpload: beforeUploadIn,
     onPreview: handlePreview,
-    // onChange={handleChange}
+    onChange: handleChange,
     onRemove: handleronRemove,
     customRequest: request,
-    onProgress: function onProgress(_ref4) {
-      var percent = _ref4.percent;
+    onProgress: function onProgress(_ref7) {
+      var percent = _ref7.percent;
       console.log("progre...", percent);
 
       if (percent === 100) {
@@ -886,14 +925,19 @@ function Index$1(_ref, ref) {
 
       return setProgress(Math.floor(percent));
     }
-  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), progress > 0 ? /*#__PURE__*/React__default['default'].createElement(_Progress__default['default'], {
-    percent: progress
-  }) : null, /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], {
+  }, props), fileList.length >= maxCount ? null : uploadButton ? uploadButton : uploadButtonDom), /*#__PURE__*/React__default['default'].createElement(_Modal__default['default'], {
     visible: previewVisible,
     title: previewTitle,
     footer: null,
     onCancel: handleCancel
-  }, /*#__PURE__*/React__default['default'].createElement("img", {
+  }, type == 'dragger' ? /*#__PURE__*/React__default['default'].createElement(FileViewer__default['default'], {
+    fileType: previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '',
+    filePath: previewImage,
+    errorComponent: /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, "".concat(previewTitle.slice(previewTitle.lastIndexOf('.') + 1) || previewImage.slice(previewImage.lastIndexOf('.') + 1) || '', " \u7C7B\u578B\u4E0D\u652F\u6301\u9884\u89C8\uFF01")),
+    onError: function onError(err) {
+      console.log(err);
+    }
+  }) : /*#__PURE__*/React__default['default'].createElement("img", {
     alt: "example",
     style: {
       width: '100%'

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.5.25",
+  "version": "0.5.26",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",
@@ -52,6 +52,7 @@
     "echarts-for-react": "^3.0.2",
     "react-countup": "^6.0.0",
     "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
     "swiper": "^6.7.0",
     "xgplayer": "^2.31.6",
     "xgplayer-flv": "^2.5.1",