cloud-b2b 1.0.9 → 1.1.2

package/es/CodeInput/CodeInput.js

@@ -0,0 +1,153 @@
+import _Reflect$construct from "@babel/runtime-corejs3/core-js-stable/reflect/construct";
+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";
+import _Row from "antd/es/row";
+import _Button from "antd/es/button";
+import _Col from "antd/es/col";
+import _Input from "antd/es/input";
+import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
+import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
+import _createClass from "@babel/runtime-corejs3/helpers/createClass";
+import _assertThisInitialized from "@babel/runtime-corejs3/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime-corejs3/helpers/inherits";
+import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
+import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+
+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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
+
+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); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct) return false; if (_Reflect$construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
+import _setInterval from "@babel/runtime-corejs3/core-js-stable/set-interval";
+import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
+import React from 'react';
+import PropTypes from 'prop-types';
+import helper from '../helper';
+var PROPS = {
+  filter: PropTypes.bool,
+  remark: PropTypes.bool,
+  searchWhenClick: PropTypes.bool,
+  noSearchWhenTypo: PropTypes.bool,
+  options: PropTypes.array,
+  value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
+  inputRef: PropTypes.func,
+  onChange: PropTypes.func,
+  onBlur: PropTypes.func,
+  onSelect: PropTypes.func,
+  onSearch: PropTypes.func
+};
+
+var PROPS_KEYS = _Object$keys(PROPS);
+
+var CodeInput = /*#__PURE__*/function (_React$Component) {
+  _inherits(CodeInput, _React$Component);
+
+  var _super = _createSuper(CodeInput);
+
+  function CodeInput(_props) {
+    var _this;
+
+    _classCallCheck(this, CodeInput);
+
+    _this = _super.call(this, _props);
+
+    _defineProperty(_assertThisInitialized(_this), "onGetCode", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+      var onGetCode, that, s;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              // const url = await helper.fetchJson();
+              onGetCode = _this.props.onGetCode;
+              _context.next = 3;
+              return onGetCode && onGetCode();
+
+            case 3:
+              if (!_context.sent) {
+                _context.next = 8;
+                break;
+              }
+
+              debugger;
+
+              _this.setState({
+                time: _this.props.time || 60
+              });
+
+              that = _assertThisInitialized(_this);
+              s = _setInterval(function () {
+                that.setState({
+                  time: that.state.time -= 1
+                });
+
+                if (that.state.time === 0) {
+                  clearInterval(s);
+                }
+              }, 1000);
+
+            case 8:
+              ;
+
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    })));
+
+    _defineProperty(_assertThisInitialized(_this), "btnProps", function (props) {
+      var btnProps = _Object$assign(helper.getObjectExclude(props, ['onGetCode']));
+
+      return _objectSpread(_objectSpread({}, btnProps), {}, {
+        size: 'large',
+        disabled: _this.state.time !== 0,
+        onClick: _this.onGetCode
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "inputProps", function (props) {
+      var inpPros = _Object$assign(helper.getObjectExclude(props, ['onGetCode']));
+
+      return _objectSpread(_objectSpread({}, inpPros), {}, {
+        size: 'large'
+      });
+    });
+
+    _this.state = {
+      value: _props.value,
+      time: 0
+    };
+    return _this;
+  }
+
+  _createClass(CodeInput, [{
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          inputKey = _this$props.inputKey,
+          readonly = _this$props.readonly,
+          value = _this$props.value;
+      var time = this.state.time;
+      return /*#__PURE__*/React.createElement(_Row, null, /*#__PURE__*/React.createElement(_Col, {
+        span: 20
+      }, /*#__PURE__*/React.createElement(_Input, this.inputProps(this.props))), /*#__PURE__*/React.createElement(_Col, null, /*#__PURE__*/React.createElement(_Button, this.btnProps(this.props), time === 0 ? "\u83B7\u53D6\u9A8C\u8BC1\u7801" : "".concat(time, "s\u83B7\u53D6\u9A8C\u8BC1\u7801"))));
+    }
+  }]);
+
+  return CodeInput;
+}(React.Component);
+
+export default CodeInput;

