cloud-b2b 1.1.38 → 1.1.40

package/lib/Control/Control.js

@@ -26,6 +26,7 @@ var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 var _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _radio = _interopRequireDefault(require("antd/lib/radio"));
 var _input = _interopRequireDefault(require("antd/lib/input"));
@@ -130,6 +131,33 @@ var textArea = function textArea(props) {
   return /*#__PURE__*/_react["default"].createElement(TextArea, props);
 };
 
+//双选输入框
+var _double = function _double(props) {
+  if (props.ref) {
+    props.inputRef = props.ref;
+    delete props.ref;
+  }
+  var doubleKey = props.doubleKey,
+    onChange = props.onChange;
+  var props1 = _objectSpread(_objectSpread({}, props), {}, {
+    defaultValue: props.doubleValue[props.doubleKey[0]],
+    onChange: props.onChange1
+  });
+  var props2 = _objectSpread(_objectSpread({}, props), {}, {
+    defaultValue: props.doubleValue[props.doubleKey[1]],
+    onChange: props.onChange2
+  });
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_NumberInput["default"], (0, _extends2["default"])({
+    key: 'linePrice'
+  }, props1)), "~", /*#__PURE__*/_react["default"].createElement(_NumberInput["default"], (0, _extends2["default"])({
+    key: 'linePrice2'
+  }, props2)));
+};
+
 // 只读框
 var readonly = function readonly(props) {
   props.readOnly = true;
@@ -333,7 +361,8 @@ var controls = {
   cascader: cascader,
   captcha: captcha,
   area: area,
-  uploadImg: uploadImg
+  uploadImg: uploadImg,
+  "double": _double
 };
 var Control = function Control(_ref4) {
   var type = _ref4.type,
@@ -342,7 +371,21 @@ var Control = function Control(_ref4) {
   var ref = autoFocus ? function (e) {
     return setFocus(e, type);
   } : null;
-  return controls[type]((0, _assign["default"])((0, _event["default"])(props), {
+  var _props$doubleKey = props.doubleKey,
+    doubleKey = _props$doubleKey === void 0 ? undefined : _props$doubleKey,
+    _props$onChange = props.onChange1,
+    onChange1 = _props$onChange === void 0 ? undefined : _props$onChange,
+    _props$onChange2 = props.onChange2,
+    onChange2 = _props$onChange2 === void 0 ? undefined : _props$onChange2,
+    _props$doubleValue = props.doubleValue,
+    doubleValue = _props$doubleValue === void 0 ? {} : _props$doubleValue;
+  return controls[type]((0, _assign["default"])((0, _event["default"])(props), type === 'double' ? {
+    ref: ref,
+    doubleKey: doubleKey,
+    onChange1: onChange1,
+    onChange2: onChange2,
+    doubleValue: doubleValue
+  } : {
     ref: ref
   }));
 };

package/lib/SuperForm2/SuperForm.js

@@ -47,7 +47,7 @@ var _variables = _interopRequireDefault(require("../variables"));
 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 || _typeof3(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; }
 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 _context24, _context25; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(source), !0)).call(_context24, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context25 = ownKeys(Object(source))).call(_context25, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context26, _context27; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context26 = ownKeys(Object(source), !0)).call(_context26, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context27 = ownKeys(Object(source))).call(_context27, 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 FormItem = _form["default"].Item;
@@ -332,6 +332,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           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 if (type === 'double') {
+        return props;
       } else {
         var _context18, _context19;
         return _objectSpread(_objectSpread({}, props), {}, {
@@ -393,6 +395,16 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       delete props.value;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toDoubleInput", function (props, control, cc) {
+      var _context20, _context21;
+      props.defaultValue = props.value;
+      props.doubleKey = props.key;
+      props.doubleValue = _helper["default"].getObject(cc, props.key);
+      props.onChange1 = (0, _bind["default"])(_context20 = _this2.onChange).call(_context20, (0, _assertThisInitialized2["default"])(_this2), props.key[0]);
+      props.onChange2 = (0, _bind["default"])(_context21 = _this2.onChange).call(_context21, (0, _assertThisInitialized2["default"])(_this2), props.key[1]);
+      delete props.value;
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toSelect", function (props, _ref6) {
       var options = _ref6.options,
         key = _ref6.key;
@@ -472,10 +484,10 @@ 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 _context20;
+      var _context22;
       var readonly = _this2.props.readonly;
       props.required = control.required || false;
-      props.onFileChange = (0, _bind["default"])(_context20 = _this2.onFileChange).call(_context20, (0, _assertThisInitialized2["default"])(_this2), control);
+      props.onFileChange = (0, _bind["default"])(_context22 = _this2.onFileChange).call(_context22, (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;
@@ -491,11 +503,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCheckbox", function (props, control) {
-      var _context21;
+      var _context23;
       var options = control.options || [];
       return /*#__PURE__*/_react["default"].createElement(_checkbox["default"].Group, {
         options: options,
-        onChange: (0, _bind["default"])(_context21 = _this2.onBlur).call(_context21, (0, _assertThisInitialized2["default"])(_this2), control.key),
+        onChange: (0, _bind["default"])(_context23 = _this2.onBlur).call(_context23, (0, _assertThisInitialized2["default"])(_this2), control.key),
         value: _this2.props.value[control.key]
       });
     });
@@ -503,6 +515,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       switch (props.type) {
         case 'readonly':
           return _this2.toReadonly(props, control);
+        case 'double':
+          return _this2.toDoubleInput(props, control, _this2.props.value);
         case 'text':
           return _this2.toText(props, control);
         case 'number':
@@ -550,8 +564,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         showInfo = _ref11.showInfo,
         showInfoTitle = _ref11.showInfoTitle;
       if (showAdd && type !== 'readonly') {
-        var _context22;
-        var onClick = (0, _bind["default"])(_context22 = _this2.onAdd).call(_context22, (0, _assertThisInitialized2["default"])(_this2), key, title);
+        var _context24;
+        var onClick = (0, _bind["default"])(_context24 = _this2.onAdd).call(_context24, (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",
@@ -613,7 +627,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCols", function () {
-      var _context23;
+      var _context25;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -622,7 +636,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         colNum = 1;
       }
       var span = 24 / colNum;
-      return (0, _map["default"])(_context23 = _this2.getControls()).call(_context23, function (control) {
+      return (0, _map["default"])(_context25 = _this2.getControls()).call(_context25, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/lib/SuperTable2/SuperTable2.js

@@ -75,7 +75,7 @@ var TypeEnum = ['readonly', 'index', 'checkbox', 'text', 'number', 'select',
 //按钮组
 'img',
 //图片标题组 value为{src,title}时显示图片标题   为字符串时   只显示图片
-'uploadImg'];
+'uploadImg', 'double'];
 
 /**
  * key：标识所在列，在一个表格中必须唯一
@@ -169,52 +169,60 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         onContentChange && onContentChange(_this.getIndex(rowIndex), key, value);
       };
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange1", function (key, rowIndex) {
+      return function (doublekey, value) {
+        var _ref4 = _this.props.callback || {},
+          onContentChange = _ref4.onContentChange;
+        _this.closeValid();
+        onContentChange && onContentChange(_this.getIndex(rowIndex), doublekey, value);
+      };
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onSearch", function (key, rowIndex, config) {
       return function (value) {
-        var _ref4 = _this.props.callback || {},
-          onSearch = _ref4.onSearch;
+        var _ref5 = _this.props.callback || {},
+          onSearch = _ref5.onSearch;
         onSearch && onSearch(_this.getIndex(rowIndex), key, value, config);
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onAdd", function (key) {
       return function () {
-        var _ref5 = _this.props.callback || {},
-          onAdd = _ref5.onAdd;
+        var _ref6 = _this.props.callback || {},
+          onAdd = _ref6.onAdd;
         onAdd && onAdd(key);
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onRowAdd", function (key, index) {
       return function () {
-        var _ref6 = _this.props.callback || {},
-          onLink = _ref6.onLink;
+        var _ref7 = _this.props.callback || {},
+          onLink = _ref7.onLink;
         onLink && onLink(key, index, _this.props.items[index]);
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function (key, rowIndex) {
       return function (value) {
-        var _ref7 = _this.props.callback || {},
-          onBlur = _ref7.onBlur;
+        var _ref8 = _this.props.callback || {},
+          onBlur = _ref8.onBlur;
         _this.closeValid();
         onBlur && onBlur(_this.getIndex(rowIndex), key, value);
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onDoubleClick", function (key, value) {
       return function () {
-        var _ref8 = _this.props.callback || {},
-          onDoubleClick = _ref8.onDoubleClick;
+        var _ref9 = _this.props.callback || {},
+          onDoubleClick = _ref9.onDoubleClick;
         onDoubleClick && onDoubleClick(key, value);
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onImgTileClick", function (col, value, rowIndex) {
       return function () {
-        var _ref9 = _this.props.callback || {},
-          onImgTileClick = _ref9.onImgTileClick;
+        var _ref10 = _this.props.callback || {},
+          onImgTileClick = _ref10.onImgTileClick;
         onImgTileClick && onImgTileClick(col, value, rowIndex);
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onMoveRow", function (dragIndex, targetIndex) {
-      var _ref10 = _this.props.callback || {},
-        onMoveRow = _ref10.onMoveRow;
+      var _ref11 = _this.props.callback || {},
+        onMoveRow = _ref11.onMoveRow;
       onMoveRow && onMoveRow(dragIndex, targetIndex);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "closeValid", function () {
@@ -264,6 +272,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var cellProps = {
         value: value,
         width: width,
+        items: _this.props.items[index],
         type: readonly || (0, _isArray["default"])(isReadonly) && (0, _includes["default"])(isReadonly).call(isReadonly, key) || _this.props.readonly ? 'readonly' : type,
         props: readonly ? {} : props,
         error: _this.validField(required, value),
@@ -336,6 +345,36 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
       return /*#__PURE__*/_react["default"].createElement(_SuperTableCell["default"], cellProps);
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "renderDoubleEditableCell", function (config, value, index) {
+      var key = config.key,
+        type = config.type,
+        options = config.options,
+        props = config.props,
+        required = config.required,
+        width = config.width,
+        showRowAdd = config.showRowAdd;
+      var _this$props$items$ind5 = _this.props.items[index],
+        readonly = _this$props$items$ind5.readonly,
+        _this$props$items$ind6 = _this$props$items$ind5.isReadonly,
+        isReadonly = _this$props$items$ind6 === void 0 ? [] : _this$props$items$ind6,
+        _this$props$items$ind7 = _this$props$items$ind5.isRequired,
+        isRequired = _this$props$items$ind7 === void 0 ? [] : _this$props$items$ind7,
+        _this$props$items$ind8 = _this$props$items$ind5._extraProps,
+        _extraProps = _this$props$items$ind8 === void 0 ? {} : _this$props$items$ind8;
+      var cellProps = {
+        value: value,
+        width: width,
+        items: _this.props.items[index],
+        type: readonly || (0, _isArray["default"])(isReadonly) && (0, _includes["default"])(isReadonly).call(isReadonly, key) || _this.props.readonly ? 'readonly' : type,
+        props: readonly ? {} : props,
+        error: _this.validField(required, value),
+        options: _this.getOptions(key, options, index),
+        onChange: _this.onChange1(key, index),
+        onSearch: _this.onSearch(key, index, config),
+        onBlur: _this.onBlur(key, index)
+      };
+      return /*#__PURE__*/_react["default"].createElement(_SuperTableCell["default"], cellProps);
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "renderLinkCell", function (col, value, record, index) {
       if (col.link === 'list') {
         var list = value && (0, _isArray["default"])(value) ? value : [];
@@ -347,8 +386,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           var _context2;
           var split = index2 === list.length - 1 ? '' : ',';
           var onClick = function onClick() {
-            var _ref11 = _this.props.callback || {},
-              onLink = _ref11.onLink;
+            var _ref12 = _this.props.callback || {},
+              onLink = _ref12.onLink;
             onLink && onLink(col.key, index, item2);
           };
           return /*#__PURE__*/_react["default"].createElement("a", {
@@ -359,8 +398,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       } else {
         var title = typeof col.link === 'string' ? col.link : value;
         var onClick = function onClick() {
-          var _ref12 = _this.props.callback || {},
-            onLink = _ref12.onLink;
+          var _ref13 = _this.props.callback || {},
+            onLink = _ref13.onLink;
           onLink && onLink(col.key, index, record);
         };
         return /*#__PURE__*/_react["default"].createElement("a", {
@@ -501,6 +540,10 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               value: _this.props.items[index][col.key]
             });
             return /*#__PURE__*/_react["default"].createElement(_Control["default"], uploadProps);
+          case 'double':
+            return _this.renderDoubleEditableCell(_objectSpread(_objectSpread({}, col), {}, {
+              type: realType
+            }), value, record.key);
           default:
             return _this.renderEditableCell(_objectSpread(_objectSpread({}, col), {}, {
               type: realType
@@ -541,12 +584,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref13) {
-      var required = _ref13.required,
-        title = _ref13.title,
-        type = _ref13.type,
-        key = _ref13.key,
-        showAdd = _ref13.showAdd;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref14) {
+      var required = _ref14.required,
+        title = _ref14.title,
+        type = _ref14.type,
+        key = _ref14.key,
+        showAdd = _ref14.showAdd;
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
         return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], (0, _extends2["default"])({
@@ -559,9 +602,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         }, title, _this.toAdd(key, showAdd));
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref14) {
-      var type = _ref14.type,
-        align = _ref14.align;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref15) {
+      var type = _ref15.type,
+        align = _ref15.align;
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
       } else {
@@ -570,16 +613,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "canReadonly", function (type) {
       var _context11;
-      return !(0, _includes["default"])(_context11 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context11, type);
+      return !(0, _includes["default"])(_context11 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar', 'uploadImg', 'double']).call(_context11, type);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols) {
       var _context12;
       var readonly = _this.props.readonly;
       return (0, _map["default"])(_context12 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context12, function (_ref15, index) {
+      })).call(_context12, function (_ref16, index) {
         var _context13;
-        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref15), _ref15));
+        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref16), _ref16));
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
@@ -611,11 +654,11 @@ 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, _ref16) {
+        return (0, _reduce["default"])(cols).call(cols, function (result, _ref17) {
           var _context14, _context15;
-          var key = _ref16.key,
-            type = _ref16.type,
-            options = _ref16.options;
+          var key = _ref17.key,
+            type = _ref17.type,
+            options = _ref17.options;
           if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context14 = item.isReadonly).call(_context14, key)) || (0, _includes["default"])(_context15 = ['img', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context15, type)) {
             result[key] = item[key];
           } else {

package/lib/SuperTable2/SuperTableCell.js

@@ -15,6 +15,7 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports.isInRegion = exports["default"] = void 0;
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
+var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 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"));
@@ -26,8 +27,9 @@ var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
 var _Control = _interopRequireDefault(require("../Control"));
+var _helper = _interopRequireDefault(require("../helper"));
 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) { (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 _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(source), !0)).call(_context4, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context5 = ownKeys(Object(source))).call(_context5, 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; } }
 // 单元格的type只能取如下值：
@@ -59,6 +61,12 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
         _this.props.onBlur();
       }
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (key, value) {
+      var onChange = _this.props.onChange;
+      if (onChange) {
+        onChange(key, value);
+      }
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onOpenChange", function (open) {
       if (!open) {
         var targets = document.getElementsByClassName('ant-calendar-picker-container');
@@ -87,6 +95,16 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
       delete props.value;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toDoubleNumberComponent", function (props, cc) {
+      var _context2, _context3;
+      props.defaultValue = props.value;
+      props.doubleKey = props.key;
+      props.doubleValue = _helper["default"].getObject(cc, props.key);
+      props.onChange1 = (0, _bind["default"])(_context2 = _this.onChange).call(_context2, (0, _assertThisInitialized2["default"])(_this), props.key[0]);
+      props.onChange2 = (0, _bind["default"])(_context3 = _this.onChange).call(_context3, (0, _assertThisInitialized2["default"])(_this), props.key[1]);
+      delete props.value;
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toDateComponent", function (props) {
       //props.getCalendarContainer = this.getPopupContainer;
       props.onBlur = _this.onDateBlur;
@@ -162,6 +180,10 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
           }, this.toDateComponent(props));
         case 'readonly':
           return this.toReadonlyComponent(props);
+        case 'double':
+          return /*#__PURE__*/_react["default"].createElement("div", {
+            className: className
+          }, this.toDoubleNumberComponent(props, this.props.items));
         default:
           return /*#__PURE__*/_react["default"].createElement("div", null, "\"error type\"");
       }

package/lib/SuperUpload/SuperUpload.js

@@ -9,6 +9,11 @@ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/in
 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 _sliceInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/slice");
+var _Array$from = require("@babel/runtime-corejs3/core-js-stable/array/from");
+var _Symbol = require("@babel/runtime-corejs3/core-js-stable/symbol");
+var _getIteratorMethod = require("@babel/runtime-corejs3/core-js/get-iterator-method");
+var _Array$isArray = require("@babel/runtime-corejs3/core-js-stable/array/is-array");
 var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 _Object$defineProperty(exports, "__esModule", {
@@ -32,6 +37,9 @@ var _Title = _interopRequireDefault(require("../Title"));
 var _variables = _interopRequireDefault(require("../variables"));
 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; }
+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 _context7; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context7 = Object.prototype.toString.call(o)).call(_context7, 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 _context5, _context6; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(source), !0)).call(_context5, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context6 = ownKeys(Object(source))).call(_context6, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 var FORMATS = ['image/jpeg', 'image/gif', 'image/bmp', 'image/jpg', 'image/png', 'image/tiff', 'image/gif', 'image/pcx', 'image/tga', 'image/exif', 'image/fpx', 'image/svg', 'image/psd', 'image/cdr', 'image/pcd', 'image/dxf', 'image/ufo', 'image/eps', 'image/ai', 'image/raw', 'image/WMF', 'video/mp4'];
@@ -88,6 +96,8 @@ var getUploadProps = function getUploadProps(props, onPreview, fileList, setFile
   var onChange = function onChange(_ref) {
     var file = _ref.file,
       fileList = _ref.fileList;
+    var limitNumber = props.limitNumber;
+    if (fileList.length > limitNumber) return _helper["default"].showError("\u6587\u4EF6\u6700\u591A\u53EF\u4E0A\u4F20".concat(limitNumber, "\u4E2A"));
     if (!file) return; //过滤掉不符合条件的响应
     var newList = [];
     if (file.response && file.response.returnCode !== 0) {
@@ -196,37 +206,88 @@ function SuperUpload(props) {
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     fileList = _useState4[0],
     setFileList = _useState4[1];
+  var initFileList = [];
   (0, _react.useEffect)(function () {
     function fetchImgData() {
       return _fetchImgData.apply(this, arguments);
     }
     function _fetchImgData() {
       _fetchImgData = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-        var initFileList;
+        var _iterator, _step, item;
         return _regenerator["default"].wrap(function _callee2$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              if (!(props.fileList.length > 0)) {
+                _context3.next = 35;
+                break;
+              }
+              _iterator = _createForOfIteratorHelper(props.fileList);
+              _context3.prev = 2;
+              _iterator.s();
+            case 4:
+              if ((_step = _iterator.n()).done) {
+                _context3.next = 27;
+                break;
+              }
+              item = _step.value;
+              if (!(item.fileUrl == '')) {
+                _context3.next = 17;
+                break;
+              }
               if (!props.getFileList) {
-                _context3.next = 6;
+                _context3.next = 13;
                 break;
               }
-              _context3.next = 3;
-              return props.getFileList(props.fileList);
-            case 3:
+              _context3.next = 10;
+              return props.getFileList(fileList);
+            case 10:
               _context3.t0 = _context3.sent;
-              _context3.next = 7;
+              _context3.next = 14;
               break;
-            case 6:
+            case 13:
               _context3.t0 = [];
-            case 7:
+            case 14:
               initFileList = _context3.t0;
-              setFileList(initFileList);
+              _context3.next = 25;
+              break;
+            case 17:
+              if (!props.getFileList) {
+                _context3.next = 23;
+                break;
+              }
+              _context3.next = 20;
+              return props.getFileList(props.fileList);
+            case 20:
+              _context3.t1 = _context3.sent;
+              _context3.next = 24;
+              break;
+            case 23:
+              _context3.t1 = [];
+            case 24:
+              initFileList = _context3.t1;
+            case 25:
+              _context3.next = 4;
+              break;
+            case 27:
+              _context3.next = 32;
+              break;
+            case 29:
+              _context3.prev = 29;
+              _context3.t2 = _context3["catch"](2);
+              _iterator.e(_context3.t2);
+            case 32:
+              _context3.prev = 32;
+              _iterator.f();
+              return _context3.finish(32);
+            case 35:
+              //const initFileList = props.getFileList ? await props.getFileList(props.fileList) : [];
+              setFileList(initFileList ? initFileList : []);
               setLoading(false);
-            case 10:
+            case 37:
             case "end":
               return _context3.stop();
           }
-        }, _callee2);
+        }, _callee2, null, [[2, 29, 32, 35]]);
       }));
       return _fetchImgData.apply(this, arguments);
     }
@@ -255,8 +316,8 @@ function SuperUpload(props) {
     limitNumber = _props$limitNumber === void 0 ? 10 : _props$limitNumber,
     readonly = props.readonly,
     title = props.title;
-  var className = listType === 'picture-card' && fileList.length < limitNumber ? (0, _variables["default"])('SuperUpload') : (0, _variables["default"])('SuperUpload2');
-  var canUpload = fileList.length >= limitNumber;
+  var className = listType === 'picture-card' && (fileList === null || fileList === void 0 ? void 0 : fileList.length) < limitNumber ? (0, _variables["default"])('SuperUpload') : (0, _variables["default"])('SuperUpload2');
+  var canUpload = (fileList === null || fileList === void 0 ? void 0 : fileList.length) >= limitNumber;
   return loading ? /*#__PURE__*/_react["default"].createElement("div", null, "loading...") : /*#__PURE__*/_react["default"].createElement("div", {
     className: className
   }, (listType === 'picture-card' || readonly) && title ? /*#__PURE__*/_react["default"].createElement(_Title["default"], {