cloud-b2b 1.1.75 → 1.1.76

package/es/Area/Area.js

@@ -9,6 +9,7 @@ import _Object$defineProperty from "@babel/runtime-corejs3/core-js-stable/object
 import _Row from "antd/es/row";
 import _Col from "antd/es/col";
 import _typeof from "@babel/runtime-corejs3/helpers/typeof";
+import _Icon from "antd/es/icon";
 import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
 import _createClass from "@babel/runtime-corejs3/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleConstructorReturn";
@@ -110,6 +111,15 @@ var Area = /*#__PURE__*/function (_React$Component) {
           type: type,
           onClick: onClick
         }, title);
+      } else if (item.type === 'icon') {
+        var _onClick = props.onClick;
+        var _key = item.key,
+          icon = item.icon;
+        return /*#__PURE__*/React.createElement(_Icon, {
+          type: icon,
+          key: _key,
+          onClick: _onClick
+        });
       } else {
         return /*#__PURE__*/React.createElement(Control, props);
       }
@@ -174,8 +184,9 @@ var Area = /*#__PURE__*/function (_React$Component) {
           type: readonly ? 'readonly' : item.type,
           searchWhenClick: true
         });
+        var factor = item.span || 24 / child.length;
         return /*#__PURE__*/React.createElement(_Col, {
-          span: 24 / child.length,
+          span: factor,
           key: item.key
         }, _this2.toControl(item, props));
       }));

package/es/SuperForm2/SuperForm.js

@@ -28,7 +28,7 @@ import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/ins
 import _bindInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/bind";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 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 _context24, _context25; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(t), !0)).call(_context24, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context25 = ownKeys(Object(t))).call(_context25, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context25, _context26; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context25 = ownKeys(Object(t), !0)).call(_context25, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context26 = ownKeys(Object(t))).call(_context26, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import React from 'react';
@@ -567,6 +567,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     _defineProperty(_this2, "toLabel", function (_ref10, type) {
       var title = _ref10.title,
         showAdd = _ref10.showAdd,
+        showQuery = _ref10.showQuery,
         key = _ref10.key,
         showInfo = _ref10.showInfo,
         showInfoTitle = _ref10.showInfoTitle;
@@ -578,6 +579,14 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           type: "plus-circle-o",
           onClick: onClick
         }));