package/es/CodeInput/package.json

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

package/es/Control/Control.js

@@ -39,10 +39,11 @@ import InputEditor from '../InputEditor';
 import InputSelect from '../InputSelect';
 import InputWriting from '../InputWriting';
 import InpurCascader from '../InpurCascader';
-import SuperUpload from '../SuperUpload';
-import Area from '../Area';
 import moment from 'moment';
 import eventWrapper from './event';
+import CodeInput from '../CodeInput';
+import SuperUpload from '../SuperUpload';
+import Area from '../Area/Area';
 var SelectOption = _Select.Option;
 var TextArea = _Input.TextArea;
 var RadioGroup = _Radio.Group;
@@ -131,6 +132,9 @@ var textArea = function textArea(props) {
 
 var readonly = function readonly(props) {
   props.readOnly = true;
+  props.style = _Object$assign(props.style || {}, {
+    backgroundColor: '#f0f0f0'
+  });
 
   if (props.value || props.defaultValue) {
     props.title = props.value || props.defaultValue;
@@ -176,6 +180,14 @@ var select = function select(props) {
   }
 
   return /*#__PURE__*/React.createElement(_Select, props, _mapInstanceProperty(options).call(options, toOption));
+};
+
+var area = function area(props) {
+  var areaProps = _objectSpread(_objectSpread({}, props), {}, {
+    onParentChange: props.onChange
+  });
+
+  return /*#__PURE__*/React.createElement(Area, areaProps);
 }; // 下拉选择框-取title作为值
 
 
@@ -312,25 +324,21 @@ var cascader = function cascader(props) {
   return /*#__PURE__*/React.createElement(InpurCascader, props);
 };
 
-var area = function area(props) {
-  var areaProps = _objectSpread(_objectSpread({}, props), {}, {
-    onParentChange: props.onChange
-  });
+var captcha = function captcha(props) {
+  if (props.ref) {
+    props.inputRef = props.ref;
+    delete props.ref;
+  }
 
-  return /*#__PURE__*/React.createElement(Area, areaProps);
+  return /*#__PURE__*/React.createElement(CodeInput, 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);
 }; // 支持的控件类型
 
@@ -351,6 +359,7 @@ var controls = {
   selectSearch: selectSearch,
   selectWriting: selectWriting,
   cascader: cascader,
+  captcha: captcha,
   area: area,
   uploadImg: uploadImg
 };
@@ -373,7 +382,8 @@ Control.propTypes = {
   autoFocus: PropTypes.bool,
   onChange: PropTypes.func,
   onSearch: PropTypes.func,
-  onBlur: PropTypes.func
+  onBlur: PropTypes.func,
+  onGetCode: PropTypes.func
 }; // 依据value查找对应的标题
 
 var getTitle = function getTitle(value) {

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 _context22, _context23; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context22 = ownKeys(Object(source), !0)).call(_context22, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context23 = ownKeys(Object(source))).call(_context23, 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); }; }
 
@@ -67,7 +67,9 @@ var ControlType = {
   onCheckItem: PropTypes.any,
   showAdd: PropTypes.any,
   rule: PropTypes.object,
-  props: PropTypes.object
+  props: PropTypes.object,
+  buildSuperUploadProps: PropTypes.func //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
+
 };
 
 var Controlled = /*#__PURE__*/function (_React$Component) {
@@ -365,13 +367,21 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           onBlur: _bindInstanceProperty(_context14 = _this2.onExitValid).call(_context14, _assertThisInitialized(_this2), key),
           onAreaSearch: _this2.props.onAreaSearch
         });
