cloud-b2b 1.1.5 → 1.1.8

package/es/Area/Area.js

@@ -151,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: value[item.key].title ? value[item.key].title : 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/NumberInput/NumberInput.js

@@ -166,9 +166,9 @@ var NumberInput = /*#__PURE__*/function (_React$Component) {
         if (!invalid) {
           onChange && onChange(value);
         }
-      }
 
-      onBlur && onBlur(event);
+        onBlur && onBlur(event); //有输入才触发外部失去焦点事件，避免非必要请求
+      }
     });
 
     _defineProperty(_assertThisInitialized(_this), "hasSpecialChar", function (value) {

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'];
 /**
@@ -133,7 +133,7 @@ var Controlled = /*#__PURE__*/function (_React$Component) {
  * checkable:是否显示checkbox选择框
  * onOpenChange:控制日期框显示隐藏回调func(key, open)
  * onAreaSearch:联级选择器触发，原型为func(key - 当前联级key, title - 输入值, parentKey - 主体联级key)
- * OnFileChange:上传组件触发,原型为func（key,{fileList, fileDeleteList}）
+ * onFileChange:上传组件触发,原型为func（key,{fileList, fileDeleteList}）
  */
 
 

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', //多选下拉搜索
@@ -89,7 +90,8 @@ var ColType = {
 /**
  * onCheck：点击复选框时触发，原型func(rowIndex, keyName, checked)
  * onContentChange: 输入框内容改变时触发，原型为function(rowIndex, keyName, value)
- * onSearch：search组件输入内容时触发，原型为function(rowIndex, keyName, value)
+ * onBlur: 输入框失去焦点时触发，原型为function(rowIndex, keyName, value)
+ * onSearch：search组件输入内容时触发，原型为function(rowIndex, keyName, value, col)
  * onLink: 点击超链接时触发，原型为function(keyName, rowIndex, item)
  * onAdd：点击+号时触发，原型为function(keyName)
  * onRenderCustom：(废弃)用于渲染type为custom类型的单元格，原型为function(rowIndex, keyName, value，props)
@@ -100,6 +102,7 @@ var CallbackType = {
   onExitValid: PropTypes.func,
   onCheck: PropTypes.func,
   onContentChange: PropTypes.func,
+  onBlur: PropTypes.func,
   onSearch: PropTypes.func,
   onLink: PropTypes.func,
   onAdd: PropTypes.func,
@@ -185,8 +188,15 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
 
-    _defineProperty(_assertThisInitialized(_this), "onBlur", function () {
-      _this.closeValid();
+    _defineProperty(_assertThisInitialized(_this), "onBlur", function (key, rowIndex) {
+      return function (value) {
+        var _ref7 = _this.props.callback || {},
+            onBlur = _ref7.onBlur;
+
+        _this.closeValid();
+
+        onBlur && onBlur(_this.getIndex(rowIndex), key, value);
+      };
     });
 
     _defineProperty(_assertThisInitialized(_this), "closeValid", function () {
@@ -248,7 +258,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         options: _this.getOptions(key, options, index),
         onChange: _this.onChange(key, index),
         onSearch: _this.onSearch(key, index, config),
-        onBlur: _this.onBlur
+        onBlur: _this.onBlur(key, index)
       };
 
       if (showRowAdd && _Array$isArray(isRequired) && _includesInstanceProperty(isRequired).call(isRequired, key)) {
@@ -328,8 +338,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           var split = index2 === list.length - 1 ? '' : ',';
 
           var onClick = function onClick() {
-            var _ref7 = _this.props.callback || {},
-                onLink = _ref7.onLink;
+            var _ref8 = _this.props.callback || {},
+                onLink = _ref8.onLink;
 
             onLink && onLink(col.key, index, item2);
           };
@@ -343,8 +353,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         var title = typeof col.link === 'string' ? col.link : value;
 
         var onClick = function onClick() {
-          var _ref8 = _this.props.callback || {},
-              onLink = _ref8.onLink;
+          var _ref9 = _this.props.callback || {},
+              onLink = _ref9.onLink;
 
           onLink && onLink(col.key, index, record);
         };
@@ -499,12 +509,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref9) {
-      var required = _ref9.required,
-          title = _ref9.title,
-          type = _ref9.type,
-          key = _ref9.key,
-          showAdd = _ref9.showAdd;
+    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref10) {
+      var required = _ref10.required,
+          title = _ref10.title,
+          type = _ref10.type,
+          key = _ref10.key,
+          showAdd = _ref10.showAdd;
 
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
@@ -520,9 +530,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
 
-    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref10) {
-      var type = _ref10.type,
-          align = _ref10.align;
+    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref11) {
+      var type = _ref11.type,
+          align = _ref11.align;
 
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
@@ -543,8 +553,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var readonly = _this.props.readonly;
       return _mapInstanceProperty(_context8 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context8, function (_ref11, index) {
-        var col = _extends({}, _ref11);
+      })).call(_context8, function (_ref12, index) {
+        var col = _extends({}, _ref12);
 
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
@@ -570,12 +580,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getDataSource", function (items, cols) {
       return _mapInstanceProperty(items).call(items, function (item, index) {
-        return _reduceInstanceProperty(cols).call(cols, function (result, _ref12) {
+        return _reduceInstanceProperty(cols).call(cols, function (result, _ref13) {
           var _context9;
 
-          var key = _ref12.key,
-              type = _ref12.type,
-              options = _ref12.options;
+          var key = _ref13.key,
+              type = _ref13.type,
+              options = _ref13.options;
 
           if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context9 = item.isReadonly).call(_context9, key))) {
             result[key] = item[key];
@@ -624,7 +634,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;
@@ -632,7 +646,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),
@@ -640,16 +660,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

@@ -179,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: value[item.key].title ? value[item.key].title : 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/NumberInput/NumberInput.js

@@ -194,9 +194,9 @@ var NumberInput = /*#__PURE__*/function (_React$Component) {
         if (!invalid) {
           onChange && onChange(value);
         }
-      }
 
-      onBlur && onBlur(event);
+        onBlur && onBlur(event); //有输入才触发外部失去焦点事件，避免非必要请求
+      }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "hasSpecialChar", function (value) {
       if ((0, _includes["default"])(value).call(value, '+')) {

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'];
 /**
@@ -183,7 +183,7 @@ var Controlled = /*#__PURE__*/function (_React$Component) {
  * checkable:是否显示checkbox选择框
  * onOpenChange:控制日期框显示隐藏回调func(key, open)
  * onAreaSearch:联级选择器触发，原型为func(key - 当前联级key, title - 输入值, parentKey - 主体联级key)
- * OnFileChange:上传组件触发,原型为func（key,{fileList, fileDeleteList}）
+ * onFileChange:上传组件触发,原型为func（key,{fileList, fileDeleteList}）
  */
 
 

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); }
@@ -142,7 +144,8 @@ var ColType = {
 /**
  * onCheck：点击复选框时触发，原型func(rowIndex, keyName, checked)
  * onContentChange: 输入框内容改变时触发，原型为function(rowIndex, keyName, value)
- * onSearch：search组件输入内容时触发，原型为function(rowIndex, keyName, value)
+ * onBlur: 输入框失去焦点时触发，原型为function(rowIndex, keyName, value)
+ * onSearch：search组件输入内容时触发，原型为function(rowIndex, keyName, value, col)
  * onLink: 点击超链接时触发，原型为function(keyName, rowIndex, item)
  * onAdd：点击+号时触发，原型为function(keyName)
  * onRenderCustom：(废弃)用于渲染type为custom类型的单元格，原型为function(rowIndex, keyName, value，props)
@@ -153,6 +156,7 @@ var CallbackType = {
   onExitValid: _propTypes["default"].func,
   onCheck: _propTypes["default"].func,
   onContentChange: _propTypes["default"].func,
+  onBlur: _propTypes["default"].func,
   onSearch: _propTypes["default"].func,
   onLink: _propTypes["default"].func,
   onAdd: _propTypes["default"].func,
@@ -231,8 +235,15 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         onLink && onLink(key, index, _this.props.items[index]);
       };
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function () {
-      _this.closeValid();
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onBlur", function (key, rowIndex) {
+      return function (value) {
+        var _ref7 = _this.props.callback || {},
+            onBlur = _ref7.onBlur;
+
+        _this.closeValid();
+
+        onBlur && onBlur(_this.getIndex(rowIndex), key, value);
+      };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "closeValid", function () {
       var _this$props = _this.props,
@@ -290,7 +301,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         options: _this.getOptions(key, options, index),
         onChange: _this.onChange(key, index),
         onSearch: _this.onSearch(key, index, config),
-        onBlur: _this.onBlur
+        onBlur: _this.onBlur(key, index)
       };
 
       if (showRowAdd && (0, _isArray["default"])(isRequired) && (0, _includes["default"])(isRequired).call(isRequired, key)) {
@@ -369,8 +380,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           var split = index2 === list.length - 1 ? '' : ',';
 
           var onClick = function onClick() {
-            var _ref7 = _this.props.callback || {},
-                onLink = _ref7.onLink;
+            var _ref8 = _this.props.callback || {},
+                onLink = _ref8.onLink;
 
             onLink && onLink(col.key, index, item2);
           };
@@ -384,8 +395,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         var title = typeof col.link === 'string' ? col.link : value;
 
         var onClick = function onClick() {
-          var _ref8 = _this.props.callback || {},
-              onLink = _ref8.onLink;
+          var _ref9 = _this.props.callback || {},
+              onLink = _ref9.onLink;
 
           onLink && onLink(col.key, index, record);
         };
@@ -535,12 +546,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref9) {
-      var required = _ref9.required,
-          title = _ref9.title,
-          type = _ref9.type,
-          key = _ref9.key,
-          showAdd = _ref9.showAdd;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref10) {
+      var required = _ref10.required,
+          title = _ref10.title,
+          type = _ref10.type,
+          key = _ref10.key,
+          showAdd = _ref10.showAdd;
 
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
@@ -555,9 +566,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         }, title, _this.toAdd(key, showAdd));
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref10) {
-      var type = _ref10.type,
-          align = _ref10.align;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref11) {
+      var type = _ref11.type,
+          align = _ref11.align;
 
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
@@ -576,8 +587,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var readonly = _this.props.readonly;
       return (0, _map["default"])(_context8 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context8, function (_ref11, index) {
-        var col = (0, _extends2["default"])({}, _ref11);
+      })).call(_context8, function (_ref12, index) {
+        var col = (0, _extends2["default"])({}, _ref12);
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
@@ -601,12 +612,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getDataSource", function (items, cols) {
       return (0, _map["default"])(items).call(items, function (item, index) {
-        return (0, _reduce["default"])(cols).call(cols, function (result, _ref12) {
+        return (0, _reduce["default"])(cols).call(cols, function (result, _ref13) {
           var _context9;
 
-          var key = _ref12.key,
-              type = _ref12.type,
-              options = _ref12.options;
+          var key = _ref13.key,
+              type = _ref13.type,
+              options = _ref13.options;
 
           if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context9 = item.isReadonly).call(_context9, key))) {
             result[key] = item[key];
@@ -653,13 +664,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),
@@ -667,16 +688,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.5",
+  "version": "1.1.8",
   "description": "A react component library dependent antd",
   "keywords": [
     "react",