cloud-b2b 1.1.16 → 1.1.18

package/es/InputSearch/InputSearch.js

@@ -257,7 +257,10 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
         value: _this.getValue(),
         allowClear: true,
         ref: inputRef,
-        onSearch: _this.onSearch,
+        onChange: _this.onSearch,
+        filterOption: function filterOption(e, option) {
+          return option;
+        },
         onSelect: _this.onSelect,
         onBlur: _this.onBlur
       });

package/es/SuperForm2/SuperForm.js

@@ -398,8 +398,10 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
 
     _defineProperty(_assertThisInitialized(_this2), "getControlProps", function (control, status) {
-      var _this2$props$value2 = _this2.props.value,
-          value = _this2$props$value2 === void 0 ? {} : _this2$props$value2;
+      var _this2$props3 = _this2.props,
+          _this2$props3$value = _this2$props3.value,
+          value = _this2$props3$value === void 0 ? {} : _this2$props3$value,
+          readonly = _this2$props3.readonly;
 
       var type = _this2.getType(control);
 
@@ -410,7 +412,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         type: type
       }, props), {}, {
         size: defaultSize,
-        value: makeString(value[control.key])
+        value: makeString(value[control.key]),
+        readonly: readonly
       });
     });
 
@@ -686,9 +689,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         required: control.required,
         validateStatus: status
       };