-      } else {
+      } else if (type === 'uploadImg') {
         var _context15, _context16;
 
-        return _objectSpread(_objectSpread({}, props), {}, {
+        var commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
+        return _objectSpread(_objectSpread(_objectSpread({}, props), commonProps), {}, {
           onChange: _bindInstanceProperty(_context15 = _this2.onBlur).call(_context15, _assertThisInitialized(_this2), key),
           onBlur: _bindInstanceProperty(_context16 = _this2.onExitValid).call(_context16, _assertThisInitialized(_this2), key)
         });
+      } else {
+        var _context17, _context18;
+
+        return _objectSpread(_objectSpread({}, props), {}, {
+          onChange: _bindInstanceProperty(_context17 = _this2.onBlur).call(_context17, _assertThisInitialized(_this2), key),
+          onBlur: _bindInstanceProperty(_context18 = _this2.onExitValid).call(_context18, _assertThisInitialized(_this2), key)
+        });
       }
     });
 
@@ -528,11 +538,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "uploadImg", function (props, control) {
-      var _context17;
+      var _context19;
 
       var readonly = _this2.props.readonly;
       props.required = control.required || false;
-      props.onFileChange = _bindInstanceProperty(_context17 = _this2.onFileChange).call(_context17, _assertThisInitialized(_this2), control);
+      props.onFileChange = _bindInstanceProperty(_context19 = _this2.onFileChange).call(_context19, _assertThisInitialized(_this2), control);
       props.readonly = readonly === true || _Array$isArray(readonly) && _someInstanceProperty(readonly).call(readonly, function (readonlyKey) {
         return readonlyKey === control.key;
       }) ? true : false;
@@ -602,9 +612,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           key = _ref11.key;
 
       if (showAdd && type !== 'readonly') {
-        var _context18;
+        var _context20;
 
-        var onClick = _bindInstanceProperty(_context18 = _this2.onAdd).call(_context18, _assertThisInitialized(_this2), key, title);
+        var onClick = _bindInstanceProperty(_context20 = _this2.onAdd).call(_context20, _assertThisInitialized(_this2), key, title);
 
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
           role: "add",
@@ -666,7 +676,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "toCols", function () {
-      var _context19;
+      var _context21;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -678,7 +688,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
 
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context19 = _this2.getControls()).call(_context19, function (control) {
+      return _mapInstanceProperty(_context21 = _this2.getControls()).call(_context21, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/es/SuperTable2/SuperTable2.js

@@ -26,13 +26,13 @@ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray(o, minLen) { var _context12; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context12 = Object.prototype.toString.call(o)).call(_context12, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { var _context13; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context13 = Object.prototype.toString.call(o)).call(_context13, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function 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 _context10, _context11; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context10 = ownKeys(Object(source), !0)).call(_context10, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context11 = ownKeys(Object(source))).call(_context11, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context11, _context12; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context11 = ownKeys(Object(source), !0)).call(_context11, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context12 = ownKeys(Object(source))).call(_context12, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
@@ -361,7 +361,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getCellRender", function (col) {
       return function (value, record, index) {
-        var _context3, _context4, _context5;
+        var _context3, _context4, _context5, _context6;
 
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
 
@@ -424,9 +424,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props);
 
           case 'toolbar':
+            //showByKey为true时，每条数据中与按钮key相同的属性值决定按钮是否显示，建议key用下划线开始命名，避免与后台数据冲突
             var props = {
               onClick: _this.props.callback.onToolbar ? _bindInstanceProperty(_context4 = _this.props.callback.onToolbar).call(_context4, null, col.key, record.key, record) : undefined,
-              buttons: _filterInstanceProperty(_context5 = col.props.buttons).call(_context5, function (item) {
+              buttons: col.props.showByKey ? _filterInstanceProperty(_context5 = col.props.buttons).call(_context5, function (item) {
+                return record[item.key] === true;
+              }) : _filterInstanceProperty(_context6 = col.props.buttons).call(_context6, function (item) {
                 return item.defaultShow === !record._isEdit;
               })
             };
@@ -527,18 +530,18 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "canReadonly", function (type) {
-      var _context6;
+      var _context7;
 
-      return !_includesInstanceProperty(_context6 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context6, type);
+      return !_includesInstanceProperty(_context7 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context7, type);
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function (cols) {
-      var _context7;
+      var _context8;
 
       var readonly = _this.props.readonly;
-      return _mapInstanceProperty(_context7 = _filterInstanceProperty(cols).call(cols, function (col) {
+      return _mapInstanceProperty(_context8 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context7, function (_ref11, index) {
+      })).call(_context8, function (_ref11, index) {
         var col = _extends({}, _ref11);
 
         col.className = _this.getColumnClassName(col);
@@ -566,13 +569,13 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_assertThisInitialized(_this), "getDataSource", function (items, cols) {
       return _mapInstanceProperty(items).call(items, function (item, index) {
         return _reduceInstanceProperty(cols).call(cols, function (result, _ref12) {
-          var _context8;
+          var _context9;
 
           var key = _ref12.key,
               type = _ref12.type,
               options = _ref12.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context8 = item.isReadonly).call(_context8, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context9 = item.isReadonly).call(_context9, key))) {
             result[key] = item[key];
           } else {
             result[key] = getTitle(item[key], options);
@@ -606,7 +609,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "getProps", function () {
-      var _context9;
+      var _context10;
 
       var _this$props3 = _this.props,
           cols = _this$props3.cols,
@@ -621,9 +624,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
           maxHeight = _this$props3.maxHeight;
 
-      var widthX = _reduceInstanceProperty(_context9 = _filterInstanceProperty(cols).call(cols, function (col) {
+      var widthX = _reduceInstanceProperty(_context10 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context9, function (width, item) {
+      })).call(_context10, function (width, item) {
         return width += item.width ? item.width : 120;
       }, 0);
 

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/lib/CodeInput/CodeInput.js

@@ -0,0 +1,182 @@
+"use strict";
+
+var _Reflect$construct = require("@babel/runtime-corejs3/core-js-stable/reflect/construct");
+
+var _Object$keys2 = 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", {
+  value: true
+});
+
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
+
+var _row = _interopRequireDefault(require("antd/lib/row"));
+
+var _button = _interopRequireDefault(require("antd/lib/button"));
+
+var _col = _interopRequireDefault(require("antd/lib/col"));
+
+var _input = _interopRequireDefault(require("antd/lib/input"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
+
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
+
+var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
+
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/assertThisInitialized"));
+
+var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/inherits"));
+
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
+
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/getPrototypeOf"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+
+var _setInterval2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set-interval"));
+
+var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _propTypes = _interopRequireDefault(require("prop-types"));
+
+var _helper = _interopRequireDefault(require("../helper"));
+
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(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 _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, 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); }; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_Reflect$construct) return false; if (_Reflect$construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+var PROPS = {
+  filter: _propTypes["default"].bool,
+  remark: _propTypes["default"].bool,
+  searchWhenClick: _propTypes["default"].bool,
+  noSearchWhenTypo: _propTypes["default"].bool,
+  options: _propTypes["default"].array,
+  value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number, _propTypes["default"].object]),
+  inputRef: _propTypes["default"].func,
+  onChange: _propTypes["default"].func,
+  onBlur: _propTypes["default"].func,
+  onSelect: _propTypes["default"].func,
+  onSearch: _propTypes["default"].func
+};
+var PROPS_KEYS = (0, _keys["default"])(PROPS);
+
+var CodeInput = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2["default"])(CodeInput, _React$Component);
+
+  var _super = _createSuper(CodeInput);
+
+  function CodeInput(_props) {
+    var _this;
+
+    (0, _classCallCheck2["default"])(this, CodeInput);
+    _this = _super.call(this, _props);
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onGetCode", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+      var onGetCode, that, s;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              // const url = await helper.fetchJson();
+              onGetCode = _this.props.onGetCode;
+              _context.next = 3;
+              return onGetCode && onGetCode();
+
+            case 3:
+              if (!_context.sent) {
+                _context.next = 8;
+                break;
+              }
+
+              debugger;
+
+              _this.setState({
+                time: _this.props.time || 60
+              });
+
+              that = (0, _assertThisInitialized2["default"])(_this);
+              s = (0, _setInterval2["default"])(function () {
+                that.setState({
+                  time: that.state.time -= 1
+                });
+
+                if (that.state.time === 0) {
+                  clearInterval(s);
+                }
+              }, 1000);
+
+            case 8:
+              ;
+
+            case 9:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    })));
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "btnProps", function (props) {
+      var btnProps = (0, _assign["default"])(_helper["default"].getObjectExclude(props, ['onGetCode']));
+      return _objectSpread(_objectSpread({}, btnProps), {}, {
+        size: 'large',
+        disabled: _this.state.time !== 0,
+        onClick: _this.onGetCode
+      });
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "inputProps", function (props) {
+      var inpPros = (0, _assign["default"])(_helper["default"].getObjectExclude(props, ['onGetCode']));
+      return _objectSpread(_objectSpread({}, inpPros), {}, {
+        size: 'large'
+      });
+    });
+    _this.state = {
+      value: _props.value,
+      time: 0
+    };
+    return _this;
+  }
+
+  (0, _createClass2["default"])(CodeInput, [{
+    key: "render",
+    value: function render() {
+      var _this$props = this.props,
+          inputKey = _this$props.inputKey,
+          readonly = _this$props.readonly,
+          value = _this$props.value;
+      var time = this.state.time;
+      return /*#__PURE__*/_react["default"].createElement(_row["default"], null, /*#__PURE__*/_react["default"].createElement(_col["default"], {
+        span: 20
+      }, /*#__PURE__*/_react["default"].createElement(_input["default"], this.inputProps(this.props))), /*#__PURE__*/_react["default"].createElement(_col["default"], null, /*#__PURE__*/_react["default"].createElement(_button["default"], this.btnProps(this.props), time === 0 ? "\u83B7\u53D6\u9A8C\u8BC1\u7801" : "".concat(time, "s\u83B7\u53D6\u9A8C\u8BC1\u7801"))));
+    }
+  }]);
+  return CodeInput;
+}(_react["default"].Component);
+
+var _default = CodeInput;
+exports["default"] = _default;

package/lib/CodeInput/package.json

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

package/lib/Control/Control.js

@@ -76,14 +76,16 @@ var _InputWriting = _interopRequireDefault(require("../InputWriting"));
 
 var _InpurCascader = _interopRequireDefault(require("../InpurCascader"));
 
-var _SuperUpload = _interopRequireDefault(require("../SuperUpload"));
-
-var _Area = _interopRequireDefault(require("../Area"));
-
 var _moment = _interopRequireDefault(require("moment"));
 
 var _event = _interopRequireDefault(require("./event"));
 
+var _CodeInput = _interopRequireDefault(require("../CodeInput"));
+
+var _SuperUpload = _interopRequireDefault(require("../SuperUpload"));
+
+var _Area = _interopRequireDefault(require("../Area/Area"));
+
 var _excluded = ["options"],
     _excluded2 = ["type", "autoFocus"];
 
@@ -180,6 +182,9 @@ var textArea = function textArea(props) {
 
 var readonly = function readonly(props) {
   props.readOnly = true;
+  props.style = (0, _assign["default"])(props.style || {}, {
+    backgroundColor: '#f0f0f0'
+  });
 
   if (props.value || props.defaultValue) {
     props.title = props.value || props.defaultValue;
@@ -225,6 +230,14 @@ var select = function select(props) {
   }
 
   return /*#__PURE__*/_react["default"].createElement(_select["default"], props, (0, _map["default"])(options).call(options, toOption));
+};
+
+var area = function area(props) {
+  var areaProps = _objectSpread(_objectSpread({}, props), {}, {
+    onParentChange: props.onChange
+  });
+
+  return /*#__PURE__*/_react["default"].createElement(_Area["default"], areaProps);
 }; // 下拉选择框-取title作为值
 
 
@@ -360,25 +373,21 @@ var cascader = function cascader(props) {
   return /*#__PURE__*/_react["default"].createElement(_InpurCascader["default"], props);
 };
 
-var area = function area(props) {
-  var areaProps = _objectSpread(_objectSpread({}, props), {}, {
-    onParentChange: props.onChange
-  });
+var captcha = function captcha(props) {
+  if (props.ref) {
+    props.inputRef = props.ref;
+    delete props.ref;
+  }
 
-  return /*#__PURE__*/_react["default"].createElement(_Area["default"], areaProps);
+  return /*#__PURE__*/_react["default"].createElement(_CodeInput["default"], 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);
 }; // 支持的控件类型
 
@@ -399,6 +408,7 @@ var controls = {
   selectSearch: selectSearch,
   selectWriting: selectWriting,
   cascader: cascader,
+  captcha: captcha,
   area: area,
   uploadImg: uploadImg
 };
@@ -420,7 +430,8 @@ Control.propTypes = {
   autoFocus: _propTypes["default"].bool,
   onChange: _propTypes["default"].func,
   onSearch: _propTypes["default"].func,
-  onBlur: _propTypes["default"].func
+  onBlur: _propTypes["default"].func,
+  onGetCode: _propTypes["default"].func
 }; // 依据value查找对应的标题
 
 var getTitle = function getTitle(value) {

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 _context22, _context23; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context22 = ownKeys(Object(source), !0)).call(_context22, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context23 = ownKeys(Object(source))).call(_context23, 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); }; }
 
@@ -121,7 +121,9 @@ var ControlType = {
   onCheckItem: _propTypes["default"].any,
   showAdd: _propTypes["default"].any,
   rule: _propTypes["default"].object,
-  props: _propTypes["default"].object
+  props: _propTypes["default"].object,
+  buildSuperUploadProps: _propTypes["default"].func //构建type===uploadImg时，SuperUpload组件需要的公共属性函数，已在项目公共文件state.js中提供，可直接引用
+
 };
 
 var Controlled = /*#__PURE__*/function (_React$Component) {
@@ -402,13 +404,21 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           onBlur: (0, _bind["default"])(_context14 = _this2.onExitValid).call(_context14, (0, _assertThisInitialized2["default"])(_this2), key),
           onAreaSearch: _this2.props.onAreaSearch
         });
-      } else {
+      } else if (type === 'uploadImg') {
         var _context15, _context16;
 
-        return _objectSpread(_objectSpread({}, props), {}, {
+        var commonProps = _this2.props.buildSuperUploadProps ? _this2.props.buildSuperUploadProps() : {};
+        return _objectSpread(_objectSpread(_objectSpread({}, props), commonProps), {}, {
           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)
         });
+      } else {
+        var _context17, _context18;
+
+        return _objectSpread(_objectSpread({}, props), {}, {
+          onChange: (0, _bind["default"])(_context17 = _this2.onBlur).call(_context17, (0, _assertThisInitialized2["default"])(_this2), key),
+          onBlur: (0, _bind["default"])(_context18 = _this2.onExitValid).call(_context18, (0, _assertThisInitialized2["default"])(_this2), key)
+        });
       }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "getControlProps", function (control, status) {
@@ -545,11 +555,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 _context19;
 
       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"])(_context19 = _this2.onFileChange).call(_context19, (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;
@@ -617,9 +627,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           key = _ref11.key;
 
       if (showAdd && type !== 'readonly') {
-        var _context18;
+        var _context20;
 
-        var onClick = (0, _bind["default"])(_context18 = _this2.onAdd).call(_context18, (0, _assertThisInitialized2["default"])(_this2), key, title);
+        var onClick = (0, _bind["default"])(_context20 = _this2.onAdd).call(_context20, (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",
@@ -678,7 +688,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCols", function () {
-      var _context19;
+      var _context21;
 
       var _this2$props4 = _this2.props,
           _this2$props4$colNum = _this2$props4.colNum,
@@ -690,7 +700,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"])(_context21 = _this2.getControls()).call(_context21, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/lib/SuperTable2/SuperTable2.js

@@ -96,13 +96,13 @@ var _variables = _interopRequireDefault(require("../variables"));
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray2(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
-function _unsupportedIterableToArray(o, minLen) { var _context12; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context12 = Object.prototype.toString.call(o)).call(_context12, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _unsupportedIterableToArray(o, minLen) { var _context13; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context13 = Object.prototype.toString.call(o)).call(_context13, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function 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 _context10, _context11; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context10 = ownKeys(Object(source), !0)).call(_context10, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context11 = ownKeys(Object(source))).call(_context11, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context11, _context12; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context11 = ownKeys(Object(source), !0)).call(_context11, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context12 = ownKeys(Object(source))).call(_context12, 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); }; }
 
@@ -400,7 +400,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getCellRender", function (col) {
       return function (value, record, index) {
-        var _context3, _context4, _context5;
+        var _context3, _context4, _context5, _context6;
 
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
 
@@ -463,9 +463,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props);
 
           case 'toolbar':
+            //showByKey为true时，每条数据中与按钮key相同的属性值决定按钮是否显示，建议key用下划线开始命名，避免与后台数据冲突
             var props = {
               onClick: _this.props.callback.onToolbar ? (0, _bind["default"])(_context4 = _this.props.callback.onToolbar).call(_context4, null, col.key, record.key, record) : undefined,
-              buttons: (0, _filter["default"])(_context5 = col.props.buttons).call(_context5, function (item) {
+              buttons: col.props.showByKey ? (0, _filter["default"])(_context5 = col.props.buttons).call(_context5, function (item) {
+                return record[item.key] === true;
+              }) : (0, _filter["default"])(_context6 = col.props.buttons).call(_context6, function (item) {
                 return item.defaultShow === !record._isEdit;
               })
             };
@@ -561,17 +564,17 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "canReadonly", function (type) {
-      var _context6;
+      var _context7;
 
-      return !(0, _includes["default"])(_context6 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context6, type);
+      return !(0, _includes["default"])(_context7 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context7, type);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols) {
-      var _context7;
+      var _context8;
 
       var readonly = _this.props.readonly;
-      return (0, _map["default"])(_context7 = (0, _filter["default"])(cols).call(cols, function (col) {
+      return (0, _map["default"])(_context8 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context7, function (_ref11, index) {
+      })).call(_context8, function (_ref11, index) {
         var col = (0, _extends2["default"])({}, _ref11);
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
@@ -597,13 +600,13 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getDataSource", function (items, cols) {
       return (0, _map["default"])(items).call(items, function (item, index) {
         return (0, _reduce["default"])(cols).call(cols, function (result, _ref12) {
-          var _context8;
+          var _context9;
 
           var key = _ref12.key,
               type = _ref12.type,
               options = _ref12.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context8 = item.isReadonly).call(_context8, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context9 = item.isReadonly).call(_context9, key))) {
             result[key] = item[key];
           } else {
             result[key] = (0, _Control.getTitle)(item[key], options);
@@ -635,7 +638,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getProps", function () {
-      var _context9;
+      var _context10;
 
       var _this$props3 = _this.props,
           cols = _this$props3.cols,
@@ -649,9 +652,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           _this$props3$isEmphas = _this$props3.isEmphasized,
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
           maxHeight = _this$props3.maxHeight;
-      var widthX = (0, _reduce["default"])(_context9 = (0, _filter["default"])(cols).call(cols, function (col) {
+      var widthX = (0, _reduce["default"])(_context10 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context9, function (width, item) {
+      })).call(_context10, function (width, item) {
         return width += item.width ? item.width : 120;
       }, 0);
       return _objectSpread({

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/package.json

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