cloud-b2b 1.1.74 → 1.1.76

package/es/Area/Area.js

@@ -8,14 +8,20 @@ import _Object$defineProperties from "@babel/runtime-corejs3/core-js-stable/obje
 import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object/define-property";
 import _Row from "antd/es/row";
 import _Col from "antd/es/col";
+import _typeof from "@babel/runtime-corejs3/helpers/typeof";
+import _Icon from "antd/es/icon";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
 import _inherits from "@babel/runtime-corejs3/helpers/inherits";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+import _Button from "antd/es/button";
+import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
+var _excluded = ["type", "children"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(t), !0)).call(_context4, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context5 = ownKeys(Object(t))).call(_context5, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
@@ -26,6 +32,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import helper from '../helper';
 import Control from '../Control';
+var defaultSize = 'small';
 var PROPS = {
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
   onChange: PropTypes.func,
@@ -33,12 +40,23 @@ var PROPS = {
   onParentChange: PropTypes.func,
   child: PropTypes.Array
 };
+var ButtonEx = function ButtonEx(_ref) {
+  var type = _ref.type,
+    children = _ref.children,
+    props = _objectWithoutProperties(_ref, _excluded);
+  props[type === 'primary-o' ? 'data-btn-type' : 'type'] = type;
+  return /*#__PURE__*/React.createElement(_Button, _extends({
+    style: {
+      marginLeft: 2
+    }
+  }, props), children);
+};
 var PROPS_KEYS = _Object$keys(PROPS);
 var Area = /*#__PURE__*/function (_React$Component) {
-  function Area(props) {
+  function Area(_props) {
     var _this;
     _classCallCheck(this, Area);
-    _this = _callSuper(this, Area, [props]);
+    _this = _callSuper(this, Area, [_props]);
     _defineProperty(_this, "onChange", function (key, keyValue) {
       var _this$props = _this.props,
         onParentChange = _this$props.onParentChange,
@@ -79,9 +97,41 @@ var Area = /*#__PURE__*/function (_React$Component) {
       });
       return flag ? onAreaSearch && onAreaSearch(key, KeyValue, parentKey) : helper.showError('请输入上级选择器');
     });
+    _defineProperty(_this, "toControl", function (item, props) {
+      if (item.type === 'button') {
+        var key = item.key,
+          title = item.title,
+          type = item.bsStyle,
+          _item$size = item.size,
+          size = _item$size === void 0 ? 'small' : _item$size;
+        var onClick = props.onClick;
+        return /*#__PURE__*/React.createElement(ButtonEx, {
+          key: key,
+          size: size,
+          type: type,
+          onClick: onClick
+        }, title);
+      } else if (item.type === 'icon') {
+        var _onClick = props.onClick;
+        var _key = item.key,
+          icon = item.icon;
+        return /*#__PURE__*/React.createElement(_Icon, {
+          type: icon,
+          key: _key,
+          onClick: _onClick
+        });
+      } else {
+        return /*#__PURE__*/React.createElement(Control, props);
+      }
+    });
+    _defineProperty(_this, "onClick", function (e) {
+      var onClick = _this.props.onClick;
+      var key = _typeof(e) === 'object' ? e.key : e;
+      onClick && onClick(key);
+    });
     _this.state = {
-      value: props.value || {},
-      options: props.options || {}
+      value: _props.value || {},
+      options: _props.options || {}
     };
     return _this;
   }
@@ -107,9 +157,13 @@ var Area = /*#__PURE__*/function (_React$Component) {
         _this$props3$readonly = _this$props3.readonly,
         readonly = _this$props3$readonly === void 0 ? false : _this$props3$readonly,
         _this$props3$value = _this$props3.value,
-        value = _this$props3$value === void 0 ? {} : _this$props3$value;
+        value = _this$props3$value === void 0 ? {} : _this$props3$value,
+        _this$props3$size = _this$props3.size,
+        size = _this$props3$size === void 0 ? defaultSize : _this$props3$size,
+        _this$props3$required = _this$props3.requiredColor,
+        requiredColor = _this$props3$required === void 0 ? false : _this$props3$required;
       return /*#__PURE__*/React.createElement(_Row, null, _mapInstanceProperty(child).call(child, function (item, index) {
-        var _context, _context2, _context3;
+        var _context, _context2, _context3, _context4;
         var childOptions = [];
         if (_includesInstanceProperty(_context = _Object$keys(options)).call(_context, item.key)) {
           if (index === 0) {
@@ -120,17 +174,21 @@ var Area = /*#__PURE__*/function (_React$Component) {
           }
         }
         var props = _objectSpread(_objectSpread({}, item), {}, {
+          size: size,
+          isBgColor: item.required && requiredColor,
           onSearch: _bindInstanceProperty(_context2 = _this2.onSearch).call(_context2, _this2, item.key, item, parentKey),
           onChange: _bindInstanceProperty(_context3 = _this2.onChange).call(_context3, _this2, item.key),
+          onClick: _bindInstanceProperty(_context4 = _this2.onClick).call(_context4, _this2, item.key),
           options: childOptions,
           value: value[item.key] && value[item.key].title ? value[item.key].title : value[item.key],
           type: readonly ? 'readonly' : item.type,
           searchWhenClick: true
         });
+        var factor = item.span || 24 / child.length;
         return /*#__PURE__*/React.createElement(_Col, {
-          span: 24 / child.length,
+          span: factor,
           key: item.key
-        }, /*#__PURE__*/React.createElement(Control, props));
+        }, _this2.toControl(item, props));
       }));
     }
   }]);

