cloud-b2b 1.1.76 → 1.1.78

package/es/InpurCascader/InputCascader.js

@@ -41,7 +41,7 @@ var PROPS = {
   onChange: PropTypes.func,
   loadData: PropTypes.func,
   //动态加载 ps：loadData 与 showSearch 无法一起使用
-  showSearch: PropTypes.func
+  showSearch: PropTypes.bool
 };
 var PROPS_KEYS = _Object$keys(PROPS);
 var InputCascader = /*#__PURE__*/function (_React$Component) {
@@ -109,7 +109,7 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       return /*#__PURE__*/React.createElement(_Cascader, _extends({}, this.getProps(), {
         style: {
-          backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
         }
       }));
     }

package/es/SuperForm2/SuperForm.js

@@ -28,7 +28,7 @@ import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/ins
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context25, _context26; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context25 = ownKeys(Object(t), !0)).call(_context25, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context26 = ownKeys(Object(t))).call(_context26, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context27, _context28; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context27 = ownKeys(Object(t), !0)).call(_context27, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context28 = ownKeys(Object(t))).call(_context28, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
@@ -570,7 +570,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         showQuery = _ref10.showQuery,
         key = _ref10.key,
         showInfo = _ref10.showInfo,
-        showInfoTitle = _ref10.showInfoTitle;
+        showInfoTitle = _ref10.showInfoTitle,
+        showIcon = _ref10.showIcon,
+        iconType = _ref10.iconType;
       if (showAdd && type !== 'readonly') {
         var _context22;
         var onClick = _bindInstanceProperty(_context22 = _this2.onAdd).call(_context22, _this2, key, title);
@@ -587,6 +589,24 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           type: "search",
           onClick: _onClick
         }));
