bkui-vue 2.0.2-beta.42 → 2.0.2-beta.43

package/lib/dialog/dialog.css

@@ -9,6 +9,13 @@
 .bk-infobox .bk-modal-wrapper .bk-modal-body {
   min-height: 176px;
 }
+.bk-infobox .bk-modal-wrapper .bk-modal-body .bk-modal-content {
+  color: #63656e;
+  font-size: 14px;
+}
+.bk-infobox.no-content-infobox .bk-modal-content {
+  display: none;
+}
 .bk-infobox-header {
   padding-top: 24px;
 }

package/lib/dialog/dialog.variable.css

@@ -140,6 +140,13 @@
 .bk-infobox .bk-modal-wrapper .bk-modal-body {
   min-height: 176px;
 }
+.bk-infobox .bk-modal-wrapper .bk-modal-body .bk-modal-content {
+  color: #63656e;
+  font-size: 14px;
+}
+.bk-infobox.no-content-infobox .bk-modal-content {
+  display: none;
+}
 .bk-infobox-header {
   padding-top: 24px;
 }

package/lib/index.js

@@ -3,5 +3,5 @@ export * from './hooks';
 export { default } from './preset';
 export * from './config-provider';
 export * from './directives';
-export const version = "2.0.2-beta.42";
+export const version = "2.0.2-beta.43";
 window.__bkui_vue_version__ = version;

package/lib/info-box/index.js