package/es/Control/Control.js

@@ -105,7 +105,11 @@ var text = function text(props) {
   if (props.value || props.defaultValue) {
     props.title = props.value || props.defaultValue;
   }
-  return /*#__PURE__*/React.createElement(_Input, props);
+  return /*#__PURE__*/React.createElement(_Input, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }));
 };
 
 // 密码输入框
@@ -123,7 +127,11 @@ var textArea = function textArea(props) {
       backgroundColor: '#f0f0f0'
     });
   }
-  return /*#__PURE__*/React.createElement(TextArea, props);
+  return /*#__PURE__*/React.createElement(TextArea, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }));
 };
 
 //双选输入框
@@ -195,7 +203,11 @@ var select = function select(props) {
       props.value = String(props.value);
     }
   }
-  return /*#__PURE__*/React.createElement(_Select, props, _mapInstanceProperty(options).call(options, toOption));
+  return /*#__PURE__*/React.createElement(_Select, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }), _mapInstanceProperty(options).call(options, toOption));
 };
 var area = function area(props) {
   var areaProps = _objectSpread(_objectSpread({}, props), {}, {
@@ -218,7 +230,11 @@ var selectText = function selectText(props) {
     props.value && _typeof(props.value) === 'object' && (props.value = _JSON$stringify(props.value));
     props.defaultValue && _typeof(props.defaultValue) === 'object' && (props.defaultValue = _JSON$stringify(props.defaultValue));
   }
-  return /*#__PURE__*/React.createElement(_Select, props, _mapInstanceProperty(options).call(options, toOption));
+  return /*#__PURE__*/React.createElement(_Select, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }), _mapInstanceProperty(options).call(options, toOption));
 };
 
 // 搜索框
@@ -286,11 +302,19 @@ var date = function date(props) {
     props.placeholder = '请选择日期';
     return /*#__PURE__*/React.createElement("div", {
       onBlur: props.onBlur
-    }, /*#__PURE__*/React.createElement(MonthPicker, props));
+    }, /*#__PURE__*/React.createElement(MonthPicker, _extends({}, props, {
+      style: {
+        backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+      }
+    })));
   }
   return /*#__PURE__*/React.createElement("div", {
     onBlur: props.onBlur
-  }, /*#__PURE__*/React.createElement(_DatePicker, props));
+  }, /*#__PURE__*/React.createElement(_DatePicker, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  })));
 };
 var rangePicker = function rangePicker(props) {
   var origin = props.onChange;
@@ -304,7 +328,11 @@ var rangePicker = function rangePicker(props) {
   }
   return /*#__PURE__*/React.createElement("div", {
     onBlur: props.onBlur
-  }, "  ", /*#__PURE__*/React.createElement(RangePicker, props));
+  }, "  ", /*#__PURE__*/React.createElement(RangePicker, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  })));
 };
 // 单选按钮组
 var radioGroup = function radioGroup(_ref3) {
@@ -322,7 +350,12 @@ var radioGroup = function radioGroup(_ref3) {
       return origin(e.target.value);
     };
   }
-  return /*#__PURE__*/React.createElement(RadioGroup, props, _mapInstanceProperty(options).call(options, toRadio));
+  return /*#__PURE__*/React.createElement(RadioGroup, _extends({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : '',
+      padding: '2px'
+    }
+  }), _mapInstanceProperty(options).call(options, toRadio));
 };
 
 // 富文本编辑器

package/es/InpurCascader/InputCascader.js

@@ -7,6 +7,7 @@ import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-st
 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 _Cascader from "antd/es/cascader";
+import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
@@ -106,7 +107,11 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
   return _createClass(InputCascader, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/React.createElement(_Cascader, this.getProps());
+      return /*#__PURE__*/React.createElement(_Cascader, _extends({}, this.getProps(), {
+        style: {
+          backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+        }
+      }));
     }
   }]);
 }(React.Component);

package/es/InputSearch/InputSearch.js

@@ -236,9 +236,6 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
         props.dataSource = _this.getDataSource();
         props.filterOption = filter ? _this.isMatch : false;
       }
