cloud-b2b 1.1.68 → 1.1.70

package/es/Control/Control.js

@@ -7,10 +7,10 @@ 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 _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
-import _DatePicker from "antd/es/date-picker";
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+import _DatePicker from "antd/es/date-picker";
 import _Radio from "antd/es/radio";
 import _Input from "antd/es/input";
 import _Select from "antd/es/select";
@@ -46,6 +46,7 @@ import Area from '../Area/Area';
 var SelectOption = _Select.Option;
 var TextArea = _Input.TextArea;
 var RadioGroup = _Radio.Group;
+var RangePicker = _DatePicker.RangePicker;
 moment.locale('zh-cn');
 var getTitleOptions = function getTitleOptions(options) {
   var existTitles = [];
@@ -291,7 +292,20 @@ var date = function date(props) {
     onBlur: props.onBlur
   }, /*#__PURE__*/React.createElement(_DatePicker, props));
 };
-
+var rangePicker = function rangePicker(props) {
+  var origin = props.onChange;
+  if (typeof props.value !== 'undefined' && props.value.length === 2) {
+    props.value = !props.value ? undefined : [moment(props.value[0]), moment(props.value[1])];
+  }
+  if (props.onChange) {
+    props.onChange = function (date, str) {
+      return origin(str);
+    };
+  }
+  return /*#__PURE__*/React.createElement("div", {
+    onBlur: props.onBlur
+  }, "  ", /*#__PURE__*/React.createElement(RangePicker, props));
+};
 // 单选按钮组
 var radioGroup = function radioGroup(_ref3) {
   var _ref3$options = _ref3.options,
@@ -362,12 +376,16 @@ var controls = {
   area: area,
   uploadImg: uploadImg,
   "double": _double,
-  treeSelect: treeSelect
+  treeSelect: treeSelect,
+  rangePicker: rangePicker
 };
 var Control = function Control(_ref4) {
   var type = _ref4.type,
     autoFocus = _ref4.autoFocus,
     props = _objectWithoutProperties(_ref4, _excluded2);
+  if (props && props['data-__meta'] && props['data-__meta'].originalProps && props['data-__meta'].originalProps.value) {
+    props.value = props['data-__meta'].originalProps.value;
+  }
   var ref = autoFocus ? function (e) {
     return setFocus(e, type);
   } : null;

package/es/InputSearch/InputSearch.js

@@ -74,14 +74,17 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, InputSearch);
     _this = _super.call(this, _props);
     _defineProperty(_assertThisInitialized(_this), "onSearch", function (value) {
-      _this.setState({
-        value: value
-      });
+      // this.setState({value});
       var _this$props = _this.props,
         onSearch = _this$props.onSearch,
         noSearchWhenTypo = _this$props.noSearchWhenTypo;
       !noSearchWhenTypo && onSearch && onSearch(value);
     });
+    _defineProperty(_assertThisInitialized(_this), "onChange", function (value) {
+      _this.setState({
+        value: value
+      });
+    });
     _defineProperty(_assertThisInitialized(_this), "onBlur", function () {
       var _this$props2 = _this.props,
         _this$props2$autoAdd = _this$props2.autoAdd,
@@ -220,12 +223,13 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
         value: _this.getValue(),
         allowClear: true,
         ref: inputRef,
-        onChange: _this.onSearch,
+        onChange: _this.onChange,
+        onSearch: _this.onSearch,
+        onSelect: _this.onSelect,
+        onBlur: _this.onBlur,
         filterOption: function filterOption(e, option) {
           return option;
-        },
-        onSelect: _this.onSelect,
-        onBlur: _this.onBlur
+        }
       });
       if (_this.props.remark) {
         props.dataSource = _this.getDataSourceRemark();
@@ -257,7 +261,8 @@ 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,
+        placeholder: this.props.placeholder
       })));
     }
   }]);

package/es/SuperForm2/SuperForm.js

@@ -41,7 +41,7 @@ import variables from '../variables';
 var FormItem = _Form.Item;
 var defaultSize = 'large';
 var defaultColNum = 4;
-var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox', 'treeSelect'];
+var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'rangePicker', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox', 'treeSelect'];
 
 /**
  * key：[必须]，用于唯一标识该Form下的一个表单元素
@@ -443,9 +443,18 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       rule && (props.disabledDate = _this2.validDate(rule));
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_assertThisInitialized(_this2), "toRadioGroup", function (props, _ref8) {
-      var key = _ref8.key,
-        options = _ref8.options;
+    _defineProperty(_assertThisInitialized(_this2), "toRangePicker", function (props, _ref8) {
+      var rule = _ref8.rule;
+      props.getCalendarContainer = _this2.getPopupContainer;
+      props.style = {
+        width: '100%'
+      };
+      // rule && (props.disabledDate = this.validDate(rule));
+      return /*#__PURE__*/React.createElement(Control, props);
+    });
+    _defineProperty(_assertThisInitialized(_this2), "toRadioGroup", function (props, _ref9) {
+      var key = _ref9.key,
+        options = _ref9.options;
       props.options = _this2.getOptions(key, options);
       return /*#__PURE__*/React.createElement(Control, props);
     });