+      } else if (showIcon && iconType && type !== 'readonly' && showInfoTitle) {
+        var _context24;
+        var _onClick2 = _bindInstanceProperty(_context24 = _this2.onAdd).call(_context24, _this2, key, title);
+        return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
+          title: showInfoTitle
+        }, /*#__PURE__*/React.createElement(_Icon, {
+          role: "add",
+          type: iconType,
+          onClick: _onClick2
+        })));
+      } else if (showIcon && iconType && type !== 'readonly') {
+        var _context25;
+        var _onClick3 = _bindInstanceProperty(_context25 = _this2.onAdd).call(_context25, _this2, key, title);
+        return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
+          role: "add",
+          type: iconType,
+          onClick: _onClick3
+        }));
       } else if (showInfo) {
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
           title: showInfoTitle
@@ -647,7 +667,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "toCols", function () {
-      var _context24;
+      var _context26;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -656,7 +676,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         colNum = 1;
       }
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context24 = _this2.getControls()).call(_context24, function (control) {
+      return _mapInstanceProperty(_context26 = _this2.getControls()).call(_context26, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/es/SuperToolbar/SuperToolbar.js

@@ -12,16 +12,27 @@ import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
 import _Menu from "antd/es/menu";
 var _excluded = ["type", "children"];
+function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(t), !0)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context5 = ownKeys(Object(t))).call(_context5, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _setTimeout from "@babel/runtime-corejs3/core-js-stable/set-timeout";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import _Reflect$construct from "@babel/runtime-corejs3/core-js-stable/reflect/construct";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
+import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _Object$getOwnPropertyDescriptor from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor";
+import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/for-each";
+import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors";
+import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/object/define-properties";
+import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
 import PropTypes from 'prop-types';
 import variables from '../variables';
+import { Control } from "../index";
 var MenuItem = _Menu.Item;
 var SubMenu = _Menu.SubMenu;
 var clicktag = 0; //被点击标识
@@ -95,17 +106,22 @@ var SuperToolbar = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
-    _defineProperty(_this, "toSubMenu", function (_ref2) {
-      var key = _ref2.key,
-        title = _ref2.title,
-        _ref2$subMenu = _ref2.subMenu,
-        subMenu = _ref2$subMenu === void 0 ? [] : _ref2$subMenu;
+    _defineProperty(_this, "onFileChange", function (_ref2, file) {
+      var key = _ref2.key;
+      var onFileChange = _this.props.onFileChange;
+      onFileChange && onFileChange(key, file);
+    });
+    _defineProperty(_this, "toSubMenu", function (_ref3) {
+      var key = _ref3.key,
+        title = _ref3.title,
+        _ref3$subMenu = _ref3.subMenu,
+        subMenu = _ref3$subMenu === void 0 ? [] : _ref3$subMenu;
       return /*#__PURE__*/React.createElement(SubMenu, {
         key: key,
         title: title
-      }, _mapInstanceProperty(subMenu).call(subMenu, function (_ref3) {
-        var key = _ref3.key,
-          title = _ref3.title;
+      }, _mapInstanceProperty(subMenu).call(subMenu, function (_ref4) {
+        var key = _ref4.key,
+          title = _ref4.title;
         return /*#__PURE__*/React.createElement(MenuItem, {
           key: key
         }, title);
@@ -127,17 +143,23 @@ var SuperToolbar = /*#__PURE__*/function (_React$Component) {
         }
       }));
     });
-    _defineProperty(_this, "toButton", function (_ref4) {
+    _defineProperty(_this, "toButton", function (control) {
       var _context2;
-      var key = _ref4.key,
-        title = _ref4.title,
-        type = _ref4.bsStyle,
-        confirm = _ref4.confirm,
-        menu = _ref4.menu,
-        loading = _ref4.loading;
+      var _this$props2 = _this.props,
+        _this$props2$size = _this$props2.size,
+        size = _this$props2$size === void 0 ? 'small' : _this$props2$size,
+        buildSuperUploadProps = _this$props2.buildSuperUploadProps,
+        _this$props2$fileList = _this$props2.fileList,
+        fileList = _this$props2$fileList === void 0 ? [] : _this$props2$fileList;
+      var key = control.key,
+        title = control.title,
+        type = control.bsStyle,
+        confirm = control.confirm,
+        menu = control.menu,
+        loading = control.loading,
+        _control$isUpload = control.isUpload,
+        isUpload = _control$isUpload === void 0 ? false : _control$isUpload;
       var onClick = _bindInstanceProperty(_context2 = _this.onClick).call(_context2, _this, key);
-      var _this$props$size = _this.props.size,
-        size = _this$props$size === void 0 ? 'small' : _this$props$size;
       if (menu && menu.length) {
         return /*#__PURE__*/React.createElement(_Dropdown, {
           key: key,
@@ -149,6 +171,23 @@ var SuperToolbar = /*#__PURE__*/function (_React$Component) {
         }, title, /*#__PURE__*/React.createElement(_Icon, {
           type: "down"
         })));
+      } else if (isUpload) {
+        var _context3;
+        var commonProps = buildSuperUploadProps ? buildSuperUploadProps() : {};
+        var uploadProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, control), {}, {
+          onFileChange: _bindInstanceProperty(_context3 = _this.onFileChange).call(_context3, null, {
+            key: key
+          })
+        }, _this.props), {}, {
+          type: 'uploadImg'
+        }, commonProps), {}, {
+          showUploadList: false,
+          listType: 'text',
+          limitNumber: 200,
+          value: fileList,
+          title: ''
+        });
+        return /*#__PURE__*/React.createElement(Control, uploadProps);
       } else if (!confirm) {
         return /*#__PURE__*/React.createElement(ButtonEx, {
           key: key,

package/es/SuperUpload/SuperUpload.js

@@ -65,7 +65,8 @@ var convertFileList = function convertFileList(fileList) {
     return {
       fileFormat: item.fileFormat || 'id',
       fileName: item.name,
-      fileUrl: item.response ? item.response.result : ''
+      fileUrl: item.response ? item.response.result : '',
+      fileShowUrl: item.fileShowUrl || ''
     };
   });
 };
@@ -81,7 +82,9 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
     _props$fileDeleteList = props.fileDeleteList,
     fileDeleteList = _props$fileDeleteList === void 0 ? [] : _props$fileDeleteList,
     onFileChange = props.onFileChange,
-    accept = props.accept;
+    accept = props.accept,
+    _props$showUploadList = props.showUploadList,
+    showUploadList = _props$showUploadList === void 0 ? true : _props$showUploadList;
   var onChange = function onChange(_ref) {
     var file = _ref.file,
       fileList = _ref.fileList;
@@ -134,6 +137,11 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
       accept: accept
     };
   }
+  var uploadList = showUploadList ? {
+    showPreviewIcon: listType !== 'text',
+    showRemoveIcon: !readonly,
+    showDownloadIcon: true
+  } : false;
   return _objectSpread(_objectSpread({
     action: props.action || '/api/proxy/zuul/archiver-service/file/upload/document',
     fileList: fileList,
@@ -157,11 +165,7 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
       }
       return isLt;
     },
-    showUploadList: {
-      showPreviewIcon: listType !== 'text',
-      showRemoveIcon: !readonly,
-      showDownloadIcon: true
-    }
+    showUploadList: uploadList
   });
 };
 function UploadButton(_ref3) {
@@ -210,19 +214,19 @@ function SuperUpload(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     fileList = _useState4[0],
     setFileList = _useState4[1];
-  var initFileList = [];
   useEffect(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
     }
     function _fetchImgData() {
       _fetchImgData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-        var _iterator, _step, item, _iterator2, _step2, _item, _t, _t2, _t3, _t4, _t5;
+        var initFileList, _iterator, _step, item, _t, _t2;
         return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(props.fileList.length > 0 || fileList.length > 0)) {
-                _context3.next = 24;
+              initFileList = [];
+              if (!(props.fileList.length > 0)) {
+                _context3.next = 10;
                 break;
               }
               _iterator = _createForOfIteratorHelper(props.fileList);
@@ -230,20 +234,16 @@ function SuperUpload(props) {
               _iterator.s();
             case 2:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 11;
+                _context3.next = 7;
                 break;
               }
               item = _step.value;
-              if (!(item.fileUrl == '')) {
-                _context3.next = 6;
-                break;
-              }
               if (!props.getFileList) {
                 _context3.next = 4;
                 break;
               }
               _context3.next = 3;
-              return props.getFileList(fileList);
+              return props.getFileList(props.fileList);
             case 3:
               _t = _context3.sent;
               _context3.next = 5;
@@ -252,84 +252,29 @@ function SuperUpload(props) {
               _t = [];
             case 5:
               initFileList = _t;
-              _context3.next = 10;
-              break;
             case 6:
-              if (!props.getFileList) {
-                _context3.next = 8;
-                break;
-              }
-              _context3.next = 7;
-              return props.getFileList(props.fileList);
+              _context3.next = 2;
+              break;
             case 7:
-              _t2 = _context3.sent;
               _context3.next = 9;
               break;
             case 8:
-              _t2 = [];
+              _context3.prev = 8;
+              _t2 = _context3["catch"](1);
+              _iterator.e(_t2);
             case 9:
-              initFileList = _t2;
-            case 10:
-              _context3.next = 2;
-              break;
-            case 11:
-              _context3.next = 13;
-              break;
-            case 12:
-              _context3.prev = 12;
-              _t3 = _context3["catch"](1);
-              _iterator.e(_t3);
-            case 13:
-              _context3.prev = 13;
+              _context3.prev = 9;
               _iterator.f();
-              return _context3.finish(13);
-            case 14:
-              _iterator2 = _createForOfIteratorHelper(fileList);
-              _context3.prev = 15;
-              _iterator2.s();
-            case 16:
-              if ((_step2 = _iterator2.n()).done) {
-                _context3.next = 21;
-                break;
-              }
-              _item = _step2.value;
-              if (!props.getFileList) {
-                _context3.next = 18;
-                break;
-              }
-              _context3.next = 17;
-              return props.getFileList(fileList);
-            case 17:
-              _t4 = _context3.sent;
-              _context3.next = 19;
-              break;
-            case 18:
-              _t4 = [];
-            case 19:
-              initFileList = _t4;
-            case 20:
-              _context3.next = 16;
-              break;
-            case 21:
-              _context3.next = 23;
-              break;
-            case 22:
-              _context3.prev = 22;
-              _t5 = _context3["catch"](15);
-              _iterator2.e(_t5);
-            case 23:
-              _context3.prev = 23;
-              _iterator2.f();
-              return _context3.finish(23);
-            case 24:
+              return _context3.finish(9);
+            case 10:
               //const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
               setFileList(initFileList ? initFileList : []);
               setLoading(false);
-            case 25:
+            case 11:
             case "end":
               return _context3.stop();
           }
-        }, _callee2, null, [[1, 12, 13, 14], [15, 22, 23, 24]]);
+        }, _callee2, null, [[1, 8, 9, 10]]);
       }));
       return _fetchImgData.apply(this, arguments);
     }