-      if (_this.props.placeholder) {
-        props.placeholder = _this.props.placeholder;
-      }
       return props;
     });
     _this.state = {
@@ -262,7 +259,10 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/React.createElement("div", {
         onClick: this.onClick
       }, /*#__PURE__*/React.createElement(_AutoComplete, this.getProps(), /*#__PURE__*/React.createElement(_Input, {
-        suffix: suffix
+        suffix: suffix,
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
       })));
     }
   }]);

package/es/InputSelect/InputSelect.js

@@ -6,6 +6,7 @@ import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/inst
 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 _extends from "@babel/runtime-corejs3/helpers/extends";
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
@@ -150,7 +151,11 @@ var InputSelect = /*#__PURE__*/function (_React$Component) {
       };
       return /*#__PURE__*/React.createElement("div", {
         onClick: this.onClick
-      }, /*#__PURE__*/React.createElement(_Select, props, this.props.remark ? _mapInstanceProperty(allOptions).call(allOptions, this.toRemarkOption) : _mapInstanceProperty(allOptions).call(allOptions, this.toOption)));
+      }, /*#__PURE__*/React.createElement(_Select, _extends({}, props, {
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
+      }), this.props.remark ? _mapInstanceProperty(allOptions).call(allOptions, this.toRemarkOption) : _mapInstanceProperty(allOptions).call(allOptions, this.toOption)));
     }
   }]);
 }(React.Component);

package/es/InputWriting/InputWriting.js

@@ -1,4 +1,5 @@
 import _Reflect$construct from "@babel/runtime-corejs3/core-js-stable/reflect/construct";
+import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
@@ -75,7 +76,11 @@ var InputWriting = /*#__PURE__*/function (_React$Component) {
       };
       return /*#__PURE__*/React.createElement("div", {
         onClick: this.onClick
-      }, /*#__PURE__*/React.createElement(_Select, props));
+      }, /*#__PURE__*/React.createElement(_Select, _extends({}, props, {
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
+      })));
     }
   }]);
 }(React.Component);

package/es/NumberInput/NumberInput.js

@@ -7,6 +7,7 @@ import _Object$getOwnPropertyDescriptors from "@babel/runtime-corejs3/core-js-st
 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 _Input from "antd/es/input";
+import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
@@ -189,7 +190,11 @@ var NumberInput = /*#__PURE__*/function (_React$Component) {
   return _createClass(NumberInput, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/React.createElement(_Input, this.getProps());
+      return /*#__PURE__*/React.createElement(_Input, _extends({}, this.getProps(), {
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
+      }));
     }
   }]);
 }(React.Component);

package/es/SuperForm2/SuperForm.js

@@ -28,7 +28,7 @@ import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/ins
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context24, _context25; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(t), !0)).call(_context24, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context25 = ownKeys(Object(t))).call(_context25, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context25, _context26; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context25 = ownKeys(Object(t), !0)).call(_context25, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context26 = ownKeys(Object(t))).call(_context26, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
@@ -38,7 +38,7 @@ import helper from '../helper';
 import Control, { getTitle, makeString } from '../Control';
 import variables from '../variables';
 var FormItem = _Form.Item;
-var defaultSize = 'large';
+var defaultSize = 'default';
 var defaultColNum = 4;
 var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'rangePicker', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox', 'treeSelect'];
 
@@ -95,7 +95,6 @@ var Controlled = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var props = _objectSpread(_objectSpread({}, this.props), {}, {
-        size: 'large',
         value: this.state.value,
         onChange: this.onChange
       });
@@ -329,15 +328,21 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       var _this2$props3 = _this2.props,
         _this2$props3$value = _this2$props3.value,
         value = _this2$props3$value === void 0 ? {} : _this2$props3$value,
-        readonly = _this2$props3.readonly;
+        readonly = _this2$props3.readonly,
+        _this2$props3$require = _this2$props3.requiredColor,
+        requiredColor = _this2$props3$require === void 0 ? false : _this2$props3$require,
+        _this2$props3$size = _this2$props3.size,
+        size = _this2$props3$size === void 0 ? defaultSize : _this2$props3$size;
       var type = _this2.getType(control);
       var props = _this2.specialProps(type, control);
       return _objectSpread(_objectSpread({
         autoFocus: !!status,
         type: type
       }, props), {}, {
-        size: defaultSize,
-        value: makeString(value[control.key])
+        size: size,
+        value: makeString(value[control.key]),
+        isBgColor: control.required && requiredColor,
+        requiredColor: requiredColor
       });
     });
     _defineProperty(_this2, "getOptions", function (key, options) {
@@ -562,6 +567,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     _defineProperty(_this2, "toLabel", function (_ref10, type) {
       var title = _ref10.title,
         showAdd = _ref10.showAdd,
+        showQuery = _ref10.showQuery,
         key = _ref10.key,
         showInfo = _ref10.showInfo,
         showInfoTitle = _ref10.showInfoTitle;
@@ -573,6 +579,14 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           type: "plus-circle-o",
           onClick: onClick
         }));
+      } else if (showQuery && type !== 'readonly') {
+        var _context23;
+        var _onClick = _bindInstanceProperty(_context23 = _this2.onAdd).call(_context23, _this2, key, title);
+        return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
+          role: "add",
+          type: "search",
+          onClick: _onClick
+        }));
       } else if (showInfo) {
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
           title: showInfoTitle
@@ -594,7 +608,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       };
       var _this2$props4 = _this2.props,
         checkable = _this2$props4.checkable,
