@kdcloudjs/kdesign 1.8.14 → 1.8.15

package/es/city-picker/city-picker.js

@@ -6,13 +6,14 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
+import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import React, { useContext, useRef, useEffect, useState, useCallback, useMemo } from 'react';
 import { useMergedState } from '../_utils/hooks';
 import classNames from 'classnames';
 import ConfigContext from '../config-provider/ConfigContext';
 import { getCompProps } from '../_utils';
 import { Icon, Tabs, Spin } from '../index';
-import usePopper from '../_utils/usePopper';
+import Popper from '../popper';
 import Option from './option';
 import escapeRegExp from 'lodash/escapeRegExp';
 import KeyCode from '../_utils/KeyCode';
@@ -152,15 +153,6 @@ var InternalSelect = function InternalSelect(props, ref) {
     setAfterChangeFocus(false);
     onBlur && onBlur(e);
   }, [onBlur]);
-  useEffect(function () {
-    selectionRef.current.addEventListener('mouseup', function (e) {
-      var _a;
-      var isCloseBtn = ((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.className.indexOf('kd-tag-close-icon')) > -1;
-      if (isCloseBtn) {
-        e.stopPropagation();
-      }
-    });
-  }, []);
   var handleSearchChange = useCallback(function (event) {
     var val = event.currentTarget.value;
     setOptionShow(true);
@@ -359,14 +351,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   }, [optionShow]);
   useEffect(function () {
     var _a;
-    var fn = function fn(e) {
-      e.stopPropagation();
-    };
-    (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('mouseup', fn);
-    return function () {
-      var _a;
-      (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener('mouseup', fn);
-    };
+    (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('click', handleReset);
   }, [initValue]);
   var curkeyboardList = useMemo(function () {
     if (!searchValue) {
@@ -395,14 +380,16 @@ var InternalSelect = function InternalSelect(props, ref) {
     setActiveIndex(index === undefined ? getActiveIndex(0) : index);
   };
   useEffect(function () {
-    initActiveIndex(searchValue ? undefined : -1);
-  }, [searchValue, tabsValue, curkeyboardList]);
+    var index = _findIndexInstanceProperty(curkeyboardList).call(curkeyboardList, function (item) {
+      return item.id === initValue;
+    });
+    initActiveIndex(index >= 0 ? index : undefined);
+  }, [curkeyboardList, initValue]);
   var onInternalKeyDown = function onInternalKeyDown(e) {
     var _a, _b, _c;
     var which = e.which;
     if (which === KeyCode.ENTER || which === KeyCode.UP || which === KeyCode.DOWN) {
       e.preventDefault();
-      setOptionShow(true);
     }
     if (optionShow) {
       var offset = 0;
@@ -467,15 +454,11 @@ var InternalSelect = function InternalSelect(props, ref) {
         minWidth: width,
         maxWidth: 600
       }, dropdownStyle), {
-        width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || 'auto',
-        zIndex: 1050
+        width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || 'auto'
       }), popperStyle);
     }
   };
   var handleVisibleChange = function handleVisibleChange(visible) {
-    if (!visible) {
-      initActiveIndex(-1);
-    }
     if (visible !== optionShow) {
       props.visible === undefined && setOptionShow(visible);
       onVisibleChange && onVisibleChange(visible);
@@ -488,14 +471,15 @@ var InternalSelect = function InternalSelect(props, ref) {
     defaultVisible: optionShow,
     visible: optionShow,
     onVisibleChange: handleVisibleChange,
-    clickToClose: !searchValue,
     onTransitionEnd: function onTransitionEnd() {
       if (optionShow === false) {
         handleClear();
       }
     }
   });
-  return usePopper(renderCityPicker(), renderContent(), popperProps);
+  return React.createElement(Popper, _extends({
+    tip: renderContent()
+  }, popperProps), renderCityPicker());
 };
 var Select = React.forwardRef(InternalSelect);
 Select.displayName = 'CityPicker';

package/es/city-picker/option.js

@@ -33,16 +33,12 @@ var InternalOption = function InternalOption(props, ref) {
   var handleOnMouseEnter = function handleOnMouseEnter() {
     onChangeActiveIndex && onChangeActiveIndex(index);
   };
-  var handleOnMouseLeave = function handleOnMouseLeave() {
-    onChangeActiveIndex && onChangeActiveIndex(-1);
-  };
   return React.createElement(React.Fragment, null, React.createElement("div", {
     ref: optionRef,
     className: optionCls,
     title: name,
     onClick: handleClick,
-    onMouseEnter: handleOnMouseEnter,
-    onMouseLeave: handleOnMouseLeave
+    onMouseEnter: handleOnMouseEnter
   }, typeof itemRender === 'function' ? itemRender(city) : React.createElement(React.Fragment, null, React.createElement("span", {
     className: "".concat(selectOptionPrefixCls, "-content")
   }, children), React.createElement("span", {

package/lib/city-picker/city-picker.js

@@ -12,6 +12,7 @@ var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
@@ -22,7 +23,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _ConfigContext = _interopRequireDefault(require("../config-provider/ConfigContext"));
 var _utils = require("../_utils");
 var _index = require("../index");
-var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
+var _popper = _interopRequireDefault(require("../popper"));
 var _option = _interopRequireDefault(require("./option"));
 var _escapeRegExp = _interopRequireDefault(require("lodash/escapeRegExp"));
 var _KeyCode = _interopRequireDefault(require("../_utils/KeyCode"));
@@ -164,15 +165,6 @@ var InternalSelect = function InternalSelect(props, ref) {
     setAfterChangeFocus(false);
     onBlur && onBlur(e);
   }, [onBlur]);
-  (0, _react.useEffect)(function () {
-    selectionRef.current.addEventListener('mouseup', function (e) {
-      var _a;
-      var isCloseBtn = ((_a = e === null || e === void 0 ? void 0 : e.target) === null || _a === void 0 ? void 0 : _a.className.indexOf('kd-tag-close-icon')) > -1;
-      if (isCloseBtn) {
-        e.stopPropagation();
-      }
-    });
-  }, []);
   var handleSearchChange = (0, _react.useCallback)(function (event) {
     var val = event.currentTarget.value;
     setOptionShow(true);
@@ -371,14 +363,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   }, [optionShow]);
   (0, _react.useEffect)(function () {
     var _a;
-    var fn = function fn(e) {
-      e.stopPropagation();
-    };
-    (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('mouseup', fn);
-    return function () {
-      var _a;
-      (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.removeEventListener('mouseup', fn);
-    };
+    (_a = clearRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('click', handleReset);
   }, [initValue]);
   var curkeyboardList = (0, _react.useMemo)(function () {
     if (!searchValue) {
@@ -407,14 +392,16 @@ var InternalSelect = function InternalSelect(props, ref) {
     setActiveIndex(index === undefined ? getActiveIndex(0) : index);
   };
   (0, _react.useEffect)(function () {
-    initActiveIndex(searchValue ? undefined : -1);
-  }, [searchValue, tabsValue, curkeyboardList]);
+    var index = (0, _findIndex.default)(curkeyboardList).call(curkeyboardList, function (item) {
+      return item.id === initValue;
+    });
+    initActiveIndex(index >= 0 ? index : undefined);
+  }, [curkeyboardList, initValue]);
   var onInternalKeyDown = function onInternalKeyDown(e) {
     var _a, _b, _c;
     var which = e.which;
     if (which === _KeyCode.default.ENTER || which === _KeyCode.default.UP || which === _KeyCode.default.DOWN) {
       e.preventDefault();
-      setOptionShow(true);
     }
     if (optionShow) {
       var offset = 0;
@@ -479,15 +466,11 @@ var InternalSelect = function InternalSelect(props, ref) {
         minWidth: width,
         maxWidth: 600
       }, dropdownStyle), {
-        width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || 'auto',
-        zIndex: 1050
+        width: (dropdownStyle === null || dropdownStyle === void 0 ? void 0 : dropdownStyle.width) || 'auto'
       }), popperStyle);
     }
   };
   var handleVisibleChange = function handleVisibleChange(visible) {
-    if (!visible) {
-      initActiveIndex(-1);
-    }
     if (visible !== optionShow) {
       props.visible === undefined && setOptionShow(visible);
       onVisibleChange && onVisibleChange(visible);
@@ -500,14 +483,15 @@ var InternalSelect = function InternalSelect(props, ref) {
     defaultVisible: optionShow,
     visible: optionShow,
     onVisibleChange: handleVisibleChange,
-    clickToClose: !searchValue,
     onTransitionEnd: function onTransitionEnd() {
       if (optionShow === false) {
         handleClear();
       }
     }
   });
-  return (0, _usePopper.default)(renderCityPicker(), renderContent(), popperProps);
+  return _react.default.createElement(_popper.default, (0, _extends2.default)({
+    tip: renderContent()
+  }, popperProps), renderCityPicker());
 };
 var Select = _react.default.forwardRef(InternalSelect);
 Select.displayName = 'CityPicker';

package/lib/city-picker/option.js

@@ -45,16 +45,12 @@ var InternalOption = function InternalOption(props, ref) {
   var handleOnMouseEnter = function handleOnMouseEnter() {
     onChangeActiveIndex && onChangeActiveIndex(index);
   };
-  var handleOnMouseLeave = function handleOnMouseLeave() {
-    onChangeActiveIndex && onChangeActiveIndex(-1);
-  };
   return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("div", {
     ref: optionRef,
     className: optionCls,
     title: name,
     onClick: handleClick,
-    onMouseEnter: handleOnMouseEnter,
-    onMouseLeave: handleOnMouseLeave
+    onMouseEnter: handleOnMouseEnter
   }, typeof itemRender === 'function' ? itemRender(city) : _react.default.createElement(_react.default.Fragment, null, _react.default.createElement("span", {
     className: "".concat(selectOptionPrefixCls, "-content")
   }, children), _react.default.createElement("span", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.8.14",
+  "version": "1.8.15",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [