cloud-b2b 1.1.3 → 1.1.4

package/es/Control/Control.js

@@ -334,16 +334,11 @@ var captcha = function captcha(props) {
 };
 
 var uploadImg = function uploadImg(props) {
-  var uploadProps = {
+  var uploadProps = _objectSpread(_objectSpread({}, props), {}, {
     fileList: props.value || [],
-    required: props.require,
-    multiple: false,
-    limitNumber: props.limitNumber || 10,
-    onFileChange: props.onFileChange,
-    needText: props.needText,
-    remark: props.remark,
     readonly: props.readonly || false
-  };
+  });
+
   return /*#__PURE__*/React.createElement(SuperUpload, uploadProps);
 }; // 支持的控件类型
 

package/es/SuperForm2/SuperForm.js

@@ -30,7 +30,7 @@ import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, 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 _context20, _context21; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context20 = ownKeys(Object(source), !0)).call(_context20, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context21 = ownKeys(Object(source))).call(_context21, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context23, _context24; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context23 = ownKeys(Object(source), !0)).call(_context23, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context24 = ownKeys(Object(source))).call(_context24, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
@@ -324,57 +324,74 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             readonly: true,
             onBlur: _bindInstanceProperty(_context3 = _this2.onExitValid).call(_context3, _assertThisInitialized(_this2), key)
           };
-        } else {
+        } else if (originType === 'uploadImg') {
           var _context4;
 
-          return {
+          var commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
+          return _objectSpread(_objectSpread(_objectSpread({}, props), commonProps), {}, {
+            readonly: true,
             onBlur: _bindInstanceProperty(_context4 = _this2.onExitValid).call(_context4, _assertThisInitialized(_this2), key)
+          });
+        } else {
+          var _context5;
+
+          return {
+            onBlur: _bindInstanceProperty(_context5 = _this2.onExitValid).call(_context5, _assertThisInitialized(_this2), key)
           };
         }
       } else if (type === 'text' || type === 'textArea') {
-        var _context5, _context6;
+        var _context6, _context7;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: _bindInstanceProperty(_context5 = _this2.onExitValid).call(_context5, _assertThisInitialized(_this2), key),
-          onBlur: _bindInstanceProperty(_context6 = _this2.onChange).call(_context6, _assertThisInitialized(_this2), key)
+          onChange: _bindInstanceProperty(_context6 = _this2.onExitValid).call(_context6, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context7 = _this2.onChange).call(_context7, _assertThisInitialized(_this2), key)
         });
       } else if (type === 'date') {
-        var _context7, _context8;
+        var _context8, _context9;
 
         var propsObj = _objectSpread(_objectSpread({}, props), {}, {
-          onChange: _bindInstanceProperty(_context7 = _this2.onBlur).call(_context7, _assertThisInitialized(_this2), key),
-          onBlur: _bindInstanceProperty(_context8 = _this2.onExitValid).call(_context8, _assertThisInitialized(_this2), key)
+          onChange: _bindInstanceProperty(_context8 = _this2.onBlur).call(_context8, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context9 = _this2.onExitValid).call(_context9, _assertThisInitialized(_this2), key)
         });
 
         if (_this2.props.onOpenChange && typeof _this2.props.onOpenChange === 'function') {
-          var _context9;
+          var _context10;
 
-          propsObj.onOpenChange = _bindInstanceProperty(_context9 = _this2.props.onOpenChange).call(_context9, _assertThisInitialized(_this2), key);
+          propsObj.onOpenChange = _bindInstanceProperty(_context10 = _this2.props.onOpenChange).call(_context10, _assertThisInitialized(_this2), key);
         }
 
         return propsObj;
       } else if (type === 'captcha') {
-        var _context10, _context11, _context12;
+        var _context11, _context12, _context13;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: _bindInstanceProperty(_context10 = _this2.onBlur).call(_context10, _assertThisInitialized(_this2), key),
-          onBlur: _bindInstanceProperty(_context11 = _this2.onExitValid).call(_context11, _assertThisInitialized(_this2), key),
-          onGetCode: _bindInstanceProperty(_context12 = _this2.onGetCode).call(_context12, _assertThisInitialized(_this2), key)
+          onChange: _bindInstanceProperty(_context11 = _this2.onBlur).call(_context11, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context12 = _this2.onExitValid).call(_context12, _assertThisInitialized(_this2), key),
+          onGetCode: _bindInstanceProperty(_context13 = _this2.onGetCode).call(_context13, _assertThisInitialized(_this2), key)
         });
       } else if (type === 'area') {
-        var _context13, _context14;
+        var _context14, _context15;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: _bindInstanceProperty(_context13 = _this2.onBlur).call(_context13, _assertThisInitialized(_this2), key),
-          onBlur: _bindInstanceProperty(_context14 = _this2.onExitValid).call(_context14, _assertThisInitialized(_this2), key),
+          onChange: _bindInstanceProperty(_context14 = _this2.onBlur).call(_context14, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context15 = _this2.onExitValid).call(_context15, _assertThisInitialized(_this2), key),
           onAreaSearch: _this2.props.onAreaSearch
         });
