iglooform 2.4.7 → 2.4.11

package/es/admin-upload/float.js

@@ -44,21 +44,17 @@ var Float = function Float(_ref) {
     return null;
   }
 
-  return _jsxs("div", Object.assign({
-    className: "igloo-admin-upload-float"
-  }, {
-    children: [_jsxs("div", Object.assign({
+  return _jsxs("div", {
+    className: "igloo-admin-upload-float",
+    children: [_jsxs("div", {
       className: "igloo-admin-upload-float-header",
       onClick: function onClick() {
         return setOpen(!open);
-      }
-    }, {
-      children: [_jsxs("div", Object.assign({
-        className: "igloo-admin-upload-float-header-left"
-      }, {
-        children: [_jsx("div", Object.assign({
-          className: "igloo-admin-upload-float-header-icon-box"
-        }, {
+      },
+      children: [_jsxs("div", {
+        className: "igloo-admin-upload-float-header-left",
+        children: [_jsx("div", {
+          className: "igloo-admin-upload-float-header-icon-box",
           children: processingNumber ? _jsx(ProcessingOutlined, {
             className: "igloo-admin-upload-float-header-icon",
             spinning: true,
@@ -66,31 +62,27 @@ var Float = function Float(_ref) {
           }, void 0) : _jsx(CheckOutlined, {
             className: "igloo-admin-upload-float-header-icon"
           }, void 0)
-        }), void 0), _jsxs("div", Object.assign({
-          className: "igloo-admin-upload-float-header-text"
-        }, {
-          children: [_jsx(Typography, Object.assign({
+        }, void 0), _jsxs("div", {
+          className: "igloo-admin-upload-float-header-text",
+          children: [_jsx(Typography, {
             level: "h5",
-            wrapElement: "div"
-          }, {
+            wrapElement: "div",
             children: title || formatMessage({
               id: 'Data Importing Queue'
             })
-          }), void 0), formatTips && _jsx(Typography, Object.assign({
+          }, void 0), formatTips && _jsx(Typography, {
             level: "body3",
             wrapElement: "div",
-            className: "igloo-admin-upload-float-header-tips"
-          }, {
+            className: "igloo-admin-upload-float-header-tips",
             children: formatTips({
               uploading: uploadingNumber,
               processing: processingNumber,
               done: doneNumber
             })
-          }), void 0), !formatTips && _jsx(Typography, Object.assign({
+          }, void 0), !formatTips && _jsx(Typography, {
             level: "body3",
             wrapElement: "div",
-            className: "igloo-admin-upload-float-header-tips"
-          }, {
+            className: "igloo-admin-upload-float-header-tips",
             children: processingNumber ? processingNumber === 1 ? formatMessage({
               id: '1 file in progress...'
             }) : formatMessage({
@@ -106,22 +98,20 @@ var Float = function Float(_ref) {
                 doneNumber: doneNumber
               }
             })
-          }), void 0)]
-        }), void 0)]
-      }), void 0), _jsxs("div", Object.assign({
-        className: "igloo-admin-upload-float-header-right"
-      }, {
+          }, void 0)]
+        }, void 0)]
+      }, void 0), _jsxs("div", {
+        className: "igloo-admin-upload-float-header-right",
         children: [open ? _jsx(ArrowUpOutlined, {}, void 0) : _jsx(ArrowDownOutlined, {}, void 0), !processingNumber && _jsx(CrossOutlined, {
           className: "igloo-admin-upload-float-header-close",
           onClick: onClose
         }, void 0)]
-      }), void 0)]
-    }), void 0), open && _jsx("div", Object.assign({
-      className: "igloo-admin-upload-float-content"
-    }, {
+      }, void 0)]
+    }, void 0), open && _jsx("div", {
+      className: "igloo-admin-upload-float-content",
       children: children
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 };
 
 export default Float;

package/es/admin-upload/index.d.ts

@@ -2,6 +2,7 @@ import { FC } from 'react';
 import { RequestMethod } from 'umi-request';
 import { IglooButtonProps } from '../button';
 import { UploadProps } from 'antd/es/upload';
+import { Job } from './job-list';
 import './style';
 export interface AdminUploadProps {
     dataSource: string | {
@@ -29,6 +30,7 @@ export interface AdminUploadProps {
         done: number;
     }) => string;
     selectPlaceholder?: string;
+    onFinish?: (jobs: Job[]) => any;
 }
 declare const AdminUpload: FC<AdminUploadProps>;
 export default AdminUpload;

package/es/admin-upload/index.js

@@ -5,9 +5,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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 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; }
 
@@ -59,7 +59,8 @@ var AdminUpload = function AdminUpload(_ref) {
       refreshInteval = _ref$refreshInteval === void 0 ? 1000 : _ref$refreshInteval,
       accept = _ref.accept,
       formatTips = _ref.formatTips,
-      selectPlaceholder = _ref.selectPlaceholder;
+      selectPlaceholder = _ref.selectPlaceholder,
+      onFinish = _ref.onFinish;
   invariant(dataSource, 'dataSource is required');
   invariant(typeof requestMethod === 'function', 'requestMethod is required');
 
@@ -167,11 +168,19 @@ var AdminUpload = function AdminUpload(_ref) {
       var data = _ref4.data;
       var processing = [];
       var done = [];
+      var latestFinished = [];
       data === null || data === void 0 ? void 0 : (_data$sort = data.sort(function (a, b) {
         return b.create_at - a.create_at;
       })) === null || _data$sort === void 0 ? void 0 : _data$sort.forEach(function (job) {
         if (job.status === 'Done') {
           done.push(job);
+
+          if (!doneJobs.find(function (_ref5) {
+            var job_id = _ref5.job_id;
+            return job.job_id === job_id;
+          })) {
+            latestFinished.push(job);
+          }
         }
 
         if (job.status === 'Processing') {
@@ -180,6 +189,11 @@ var AdminUpload = function AdminUpload(_ref) {
       });
       setProcessingJobs(processing);
       setDoneJobs(done);
+
+      if (latestFinished.length && typeof onFinish === 'function') {
+        onFinish(latestFinished);
+      }
+
       setFailed(false);
 
       if (!(processing === null || processing === void 0 ? void 0 : processing.length)) {
@@ -255,8 +269,8 @@ var AdminUpload = function AdminUpload(_ref) {
       refresh().then(function () {
         handleRemoveUpload(uid);
       });
-    }).catch(function (_ref5) {
-      var errorMessage = _ref5.errorMessage;
+    }).catch(function (_ref6) {
+      var errorMessage = _ref6.errorMessage;
       dispatch({
         type: 'update',
         payload: {
@@ -307,7 +321,7 @@ var AdminUpload = function AdminUpload(_ref) {
   };
 
   var handleRemoveJob = debounce( /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(jobId) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(jobId) {
       var rst;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -332,7 +346,7 @@ var AdminUpload = function AdminUpload(_ref) {
     }));
 
     return function (_x) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), 2000, {
     leading: true,
@@ -340,15 +354,15 @@ var AdminUpload = function AdminUpload(_ref) {
   });
 
   var handleHideJobs = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var rst;
       return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return remove(doneJobs.map(function (_ref8) {
-                var job_id = _ref8.job_id;
+              return remove(doneJobs.map(function (_ref9) {
+                var job_id = _ref9.job_id;
                 return job_id;
               }));
 
@@ -369,7 +383,7 @@ var AdminUpload = function AdminUpload(_ref) {
     }));
 
     return function handleHideJobs() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -378,20 +392,18 @@ var AdminUpload = function AdminUpload(_ref) {
     setShowFloatComfirm(true);
   };
 
-  return _jsxs("div", Object.assign({
-    className: "igloo-admin-upload"
-  }, {
-    children: [_jsx(Button, Object.assign({
+  return _jsxs("div", {
+    className: "igloo-admin-upload",
+    children: [_jsx(Button, {
       type: buttonType,
       onClick: function onClick() {
         return setShowModal(true);
       },
-      icon: _jsx(PublishOutlined, {}, void 0)
-    }, {
+      icon: _jsx(PublishOutlined, {}, void 0),
       children: buttonText || formatMessage({
         id: 'Import'
       })
-    }), void 0), _jsx(Import, Object.assign({
+    }, void 0), _jsx(Import, {
       title: modalTitle,
       accept: accept,
       visible: showModal,
@@ -400,8 +412,7 @@ var AdminUpload = function AdminUpload(_ref) {
       onClose: function onClose() {
         return setShowModal(false);
       },
-      onUpload: handleUpload
-    }, {
+      onUpload: handleUpload,
       children: _jsx(JobList, {
         uploadJobs: uploadJobs,
         processingJobs: processingJobs,
@@ -413,15 +424,14 @@ var AdminUpload = function AdminUpload(_ref) {
         cancelProcess: handleRemoveJob,
         hideJob: handleRemoveJob
       }, void 0)
-    }), void 0), _jsx(Float, Object.assign({
+    }, void 0), _jsx(Float, {
       title: floatTitle,
       visible: showFloat,
       uploadingNumber: uploadJobs.length,
       processingNumber: processingJobs.length,
       doneNumber: doneJobs.length,
       onClose: handleCloseFloat,
-      formatTips: formatTips
-    }, {
+      formatTips: formatTips,
       children: _jsx(JobList, {
         uploadJobs: uploadJobs,
         processingJobs: processingJobs,
@@ -433,7 +443,7 @@ var AdminUpload = function AdminUpload(_ref) {
         cancelProcess: handleRemoveJob,
         hideJob: handleRemoveJob
       }, void 0)
-    }), void 0), _jsx(_Modal, Object.assign({
+    }, void 0), _jsx(_Modal, {
       cancelText: formatMessage({
         id: 'Cancel'
       }),
@@ -464,19 +474,16 @@ var AdminUpload = function AdminUpload(_ref) {
         style: {
           fontSize: 24
         }
-      }, void 0)
-    }, {
-      children: _jsxs(Typography, Object.assign({
-        level: "body1"
-      }, {
-        children: ["Would you like to close the result panel now? You can go to", ' ', _jsxs(Typography, Object.assign({
-          level: "caption1"
-        }, {
+      }, void 0),
+      children: _jsxs(Typography, {
+        level: "body1",
+        children: ["Would you like to close the result panel now? You can go to", ' ', _jsxs(Typography, {
+          level: "caption1",
           children: ["My Account ", '>', " Activity Log"]
-        }), void 0), ' ', "to view this import result after this panel is closed."]
-      }), void 0)
-    }), void 0)]
-  }), void 0);
+        }, void 0), ' ', "to view this import result after this panel is closed."]
+      }, void 0)
+    }, void 0)]
+  }, void 0);
 };
 
 export default AdminUpload;