@@ -360,13 +305,21 @@ function SuperUpload(props) {
     title = props.title;
   var className = listType === 'picture-card' && (fileList === null || fileList === void 0 ? void 0 : fileList.length) < limitNumber ? variables('SuperUpload') : variables('SuperUpload2');
   var canUpload = (fileList === null || fileList === void 0 ? void 0 : fileList.length) >= limitNumber;
-  return loading ? /*#__PURE__*/React.createElement("div", null, "loading...") : /*#__PURE__*/React.createElement("div", {
-    className: className
-  }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/React.createElement(Title, {
-    title: props.title || '附件',
-    required: props.required
-  }) : null, /*#__PURE__*/React.createElement(_Upload, uploadProps, readonly || canUpload ? null : /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
-    fileList: fileList
-  }))), props.needText ? /*#__PURE__*/React.createElement("span", null, props.remark) : null);
+  var _props$showUploadList2 = props.showUploadList,
+    showUploadList = _props$showUploadList2 === void 0 ? true : _props$showUploadList2;
+  if (showUploadList) {
+    return loading ? /*#__PURE__*/React.createElement("div", null, "loading...") : /*#__PURE__*/React.createElement("div", {
+      className: className
+    }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/React.createElement(Title, {
+      title: props.title || '附件',
+      required: props.required
+    }) : null, /*#__PURE__*/React.createElement(_Upload, uploadProps, readonly || canUpload ? null : /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
+      fileList: fileList
+    }))), props.needText ? /*#__PURE__*/React.createElement("span", null, props.remark) : null);
+  } else {
+    return /*#__PURE__*/React.createElement(_Upload, uploadProps, /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
+      fileList: fileList
+    })));
+  }
 }
 export default SuperUpload;

