cloud-b2b 1.1.13 → 1.1.16

package/es/CodeInput/CodeInput.js

@@ -6,9 +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 _Row from "antd/es/row";
 import _Button from "antd/es/button";
-import _Col from "antd/es/col";
 import _Input from "antd/es/input";
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
@@ -117,10 +115,11 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "inputProps", function (props) {
-      var inpPros = _Object$assign(helper.getObjectExclude(props, ['onGetCode']));
+      var inpPros = _Object$assign(helper.getObjectExclude(props, ['onGetCode', 'value']));
 
       return _objectSpread(_objectSpread({}, inpPros), {}, {
-        size: 'large'
+        size: 'large',
+        defaultValue: props.value || ''
       });
     });
 
@@ -139,9 +138,11 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
           readonly = _this$props.readonly,
           value = _this$props.value;
       var time = this.state.time;
-      return /*#__PURE__*/React.createElement(_Row, null, /*#__PURE__*/React.createElement(_Col, {
-        span: 20
-      }, /*#__PURE__*/React.createElement(_Input, this.inputProps(this.props))), /*#__PURE__*/React.createElement(_Col, null, /*#__PURE__*/React.createElement(_Button, this.btnProps(this.props), time === 0 ? "\u83B7\u53D6\u9A8C\u8BC1\u7801" : "".concat(time, "s\u83B7\u53D6\u9A8C\u8BC1\u7801"))));
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          display: 'flex'
+        }
+      }, /*#__PURE__*/React.createElement(_Input, this.inputProps(this.props)), /*#__PURE__*/React.createElement(_Button, this.btnProps(this.props), time === 0 ? "\u83B7\u53D6\u9A8C\u8BC1\u7801" : "".concat(time, "s\u83B7\u53D6\u9A8C\u8BC1\u7801")));
     }
   }]);
 

package/es/InputSearch/InputSearch.js

@@ -186,8 +186,10 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "isMatchRemark", function (inputValue, option) {
       var _option$props = option.props,
-          text = _option$props.text,
-          remark = _option$props.remark;
+          _option$props$text = _option$props.text,
+          text = _option$props$text === void 0 ? '' : _option$props$text,
+          _option$props$remark = _option$props.remark,
+          remark = _option$props$remark === void 0 ? '' : _option$props$remark;
       return _indexOfInstanceProperty(text).call(text, inputValue) > -1 || _indexOfInstanceProperty(remark).call(remark, inputValue) > -1;
     });
 

package/es/SuperForm/SuperForm.js

@@ -420,7 +420,7 @@ var SuperForm = /*#__PURE__*/function (_React$Component2) {
           'resize': 'none'
         };
       } else {
-        props.autosize = {
+        props.autoSize = {
           minRows: 1,
           maxRows: 5
         };

package/es/SuperForm2/SuperForm.js

@@ -446,7 +446,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           'resize': 'none'
         };
       } else {
-        props.autosize = {
+        props.autoSize = {
           minRows: 1,
           maxRows: 5
         };

package/es/SuperTable2/SuperTable2.js

@@ -420,7 +420,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               minWidth: '100px',
               maxWidth: "".concat(col.width - 16, "px"),
               overflow: 'hidden',
-              textOverflow: 'ellipsis'
+              textOverflow: 'ellipsis',
+              display: '-webkit-box',
+              WebkitLineClamp: 2,
+              WebkitBoxOrient: "vertical",
+              whiteSpace: 'break-spaces'
             },
             title: value
           }, value);
@@ -471,7 +475,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             });
 
           case 'custom':
-            return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props);
+            return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props, col);
 
           case 'toolbar':
             //showByKey为true时，每条数据中与按钮key相同的属性值决定按钮是否显示，建议key用下划线开始命名，避免与后台数据冲突

package/lib/CodeInput/CodeInput.js

@@ -28,12 +28,8 @@ exports["default"] = void 0;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime-corejs3/regenerator"));
 
-var _row = _interopRequireDefault(require("antd/lib/row"));
-
 var _button = _interopRequireDefault(require("antd/lib/button"));
 
