iglooform 2.4.7 → 2.4.11

package/es/upload-preview/index.js

@@ -115,9 +115,8 @@ var UploadPreview = function UploadPreview(_ref) {
   if (!files || !files.length) return _jsx("div", {
     children: "-"
   }, void 0);
-  return _jsxs("div", Object.assign({
-    className: "igloo-upload-preview"
-  }, {
+  return _jsxs("div", {
+    className: "igloo-upload-preview",
     children: [description || (files.length === 1 ? formatMessage({
       id: '1 file attached.'
     }) : formatMessage({
@@ -133,20 +132,18 @@ var UploadPreview = function UploadPreview(_ref) {
       style: {
         fontSize: 24
       }
-    }, void 0), _jsxs(Modal, Object.assign({
+    }, void 0), _jsxs(Modal, {
       visible: preview,
-      title: _jsxs(Typography, Object.assign({
-        level: "h4"
-      }, {
+      title: _jsxs(Typography, {
+        level: "h4",
         children: [label, " (", current + 1, "/", files.length, ")"]
-      }), void 0),
+      }, void 0),
       className: "igloo-upload-preview-modal",
       footer: null,
       onCancel: function onCancel() {
         return setPreview(false);
       },
-      forceRender: false
-    }, {
+      forceRender: false,
       children: [_jsx(Button, {
         icon: _jsx(ArrowLeftOutlined, {}, void 0),
         className: classnames('igloo-upload-preview-modal-button', 'igloo-upload-preview-modal-button-left'),
@@ -161,8 +158,8 @@ var UploadPreview = function UploadPreview(_ref) {
         onClick: next,
         disabled: current >= files.length - 1
       }, void 0)]
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 };
 
 export default UploadPreview;

package/es/upload-preview/media.js

@@ -53,11 +53,10 @@ var PDF = function PDF(_ref) {
     }, i));
   }
 
-  return _jsx("div", Object.assign({
-    className: "igloo-upload-preview-pdf"
-  }, {
+  return _jsx("div", {
+    className: "igloo-upload-preview-pdf",
     children: pages
-  }), void 0);
+  }, void 0);
 };
 
 var Media = function Media(_ref3) {
@@ -68,20 +67,18 @@ var Media = function Media(_ref3) {
   var _useContext = useContext(LocaleContext),
       formatMessage = _useContext.formatMessage;
 
-  var children = _jsxs("div", Object.assign({
-    className: "igloo-upload-prevew-not-supported"
-  }, {
+  var children = _jsxs("div", {
+    className: "igloo-upload-prevew-not-supported",
     children: [_jsx(ErrorFilled, {
       className: "igloo-upload-prevew-not-supported-icon"
-    }, void 0), _jsx(Typography, Object.assign({
+    }, void 0), _jsx(Typography, {
       level: "body1",
-      className: "igloo-upload-prevew-not-supported-text"
-    }, {
+      className: "igloo-upload-prevew-not-supported-text",
       children: formatMessage({
         id: 'No preview for this file. Only support image, video or PDF file.'
       })
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 
   if (type === 'image') {
     children = _jsx("img", {
@@ -105,11 +102,10 @@ var Media = function Media(_ref3) {
     }, void 0);
   }
 
-  return _jsx("div", Object.assign({
-    className: classNames('igloo-upload-preview-container', className)
-  }, {
+  return _jsx("div", {
+    className: classNames('igloo-upload-preview-container', className),
     children: children
-  }), void 0);
+  }, void 0);
 };
 
 export default Media;

package/es/upload-preview/style/index.less

@@ -4,8 +4,8 @@
 
   .igloo-upload-prevew-icon {
     cursor: pointer;
-    width: 22px;
-    height: 22px;
+    width: 24px;
+    height: 24px;
     margin-left: 8px;
   }
 }

package/es/utils/form-utils.js

@@ -1,11 +1,11 @@
-var _excluded = ["type", "name", "required", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || 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 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; }
 
@@ -36,7 +36,7 @@ export var calcNamePath = function calcNamePath(parentName, name) {
     names.push(parentName);
   }
 
-  if (name) {
+  if (name !== undefined) {
     names.push(name);
   }
 
@@ -45,9 +45,8 @@ export var calcNamePath = function calcNamePath(parentName, name) {
 export var testAssert = function testAssert(form, assert) {
   var field = assert.field,
       value = assert.value,
-      _assert$operation = assert.operation,
-      operation = _assert$operation === void 0 ? 'eq' : _assert$operation;
-  var v = form.getFieldValue(field);
+      operation = assert.operation;
+  var v = form.getFieldValue(typeof field === 'string' ? field.split('.') : field);
 
   switch (operation) {
     case 'ne':
@@ -86,18 +85,39 @@ export var testAssert = function testAssert(form, assert) {
       if (v === undefined || v < value) return false;
       break;
 
+    case 'filled':
+      return v !== undefined;
+
     case 'eq':
+      return v === value;
+
     default:
-      if (v !== value) return false;
+      if (value !== undefined) return v === value;
+      return v !== undefined;
   }
 
   return true;
 };
+
+var calcRequired = function calcRequired() {
+  var required = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+  var form = arguments.length > 1 ? arguments[1] : undefined;
+  var requiredAsserts = arguments.length > 2 ? arguments[2] : undefined;
+
+  if (Array.isArray(requiredAsserts)) {
+    return requiredAsserts.every(function (assert) {
+      return form && testAssert(form, assert);
+    });
+  }
+
+  return required;
+};
+
 export var calcFormItemProps = function calcFormItemProps(config, extraProps, form, parentName) {
   var type = config.type,
       nameProp = config.name,
-      _config$required = config.required,
-      required = _config$required === void 0 ? true : _config$required,
+      required = config.required,
+      requiredAsserts = config.requiredAsserts,
       _config$showOptional = config.showOptional,
       showOptional = _config$showOptional === void 0 ? false : _config$showOptional,
       _config$rules = config.rules,
@@ -161,7 +181,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       className = extraProps.className,
       extraRest = _objectWithoutProperties(extraProps, _excluded2);
 
-  var rules = required === true && extraRequired ? [{
+  var rules = calcRequired(required, form, requiredAsserts) ? [{
     required: true,
     message: requiredMessage || extraRequiredMessage
   }].concat(_toConsumableArray(propsRules)) : _toConsumableArray(propsRules);
@@ -206,40 +226,33 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       normalize: normalize || extraNormalize,
       rules: rules,
       validateTrigger: _toConsumableArray(new Set(validateTriggers)),
-      label: label ? _jsxs("div", Object.assign({
-        className: "igloo-form-label"
-      }, {
-        children: [_jsxs("div", Object.assign({
-          className: "igloo-form-label-text"
-        }, {
-          children: [_jsx(Typography, Object.assign({
-            level: "body1"
-          }, {
+      label: label ? _jsxs("div", {
+        className: "igloo-form-label",
+        children: [_jsxs("div", {
+          className: "igloo-form-label-text",
+          children: [_jsx(Typography, {
+            level: "body1",
             children: label
-          }), void 0), isRequired && requiredMark && _jsx("span", Object.assign({
-            className: "igloo-form-label-required"
-          }, {
+          }, void 0), isRequired && requiredMark && _jsx("span", {
+            className: "igloo-form-label-required",
             children: "*"
-          }), void 0), showOptional && _jsxs("span", Object.assign({
-            className: "igloo-form-label-optional"
-          }, {
+          }, void 0), showOptional && _jsxs("span", {
+            className: "igloo-form-label-optional",
             children: ["(", formatMessage({
               id: 'Optional'
             }), ")"]
-          }), void 0)]
-        }), void 0), extraLabel && _jsx("div", Object.assign({
-          className: "igloo-form-label-extra"
-        }, {
+          }, void 0)]
+        }, void 0), extraLabel && _jsx("div", {
+          className: "igloo-form-label-extra",
           children: typeof extraLabel === 'function' ? extraLabel(form) : extraLabel
-        }), void 0)]
-      }), void 0) : null,
+        }, void 0)]
+      }, void 0) : null,
       getValueFromEvent: getValueFromEvent || extraGetValueFromEvent,
       getValueProps: getValueProps,
-      extra: (extra || extraExtra) && _jsx(Typography, Object.assign({
-        level: "caption2"
-      }, {
+      extra: (extra || extraExtra) && _jsx(Typography, {
+        level: "caption2",
         children: extra || extraExtra
-      }), void 0),
+      }, void 0),
       help: help || extraHelp,
       valuePropName: valuePropName || extraValuePropName,
       messageVariables: _objectSpread({

package/lib/admin-upload/float.js

@@ -57,21 +57,17 @@ var Float = function Float(_ref) {
     return null;
   }
 
-  return (0, _jsxRuntime.jsxs)("div", Object.assign({
-    className: "igloo-admin-upload-float"
-  }, {
-    children: [(0, _jsxRuntime.jsxs)("div", Object.assign({
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: "igloo-admin-upload-float",
+    children: [(0, _jsxRuntime.jsxs)("div", {
       className: "igloo-admin-upload-float-header",
       onClick: function onClick() {
         return setOpen(!open);
-      }
-    }, {
-      children: [(0, _jsxRuntime.jsxs)("div", Object.assign({
-        className: "igloo-admin-upload-float-header-left"
-      }, {
-        children: [(0, _jsxRuntime.jsx)("div", Object.assign({
-          className: "igloo-admin-upload-float-header-icon-box"
-        }, {
+      },
+      children: [(0, _jsxRuntime.jsxs)("div", {
+        className: "igloo-admin-upload-float-header-left",
+        children: [(0, _jsxRuntime.jsx)("div", {
+          className: "igloo-admin-upload-float-header-icon-box",
           children: processingNumber ? (0, _jsxRuntime.jsx)(_iglooicon.ProcessingOutlined, {
             className: "igloo-admin-upload-float-header-icon",
             spinning: true,
@@ -79,31 +75,27 @@ var Float = function Float(_ref) {
           }, void 0) : (0, _jsxRuntime.jsx)(_iglooicon.CheckOutlined, {
             className: "igloo-admin-upload-float-header-icon"
           }, void 0)
-        }), void 0), (0, _jsxRuntime.jsxs)("div", Object.assign({
-          className: "igloo-admin-upload-float-header-text"
-        }, {
-          children: [(0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+        }, void 0), (0, _jsxRuntime.jsxs)("div", {
+          className: "igloo-admin-upload-float-header-text",
+          children: [(0, _jsxRuntime.jsx)(_typography.default, {
             level: "h5",
-            wrapElement: "div"
-          }, {
+            wrapElement: "div",
             children: title || formatMessage({
               id: 'Data Importing Queue'
             })
-          }), void 0), formatTips && (0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+          }, void 0), formatTips && (0, _jsxRuntime.jsx)(_typography.default, {
             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 && (0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+          }, void 0), !formatTips && (0, _jsxRuntime.jsx)(_typography.default, {
             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({
@@ -119,22 +111,20 @@ var Float = function Float(_ref) {
                 doneNumber: doneNumber
               }
             })
-          }), void 0)]
-        }), void 0)]
-      }), void 0), (0, _jsxRuntime.jsxs)("div", Object.assign({
-        className: "igloo-admin-upload-float-header-right"
-      }, {
+          }, void 0)]
+        }, void 0)]
+      }, void 0), (0, _jsxRuntime.jsxs)("div", {
+        className: "igloo-admin-upload-float-header-right",
         children: [open ? (0, _jsxRuntime.jsx)(_iglooicon.ArrowUpOutlined, {}, void 0) : (0, _jsxRuntime.jsx)(_iglooicon.ArrowDownOutlined, {}, void 0), !processingNumber && (0, _jsxRuntime.jsx)(_iglooicon.CrossOutlined, {
           className: "igloo-admin-upload-float-header-close",
           onClick: onClose
         }, void 0)]
-      }), void 0)]
-    }), void 0), open && (0, _jsxRuntime.jsx)("div", Object.assign({
-      className: "igloo-admin-upload-float-content"
-    }, {
+      }, void 0)]
+    }, void 0), open && (0, _jsxRuntime.jsx)("div", {
+      className: "igloo-admin-upload-float-content",
       children: children
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 };
 
 var _default = Float;

package/lib/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/lib/admin-upload/index.js

@@ -41,9 +41,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; }
 
@@ -81,7 +81,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;
   (0, _invariant.default)(dataSource, 'dataSource is required');
   (0, _invariant.default)(typeof requestMethod === 'function', 'requestMethod is required');
 
@@ -189,11 +190,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') {
@@ -202,6 +211,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)) {
@@ -277,8 +291,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: {
@@ -329,7 +343,7 @@ var AdminUpload = function AdminUpload(_ref) {
   };
 
   var handleRemoveJob = (0, _lodash.default)( /*#__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) {
@@ -354,7 +368,7 @@ var AdminUpload = function AdminUpload(_ref) {
     }));
 
     return function (_x) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }(), 2000, {
     leading: true,
@@ -362,15 +376,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;
               }));
 
@@ -391,7 +405,7 @@ var AdminUpload = function AdminUpload(_ref) {
     }));
 
     return function handleHideJobs() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -400,20 +414,18 @@ var AdminUpload = function AdminUpload(_ref) {
     setShowFloatComfirm(true);
   };
 
-  return (0, _jsxRuntime.jsxs)("div", Object.assign({
-    className: "igloo-admin-upload"
-  }, {
-    children: [(0, _jsxRuntime.jsx)(_button.default, Object.assign({
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: "igloo-admin-upload",
+    children: [(0, _jsxRuntime.jsx)(_button.default, {
       type: buttonType,
       onClick: function onClick() {
         return setShowModal(true);
       },
-      icon: (0, _jsxRuntime.jsx)(_iglooicon.PublishOutlined, {}, void 0)
-    }, {
+      icon: (0, _jsxRuntime.jsx)(_iglooicon.PublishOutlined, {}, void 0),
       children: buttonText || formatMessage({
         id: 'Import'
       })
-    }), void 0), (0, _jsxRuntime.jsx)(_modal2.default, Object.assign({
+    }, void 0), (0, _jsxRuntime.jsx)(_modal2.default, {
       title: modalTitle,
       accept: accept,
       visible: showModal,
@@ -422,8 +434,7 @@ var AdminUpload = function AdminUpload(_ref) {
       onClose: function onClose() {
         return setShowModal(false);
       },
-      onUpload: handleUpload
-    }, {
+      onUpload: handleUpload,
       children: (0, _jsxRuntime.jsx)(_jobList.default, {
         uploadJobs: uploadJobs,
         processingJobs: processingJobs,
@@ -435,15 +446,14 @@ var AdminUpload = function AdminUpload(_ref) {
         cancelProcess: handleRemoveJob,
         hideJob: handleRemoveJob
       }, void 0)
-    }), void 0), (0, _jsxRuntime.jsx)(_float.default, Object.assign({
+    }, void 0), (0, _jsxRuntime.jsx)(_float.default, {
       title: floatTitle,
       visible: showFloat,
       uploadingNumber: uploadJobs.length,
       processingNumber: processingJobs.length,
       doneNumber: doneJobs.length,
       onClose: handleCloseFloat,
-      formatTips: formatTips
-    }, {
+      formatTips: formatTips,
       children: (0, _jsxRuntime.jsx)(_jobList.default, {
         uploadJobs: uploadJobs,
         processingJobs: processingJobs,
@@ -455,7 +465,7 @@ var AdminUpload = function AdminUpload(_ref) {
         cancelProcess: handleRemoveJob,
         hideJob: handleRemoveJob
       }, void 0)
-    }), void 0), (0, _jsxRuntime.jsx)(_modal.default, Object.assign({
+    }, void 0), (0, _jsxRuntime.jsx)(_modal.default, {
       cancelText: formatMessage({
         id: 'Cancel'
       }),
@@ -486,19 +496,16 @@ var AdminUpload = function AdminUpload(_ref) {
         style: {
           fontSize: 24
         }
-      }, void 0)
-    }, {
-      children: (0, _jsxRuntime.jsxs)(_typography.default, Object.assign({
-        level: "body1"
-      }, {
-        children: ["Would you like to close the result panel now? You can go to", ' ', (0, _jsxRuntime.jsxs)(_typography.default, Object.assign({
-          level: "caption1"
-        }, {
+      }, void 0),
+      children: (0, _jsxRuntime.jsxs)(_typography.default, {
+        level: "body1",
+        children: ["Would you like to close the result panel now? You can go to", ' ', (0, _jsxRuntime.jsxs)(_typography.default, {
+          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);
 };
 
 var _default = AdminUpload;