@@ -453,9 +462,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       props.onGetCode = _this2.props.onGetCode;
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_assertThisInitialized(_this2), "toReadonly", function (props, _ref9) {
-      var options = _ref9.options,
-        key = _ref9.key;
+    _defineProperty(_assertThisInitialized(_this2), "toReadonly", function (props, _ref10) {
+      var options = _ref10.options,
+        key = _ref10.key;
       props.value = getTitle(props.value, _this2.getOptions(key, options));
       return /*#__PURE__*/React.createElement(Control, props);
     });
@@ -466,9 +475,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/React.createElement(Control, props);
     });
-    _defineProperty(_assertThisInitialized(_this2), "area", function (props, _ref10) {
-      var key = _ref10.key,
-        options = _ref10.options;
+    _defineProperty(_assertThisInitialized(_this2), "area", function (props, _ref11) {
+      var key = _ref11.key,
+        options = _ref11.options;
       var readonly = _this2.props.readonly;
       props.parentKey = key;
       props.options = _this2.getOptions(key, options);
@@ -524,6 +533,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           return _this2.toSearch(props, control);
         case 'date':
           return _this2.toDate(props, control);
+        case 'rangePicker':
+          return _this2.toRangePicker(props, control);
         case 'radioGroup':
           return _this2.toRadioGroup(props, control);
         case 'textArea':
@@ -554,12 +565,12 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           return 'type error';
       }
     });
-    _defineProperty(_assertThisInitialized(_this2), "toLabel", function (_ref11, type) {
-      var title = _ref11.title,
-        showAdd = _ref11.showAdd,
-        key = _ref11.key,
-        showInfo = _ref11.showInfo,
-        showInfoTitle = _ref11.showInfoTitle;
+    _defineProperty(_assertThisInitialized(_this2), "toLabel", function (_ref12, type) {
+      var title = _ref12.title,
+        showAdd = _ref12.showAdd,
+        key = _ref12.key,
+        showInfo = _ref12.showInfo,
+        showInfoTitle = _ref12.showInfoTitle;
       if (showAdd && type !== 'readonly') {
         var _context24;
         var onClick = _bindInstanceProperty(_context24 = _this2.onAdd).call(_context24, _assertThisInitialized(_this2), key, title);

package/es/SuperForm2/SuperForm.less

@@ -34,6 +34,13 @@
     :global(.ant-select-selection--multiple) {
       border-top-width: 1px;
     }
+    :global(.ant-calendar-picker-input) {
+      display: flex;
+    }
+    :global(.has-error .ant-calendar-picker-input) {
+      border-color: #ff4d4f !important;
+      box-shadow:0 0 2px rgba(245, 34, 45, 0.2) !important;
+    }
 
     :global(.ant-radio-group-small) {
       display: block;

package/lib/Control/Control.js

@@ -24,10 +24,10 @@ var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 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 _datePicker = _interopRequireDefault(require("antd/lib/date-picker"));
 var _radio = _interopRequireDefault(require("antd/lib/radio"));
 var _input = _interopRequireDefault(require("antd/lib/input"));
 var _select = _interopRequireDefault(require("antd/lib/select"));
@@ -53,6 +53,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _co
 var SelectOption = _select["default"].Option;
 var TextArea = _input["default"].TextArea;
 var RadioGroup = _radio["default"].Group;
+var RangePicker = _datePicker["default"].RangePicker;
 _moment["default"].locale('zh-cn');
 var getTitleOptions = function getTitleOptions(options) {
   var existTitles = [];
@@ -298,7 +299,20 @@ var date = function date(props) {
     onBlur: props.onBlur
   }, /*#__PURE__*/_react["default"].createElement(_datePicker["default"], props));
 };
-
+var rangePicker = function rangePicker(props) {
+  var origin = props.onChange;
+  if (typeof props.value !== 'undefined' && props.value.length === 2) {
+    props.value = !props.value ? undefined : [(0, _moment["default"])(props.value[0]), (0, _moment["default"])(props.value[1])];
+  }
+  if (props.onChange) {
+    props.onChange = function (date, str) {
+      return origin(str);
+    };
+  }
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    onBlur: props.onBlur
+  }, "  ", /*#__PURE__*/_react["default"].createElement(RangePicker, props));
+};
 // 单选按钮组
 var radioGroup = function radioGroup(_ref3) {
   var _ref3$options = _ref3.options,
@@ -369,12 +383,16 @@ var controls = {
   area: area,
   uploadImg: uploadImg,
   "double": _double,
-  treeSelect: treeSelect
+  treeSelect: treeSelect,
+  rangePicker: rangePicker
 };
 var Control = function Control(_ref4) {
   var type = _ref4.type,
     autoFocus = _ref4.autoFocus,
     props = (0, _objectWithoutProperties2["default"])(_ref4, _excluded2);
+  if (props && props['data-__meta'] && props['data-__meta'].originalProps && props['data-__meta'].originalProps.value) {
+    props.value = props['data-__meta'].originalProps.value;
+  }
   var ref = autoFocus ? function (e) {
     return setFocus(e, type);
   } : null;

package/lib/InputSearch/InputSearch.js

@@ -82,14 +82,17 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
     (0, _classCallCheck2["default"])(this, InputSearch);
     _this = _super.call(this, _props);
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onSearch", function (value) {
-      _this.setState({
-        value: value
-      });
+      // this.setState({value});
       var _this$props = _this.props,
         onSearch = _this$props.onSearch,
         noSearchWhenTypo = _this$props.noSearchWhenTypo;
       !noSearchWhenTypo && onSearch && onSearch(value);
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onChange", function (value) {
+      _this.setState({
+        value: value
+      });
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function () {
       var _this$props2 = _this.props,
         _this$props2$autoAdd = _this$props2.autoAdd,
@@ -228,12 +231,13 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
         value: _this.getValue(),
         allowClear: true,
         ref: inputRef,
-        onChange: _this.onSearch,
+        onChange: _this.onChange,
+        onSearch: _this.onSearch,
+        onSelect: _this.onSelect,
+        onBlur: _this.onBlur,
         filterOption: function filterOption(e, option) {
           return option;
-        },
-        onSelect: _this.onSelect,
-        onBlur: _this.onBlur
+        }
       });
       if (_this.props.remark) {
         props.dataSource = _this.getDataSourceRemark();
@@ -265,7 +269,8 @@ 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,
+        placeholder: this.props.placeholder
       })));
     }
   }]);