package/lib/InpurCascader/InputCascader.js

@@ -48,7 +48,7 @@ var PROPS = {
   onChange: _propTypes["default"].func,
   loadData: _propTypes["default"].func,
   //动态加载 ps：loadData 与 showSearch 无法一起使用
-  showSearch: _propTypes["default"].func
+  showSearch: _propTypes["default"].bool
 };
 var PROPS_KEYS = (0, _keys["default"])(PROPS);
 var InputCascader = /*#__PURE__*/function (_React$Component) {
@@ -116,7 +116,7 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       return /*#__PURE__*/_react["default"].createElement(_cascader["default"], (0, _extends2["default"])({}, this.getProps(), {
         style: {
-          backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
         }
       }));
     }

package/lib/SuperForm2/SuperForm.js

@@ -45,7 +45,7 @@ var _Control = _interopRequireWildcard(require("../Control"));
 var _variables = _interopRequireDefault(require("../variables"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context25, _context26; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context25 = ownKeys(Object(t), !0)).call(_context25, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context26 = ownKeys(Object(t))).call(_context26, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context27, _context28; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context27 = ownKeys(Object(t), !0)).call(_context27, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context28 = ownKeys(Object(t))).call(_context28, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var FormItem = _form["default"].Item;
@@ -581,7 +581,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         showQuery = _ref10.showQuery,
         key = _ref10.key,
         showInfo = _ref10.showInfo,
-        showInfoTitle = _ref10.showInfoTitle;
+        showInfoTitle = _ref10.showInfoTitle,
+        showIcon = _ref10.showIcon,
+        iconType = _ref10.iconType;
       if (showAdd && type !== 'readonly') {
         var _context22;
         var onClick = (0, _bind["default"])(_context22 = _this2.onAdd).call(_context22, _this2, key, title);
@@ -598,6 +600,24 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           type: "search",
           onClick: _onClick
         }));