+      } else if (type === 'uploadImg') {
+        var _context16, _context17;
+
+        var _commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
+
+        return _objectSpread(_objectSpread(_objectSpread({}, props), _commonProps), {}, {
+          onChange: _bindInstanceProperty(_context16 = _this2.onBlur).call(_context16, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context17 = _this2.onExitValid).call(_context17, _assertThisInitialized(_this2), key)
+        });
       } else {
-        var _context15, _context16;
+        var _context18, _context19;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: _bindInstanceProperty(_context15 = _this2.onBlur).call(_context15, _assertThisInitialized(_this2), key),
-          onBlur: _bindInstanceProperty(_context16 = _this2.onExitValid).call(_context16, _assertThisInitialized(_this2), key)
+          onChange: _bindInstanceProperty(_context18 = _this2.onBlur).call(_context18, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context19 = _this2.onExitValid).call(_context19, _assertThisInitialized(_this2), key)
         });
       }
     });
@@ -532,11 +549,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "uploadImg", function (props, control) {
-      var _context17;
+      var _context20;
 
       var readonly = _this2.props.readonly;
       props.required = control.required || false;
-      props.onFileChange = _bindInstanceProperty(_context17 = _this2.onFileChange).call(_context17, _assertThisInitialized(_this2), control);
+      props.onFileChange = _bindInstanceProperty(_context20 = _this2.onFileChange).call(_context20, _assertThisInitialized(_this2), control);
       props.readonly = readonly === true || _Array$isArray(readonly) && _someInstanceProperty(readonly).call(readonly, function (readonlyKey) {
         return readonlyKey === control.key;
       }) ? true : false;
@@ -620,9 +637,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           key = _ref11.key;
 
       if (showAdd && type !== 'readonly') {
-        var _context18;
+        var _context21;
 
-        var onClick = _bindInstanceProperty(_context18 = _this2.onAdd).call(_context18, _assertThisInitialized(_this2), key, title);
+        var onClick = _bindInstanceProperty(_context21 = _this2.onAdd).call(_context21, _assertThisInitialized(_this2), key, title);
 
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
           role: "add",
@@ -684,7 +701,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "toCols", function () {
-      var _context19;
+      var _context22;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -696,7 +713,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
 
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context19 = _this2.getControls()).call(_context19, function (control) {
+      return _mapInstanceProperty(_context22 = _this2.getControls()).call(_context22, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }
@@ -744,7 +761,9 @@ _defineProperty(SuperForm2, "propTypes", {
   onOpenChange: PropTypes.func,
   onGetCode: PropTypes.func,
   onFileChange: PropTypes.func,
-  onAreaSearch: PropTypes.func
+  onAreaSearch: PropTypes.func,
+  buildSuperUploadProps: PropTypes.func //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
+
 });
 
 export default SuperForm2;

package/es/SuperTable/FilterDropDown.less

@@ -1,30 +1,30 @@
-@import '../variables.less';
-
-.@{cloudlink-prefix}-FilterDropDown {
-  background: white;
-  padding: @padding-vertical @padding-horizontal;
-  border-radius: @border-radius-base;
-  border: 1px solid #d9d9d9;
-
-  > :first-child {
-    width: 135px;
-    margin-right: 10px;
-  }
-  .date{
-    background: white;
-    padding: @padding-vertical @padding-horizontal;
-    border-radius: @border-radius-base;
-    border: 1px solid #d9d9d9;
-
-    > :first-child > div {
-      display: inline-block;
-    }
-
-    > :last-child {
-      text-align: right;
-      margin-top: 5px;
-    }
-  }
-}
-
-
+@import '../variables.less';
+
+.@{cloudlink-prefix}-FilterDropDown {
+  background: white;
+  padding: @padding-vertical @padding-horizontal;
+  border-radius: @border-radius-base;
+  border: 1px solid #d9d9d9;
+
+  > :first-child {
+    width: 135px;
+    margin-right: 10px;
+  }
+  .date{
+    background: white;
+    padding: @padding-vertical @padding-horizontal;
+    border-radius: @border-radius-base;
+    border: 1px solid #d9d9d9;
+
+    > :first-child > div {
+      display: inline-block;
+    }
+
+    > :last-child {
+      text-align: right;
+      margin-top: 5px;
+    }
+  }
+}
+
+

package/es/SuperTable/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "SuperTable",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./SuperTable.js"
-}
+{
+  "name": "SuperTable",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./SuperTable.js"
+}

package/es/SuperTable2/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "SuperTable2",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./SuperTable2.js"
-}
+{
+  "name": "SuperTable2",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./SuperTable2.js"
+}

package/es/SuperUpload/SuperUpload.js

@@ -4,9 +4,6 @@ import _Button from "antd/es/button";
 import _Icon from "antd/es/icon";
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
-
-var _this = this;
-
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -119,6 +116,9 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              props.onRemove && props.onRemove(fileRemove, fileList, fileDeleteList, onFileChange);
+
+            case 1:
             case "end":
               return _context2.stop();
           }
@@ -132,7 +132,7 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
   }();
 
   return {
-    action: _this.props.action || '/api/proxy/zuul/ict-service/file/upload/document',
+    action: props.action || '/api/proxy/zuul/archiver-service/file/upload/document',
     fileList: fileList,
     listType: listType,
     multiple: multiple,
@@ -170,7 +170,11 @@ function UploadButton(_ref3) {
       _ref3$limitNumber = _ref3.limitNumber,
       limitNumber = _ref3$limitNumber === void 0 ? 10 : _ref3$limitNumber,
       _ref3$listType = _ref3.listType,
-      listType = _ref3$listType === void 0 ? 'picture-card' : _ref3$listType;
+      listType = _ref3$listType === void 0 ? 'picture-card' : _ref3$listType,
+      _ref3$needText = _ref3.needText,
+      needText = _ref3$needText === void 0 ? false : _ref3$needText,
+      _ref3$remark = _ref3.remark,
+      remark = _ref3$remark === void 0 ? '大小>=5M' : _ref3$remark;
   var canUpload = fileList.length < limitNumber;
   return canUpload ? listType === 'picture-card' ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_Icon, {
     type: "plus"
@@ -192,8 +196,6 @@ function UploadButton(_ref3) {
 }
 
 function SuperUpload(props) {
-  var _this2 = this;
-
   var _useState = useState(true),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -204,7 +206,6 @@ function SuperUpload(props) {
       fileList = _useState4[0],
       setFileList = _useState4[1];
 
-  var getFileList = this.props.getFileList;
   useEffect(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
@@ -217,15 +218,28 @@ function SuperUpload(props) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.next = 2;
-                return getFileList(props.fileList);
+                if (!props.getFileList) {
+                  _context3.next = 6;
+                  break;
+                }
+
+                _context3.next = 3;
+                return props.getFileList(props.fileList);
+
+              case 3:
+                _context3.t0 = _context3.sent;
+                _context3.next = 7;
+                break;
+
+              case 6:
+                _context3.t0 = [];
 
-              case 2:
-                initFileList = _context3.sent;
+              case 7:
+                initFileList = _context3.t0;
                 setFileList(initFileList);
                 setLoading(false);
 
-              case 5:
+              case 10:
               case "end":
                 return _context3.stop();
             }
@@ -240,15 +254,13 @@ function SuperUpload(props) {
 
   var onPreview = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(file) {
-      var onPreview;
       return _regeneratorRuntime.wrap(function _callee3$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              onPreview = _this2.props.onPreview;
-              onPreview && onPreview(file);
+              props.onPreview && props.onPreview(file, fileList);
 
-            case 2:
+            case 1:
             case "end":
               return _context4.stop();
           }
@@ -276,7 +288,7 @@ function SuperUpload(props) {
     required: props.required
   }) : null, /*#__PURE__*/React.createElement(_Upload, uploadProps, readonly ? null : /*#__PURE__*/React.createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
     fileList: fileList
-  }))));
+  }))), props.needText ? /*#__PURE__*/React.createElement("span", null, props.remark) : null);
 }
 
 export default SuperUpload;

