bkui-vue 2.0.1-beta.60.fix.1 → 2.0.1-beta.61

package/lib/select/index.js

@@ -17,6 +17,7 @@ import "../popover/popover.less";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_virtual_render_927587a8__ from "../virtual-render";
 import "../virtual-render/virtual-render.less";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_merge_cf99375a__ from "lodash/merge";
+import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_overflow_title_051a85a5__ from "../overflow-title";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_tag_d74826be__ from "../tag";
 import "../tag/tag.less";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_debounce_3540babe__ from "lodash/debounce";
@@ -507,7 +508,7 @@ const config_provider_namespaceObject = config_provider_x({ ["useLocale"]: () =>
 ;// CONCATENATED MODULE: external "../icon"
 var icon_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var icon_y = x => () => x
-const icon_namespaceObject = icon_x({ ["AngleUp"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.AngleUp, ["AngleUpFill"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.AngleUpFill, ["Close"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Close, ["Done"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Done, ["Search"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Search, ["TextAll"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.TextAll });
+const icon_namespaceObject = icon_x({ ["AngleDown"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.AngleDown, ["AngleUpFill"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.AngleUpFill, ["Close"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Close, ["Done"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Done, ["Search"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.Search, ["TextAll"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_icon_a97c79c3__.TextAll });
 ;// CONCATENATED MODULE: external "lodash/isEqual"
 var isEqual_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var isEqual_y = x => () => x
@@ -597,7 +598,6 @@ function useRegistry(data) {
   var register = function register(key, item) {
     if (!item) return;
     if (data.value.has(key)) {
-      // console.warn(`repeat ${key}`, item);
       return;
     }
     return data.value.set(key, item);
@@ -770,7 +770,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
   name: 'Option',
   props: {
     id: {
-      type: [String, Number, Object],
+      type: [String, Number],
       require: true
     },
     name: shared_namespaceObject.PropTypes.oneOfType([shared_namespaceObject.PropTypes.number, shared_namespaceObject.PropTypes.string]),
@@ -779,6 +779,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
   },
   setup: function setup(props, _ref) {
     var attrs = _ref.attrs;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var _getCurrentInstance = (0,external_vue_namespaceObject.getCurrentInstance)(),
       proxy = _getCurrentInstance.proxy;
     var states = (0,external_vue_namespaceObject.reactive)({
@@ -2292,6 +2293,10 @@ if (core.isSupported() && _56l.shouldPatch(core.genToken)) {
 
 /* harmony default export */ const pinyin = (core);
 
+;// CONCATENATED MODULE: external "../overflow-title"
+var overflow_title_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var overflow_title_y = x => () => x
+const overflow_title_namespaceObject = overflow_title_x({ ["OverflowTitle"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_overflow_title_051a85a5__.OverflowTitle });
 ;// CONCATENATED MODULE: external "../tag"
 var tag_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var tag_y = x => () => x
@@ -2340,6 +2345,7 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
 
 
 
+
 /* harmony default export */ const selectTagInput = ((0,external_vue_namespaceObject.defineComponent)({
   name: 'SelectTagInput',
   directives: {
@@ -2376,7 +2382,7 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
     var overflowTagIndex = (0,external_vue_namespaceObject.ref)(null);
     var overflowContent = (0,external_vue_namespaceObject.computed)(function () {
       return selected.value.slice(overflowTagIndex.value, selected.value.length).map(function (item) {
-        return item.label;
+        return select === null || select === void 0 ? void 0 : select.handleGetLabelByValue(item.value);
       }).join(', ');
     });
     (0,external_vue_namespaceObject.watch)(modelValue, function () {
@@ -2481,8 +2487,8 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
       _this$$slots$default2,
       _this$$slots3,
       _this = this,
-      _this$$slots4,
-      _this$$slots4$suffix;
+      _this$$slots5,
+      _this$$slots5$suffix;
     var prefix = (_this$$slots = this.$slots) === null || _this$$slots === void 0 || (_this$$slots$prefix = _this$$slots.prefix) === null || _this$$slots$prefix === void 0 ? void 0 : _this$$slots$prefix.call(_this$$slots);
     var selectTagClass = (0,shared_namespaceObject.classes)(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, this.resolveClassName('select-tag'), true), this.resolveClassName('select-tag--default'), true), 'is-disabled', this.disabled), 'collapse-tag', this.collapseTags), 'has-prefix', !!prefix), 'is-simplicity', this.behavior === 'simplicity'));
     var tagWrapperClass = (0,shared_namespaceObject.classes)(_defineProperty({}, this.resolveClassName('select-tag-wrapper'), true));
@@ -2495,7 +2501,7 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
     }, [(_this$$slots2 = this.$slots) === null || _this$$slots2 === void 0 || (_this$$slots2$prefix = _this$$slots2.prefix) === null || _this$$slots2$prefix === void 0 ? void 0 : _this$$slots2$prefix.call(_this$$slots2), (0,external_vue_namespaceObject.createVNode)("div", {
       "class": tagWrapperClass
     }, [(_this$$slots$default = (_this$$slots$default2 = (_this$$slots3 = this.$slots)["default"]) === null || _this$$slots$default2 === void 0 ? void 0 : _this$$slots$default2.call(_this$$slots3)) !== null && _this$$slots$default !== void 0 ? _this$$slots$default : this.selected.map(function (item, index) {
-      var _this$select;
+      var _this$$slots$tagRende, _this$$slots$tagRende2, _this$$slots4, _this$select;
       return (0,external_vue_namespaceObject.createVNode)(tag_namespaceObject["default"], {
         "ref": function ref(el) {
           return _this.tagsRefs[index] = el;
@@ -2510,7 +2516,13 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
         }
       }, {
         "default": function _default() {
-          return [(_this$select = _this.select) === null || _this$select === void 0 ? void 0 : _this$select.handleGetLabelByValue(item.value)];
+          return [(_this$$slots$tagRende = (_this$$slots$tagRende2 = (_this$$slots4 = _this.$slots).tagRender) === null || _this$$slots$tagRende2 === void 0 ? void 0 : _this$$slots$tagRende2.call(_this$$slots4, item)) !== null && _this$$slots$tagRende !== void 0 ? _this$$slots$tagRende : (0,external_vue_namespaceObject.createVNode)(overflow_title_namespaceObject.OverflowTitle, {
+            "type": "tips"
+          }, {
+            "default": function _default() {
+              return [(_this$select = _this.select) === null || _this$select === void 0 ? void 0 : _this$select.handleGetLabelByValue(item.value)];
+            }
+          })];
         }
       });
     }), (0,external_vue_namespaceObject.withDirectives)((0,external_vue_namespaceObject.createVNode)(tag_namespaceObject["default"], {
@@ -2525,7 +2537,8 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
       }
     }), [[(0,external_vue_namespaceObject.resolveDirective)("bk-tooltips"), {
       content: this.overflowContent,
-      disabled: !this.overflowTagIndex || !this.collapseTags
+      disabled: !this.overflowTagIndex || !this.collapseTags,
+      extCls: this.resolveClassName('select-tooltips')
     }]]), (0,external_vue_namespaceObject.createVNode)("input", {
       "ref": "inputRef",
       "style": inputStyle,
@@ -2537,7 +2550,7 @@ const debounce_namespaceObject = debounce_x({ ["default"]: () => __WEBPACK_EXTER
       "value": !this.filterable ? '' : this.value,
       "onInput": this.handleInput,
       "onKeydown": this.handleKeydown
-    }, null)]), (_this$$slots4 = this.$slots) === null || _this$$slots4 === void 0 || (_this$$slots4$suffix = _this$$slots4.suffix) === null || _this$$slots4$suffix === void 0 ? void 0 : _this$$slots4$suffix.call(_this$$slots4)]);
+    }, null)]), (_this$$slots5 = this.$slots) === null || _this$$slots5 === void 0 || (_this$$slots5$suffix = _this$$slots5.suffix) === null || _this$$slots5$suffix === void 0 ? void 0 : _this$$slots5$suffix.call(_this$$slots5)]);
   }
 }));
 ;// CONCATENATED MODULE: ../../packages/select/src/select.tsx
@@ -2649,7 +2662,11 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       type: Function
     },
     searchWithPinyin: shared_namespaceObject.PropTypes.bool.def(true),
-    highlightKeyword: shared_namespaceObject.PropTypes.bool.def(false) // 搜索高亮
+    highlightKeyword: shared_namespaceObject.PropTypes.bool.def(false),
+    trigger: {
+      type: String,
+      "default": 'default'
+    } // content显示和隐藏方式
   },
   emits: ['update:modelValue', 'change', 'toggle', 'clear', 'scroll-end', 'focus', 'blur', 'tag-remove', 'select', 'deselect', 'search-change'],
   setup: function setup(props, _ref) {
@@ -2689,7 +2706,9 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       filterOption = _toRefs.filterOption,
       searchWithPinyin = _toRefs.searchWithPinyin,
       highlightKeyword = _toRefs.highlightKeyword,
-      disableFocusBehavior = _toRefs.disableFocusBehavior;
+      disableFocusBehavior = _toRefs.disableFocusBehavior,
+      trigger = _toRefs.trigger;
+    var virtualRenderRef = (0,external_vue_namespaceObject.ref)(null);
     var localNoDataText = (0,external_vue_namespaceObject.computed)(function () {
       if (props.noDataText === undefined) {
         return t.value.noData;
@@ -2747,6 +2766,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         return pre;
       }, {});
     });
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var activeOptionValue = (0,external_vue_namespaceObject.ref)(); // 当前悬浮的option
     var listMap = (0,external_vue_namespaceObject.computed)(function () {
       return list.value.reduce(function (pre, item) {
@@ -2915,6 +2935,14 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       hidePopover = _usePopover.hidePopover,
       showPopover = _usePopover.showPopover,
       togglePopover = _usePopover.togglePopover;
+    var handleHidePopover = function handleHidePopover() {
+      if (trigger.value === 'manual') return;
+      hidePopover();
+    };
+    var handleShowPopover = function handleShowPopover() {
+      if (trigger.value === 'manual') return;
+      showPopover();
+    };
     // 输入框是否可以输入内容
     var isInput = (0,external_vue_namespaceObject.computed)(function () {
       return (filterable.value && inputSearch.value || allowCreate.value) && isPopoverShow.value;
@@ -2959,6 +2987,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       }
     };
     // 默认搜索方法
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var defaultSearchMethod = function defaultSearchMethod(searchValue, optionName) {
       var _toLowerCase2;
       var filterData = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -3012,7 +3041,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     };
     // 派发toggle事件
     var handleTogglePopover = function handleTogglePopover() {
-      if (isDisabled.value) return;
+      if (isDisabled.value || trigger.value === 'manual') return;
       handleFocus();
       togglePopover();
     };
@@ -3053,7 +3082,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           label: value
         }];
         emitChange(value);
-        hidePopover();
+        handleHidePopover();
       }
       customOptionName.value = '';
     };
@@ -3097,7 +3126,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         }];
         emitChange(option.optionID);
         emit('select', option.optionID);
-        hidePopover();
+        handleHidePopover();
         handleBlur();
       }
     };
@@ -3137,7 +3166,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       selected.value = [];
       emitChange(multiple.value ? [] : '');
       emit('clear', multiple.value ? [] : '');
-      hidePopover();
+      handleHidePopover();
     };
     var handleSelectedAllOptionMouseEnter = function handleSelectedAllOptionMouseEnter() {
       activeOptionValue.value = '';
@@ -3148,22 +3177,21 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         selected.value = [];
       } else {
         var _list$value;
-        var tmpSelected = [];
+        var tmpSelectedMap = new Map();
         options.value.forEach(function (option) {
-          if (option.disabled) return;
-          tmpSelected.push({
-            value: option.optionID,
-            label: option.optionName || option.optionID
-          });
+          if (option.disabled || tmpSelectedMap.has(option.optionID)) return;
+          tmpSelectedMap.set(option.optionID, option.optionName || option.optionID);
         });
         (_list$value = list.value) === null || _list$value === void 0 || _list$value.forEach(function (item) {
-          if (item.disabled) return;
-          tmpSelected.push({
-            value: item[idKey.value],
-            label: item[displayKey.value]
-          });
+          if (item.disabled || tmpSelectedMap.has(item[idKey.value])) return;
+          tmpSelectedMap.set(item[idKey.value], item[displayKey.value]);
+        });
+        selected.value = Array.from(tmpSelectedMap.keys()).map(function (key) {
+          return {
+            value: key,
+            label: tmpSelectedMap.get(key)
+          };
         });
-        selected.value = tmpSelected;
       }
       emitChange(selected.value.map(function (item) {
         return item.value;
@@ -3248,7 +3276,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           };
         }));
       } else {
-        if (modelValue.value !== undefined || allowEmptyValues.value.includes(modelValue.value)) {
+        if (modelValue.value || allowEmptyValues.value.includes(modelValue.value)) {
           selected.value = [{
             value: modelValue.value,
             label: handleGetLabelByValue(modelValue.value)
@@ -3258,6 +3286,15 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         }
       }
     };
+    // 手动设置selected值
+    var setSelected = function setSelected(data) {
+      selected.value = data.map(function (item) {
+        return {
+          label: item[displayKey.value],
+          value: item[idKey.value]
+        };
+      });
+    };
     // 处理键盘事件
     var handleDocumentKeydown = function handleDocumentKeydown(e) {
       if (!isPopoverShow.value || isEnableVirtualRender.value) return;
@@ -3315,7 +3352,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       var event = _ref2.event;
       var target = event.target;
       if ((_triggerRef$value = triggerRef.value) !== null && _triggerRef$value !== void 0 && _triggerRef$value.contains(target) || triggerRef.value === target) return;
-      hidePopover();
+      handleHidePopover();
       handleBlur();
     };
     (0,external_vue_namespaceObject.provide)(selectKey, (0,external_vue_namespaceObject.reactive)({
@@ -3336,10 +3373,14 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     (0,external_vue_namespaceObject.onMounted)(function () {
       handleSetSelectedData();
       setTimeout(function () {
-        showOnInit.value && showPopover();
+        showOnInit.value && handleShowPopover();
         autoFocus.value && focusInput();
       });
     });
+    var handlePopoverShown = function handlePopoverShown() {
+      var _virtualRenderRef$val;
+      (_virtualRenderRef$val = virtualRenderRef.value) === null || _virtualRenderRef$val === void 0 || _virtualRenderRef$val.scrollTo(0, 1);
+    };
     return {
       t: t,
       selected: selected,
@@ -3397,15 +3438,20 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       localSelectAllText: localSelectAllText,
       resolveClassName: resolveClassName,
       handleCreateCustomOption: handleCreateCustomOption,
+      handlePopoverShown: handlePopoverShown,
       virtualLineHeight: virtualLineHeight,
       isEnableVirtualRender: isEnableVirtualRender,
-      preloadItemCount: preloadItemCount
+      preloadItemCount: preloadItemCount,
+      virtualRenderRef: virtualRenderRef,
+      setSelected: setSelected
     };
   },
   render: function render() {
     var _this = this;
     var selectClass = (0,shared_namespaceObject.classes)(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(this.resolveClassName('select')), true), 'popover-show', this.isPopoverShow), 'is-disabled', this.isDisabled), 'is-focus', this.isFocus), 'is-filterable', this.filterable), this.size, true), this.behavior, true));