+      } else if (showIcon && iconType && type !== 'readonly' && showInfoTitle) {
+        var _context24;
+        var _onClick2 = (0, _bind["default"])(_context24 = _this2.onAdd).call(_context24, _this2, key, title);
+        return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+          title: showInfoTitle
+        }, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          role: "add",
+          type: iconType,
+          onClick: _onClick2
+        })));
+      } else if (showIcon && iconType && type !== 'readonly') {
+        var _context25;
+        var _onClick3 = (0, _bind["default"])(_context25 = _this2.onAdd).call(_context25, _this2, key, title);
+        return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          role: "add",
+          type: iconType,
+          onClick: _onClick3
+        }));
       } else if (showInfo) {
         return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
           title: showInfoTitle
@@ -658,7 +678,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])(_this2, "toCols", function () {
-      var _context24;
+      var _context26;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -667,7 +687,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         colNum = 1;
       }
       var span = 24 / colNum;
-      return (0, _map["default"])(_context24 = _this2.getControls()).call(_context24, function (control) {
+      return (0, _map["default"])(_context26 = _this2.getControls()).call(_context26, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/lib/SuperToolbar/SuperToolbar.js

@@ -1,6 +1,13 @@
 "use strict";
 
 var _Reflect$construct = require("@babel/runtime-corejs3/core-js-stable/reflect/construct");
+var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
+var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
+var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
+var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
+var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
+var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
+var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 _Object$defineProperty(exports, "__esModule", {
@@ -27,7 +34,10 @@ var _menu = _interopRequireDefault(require("antd/lib/menu"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _variables = _interopRequireDefault(require("../variables"));
+var _index = require("../index");
 var _excluded = ["type", "children"];
+function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(t), !0)).call(_context4, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context5 = ownKeys(Object(t))).call(_context5, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var MenuItem = _menu["default"].Item;
@@ -103,17 +113,22 @@ var SuperToolbar = /*#__PURE__*/function (_React$Component) {
         }
       }
     });
-    (0, _defineProperty2["default"])(_this, "toSubMenu", function (_ref2) {
-      var key = _ref2.key,
-        title = _ref2.title,
-        _ref2$subMenu = _ref2.subMenu,
-        subMenu = _ref2$subMenu === void 0 ? [] : _ref2$subMenu;
+    (0, _defineProperty2["default"])(_this, "onFileChange", function (_ref2, file) {
+      var key = _ref2.key;
+      var onFileChange = _this.props.onFileChange;
+      onFileChange && onFileChange(key, file);
+    });
+    (0, _defineProperty2["default"])(_this, "toSubMenu", function (_ref3) {
+      var key = _ref3.key,
+        title = _ref3.title,
+        _ref3$subMenu = _ref3.subMenu,
+        subMenu = _ref3$subMenu === void 0 ? [] : _ref3$subMenu;
       return /*#__PURE__*/_react["default"].createElement(SubMenu, {
         key: key,
         title: title
-      }, (0, _map["default"])(subMenu).call(subMenu, function (_ref3) {
-        var key = _ref3.key,
-          title = _ref3.title;
+      }, (0, _map["default"])(subMenu).call(subMenu, function (_ref4) {
+        var key = _ref4.key,
+          title = _ref4.title;
         return /*#__PURE__*/_react["default"].createElement(MenuItem, {
           key: key
         }, title);
@@ -135,17 +150,23 @@ var SuperToolbar = /*#__PURE__*/function (_React$Component) {
         }
       }));
     });
-    (0, _defineProperty2["default"])(_this, "toButton", function (_ref4) {
+    (0, _defineProperty2["default"])(_this, "toButton", function (control) {
       var _context2;
-      var key = _ref4.key,
-        title = _ref4.title,
-        type = _ref4.bsStyle,
-        confirm = _ref4.confirm,
-        menu = _ref4.menu,
-        loading = _ref4.loading;
+      var _this$props2 = _this.props,
+        _this$props2$size = _this$props2.size,
+        size = _this$props2$size === void 0 ? 'small' : _this$props2$size,
+        buildSuperUploadProps = _this$props2.buildSuperUploadProps,
+        _this$props2$fileList = _this$props2.fileList,
+        fileList = _this$props2$fileList === void 0 ? [] : _this$props2$fileList;
+      var key = control.key,
+        title = control.title,
+        type = control.bsStyle,
+        confirm = control.confirm,
+        menu = control.menu,
+        loading = control.loading,
+        _control$isUpload = control.isUpload,
+        isUpload = _control$isUpload === void 0 ? false : _control$isUpload;
       var onClick = (0, _bind["default"])(_context2 = _this.onClick).call(_context2, _this, key);
-      var _this$props$size = _this.props.size,
-        size = _this$props$size === void 0 ? 'small' : _this$props$size;
       if (menu && menu.length) {
         return /*#__PURE__*/_react["default"].createElement(_dropdown["default"], {
           key: key,
@@ -157,6 +178,23 @@ var SuperToolbar = /*#__PURE__*/function (_React$Component) {
         }, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
           type: "down"
         })));
+      } else if (isUpload) {
+        var _context3;
+        var commonProps = buildSuperUploadProps ? buildSuperUploadProps() : {};
+        var uploadProps = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, control), {}, {
+          onFileChange: (0, _bind["default"])(_context3 = _this.onFileChange).call(_context3, null, {
+            key: key
+          })
+        }, _this.props), {}, {
+          type: 'uploadImg'
+        }, commonProps), {}, {
+          showUploadList: false,
+          listType: 'text',
+          limitNumber: 200,
+          value: fileList,
+          title: ''
+        });
+        return /*#__PURE__*/_react["default"].createElement(_index.Control, uploadProps);
       } else if (!confirm) {
         return /*#__PURE__*/_react["default"].createElement(ButtonEx, {
           key: key,

package/lib/SuperUpload/SuperUpload.js

@@ -36,7 +36,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _helper = _interopRequireDefault(require("../helper"));
 var _Title = _interopRequireDefault(require("../Title"));
 var _variables = _interopRequireDefault(require("../variables"));
-function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t6 in e) "default" !== _t6 && {}.hasOwnProperty.call(e, _t6) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t6)) && (i.get || i.set) ? o(f, _t6, i) : f[_t6] = e[_t6]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t3 in e) "default" !== _t3 && {}.hasOwnProperty.call(e, _t3) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t3)) && (i.get || i.set) ? o(f, _t3, i) : f[_t3] = e[_t3]); return f; })(e, t); }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof _Symbol && _getIteratorMethod(r) || r["@@iterator"]; if (!t) { if (_Array$isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { var _context7; if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = _sliceInstanceProperty(_context7 = {}.toString.call(r)).call(_context7, 8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? _Array$from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -76,7 +76,8 @@ var convertFileList = function convertFileList(fileList) {
     return {
       fileFormat: item.fileFormat || 'id',
       fileName: item.name,
-      fileUrl: item.response ? item.response.result : ''
+      fileUrl: item.response ? item.response.result : '',
+      fileShowUrl: item.fileShowUrl || ''
     };
   });
 };
@@ -92,7 +93,9 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
     _props$fileDeleteList = props.fileDeleteList,
     fileDeleteList = _props$fileDeleteList === void 0 ? [] : _props$fileDeleteList,
     onFileChange = props.onFileChange,
-    accept = props.accept;
+    accept = props.accept,
+    _props$showUploadList = props.showUploadList,
+    showUploadList = _props$showUploadList === void 0 ? true : _props$showUploadList;
   var onChange = function onChange(_ref) {
     var file = _ref.file,
       fileList = _ref.fileList;
@@ -145,6 +148,11 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
       accept: accept
     };
   }
+  var uploadList = showUploadList ? {
+    showPreviewIcon: listType !== 'text',
+    showRemoveIcon: !readonly,
+    showDownloadIcon: true
+  } : false;
   return _objectSpread(_objectSpread({
     action: props.action || '/api/proxy/zuul/archiver-service/file/upload/document',
     fileList: fileList,
@@ -168,11 +176,7 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
       }
       return isLt;
     },
-    showUploadList: {
-      showPreviewIcon: listType !== 'text',
-      showRemoveIcon: !readonly,
-      showDownloadIcon: true
-    }
+    showUploadList: uploadList
   });
 };
 function UploadButton(_ref3) {
@@ -221,19 +225,19 @@ function SuperUpload(props) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     fileList = _useState4[0],
     setFileList = _useState4[1];
-  var initFileList = [];
   (0, _react.useEffect)(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
     }
     function _fetchImgData() {
       _fetchImgData = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var _iterator, _step, item, _iterator2, _step2, _item, _t, _t2, _t3, _t4, _t5;
+        var initFileList, _iterator, _step, item, _t, _t2;
         return _regenerator["default"].wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              if (!(props.fileList.length > 0 || fileList.length > 0)) {
-                _context3.next = 24;
+              initFileList = [];
+              if (!(props.fileList.length > 0)) {
+                _context3.next = 10;
                 break;
               }
               _iterator = _createForOfIteratorHelper(props.fileList);
@@ -241,20 +245,16 @@ function SuperUpload(props) {
               _iterator.s();
             case 2:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 11;
+                _context3.next = 7;
                 break;
               }
               item = _step.value;
-              if (!(item.fileUrl == '')) {
-                _context3.next = 6;
-                break;
-              }
               if (!props.getFileList) {
                 _context3.next = 4;
                 break;
               }
               _context3.next = 3;
-              return props.getFileList(fileList);
+              return props.getFileList(props.fileList);
             case 3:
               _t = _context3.sent;
               _context3.next = 5;
@@ -263,84 +263,29 @@ function SuperUpload(props) {
               _t = [];
             case 5:
               initFileList = _t;
-              _context3.next = 10;
-              break;
             case 6:
-              if (!props.getFileList) {
-                _context3.next = 8;
-                break;
-              }
-              _context3.next = 7;
-              return props.getFileList(props.fileList);
+              _context3.next = 2;
+              break;
             case 7:
-              _t2 = _context3.sent;
               _context3.next = 9;
               break;
             case 8:
-              _t2 = [];
+              _context3.prev = 8;
+              _t2 = _context3["catch"](1);
+              _iterator.e(_t2);
             case 9:
-              initFileList = _t2;
-            case 10:
-              _context3.next = 2;
-              break;
-            case 11:
-              _context3.next = 13;
-              break;
-            case 12:
-              _context3.prev = 12;
-              _t3 = _context3["catch"](1);
-              _iterator.e(_t3);
-            case 13:
-              _context3.prev = 13;
+              _context3.prev = 9;
               _iterator.f();
-              return _context3.finish(13);
-            case 14:
-              _iterator2 = _createForOfIteratorHelper(fileList);
-              _context3.prev = 15;
-              _iterator2.s();
-            case 16:
-              if ((_step2 = _iterator2.n()).done) {
-                _context3.next = 21;
-                break;
-              }
-              _item = _step2.value;
-              if (!props.getFileList) {
-                _context3.next = 18;
-                break;
-              }
-              _context3.next = 17;
-              return props.getFileList(fileList);
-            case 17:
-              _t4 = _context3.sent;
-              _context3.next = 19;
-              break;
-            case 18:
-              _t4 = [];
-            case 19:
-              initFileList = _t4;
-            case 20:
-              _context3.next = 16;
-              break;
-            case 21:
-              _context3.next = 23;
-              break;
-            case 22:
-              _context3.prev = 22;
-              _t5 = _context3["catch"](15);
-              _iterator2.e(_t5);
-            case 23:
-              _context3.prev = 23;
-              _iterator2.f();
-              return _context3.finish(23);
-            case 24:
+              return _context3.finish(9);
+            case 10:
               //const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
               setFileList(initFileList ? initFileList : []);
               setLoading(false);
-            case 25:
+            case 11:
             case "end":
               return _context3.stop();
           }
-        }, _callee2, null, [[1, 12, 13, 14], [15, 22, 23, 24]]);
+        }, _callee2, null, [[1, 8, 9, 10]]);
       }));
       return _fetchImgData.apply(this, arguments);
     }