package/es/adjust.less

@@ -1,89 +1,89 @@
-
-.ant-table-small {
-  .ant-table-thead {
-    background-color: @table-header-bg;
-
-    > tr > th {
-      padding: 12px 8px 11px !important;
-    }
-  }
-
-  .ant-table-tbody > tr > td {
-    padding: 8px 8px 7px !important;
-  }
-
-  .ant-table-tbody > tr.ant-table-row-selected td {
-    background-color: @primary-1 !important;
-  }
-
-  .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
-    background-color: @table-header-bg !important;
-  }
-
-  .ant-table-selection-column {
-    min-width: 62px;
-  }
-
-  table {
-    border-collapse: separate;
-    border-spacing: 0;
-  }
-}
-
-.ant-modal {
-  top: 50px;
-  padding-bottom: 0;
-}
-
-.ant-form-item {
-  margin-bottom: 6px;
-}
-
-.ant-select-sm .ant-select-selection--single {
-  height: @input-height-sm !important;
-  overflow: hidden;
-}
-
-.ant-form-vertical .ant-form-item {
-  padding-bottom: 0;
-}
-
-.ant-form-item-control {
-  line-height: @input-height-sm;
-
-  > .ant-form-explain-holder[aria-hidden='true'] {
-    display: none;
-  }
-}
-
-.ant-form-vertical .ant-form-item-label {
-  padding: 0;
-  line-height: 1.2;
-}
-
-.ant-input-lg {
-  font-size: 12px;
-}
-
-.ant-btn-lg {
-  height: @input-height-lg;
-}
-
-.ant-menu-inline .ant-menu-item {
-  margin-top: 0;
-  margin-bottom: 0 !important;
-}
-
-.ant-modal-header {
-  padding: 13px 16px;
-}
-
-.ant-modal-body {
-  padding: 16px;
-}
-
-.ant-btn-primary:focus {
-  background-color: white;
-  color: @primary-color;
-  text-shadow: none;
-}
+
+.ant-table-small {
+  .ant-table-thead {
+    background-color: @table-header-bg;
+
+    > tr > th {
+      padding: 12px 8px 11px !important;
+    }
+  }
+
+  .ant-table-tbody > tr > td {
+    padding: 8px 8px 7px !important;
+  }
+
+  .ant-table-tbody > tr.ant-table-row-selected td {
+    background-color: @primary-1 !important;
+  }
+
+  .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
+    background-color: @table-header-bg !important;
+  }
+
+  .ant-table-selection-column {
+    min-width: 62px;
+  }
+
+  table {
+    border-collapse: separate;
+    border-spacing: 0;
+  }
+}
+
+.ant-modal {
+  top: 50px;
+  padding-bottom: 0;
+}
+
+.ant-form-item {
+  margin-bottom: 6px;
+}
+
+.ant-select-sm .ant-select-selection--single {
+  height: @input-height-sm !important;
+  overflow: hidden;
+}
+
+.ant-form-vertical .ant-form-item {
+  padding-bottom: 0;
+}
+
+.ant-form-item-control {
+  line-height: @input-height-sm;
+
+  > .ant-form-explain-holder[aria-hidden='true'] {
+    display: none;
+  }
+}
+
+.ant-form-vertical .ant-form-item-label {
+  padding: 0;
+  line-height: 1.2;
+}
+
+.ant-input-lg {
+  font-size: 12px;
+}
+
+.ant-btn-lg {
+  height: @input-height-lg;
+}
+
+.ant-menu-inline .ant-menu-item {
+  margin-top: 0;
+  margin-bottom: 0 !important;
+}
+
+.ant-modal-header {
+  padding: 13px 16px;
+}
+
+.ant-modal-body {
+  padding: 16px;
+}
+
+.ant-btn-primary:focus {
+  background-color: white;
+  color: @primary-color;
+  text-shadow: none;
+}