+      } else if (showQuery && type !== 'readonly') {
+        var _context23;
+        var _onClick = _bindInstanceProperty(_context23 = _this2.onAdd).call(_context23, _this2, key, title);
+        return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Icon, {
+          role: "add",
+          type: "search",
+          onClick: _onClick
+        }));
       } else if (showInfo) {
         return /*#__PURE__*/React.createElement("span", null, title, /*#__PURE__*/React.createElement(_Tooltip, {
           title: showInfoTitle
@@ -602,6 +611,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         onCheckItem = _this2$props4.onCheckItem,
         _this2$props4$isGridF = _this2$props4.isGridForm,
         isGridForm = _this2$props4$isGridF === void 0 ? false : _this2$props4$isGridF;
+      var labelSpan = factor === 3 ? 3 : factor === 2 ? 4 : 8;
+      var smSpan = control.title ? factor === 3 ? 21 : factor === 2 ? 20 : 16 : 24;
       return control.type !== 'empty' ? /*#__PURE__*/React.createElement(_Col, {
         span: span * factor,
         key: control.key
@@ -616,7 +627,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 8
+            span: labelSpan
           }
         },
         wrapperCol: {
@@ -624,7 +635,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 16
+            span: smSpan
           }
         }
       }), _this2.toControl(controlProps, control))) : /*#__PURE__*/React.createElement(_Col, {
@@ -636,7 +647,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     _defineProperty(_this2, "toCols", function () {
-      var _context23;
+      var _context24;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -645,7 +656,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         colNum = 1;
       }
       var span = 24 / colNum;
-      return _mapInstanceProperty(_context23 = _this2.getControls()).call(_context23, function (control) {
+      return _mapInstanceProperty(_context24 = _this2.getControls()).call(_context24, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/es/SuperForm2/SuperForm.less

@@ -19,7 +19,9 @@
     :global(.ant-form-item-label) {
       line-height: 16px;
     }
-
+    :global(.ant-col-sm-24) {
+      text-align: center;
+    }
     :global(.ant-form-item-control) > span > textArea {
       min-height: 22px !important;
       margin-bottom: 0 !important;

package/lib/Area/Area.js

@@ -21,6 +21,7 @@ var _bind = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stabl
 var _row = _interopRequireDefault(require("antd/lib/row"));
 var _col = _interopRequireDefault(require("antd/lib/col"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
+var _icon = _interopRequireDefault(require("antd/lib/icon"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass"));
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/possibleConstructorReturn"));
@@ -118,6 +119,15 @@ var Area = /*#__PURE__*/function (_React$Component) {
           type: type,
           onClick: onClick
         }, title);
+      } else if (item.type === 'icon') {
+        var _onClick = props.onClick;
+        var _key = item.key,
+          icon = item.icon;
+        return /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          type: icon,
+          key: _key,
+          onClick: _onClick
+        });
       } else {
         return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
       }
@@ -182,8 +192,9 @@ var Area = /*#__PURE__*/function (_React$Component) {
           type: readonly ? 'readonly' : item.type,
           searchWhenClick: true
         });
+        var factor = item.span || 24 / child.length;
         return /*#__PURE__*/_react["default"].createElement(_col["default"], {
-          span: 24 / child.length,
+          span: factor,
           key: item.key
         }, _this2.toControl(item, props));
       }));

package/lib/SuperForm2/SuperForm.js

@@ -45,7 +45,7 @@ var _Control = _interopRequireWildcard(require("../Control"));
 var _variables = _interopRequireDefault(require("../variables"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof _WeakMap) var r = new _WeakMap(), n = new _WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = _Object$defineProperty) && _Object$getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty2(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 _context24, _context25; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context24 = ownKeys(Object(t), !0)).call(_context24, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context25 = ownKeys(Object(t))).call(_context25, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context25, _context26; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context25 = ownKeys(Object(t), !0)).call(_context25, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context26 = ownKeys(Object(t))).call(_context26, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, _isNativeReflectConstruct() ? _Reflect$construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(_Reflect$construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var FormItem = _form["default"].Item;
@@ -578,6 +578,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
     (0, _defineProperty2["default"])(_this2, "toLabel", function (_ref10, type) {
       var title = _ref10.title,
         showAdd = _ref10.showAdd,
+        showQuery = _ref10.showQuery,
         key = _ref10.key,
         showInfo = _ref10.showInfo,
         showInfoTitle = _ref10.showInfoTitle;
@@ -589,6 +590,14 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
           type: "plus-circle-o",
           onClick: onClick
         }));
+      } else if (showQuery && type !== 'readonly') {
+        var _context23;
+        var _onClick = (0, _bind["default"])(_context23 = _this2.onAdd).call(_context23, _this2, key, title);
+        return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_icon["default"], {
+          role: "add",
+          type: "search",
+          onClick: _onClick
+        }));
       } else if (showInfo) {
         return /*#__PURE__*/_react["default"].createElement("span", null, title, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
           title: showInfoTitle
@@ -613,6 +622,8 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         onCheckItem = _this2$props4.onCheckItem,
         _this2$props4$isGridF = _this2$props4.isGridForm,
         isGridForm = _this2$props4$isGridF === void 0 ? false : _this2$props4$isGridF;
+      var labelSpan = factor === 3 ? 3 : factor === 2 ? 4 : 8;
+      var smSpan = control.title ? factor === 3 ? 21 : factor === 2 ? 20 : 16 : 24;
       return control.type !== 'empty' ? /*#__PURE__*/_react["default"].createElement(_col["default"], {
         span: span * factor,
         key: control.key
@@ -627,7 +638,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 8
+            span: labelSpan
           }
         },
         wrapperCol: {
@@ -635,7 +646,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
             span: 24
           },
           sm: {
-            span: 16
+            span: smSpan
           }
         }
       }), _this2.toControl(controlProps, control))) : /*#__PURE__*/_react["default"].createElement(_col["default"], {
@@ -647,7 +658,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
       });
     });
     (0, _defineProperty2["default"])(_this2, "toCols", function () {
-      var _context23;
+      var _context24;
       var _this2$props5 = _this2.props,
         _this2$props5$colNum = _this2$props5.colNum,
         colNum = _this2$props5$colNum === void 0 ? defaultColNum : _this2$props5$colNum,
@@ -656,7 +667,7 @@ var SuperForm2 = /*#__PURE__*/function (_React$Component2) {
         colNum = 1;
       }
       var span = 24 / colNum;
-      return (0, _map["default"])(_context23 = _this2.getControls()).call(_context23, function (control) {
+      return (0, _map["default"])(_context24 = _this2.getControls()).call(_context24, function (control) {
         if (allFullFather) {
           control.allFullFather = allFullFather;
         }

package/lib/SuperForm2/SuperForm.less

@@ -19,7 +19,9 @@
     :global(.ant-form-item-label) {
       line-height: 16px;
     }
-
+    :global(.ant-col-sm-24) {
+      text-align: center;
+    }
     :global(.ant-form-item-control) > span > textArea {
       min-height: 22px !important;
       margin-bottom: 0 !important;

package/package.json

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