cloud-b2b 1.1.4 → 1.1.7

package/es/Area/Area.js

@@ -58,7 +58,8 @@ var Area = /*#__PURE__*/function (_React$Component) {
       var _this$props = _this.props,
           onParentChange = _this$props.onParentChange,
           child = _this$props.child,
-          value = _this$props.value;
+          _this$props$value = _this$props.value,
+          value = _this$props$value === void 0 ? {} : _this$props$value;
       var newValue = {};
       newValue[key] = keyValue;
       var CheckValue, checkIndex;
@@ -83,7 +84,8 @@ var Area = /*#__PURE__*/function (_React$Component) {
       var _this$props2 = _this.props,
           onAreaSearch = _this$props2.onAreaSearch,
           child = _this$props2.child,
-          value = _this$props2.value;
+          _this$props2$value = _this$props2.value,
+          value = _this$props2$value === void 0 ? {} : _this$props2$value;
       var flag = true;
 
       _mapInstanceProperty(child).call(child, function (item, index) {
@@ -113,7 +115,7 @@ var Area = /*#__PURE__*/function (_React$Component) {
     value: function componentWillReceiveProps(props) {
       if (props.value !== this.props.value) {
         this.setState({
-          value: props.value
+          value: props.value || {}
         });
       }
     }
@@ -129,7 +131,8 @@ var Area = /*#__PURE__*/function (_React$Component) {
           options = _this$props3$options === void 0 ? {} : _this$props3$options,
           _this$props3$readonly = _this$props3.readonly,
           readonly = _this$props3$readonly === void 0 ? false : _this$props3$readonly,
-          value = _this$props3.value;
+          _this$props3$value = _this$props3.value,
+          value = _this$props3$value === void 0 ? {} : _this$props3$value;
       return /*#__PURE__*/React.createElement(_Row, null, _mapInstanceProperty(child).call(child, function (item, index) {
         var _context, _context2, _context3;
 
@@ -148,7 +151,7 @@ var Area = /*#__PURE__*/function (_React$Component) {
           onSearch: _bindInstanceProperty(_context2 = _this2.onSearch).call(_context2, _this2, item.key, item, parentKey),
           onChange: _bindInstanceProperty(_context3 = _this2.onChange).call(_context3, _this2, item.key),
           options: childOptions,
-          value: _this2.props.value[item.key].title ? _this2.props.value[item.key].title : _this2.props.value[item.key],
+          value: value[item.key] && value[item.key].title ? value[item.key].title : value[item.key],
           type: readonly ? 'readonly' : item.type
         });
 

package/es/SuperForm2/SuperForm.js

@@ -43,7 +43,7 @@ import helper from '../helper';
 import Control, { getTitle, makeString } from '../Control';
 import variables from '../variables';
 var FormItem = _Form.Item;
-var defaultSize = 'small';
+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'];
 /**

package/es/SuperTable2/SuperTable2.js

@@ -55,6 +55,7 @@ import SuperTableCell from './SuperTableCell';
 import fixed from '../SuperTable/fixed';
 import SuperToolbar from '../SuperToolbar';
 import variables from '../variables';
+import helper from '../helper';
 var TypeEnum = ['readonly', 'index', 'checkbox', 'text', 'number', 'select', //存储value
 'selectText', //存储title
 'search', 'searchText', 'selectSearch', //多选下拉搜索
@@ -439,14 +440,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             return value ? typeof value === 'string' ? /*#__PURE__*/React.createElement("img", {
               src: value,
               style: {
-                maxWidth: '100px'
+                width: '80px',
+                height: '80px'
               }
             }) : /*#__PURE__*/React.createElement("div", {
               role: 'imgBox'
             }, /*#__PURE__*/React.createElement("img", {
               src: value.img,
               style: {
-                maxWidth: '100px'
+                width: '80px',
+                height: '80px'
               }
             }), /*#__PURE__*/React.createElement("span", null, value.title)) : /*#__PURE__*/React.createElement("div", null);
 
@@ -622,7 +625,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           pagination = _this$props3$paginati === void 0 ? false : _this$props3$paginati,
           _this$props3$isEmphas = _this$props3.isEmphasized,
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
-          maxHeight = _this$props3.maxHeight;
+          maxHeight = _this$props3.maxHeight,
+          _this$props3$expanded = _this$props3.expandedRowRender,
+          expandedRowRender = _this$props3$expanded === void 0 ? undefined : _this$props3$expanded,
+          _this$props3$onExpand = _this$props3.onExpand,
+          onExpand = _this$props3$onExpand === void 0 ? undefined : _this$props3$onExpand;
 
       var widthX = _reduceInstanceProperty(_context10 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
@@ -630,7 +637,13 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         return width += item.width ? item.width : 120;
       }, 0);
 
-      return _objectSpread({
+      var scrollProps = !helper.isEmpty2(expandedRowRender) ? {} : {
+        scroll: {
+          x: widthX,
+          y: maxHeight
+        }
+      };
+      return _objectSpread(_objectSpread({
         className: !isEmphasized ? variables('SuperTable2') : variables('SuperTable2').noTransition,
         columns: _this.getColumns(cols),
         dataSource: _this.getDataSource(items, cols),
@@ -638,16 +651,15 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           whiteSpace: 'nowrap'
         }, style),
         size: 'small',
-        scroll: {
-          x: widthX,
-          y: maxHeight
-        },
         pagination: pagination,
         footer: footer,
         locale: _this.props.emptyText ? {
           emptyText: _this.props.emptyText
         } : null
-      }, _this.getPropsByCheckbox());
+      }, _this.getPropsByCheckbox()), {}, {
+        expandedRowRender: expandedRowRender,
+        onExpand: onExpand
+      }, scrollProps);
     });
 
     _defineProperty(_assertThisInitialized(_this), "setScroll", function () {

package/lib/Area/Area.js

@@ -91,7 +91,8 @@ var Area = /*#__PURE__*/function (_React$Component) {
       var _this$props = _this.props,
           onParentChange = _this$props.onParentChange,
           child = _this$props.child,
-          value = _this$props.value;
+          _this$props$value = _this$props.value,
+          value = _this$props$value === void 0 ? {} : _this$props$value;
       var newValue = {};
       newValue[key] = keyValue;
       var CheckValue, checkIndex;
@@ -114,7 +115,8 @@ var Area = /*#__PURE__*/function (_React$Component) {
       var _this$props2 = _this.props,
           onAreaSearch = _this$props2.onAreaSearch,
           child = _this$props2.child,
-          value = _this$props2.value;
+          _this$props2$value = _this$props2.value,
+          value = _this$props2$value === void 0 ? {} : _this$props2$value;
       var flag = true;
       (0, _map["default"])(child).call(child, function (item, index) {
         if (item.key === key && index !== 0) {
@@ -141,7 +143,7 @@ var Area = /*#__PURE__*/function (_React$Component) {
     value: function componentWillReceiveProps(props) {
       if (props.value !== this.props.value) {
         this.setState({
-          value: props.value
+          value: props.value || {}
         });
       }
     }
@@ -157,7 +159,8 @@ var Area = /*#__PURE__*/function (_React$Component) {
           options = _this$props3$options === void 0 ? {} : _this$props3$options,
           _this$props3$readonly = _this$props3.readonly,
           readonly = _this$props3$readonly === void 0 ? false : _this$props3$readonly,
-          value = _this$props3.value;
+          _this$props3$value = _this$props3.value,
+          value = _this$props3$value === void 0 ? {} : _this$props3$value;
       return /*#__PURE__*/_react["default"].createElement(_row["default"], null, (0, _map["default"])(child).call(child, function (item, index) {
         var _context, _context2, _context3;
 
@@ -176,7 +179,7 @@ var Area = /*#__PURE__*/function (_React$Component) {
           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),
           options: childOptions,
-          value: _this2.props.value[item.key].title ? _this2.props.value[item.key].title : _this2.props.value[item.key],
+          value: value[item.key] && value[item.key].title ? value[item.key].title : value[item.key],
           type: readonly ? 'readonly' : item.type
         });
 

package/lib/SuperForm2/SuperForm.js

@@ -97,7 +97,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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;
-var defaultSize = 'small';
+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'];
 /**

package/lib/SuperTable2/SuperTable2.js

@@ -94,6 +94,8 @@ var _SuperToolbar = _interopRequireDefault(require("../SuperToolbar"));
 
 var _variables = _interopRequireDefault(require("../variables"));
 
+var _helper = _interopRequireDefault(require("../helper"));
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray2(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { var _context13; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context13 = Object.prototype.toString.call(o)).call(_context13, 8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return _Array$from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -478,14 +480,16 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             return value ? typeof value === 'string' ? /*#__PURE__*/_react["default"].createElement("img", {
               src: value,
               style: {
-                maxWidth: '100px'
+                width: '80px',
+                height: '80px'
               }
             }) : /*#__PURE__*/_react["default"].createElement("div", {
               role: 'imgBox'
             }, /*#__PURE__*/_react["default"].createElement("img", {
               src: value.img,
               style: {
-                maxWidth: '100px'
+                width: '80px',
+                height: '80px'
               }
             }), /*#__PURE__*/_react["default"].createElement("span", null, value.title)) : /*#__PURE__*/_react["default"].createElement("div", null);
 
@@ -651,13 +655,23 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           pagination = _this$props3$paginati === void 0 ? false : _this$props3$paginati,
           _this$props3$isEmphas = _this$props3.isEmphasized,
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
-          maxHeight = _this$props3.maxHeight;
+          maxHeight = _this$props3.maxHeight,
+          _this$props3$expanded = _this$props3.expandedRowRender,
+          expandedRowRender = _this$props3$expanded === void 0 ? undefined : _this$props3$expanded,
+          _this$props3$onExpand = _this$props3.onExpand,
+          onExpand = _this$props3$onExpand === void 0 ? undefined : _this$props3$onExpand;
       var widthX = (0, _reduce["default"])(_context10 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
       })).call(_context10, function (width, item) {
         return width += item.width ? item.width : 120;
       }, 0);
-      return _objectSpread({
+      var scrollProps = !_helper["default"].isEmpty2(expandedRowRender) ? {} : {
+        scroll: {
+          x: widthX,
+          y: maxHeight
+        }
+      };
+      return _objectSpread(_objectSpread({
         className: !isEmphasized ? (0, _variables["default"])('SuperTable2') : (0, _variables["default"])('SuperTable2').noTransition,
         columns: _this.getColumns(cols),
         dataSource: _this.getDataSource(items, cols),
@@ -665,16 +679,15 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           whiteSpace: 'nowrap'
         }, style),
         size: 'small',
-        scroll: {
-          x: widthX,
-          y: maxHeight
-        },
         pagination: pagination,
         footer: footer,
         locale: _this.props.emptyText ? {
           emptyText: _this.props.emptyText
         } : null
-      }, _this.getPropsByCheckbox());
+      }, _this.getPropsByCheckbox()), {}, {
+        expandedRowRender: expandedRowRender,
+        onExpand: onExpand
+      }, scrollProps);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setScroll", function () {
       if (_this.props.maxHeight && _this.props.items.length) {

package/package.json

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