package/lib/Control/Control.js

@@ -383,16 +383,11 @@ var captcha = function captcha(props) {
 };
 
 var uploadImg = function uploadImg(props) {
-  var uploadProps = {
+  var uploadProps = _objectSpread(_objectSpread({}, props), {}, {
     fileList: props.value || [],
-    required: props.require,
-    multiple: false,
-    limitNumber: props.limitNumber || 10,
-    onFileChange: props.onFileChange,
-    needText: props.needText,
-    remark: props.remark,
     readonly: props.readonly || false
-  };
+  });
+
   return /*#__PURE__*/_react["default"].createElement(_SuperUpload["default"], uploadProps);
 }; // 支持的控件类型
 

package/lib/SuperForm2/SuperForm.js

@@ -90,7 +90,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(symbols).call(symbols, 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 _context20, _context21; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context20 = ownKeys(Object(source), !0)).call(_context20, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context21 = ownKeys(Object(source))).call(_context21, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context23, _context24; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context23 = ownKeys(Object(source), !0)).call(_context23, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context24 = ownKeys(Object(source))).call(_context24, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
@@ -360,57 +360,74 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             readonly: true,
             onBlur: (0, _bind["default"])(_context3 = _this2.onExitValid).call(_context3, (0, _assertThisInitialized2["default"])(_this2), key)
           };
