Merge pull request #421 from TencentBlueKing/staging

feat: bump to 2.5.7
TencentBlueKing · Jul 24, 2023 · 61c4746 · 61c4746
2 parents 689cdf3 + 56d811c
commit 61c4746
Show file tree

Hide file tree

Showing 31 changed files with 1,237 additions and 171 deletions.
diff --git a/example/components.config.js b/example/components.config.js
@@ -198,7 +198,7 @@ module.exports = {
         },
         {
           id: 'searchSelect',
-          name: 'SearchSelect 查询选择器'
+          name: 'Search 查询搜索'
         },
         {
           id: 'slider',

diff --git a/example/components/changelog/readme.md b/example/components/changelog/readme.md
@@ -8,6 +8,20 @@
 
 <div class="changelog-wrapper">
 
+### 2.5.7 {page=#/changelog}
+###### 2023.07.24
+
+* **[add]**:
+    - [Select 下拉选框](#/select) 多选新增 [checkbox 模式](#/select?anchor=duo-xuan)
+    - [SearchSelect 查询选择器](#/searchselect) 新增 [checkbox 模式](#/search-select?anchor=checkbox-mo-shi)
+    - [SearchSelect 查询选择器](#/searchselect) 新增推荐搜索选择的功能
+    - [Message 消息提示](#/message) 支持[规范化高阶使用配置](#/message?anchor=gao-jie-yong-fa)
+    - [Message 消息提示](#/message) 支持自定义 z-index
+* **[fix]**:
+    - [Cascade 级联选框](#/cascade) 修复 filterable 和 check-any-level 卡死的问题 [#407](https://github.com/TencentBlueKing/bkui-vue2/issues/407)
+
+---
+
 ### 2.5.6 {page=#/changelog}
 ###### 2023.06.21
 

diff --git a/example/components/message/readme.md b/example/components/message/readme.md
@@ -89,6 +89,52 @@
                     ellipsisLine: 2,
                     ellipsisCopy: true
                 })
+            },
+            handleAdvancedMessage () {
+                this.$bkMessage({
+                    message: {
+                    code: 10086,
+                    overview: '算法载入失败。',
+                    suggestion: '请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。',
+                    type: 'key-value',
+                    details: `{
+                          "code": "UNAUTHENTICATED",
+                          "message": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code1": "UNAUTHENTICATED",
+                          "message1": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code2": "UNAUTHENTICATED",
+                          "message2": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code3": "UNAUTHENTICATED",
+                          "message3": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code4": "UNAUTHENTICATED",
+                          "message4": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code5": "UNAUTHENTICATED",
+                          "message5": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code6": "UNAUTHENTICATED",
+                          "message6": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code7": "UNAUTHENTICATED",
+                          "message7": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code8": "UNAUTHENTICATED",
+                          "message8": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code9": "UNAUTHENTICATED",
+                          "message9": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code10": "UNAUTHENTICATED",
+                          "message10": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code81": "UNAUTHENTICATED",
+                          "message81": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code91": "UNAUTHENTICATED",
+                          "message91": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code101": "UNAUTHENTICATED",
+                          "message101": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)"
+                        }`,
+                    assistant: '',
+              },
+                    theme: 'error',
+                    offsetY: 80,
+                    ellipsisLine: 2,
+                    ellipsisCopy: true
+                })
+
             }
         }
     }
@@ -348,7 +394,7 @@
 
 
 
-### 内容超出被截断时显示复制按钮
+### 内容超出被截断时显示复制按钮 {page=#/message}
 
 :::demo 内容超出被截断时显示复制按钮
 ```html
@@ -386,6 +432,79 @@
     }
 </script>
 ```
+:::
+
+### 高阶用法 {page=#/message}
+
+:::demo 高阶用法
+```html
+<template>
+    <bk-button type="primary" @click="handleAdvancedMessage">高阶用法</bk-button>
+</template>
+
+<script>
+    import { bkButton } from '{{BASE_LIB_NAME}}'
+
+    export default {
+        components: {
+            bkButton
+        },
+        data () {
+            return {
+                message: {
+                    code: 10086,
+                    overview: '算法载入失败。',
+                    suggestion: '请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。请确认文件内容是否正确，并和所选框架匹配。',
+                    type,
+                    details: `{
+                          "code": "UNAUTHENTICATED",
+                          "message": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code1": "UNAUTHENTICATED",
+                          "message1": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code2": "UNAUTHENTICATED",
+                          "message2": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code3": "UNAUTHENTICATED",
+                          "message3": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code4": "UNAUTHENTICATED",
+                          "message4": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code5": "UNAUTHENTICATED",
+                          "message5": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code6": "UNAUTHENTICATED",
+                          "message6": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code7": "UNAUTHENTICATED",
+                          "message7": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code8": "UNAUTHENTICATED",
+                          "message8": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code9": "UNAUTHENTICATED",
+                          "message9": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code10": "UNAUTHENTICATED",
+                          "message10": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code81": "UNAUTHENTICATED",
+                          "message81": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code91": "UNAUTHENTICATED",
+                          "message91": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)",
+                          "code101": "UNAUTHENTICATED",
+                          "message101": "用户未登录或登录态失效，请使用登录链接重新登录 (UNAUTHORIZED)"
+                        }`,
+                    assistant: '',
+              },
+            }
+        },
+        methods: {
+            handleCopyMessage () {
+                this.$bkMessage({
+                    message: this.message,
+                    theme: 'error',
+                    offsetY: 80,
+                    ellipsisLine: 2,
+                    ellipsisCopy: true
+                })
+            }
+        }
+    }
+</script>
+```
+
 :::
 ### 属性 {page=#/message}
 | 参数 | 说明 | 类型 | 可选值 | 默认值 |

diff --git a/example/components/navigation/demo.vue b/example/components/navigation/demo.vue
@@ -156,7 +156,7 @@
 </template>
 
 <script>
-import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkNavigationMenuGroup, bkSelect, bkOption, bkPopover, bkButton } from 'bk-magic-vue'
+import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkNavigationMenuGroup, bkSelect, bkOption, bkPopover, bkButton } from '@'
 export default {
   name: 'monitor-navigation',
   components: {

diff --git a/example/components/navigation/demo1.vue b/example/components/navigation/demo1.vue
@@ -148,7 +148,7 @@
 </template>
 
 <script>
-import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkSelect, bkOption, bkPopover, bkButton } from 'bk-magic-vue'
+import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkSelect, bkOption, bkPopover, bkButton } from '@'
 export default {
   name: 'monitor-navigation',
   components: {

diff --git a/example/components/navigation/readme.md b/example/components/navigation/readme.md
@@ -1006,7 +1006,7 @@ export default {
 </template>
 
 <script>
-import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkSelect, bkOption, bkPopover, bkButton } from 'bk-magic-vue'
+import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkSelect, bkOption, bkPopover, bkButton } from '@'
 export default {
   name: 'monitor-navigation',
   components: {
@@ -1914,7 +1914,7 @@ box-shadow:none;
 </template>
 
 <script>
-import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkNavigationMenuGroup, bkSelect, bkOption, bkPopover, bkButton } from 'bk-magic-vue'
+import { bkNavigation, bkNavigationMenu, bkNavigationMenuItem, bkNavigationMenuGroup, bkSelect, bkOption, bkPopover, bkButton } from '@'
 export default {
   name: 'monitor-navigation',
   components: {