-var _col = _interopRequireDefault(require("antd/lib/col"));
-
 var _input = _interopRequireDefault(require("antd/lib/input"));
 
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/asyncToGenerator"));
@@ -148,9 +144,10 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "inputProps", function (props) {
-      var inpPros = (0, _assign["default"])(_helper["default"].getObjectExclude(props, ['onGetCode']));
+      var inpPros = (0, _assign["default"])(_helper["default"].getObjectExclude(props, ['onGetCode', 'value']));
       return _objectSpread(_objectSpread({}, inpPros), {}, {
-        size: 'large'
+        size: 'large',
+        defaultValue: props.value || ''
       });
     });
     _this.state = {
@@ -168,9 +165,11 @@ var CodeInput = /*#__PURE__*/function (_React$Component) {
           readonly = _this$props.readonly,
           value = _this$props.value;
       var time = this.state.time;
-      return /*#__PURE__*/_react["default"].createElement(_row["default"], null, /*#__PURE__*/_react["default"].createElement(_col["default"], {
-        span: 20
-      }, /*#__PURE__*/_react["default"].createElement(_input["default"], this.inputProps(this.props))), /*#__PURE__*/_react["default"].createElement(_col["default"], null, /*#__PURE__*/_react["default"].createElement(_button["default"], this.btnProps(this.props), time === 0 ? "\u83B7\u53D6\u9A8C\u8BC1\u7801" : "".concat(time, "s\u83B7\u53D6\u9A8C\u8BC1\u7801"))));
+      return /*#__PURE__*/_react["default"].createElement("div", {
+        style: {
+          display: 'flex'
+        }
+      }, /*#__PURE__*/_react["default"].createElement(_input["default"], this.inputProps(this.props)), /*#__PURE__*/_react["default"].createElement(_button["default"], this.btnProps(this.props), time === 0 ? "\u83B7\u53D6\u9A8C\u8BC1\u7801" : "".concat(time, "s\u83B7\u53D6\u9A8C\u8BC1\u7801")));
     }
   }]);
   return CodeInput;

package/lib/InputSearch/InputSearch.js

@@ -209,8 +209,10 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isMatchRemark", function (inputValue, option) {
       var _option$props = option.props,
-          text = _option$props.text,
-          remark = _option$props.remark;
+          _option$props$text = _option$props.text,
+          text = _option$props$text === void 0 ? '' : _option$props$text,
+          _option$props$remark = _option$props.remark,
+          remark = _option$props$remark === void 0 ? '' : _option$props$remark;
       return (0, _indexOf["default"])(text).call(text, inputValue) > -1 || (0, _indexOf["default"])(remark).call(remark, inputValue) > -1;
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "isValidValue", function (value) {

package/lib/SuperForm/SuperForm.js

@@ -450,7 +450,7 @@ var SuperForm = /*#__PURE__*/function (_React$Component2) {
           'resize': 'none'
         };
       } else {
-        props.autosize = {
+        props.autoSize = {
           minRows: 1,
           maxRows: 5
         };

package/lib/SuperForm2/SuperForm.js

@@ -475,7 +475,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           'resize': 'none'
         };
       } else {
-        props.autosize = {
+        props.autoSize = {
           minRows: 1,
           maxRows: 5
         };

package/lib/SuperTable2/SuperTable2.js

@@ -469,7 +469,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               minWidth: '100px',
               maxWidth: "".concat(col.width - 16, "px"),
               overflow: 'hidden',
-              textOverflow: 'ellipsis'
+              textOverflow: 'ellipsis',
+              display: '-webkit-box',
+              WebkitLineClamp: 2,
+              WebkitBoxOrient: "vertical",
+              whiteSpace: 'break-spaces'
             },
             title: value
           }, value);
@@ -520,7 +524,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             });
 
           case 'custom':
-            return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props);
+            return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props, col);
 
           case 'toolbar':
             //showByKey为true时，每条数据中与按钮key相同的属性值决定按钮是否显示，建议key用下划线开始命名，避免与后台数据冲突

package/package.json

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