@@ -782,7 +782,11 @@ var genDefaultState = function genDefaultState() {
       };
       return (0,external_vue_namespaceObject.createVNode)(modal_namespaceObject["default"], {
         "width": renderWidth(),
-        "class": [resolveClassName('infobox'), state["class"]],
+        "class": [_defineProperty({}, resolveClassName('infobox'), true),
+        // 处理无提示内容modal-content还会占位高度
+        {
+          'no-content-infobox': !state.content
+        }, state["class"]],
         "animateType": "fadein",
         "closeIcon": state.closeIcon,
         "isShow": isShow.value,

package/lib/info-box/info-box.css

@@ -9,6 +9,13 @@
 .bk-infobox .bk-modal-wrapper .bk-modal-body {
   min-height: 176px;
 }
+.bk-infobox .bk-modal-wrapper .bk-modal-body .bk-modal-content {
+  color: #63656e;
+  font-size: 14px;
+}
+.bk-infobox.no-content-infobox .bk-modal-content {
+  display: none;
+}
 .bk-infobox-header {
   padding-top: 24px;
 }

package/lib/info-box/info-box.less

@@ -1,7 +1,7 @@
 @import '../styles/themes/themes.less';
 
 .@{bk-prefix}-infobox {
-  font-size: 12px;
+  font-size: @font-size-base;
 
   .@{bk-prefix}-modal-wrapper {
     top: 50%;
@@ -10,9 +10,20 @@
 
     .@{bk-prefix}-modal-body {
       min-height: 176px;
+
+      .@{bk-prefix}-modal-content { 
+        color: @default-color;
+        font-size: @font-size-medium;
+      }
     }
 
   }
+
+  &.no-content-infobox {
+    .@{bk-prefix}-modal-content {
+      display: none;
+    }
+  }
 }
 
 .@{bk-prefix}-infobox-header {

package/lib/info-box/info-box.variable.css

@@ -130,7 +130,7 @@
   --sub-title-bg-color: #f5f6fa;
 }
 .bk-infobox {
-  font-size: 12px;
+  font-size: var(--font-size-base);
 }
 .bk-infobox .bk-modal-wrapper {
   top: 50%;
@@ -140,6 +140,13 @@
 .bk-infobox .bk-modal-wrapper .bk-modal-body {
   min-height: 176px;
 }
+.bk-infobox .bk-modal-wrapper .bk-modal-body .bk-modal-content {
+  color: var(--default-color);
+  font-size: var(--font-size-medium);
+}
+.bk-infobox.no-content-infobox .bk-modal-content {
+  display: none;
+}
 .bk-infobox-header {
   padding-top: 24px;
 }

package/lib/modal/modal.css

@@ -9,6 +9,13 @@
 .bk-infobox .bk-modal-wrapper .bk-modal-body {
   min-height: 176px;
 }
+.bk-infobox .bk-modal-wrapper .bk-modal-body .bk-modal-content {
+  color: #63656e;
+  font-size: 14px;
+}
+.bk-infobox.no-content-infobox .bk-modal-content {
+  display: none;
+}
 .bk-infobox-header {
   padding-top: 24px;
 }

package/lib/modal/modal.variable.css

@@ -140,6 +140,13 @@
 .bk-infobox .bk-modal-wrapper .bk-modal-body {
   min-height: 176px;
 }
+.bk-infobox .bk-modal-wrapper .bk-modal-body .bk-modal-content {
+  color: #63656e;
+  font-size: 14px;
+}
+.bk-infobox.no-content-infobox .bk-modal-content {
+  display: none;
+}
 .bk-infobox-header {
   padding-top: 24px;
 }

package/lib/select/index.d.ts

@@ -388,7 +388,7 @@ declare const BkSelect: {
         inputRef: import("vue").Ref<HTMLElement>;
         triggerRef: import("vue").Ref<HTMLElement>;
         contentRef: import("vue").Ref<HTMLElement>;
-        searchRef: import("vue").Ref<HTMLElement>;
+        searchRef: import("vue").Ref<HTMLInputElement>;
         scrollContainerRef: import("vue").Ref<HTMLElement>;
         selectTagInputRef: import("vue").Ref<import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
             selected: {
@@ -1572,7 +1572,7 @@ declare const BkSelect: {
         inputRef: import("vue").Ref<HTMLElement>;
         triggerRef: import("vue").Ref<HTMLElement>;
         contentRef: import("vue").Ref<HTMLElement>;
-        searchRef: import("vue").Ref<HTMLElement>;
+        searchRef: import("vue").Ref<HTMLInputElement>;
         scrollContainerRef: import("vue").Ref<HTMLElement>;
         selectTagInputRef: import("vue").Ref<import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
             selected: {
@@ -2391,7 +2391,7 @@ declare const BkSelect: {
     inputRef: import("vue").Ref<HTMLElement>;
     triggerRef: import("vue").Ref<HTMLElement>;
     contentRef: import("vue").Ref<HTMLElement>;
-    searchRef: import("vue").Ref<HTMLElement>;
+    searchRef: import("vue").Ref<HTMLInputElement>;
     scrollContainerRef: import("vue").Ref<HTMLElement>;
     selectTagInputRef: import("vue").Ref<import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
         selected: {

package/lib/select/index.js

@@ -4292,6 +4292,10 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       emit('change', val, modelValue.value);
       // 重置Selected 以model-value为主
       handleSetSelectedData();
+      if (multiple.value) {
+        // 多选时enter之后变成tag不需要保存当前值
+        customOptionName.value = '';
+      }
     };
     // 派发toggle事件
     var handleTogglePopover = function handleTogglePopover() {
@@ -4317,7 +4321,6 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
       if (filterable.value && matchedOption) {
         // 开启搜索后，正好匹配到自定义选项，则不进行创建操作
         handleOptionSelected(matchedOption);
-        customOptionName.value = '';
         return;
       }
       var data = optionsMap.value.get(value);
@@ -4338,7 +4341,6 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         emitChange(value);
         handleHidePopover();
       }
-      customOptionName.value = '';
     };
     // Option点击事件
     var handleOptionSelected = function handleOptionSelected(option) {
@@ -4379,9 +4381,6 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           label: option.optionName || option.optionID,
           value: option.optionID
         }];
-        if (filterable.value && allowCreate.value) {
-          customOptionName.value = '';
-        }
         emitChange(option.optionID);
         emit('select', option.optionID);
         handleHidePopover();
@@ -4429,6 +4428,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
     var handleClear = function handleClear(e) {
       e.stopPropagation();
       selected.value = [];
+      customOptionName.value = '';
       clearMultipleInputValue();
       emitChange(multiple.value ? [] : '');
       emit('clear', multiple.value ? [] : '');
@@ -4605,9 +4605,10 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         case 'NumpadEnter':
         case 'Enter':
           {
+            var _searchRef$value2;
             var value = e.target.value;
             // 搜索和创建的时候不触发enter事件
-            if (allowCreate.value && value || e.target === searchRef.value) return;
+            if (allowCreate.value && value || e.target === searchRef.value && (_searchRef$value2 = searchRef.value) !== null && _searchRef$value2 !== void 0 && _searchRef$value2.value) return;
             var option = optionsMap.value.get(activeOptionValue.value);
             handleOptionSelected(option);
             break;
@@ -4730,7 +4731,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
           "theme": "primary"
         }, null);
       }
-      if (_this.clearable && _this.isHover && _this.selected.length && !_this.isDisabled) {
+      if (_this.clearable && _this.isHover && _this.selected.length && !_this.isDisabled || _this.allowCreate && _this.isHover && _this.customOptionName && !_this.isDisabled) {
         return (0,external_vue_namespaceObject.createVNode)(icon_namespaceObject.Close, {
           "class": "clear-icon",
           "onClick": _this.handleClear
@@ -4832,7 +4833,7 @@ function select_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { v
         "ref": "inputRef",
         "behavior": _this.behavior,
         "disabled": _this.isDisabled,
-        "modelValue": _this.isInput ? _this.customOptionName : _this.selectedLabel.join(','),
+        "modelValue": _this.isInput && _this.customOptionName ? _this.customOptionName : _this.selectedLabel.join(','),
         "placeholder": _this.isInput ? _this.selectedLabel.join(',') || _this.localPlaceholder : _this.localPlaceholder,
         "readonly": !_this.isInput,
         "selectReadonly": true,

package/lib/select/select.d.ts

@@ -375,7 +375,7 @@ declare const _default: import("vue").DefineComponent<{
     inputRef: import("vue").Ref<HTMLElement>;
     triggerRef: import("vue").Ref<HTMLElement>;
     contentRef: import("vue").Ref<HTMLElement>;
-    searchRef: import("vue").Ref<HTMLElement>;
+    searchRef: import("vue").Ref<HTMLInputElement>;
     scrollContainerRef: import("vue").Ref<HTMLElement>;
     selectTagInputRef: import("vue").Ref<import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
         selected: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "2.0.2-beta.42",
+  "version": "2.0.2-beta.43",
   "workspaces": [
     "packages/**",
     "scripts/cli",