@@ -371,13 +316,21 @@ function SuperUpload(props) {
     title = props.title;
   var className = listType === 'picture-card' && (fileList === null || fileList === void 0 ? void 0 : fileList.length) < limitNumber ? (0, _variables["default"])('SuperUpload') : (0, _variables["default"])('SuperUpload2');
   var canUpload = (fileList === null || fileList === void 0 ? void 0 : fileList.length) >= limitNumber;
-  return loading ? /*#__PURE__*/_react["default"].createElement("div", null, "loading...") : /*#__PURE__*/_react["default"].createElement("div", {
-    className: className
-  }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/_react["default"].createElement(_Title["default"], {
-    title: props.title || '附件',
-    required: props.required
-  }) : null, /*#__PURE__*/_react["default"].createElement(_upload["default"], uploadProps, readonly || canUpload ? null : /*#__PURE__*/_react["default"].createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
-    fileList: fileList
-  }))), props.needText ? /*#__PURE__*/_react["default"].createElement("span", null, props.remark) : null);
+  var _props$showUploadList2 = props.showUploadList,
+    showUploadList = _props$showUploadList2 === void 0 ? true : _props$showUploadList2;
+  if (showUploadList) {
+    return loading ? /*#__PURE__*/_react["default"].createElement("div", null, "loading...") : /*#__PURE__*/_react["default"].createElement("div", {
+      className: className
+    }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/_react["default"].createElement(_Title["default"], {
+      title: props.title || '附件',
+      required: props.required
+    }) : null, /*#__PURE__*/_react["default"].createElement(_upload["default"], uploadProps, readonly || canUpload ? null : /*#__PURE__*/_react["default"].createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
+      fileList: fileList
+    }))), props.needText ? /*#__PURE__*/_react["default"].createElement("span", null, props.remark) : null);
+  } else {
+    return /*#__PURE__*/_react["default"].createElement(_upload["default"], uploadProps, /*#__PURE__*/_react["default"].createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
+      fileList: fileList
+    })));
+  }
 }
 var _default = exports["default"] = SuperUpload;

package/package.json

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