@hi-ui/hiui 2.15.10 → 2.15.11

package/es/select/Select.js

@@ -1,34 +1,10 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-var _typeof3 = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _reactDom = _interopRequireDefault(require("react-dom"));
@@ -37,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _shallowequal = _interopRequireDefault(require("shallowequal"));
+
 var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
@@ -51,24 +29,58 @@ var _context = _interopRequireDefault(require("../context"));
 
 var _fetchJsonp = _interopRequireDefault(require("fetch-jsonp"));
 
-var _qs = _interopRequireDefault(require("qs"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-var _lodash = _interopRequireDefault(require("lodash"));
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof3(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 
-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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(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 _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; } }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+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 _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var Select = /*#__PURE__*/function (_Component) {
-  (0, _inherits2["default"])(Select, _Component);
+  _inherits(Select, _Component);
 
   var _super = _createSuper(Select);
 
@@ -76,15 +88,13 @@ var Select = /*#__PURE__*/function (_Component) {
   function Select(props) {
     var _this;
 
-    (0, _classCallCheck2["default"])(this, Select);
+    _classCallCheck(this, Select);
+
     _this = _super.call(this, props);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "autoloadFlag", true);
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "setStateAutolaod", function () {
-      _this.setState({
-        stateAutoload: false
-      });
-    });
-    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleInputClick", function (e) {
+
+    _defineProperty(_assertThisInitialized(_this), "autoloadFlag", true);
+
+    _defineProperty(_assertThisInitialized(_this), "handleInputClick", function (e) {
       var dropdownShow = _this.state.dropdownShow;
 
       if (dropdownShow) {
@@ -93,49 +103,44 @@ var Select = /*#__PURE__*/function (_Component) {
         return;
       }
 
-      !_this.getSearchable() && _this.selectInput.focus();
+      _this.selectInput.focus();
 
       if (_this.props.disabled) {
         return;
       }
 
-      if (dropdownShow === false) {
+      if (!dropdownShow) {
         _this.showDropdown();
       }
     });
-    var data = props.data,
-        value = props.value,
-        defaultValue = props.defaultValue,
-        autoload = props.autoload;
-    var dropdownItems = (0, _cloneDeep["default"])(data);
-    var initialValue = value === undefined ? defaultValue : value;
 
-    var selectedItems = _this.resetSelectedItems(initialValue, dropdownItems, []);
+    var list = _this.props.list;
+    var dropdownItems = (0, _cloneDeep["default"])(list);
+
+    var selectedItems = _this.resetSelectedItems(_this.props.value, dropdownItems);
 
     var searchable = _this.getSearchable();
 
-    _this.debouncedFilterItems = (0, _debounce["default"])(_this.onFilterItems.bind((0, _assertThisInitialized2["default"])(_this)), 300);
-    _this.clickOutsideHandel = _this.clickOutside.bind((0, _assertThisInitialized2["default"])(_this));
+    _this.debouncedFilterItems = (0, _debounce["default"])(_this.onFilterItems.bind(_assertThisInitialized(_this)), 300);
+    _this.clickOutsideHandel = _this.clickOutside.bind(_assertThisInitialized(_this)); // const focusedIndex = this.resetFocusedIndex(false)
+
     _this.state = {
       searchable: searchable,
       queryLength: 1,
       focusedIndex: 0,
-      stateAutoload: autoload,
       selectedItems: selectedItems,
-      cacheSelectedItems: selectedItems,
       dropdownItems: dropdownItems,
       dropdownShow: false,
       fetching: false,
       keyword: '',
-      filterText: '',
       searchInput: {
-        width: 2
+        width: '2px'
       }
     };
     return _this;
   }
 
-  (0, _createClass2["default"])(Select, [{
+  _createClass(Select, [{
     key: "getChildContext",
     value: function getChildContext() {
       return {
@@ -165,7 +170,7 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function clickOutside(e) {
       var selectInput = _reactDom["default"].findDOMNode(this.selectInput);
 
-      if (selectInput && selectInput.contains(e.target) || e.target.tagName === 'INPUT' && e.target.className.includes('hi-select__dropdown__searchbar--input')) {
+      if (selectInput && selectInput.contains(e.target)) {
         return;
       }
 
@@ -173,40 +178,23 @@ var Select = /*#__PURE__*/function (_Component) {
     }
   }, {
     key: "componentWillReceiveProps",
-    value: function componentWillReceiveProps(nextProps) {
-      if (!_lodash["default"].isEqual(nextProps.data, this.props.data)) {
-        var selectedItems = this.resetSelectedItems(nextProps.value || this.state.selectedItems, nextProps.data, []);
+    value: function componentWillReceiveProps(props) {
+      if (!(0, _shallowequal["default"])(props.value, this.props.value)) {
+        var selectedItems = this.resetSelectedItems(props.value, this.state.dropdownItems); // 异步获取时会从内部改变dropdownItems，所以不能从list取
+
         this.setState({
-          selectedItems: selectedItems,
-          cacheSelectedItems: selectedItems,
-          dropdownItems: (0, _cloneDeep["default"])(nextProps.data)
+          selectedItems: selectedItems
+        }, function () {// this.onChange()
         });
-      } else {
-        var type = nextProps.type,
-            value = nextProps.value,
-            dataSource = nextProps.dataSource;
-        var oldValue = this.props.value;
-
-        if (!_lodash["default"].isEqual(value, oldValue)) {
-          var _this$state = this.state,
-              _this$state$dropdownI = _this$state.dropdownItems,
-              dropdownItems = _this$state$dropdownI === void 0 ? [] : _this$state$dropdownI,
-              stateSelectedItems = _this$state.selectedItems,
-              cacheSelectedItems = _this$state.cacheSelectedItems;
-
-          var _selectedItems2 = this.resetSelectedItems(value, dataSource && this.state.keyword === '' && !this.state.stateAutoload ? cacheSelectedItems : dropdownItems, type === 'multiple' ? _lodash["default"].cloneDeep(stateSelectedItems) : []);
-
-          if (Array.isArray(value)) {
-            _selectedItems2 = _selectedItems2.filter(function (item) {
-              return value.includes(item.id);
-            });
-          } // 异步获取时会从内部改变dropdownItems，所以不能从list取
+      }
 
+      if (!(0, _shallowequal["default"])(props.list, this.props.list)) {
+        var _selectedItems2 = this.resetSelectedItems(props.value, props.list, true);
 
-          this.setState({
-            selectedItems: _selectedItems2
-          });
-        }
+        this.setState({
+          selectedItems: _selectedItems2,
+          dropdownItems: (0, _cloneDeep["default"])(props.list)
+        });
       }
     }
   }, {
@@ -216,9 +204,12 @@ var Select = /*#__PURE__*/function (_Component) {
 
       if (this.isRemote()) {
         return true;
-      }
+      } // if(mode==='multiple' && searchable===undefined) {
+      //   return true
+      // }
 
-      return searchable;
+
+      return !!searchable;
     }
   }, {
     key: "parseValue",
@@ -226,13 +217,9 @@ var Select = /*#__PURE__*/function (_Component) {
       var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.props.value;
 
       if (Array.isArray(value)) {
-        return value.map(function (v) {
-          if ((0, _typeof2["default"])(v) === 'object') {
-            return v.id;
-          } else {
-            return v;
-          }
-        });
+        return value.slice();
+      } else if (typeof value === 'string') {
+        return value.split(',');
       } else {
         return [value];
       }
@@ -240,62 +227,65 @@ var Select = /*#__PURE__*/function (_Component) {
   }, {
     key: "isRemote",
     value: function isRemote() {
-      var _this$props = this.props,
-          dataSource = _this$props.dataSource,
-          onSearch = _this$props.onSearch;
-      return onSearch || dataSource;
+      var origin = this.props.origin;
+      return origin && !!origin.url;
     }
   }, {
     key: "resetSelectedItems",
-    value: function resetSelectedItems(value) {
-      var dropdownItems = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-      var reviceSelectedItems = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    value: function resetSelectedItems(value, dropdownItems) {
+      var listChanged = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
       var values = this.parseValue(value);
-      var selectedItems = [];
-      dropdownItems.forEach(function (item) {
-        if (values.includes(item.id)) {
-          selectedItems.push(item);
+      var selectedItems = listChanged && this.props.mode === 'multiple' ? this.state.selectedItems : []; // 如果是多选，dropdownItems有改动，需要保留之前的选中值
+
+      dropdownItems && dropdownItems.map(function (item) {
+        if (values.indexOf(item.id) !== -1) {
+          var itemIndex = selectedItems.findIndex(function (sItem) {
+            // 多选时检查是否已选中
+            return sItem.id === item.id;
+          });
+          itemIndex === -1 && selectedItems.push(item);
         }
       });
-      return _lodash["default"].uniqBy(reviceSelectedItems.concat(selectedItems), 'id');
+      return selectedItems;
+    }
+  }, {
+    key: "addOption",
+    value: function addOption(option) {
+      var values = this.parseValue();
+      this.state.dropdownItems.push(option);
+      values.indexOf(option.id) > -1 && this.state.selectedItems.push(option);
+      this.forceUpdate();
     }
   }, {
     key: "onEnterSelect",
     value: function onEnterSelect() {
-      var _this$state2 = this.state,
-          dropdownItems = _this$state2.dropdownItems,
-          focusedIndex = _this$state2.focusedIndex;
+      var _this$state = this.state,
+          dropdownItems = _this$state.dropdownItems,
+          focusedIndex = _this$state.focusedIndex;
       var item = dropdownItems[focusedIndex];
       this.onClickOption(item, focusedIndex);
     }
   }, {
     key: "onChange",
-    value: function onChange(selectedItems, changedItems, callback) {
-      var _this$props2 = this.props,
-          onChange = _this$props2.onChange,
-          value = _this$props2.value;
-      value === undefined && this.setState({
-        selectedItems: selectedItems
-      }, callback);
-      var selectedIds = selectedItems.map(function (_ref) {
-        var id = _ref.id;
-        return id;
-      });
-      onChange && onChange(selectedIds, changedItems);
+    value: function onChange(changedItems) {
+      var selectedItems = this.state.selectedItems;
+      this.props.onChange && this.props.onChange(selectedItems, changedItems);
     }
   }, {
     key: "checkAll",
-    value: function checkAll(filterItems, e) {
+    value: function checkAll(e) {
       var _this2 = this;
 
       // 全选
       e && e.stopPropagation();
-      var selectedItems = this.state.selectedItems;
+      var _this$state2 = this.state,
+          dropdownItems = _this$state2.dropdownItems,
+          selectedItems = _this$state2.selectedItems;
 
-      var _selectedItems = (0, _toConsumableArray2["default"])(selectedItems);
+      var _selectedItems = _toConsumableArray(selectedItems);
 
       var changedItems = [];
-      filterItems.forEach(function (item) {
+      dropdownItems.forEach(function (item) {
         if (!item.disabled && _this2.matchFilter(item)) {
           if (!_selectedItems.map(function (selectItem) {
             return selectItem.id;
@@ -306,7 +296,13 @@ var Select = /*#__PURE__*/function (_Component) {
           }
         }
       });
-      this.onChange(_selectedItems, changedItems, function () {}, _selectedItems);
+      this.setState({
+        selectedItems: _selectedItems
+      }, function () {
+        _this2.selectInput.focus();
+
+        _this2.onChange(changedItems);
+      });
     }
   }, {
     key: "onClickOption",
@@ -317,7 +313,7 @@ var Select = /*#__PURE__*/function (_Component) {
       var selectedItems = this.state.selectedItems.concat();
       var focusedIndex = index;
 
-      if (this.props.type === 'multiple') {
+      if (this.props.mode === 'multiple') {
         var itemIndex = this.state.selectedItems.findIndex(function (sItem) {
           return sItem.id === item.id;
         });
@@ -331,21 +327,21 @@ var Select = /*#__PURE__*/function (_Component) {
         selectedItems = [item];
       }
 
-      this.onChange(_lodash["default"].cloneDeep(selectedItems), item, function () {
-        _this3.setState({
-          focusedIndex: focusedIndex
-        });
+      this.setState({
+        selectedItems: selectedItems,
+        focusedIndex: focusedIndex
+      }, function () {
+        if (_this3.props.mode !== 'multiple') {
+          _this3.hideDropdown();
+        } else {
+          _this3.selectInput.focus();
+
+          _this3.clearKeyword(); // 多选状态清空筛选
 
-        if (_this3.props.type !== 'multiple') {
-          _this3.setState({
-            cacheSelectedItems: selectedItems
-          });
         }
-      });
 
-      if (this.props.type !== 'multiple') {
-        this.hideDropdown();
-      }
+        _this3.onChange(item);
+      });
     }
   }, {
     key: "clearKeyword",
@@ -366,10 +362,6 @@ var Select = /*#__PURE__*/function (_Component) {
       this.state.dropdownShow === true && this.setState({
         dropdownShow: false
       }, function () {
-        _this5.setState({
-          cacheSelectedItems: _this5.state.selectedItems
-        });
-
         _this5.clearKeyword();
       });
     }
@@ -379,6 +371,7 @@ var Select = /*#__PURE__*/function (_Component) {
       this.state.dropdownShow === false && this.setState({
         dropdownShow: true
       });
+      this.selectInput.focus();
     }
   }, {
     key: "deleteItem",
@@ -391,9 +384,13 @@ var Select = /*#__PURE__*/function (_Component) {
         return obj.id === item.id;
       });
       selectedItems.splice(sIndex, 1);
-      this.onChange(selectedItems, item, function () {
-        !_this6.getSearchable() && _this6.selectInput.focus();
-      }, selectedItems);
+      this.setState({
+        selectedItems: selectedItems
+      }, function () {
+        _this6.selectInput.focus();
+
+        _this6.onChange(item);
+      });
     } // 全部删除
 
   }, {
@@ -401,106 +398,75 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function deleteAllItems() {
       var _this7 = this;
 
-      var type = this.props.type;
       var focusedIndex = this.resetFocusedIndex();
-      var changedItems = (0, _toConsumableArray2["default"])(this.state.selectedItems);
-      this.onChange([], type === 'multiple' ? changedItems : changedItems[0], function () {
-        _this7.setState({
-          focusedIndex: focusedIndex
-        });
+
+      var changedItems = _toConsumableArray(this.state.selectedItems);
+
+      this.setState({
+        focusedIndex: focusedIndex,
+        selectedItems: []
+      }, function () {
+        _this7.onChange(_this7.props.mode === 'multiple' ? changedItems : changedItems[0]);
 
         _this7.onFilterItems('');
-      }, []);
+      });
     }
   }, {
     key: "remoteSearch",
     value: function remoteSearch(keyword) {
       var _this8 = this;
 
-      var _this$props3 = this.props,
-          onSearch = _this$props3.onSearch,
-          dataSource = _this$props3.dataSource,
-          autoload = _this$props3.autoload,
-          propsWithCredentials = _this$props3.withCredentials;
+      var _this$props$origin = this.props.origin,
+          url = _this$props$origin.url,
+          func = _this$props$origin.func,
+          error = _this$props$origin.error,
+          _this$props$origin$da = _this$props$origin.data,
+          data = _this$props$origin$da === void 0 ? {} : _this$props$origin$da,
+          _this$props$origin$ty = _this$props$origin.type,
+          type = _this$props$origin$ty === void 0 ? 'GET' : _this$props$origin$ty,
+          _this$props$origin$ke = _this$props$origin.key,
+          key = _this$props$origin$ke === void 0 ? 'keyword' : _this$props$origin$ke,
+          _this$props$origin$js = _this$props$origin.jsonpCallback,
+          jsonpCallback = _this$props$origin$js === void 0 ? 'callback' : _this$props$origin$js,
+          options = _objectWithoutProperties(_this$props$origin, ["url", "func", "error", "data", "type", "key", "jsonpCallback"]);
+
+      keyword = !keyword && this.autoloadFlag && this.props.autoload ? this.props.origin.keyword : keyword;
+      this.autoloadFlag = false; // 第一次自动加载数据后，输入的关键词即使为空也不再使用默认关键词
+
+      url = url.indexOf('?') === -1 ? "".concat(url, "?").concat([key], "=").concat(keyword) : "".concat(url, "&").concat([key], "=").concat(keyword);
+
+      if (type.toUpperCase() === 'POST') {
+        options.body = JSON.stringify(data);
+      }
+
+      this.setState({
+        fetching: true
+      });
 
-      if (onSearch && typeof onSearch === 'function') {
-        this.setState({
-          fetching: true
+      if (type.toUpperCase() === 'JSONP') {
+        var _o = {
+          jsonpCallback: jsonpCallback,
+          jsonpCallbackFunction: jsonpCallback
+        };
+        (0, _fetchJsonp["default"])(url, _o).then(function (res) {
+          return res.json();
+        }).then(function (json) {
+          _this8._setDropdownItems(json, func);
         });
-        onSearch(keyword)["finally"](function () {
+      } else {
+        window.fetch(url, _objectSpread({
+          method: type
+        }, options)).then(function (response) {
+          return response.json();
+        }).then(function (res) {
+          _this8._setDropdownItems(res, func);
+        }, function (err) {
+          error && error(err);
+
           _this8.setState({
             fetching: false
           });
         });
-      } else {
-        var _dataSource = typeof dataSource === 'function' ? dataSource(keyword) : dataSource;
-
-        var url = _dataSource.url,
-            transformResponse = _dataSource.transformResponse,
-            error = _dataSource.error,
-            params = _dataSource.params,
-            headers = _dataSource.headers,
-            mode = _dataSource.mode,
-            _dataSource$data = _dataSource.data,
-            data = _dataSource$data === void 0 ? {} : _dataSource$data,
-            _dataSource$type = _dataSource.type,
-            type = _dataSource$type === void 0 ? 'GET' : _dataSource$type,
-            key = _dataSource.key,
-            _dataSource$withCrede = _dataSource.withCredentials,
-            withCredentials = _dataSource$withCrede === void 0 ? propsWithCredentials : _dataSource$withCrede,
-            _dataSource$jsonpCall = _dataSource.jsonpCallback,
-            jsonpCallback = _dataSource$jsonpCall === void 0 ? 'callback' : _dataSource$jsonpCall,
-            options = (0, _objectWithoutProperties2["default"])(_dataSource, ["url", "transformResponse", "error", "params", "headers", "mode", "data", "type", "key", "withCredentials", "jsonpCallback"]);
-        keyword = !keyword && this.autoloadFlag && autoload ? _dataSource.keyword : keyword;
-        this.autoloadFlag = false; // 第一次自动加载数据后，输入的关键词即使为空也不再使用默认关键词
-
-        Object.assign(options, {
-          mode: mode
-        }, {
-          headers: headers
-        });
-
-        var queryParams = _qs["default"].stringify(Object.assign({}, params, key && (0, _defineProperty2["default"])({}, key, keyword)));
-
-        if (!_lodash["default"].isEmpty(queryParams)) {
-          url = url.includes('?') ? "".concat(url, "&").concat(queryParams) : "".concat(url, "?").concat(queryParams);
-        }
-
-        if (type.toUpperCase() === 'POST') {
-          options.body = JSON.stringify(data);
-        }
-
-        this.setState({
-          fetching: true
-        });
-
-        if (type.toUpperCase() === 'JSONP') {
-          var _o = {
-            jsonpCallback: jsonpCallback,
-            jsonpCallbackFunction: jsonpCallback
-          };
-          (0, _fetchJsonp["default"])(url, _o).then(function (res) {
-            return res.json();
-          }).then(function (json) {
-            _this8._setDropdownItems(json, transformResponse);
-          });
-        } else {
-          /* eslint-disable */
-          fetch(url, _objectSpread({
-            method: type,
-            credentials: withCredentials ? 'include' : 'same-origin'
-          }, options)).then(function (response) {
-            return response.json();
-          }).then(function (res) {
-            _this8._setDropdownItems(res, transformResponse);
-          }, function (err) {
-            error && error(err);
-
-            _this8.setState({
-              fetching: false
-            });
-          });
-        }
       }
     }
   }, {
@@ -515,8 +481,7 @@ var Select = /*#__PURE__*/function (_Component) {
       }
 
       if (Array.isArray(dropdownItems)) {
-        var reviceSelectedItems = this.props.type === 'multiple' ? this.props.dataSource && this.state.selectedItems || [] : this.state.cacheSelectedItems;
-        var selectedItems = this.resetSelectedItems(this.props.value, dropdownItems, _lodash["default"].cloneDeep(reviceSelectedItems));
+        var selectedItems = this.resetSelectedItems(this.props.value, dropdownItems, true);
         this.setState({
           dropdownItems: dropdownItems,
           selectedItems: selectedItems
@@ -532,44 +497,28 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function onFilterItems(keyword) {
       var _this9 = this;
 
-      var _this$props4 = this.props,
-          onSearch = _this$props4.onSearch,
-          dataSource = _this$props4.dataSource,
-          autoload = _this$props4.autoload;
       this.setState({
         keyword: keyword
       }, function () {
         return _this9.resetFocusedIndex();
       });
 
-      if (dataSource) {
-        if (!(keyword && keyword.length >= this.state.queryLength)) {
-          this.setState({
-            cacheSelectedItems: this.state.selectedItems
-          });
-        }
-
-        if (autoload && this.state.stateAutoload || keyword && keyword.length >= this.state.queryLength) {
+      if (this.props.origin) {
+        // this.setState({
+        //   dropdownItems: []
+        // })
+        if (this.props.autoload || keyword.toString().length >= this.state.queryLength) {
           this.remoteSearch(keyword);
         }
-      } else if (onSearch) {
-        this.remoteSearch(keyword);
       }
     }
   }, {
     key: "matchFilter",
     value: function matchFilter(item) {
-      var filterOption = this.props.filterOption;
       var _this$state3 = this.state,
           searchable = _this$state3.searchable,
           keyword = _this$state3.keyword;
-      var shouldMatch = this.isRemote() || !searchable || !keyword;
-
-      if (typeof filterOption === "function") {
-        return shouldMatch || filterOption(keyword, item);
-      }
-
-      return shouldMatch || String(item.id).includes(keyword) || String(item.title).includes(keyword);
+      return this.isRemote() || !searchable || !keyword || searchable && keyword && (String(item.id).includes(keyword) || String(item.name).includes(keyword));
     }
   }, {
     key: "resetFocusedIndex",
@@ -607,7 +556,7 @@ var Select = /*#__PURE__*/function (_Component) {
       var focusedIndex = this.state.focusedIndex;
       var dropdownItems = this.state.dropdownItems;
 
-      if (direction === "up") {
+      if (direction === 'up') {
         dropdownItems.slice(0, focusedIndex).reverse().every(function (item) {
           focusedIndex--;
 
@@ -649,43 +598,36 @@ var Select = /*#__PURE__*/function (_Component) {
     value: function render() {
       var _this12 = this;
 
-      var _this$props5 = this.props,
-          type = _this$props5.type,
-          showCheckAll = _this$props5.showCheckAll,
-          className = _this$props5.className,
-          disabled = _this$props5.disabled,
-          clearable = _this$props5.clearable,
-          style = _this$props5.style,
-          children = _this$props5.children,
-          optionWidth = _this$props5.optionWidth,
-          render = _this$props5.render,
-          multipleWrap = _this$props5.multipleWrap,
-          _onClick = _this$props5.onClick,
-          onBlur = _this$props5.onBlur,
-          onFocus = _this$props5.onFocus,
-          dataSource = _this$props5.dataSource,
-          filterOption = _this$props5.filterOption,
-          onSearch = _this$props5.onSearch,
-          theme = _this$props5.theme,
-          localeDatas = _this$props5.localeDatas;
+      var _this$props = this.props,
+          mode = _this$props.mode,
+          showCheckAll = _this$props.showCheckAll,
+          className = _this$props.className,
+          disabled = _this$props.disabled,
+          clearable = _this$props.clearable,
+          style = _this$props.style,
+          children = _this$props.children,
+          optionWidth = _this$props.optionWidth,
+          dropdownRender = _this$props.dropdownRender,
+          multipleMode = _this$props.multipleMode,
+          _onClick = _this$props.onClick,
+          onBlur = _this$props.onBlur,
+          onFocus = _this$props.onFocus,
+          locale = _this$props.locale;
       var placeholder = this.localeDatasProps('placeholder');
-      var emptyContent = this.localeDatasProps('emptyContent');
-      var searchPlaceholder = this.localeDatasProps('searchPlaceholder');
+      var noFoundTip = this.localeDatasProps('noFoundTip');
       var _this$state4 = this.state,
           selectedItems = _this$state4.selectedItems,
-          cacheSelectedItems = _this$state4.cacheSelectedItems,
           dropdownItems = _this$state4.dropdownItems,
           searchable = _this$state4.searchable,
           dropdownShow = _this$state4.dropdownShow,
           focusedIndex = _this$state4.focusedIndex,
           fetching = _this$state4.fetching;
       var extraClass = {
-        "is-multiple": type === "multiple",
-        "is-single": type === "single"
+        'is-multiple': mode === 'multiple',
+        'is-single': mode === 'single'
       };
-      var selectInputWidth = this.selectInputContainer ? this.selectInputContainer.getBoundingClientRect().width : null;
       return /*#__PURE__*/_react["default"].createElement("div", {
-        className: (0, _classnames["default"])("hi-select", className, extraClass),
+        className: (0, _classnames["default"])('hi-select', className, extraClass),
         style: style
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "hi-select__input-container",
@@ -696,16 +638,15 @@ var Select = /*#__PURE__*/function (_Component) {
         ref: function ref(node) {
           _this12.selectInput = node;
         },
-        theme: theme,
-        mode: type,
+        mode: mode,
         disabled: disabled,
         searchable: searchable,
         clearable: clearable,
-        show: dropdownShow && this.props.open,
         dropdownShow: dropdownShow,
         placeholder: placeholder,
         selectedItems: selectedItems,
-        multipleMode: multipleWrap,
+        dropdownItems: dropdownItems,
+        multipleMode: multipleMode,
         container: this.selectInputContainer,
         moveFocusedIndex: this.moveFocusedIndex.bind(this),
         onClick: function onClick() {
@@ -726,81 +667,68 @@ var Select = /*#__PURE__*/function (_Component) {
         attachEle: this.selectInputContainer,
         zIndex: 1050,
         topGap: 5,
-        leftGap: 0,
         className: "hi-select__popper",
         placement: "top-bottom-start"
       }, /*#__PURE__*/_react["default"].createElement(_SelectDropdown["default"], {
-        noFoundTip: emptyContent,
-        localeMap: localeDatas.select || {},
-        mode: type,
-        searchPlaceholder: searchPlaceholder,
-        theme: theme,
-        onBlur: onBlur,
-        onFocus: onFocus,
-        isOnSearch: onSearch || dataSource,
-        onSearch: this.debouncedFilterItems.bind(this),
-        searchable: searchable,
+        noFoundTip: noFoundTip,
+        mode: mode,
         showCheckAll: showCheckAll,
         checkAll: this.checkAll.bind(this),
         loading: fetching,
         focusedIndex: focusedIndex,
-        setStateAutolaod: this.setStateAutolaod,
-        filterOption: filterOption,
         matchFilter: this.matchFilter.bind(this),
         setFocusedIndex: this.setFocusedIndex.bind(this),
-        show: dropdownShow && this.props.open,
         optionWidth: optionWidth,
-        selectInputWidth: selectInputWidth,
-        onEnterSelect: this.onEnterSelect.bind(this),
-        moveFocusedIndex: this.moveFocusedIndex.bind(this),
-        dropdownItems: dataSource && this.state.keyword === '' && !this.state.stateAutoload ? cacheSelectedItems : dropdownItems,
+        dropdownItems: dropdownItems,
         selectedItems: selectedItems,
-        dropdownRender: render,
+        dropdownRender: dropdownRender // Popper 包裹的组件需要手动传入 locale
+        ,
+        locale: locale,
         onClickOption: this.onClickOption.bind(this)
       })));
     }
   }]);
+
   return Select;
 }(_react.Component);
 
-(0, _defineProperty2["default"])(Select, "propTypes", {
-  type: _propTypes["default"].oneOf(['single', 'multiple']),
-  multipleWrap: _propTypes["default"].oneOf(['wrap', 'nowrap']),
-  data: _propTypes["default"].array,
-  dataSource: _propTypes["default"].oneOfType([_propTypes["default"].object, _propTypes["default"].func]),
-  defaultValue: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].array, _propTypes["default"].bool, _propTypes["default"].number]),
+_defineProperty(Select, "propTypes", {
+  mode: _propTypes["default"].oneOf(['single', 'multiple']),
+  multipleMode: _propTypes["default"].oneOf(['wrap', 'nowrap']),
+  list: _propTypes["default"].array,
+  origin: _propTypes["default"].object,
   value: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].array, _propTypes["default"].bool, _propTypes["default"].number]),
   showCheckAll: _propTypes["default"].bool,
   autoload: _propTypes["default"].bool,
-  withCredentials: _propTypes["default"].bool,
   searchable: _propTypes["default"].bool,
-  filterOption: _propTypes["default"].func,
   clearable: _propTypes["default"].bool,
   disabled: _propTypes["default"].bool,
   placeholder: _propTypes["default"].string,
-  emptyContent: _propTypes["default"].string,
+  noFoundTip: _propTypes["default"].string,
   optionWidth: _propTypes["default"].number,
   style: _propTypes["default"].object,
   onChange: _propTypes["default"].func,
-  render: _propTypes["default"].func,
+  dropdownRender: _propTypes["default"].func,
   open: _propTypes["default"].bool
 });
-(0, _defineProperty2["default"])(Select, "defaultProps", {
-  data: [],
-  type: 'single',
-  multipleWrap: 'nowrap',
+
+_defineProperty(Select, "defaultProps", {
+  list: [],
+  mode: 'single',
+  multipleMode: 'wrap',
   disabled: false,
   clearable: true,
-  defaultValue: '',
+  value: '',
   autoload: false,
+  placeholder: '',
+  noFoundTip: '',
   showCheckAll: false,
   open: true,
-  withCredentials: false,
-  stateAutoload: false,
   onClick: function onClick() {},
   onBlur: function onBlur() {},
   onFocus: function onFocus() {}
 });
+
 Select.childContextTypes = {
   component: _propTypes["default"].any
 };