-        } else {
+        } else if (originType === 'uploadImg') {
           var _context4;
 
-          return {
+          var commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
+          return _objectSpread(_objectSpread(_objectSpread({}, props), commonProps), {}, {
+            readonly: true,
             onBlur: (0, _bind["default"])(_context4 = _this2.onExitValid).call(_context4, (0, _assertThisInitialized2["default"])(_this2), key)
+          });
+        } else {
+          var _context5;
+
+          return {
+            onBlur: (0, _bind["default"])(_context5 = _this2.onExitValid).call(_context5, (0, _assertThisInitialized2["default"])(_this2), key)
           };
         }
       } else if (type === 'text' || type === 'textArea') {
-        var _context5, _context6;
+        var _context6, _context7;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: (0, _bind["default"])(_context5 = _this2.onExitValid).call(_context5, (0, _assertThisInitialized2["default"])(_this2), key),
-          onBlur: (0, _bind["default"])(_context6 = _this2.onChange).call(_context6, (0, _assertThisInitialized2["default"])(_this2), key)
+          onChange: (0, _bind["default"])(_context6 = _this2.onExitValid).call(_context6, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context7 = _this2.onChange).call(_context7, (0, _assertThisInitialized2["default"])(_this2), key)
         });
       } else if (type === 'date') {
-        var _context7, _context8;
+        var _context8, _context9;
 
         var propsObj = _objectSpread(_objectSpread({}, props), {}, {
-          onChange: (0, _bind["default"])(_context7 = _this2.onBlur).call(_context7, (0, _assertThisInitialized2["default"])(_this2), key),
-          onBlur: (0, _bind["default"])(_context8 = _this2.onExitValid).call(_context8, (0, _assertThisInitialized2["default"])(_this2), key)
+          onChange: (0, _bind["default"])(_context8 = _this2.onBlur).call(_context8, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context9 = _this2.onExitValid).call(_context9, (0, _assertThisInitialized2["default"])(_this2), key)
         });
 
         if (_this2.props.onOpenChange && typeof _this2.props.onOpenChange === 'function') {
-          var _context9;
+          var _context10;
 
-          propsObj.onOpenChange = (0, _bind["default"])(_context9 = _this2.props.onOpenChange).call(_context9, (0, _assertThisInitialized2["default"])(_this2), key);
+          propsObj.onOpenChange = (0, _bind["default"])(_context10 = _this2.props.onOpenChange).call(_context10, (0, _assertThisInitialized2["default"])(_this2), key);
         }
 
         return propsObj;
       } else if (type === 'captcha') {
-        var _context10, _context11, _context12;
+        var _context11, _context12, _context13;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: (0, _bind["default"])(_context10 = _this2.onBlur).call(_context10, (0, _assertThisInitialized2["default"])(_this2), key),
-          onBlur: (0, _bind["default"])(_context11 = _this2.onExitValid).call(_context11, (0, _assertThisInitialized2["default"])(_this2), key),
-          onGetCode: (0, _bind["default"])(_context12 = _this2.onGetCode).call(_context12, (0, _assertThisInitialized2["default"])(_this2), key)
+          onChange: (0, _bind["default"])(_context11 = _this2.onBlur).call(_context11, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context12 = _this2.onExitValid).call(_context12, (0, _assertThisInitialized2["default"])(_this2), key),
+          onGetCode: (0, _bind["default"])(_context13 = _this2.onGetCode).call(_context13, (0, _assertThisInitialized2["default"])(_this2), key)
         });
       } else if (type === 'area') {
-        var _context13, _context14;
+        var _context14, _context15;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: (0, _bind["default"])(_context13 = _this2.onBlur).call(_context13, (0, _assertThisInitialized2["default"])(_this2), key),
-          onBlur: (0, _bind["default"])(_context14 = _this2.onExitValid).call(_context14, (0, _assertThisInitialized2["default"])(_this2), key),
+          onChange: (0, _bind["default"])(_context14 = _this2.onBlur).call(_context14, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context15 = _this2.onExitValid).call(_context15, (0, _assertThisInitialized2["default"])(_this2), key),
           onAreaSearch: _this2.props.onAreaSearch
         });
