cloud-b2b 1.0.9 → 1.1.0

package/es/SuperTable2/SuperTable2.js

@@ -26,13 +26,13 @@ import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 
 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 _context12; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context12 = Object.prototype.toString.call(o)).call(_context12, 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 _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); }
 
 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 _context10, _context11; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context10 = ownKeys(Object(source), !0)).call(_context10, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context11 = ownKeys(Object(source))).call(_context11, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context11, _context12; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context11 = ownKeys(Object(source), !0)).call(_context11, function (key) { _defineProperty(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context12 = ownKeys(Object(source))).call(_context12, 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";
@@ -361,7 +361,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this), "getCellRender", function (col) {
       return function (value, record, index) {
-        var _context3, _context4, _context5;
+        var _context3, _context4, _context5, _context6;
 
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
 
@@ -424,9 +424,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props);
 
           case 'toolbar':
+            //showByKey为true时，每条数据中与按钮key相同的属性值决定按钮是否显示，建议key用下划线开始命名，避免与后台数据冲突
             var props = {
               onClick: _this.props.callback.onToolbar ? _bindInstanceProperty(_context4 = _this.props.callback.onToolbar).call(_context4, null, col.key, record.key, record) : undefined,
-              buttons: _filterInstanceProperty(_context5 = col.props.buttons).call(_context5, function (item) {
+              buttons: col.props.showByKey ? _filterInstanceProperty(_context5 = col.props.buttons).call(_context5, function (item) {
+                return record[item.key] === true;
+              }) : _filterInstanceProperty(_context6 = col.props.buttons).call(_context6, function (item) {
                 return item.defaultShow === !record._isEdit;
               })
             };
@@ -527,18 +530,18 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "canReadonly", function (type) {
-      var _context6;
+      var _context7;
 
-      return !_includesInstanceProperty(_context6 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context6, type);
+      return !_includesInstanceProperty(_context7 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context7, type);
     });
 
     _defineProperty(_assertThisInitialized(_this), "getColumns", function (cols) {
-      var _context7;
+      var _context8;
 
       var readonly = _this.props.readonly;
-      return _mapInstanceProperty(_context7 = _filterInstanceProperty(cols).call(cols, function (col) {
+      return _mapInstanceProperty(_context8 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context7, function (_ref11, index) {
+      })).call(_context8, function (_ref11, index) {
         var col = _extends({}, _ref11);
 
         col.className = _this.getColumnClassName(col);
@@ -566,13 +569,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, _ref12) {
-          var _context8;
+          var _context9;
 
           var key = _ref12.key,
               type = _ref12.type,
               options = _ref12.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context8 = item.isReadonly).call(_context8, key))) {
+          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || _Array$isArray(item.isReadonly) && !_includesInstanceProperty(_context9 = item.isReadonly).call(_context9, key))) {
             result[key] = item[key];
           } else {
             result[key] = getTitle(item[key], options);
@@ -606,7 +609,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "getProps", function () {
-      var _context9;
+      var _context10;
 
       var _this$props3 = _this.props,
           cols = _this$props3.cols,
@@ -621,9 +624,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
           maxHeight = _this$props3.maxHeight;
 
-      var widthX = _reduceInstanceProperty(_context9 = _filterInstanceProperty(cols).call(cols, function (col) {
+      var widthX = _reduceInstanceProperty(_context10 = _filterInstanceProperty(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context9, function (width, item) {
+      })).call(_context10, function (width, item) {
         return width += item.width ? item.width : 120;
       }, 0);
 

package/lib/SuperTable2/SuperTable2.js

@@ -96,13 +96,13 @@ var _variables = _interopRequireDefault(require("../variables"));
 
 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 _context12; if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = _sliceInstanceProperty(_context12 = Object.prototype.toString.call(o)).call(_context12, 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 _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); }
 
 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 _context10, _context11; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context10 = ownKeys(Object(source), !0)).call(_context10, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context11 = ownKeys(Object(source))).call(_context11, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context11, _context12; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context11 = ownKeys(Object(source), !0)).call(_context11, function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context12 = ownKeys(Object(source))).call(_context12, 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); }; }
 
@@ -400,7 +400,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getCellRender", function (col) {
       return function (value, record, index) {
-        var _context3, _context4, _context5;
+        var _context3, _context4, _context5, _context6;
 
         var realType = record._isEdit === true && _this.canReadonly(col.type) ? col.editType : col.type;
 
@@ -463,9 +463,12 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
             return _this.props.callback.onRenderCustom(record.key, col.key, value, col.props);
 
           case 'toolbar':
+            //showByKey为true时，每条数据中与按钮key相同的属性值决定按钮是否显示，建议key用下划线开始命名，避免与后台数据冲突
             var props = {
               onClick: _this.props.callback.onToolbar ? (0, _bind["default"])(_context4 = _this.props.callback.onToolbar).call(_context4, null, col.key, record.key, record) : undefined,
-              buttons: (0, _filter["default"])(_context5 = col.props.buttons).call(_context5, function (item) {
+              buttons: col.props.showByKey ? (0, _filter["default"])(_context5 = col.props.buttons).call(_context5, function (item) {
+                return record[item.key] === true;
+              }) : (0, _filter["default"])(_context6 = col.props.buttons).call(_context6, function (item) {
                 return item.defaultShow === !record._isEdit;
               })
             };
@@ -561,17 +564,17 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       }
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "canReadonly", function (type) {
-      var _context6;
+      var _context7;
 
-      return !(0, _includes["default"])(_context6 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context6, type);
+      return !(0, _includes["default"])(_context7 = ['index', 'checkbox', 'link', 'button', 'switch', 'custom', 'img', 'toolbar']).call(_context7, type);
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getColumns", function (cols) {
-      var _context7;
+      var _context8;
 
       var readonly = _this.props.readonly;
-      return (0, _map["default"])(_context7 = (0, _filter["default"])(cols).call(cols, function (col) {
+      return (0, _map["default"])(_context8 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context7, function (_ref11, index) {
+      })).call(_context8, function (_ref11, index) {
         var col = (0, _extends2["default"])({}, _ref11);
         col.className = _this.getColumnClassName(col);
         col.title = _this.getColumnTitle(col);
@@ -597,13 +600,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, _ref12) {
-          var _context8;
+          var _context9;
 
           var key = _ref12.key,
               type = _ref12.type,
               options = _ref12.options;
 
-          if (!_this.props.readonly && type && type !== 'readonly' && (!item.isReadonly || (0, _isArray["default"])(item.isReadonly) && !(0, _includes["default"])(_context8 = item.isReadonly).call(_context8, key))) {
+          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];
           } else {
             result[key] = (0, _Control.getTitle)(item[key], options);
@@ -635,7 +638,7 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
       };
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getProps", function () {
-      var _context9;
+      var _context10;
 
       var _this$props3 = _this.props,
           cols = _this$props3.cols,
@@ -649,9 +652,9 @@ var SuperTable2 = /*#__PURE__*/function (_React$Component) {
           _this$props3$isEmphas = _this$props3.isEmphasized,
           isEmphasized = _this$props3$isEmphas === void 0 ? false : _this$props3$isEmphas,
           maxHeight = _this$props3.maxHeight;
-      var widthX = (0, _reduce["default"])(_context9 = (0, _filter["default"])(cols).call(cols, function (col) {
+      var widthX = (0, _reduce["default"])(_context10 = (0, _filter["default"])(cols).call(cols, function (col) {
         return !col.hide;
-      })).call(_context9, function (width, item) {
+      })).call(_context10, function (width, item) {
         return width += item.width ? item.width : 120;
       }, 0);
       return _objectSpread({

package/package.json

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