@nocobase/client 0.9.1-alpha.2 → 0.9.2-alpha.1

package/es/schema-component/antd/time-picker/TimePicker.js

@@ -1,14 +1,13 @@
+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); 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 = 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; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { formatMomentValue, momentable } from '@formily/antd/lib/__builtins__';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { TimePicker as AntdTimePicker } from 'antd';
 import { ReadPretty } from './ReadPretty';
-
 var mapTimeFormat = function mapTimeFormat() {
   return function (props, field) {
     var format = props['format'] || 'HH:mm:ss';
@@ -24,7 +23,6 @@ var mapTimeFormat = function mapTimeFormat() {
     });
   };
 };
-
 export var TimePicker = connect(AntdTimePicker, mapProps(mapTimeFormat()), mapReadPretty(ReadPretty));
 TimePicker.RangePicker = connect(AntdTimePicker.RangePicker, mapProps(mapTimeFormat()), mapReadPretty(ReadPretty));
 export default TimePicker;

package/es/schema-component/antd/tree-select/ReadPretty.js

@@ -6,15 +6,12 @@ import cls from 'classnames';
 import React from 'react';
 export var ReadPretty = observer(function (props) {
   var _field$dataSource, _props$treeData;
-
   var field = useField();
   var placeholder = props.placeholder;
   var prefixCls = usePrefixCls('description-tree-select', props);
   var dataSource = (field === null || field === void 0 ? void 0 : (_field$dataSource = field.dataSource) === null || _field$dataSource === void 0 ? void 0 : _field$dataSource.length) ? field.dataSource : (props === null || props === void 0 ? void 0 : (_props$treeData = props.treeData) === null || _props$treeData === void 0 ? void 0 : _props$treeData.length) ? props.treeData : [];
-
   var getSelected = function getSelected() {
     var value = props.value;
-
     if (props.multiple) {
       if (props.labelInValue) {
         return isArr(value) ? value : [];
@@ -37,11 +34,9 @@ export var ReadPretty = observer(function (props) {
       }
     }
   };
-
   var findLabel = function findLabel(value, dataSource) {
     for (var i = 0; i < (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length); i++) {
       var item = dataSource[i];
-
       if ((item === null || item === void 0 ? void 0 : item.value) === value) {
         return item === null || item === void 0 ? void 0 : item.label;
       } else {
@@ -50,19 +45,17 @@ export var ReadPretty = observer(function (props) {
       }
     }
   };
-
   var getLabels = function getLabels() {
     var selected = getSelected();
     if (!(selected === null || selected === void 0 ? void 0 : selected.length)) return /*#__PURE__*/React.createElement(Tag, null, placeholder);
     return selected.map(function (_ref, key) {
       var value = _ref.value,
-          label = _ref.label;
+        label = _ref.label;
       return /*#__PURE__*/React.createElement(Tag, {
         key: key
       }, findLabel(value, dataSource) || label || placeholder);
     });
   };
-
   return /*#__PURE__*/React.createElement("div", {
     className: cls(prefixCls, props.className),
     style: props.style

package/es/schema-component/antd/tree-select/TreeSelect.js

@@ -1,9 +1,9 @@
+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); 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 = 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; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { TreeSelect as AntdTreeSelect } from 'antd';

package/es/schema-component/antd/upload/ReadPretty.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { UploadProps } from './type';
 declare type Composed = React.FC<UploadProps> & {
     Upload?: React.FC<UploadProps>;
-    Attachment?: React.FC<UploadProps>;
+    File?: React.FC<UploadProps>;
 };
 export declare const ReadPretty: Composed;
 export {};

package/es/schema-component/antd/upload/ReadPretty.js

@@ -1,43 +1,36 @@
 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."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 import DownloadOutlined from '@ant-design/icons/DownloadOutlined';
 import { useField } from '@formily/react';
+import { isString } from '@nocobase/utils/client';
 import { Button, Space } from 'antd';
 import cls from 'classnames';
 import { saveAs } from 'file-saver';
 import React, { useState } from 'react';
 import Lightbox from 'react-image-lightbox';
+import { useRecord } from '../../../record-provider';
 import { isImage, toArr, toImages } from './shared';
 export var ReadPretty = function ReadPretty() {
   return null;
 };
-
-ReadPretty.Attachment = function (props) {
+ReadPretty.File = function (props) {
   var _images$photoIndex, _images, _images2, _images$photoIndex2;
-
+  var record = useRecord();
   var field = useField();
-  var images = toImages(toArr(field.value));
-
+  var value = isString(field.value) ? record : field.value;
+  var images = toImages(toArr(value));
   var _useState = useState(0),
-      _useState2 = _slicedToArray(_useState, 2),
-      photoIndex = _useState2[0],
-      setPhotoIndex = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    photoIndex = _useState2[0],
+    setPhotoIndex = _useState2[1];
   var _useState3 = useState(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      visible = _useState4[0],
-      setVisible = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    visible = _useState4[0],
+    setVisible = _useState4[1];
   var size = props.size;
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
     className: cls('ant-upload-picture-card-wrapper nb-upload', size ? "nb-upload-".concat(size) : null)
@@ -46,16 +39,15 @@ ReadPretty.Attachment = function (props) {
   }, images.map(function (file) {
     var handleClick = function handleClick(e) {
       var index = images.indexOf(file);
-
       if (isImage(file.extname)) {
         e.preventDefault();
         e.stopPropagation();
         setVisible(true);
         setPhotoIndex(index);
-      } // else {
+      }
+      // else {
       //   saveAs(file.url, `${file.title}${file.extname}`);
       // }
-
     };
 
     return /*#__PURE__*/React.createElement("div", {
@@ -97,7 +89,8 @@ ReadPretty.Attachment = function (props) {
         saveAs(file.url, "".concat(file.title).concat(file.extname));
       }
     })))));
-  }))), visible && /*#__PURE__*/React.createElement(Lightbox // discourageDownloads={true}
+  }))), visible && /*#__PURE__*/React.createElement(Lightbox
+  // discourageDownloads={true}
   , {
     // discourageDownloads={true}
     mainSrc: (_images$photoIndex = images[photoIndex]) === null || _images$photoIndex === void 0 ? void 0 : _images$photoIndex.imageUrl,
@@ -135,7 +128,6 @@ ReadPretty.Attachment = function (props) {
     }, /*#__PURE__*/React.createElement(DownloadOutlined, null))]
   }));
 };