-        onCheckItem = _this2$props4.onCheckItem;
+        onCheckItem = _this2$props4.onCheckItem,
+        _this2$props4$isGridF = _this2$props4.isGridForm,
+        isGridForm = _this2$props4$isGridF === void 0 ? false : _this2$props4$isGridF;
+      var labelSpan = factor === 3 ? 3 : factor === 2 ? 4 : 8;
+      var smSpan = control.title ? factor === 3 ? 21 : factor === 2 ? 20 : 16 : 24;
       return control.type !== 'empty' ? /*#__PURE__*/React.createElement(_Col, {
         span: span * factor,
         key: control.key
@@ -609,7 +627,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 8
+            span: labelSpan
           }
         },
         wrapperCol: {
@@ -617,7 +635,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 16
+            span: smSpan
           }
         }
       }), _this2.toControl(controlProps, control))) : /*#__PURE__*/React.createElement(_Col, {
@@ -629,7 +647,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "toCols", function () {
-      var _context23;
+      var _context24;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -638,7 +656,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         colNum = 1;
       }
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context23 = _this2.getControls()).call(_context23, function (control) {
+      return _mapInstanceProperty(_context24 = _this2.getControls()).call(_context24, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }
@@ -671,6 +689,7 @@ _defineProperty(SuperForm2, "propTypes", {
   controls: PropTypes.arrayOf(PropTypes.shape(ControlType)).isRequired,
   value: PropTypes.object,
   colNum: PropTypes.number,
+  requiredColor: PropTypes.bool,
   valid: PropTypes.bool,
   readonly: PropTypes.oneOfType([PropTypes.bool, PropTypes.array]),
   hideControls: PropTypes.array,

package/es/SuperForm2/SuperForm.less

@@ -19,7 +19,9 @@
     :global(.ant-form-item-label) {
       line-height: 16px;
     }
-
+    :global(.ant-col-sm-24) {
+      text-align: center;
+    }
     :global(.ant-form-item-control) > span > textArea {
       min-height: 22px !important;
       margin-bottom: 0 !important;
@@ -51,8 +53,8 @@
       position: absolute;
       top:15px;
     }
-
-    .formItemWithCheckbox{
+    // ========== 修复后的自定义样式 ==========
+    & :global(.formItemWithCheckbox).ant-form-item {
       margin-left: 20px;
     }
   }

package/es/SuperTable/SuperTable.js

@@ -80,6 +80,7 @@ var ItemType = {
  * onLink: 点击超链接时触发，原型为func(key, rowIndex, item)
  * onTableChange: 排序信息改变时触发，原型为func(sortInfo, filterInfo)
  * onMoveRow：行拖曳排序时触发，原型为func(dragIndex, targetIndex)
+ * onRenderCustom：(废弃)用于渲染type为custom类型的单元格，原型为function(rowIndex, keyName, value，item)
  */
 var CallbackType = {
   onCheck: PropTypes.func,
@@ -87,7 +88,8 @@ var CallbackType = {
   onDoubleClick: PropTypes.func,
   onLink: PropTypes.func,
   onTableChange: PropTypes.func,
-  onMoveRow: PropTypes.func
+  onMoveRow: PropTypes.func,
+  onRenderCustom: PropTypes.func
 };
 
 /**
@@ -445,6 +447,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           col.render = function (text, record, index) {
             return _this.tags(col.key, index, items[index], col);
           };
+        } else if (col.type === 'custom') {
+          col.render = function (text, record, index) {
+            return _this.props.callback.onRenderCustom(index, col.key, record[col.key], record);
+          };
         }
         return col;
       });

package/es/adjust.less

@@ -43,11 +43,16 @@
   height: @input-height-sm !important;
   overflow: hidden;
 }
-
+.ant-select .ant-select-selection {
+  background-color: inherit !important;
+}
 .ant-form-vertical .ant-form-item {
   padding-bottom: 0;
 }
-
+.ant-calendar-picker-input,
+.ant-range-picker .ant-calendar-picker-input {
+  background-color: inherit !important;
+}
 .ant-form-item-control {
   line-height: @input-height-sm;
 

package/lib/Area/Area.js

@@ -14,26 +14,33 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
+var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
+var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 var _row = _interopRequireDefault(require("antd/lib/row"));
 var _col = _interopRequireDefault(require("antd/lib/col"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
+var _icon = _interopRequireDefault(require("antd/lib/icon"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
-var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
-var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
+var _button = _interopRequireDefault(require("antd/lib/button"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _helper = _interopRequireDefault(require("../helper"));
 var _Control = _interopRequireDefault(require("../Control"));
+var _excluded = ["type", "children"];
 function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context4, _context5; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context4 = ownKeys(Object(t), !0)).call(_context4, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context5 = ownKeys(Object(t))).call(_context5, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+var defaultSize = 'small';
 var PROPS = {
   value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number, _propTypes["default"].object]),
   onChange: _propTypes["default"].func,
@@ -41,12 +48,23 @@ var PROPS = {
   onParentChange: _propTypes["default"].func,
   child: _propTypes["default"].Array
 };
+var ButtonEx = function ButtonEx(_ref) {
+  var type = _ref.type,
+    children = _ref.children,
+    props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
+  props[type === 'primary-o' ? 'data-btn-type' : 'type'] = type;
+  return /*#__PURE__*/_react["default"].createElement(_button["default"], (0, _extends2["default"])({
+    style: {
+      marginLeft: 2
+    }
+  }, props), children);
+};
 var PROPS_KEYS = (0, _keys["default"])(PROPS);
 var Area = /*#__PURE__*/function (_React$Component) {
-  function Area(props) {
+  function Area(_props) {
     var _this;
     (0, _classCallCheck2["default"])(this, Area);
-    _this = _callSuper(this, Area, [props]);
+    _this = _callSuper(this, Area, [_props]);
     (0, _defineProperty2["default"])(_this, "onChange", function (key, keyValue) {
       var _this$props = _this.props,
         onParentChange = _this$props.onParentChange,
@@ -87,9 +105,41 @@ var Area = /*#__PURE__*/function (_React$Component) {
       });
       return flag ? onAreaSearch && onAreaSearch(key, KeyValue, parentKey) : _helper["default"].showError('请输入上级选择器');
     });
+    (0, _defineProperty2["default"])(_this, "toControl", function (item, props) {
+      if (item.type === 'button') {
+        var key = item.key,
+          title = item.title,
+          type = item.bsStyle,
+          _item$size = item.size,
+          size = _item$size === void 0 ? 'small' : _item$size;
+        var onClick = props.onClick;
+        return /*#__PURE__*/_react["default"].createElement(ButtonEx, {
+          key: key,
+          size: size,
+          type: type,
+          onClick: onClick
+        }, title);
+      } else if (item.type === 'icon') {
+        var _onClick = props.onClick;
+        var _key = item.key,
+          icon = item.icon;
+        return /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          type: icon,
+          key: _key,
+          onClick: _onClick
+        });
+      } else {
+        return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+      }
+    });
+    (0, _defineProperty2["default"])(_this, "onClick", function (e) {
+      var onClick = _this.props.onClick;
+      var key = (0, _typeof2["default"])(e) === 'object' ? e.key : e;
+      onClick && onClick(key);
+    });
     _this.state = {
-      value: props.value || {},
-      options: props.options || {}
+      value: _props.value || {},
+      options: _props.options || {}
     };
     return _this;
   }
@@ -115,9 +165,13 @@ var Area = /*#__PURE__*/function (_React$Component) {
         _this$props3$readonly = _this$props3.readonly,
         readonly = _this$props3$readonly === void 0 ? false : _this$props3$readonly,
         _this$props3$value = _this$props3.value,
-        value = _this$props3$value === void 0 ? {} : _this$props3$value;
+        value = _this$props3$value === void 0 ? {} : _this$props3$value,
+        _this$props3$size = _this$props3.size,
+        size = _this$props3$size === void 0 ? defaultSize : _this$props3$size,
+        _this$props3$required = _this$props3.requiredColor,
+        requiredColor = _this$props3$required === void 0 ? false : _this$props3$required;
       return /*#__PURE__*/_react["default"].createElement(_row["default"], null, (0, _map["default"])(child).call(child, function (item, index) {
-        var _context, _context2, _context3;
+        var _context, _context2, _context3, _context4;
         var childOptions = [];
         if ((0, _includes["default"])(_context = (0, _keys["default"])(options)).call(_context, item.key)) {
           if (index === 0) {
@@ -128,17 +182,21 @@ var Area = /*#__PURE__*/function (_React$Component) {
           }
         }
         var props = _objectSpread(_objectSpread({}, item), {}, {
+          size: size,
+          isBgColor: item.required && requiredColor,
           onSearch: (0, _bind["default"])(_context2 = _this2.onSearch).call(_context2, _this2, item.key, item, parentKey),
           onChange: (0, _bind["default"])(_context3 = _this2.onChange).call(_context3, _this2, item.key),
+          onClick: (0, _bind["default"])(_context4 = _this2.onClick).call(_context4, _this2, item.key),
           options: childOptions,
           value: value[item.key] && value[item.key].title ? value[item.key].title : value[item.key],
           type: readonly ? 'readonly' : item.type,
           searchWhenClick: true
         });
+        var factor = item.span || 24 / child.length;
         return /*#__PURE__*/_react["default"].createElement(_col["default"], {
-          span: 24 / child.length,
+          span: factor,
           key: item.key
-        }, /*#__PURE__*/_react["default"].createElement(_Control["default"], props));
+        }, _this2.toControl(item, props));
       }));
     }
   }]);

package/lib/Control/Control.js

@@ -112,7 +112,11 @@ var text = function text(props) {
   if (props.value || props.defaultValue) {
     props.title = props.value || props.defaultValue;
   }
-  return /*#__PURE__*/_react["default"].createElement(_input["default"], props);
+  return /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }));
 };
 
 // 密码输入框
