cloud-b2b 1.1.56 → 1.1.58

package/es/InpurCascader/InputCascader.js

@@ -15,11 +15,13 @@ import _possibleConstructorReturn from "@babel/runtime-corejs3/helpers/possibleC
 import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, 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 _someInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/some";
+import _indexOfInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/index-of";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 //级联选择input
 import React from 'react';
@@ -68,7 +70,12 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
         return obj;
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "showSearch", function (inputValue, path) {});
+    _defineProperty(_assertThisInitialized(_this), "showSearch", function (inputValue, path) {
+      return _someInstanceProperty(path).call(path, function (option) {
+        var _context;
+        return _indexOfInstanceProperty(_context = option.label.toLowerCase()).call(_context, inputValue.toLowerCase()) > -1;
+      });
+    });
     _defineProperty(_assertThisInitialized(_this), "getProps", function () {
       var _this$props = _this.props,
         _this$props$options = _this$props.options,
@@ -77,20 +84,22 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
         size = _this$props.size,
         value = _this$props.value,
         loadData = _this$props.loadData,
-        showSearch = _this$props.showSearch;
+        showSearch = _this$props.showSearch,
+        _this$props$changeOnS = _this$props.changeOnSelect,
+        changeOnSelect = _this$props$changeOnS === void 0 ? true : _this$props$changeOnS;
       var props = _Object$assign(getObjectExclude({}, PROPS_KEYS), {
         onChange: _this.onChange,
         value: value,
         options: _this.getOptions(options),
-        changeOnSelect: true,
+        changeOnSelect: changeOnSelect,
         placeholder: placeholder,
         size: size
       });
       //动态加载 ps：loadData 与 showSearch 无法一起使用
-      if (loadData) {
+      if (showSearch) {
+        props.showSearch = true;
+      } else if (loadData) {
         props.loadData = _this.loadData;
-      } else if (showSearch) {
-        props.showSearch = _this.showSearch;
       }
       return props;
     });

package/es/SuperTable2/SuperTable2.js

@@ -64,7 +64,7 @@ var TypeEnum = ['readonly', 'index', 'checkbox', 'text', 'number', 'select',
 //按钮组
 'img',
 //图片标题组 value为{src,title}时显示图片标题   为字符串时   只显示图片
-'uploadImg', 'double', 'radioGroup'];
+'uploadImg', 'double', 'radioGroup', 'selectWriting'];
 
 /**
  * key：标识所在列，在一个表格中必须唯一

package/es/SuperTable2/SuperTableCell.js

@@ -121,8 +121,22 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
     _defineProperty(_assertThisInitialized(_this), "toCascader", function (props) {
       props.options = _this.options() || [];
       props.onSearch = _this.props.onSearch;
+      props.loadData = _this.props.onSearch;
       return /*#__PURE__*/React.createElement(Control, props);
     });