+      } else if (type === 'uploadImg') {
+        var _context16, _context17;
+
+        var _commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
+
+        return _objectSpread(_objectSpread(_objectSpread({}, props), _commonProps), {}, {
+          onChange: (0, _bind["default"])(_context16 = _this2.onBlur).call(_context16, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context17 = _this2.onExitValid).call(_context17, (0, _assertThisInitialized2["default"])(_this2), key)
+        });
       } else {
-        var _context15, _context16;
+        var _context18, _context19;
 
         return _objectSpread(_objectSpread({}, props), {}, {
-          onChange: (0, _bind["default"])(_context15 = _this2.onBlur).call(_context15, (0, _assertThisInitialized2["default"])(_this2), key),
-          onBlur: (0, _bind["default"])(_context16 = _this2.onExitValid).call(_context16, (0, _assertThisInitialized2["default"])(_this2), key)
+          onChange: (0, _bind["default"])(_context18 = _this2.onBlur).call(_context18, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context19 = _this2.onExitValid).call(_context19, (0, _assertThisInitialized2["default"])(_this2), key)
         });
       }
     });
@@ -548,11 +565,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "uploadImg", function (props, control) {
-      var _context17;
+      var _context20;
 
       var readonly = _this2.props.readonly;
       props.required = control.required || false;
-      props.onFileChange = (0, _bind["default"])(_context17 = _this2.onFileChange).call(_context17, (0, _assertThisInitialized2["default"])(_this2), control);
+      props.onFileChange = (0, _bind["default"])(_context20 = _this2.onFileChange).call(_context20, (0, _assertThisInitialized2["default"])(_this2), control);
       props.readonly = readonly === true || (0, _isArray["default"])(readonly) && (0, _some["default"])(readonly).call(readonly, function (readonlyKey) {
         return readonlyKey === control.key;
       }) ? true : false;
@@ -633,9 +650,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           key = _ref11.key;
 
       if (showAdd && type !== 'readonly') {
-        var _context18;
+        var _context21;
 
-        var onClick = (0, _bind["default"])(_context18 = _this2.onAdd).call(_context18, (0, _assertThisInitialized2["default"])(_this2), key, title);
+        var onClick = (0, _bind["default"])(_context21 = _this2.onAdd).call(_context21, (0, _assertThisInitialized2["default"])(_this2), key, title);
         return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
           role: "add",
           type: "plus-circle-o",
@@ -694,7 +711,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCols", function () {
-      var _context19;
+      var _context22;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -706,7 +723,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
 
       var span = 24 / colNum;
-      return (0, _map["default"])(_context19 = _this2.getControls()).call(_context19, function (control) {
+      return (0, _map["default"])(_context22 = _this2.getControls()).call(_context22, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }
@@ -752,7 +769,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
   onOpenChange: _propTypes["default"].func,
   onGetCode: _propTypes["default"].func,
   onFileChange: _propTypes["default"].func,
-  onAreaSearch: _propTypes["default"].func
+  onAreaSearch: _propTypes["default"].func,
+  buildSuperUploadProps: _propTypes["default"].func //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
+
 });
 var _default = SuperForm2;
 exports["default"] = _default;

package/lib/SuperTable/FilterDropDown.less

@@ -1,30 +1,30 @@
-@import '../variables.less';
-
-.@{cloudlink-prefix}-FilterDropDown {
-  background: white;
-  padding: @padding-vertical @padding-horizontal;
-  border-radius: @border-radius-base;
-  border: 1px solid #d9d9d9;
-
-  > :first-child {
-    width: 135px;
-    margin-right: 10px;
-  }
-  .date{
-    background: white;
-    padding: @padding-vertical @padding-horizontal;
-    border-radius: @border-radius-base;
-    border: 1px solid #d9d9d9;
-
-    > :first-child > div {
-      display: inline-block;
-    }
-
-    > :last-child {
-      text-align: right;
-      margin-top: 5px;
-    }
-  }
-}
-
-
+@import '../variables.less';
+
+.@{cloudlink-prefix}-FilterDropDown {
+  background: white;
+  padding: @padding-vertical @padding-horizontal;
+  border-radius: @border-radius-base;
+  border: 1px solid #d9d9d9;
+
+  > :first-child {
+    width: 135px;
+    margin-right: 10px;
+  }
+  .date{
+    background: white;
+    padding: @padding-vertical @padding-horizontal;
+    border-radius: @border-radius-base;
+    border: 1px solid #d9d9d9;
+
+    > :first-child > div {
+      display: inline-block;
+    }
+
+    > :last-child {
+      text-align: right;
+      margin-top: 5px;
+    }
+  }
+}
+
+

package/lib/SuperTable/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "SuperTable",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./SuperTable.js"
-}
+{
+  "name": "SuperTable",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./SuperTable.js"
+}

package/lib/SuperTable2/package.json

@@ -1,6 +1,6 @@
-{
-  "name": "SuperTable2",
-  "version": "0.0.0",
-  "private": true,
-  "main": "./SuperTable2.js"
-}
+{
+  "name": "SuperTable2",
+  "version": "0.0.0",
+  "private": true,
+  "main": "./SuperTable2.js"
+}

package/lib/SuperUpload/SuperUpload.js

@@ -58,8 +58,6 @@ var _Title = _interopRequireDefault(require("../Title"));
 
 var _variables = _interopRequireDefault(require("../variables"));
 
-var _this = void 0;
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { _Object$defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -160,6 +158,9 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
+              props.onRemove && props.onRemove(fileRemove, fileList, fileDeleteList, onFileChange);
+
+            case 1:
             case "end":
               return _context2.stop();
           }
@@ -173,7 +174,7 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
   }();
 
   return {
-    action: _this.props.action || '/api/proxy/zuul/ict-service/file/upload/document',
+    action: props.action || '/api/proxy/zuul/archiver-service/file/upload/document',
     fileList: fileList,
     listType: listType,
     multiple: multiple,
@@ -211,7 +212,11 @@ function UploadButton(_ref3) {
       _ref3$limitNumber = _ref3.limitNumber,
       limitNumber = _ref3$limitNumber === void 0 ? 10 : _ref3$limitNumber,
       _ref3$listType = _ref3.listType,
-      listType = _ref3$listType === void 0 ? 'picture-card' : _ref3$listType;
+      listType = _ref3$listType === void 0 ? 'picture-card' : _ref3$listType,
+      _ref3$needText = _ref3.needText,
+      needText = _ref3$needText === void 0 ? false : _ref3$needText,
+      _ref3$remark = _ref3.remark,
+      remark = _ref3$remark === void 0 ? '大小>=5M' : _ref3$remark;
   var canUpload = fileList.length < limitNumber;
   return canUpload ? listType === 'picture-card' ? /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
     type: "plus"
@@ -233,8 +238,6 @@ function UploadButton(_ref3) {
 }
 
 function SuperUpload(props) {
-  var _this2 = this;
-
   var _useState = (0, _react.useState)(true),
       _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
       loading = _useState2[0],
@@ -245,7 +248,6 @@ function SuperUpload(props) {
       fileList = _useState4[0],
       setFileList = _useState4[1];
 
-  var getFileList = this.props.getFileList;
   (0, _react.useEffect)(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
@@ -258,15 +260,28 @@ function SuperUpload(props) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.next = 2;
-                return getFileList(props.fileList);
+                if (!props.getFileList) {
+                  _context3.next = 6;
+                  break;
+                }
+
+                _context3.next = 3;
+                return props.getFileList(props.fileList);
+
+              case 3:
+                _context3.t0 = _context3.sent;
+                _context3.next = 7;
+                break;
+
+              case 6:
+                _context3.t0 = [];
 
-              case 2:
-                initFileList = _context3.sent;
+              case 7:
+                initFileList = _context3.t0;
                 setFileList(initFileList);
                 setLoading(false);
 
-              case 5:
+              case 10:
               case "end":
                 return _context3.stop();
             }
@@ -281,15 +296,13 @@ function SuperUpload(props) {
 
   var onPreview = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(file) {
-      var onPreview;
       return _regenerator["default"].wrap(function _callee3$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
-              onPreview = _this2.props.onPreview;
-              onPreview && onPreview(file);
+              props.onPreview && props.onPreview(file, fileList);
 
-            case 2:
+            case 1:
             case "end":
               return _context4.stop();
           }
@@ -317,7 +330,7 @@ function SuperUpload(props) {
     required: props.required
   }) : null, /*#__PURE__*/_react["default"].createElement(_upload["default"], uploadProps, readonly ? null : /*#__PURE__*/_react["default"].createElement(UploadButton, _objectSpread(_objectSpread({}, props), {}, {
     fileList: fileList
-  }))));
+  }))), props.needText ? /*#__PURE__*/_react["default"].createElement("span", null, props.remark) : null);
 }
 
 var _default = SuperUpload;