-
 ReadPretty.Upload = function (props) {
   var field = useField();
   return (field.value || []).map(function (item) {

package/es/schema-component/antd/upload/Upload.js

@@ -1,42 +1,29 @@
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 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."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 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 = 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; }
-
-import DeleteOutlined from '@ant-design/icons/DeleteOutlined';
-import DownloadOutlined from '@ant-design/icons/DownloadOutlined';
-import PlusOutlined from '@ant-design/icons/PlusOutlined';
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusOutlined } from '@ant-design/icons';
 import { usePrefixCls } from '@formily/antd/lib/__builtins__';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
-import { Button, Progress, Space, Upload as AntdUpload } from 'antd';
+import { Upload as AntdUpload, Button, Progress, Space } from 'antd';
 import cls from 'classnames';
 import { saveAs } from 'file-saver';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import Lightbox from 'react-image-lightbox';
 import 'react-image-lightbox/style.css'; // This only needs to be imported once in your app
-
 import { ReadPretty } from './ReadPretty';
 import { isImage, toArr, toFileList, toItem, toValue, useUploadProps } from './shared';
 import './style.less';
@@ -47,37 +34,29 @@ export var Upload = connect(function (props) {
 }), mapReadPretty(ReadPretty.Upload));
 Upload.Attachment = connect(function (props) {
   var _images$photoIndex, _images, _images2, _images$photoIndex2;
-
   var disabled = props.disabled,
-      multiple = props.multiple,
-      value = props.value,
-      _onChange = props.onChange;
-
+    multiple = props.multiple,
+    value = props.value,
+    _onChange = props.onChange;
   var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      fileList = _useState2[0],
-      setFileList = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    fileList = _useState2[0],
+    setFileList = _useState2[1];
   var _useState3 = useState(true),
-      _useState4 = _slicedToArray(_useState3, 2),
-      sync = _useState4[0],
-      setSync = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    sync = _useState4[0],
+    setSync = _useState4[1];
   var images = fileList;
-
   var _useState5 = useState(0),
-      _useState6 = _slicedToArray(_useState5, 2),
-      photoIndex = _useState6[0],
-      setPhotoIndex = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    photoIndex = _useState6[0],
+    setPhotoIndex = _useState6[1];
   var _useState7 = useState(false),
-      _useState8 = _slicedToArray(_useState7, 2),
-      visible = _useState8[0],
-      setVisible = _useState8[1];
-
+    _useState8 = _slicedToArray(_useState7, 2),
+    visible = _useState8[0],
+    setVisible = _useState8[1];
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   useEffect(function () {
     if (sync) {
       setFileList(toFileList(value));
@@ -93,7 +72,6 @@ Upload.Attachment = connect(function (props) {
       e.preventDefault();
       e.stopPropagation();
       var index = fileList.indexOf(file);
-
       if (isImage(file.extname)) {
         setVisible(true);
         setPhotoIndex(index);
@@ -101,7 +79,6 @@ Upload.Attachment = connect(function (props) {
         saveAs(file.url, "".concat(file.title).concat(file.extname));
       }
     };
-
     return /*#__PURE__*/React.createElement("div", {
       className: 'ant-upload-list-picture-card-container'
     }, /*#__PURE__*/React.createElement("div", {
@@ -147,15 +124,11 @@ Upload.Attachment = connect(function (props) {
         setFileList(function (prevFileList) {
           if (!multiple) {
             _onChange(null);
-
             return [];
           }
-
           var index = prevFileList.indexOf(file);
           prevFileList.splice(index, 1);
-
           _onChange(toValue(_toConsumableArray(prevFileList)));
-
           return _toConsumableArray(prevFileList);
         });
       }
@@ -176,28 +149,24 @@ Upload.Attachment = connect(function (props) {
     fileList: fileList,
     onChange: function onChange(info) {
       setSync(false);
-
       if (multiple) {
         if (info.file.status === 'done') {
           _onChange(toValue(info.fileList));
         }
-
         setFileList(info.fileList.map(toItem));
       } else {
         if (info.file.status === 'done') {
           var _info$file, _info$file$response;
-
           // TODO(BUG): object 的联动有问题，不响应，折中的办法先置空再赋值
           _onChange(null);
-
           _onChange((_info$file = info.file) === null || _info$file === void 0 ? void 0 : (_info$file$response = _info$file.response) === null || _info$file$response === void 0 ? void 0 : _info$file$response.data);
         }
-
         setFileList([toItem(info.file)]);
       }
     },
     showUploadList: false
-  }), !disabled && (multiple || toArr(value).length < 1) && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("br", null), " ", t('Upload')))))), visible && /*#__PURE__*/React.createElement(Lightbox // discourageDownloads={true}
+  }), !disabled && (multiple || toArr(value).length < 1) && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlusOutlined, null), /*#__PURE__*/React.createElement("br", null), " ", t('Upload')))))), visible && /*#__PURE__*/React.createElement(Lightbox
+  // discourageDownloads={true}
   , {
     // discourageDownloads={true}
     mainSrc: (_images$photoIndex = images[photoIndex]) === null || _images$photoIndex === void 0 ? void 0 : _images$photoIndex.imageUrl,
@@ -230,7 +199,7 @@ Upload.Attachment = connect(function (props) {
       }
     }, /*#__PURE__*/React.createElement(DownloadOutlined, null))]
   }));