package/lib/SuperForm2/SuperForm.js

@@ -53,7 +53,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !_R
 var FormItem = _form["default"].Item;
 var defaultSize = 'large';
 var defaultColNum = 4;
-var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox', 'treeSelect'];
+var TYPE = ['readonly', 'text', 'search', 'searchText', 'select', 'selectText', 'radioGroup', 'number', 'date', 'rangePicker', 'textArea', 'password', 'editor', 'selectWriting', 'selectSearch', 'empty', 'captcha', 'area', 'uploadImg', 'cascader', 'checkbox', 'treeSelect'];
 
 /**
  * key：[必须]，用于唯一标识该Form下的一个表单元素
@@ -455,9 +455,18 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       rule && (props.disabledDate = _this2.validDate(rule));
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toRadioGroup", function (props, _ref8) {
-      var key = _ref8.key,
-        options = _ref8.options;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toRangePicker", function (props, _ref8) {
+      var rule = _ref8.rule;
+      props.getCalendarContainer = _this2.getPopupContainer;
+      props.style = {
+        width: '100%'
+      };
+      // rule && (props.disabledDate = this.validDate(rule));
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toRadioGroup", function (props, _ref9) {
+      var key = _ref9.key,
+        options = _ref9.options;
       props.options = _this2.getOptions(key, options);
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
@@ -465,9 +474,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       props.onGetCode = _this2.props.onGetCode;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toReadonly", function (props, _ref9) {
-      var options = _ref9.options,
-        key = _ref9.key;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toReadonly", function (props, _ref10) {
+      var options = _ref10.options,
+        key = _ref10.key;
       props.value = (0, _Control.getTitle)(props.value, _this2.getOptions(key, options));
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
@@ -478,9 +487,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       props.dropdownMatchSelectWidth = false;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "area", function (props, _ref10) {
-      var key = _ref10.key,
-        options = _ref10.options;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "area", function (props, _ref11) {
+      var key = _ref11.key,
+        options = _ref11.options;
       var readonly = _this2.props.readonly;
       props.parentKey = key;
       props.options = _this2.getOptions(key, options);
@@ -536,6 +545,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           return _this2.toSearch(props, control);
         case 'date':
           return _this2.toDate(props, control);
+        case 'rangePicker':
+          return _this2.toRangePicker(props, control);
         case 'radioGroup':
           return _this2.toRadioGroup(props, control);
         case 'textArea':
@@ -566,12 +577,12 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           return 'type error';
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toLabel", function (_ref11, type) {
-      var title = _ref11.title,
-        showAdd = _ref11.showAdd,
-        key = _ref11.key,
-        showInfo = _ref11.showInfo,
-        showInfoTitle = _ref11.showInfoTitle;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toLabel", function (_ref12, type) {
+      var title = _ref12.title,
+        showAdd = _ref12.showAdd,
+        key = _ref12.key,
+        showInfo = _ref12.showInfo,
+        showInfoTitle = _ref12.showInfoTitle;
       if (showAdd && type !== 'readonly') {
         var _context24;
         var onClick = (0, _bind["default"])(_context24 = _this2.onAdd).call(_context24, (0, _assertThisInitialized2["default"])(_this2), key, title);

package/lib/SuperForm2/SuperForm.less

@@ -34,6 +34,13 @@
     :global(.ant-select-selection--multiple) {
       border-top-width: 1px;
     }
+    :global(.ant-calendar-picker-input) {
+      display: flex;
+    }
+    :global(.has-error .ant-calendar-picker-input) {
+      border-color: #ff4d4f !important;
+      box-shadow:0 0 2px rgba(245, 34, 45, 0.2) !important;
+    }
 
     :global(.ant-radio-group-small) {
       display: block;

package/package.json

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