cloud-b2b 1.1.77 → 1.1.78

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

@@ -82,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;
@@ -135,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,
@@ -158,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) {
@@ -222,7 +225,6 @@ function SuperUpload(props) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               initFileList = [];
-              console.log(props.fileList);
               if (!(props.fileList.length > 0)) {
                 _context3.next = 10;
                 break;
@@ -303,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/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

@@ -93,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;
@@ -146,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,
@@ -169,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) {
@@ -233,7 +236,6 @@ function SuperUpload(props) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               initFileList = [];
-              console.log(props.fileList);
               if (!(props.fileList.length > 0)) {
                 _context3.next = 10;
                 break;
@@ -314,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.77",
+  "version": "1.1.78",
   "description": "A react component library dependent antd",
   "keywords": [
     "react",