package/lib/adjust.less

@@ -1,89 +1,89 @@
-
-.ant-table-small {
-  .ant-table-thead {
-    background-color: @table-header-bg;
-
-    > tr > th {
-      padding: 12px 8px 11px !important;
-    }
-  }
-
-  .ant-table-tbody > tr > td {
-    padding: 8px 8px 7px !important;
-  }
-
-  .ant-table-tbody > tr.ant-table-row-selected td {
-    background-color: @primary-1 !important;
-  }
-
-  .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
-    background-color: @table-header-bg !important;
-  }
-
-  .ant-table-selection-column {
-    min-width: 62px;
-  }
-
-  table {
-    border-collapse: separate;
-    border-spacing: 0;
-  }
-}
-
-.ant-modal {
-  top: 50px;
-  padding-bottom: 0;
-}
-
-.ant-form-item {
-  margin-bottom: 6px;
-}
-
-.ant-select-sm .ant-select-selection--single {
-  height: @input-height-sm !important;
-  overflow: hidden;
-}
-
-.ant-form-vertical .ant-form-item {
-  padding-bottom: 0;
-}
-
-.ant-form-item-control {
-  line-height: @input-height-sm;
-
-  > .ant-form-explain-holder[aria-hidden='true'] {
-    display: none;
-  }
-}
-
-.ant-form-vertical .ant-form-item-label {
-  padding: 0;
-  line-height: 1.2;
-}
-
-.ant-input-lg {
-  font-size: 12px;
-}
-
-.ant-btn-lg {
-  height: @input-height-lg;
-}
-
-.ant-menu-inline .ant-menu-item {
-  margin-top: 0;
-  margin-bottom: 0 !important;
-}
-
-.ant-modal-header {
-  padding: 13px 16px;
-}
-
-.ant-modal-body {
-  padding: 16px;
-}
-
-.ant-btn-primary:focus {
-  background-color: white;
-  color: @primary-color;
-  text-shadow: none;
-}
+
+.ant-table-small {
+  .ant-table-thead {
+    background-color: @table-header-bg;
+
+    > tr > th {
+      padding: 12px 8px 11px !important;
+    }
+  }
+
+  .ant-table-tbody > tr > td {
+    padding: 8px 8px 7px !important;
+  }
+
+  .ant-table-tbody > tr.ant-table-row-selected td {
+    background-color: @primary-1 !important;
+  }
+
+  .ant-table-tbody > tr:hover:not(.ant-table-expanded-row) > td {
+    background-color: @table-header-bg !important;
+  }
+
+  .ant-table-selection-column {
+    min-width: 62px;
+  }
+
+  table {
+    border-collapse: separate;
+    border-spacing: 0;
+  }
+}
+
+.ant-modal {
+  top: 50px;
+  padding-bottom: 0;
+}
+
+.ant-form-item {
+  margin-bottom: 6px;
+}
+
+.ant-select-sm .ant-select-selection--single {
+  height: @input-height-sm !important;
+  overflow: hidden;
+}
+
+.ant-form-vertical .ant-form-item {
+  padding-bottom: 0;
+}
+
+.ant-form-item-control {
+  line-height: @input-height-sm;
+
+  > .ant-form-explain-holder[aria-hidden='true'] {
+    display: none;
+  }
+}
+
+.ant-form-vertical .ant-form-item-label {
+  padding: 0;
+  line-height: 1.2;
+}
+
+.ant-input-lg {
+  font-size: 12px;
+}
+
+.ant-btn-lg {
+  height: @input-height-lg;
+}
+
+.ant-menu-inline .ant-menu-item {
+  margin-top: 0;
+  margin-bottom: 0 !important;
+}
+
+.ant-modal-header {
+  padding: 13px 16px;
+}
+
+.ant-modal-body {
+  padding: 16px;
+}
+
+.ant-btn-primary:focus {
+  background-color: white;
+  color: @primary-color;
+  text-shadow: none;
+}

package/package.json

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