cloud-b2b 1.1.60 → 1.1.62

package/es/Search2/Search.less

@@ -2,7 +2,6 @@
 
 .@{cloudlink-prefix}-Search2 {
   transition: all 0.3s;
-
   > *:first-child {
     display: inline-block;
     vertical-align: top;

package/es/SuperTable2/SuperTable2.js

@@ -426,6 +426,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       return function (value, record, index) {
         var _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10;
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
+        if (realType === 'customType') {
+          var _this$props$items$rec = _this.props.items[record.key].__customType,
+            __customType = _this$props$items$rec === void 0 ? _defineProperty({}, col.key, 'text') : _this$props$items$rec;
+          realType = __customType[col.key];
+        }
         if (!realType) {
           return /*#__PURE__*/React.createElement("div", {
             onDoubleClick: _this.onDoubleClick(col.key, record.key),
@@ -594,12 +599,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref15) {
-      var required = _ref15.required,
-        title = _ref15.title,
-        type = _ref15.type,
-        key = _ref15.key,
-        showAdd = _ref15.showAdd;
+    _defineProperty(_assertThisInitialized(_this), "getColumnTitle", function (_ref16) {
+      var required = _ref16.required,
+        title = _ref16.title,
+        type = _ref16.type,
+        key = _ref16.key,
+        showAdd = _ref16.showAdd;
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
         return /*#__PURE__*/React.createElement(_Checkbox, _extends({
@@ -612,9 +617,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         }, title, _this.toAdd(key, showAdd));
       }
     });
-    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref16) {
-      var type = _ref16.type,
-        align = _ref16.align;
+    _defineProperty(_assertThisInitialized(_this), "getColumnClassName", function (_ref17) {
+      var type = _ref17.type,
+        align = _ref17.align;
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
       } else {
@@ -630,9 +635,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var readonly = _this.props.readonly;
       return _mapInstanceProperty(_context12 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context12, function (_ref17, index) {
+      })).call(_context12, function (_ref18, index) {
         var _context13;
-        var col = _extends({}, (_objectDestructuringEmpty(_ref17), _ref17));
+        var col = _extends({}, (_objectDestructuringEmpty(_ref18), _ref18));
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
@@ -673,11 +678,11 @@ 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, _ref18) {
+        return _reduceInstanceProperty(cols).call(cols, function (result, _ref19) {
           var _context14, _context15;
-          var key = _ref18.key,
-            type = _ref18.type,
-            options = _ref18.options;
+          var key = _ref19.key,
+            type = _ref19.type,
+            options = _ref19.options;
           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 {

package/es/SuperTable2/SuperTable2.less

@@ -9,7 +9,8 @@
   }
 
   :global(.ant-select-selection--multiple) {
-    max-width: 200px;
+    max-width: 300px;
+    min-width: 100px;
     max-height: 22px;
     overflow: auto;
   }

package/es/style.less

@@ -27,4 +27,5 @@
 @import "./SuperTab/SuperTab.less";
 @import "./SuperTab2/SuperTab2.less";
 @import "./ImageView/ImageView.less";
-@import "./WingBlank/WingBlank.less";
+@import "./WingBlank/WingBlank.less";
+@import "./Search2/Search.less";

package/lib/Search2/Search.less

@@ -2,7 +2,6 @@
 
 .@{cloudlink-prefix}-Search2 {
   transition: all 0.3s;
-
   > *:first-child {
     display: inline-block;
     vertical-align: top;

package/lib/SuperTable2/SuperTable2.js

@@ -439,6 +439,11 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       return function (value, record, index) {
         var _context3, _context4, _context5, _context6, _context7, _context8, _context9, _context10;
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
+        if (realType === 'customType') {
+          var _this$props$items$rec = _this.props.items[record.key].__customType,
+            __customType = _this$props$items$rec === void 0 ? (0, _defineProperty2["default"])({}, col.key, 'text') : _this$props$items$rec;
+          realType = __customType[col.key];
+        }
         if (!realType) {
           return /*#__PURE__*/_react["default"].createElement("div", {
             onDoubleClick: _this.onDoubleClick(col.key, record.key),
@@ -607,12 +612,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         return null;
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref15) {
-      var required = _ref15.required,
-        title = _ref15.title,
-        type = _ref15.type,
-        key = _ref15.key,
-        showAdd = _ref15.showAdd;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnTitle", function (_ref16) {
+      var required = _ref16.required,
+        title = _ref16.title,
+        type = _ref16.type,
+        key = _ref16.key,
+        showAdd = _ref16.showAdd;
       if (type === 'checkbox') {
         var status = _this.getCheckedStatus(key);
         return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], (0, _extends2["default"])({
@@ -625,9 +630,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
         }, title, _this.toAdd(key, showAdd));
       }
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref16) {
-      var type = _ref16.type,
-        align = _ref16.align;
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumnClassName", function (_ref17) {
+      var type = _ref17.type,
+        align = _ref17.align;
       if (type === 'index' || type === 'checkbox') {
         return 'ant-table-selection-column';
       } else {
@@ -643,9 +648,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       var readonly = _this.props.readonly;
       return (0, _map["default"])(_context12 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context12, function (_ref17, index) {
+      })).call(_context12, function (_ref18, index) {
         var _context13;
-        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref17), _ref17));
+        var col = (0, _extends2["default"])({}, ((0, _objectDestructuringEmpty2["default"])(_ref18), _ref18));
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
         col.dataIndex = col.key;
@@ -686,11 +691,11 @@ 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, _ref18) {
+        return (0, _reduce["default"])(cols).call(cols, function (result, _ref19) {
           var _context14, _context15;
-          var key = _ref18.key,
-            type = _ref18.type,
-            options = _ref18.options;
+          var key = _ref19.key,
+            type = _ref19.type,
+            options = _ref19.options;
           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 {

package/lib/SuperTable2/SuperTable2.less

@@ -9,7 +9,8 @@
   }
 
   :global(.ant-select-selection--multiple) {
-    max-width: 200px;
+    max-width: 300px;
+    min-width: 100px;
     max-height: 22px;
     overflow: auto;
   }

package/lib/style.less

@@ -27,4 +27,5 @@
 @import "./SuperTab/SuperTab.less";
 @import "./SuperTab2/SuperTab2.less";
 @import "./ImageView/ImageView.less";
-@import "./WingBlank/WingBlank.less";
+@import "./WingBlank/WingBlank.less";
+@import "./Search2/Search.less";

package/package.json

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