cloud-b2b 1.1.85 → 1.1.86

package/es/Area/Area.js

@@ -22,11 +22,13 @@ import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime-corejs3/helpers/objectWithoutProperties";
 var _excluded = ["type", "children"];
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context6 = ownKeys(Object(t), !0)).call(_context6, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context7 = ownKeys(Object(t))).call(_context7, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = _Reflect$construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 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; } }
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import React from 'react';
@@ -47,6 +49,7 @@ var ButtonEx = function ButtonEx(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   props[type === 'primary-o' ? 'data-btn-type' : 'type'] = type;
   return /*#__PURE__*/React.createElement(_Button, _extends({
+    disabled: true,
     style: {
       marginLeft: 2
     }
@@ -107,12 +110,15 @@ var Area = /*#__PURE__*/function (_React$Component) {
           type = item.bsStyle,
           _item$size = item.size,
           size = _item$size === void 0 ? 'small' : _item$size;
-        var onClick = props.onClick;
+        var onClick = props.onClick,
+          _props$btnDisabled = props.btnDisabled,
+          disabled = _props$btnDisabled === void 0 ? false : _props$btnDisabled;
         return /*#__PURE__*/React.createElement(ButtonEx, {
           key: key,
           size: size,
           type: type,
-          onClick: onClick
+          onClick: onClick,
+          disabled: disabled
         }, title);
       } else if (item.type === 'icon') {
         var _onClick = props.onClick;
@@ -125,6 +131,25 @@ var Area = /*#__PURE__*/function (_React$Component) {
           style: style,
           onClick: _onClick
         });
+      } else if (item.type === 'link') {
+        var _onClick2 = props.onClick,
+          value = props.value;
+        var list = value && _Array$isArray(value) ? value : [];
+        return /*#__PURE__*/React.createElement("div", {
+          style: {
+            whiteSpace: 'pre-wrap'
+          }
+        }, _mapInstanceProperty(list).call(list, function (item2, index2) {
+          var _context;
+          var split = index2 === list.length - 1 ? '' : ',';
+          var onLink = function onLink() {
+            _onClick2 && _onClick2();
+          };
+          return /*#__PURE__*/React.createElement("a", {
+            key: index2,
+            onClick: onLink
+          }, _concatInstanceProperty(_context = "".concat(item2[item.linkTitleKey])).call(_context, split));
+        }));
       } else {
         if (props.type === 'readonly') {
           props.value = getTitle(props.value, props.options);
@@ -168,11 +193,12 @@ var Area = /*#__PURE__*/function (_React$Component) {
         _this$props3$size = _this$props3.size,
         size = _this$props3$size === void 0 ? defaultSize : _this$props3$size,
         _this$props3$required = _this$props3.requiredColor,
-        requiredColor = _this$props3$required === void 0 ? false : _this$props3$required;
+        requiredColor = _this$props3$required === void 0 ? false : _this$props3$required,
+        btnDisabled = _this$props3.btnDisabled;
       return /*#__PURE__*/React.createElement(_Row, null, _mapInstanceProperty(child).call(child, function (item, index) {
-        var _context, _context2, _context3, _context4;
+        var _context2, _context3, _context4, _context5;
         var childOptions = [];
-        if (_includesInstanceProperty(_context = _Object$keys(options)).call(_context, item.key)) {
+        if (_includesInstanceProperty(_context2 = _Object$keys(options)).call(_context2, item.key)) {
           if (index === 0) {
             childOptions = options[item.key];
           } else {
@@ -180,12 +206,14 @@ var Area = /*#__PURE__*/function (_React$Component) {
             childOptions = helper.isEmpty2(value[upKey]) || _Object$keys(value[upKey]).length === 0 ? [] : options[item.key];
           }
         }
-        var props = _objectSpread(_objectSpread({}, item), {}, {
+        var props = _objectSpread(_objectSpread({
+          btnDisabled: btnDisabled
+        }, item), {}, {
           size: size,
           isBgColor: item.required && requiredColor,
-          onSearch: _bindInstanceProperty(_context2 = _this2.onSearch).call(_context2, _this2, item.key, item, parentKey),
-          onChange: _bindInstanceProperty(_context3 = _this2.onChange).call(_context3, _this2, item.key),
-          onClick: _bindInstanceProperty(_context4 = _this2.onClick).call(_context4, _this2, item.key),
+          onSearch: _bindInstanceProperty(_context3 = _this2.onSearch).call(_context3, _this2, item.key, item, parentKey),
+          onChange: _bindInstanceProperty(_context4 = _this2.onChange).call(_context4, _this2, item.key),
+          onClick: _bindInstanceProperty(_context5 = _this2.onClick).call(_context5, _this2, item.key),
           options: childOptions,
           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

@@ -484,8 +484,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
     _defineProperty(_assertThisInitialized(_this2), "area", function (props, _ref11) {
       var key = _ref11.key,
-        options = _ref11.options;
+        options = _ref11.options,
+        _ref11$btnDisabled = _ref11.btnDisabled,
+        btnDisabled = _ref11$btnDisabled === void 0 ? false : _ref11$btnDisabled;
       var readonly = _this2.props.readonly;
+      props.btnDisabled = btnDisabled;
       props.parentKey = key;
       props.options = _this2.getOptions(key, options);
       props.dropdownMatchSelectWidth = false;

package/lib/Area/Area.js

@@ -18,6 +18,8 @@ _Object$defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
+var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/bind"));
 var _row = _interopRequireDefault(require("antd/lib/row"));
@@ -42,7 +44,7 @@ var _excluded = ["type", "children"];
 function _getRequireWildcardCache(e) { if ("function" != typeof _WeakMap) return null; var r = new _WeakMap(), t = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = _Object$defineProperty && _Object$getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? _Object$getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? _Object$defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = _Object$keys2(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context5, _context6; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context5 = ownKeys(Object(t), !0)).call(_context5, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context6 = ownKeys(Object(t))).call(_context6, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context6, _context7; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context6 = ownKeys(Object(t), !0)).call(_context6, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context7 = ownKeys(Object(t))).call(_context7, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 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); }; }
 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 defaultSize = 'small';
@@ -59,6 +61,7 @@ var ButtonEx = function ButtonEx(_ref) {
     props = (0, _objectWithoutProperties2["default"])(_ref, _excluded);
   props[type === 'primary-o' ? 'data-btn-type' : 'type'] = type;
   return /*#__PURE__*/_react["default"].createElement(_button["default"], (0, _extends2["default"])({
+    disabled: true,
     style: {
       marginLeft: 2
     }
@@ -119,12 +122,15 @@ var Area = /*#__PURE__*/function (_React$Component) {
           type = item.bsStyle,
           _item$size = item.size,
           size = _item$size === void 0 ? 'small' : _item$size;
-        var onClick = props.onClick;
+        var onClick = props.onClick,
+          _props$btnDisabled = props.btnDisabled,
+          disabled = _props$btnDisabled === void 0 ? false : _props$btnDisabled;
         return /*#__PURE__*/_react["default"].createElement(ButtonEx, {
           key: key,
           size: size,
           type: type,
-          onClick: onClick
+          onClick: onClick,
+          disabled: disabled
         }, title);
       } else if (item.type === 'icon') {
         var _onClick = props.onClick;
@@ -137,6 +143,25 @@ var Area = /*#__PURE__*/function (_React$Component) {
           style: style,
           onClick: _onClick
         });
+      } else if (item.type === 'link') {
+        var _onClick2 = props.onClick,
+          value = props.value;
+        var list = value && (0, _isArray["default"])(value) ? value : [];
+        return /*#__PURE__*/_react["default"].createElement("div", {
+          style: {
+            whiteSpace: 'pre-wrap'
+          }
+        }, (0, _map["default"])(list).call(list, function (item2, index2) {
+          var _context;
+          var split = index2 === list.length - 1 ? '' : ',';
+          var onLink = function onLink() {
+            _onClick2 && _onClick2();
+          };
+          return /*#__PURE__*/_react["default"].createElement("a", {
+            key: index2,
+            onClick: onLink
+          }, (0, _concat["default"])(_context = "".concat(item2[item.linkTitleKey])).call(_context, split));
+        }));
       } else {
         if (props.type === 'readonly') {
           props.value = (0, _Control.getTitle)(props.value, props.options);
@@ -180,11 +205,12 @@ var Area = /*#__PURE__*/function (_React$Component) {
         _this$props3$size = _this$props3.size,
         size = _this$props3$size === void 0 ? defaultSize : _this$props3$size,
         _this$props3$required = _this$props3.requiredColor,
-        requiredColor = _this$props3$required === void 0 ? false : _this$props3$required;
+        requiredColor = _this$props3$required === void 0 ? false : _this$props3$required,
+        btnDisabled = _this$props3.btnDisabled;
       return /*#__PURE__*/_react["default"].createElement(_row["default"], null, (0, _map["default"])(child).call(child, function (item, index) {
-        var _context, _context2, _context3, _context4;
+        var _context2, _context3, _context4, _context5;
         var childOptions = [];
-        if ((0, _includes["default"])(_context = (0, _keys["default"])(options)).call(_context, item.key)) {
+        if ((0, _includes["default"])(_context2 = (0, _keys["default"])(options)).call(_context2, item.key)) {
           if (index === 0) {
             childOptions = options[item.key];
           } else {
@@ -192,12 +218,14 @@ var Area = /*#__PURE__*/function (_React$Component) {
             childOptions = _helper["default"].isEmpty2(value[upKey]) || (0, _keys["default"])(value[upKey]).length === 0 ? [] : options[item.key];
           }
         }
-        var props = _objectSpread(_objectSpread({}, item), {}, {
+        var props = _objectSpread(_objectSpread({
+          btnDisabled: btnDisabled
+        }, item), {}, {
           size: size,
           isBgColor: item.required && requiredColor,
-          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),
-          onClick: (0, _bind["default"])(_context4 = _this2.onClick).call(_context4, _this2, item.key),
+          onSearch: (0, _bind["default"])(_context3 = _this2.onSearch).call(_context3, _this2, item.key, item, parentKey),
+          onChange: (0, _bind["default"])(_context4 = _this2.onChange).call(_context4, _this2, item.key),
+          onClick: (0, _bind["default"])(_context5 = _this2.onClick).call(_context5, _this2, item.key),
           options: childOptions,
           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

@@ -496,8 +496,11 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this2), "area", function (props, _ref11) {
       var key = _ref11.key,
-        options = _ref11.options;
+        options = _ref11.options,
+        _ref11$btnDisabled = _ref11.btnDisabled,
+        btnDisabled = _ref11$btnDisabled === void 0 ? false : _ref11$btnDisabled;
       var readonly = _this2.props.readonly;
+      props.btnDisabled = btnDisabled;
       props.parentKey = key;
       props.options = _this2.getOptions(key, options);
       props.dropdownMatchSelectWidth = false;

package/package.json

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