-}, mapReadPretty(ReadPretty.Attachment));
+}, mapReadPretty(ReadPretty.File));
 Upload.Dragger = connect(function (props) {
   var tipContent = props.tipContent;
   return /*#__PURE__*/React.createElement("div", {
@@ -239,4 +208,50 @@ Upload.Dragger = connect(function (props) {
 }, mapProps({
   value: 'fileList'
 }));
+Upload.DraggerV2 = connect(function (props) {
+  var _useTranslation2 = useTranslation(),
+    t = _useTranslation2.t;
+  var defaultTitle = t('Click or drag file to this area to upload');
+  var defaultSubTitle = t('Support for a single or bulk upload, file size should not exceed') + " 10MB";
+  var _props$title = props.title,
+    title = _props$title === void 0 ? defaultTitle : _props$title,
+    _props$subTitle = props.subTitle,
+    subTitle = _props$subTitle === void 0 ? defaultSubTitle : _props$subTitle,
+    useProps = props.useProps;
+  var extraProps = (useProps === null || useProps === void 0 ? void 0 : useProps()) || {};
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
+  var handleChange = function handleChange() {
+    var fileList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var onChange = extraProps.onChange;
+    onChange === null || onChange === void 0 ? void 0 : onChange(fileList);
+    if (fileList.some(function (file) {
+      return file.status === 'uploading';
+    })) {
+      setLoading(true);
+    } else {
+      setLoading(false);
+    }
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: usePrefixCls('upload-dragger')
+  }, /*#__PURE__*/React.createElement(AntdUpload.Dragger, _objectSpread({}, useUploadProps(_objectSpread(_objectSpread(_objectSpread({}, props), extraProps), {}, {
+    onChange: handleChange
+  }))), /*#__PURE__*/React.createElement("p", {
+    className: "ant-upload-drag-icon"
+  }, loading ? /*#__PURE__*/React.createElement(LoadingOutlined, {
+    style: {
+      fontSize: 36
+    },
+    spin: true
+  }) : /*#__PURE__*/React.createElement(InboxOutlined, null)), /*#__PURE__*/React.createElement("p", {
+    className: "ant-upload-text"
+  }, title), /*#__PURE__*/React.createElement("p", {
+    className: "ant-upload-hint"
+  }, subTitle)));
+}, mapProps({
+  value: 'fileList'
+}));
 export default Upload;

package/es/schema-component/antd/upload/shared.js

@@ -1,29 +1,18 @@
 var _excluded = ["serviceErrorMessage"];
-
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-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 _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 _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; }
-
 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 = 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; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }
-
 import { useField } from '@formily/react';
 import { reaction } from '@formily/reactive';
 import { isArr, isValid, toArr as toArray } from '@formily/shared';
@@ -38,21 +27,16 @@ export var toMap = function toMap(fileList) {
   if (!fileList) {
     return [];
   }
-
   if (_typeof(fileList) !== 'object') {
     return [];
   }
-
   var list = fileList;
-
   if (!Array.isArray(fileList)) {
     if (Object.keys(_objectSpread({}, fileList)).length === 0) {
       return [];
     }
-
     list = [fileList];
   }
-
   return list.map(function (item) {
     return [item.id || item.uid, toItem(item)];
   });
@@ -61,21 +45,16 @@ export var toImages = function toImages(fileList) {
   if (!fileList) {
     return [];
   }
-
   if (_typeof(fileList) !== 'object') {
     return [];
   }
-
   if (Object.keys(fileList).length === 0) {
     return [];
   }
-
   var list = fileList;
-
   if (!Array.isArray(fileList) && _typeof(fileList) === 'object') {
     list = [fileList];
   }
-
   return list.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
       title: item.title || item.name,
@@ -89,11 +68,9 @@ export var toArr = function toArr(value) {
   if (!isValid(value)) {
     return [];
   }
-
   if (Object.keys(value).length === 0) {
     return [];
   }
-
   return toArray(value);
 };
 export var testOpts = function testOpts(ext, options) {
@@ -102,13 +79,11 @@ export var testOpts = function testOpts(ext, options) {
       return ext.test(url);
     });
   }
-
   if (options && isArr(options.exclude)) {
     return !options.exclude.some(function (url) {
       return ext.test(url);
     });
   }
-
   return true;
 };
 export var getImageByUrl = function getImageByUrl(url, options) {
@@ -117,7 +92,6 @@ export var getImageByUrl = function getImageByUrl(url, options) {
       return UPLOAD_PLACEHOLDER[i].icon || url;
     }
   }
-
   return url;
 };
 export var getURL = function getURL(target) {
@@ -148,7 +122,6 @@ export var normalizeFileList = function normalizeFileList(fileList) {
       });
     });
   }