@@ -130,7 +134,11 @@ var textArea = function textArea(props) {
       backgroundColor: '#f0f0f0'
     });
   }
-  return /*#__PURE__*/_react["default"].createElement(TextArea, props);
+  return /*#__PURE__*/_react["default"].createElement(TextArea, (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }));
 };
 
 //双选输入框
@@ -202,7 +210,11 @@ var select = function select(props) {
       props.value = String(props.value);
     }
   }
-  return /*#__PURE__*/_react["default"].createElement(_select["default"], props, (0, _map["default"])(options).call(options, toOption));
+  return /*#__PURE__*/_react["default"].createElement(_select["default"], (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }), (0, _map["default"])(options).call(options, toOption));
 };
 var area = function area(props) {
   var areaProps = _objectSpread(_objectSpread({}, props), {}, {
@@ -225,7 +237,11 @@ var selectText = function selectText(props) {
     props.value && (0, _typeof2["default"])(props.value) === 'object' && (props.value = (0, _stringify["default"])(props.value));
     props.defaultValue && (0, _typeof2["default"])(props.defaultValue) === 'object' && (props.defaultValue = (0, _stringify["default"])(props.defaultValue));
   }
-  return /*#__PURE__*/_react["default"].createElement(_select["default"], props, (0, _map["default"])(options).call(options, toOption));
+  return /*#__PURE__*/_react["default"].createElement(_select["default"], (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  }), (0, _map["default"])(options).call(options, toOption));
 };
 
 // 搜索框
@@ -293,11 +309,19 @@ var date = function date(props) {
     props.placeholder = '请选择日期';
     return /*#__PURE__*/_react["default"].createElement("div", {
       onBlur: props.onBlur
-    }, /*#__PURE__*/_react["default"].createElement(MonthPicker, props));
+    }, /*#__PURE__*/_react["default"].createElement(MonthPicker, (0, _extends2["default"])({}, props, {
+      style: {
+        backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+      }
+    })));
   }
   return /*#__PURE__*/_react["default"].createElement("div", {
     onBlur: props.onBlur
-  }, /*#__PURE__*/_react["default"].createElement(_datePicker["default"], props));
+  }, /*#__PURE__*/_react["default"].createElement(_datePicker["default"], (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  })));
 };
 var rangePicker = function rangePicker(props) {
   var origin = props.onChange;
@@ -311,7 +335,11 @@ var rangePicker = function rangePicker(props) {
   }
   return /*#__PURE__*/_react["default"].createElement("div", {
     onBlur: props.onBlur
-  }, "  ", /*#__PURE__*/_react["default"].createElement(RangePicker, props));
+  }, "  ", /*#__PURE__*/_react["default"].createElement(RangePicker, (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+    }
+  })));
 };
 // 单选按钮组
 var radioGroup = function radioGroup(_ref3) {
@@ -329,7 +357,12 @@ var radioGroup = function radioGroup(_ref3) {
       return origin(e.target.value);
     };
   }