+    // 右侧ICON
     var suffixIcon = function suffixIcon() {
+      var _this$$slots, _this$$slots2, _this$$slots2$suffix;
       if (_this.loading) {
         return (0,external_vue_namespaceObject.createVNode)(loading_namespaceObject["default"], {
           "class": "spinner",
@@ -3421,12 +3467,14 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           "onClick": _this.handleClear
         }, null);
       }
-      return (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.AngleUp, {
-        "class": "angle-up"
+      return (_this$$slots = _this.$slots) !== null && _this$$slots !== void 0 && _this$$slots.suffix ? (0,external_vue_namespaceObject.createVNode)("span", {
+        "class": "angle-down"
+      }, [(_this$$slots2 = _this.$slots) === null || _this$$slots2 === void 0 || (_this$$slots2$suffix = _this$$slots2.suffix) === null || _this$$slots2$suffix === void 0 ? void 0 : _this$$slots2$suffix.call(_this$$slots2)]) : (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.AngleDown, {
+        "class": "angle-down"
       }, null);
     };
     var renderPrefix = function renderPrefix() {
-      var _this$$slots;
+      var _this$$slots3;
       if (_this.prefix) {
         return function () {
           return (0,external_vue_namespaceObject.createVNode)("div", {
@@ -3434,9 +3482,9 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           }, [(0,external_vue_namespaceObject.createVNode)("span", null, [_this.prefix])]);
         };
       }
-      return (_this$$slots = _this.$slots) !== null && _this$$slots !== void 0 && _this$$slots.prefix ? function () {
-        var _this$$slots2, _this$$slots2$prefix;
-        return (_this$$slots2 = _this.$slots) === null || _this$$slots2 === void 0 || (_this$$slots2$prefix = _this$$slots2.prefix) === null || _this$$slots2$prefix === void 0 ? void 0 : _this$$slots2$prefix.call(_this$$slots2);
+      return (_this$$slots3 = _this.$slots) !== null && _this$$slots3 !== void 0 && _this$$slots3.prefix ? function () {
+        var _this$$slots4, _this$$slots4$prefix;
+        return (_this$$slots4 = _this.$slots) === null || _this$$slots4 === void 0 || (_this$$slots4$prefix = _this$$slots4.prefix) === null || _this$$slots4$prefix === void 0 ? void 0 : _this$$slots4$prefix.call(_this$$slots4);
       } : undefined;
     };
     // 全选
@@ -3467,9 +3515,9 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     };
     // 默认trigger输入框渲染
     var renderTriggerInput = function renderTriggerInput() {
-      var _this$$slots5;
+      var _this$$slots9;
       if (_this.multipleMode === 'tag') {
-        var _this$$slots3;
+        var _this$$slots5, _this$$slots7;
         return (0,external_vue_namespaceObject.createVNode)(selectTagInput, {
           "ref": "selectTagInputRef",
           "modelValue": _this.customOptionName,
@@ -3487,12 +3535,16 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           "onRemove": _this.handleDeleteTag
         }, {
           prefix: renderPrefix(),
-          "default": ((_this$$slots3 = _this.$slots) === null || _this$$slots3 === void 0 ? void 0 : _this$$slots3.tag) && function () {
-            var _this$$slots4;
-            return (_this$$slots4 = _this.$slots) === null || _this$$slots4 === void 0 ? void 0 : _this$$slots4.tag({
+          "default": ((_this$$slots5 = _this.$slots) === null || _this$$slots5 === void 0 ? void 0 : _this$$slots5.tag) && function () {
+            var _this$$slots6;
+            return (_this$$slots6 = _this.$slots) === null || _this$$slots6 === void 0 ? void 0 : _this$$slots6.tag({
               selected: _this.selected
             });
           },
+          tagRender: ((_this$$slots7 = _this.$slots) === null || _this$$slots7 === void 0 ? void 0 : _this$$slots7.tagRender) && function (item) {
+            var _this$$slots8;
+            return (_this$$slots8 = _this.$slots) === null || _this$$slots8 === void 0 ? void 0 : _this$$slots8.tagRender(item);
+          },
           suffix: function suffix() {
             return suffixIcon();
           }
@@ -3514,10 +3566,10 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         "onInput": _this.handleInputChange
       }, _this.prefix ? {
         prefix: _this.prefix
-      } : null), select_objectSpread(select_objectSpread({}, typeof ((_this$$slots5 = _this.$slots) === null || _this$$slots5 === void 0 ? void 0 : _this$$slots5.prefix) === 'function' ? {
+      } : null), select_objectSpread(select_objectSpread({}, typeof ((_this$$slots9 = _this.$slots) === null || _this$$slots9 === void 0 ? void 0 : _this$$slots9.prefix) === 'function' ? {
         prefix: function prefix() {
-          var _this$$slots6, _this$$slots6$prefix;
-          return (_this$$slots6 = _this.$slots) === null || _this$$slots6 === void 0 || (_this$$slots6$prefix = _this$$slots6.prefix) === null || _this$$slots6$prefix === void 0 ? void 0 : _this$$slots6$prefix.call(_this$$slots6);
+          var _this$$slots10, _this$$slots10$prefix;
+          return (_this$$slots10 = _this.$slots) === null || _this$$slots10 === void 0 || (_this$$slots10$prefix = _this$$slots10.prefix) === null || _this$$slots10$prefix === void 0 ? void 0 : _this$$slots10$prefix.call(_this$$slots10);
         }
       } : null), {}, {
         suffix: function suffix() {
@@ -3527,7 +3579,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     };
     // 渲染trigger
     var renderSelectTrigger = function renderSelectTrigger() {
-      var _this$$slots7, _this$$slots7$trigger;
+      var _this$$slots11, _this$$slots11$trigge;
       return (0,external_vue_namespaceObject.createVNode)("div", {
         "ref": "triggerRef",
         "style": {
@@ -3537,22 +3589,28 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         "onClick": _this.handleTogglePopover,
         "onMouseenter": _this.setHover,
         "onMouseleave": _this.cancelHover
-      }, [((_this$$slots7 = _this.$slots) === null || _this$$slots7 === void 0 || (_this$$slots7$trigger = _this$$slots7.trigger) === null || _this$$slots7$trigger === void 0 ? void 0 : _this$$slots7$trigger.call(_this$$slots7, {
+      }, [((_this$$slots11 = _this.$slots) === null || _this$$slots11 === void 0 || (_this$$slots11$trigge = _this$$slots11.trigger) === null || _this$$slots11$trigge === void 0 ? void 0 : _this$$slots11$trigge.call(_this$$slots11, {
         selected: _this.selected
       })) || renderTriggerInput()]);
     };
     // 渲染列表模式
     var renderList = function renderList() {
       return _this.isEnableVirtualRender ? (0,external_vue_namespaceObject.createVNode)(virtual_render_namespaceObject["default"], {
+        "ref": "virtualRenderRef",
         "height": _this.virtualHeight,
         "lineHeight": _this.virtualLineHeight,
         "list": _this.filterList,
-        "preloadItemCount": _this.preloadItemCount
+        "preloadItemCount": _this.preloadItemCount,
+        "scrollbar": {
+          enabled: true,
+          size: 'small'
+        }
       }, {
         "default": function _default(_ref3) {
-          var _this$$slots8, _this$$slots9;
+          var _this$$slots12, _this$$slots13;
           var data = _ref3.data;
-          var optionRender = ((_this$$slots8 = _this.$slots) === null || _this$$slots8 === void 0 ? void 0 : _this$$slots8.optionRender) || ((_this$$slots9 = _this.$slots) === null || _this$$slots9 === void 0 ? void 0 : _this$$slots9.virtualScrollRender);
+          // 兼容以前slots
+          var optionRender = ((_this$$slots12 = _this.$slots) === null || _this$$slots12 === void 0 ? void 0 : _this$$slots12.optionRender) || ((_this$$slots13 = _this.$slots) === null || _this$$slots13 === void 0 ? void 0 : _this$$slots13.virtualScrollRender);
           return data.map(function (item) {
             return (0,external_vue_namespaceObject.createVNode)(src_option, {
               "id": item[_this.idKey],
@@ -3568,15 +3626,16 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           });
         }
       }) : _this.filterList.map(function (item) {
-        var _this$$slots10;
+        var _this$$slots14, _this$$slots15;
+        // 兼容以前slots
+        var optionRender = ((_this$$slots14 = _this.$slots) === null || _this$$slots14 === void 0 ? void 0 : _this$$slots14.optionRender) || ((_this$$slots15 = _this.$slots) === null || _this$$slots15 === void 0 ? void 0 : _this$$slots15.virtualScrollRender);
         return (0,external_vue_namespaceObject.createVNode)(src_option, {
           "id": item[_this.idKey],
           "key": item[_this.idKey],
           "name": item[_this.displayKey]
-        }, (_this$$slots10 = _this.$slots) !== null && _this$$slots10 !== void 0 && _this$$slots10.optionRender ? {
+        }, typeof optionRender === 'function' ? {
           "default": function _default() {
-            var _this$$slots11, _this$$slots11$option;
-            return (_this$$slots11 = _this.$slots) === null || _this$$slots11 === void 0 || (_this$$slots11$option = _this$$slots11.optionRender) === null || _this$$slots11$option === void 0 ? void 0 : _this$$slots11$option.call(_this$$slots11, {
+            return optionRender({
               item: item
             });
           }
@@ -3585,7 +3644,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     };
     // 渲染内容
     var renderSelectContent = function renderSelectContent() {
-      var _this$$slots12, _this$$slots12$defaul, _this$$slots13, _this$$slots14;
+      var _this$$slots16, _this$$slots16$defaul, _this$$slots17, _this$$slots18;
       return (0,external_vue_namespaceObject.createVNode)("div", {
         "ref": "contentRef",
         "class": _this.resolveClassName('select-content-wrapper')
@@ -3621,7 +3680,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         "onScroll": _this.handleScroll
       }, [(0,external_vue_namespaceObject.createVNode)("ul", {
         "class": _this.resolveClassName('select-options')
-      }, [renderSelectAll(), renderList(), (_this$$slots12 = _this.$slots) === null || _this$$slots12 === void 0 || (_this$$slots12$defaul = _this$$slots12["default"]) === null || _this$$slots12$defaul === void 0 ? void 0 : _this$$slots12$defaul.call(_this$$slots12), _this.scrollLoading && (0,external_vue_namespaceObject.createVNode)("li", {
+      }, [renderSelectAll(), renderList(), (_this$$slots16 = _this.$slots) === null || _this$$slots16 === void 0 || (_this$$slots16$defaul = _this$$slots16["default"]) === null || _this$$slots16$defaul === void 0 ? void 0 : _this$$slots16$defaul.call(_this$$slots16), _this.scrollLoading && (0,external_vue_namespaceObject.createVNode)("li", {
         "class": _this.resolveClassName('select-options-loading')
       }, [(0,external_vue_namespaceObject.createVNode)(loading_namespaceObject["default"], {
         "class": "spinner mr5",
@@ -3629,14 +3688,15 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         "mode": "spin",
         "size": "mini",
         "theme": "primary"
-      }, null), (0,external_vue_namespaceObject.createVNode)("span", null, [_this.localLoadingText])])])]), ((_this$$slots13 = _this.$slots) === null || _this$$slots13 === void 0 ? void 0 : _this$$slots13.extension) && (0,external_vue_namespaceObject.createVNode)("div", {
+      }, null), (0,external_vue_namespaceObject.createVNode)("span", null, [_this.localLoadingText])])])]), ((_this$$slots17 = _this.$slots) === null || _this$$slots17 === void 0 ? void 0 : _this$$slots17.extension) && (0,external_vue_namespaceObject.createVNode)("div", {
         "class": _this.resolveClassName('select-extension')
-      }, [(_this$$slots14 = _this.$slots) === null || _this$$slots14 === void 0 ? void 0 : _this$$slots14.extension()])])]);
+      }, [(_this$$slots18 = _this.$slots) === null || _this$$slots18 === void 0 ? void 0 : _this$$slots18.extension()])])]);
     };
     return (0,external_vue_namespaceObject.createVNode)("div", {
       "class": selectClass
     }, [(0,external_vue_namespaceObject.createVNode)(popover_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)(this.popoverConfig, {
       "ref": "popoverRef",
+      "onAfterShow": this.handlePopoverShown,
       "onClickoutside": this.handleClickOutside
     }), {
       "default": function _default() {

package/lib/select/option.d.ts

@@ -1,8 +1,7 @@
 import { VNode } from 'vue';
-import { SelectedTypeEnum } from '../shared';
 declare const _default: import("vue").DefineComponent<{
     id: {
-        type: (ObjectConstructor | NumberConstructor | StringConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         require: boolean;
     };
     name: import("vue-types").VueTypeDef<string | number>;
@@ -21,9 +20,9 @@ declare const _default: import("vue").DefineComponent<{
     multiple: import("vue").ComputedRef<boolean>;
     isHover: import("vue").ComputedRef<boolean>;
     showSelectedIcon: import("vue").ComputedRef<boolean>;
-    selectedStyle: import("vue").ComputedRef<SelectedTypeEnum>;
+    selectedStyle: import("vue").ComputedRef<"checkbox" | "check">;
     optionName: import("vue").ComputedRef<string | number>;
-    optionID: import("vue").ComputedRef<unknown>;
+    optionID: import("vue").ComputedRef<string | number>;
     highlightKeyword: import("vue").ComputedRef<boolean>;
     handleOptionClick: () => void;
     handleMouseEnter: () => void;
@@ -32,7 +31,7 @@ declare const _default: import("vue").DefineComponent<{
     visible: import("vue").Ref<boolean>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     id: {
-        type: (ObjectConstructor | NumberConstructor | StringConstructor)[];
+        type: (NumberConstructor | StringConstructor)[];
         require: boolean;
     };
     name: import("vue-types").VueTypeDef<string | number>;