-      var _this2$props3 = _this2.props,
-          checkable = _this2$props3.checkable,
-          onCheckItem = _this2$props3.onCheckItem;
+      var _this2$props4 = _this2.props,
+          checkable = _this2$props4.checkable,
+          onCheckItem = _this2$props4.onCheckItem;
       return control.type !== 'empty' ? /*#__PURE__*/React.createElement(_Col, {
         span: span * factor,
         key: control.key
@@ -726,10 +729,10 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     _defineProperty(_assertThisInitialized(_this2), "toCols", function () {
       var _context23;
 
-      var _this2$props4 = _this2.props,
-          _this2$props4$colNum = _this2$props4.colNum,
-          colNum = _this2$props4$colNum === void 0 ? defaultColNum : _this2$props4$colNum,
-          allFullFather = _this2$props4.allFullFather;
+      var _this2$props5 = _this2.props,
+          _this2$props5$colNum = _this2$props5.colNum,
+          colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
+          allFullFather = _this2$props5.allFullFather;
 
       if (allFullFather) {
         colNum = 1;

package/es/SuperTable2/SuperTable2.js

@@ -28,13 +28,13 @@ var _excluded = ["onRowClick"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof _Symbol !== "undefined" && _getIteratorMethod(o) || o["@@iterator"]; if (!it) { if (_Array$isArray(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 _context19; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context19 = Object.prototype.toString.call(o)).call(_context19, 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); }
+function _unsupportedIterableToArray(o, minLen) { var _context20; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context20 = Object.prototype.toString.call(o)).call(_context20, 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); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context17, _context18; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context17 = ownKeys(Object(source), !0)).call(_context17, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context18 = ownKeys(Object(source))).call(_context18, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context18, _context19; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context18 = ownKeys(Object(source), !0)).call(_context18, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context19 = ownKeys(Object(source))).call(_context19, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
@@ -289,7 +289,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var cellProps = {
         value: value,
         width: width,
-        type: readonly || _Array$isArray(isReadonly) && _includesInstanceProperty(isReadonly).call(isReadonly, key) ? 'readonly' : type,
+        type: readonly || _Array$isArray(isReadonly) && _includesInstanceProperty(isReadonly).call(isReadonly, key) || _this.props.readonly ? 'readonly' : type,
         props: readonly ? {} : props,
         error: _this.validField(required, value),
         options: _this.getOptions(key, options, index),
@@ -419,6 +419,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               minHeight: '20px',
               minWidth: '100px',
               maxWidth: "".concat(col.width - 16, "px"),
+              color: col.isNeedShow ? '#1890ff' : '',
               overflow: 'hidden',
               textOverflow: 'ellipsis',
               display: '-webkit-box',
@@ -645,6 +646,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         // }
         // }
 
+        col.readonly = readonly;
+        debugger;
         col.render = _this.getCellRender(col);
 
         if (col.link) {
@@ -659,13 +662,13 @@ 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, _ref16) {
-          var _context14;
+          var _context14, _context15;
 
           var key = _ref16.key,
               type = _ref16.type,
               options = _ref16.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context14 = item.isReadonly).call(_context14, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context14 = item.isReadonly).call(_context14, key)) || _includesInstanceProperty(_context15 = ['img', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context15, type)) {
             result[key] = item[key];
           } else {
             result[key] = getTitle(item[key], options);
@@ -821,7 +824,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "getProps", function () {
-      var _context15;
+      var _context16;
 
       var _this$props4 = _this.props,
           cols = _this$props4.cols,
@@ -841,12 +844,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           _this$props4$onExpand = _this$props4.onExpand,
           onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand;
 
-      var widthX = _reduceInstanceProperty(_context15 = _filterInstanceProperty(cols).call(cols, function (col) {
+      var widthX = _reduceInstanceProperty(_context16 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context15, function (width, item) {
-        var _context16;
+      })).call(_context16, function (width, item) {
+        var _context17;
 
-        return width += item.width ? item.width : _includesInstanceProperty(_context16 = ['index', 'checked']).call(_context16, item.key) ? 70 : item.type === 'img' ? 200 : 120;
+        return width += item.width ? item.width : _includesInstanceProperty(_context17 = ['index', 'checked']).call(_context17, item.key) ? 70 : item.type === 'img' ? 200 : 120;
       }, 0);
 
       var scrollProps = !helper.isEmpty2(expandedRowRender) ? {

package/lib/InputSearch/InputSearch.js

@@ -275,7 +275,10 @@ var InputSearch = /*#__PURE__*/function (_React$Component) {
         value: _this.getValue(),
         allowClear: true,
         ref: inputRef,
-        onSearch: _this.onSearch,
+        onChange: _this.onSearch,
+        filterOption: function filterOption(e, option) {
+          return option;
+        },
         onSelect: _this.onSelect,
         onBlur: _this.onBlur
       });

package/lib/SuperForm2/SuperForm.js

@@ -434,8 +434,10 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "getControlProps", function (control, status) {
-      var _this2$props$value2 = _this2.props.value,
-          value = _this2$props$value2 === void 0 ? {} : _this2$props$value2;
+      var _this2$props3 = _this2.props,
+          _this2$props3$value = _this2$props3.value,
+          value = _this2$props3$value === void 0 ? {} : _this2$props3$value,
+          readonly = _this2$props3.readonly;
 
       var type = _this2.getType(control);
 
@@ -446,7 +448,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         type: type
       }, props), {}, {
         size: defaultSize,
-        value: (0, _Control.makeString)(value[control.key])
+        value: (0, _Control.makeString)(value[control.key]),
+        readonly: readonly
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "getOptions", function (key, options) {
@@ -697,9 +700,9 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         required: control.required,
         validateStatus: status
       };
-      var _this2$props3 = _this2.props,
-          checkable = _this2$props3.checkable,
-          onCheckItem = _this2$props3.onCheckItem;
+      var _this2$props4 = _this2.props,
+          checkable = _this2$props4.checkable,
+          onCheckItem = _this2$props4.onCheckItem;
       return control.type !== 'empty' ? /*#__PURE__*/_react["default"].createElement(_col["default"], {
         span: span * factor,
         key: control.key
@@ -736,10 +739,10 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "toCols", function () {
       var _context23;
 
-      var _this2$props4 = _this2.props,
-          _this2$props4$colNum = _this2$props4.colNum,
-          colNum = _this2$props4$colNum === void 0 ? defaultColNum : _this2$props4$colNum,
-          allFullFather = _this2$props4.allFullFather;
+      var _this2$props5 = _this2.props,
+          _this2$props5$colNum = _this2$props5.colNum,
+          colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
+          allFullFather = _this2$props5.allFullFather;
 
       if (allFullFather) {
         colNum = 1;

package/lib/SuperTable2/SuperTable2.js

@@ -114,13 +114,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 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 _context19; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context19 = Object.prototype.toString.call(o)).call(_context19, 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); }
+function _unsupportedIterableToArray(o, minLen) { var _context20; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context20 = Object.prototype.toString.call(o)).call(_context20, 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); }
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
 function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context17, _context18; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context17 = ownKeys(Object(source), !0)).call(_context17, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context18 = ownKeys(Object(source))).call(_context18, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context18, _context19; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context18 = ownKeys(Object(source), !0)).call(_context18, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context19 = ownKeys(Object(source))).call(_context19, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
@@ -341,7 +341,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var cellProps = {
         value: value,
         width: width,
-        type: readonly || (0, _isArray["default"])(isReadonly) && (0, _includes["default"])(isReadonly).call(isReadonly, key) ? 'readonly' : type,
+        type: readonly || (0, _isArray["default"])(isReadonly) && (0, _includes["default"])(isReadonly).call(isReadonly, key) || _this.props.readonly ? 'readonly' : type,
         props: readonly ? {} : props,
         error: _this.validField(required, value),
         options: _this.getOptions(key, options, index),
@@ -468,6 +468,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
               minHeight: '20px',
               minWidth: '100px',
               maxWidth: "".concat(col.width - 16, "px"),
+              color: col.isNeedShow ? '#1890ff' : '',
               overflow: 'hidden',
               textOverflow: 'ellipsis',
               display: '-webkit-box',
@@ -687,6 +688,8 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         // }
         // }
 
+        col.readonly = readonly;
+        debugger;
         col.render = _this.getCellRender(col);
 
         if (col.link) {
@@ -700,13 +703,13 @@ 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, _ref16) {
-          var _context14;
+          var _context14, _context15;
 
           var key = _ref16.key,
               type = _ref16.type,
               options = _ref16.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context14 = item.isReadonly).call(_context14, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context14 = item.isReadonly).call(_context14, key)) || (0, _includes["default"])(_context15 = ['img', 'switch', 'custom', 'img', 'toolbar', 'uploadImg']).call(_context15, type)) {
             result[key] = item[key];
           } else {
             result[key] = (0, _Control.getTitle)(item[key], options);
@@ -855,7 +858,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getProps", function () {
-      var _context15;
+      var _context16;
 
       var _this$props4 = _this.props,
           cols = _this$props4.cols,
@@ -874,12 +877,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           expandedRowRender = _this$props4$expanded === void 0 ? undefined : _this$props4$expanded,
           _this$props4$onExpand = _this$props4.onExpand,
           onExpand = _this$props4$onExpand === void 0 ? undefined : _this$props4$onExpand;
-      var widthX = (0, _reduce["default"])(_context15 = (0, _filter["default"])(cols).call(cols, function (col) {
+      var widthX = (0, _reduce["default"])(_context16 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context15, function (width, item) {
-        var _context16;
+      })).call(_context16, function (width, item) {
+        var _context17;
 
-        return width += item.width ? item.width : (0, _includes["default"])(_context16 = ['index', 'checked']).call(_context16, item.key) ? 70 : item.type === 'img' ? 200 : 120;
+        return width += item.width ? item.width : (0, _includes["default"])(_context17 = ['index', 'checked']).call(_context17, item.key) ? 70 : item.type === 'img' ? 200 : 120;
       }, 0);
       var scrollProps = !_helper["default"].isEmpty2(expandedRowRender) ? {
         expandedRowRender: expandedRowRender

package/package.json

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