-  return /*#__PURE__*/_react["default"].createElement(RadioGroup, props, (0, _map["default"])(options).call(options, toRadio));
+  return /*#__PURE__*/_react["default"].createElement(RadioGroup, (0, _extends2["default"])({}, props, {
+    style: {
+      backgroundColor: props.isBgColor ? '#f6ffc1' : '',
+      padding: '2px'
+    }
+  }), (0, _map["default"])(options).call(options, toRadio));
 };
 
 // 富文本编辑器

package/lib/InpurCascader/InputCascader.js

@@ -15,6 +15,7 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _cascader = _interopRequireDefault(require("antd/lib/cascader"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
@@ -113,7 +114,11 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
   return (0, _createClass2["default"])(InputCascader, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/_react["default"].createElement(_cascader["default"], this.getProps());
+      return /*#__PURE__*/_react["default"].createElement(_cascader["default"], (0, _extends2["default"])({}, this.getProps(), {
+        style: {
+          backgroundColor: props.isBgColor ? '#f6ffc1' : ''
+        }
+      }));
     }
   }]);
 }(_react["default"].Component);

package/lib/InputSearch/InputSearch.js

@@ -244,9 +244,6 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
         props.dataSource = _this.getDataSource();
         props.filterOption = filter ? _this.isMatch : false;
       }