+    _defineProperty(_assertThisInitialized(_this), "toSelectWriting", function (props) {
+      return /*#__PURE__*/React.createElement(Control, props);
+    });
+    // 确保value的值为字符串(包含value和title的对象除外)
+    _defineProperty(_assertThisInitialized(_this), "makeString", function (value) {
+      if (value === null || typeof value === 'undefined') {
+        return '';
+      } else if (typeof value === 'number') {
+        return String(value);
+      } else {
+        return value;
+      }
+    });
     _defineProperty(_assertThisInitialized(_this), "controlProps", function (_ref2) {
       var type = _ref2.type,
         value = _ref2.value,
@@ -133,7 +147,7 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
       type === 'readonly' && (props = {});
       return _objectSpread(_objectSpread({}, props), {}, {
         type: type,
-        value: value,
+        value: _this.makeString(value),
         size: 'small',
         autoFocus: _this.props.error,
         style: {
@@ -180,7 +194,13 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
         case 'readonly':
           return this.toReadonlyComponent(props);
         case 'cascader':
-          return this.toCascader(props);
+          return /*#__PURE__*/React.createElement("div", {
+            className: className
+          }, this.toCascader(props));
+        case 'selectWriting':
+          return /*#__PURE__*/React.createElement("div", {
+            className: className
+          }, this.toSelectWriting(props));
         case 'double':
           return /*#__PURE__*/React.createElement("div", {
             className: className

package/lib/InpurCascader/InputCascader.js

@@ -24,12 +24,14 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 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 _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some"));
+var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _helper = require("../helper");
 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 _context, _context2; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(t), !0)).call(_context, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context2 = ownKeys(Object(t))).call(_context2, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, 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; } } //级联选择input
 var optionsType = {
@@ -75,7 +77,12 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
         return obj;
       });
     });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "showSearch", function (inputValue, path) {});
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "showSearch", function (inputValue, path) {
+      return (0, _some["default"])(path).call(path, function (option) {
+        var _context;
+        return (0, _indexOf["default"])(_context = option.label.toLowerCase()).call(_context, inputValue.toLowerCase()) > -1;
+      });
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "getProps", function () {
       var _this$props = _this.props,
         _this$props$options = _this$props.options,
@@ -84,20 +91,22 @@ var InputCascader = /*#__PURE__*/function (_React$Component) {
         size = _this$props.size,
         value = _this$props.value,
         loadData = _this$props.loadData,
-        showSearch = _this$props.showSearch;
+        showSearch = _this$props.showSearch,
+        _this$props$changeOnS = _this$props.changeOnSelect,
+        changeOnSelect = _this$props$changeOnS === void 0 ? true : _this$props$changeOnS;
       var props = (0, _assign["default"])((0, _helper.getObjectExclude)({}, PROPS_KEYS), {
         onChange: _this.onChange,
         value: value,
         options: _this.getOptions(options),
-        changeOnSelect: true,
+        changeOnSelect: changeOnSelect,
         placeholder: placeholder,
         size: size
       });
       //动态加载 ps：loadData 与 showSearch 无法一起使用
-      if (loadData) {
+      if (showSearch) {
+        props.showSearch = true;
+      } else if (loadData) {
         props.loadData = _this.loadData;
-      } else if (showSearch) {
-        props.showSearch = _this.showSearch;
       }
       return props;
     });

package/lib/SuperTable2/SuperTable2.js

@@ -77,7 +77,7 @@ var TypeEnum = ['readonly', 'index', 'checkbox', 'text', 'number', 'select',
 //按钮组
 'img',
 //图片标题组 value为{src,title}时显示图片标题   为字符串时   只显示图片
-'uploadImg', 'double', 'radioGroup'];
+'uploadImg', 'double', 'radioGroup', 'selectWriting'];
 
 /**
  * key：标识所在列，在一个表格中必须唯一

package/lib/SuperTable2/SuperTableCell.js

@@ -127,8 +127,22 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toCascader", function (props) {
       props.options = _this.options() || [];
       props.onSearch = _this.props.onSearch;
+      props.loadData = _this.props.onSearch;
       return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
     });
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "toSelectWriting", function (props) {
+      return /*#__PURE__*/_react["default"].createElement(_Control["default"], props);
+    });
+    // 确保value的值为字符串(包含value和title的对象除外)
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "makeString", function (value) {
+      if (value === null || typeof value === 'undefined') {
+        return '';
+      } else if (typeof value === 'number') {
+        return String(value);
+      } else {
+        return value;
+      }
+    });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "controlProps", function (_ref2) {
       var type = _ref2.type,
         value = _ref2.value,
@@ -139,7 +153,7 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
       type === 'readonly' && (props = {});
       return _objectSpread(_objectSpread({}, props), {}, {
         type: type,
-        value: value,
+        value: _this.makeString(value),
         size: 'small',
         autoFocus: _this.props.error,
         style: {
@@ -186,7 +200,13 @@ var SuperTableCell = /*#__PURE__*/function (_React$Component) {
         case 'readonly':
           return this.toReadonlyComponent(props);
         case 'cascader':
-          return this.toCascader(props);
+          return /*#__PURE__*/_react["default"].createElement("div", {
+            className: className
+          }, this.toCascader(props));
+        case 'selectWriting':
+          return /*#__PURE__*/_react["default"].createElement("div", {
+            className: className
+          }, this.toSelectWriting(props));
         case 'double':
           return /*#__PURE__*/_react["default"].createElement("div", {
             className: className

package/package.json

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