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

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.44";
 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/locale/index.d.ts

@@ -1,3 +1,4 @@
 export { default as en } from './lang/en';
 export type { Language } from './lang/en';
+export { default as jp } from './lang/ja-jp';
 export { default as zhCn } from './lang/zh-cn';

package/lib/locale/index.js

@@ -26,6 +26,7 @@ var __webpack_exports__ = {};
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
   en: () => (/* reexport */ lang_en),
+  jp: () => (/* reexport */ ja_jp),
   zhCn: () => (/* reexport */ zh_cn)
 });
 
@@ -237,6 +238,171 @@ var en = {
   }
 };
 /* harmony default export */ const lang_en = (en);
+;// CONCATENATED MODULE: ../../packages/locale/src/lang/ja-jp.ts
+/*
+ * Tencent is pleased to support the open source community by making
+ * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) is licensed under the MIT License.
+ *
+ * License for 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition):
+ *
+ * ---------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+var jp = {
+  lang: 'ja',
+  steps: {
+    step1: 'ステップ1',
+    step2: 'ステップ2',
+    step3: 'ステップ3'
+  },
+  datePicker: {
+    selectDate: '日付を選択',
+    selectTime: '時間を選択',
+    clear: 'クリア',
+    ok: 'OK',
+    weekdays: {
+      sun: '日',
+      mon: '月',
+      tue: '火',
+      wed: '水',
+      thu: '木',
+      fri: '金',
+      sat: '土'
+    },
+    hour: '時間',
+    min: '分',
+    sec: '秒',
+    toNow: '現在まで'
+  },
+  dialog: {
+    ok: 'OK',
+    cancel: 'キャンセル',
+    prev: '前へ',
+    next: '次へ'
+  },
+  popConfirm: {
+    ok: 'OK',
+    cancel: 'キャンセル'
+  },
+  form: {
+    notBeEmpty: '空にできません',
+    incorrectFormat: '形式が正しくありません',
+    max: '最大値',
+    min: '最小値',
+    maxLen: '最大長',
+    verifyError: '検証エラー'
+  },
+  pagination: {
+    eachPage: '各ページ',
+    strip: '',
+    total: '合計'
+  },
+  process: {
+    step1: 'ステップ1',
+    step2: 'ステップ2',
+    step3: 'ステップ3',
+    step4: 'ステップ4'
+  },
+  searchSelect: {
+    pleaseSelect: '選択してください',
+    loading: 'ロード中...',
+    filterQueryMustHasValue: 'フィルタークエリに値を含める必要があります',
+    ok: 'OK',
+    cancel: 'キャンセル',
+    or: 'または',
+    and: 'そして',
+    logical: '論理:'
+  },
+  select: {
+    noData: 'データなし',
+    noMatchedData: '一致するデータがありません',
+    loading: '読み込み中...',
+    pleaseSelect: '選んでください',
+    enterKeywords: 'キーワードを入力してください',
+    all: 'すべて',
+    selectAll: 'すべて選択'
+  },
+  table: {
+    emptyText: 'データがありません',
+    confirm: '確認',
+    reset: 'リセット',
+    sort: 'ソート',
+    setting: {
+      title: 'テーブル設定',
+      fields: {
+        title: '表示フィールド設定',
+        subtitle: function subtitle(max) {
+          return "\uFF08".concat(max, "\u30D5\u30A3\u30FC\u30EB\u30C9\u6700\u5927\uFF09");
+        },
+        selectAll: 'すべて選択'
+      },
+      lineHeight: {
+        title: 'テーブル行の高さ',
+        small: '小',
+        medium: '中',
+        large: '大'
+      },
+      options: {
+        ok: 'OK',
+        cancel: 'キャンセル'
+      }
+    }
+  },
+  transfer: {
+    sourceList: 'ソースリスト',
+    targetList: 'ターゲットリスト',
+    removeAll: 'すべて削除',
+    selectAll: 'すべて選択',
+    noData: 'データがありません',
+    noSelected: '選択されていません',
+    search: '検索'
+  },
+  upload: {
+    uploadSuccess: 'アップロード成功',
+    uploadFailed: 'アップロード失敗',
+    drapFileOr: 'ここにファイルをドラッグまたは',
+    clickUpload: 'クリックしてアップロード',
+    uploadLabel: 'ファイルをアップロード'
+  },
+  input: {
+    placeholder: '入力してください',
+    maxlengthLimitTips: '文字数制限に達しました'
+  },
+  tagInput: {
+    placeholder: '入力してEnterキーで終了'
+  },
+  message: {
+    assistant: 'アシスタント',
+    details: '詳細',
+    copySuccess: 'コピー成功',
+    copyFailed: 'コピー失敗'
+  },
+  cascader: {
+    pleaseSelect: '選択してください',
+    noData: 'データがありません',
+    emptyText: 'データがありません'
+  },
+  versionLog: {
+    current: '現在のバージョン'
+  }
+};
+/* harmony default export */ const ja_jp = (jp);
 ;// CONCATENATED MODULE: ../../packages/locale/src/lang/zh-cn.ts
 /*
  * Tencent is pleased to support the open source community by making
@@ -473,6 +639,8 @@ var zhCn = {
  */
 
 
+
 var __webpack_exports__en = __webpack_exports__.en;
+var __webpack_exports__jp = __webpack_exports__.jp;
 var __webpack_exports__zhCn = __webpack_exports__.zhCn;
-export { __webpack_exports__en as en, __webpack_exports__zhCn as zhCn };
+export { __webpack_exports__en as en, __webpack_exports__jp as jp, __webpack_exports__zhCn as zhCn };

package/lib/locale/lang/ja-jp.d.ts

@@ -0,0 +1,3 @@
+import { Language as EnLanguage } from './en';
+declare const jp: EnLanguage;
+export default jp;

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.44",
   "workspaces": [
     "packages/**",
     "scripts/cli",