-      if (_this.props.placeholder) {
-        props.placeholder = _this.props.placeholder;
-      }
       return props;
     });
     _this.state = {
@@ -270,7 +267,10 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         onClick: this.onClick
       }, /*#__PURE__*/_react["default"].createElement(_autoComplete["default"], this.getProps(), /*#__PURE__*/_react["default"].createElement(_input["default"], {
-        suffix: suffix
+        suffix: suffix,
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
       })));
     }
   }]);

package/lib/InputSelect/InputSelect.js

@@ -21,6 +21,7 @@ var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
@@ -158,7 +159,11 @@ var InputSelect = /*#__PURE__*/function (_React$Component) {
       };
       return /*#__PURE__*/_react["default"].createElement("div", {
         onClick: this.onClick
-      }, /*#__PURE__*/_react["default"].createElement(_select["default"], props, this.props.remark ? (0, _map["default"])(allOptions).call(allOptions, this.toRemarkOption) : (0, _map["default"])(allOptions).call(allOptions, this.toOption)));
+      }, /*#__PURE__*/_react["default"].createElement(_select["default"], (0, _extends2["default"])({}, props, {
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
+      }), this.props.remark ? (0, _map["default"])(allOptions).call(allOptions, this.toRemarkOption) : (0, _map["default"])(allOptions).call(allOptions, this.toOption)));
     }
   }]);
 }(_react["default"].Component);

package/lib/InputWriting/InputWriting.js

@@ -9,6 +9,7 @@ _Object$defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
@@ -83,7 +84,11 @@ var InputWriting = /*#__PURE__*/function (_React$Component) {
       };
       return /*#__PURE__*/_react["default"].createElement("div", {
         onClick: this.onClick
-      }, /*#__PURE__*/_react["default"].createElement(_select["default"], props));
+      }, /*#__PURE__*/_react["default"].createElement(_select["default"], (0, _extends2["default"])({}, props, {
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
+      })));
     }
   }]);
 }(_react["default"].Component);

package/lib/NumberInput/NumberInput.js

@@ -15,6 +15,7 @@ _Object$defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _input = _interopRequireDefault(require("antd/lib/input"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
@@ -197,7 +198,11 @@ var NumberInput = /*#__PURE__*/function (_React$Component) {
   return (0, _createClass2["default"])(NumberInput, [{
     key: "render",
     value: function render() {
-      return /*#__PURE__*/_react["default"].createElement(_input["default"], this.getProps());
+      return /*#__PURE__*/_react["default"].createElement(_input["default"], (0, _extends2["default"])({}, this.getProps(), {
+        style: {
+          backgroundColor: this.props.isBgColor ? '#f6ffc1' : ''
+        }
+      }));
     }
   }]);
 }(_react["default"].Component);

package/lib/SuperForm2/SuperForm.js

@@ -45,11 +45,11 @@ var _Control = _interopRequireWildcard(require("../Control"));
 var _variables = _interopRequireDefault(require("../variables"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context24, _context25; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(t), !0)).call(_context24, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context25 = ownKeys(Object(t))).call(_context25, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context25, _context26; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context25 = ownKeys(Object(t), !0)).call(_context25, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context26 = ownKeys(Object(t))).call(_context26, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var FormItem = _form["default"].Item;
-var defaultSize = 'large';
+var defaultSize = 'default';
 var defaultColNum = 4;
 var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'rangePicker', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox', 'treeSelect'];
 
@@ -106,7 +106,6 @@ var Controlled = /*#__PURE__*/function (_React$Component) {
     key: "render",
     value: function render() {
       var props = _objectSpread(_objectSpread({}, this.props), {}, {
-        size: 'large',
         value: this.state.value,
         onChange: this.onChange
       });
@@ -340,15 +339,21 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       var _this2$props3 = _this2.props,
         _this2$props3$value = _this2$props3.value,
         value = _this2$props3$value === void 0 ? {} : _this2$props3$value,
-        readonly = _this2$props3.readonly;
+        readonly = _this2$props3.readonly,
+        _this2$props3$require = _this2$props3.requiredColor,
+        requiredColor = _this2$props3$require === void 0 ? false : _this2$props3$require,
+        _this2$props3$size = _this2$props3.size,
+        size = _this2$props3$size === void 0 ? defaultSize : _this2$props3$size;
       var type = _this2.getType(control);
       var props = _this2.specialProps(type, control);
       return _objectSpread(_objectSpread({
         autoFocus: !!status,
         type: type
       }, props), {}, {
-        size: defaultSize,
-        value: (0, _Control.makeString)(value[control.key])
+        size: size,
+        value: (0, _Control.makeString)(value[control.key]),
+        isBgColor: control.required && requiredColor,
+        requiredColor: requiredColor
       });
     });
     (0, _defineProperty2["default"])(_this2, "getOptions", function (key, options) {
@@ -573,6 +578,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     (0, _defineProperty2["default"])(_this2, "toLabel", function (_ref10, type) {
       var title = _ref10.title,
         showAdd = _ref10.showAdd,
+        showQuery = _ref10.showQuery,
         key = _ref10.key,
         showInfo = _ref10.showInfo,
         showInfoTitle = _ref10.showInfoTitle;
@@ -584,6 +590,14 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           type: "plus-circle-o",
           onClick: onClick
         }));
+      } else if (showQuery && type !== 'readonly') {
+        var _context23;
+        var _onClick = (0, _bind["default"])(_context23 = _this2.onAdd).call(_context23, _this2, key, title);
+        return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          role: "add",
+          type: "search",
+          onClick: _onClick
+        }));
       } else if (showInfo) {
         return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
           title: showInfoTitle
@@ -605,7 +619,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       };
       var _this2$props4 = _this2.props,
         checkable = _this2$props4.checkable,
