cloud-b2b 1.1.81 → 1.1.83

package/es/Area/Area.js

@@ -32,7 +32,7 @@ import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instanc
 import React from 'react';
 import PropTypes from 'prop-types';
 import helper from '../helper';
-import Control from '../Control';
+import Control, { getTitle } from '../Control';
 var defaultSize = 'small';
 var PROPS = {
   value: PropTypes.oneOfType([PropTypes.string, PropTypes.number, PropTypes.object]),
@@ -117,13 +117,18 @@ var Area = /*#__PURE__*/function (_React$Component) {
       } else if (item.type === 'icon') {
         var _onClick = props.onClick;
         var _key = item.key,
-          icon = item.icon;
+          icon = item.icon,
+          style = item.style;
         return /*#__PURE__*/React.createElement(_Icon, {
           type: icon,
           key: _key,
+          style: style,
           onClick: _onClick
         });
       } else {
+        if (props.type === 'readonly') {
+          props.value = getTitle(props.value, props.options);
+        }
         return /*#__PURE__*/React.createElement(Control, props);
       }
     });

package/es/Control/Control.js

@@ -21,10 +21,10 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _co
 import _reduceInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/reduce";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
+import _Array$isArray from "@babel/runtime-corejs3/core-js-stable/array/is-array";
 import _indexOfInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/index-of";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
 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 _trimInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/trim";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
@@ -167,6 +167,9 @@ var readonly = function readonly(props) {
   props.style = _Object$assign(props.style || {}, {
     backgroundColor: '#f0f0f0'
   });
+  if (_typeof(props.value) === 'object' && !_Array$isArray(props.value)) {
+    props.value = props.value ? props.value.title : '';
+  }
   if (props.value || props.defaultValue) {
     props.title = props.value || props.defaultValue;
   }

package/lib/Area/Area.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _typeof3 = require("@babel/runtime-corejs3/helpers/typeof");
 var _Reflect$construct = require("@babel/runtime-corejs3/core-js-stable/reflect/construct");
 var _Object$keys2 = require("@babel/runtime-corejs3/core-js-stable/object/keys");
 var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
@@ -9,6 +10,7 @@ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/in
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
 var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
+var _WeakMap = require("@babel/runtime-corejs3/core-js-stable/weak-map");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 _Object$defineProperty(exports, "__esModule", {
   value: true
@@ -35,8 +37,10 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-c
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _helper = _interopRequireDefault(require("../helper"));
-var _Control = _interopRequireDefault(require("../Control"));
+var _Control = _interopRequireWildcard(require("../Control"));
 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 _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); }; }
@@ -125,13 +129,18 @@ var Area = /*#__PURE__*/function (_React$Component) {
       } else if (item.type === 'icon') {
         var _onClick = props.onClick;
         var _key = item.key,
-          icon = item.icon;
+          icon = item.icon,
+          style = item.style;
         return /*#__PURE__*/_react["default"].createElement(_icon["default"], {
           type: icon,
           key: _key,
+          style: style,
           onClick: _onClick
         });
       } else {
+        if (props.type === 'readonly') {
+          props.value = (0, _Control.getTitle)(props.value, props.options);
+        }
         return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
       }
     });

package/lib/Control/Control.js

@@ -17,10 +17,10 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-c
 var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
+var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
 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 _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
@@ -174,6 +174,9 @@ var readonly = function readonly(props) {
   props.style = (0, _assign["default"])(props.style || {}, {
     backgroundColor: '#f0f0f0'
   });
+  if ((0, _typeof2["default"])(props.value) === 'object' && !(0, _isArray["default"])(props.value)) {
+    props.value = props.value ? props.value.title : '';
+  }
   if (props.value || props.defaultValue) {
     props.title = props.value || props.defaultValue;
   }

package/package.json

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