-
   return [];
 };
 export var useValidator = function useValidator(validator) {
@@ -173,13 +146,10 @@ export var useUploadValidator = function useUploadValidator() {
   var serviceErrorMessage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'Upload Service Error';
   useValidator(function (value) {
     var list = toArr(value);
-
     for (var i = 0; i < list.length; i++) {
       var _list$i;
-
       if (((_list$i = list[i]) === null || _list$i === void 0 ? void 0 : _list$i.status) === 'error') {
         var _list$i2;
-
         return getErrorMessage((_list$i2 = list[i]) === null || _list$i2 === void 0 ? void 0 : _list$i2.response) || getErrorMessage(list[i]) || serviceErrorMessage;
       }
     }
@@ -187,16 +157,12 @@ export var useUploadValidator = function useUploadValidator() {
 };
 export function useUploadProps(_ref) {
   var serviceErrorMessage = _ref.serviceErrorMessage,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    props = _objectWithoutProperties(_ref, _excluded);
   useUploadValidator(serviceErrorMessage);
-
   var onChange = function onChange(param) {
     var _props$onChange;
-
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, normalizeFileList(_toConsumableArray(param.fileList)));
   };
-
   var api = useAPIClient();
   return _objectSpread(_objectSpread({}, props), {}, {
     // in customRequest method can't modify form's status(e.g: form.disabled=true )
@@ -204,29 +170,27 @@ export function useUploadProps(_ref) {
     // which will cause multiple files upload fail
     customRequest: function customRequest(_ref2) {
       var action = _ref2.action,
-          data = _ref2.data,
-          file = _ref2.file,
-          filename = _ref2.filename,
-          headers = _ref2.headers,
-          onError = _ref2.onError,
-          onProgress = _ref2.onProgress,
-          onSuccess = _ref2.onSuccess,
-          withCredentials = _ref2.withCredentials;
+        data = _ref2.data,
+        file = _ref2.file,
+        filename = _ref2.filename,
+        headers = _ref2.headers,
+        onError = _ref2.onError,
+        onProgress = _ref2.onProgress,
+        onSuccess = _ref2.onSuccess,
+        withCredentials = _ref2.withCredentials;
       var formData = new FormData();
-
       if (data) {
         Object.keys(data).forEach(function (key) {
           formData.append(key, data[key]);
         });
       }
-
       formData.append(filename, file);
       api.axios.post(action, formData, {
         withCredentials: withCredentials,
         headers: headers,
         onUploadProgress: function onUploadProgress(_ref3) {
           var total = _ref3.total,
-              loaded = _ref3.loaded;
+            loaded = _ref3.loaded;
           onProgress({
             percent: Math.round(loaded / total * 100).toFixed(2)
           }, file);
@@ -246,11 +210,9 @@ export function useUploadProps(_ref) {
 }
 export var toItem = function toItem(file) {
   var _file, _file$response;
-
   if ((_file = file) === null || _file === void 0 ? void 0 : (_file$response = _file.response) === null || _file$response === void 0 ? void 0 : _file$response.data) {
     file = file.response.data;
   }
-
   return _objectSpread(_objectSpread({}, file), {}, {
     id: file.id || file.uid,
     title: file.title || file.name,
@@ -267,7 +229,6 @@ export var toValue = function toValue(fileList) {
     return !file.response || file.status === 'done';
   }).map(function (file) {
     var _file$response2;
-
     return (file === null || file === void 0 ? void 0 : (_file$response2 = file.response) === null || _file$response2 === void 0 ? void 0 : _file$response2.data) || file;
   });
 };