-        onCheckItem = _this2$props4.onCheckItem;
+        onCheckItem = _this2$props4.onCheckItem,
+        _this2$props4$isGridF = _this2$props4.isGridForm,
+        isGridForm = _this2$props4$isGridF === void 0 ? false : _this2$props4$isGridF;
+      var labelSpan = factor === 3 ? 3 : factor === 2 ? 4 : 8;
+      var smSpan = control.title ? factor === 3 ? 21 : factor === 2 ? 20 : 16 : 24;
       return control.type !== 'empty' ? /*#__PURE__*/_react["default"].createElement(_col["default"], {
         span: span * factor,
         key: control.key
@@ -620,7 +638,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 8
+            span: labelSpan
           }
         },
         wrapperCol: {
@@ -628,7 +646,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 16
+            span: smSpan
           }
         }
       }), _this2.toControl(controlProps, control))) : /*#__PURE__*/_react["default"].createElement(_col["default"], {
@@ -640,7 +658,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])(_this2, "toCols", function () {
-      var _context23;
+      var _context24;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -649,7 +667,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"])(_context24 = _this2.getControls()).call(_context24, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }
@@ -682,6 +700,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
   controls: _propTypes["default"].arrayOf(_propTypes["default"].shape(ControlType)).isRequired,
   value: _propTypes["default"].object,
   colNum: _propTypes["default"].number,
+  requiredColor: _propTypes["default"].bool,
   valid: _propTypes["default"].bool,
   readonly: _propTypes["default"].oneOfType([_propTypes["default"].bool, _propTypes["default"].array]),
   hideControls: _propTypes["default"].array,

package/lib/SuperForm2/SuperForm.less

@@ -19,7 +19,9 @@
     :global(.ant-form-item-label) {
       line-height: 16px;
     }
-
+    :global(.ant-col-sm-24) {
+      text-align: center;
+    }
     :global(.ant-form-item-control) > span > textArea {
       min-height: 22px !important;
       margin-bottom: 0 !important;
@@ -51,8 +53,8 @@
       position: absolute;
       top:15px;
     }
-
-    .formItemWithCheckbox{
+    // ========== 修复后的自定义样式 ==========
+    & :global(.formItemWithCheckbox).ant-form-item {
       margin-left: 20px;
     }
   }

package/lib/SuperTable/SuperTable.js

@@ -88,6 +88,7 @@ var ItemType = {
  * onLink: 点击超链接时触发，原型为func(key, rowIndex, item)
  * onTableChange: 排序信息改变时触发，原型为func(sortInfo, filterInfo)
  * onMoveRow：行拖曳排序时触发，原型为func(dragIndex, targetIndex)
+ * onRenderCustom：(废弃)用于渲染type为custom类型的单元格，原型为function(rowIndex, keyName, value，item)
  */
 var CallbackType = {
   onCheck: _propTypes["default"].func,
@@ -95,7 +96,8 @@ var CallbackType = {
   onDoubleClick: _propTypes["default"].func,
   onLink: _propTypes["default"].func,
   onTableChange: _propTypes["default"].func,
-  onMoveRow: _propTypes["default"].func
+  onMoveRow: _propTypes["default"].func,
+  onRenderCustom: _propTypes["default"].func
 };
 
 /**
@@ -453,6 +455,10 @@ var SuperTable = /*#__PURE__*/function (_React$Component) {
           col.render = function (text, record, index) {
             return _this.tags(col.key, index, items[index], col);
           };
+        } else if (col.type === 'custom') {
+          col.render = function (text, record, index) {
+            return _this.props.callback.onRenderCustom(index, col.key, record[col.key], record);
+          };
         }
         return col;
       });

package/lib/adjust.less

@@ -43,11 +43,16 @@
   height: @input-height-sm !important;
   overflow: hidden;
 }
-
+.ant-select .ant-select-selection {
+  background-color: inherit !important;
+}
 .ant-form-vertical .ant-form-item {
   padding-bottom: 0;
 }
-
+.ant-calendar-picker-input,
+.ant-range-picker .ant-calendar-picker-input {
+  background-color: inherit !important;
+}
 .ant-form-item-control {
   line-height: @input-height-sm;
 

package/package.json

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