@kdcloudjs/kdesign 1.7.27 → 1.7.29

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

@@ -15,6 +15,13 @@ import usePopper from '../_utils/usePopper';
 import Option from './option';
 import escapeRegExp from 'lodash/escapeRegExp';
 import KeyCode from '../_utils/KeyCode';
+import isObject from 'lodash/isObject';
+var getCityId = function getCityId(data) {
+  if (isObject(data)) {
+    return data === null || data === void 0 ? void 0 : data.id;
+  }
+  return data;
+};
 var InternalSelect = function InternalSelect(props, ref) {
   var _context, _classNames3, _classNames5;
   var _useContext = useContext(ConfigContext),
@@ -64,8 +71,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     itemRender = selectProps.itemRender,
     onTabPaneChange = selectProps.onTabPaneChange;
   var _useMergedState = useMergedState(undefined, {
-      value: value,
-      defaultValue: defaultValue
+      value: getCityId(value),
+      defaultValue: getCityId(defaultValue)
     }),
     _useMergedState2 = _slicedToArray(_useMergedState, 2),
     initValue = _useMergedState2[0],
@@ -114,6 +121,10 @@ var InternalSelect = function InternalSelect(props, ref) {
   useEffect(function () {
     var _context2;
     if (typeof value === 'undefined') return;
+    if (isObject(value)) {
+      setSeletedCity(value);
+      return;
+    }
     var cityList = _concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(commonList), _toConsumableArray(domesticList), _toConsumableArray(foreignList));
     var city = _findInstanceProperty(cityList).call(cityList, function (city) {
       return city.id === value;
@@ -214,6 +225,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   };
   var handleOption = function handleOption(city) {
     handleVisibleChange(false);
+    city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
     (city === null || city === void 0 ? void 0 : city.id) !== initValue && (onChange === null || onChange === void 0 ? void 0 : onChange(city === null || city === void 0 ? void 0 : city.id, city));
     if (typeof value === 'undefined') {
       setSeletedCity(city);
@@ -279,17 +291,22 @@ var InternalSelect = function InternalSelect(props, ref) {
     var symbol = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ', ';
     if (!data) return null;
     if (isDomestic(type)) {
-      var _context4;
+      var _context5;
       if (isCommon) {
         var _context3;
         var _curVal = (data === null || data === void 0 ? void 0 : data.province) ? data === null || data === void 0 ? void 0 : data.province : data === null || data === void 0 ? void 0 : data.country;
         return _concatInstanceProperty(_context3 = "".concat(flag && _curVal ? symbol : '')).call(_context3, _curVal);
       }
-      var curVal = tabsValue === 'domestic' ? data === null || data === void 0 ? void 0 : data.province : data === null || data === void 0 ? void 0 : data.country;
-      return _concatInstanceProperty(_context4 = "".concat(flag && curVal ? symbol : '')).call(_context4, curVal);
+      if (data === null || data === void 0 ? void 0 : data.type) {
+        var _context4;
+        var _curVal2 = data.type === 'domestic' ? (data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country) : data === null || data === void 0 ? void 0 : data.country;
+        return _concatInstanceProperty(_context4 = "".concat(flag && _curVal2 ? symbol : '')).call(_context4, _curVal2);
+      }
+      var curVal = tabsValue === 'domestic' ? (data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country) : data === null || data === void 0 ? void 0 : data.country;
+      return _concatInstanceProperty(_context5 = "".concat(flag && curVal ? symbol : '')).call(_context5, curVal);
     } else {
-      var _context5, _context6, _context7;
-      return _concatInstanceProperty(_context5 = _concatInstanceProperty(_context6 = _concatInstanceProperty(_context7 = "".concat(flag && ((data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country)) ? symbol : '')).call(_context7, data === null || data === void 0 ? void 0 : data.province)).call(_context6, (data === null || data === void 0 ? void 0 : data.country) && (data === null || data === void 0 ? void 0 : data.province) ? symbol : '')).call(_context5, data === null || data === void 0 ? void 0 : data.country);
+      var _context6, _context7, _context8;
+      return _concatInstanceProperty(_context6 = _concatInstanceProperty(_context7 = _concatInstanceProperty(_context8 = "".concat(flag && ((data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country)) ? symbol : '')).call(_context8, data === null || data === void 0 ? void 0 : data.province)).call(_context7, (data === null || data === void 0 ? void 0 : data.country) && (data === null || data === void 0 ? void 0 : data.province) ? symbol : '')).call(_context6, data === null || data === void 0 ? void 0 : data.country);
     }
   }, [type, tabsValue]);
   var renderSingle = function renderSingle() {

package/es/city-picker/interface.d.ts

@@ -4,6 +4,7 @@ export declare type City = {
     country?: string;
     province?: string;
     name?: string;
+    type?: 'domestic' | 'foreign';
     [key: string]: any;
 };
 export declare const BorderTypes: ["none", "underline", "bordered"];
@@ -33,7 +34,7 @@ export interface CityPickerProps {
     clearIcon?: React.ReactNode;
     suffixIcon?: React.ReactNode;
     optionHighlightProps?: string;
-    value?: string | number;
+    value?: string | number | City;
     defaultValue?: string | number;
     description?: React.ReactNode;
     showDescription?: boolean;

package/es/city-picker/style/index.css

@@ -166,6 +166,7 @@
   opacity: 0;
   z-index: 1;
   position: absolute;
+  top: 0;
   background: #fff;
   -webkit-transition: opacity 0.15s ease;
   transition: opacity 0.15s ease;
@@ -181,6 +182,14 @@
   text-overflow: ellipsis;
   right: 24px;
   left: 0;
+  top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-city-picker-borderless {
   border: none;
@@ -387,6 +396,8 @@
 }
 .kd-city-picker-suffix {
   right: 0;
+  top: 0;
+  bottom: 0;
   position: absolute;
   display: -webkit-box;
   display: -ms-flexbox;

package/es/city-picker/style/index.less

@@ -58,6 +58,7 @@
       opacity: 0;
       z-index: 1;
       position: absolute;
+      top: 0;
       background: #fff;
       transition: opacity 0.15s ease;
       &:hover {
@@ -74,6 +75,10 @@
     text-overflow: ellipsis;
     right: 24px;
     left: 0;
+    top: 0;
+    bottom: 0;
+    display: flex;
+    align-items: center;
   }
 
   &-borderless {
@@ -277,6 +282,8 @@
 
   &-suffix {
     right: 0;
+    top: 0;
+    bottom: 0;
     position: absolute;
     display: flex;
     flex: 0;

package/es/grid/col.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 interface ColBase {
     span?: number;
     pull?: number;

package/es/grid/col.js

@@ -1,35 +1,52 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
-import * as React from 'react';
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof _Object$getOwnPropertySymbols === "function") for (var i = 0, p = _Object$getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+import React, { useContext } from 'react';
 import classNames from 'classnames';
 import { getCompProps } from '../_utils';
 import { ConfigContext } from '../config-provider';
 import { testBrowserType } from '../_utils/testBrowserType';
+import { GapContext } from './row';
 var Col = function Col(props) {
   var _React$useContext = React.useContext(ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls,
     pkgPrefixCls = _React$useContext.prefixCls,
     userDefaultProps = _React$useContext.compDefaultProps;
   // 属性需要合并一遍用户定义的默认属性
-  var _getCompProps = getCompProps('Col', userDefaultProps, props),
-    xs = _getCompProps.xs,
-    sm = _getCompProps.sm,
-    md = _getCompProps.md,
-    lg = _getCompProps.lg,
-    xl = _getCompProps.xl,
-    flex = _getCompProps.flex,
-    span = _getCompProps.span,
-    pull = _getCompProps.pull,
-    push = _getCompProps.push,
-    style = _getCompProps.style,
-    order = _getCompProps.order,
-    offset = _getCompProps.offset,
-    winWidth = _getCompProps.winWidth,
-    children = _getCompProps.children,
-    className = _getCompProps.className,
-    customPrefixcls = _getCompProps.prefixCls;
+  var _a = getCompProps('Col', userDefaultProps, props),
+    xs = _a.xs,
+    sm = _a.sm,
+    md = _a.md,
+    lg = _a.lg,
+    xl = _a.xl,
+    flex = _a.flex,
+    span = _a.span,
+    pull = _a.pull,
+    push = _a.push,
+    style = _a.style,
+    order = _a.order,
+    offset = _a.offset,
+    children = _a.children,
+    className = _a.className,
+    customPrefixcls = _a.prefixCls,
+    others = __rest(_a, ["xs", "sm", "md", "lg", "xl", "flex", "span", "pull", "push", "style", "order", "offset", "children", "className", "prefixCls"]);
+  var rowGroup = useContext(GapContext);
+  var mergedWinWidth = rowGroup.winWidth;
+  var gap = rowGroup.gap;
   // 浏览器名称
-  var isSogou = testBrowserType(/^sogou/i, 0);
+  var isSogouOrIE = testBrowserType(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  var colGapStyle = {
+    padding: "0 ".concat(gap.h / 2, "px")
+  };
+  if (isSogouOrIE && gap.v) colGapStyle.marginBottom = gap.v;
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'col', customPrefixcls);
   var columns = 24;
@@ -40,23 +57,23 @@ var Col = function Col(props) {
     offset: offset,
     order: order
   };
-  if (xs && winWidth > 0) {
+  if (xs && mergedWinWidth > 0) {
     if (xs.constructor === Number) base.span = xs;
     if (xs.constructor === Object) base = _extends(_extends({}, base), xs);
   }
-  if (sm && winWidth >= 600) {
+  if (sm && mergedWinWidth >= 600) {
     if (sm.constructor === Number) base.span = sm;
     if (sm.constructor === Object) base = _extends(_extends({}, base), sm);
   }
-  if (md && winWidth >= 1024) {
+  if (md && mergedWinWidth >= 1024) {
     if (md.constructor === Number) base.span = md;
     if (md.constructor === Object) base = _extends(_extends({}, base), md);
   }
-  if (lg && winWidth >= 1280) {
+  if (lg && mergedWinWidth >= 1280) {
     if (lg.constructor === Number) base.span = lg;
     if (lg.constructor === Object) base = _extends(_extends({}, base), lg);
   }
-  if (xl && winWidth >= 1920) {
+  if (xl && mergedWinWidth >= 1920) {
     if (xl.constructor === Number) base.span = xl;
     if (xl.constructor === Object) base = _extends(_extends({}, base), xl);
   }
@@ -76,20 +93,18 @@ var Col = function Col(props) {
       }
     }
   }
-  var styleString = _extends({
+  var styleString = _extends(_extends({
     flex: flexstr,
     maxWidth: width,
     order: base.order,
     left: base.push && base.push / columns * 100 + '%',
     right: base.pull && base.pull / columns * 100 + '%',
     marginLeft: base.offset && base.offset / columns * 100 + '%'
-  }, style);
-  return /*#__PURE__*/React.createElement("div", {
-    className: classNames(prefixCls, className, {
-      'sogou-col': isSogou
-    }),
+  }, colGapStyle), style);
+  return /*#__PURE__*/React.createElement("div", _extends({
+    className: classNames(prefixCls, className),
     style: styleString
-  }, children);
+  }, others), children);
 };
 Col.displayName = 'Col';
 export default Col;

package/es/grid/row.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 declare type Align = 'top' | 'middle' | 'bottom' | 'stretch';
 declare type Justify = 'start' | 'end' | 'center' | 'space-around' | 'space-between';
 interface gutterObject {
@@ -17,5 +17,13 @@ export interface RowProps {
     style?: React.CSSProperties;
     gutter?: number | gutterObject | Array<number | gutterObject>;
 }
+export interface GridContext {
+    gap: {
+        v: number;
+        h: number;
+    };
+    winWidth: number;
+}
+export declare const GapContext: React.Context<GridContext>;
 declare const Row: React.FC<RowProps>;
 export default Row;

package/es/grid/row.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import * as React from 'react';
+import React, { createContext } from 'react';
 import classNames from 'classnames';
 import { getCompProps } from '../_utils';
 import { ConfigContext } from '../config-provider';
@@ -21,8 +20,14 @@ function getGap(gutter, width) {
   if (xl && width >= 1920) gap = xl;
   return gap;
 }
+export var GapContext = /*#__PURE__*/createContext({
+  gap: {
+    h: 0,
+    v: 0
+  },
+  winWidth: window.innerWidth
+});
 var Row = function Row(props) {
-  var _context;
   var _React$useContext = React.useContext(ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls,
     pkgPrefixCls = _React$useContext.prefixCls,
@@ -38,7 +43,7 @@ var Row = function Row(props) {
     justify = _getCompProps.justify,
     customPrefixcls = _getCompProps.prefixCls;
   // 浏览器名称
-  var isSogou = testBrowserType(/^sogou/i, 0);
+  var isSogouOrIe = testBrowserType(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
   var _React$useState = React.useState(window.innerWidth),
@@ -70,9 +75,10 @@ var Row = function Row(props) {
     }
   }
   var rowStyle = {
-    '--cgap': "".concat(gap.h, "px")
+    'row-gap': "".concat(gap.v, "px"),
+    margin: "0 ".concat(-1 * gap.h, "px")
   };
-  if (gap.v) rowStyle['--rgap'] = "".concat(gap.v, "px");
+  if (gap.v && isSogouOrIe) rowStyle['margin-bottom'] = "".concat(-1 * gap.v / 2, "px");
   var toalign = {
     top: 'flex-start',
     middle: 'center',
@@ -82,22 +88,21 @@ var Row = function Row(props) {
     start: 'flex-start',
     end: 'flex-end'
   };
-  var styleString = _extends(_extends(_extends({}, style), rowStyle), {
+  var styleString = _extends(_extends(_extends({}, rowStyle), style), {
     alignItems: toalign[align] || align,
     justifyContent: tojustify[justify] || justify
   });
-  return /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(GapContext.Provider, {
+    value: {
+      gap: gap,
+      winWidth: winWidth
+    }
+  }, /*#__PURE__*/React.createElement("div", {
     className: classNames(prefixCls, className, {
       nowrap: !wrap
-    }, {
-      'sogou-row': isSogou
     }),
     style: styleString
-  }, _mapInstanceProperty(_context = React.Children).call(_context, children, function (child) {
-    return /*#__PURE__*/React.cloneElement(child, {
-      winWidth: winWidth
-    });
-  }));
+  }, children));
 };
 Row.displayName = 'Row';
 export default Row;

package/es/select/select.js

@@ -629,9 +629,9 @@ var InternalSelect = function InternalSelect(props, ref) {
       onFocus: handleFocus,
       onBlur: handleBlur,
       readOnly: !isShowSearch || !!disabled
-    })), singleVal && !searchValue && /*#__PURE__*/React.createElement("span", {
+    })), singleVal && !searchValue ? /*#__PURE__*/React.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-item")
-    }, singleVal), /*#__PURE__*/React.createElement("span", {
+    }, singleVal) : null, /*#__PURE__*/React.createElement("span", {
       className: "".concat(selectPrefixCls, "-placeholder"),
       style: hiddenStyle
     }, placeholder), /*#__PURE__*/React.createElement("span", {

package/es/select/style/index.css

@@ -280,6 +280,14 @@
 .kd-select-icon-clear {
   opacity: 0;
   z-index: 1;
+  top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
   position: absolute;
   background: #fff;
   -webkit-transition: opacity 0.15s ease;
@@ -299,6 +307,15 @@
   text-overflow: ellipsis;
   right: 28px;
   left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: -1;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-select-borderless {
   border: none;
@@ -433,18 +450,32 @@
   max-height: calc(var(--kd-c-select-sizing-height-small, 24px) * 3 - 10px);
   font-size: var(--kd-c-select-font-size-small, 12px);
 }
+.kd-select-size-small .kd-select-selection-item {
+  min-height: calc(var(--kd-c-select-sizing-height-small, 24px) - 4px);
+  line-height: calc(var(--kd-c-select-sizing-height-small, 24px) - 4px);
+}
 .kd-select-size-middle {
   min-height: var(--kd-c-select-sizing-height-middle, 30px);
   max-height: calc(var(--kd-c-select-sizing-height-middle, 30px) * 3 - 10px);
   font-size: var(--kd-c-select-font-size-middle, 14px);
 }
+.kd-select-size-middle .kd-select-selection-item {
+  min-height: calc(var(--kd-c-select-sizing-height-middle, 30px) - 4px);
+  line-height: calc(var(--kd-c-select-sizing-height-middle, 30px) - 4px);
+}
 .kd-select-size-large {
   min-height: var(--kd-c-select-sizing-height-large, 36px);
   max-height: calc(var(--kd-c-select-sizing-height-large, 36px) * 3 - 10px);
   font-size: var(--kd-c-select-font-size-large, 16px);
 }
+.kd-select-size-large .kd-select-selection-item {
+  min-height: calc(var(--kd-c-select-sizing-height-large, 36px) - 4px);
+  line-height: calc(var(--kd-c-select-sizing-height-large, 36px) - 4px);
+}
 .kd-select-suffix {
   right: 0;
+  top: 0;
+  bottom: 0;
   position: absolute;
   display: -webkit-box;
   display: -ms-flexbox;
@@ -467,6 +498,14 @@
   right: 28px;
   left: 0;
   height: 100%;
+  top: 0;
+  bottom: 0;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
 }
 .kd-select .kd-select-single .kd-select-selection-search-input {
   outline: 0;
@@ -525,9 +564,6 @@
           align-items: center;
   vertical-align: middle;
   max-width: 100%;
-  height: 20px;
-  line-height: 20px;
-  margin: 2px 8px 2px 0;
   cursor: default;
   -webkit-user-select: none;
      -moz-user-select: none;

package/es/select/style/index.less

@@ -46,6 +46,10 @@
     &-clear {
       opacity: 0;
       z-index: 1;
+      top: 0;
+      bottom: 0;
+      display: flex;
+      align-items: center;
       position: absolute;
       background: #fff;
       transition: opacity 0.15s ease;
@@ -66,6 +70,11 @@
     text-overflow: ellipsis;
     right: 28px;
     left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: -1;
+    display: flex;
+    align-items: center;
   }
 
   &-borderless {
@@ -220,6 +229,8 @@
 
   &-suffix {
     right: 0;
+    top: 0;
+    bottom: 0;
     position: absolute;
     display: flex;
     flex: 0;
@@ -235,6 +246,10 @@
         right: 28px;
         left: 0;
         height: 100%;
+        top: 0;
+        bottom: 0;
+        display: flex;
+        align-items: center;
         &-input {
           outline: 0;
           border-radius: 0;
@@ -289,9 +304,6 @@
     align-items: center;
     vertical-align: middle;
     max-width: 100%;
-    height: 20px;
-    line-height: 20px;
-    margin: 2px 8px 2px 0;
     cursor: default;
     user-select: none;
     &-small {

package/es/select/style/mixin.less

@@ -19,6 +19,11 @@
   min-height: @height;
   max-height: calc(@maxHeight * 3 - 10px);
   font-size: @fontSize;
+
+  .@{select-prefix-cls}-selection-item {
+    min-height: calc(@height - 4px);
+    line-height: calc(@height - 4px);
+  }
 }
 
 .over() {
@@ -52,7 +57,6 @@
   }
 }
 
-
 @keyframes SlideUpIn {
   0% {
     transform: scaleY(0.8);
@@ -77,4 +81,4 @@
     transform-origin: 100% 100%;
     opacity: 0;
   }
-}
+}

package/es/style/themes/default.less

@@ -282,7 +282,7 @@
 @radio-border-width: 1px;
 @radio-margin-right: 8px;
 @radio-transition-fn: cubic-bezier(0.075, 0.82, 0.165, 1);
-@radio-circle-size: 13px;
+@radio-circle-size: 14px;
 @radio-square-height: 32px;
 @radio-square-padding: 0 20px;
 @radio-button-height: 24px;
@@ -706,4 +706,4 @@
 @advancedSelector-dropdown-options-height: 32px;
 @advancedSelector-hover-bg: @hover-color;
 
-/* -----------  AdvancedSelector  ——————---- end */
+/* -----------  AdvancedSelector  ——————---- end */

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

@@ -25,8 +25,15 @@ var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
 var _option = _interopRequireDefault(require("./option"));
 var _escapeRegExp = _interopRequireDefault(require("lodash/escapeRegExp"));
 var _KeyCode = _interopRequireDefault(require("../_utils/KeyCode"));
+var _isObject = _interopRequireDefault(require("lodash/isObject"));
 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 _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(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; }
+var getCityId = function getCityId(data) {
+  if ((0, _isObject.default)(data)) {
+    return data === null || data === void 0 ? void 0 : data.id;
+  }
+  return data;
+};
 var InternalSelect = function InternalSelect(props, ref) {
   var _context, _classNames3, _classNames5;
   var _useContext = (0, _react.useContext)(_ConfigContext.default),
@@ -76,8 +83,8 @@ var InternalSelect = function InternalSelect(props, ref) {
     itemRender = selectProps.itemRender,
     onTabPaneChange = selectProps.onTabPaneChange;
   var _useMergedState = (0, _hooks.useMergedState)(undefined, {
-      value: value,
-      defaultValue: defaultValue
+      value: getCityId(value),
+      defaultValue: getCityId(defaultValue)
     }),
     _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
     initValue = _useMergedState2[0],
@@ -126,6 +133,10 @@ var InternalSelect = function InternalSelect(props, ref) {
   (0, _react.useEffect)(function () {
     var _context2;
     if (typeof value === 'undefined') return;
+    if ((0, _isObject.default)(value)) {
+      setSeletedCity(value);
+      return;
+    }
     var cityList = (0, _concat.default)(_context2 = []).call(_context2, (0, _toConsumableArray2.default)(commonList), (0, _toConsumableArray2.default)(domesticList), (0, _toConsumableArray2.default)(foreignList));
     var city = (0, _find.default)(cityList).call(cityList, function (city) {
       return city.id === value;
@@ -226,6 +237,7 @@ var InternalSelect = function InternalSelect(props, ref) {
   };
   var handleOption = function handleOption(city) {
     handleVisibleChange(false);
+    city.type = tabsValue === 'domestic' ? 'domestic' : 'foreign';
     (city === null || city === void 0 ? void 0 : city.id) !== initValue && (onChange === null || onChange === void 0 ? void 0 : onChange(city === null || city === void 0 ? void 0 : city.id, city));
     if (typeof value === 'undefined') {
       setSeletedCity(city);
@@ -291,17 +303,22 @@ var InternalSelect = function InternalSelect(props, ref) {
     var symbol = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : ', ';
     if (!data) return null;
     if (isDomestic(type)) {
-      var _context4;
+      var _context5;
       if (isCommon) {
         var _context3;
         var _curVal = (data === null || data === void 0 ? void 0 : data.province) ? data === null || data === void 0 ? void 0 : data.province : data === null || data === void 0 ? void 0 : data.country;
         return (0, _concat.default)(_context3 = "".concat(flag && _curVal ? symbol : '')).call(_context3, _curVal);
       }
-      var curVal = tabsValue === 'domestic' ? data === null || data === void 0 ? void 0 : data.province : data === null || data === void 0 ? void 0 : data.country;
-      return (0, _concat.default)(_context4 = "".concat(flag && curVal ? symbol : '')).call(_context4, curVal);
+      if (data === null || data === void 0 ? void 0 : data.type) {
+        var _context4;
+        var _curVal2 = data.type === 'domestic' ? (data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country) : data === null || data === void 0 ? void 0 : data.country;
+        return (0, _concat.default)(_context4 = "".concat(flag && _curVal2 ? symbol : '')).call(_context4, _curVal2);
+      }
+      var curVal = tabsValue === 'domestic' ? (data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country) : data === null || data === void 0 ? void 0 : data.country;
+      return (0, _concat.default)(_context5 = "".concat(flag && curVal ? symbol : '')).call(_context5, curVal);
     } else {
-      var _context5, _context6, _context7;
-      return (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = (0, _concat.default)(_context7 = "".concat(flag && ((data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country)) ? symbol : '')).call(_context7, data === null || data === void 0 ? void 0 : data.province)).call(_context6, (data === null || data === void 0 ? void 0 : data.country) && (data === null || data === void 0 ? void 0 : data.province) ? symbol : '')).call(_context5, data === null || data === void 0 ? void 0 : data.country);
+      var _context6, _context7, _context8;
+      return (0, _concat.default)(_context6 = (0, _concat.default)(_context7 = (0, _concat.default)(_context8 = "".concat(flag && ((data === null || data === void 0 ? void 0 : data.province) || (data === null || data === void 0 ? void 0 : data.country)) ? symbol : '')).call(_context8, data === null || data === void 0 ? void 0 : data.province)).call(_context7, (data === null || data === void 0 ? void 0 : data.country) && (data === null || data === void 0 ? void 0 : data.province) ? symbol : '')).call(_context6, data === null || data === void 0 ? void 0 : data.country);
     }
   }, [type, tabsValue]);
   var renderSingle = function renderSingle() {

package/lib/city-picker/interface.d.ts

@@ -4,6 +4,7 @@ export declare type City = {
     country?: string;
     province?: string;
     name?: string;
+    type?: 'domestic' | 'foreign';
     [key: string]: any;
 };
 export declare const BorderTypes: ["none", "underline", "bordered"];
@@ -33,7 +34,7 @@ export interface CityPickerProps {
     clearIcon?: React.ReactNode;
     suffixIcon?: React.ReactNode;
     optionHighlightProps?: string;
-    value?: string | number;
+    value?: string | number | City;
     defaultValue?: string | number;
     description?: React.ReactNode;
     showDescription?: boolean;