From 4b5bdb54fd5d42385327701b6de53aee6edff73a Mon Sep 17 00:00:00 2001
From: Whbbit1999 <60510247+Whbbit1999@users.noreply.github.com>
Date: Mon, 13 Nov 2023 15:16:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E6=96=87=E6=A1=A3=E4=B8=ADmd?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E6=8C=89=E9=92=AE=E9=AB=98=E5=BA=A6=E5=92=8C?=
 =?UTF-8?q?=E5=AE=9E=E9=99=85=E4=BD=BF=E7=94=A8=E6=97=B6=E4=B8=8D=E5=90=8C?=
 =?UTF-8?q?=20#1635=20(#1692)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 使用搜索后有//#刷新页面页面空白的问题 #1619

* fix: button height
---
 packages/devui-vue/devui/button/src/button.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/devui-vue/devui/button/src/button.scss b/packages/devui-vue/devui/button/src/button.scss
index 8742882c69..d9209ea5c5 100644
--- a/packages/devui-vue/devui/button/src/button.scss
+++ b/packages/devui-vue/devui/button/src/button.scss
@@ -20,6 +20,7 @@ $devui-btn-lg-padding: var(--devui-btn-lg-padding, 0 24px);
 .#{$devui-prefix}-button {
   padding: $devui-btn-padding;
   font-size: $devui-font-size-md;
+  height: $devui-size-md;
   line-height: $devui-line-height-base;
   border-radius: $devui-border-radius;
   border-width: 1px;

From edd34a232746b1b30bf62b396d3a280bc2b99552 Mon Sep 17 00:00:00 2001
From: GreatZP <greatzp@greatzp.cn>
Date: Wed, 3 Jan 2024 09:17:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93id=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20(#1774)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* doc: 新增xss规则自定义示例

* fix(md): 修复toc目录引入标题id不正确(全为undefined)问题
---
 .../devui-vue/devui/editor-md/src/plugins/toc.ts   |  4 ++--
 .../devui-vue/docs/components/editor-md/index.md   | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/devui-vue/devui/editor-md/src/plugins/toc.ts b/packages/devui-vue/devui/editor-md/src/plugins/toc.ts
index e20b68a99d..19a8cbdb3b 100644
--- a/packages/devui-vue/devui/editor-md/src/plugins/toc.ts
+++ b/packages/devui-vue/devui/editor-md/src/plugins/toc.ts
@@ -59,10 +59,10 @@ export default function (md: any, options: Record<string, any>) {
           let content;
           if (heading.children && heading.children.length > 0 && heading.children[0].type === 'link_open') {
             content = heading.children[1].content;
-            heading._toAnchor = safeString(content);
+            heading._tocAnchor = safeString(content);
           } else {
             content = heading.content;
-            heading._toAnchor = safeString(heading.children.reduce((s, t) => s + t.content, ''));
+            heading._tocAnchor = safeString(heading.children.reduce((s, t) => s + t.content, ''));
           }
           headings.push({
             content,
diff --git a/packages/devui-vue/docs/components/editor-md/index.md b/packages/devui-vue/docs/components/editor-md/index.md
index e413cb8d13..63852875a3 100644
--- a/packages/devui-vue/docs/components/editor-md/index.md
+++ b/packages/devui-vue/docs/components/editor-md/index.md
@@ -36,11 +36,11 @@ export default defineComponent({
 
 ### 自定义渲染
 
-:::demo 自定义从 md 到 html 的渲染规则。
+:::demo 自定义从 md 到 html 的渲染规则，也可自定义XSS过滤规则，放开指定标签。
 
 ```vue
 <template>
-  <d-editor-md v-model="content" :custom-renderer-rules="customRendererRules"></d-editor-md>
+  <d-editor-md v-model="content" :custom-renderer-rules="customRendererRules" :custom-xss-rules="customRenderRules"></d-editor-md>
 </template>
 
 <script>
@@ -48,7 +48,13 @@ import { defineComponent, ref } from 'vue';
 
 export default defineComponent({
   setup() {
-    const content = ref('[link](#test)');
+    const content = ref('[link](#test)\n<kbd>kbd 标签渲染</kbd>');
+    const customRenderRules = ref([
+      {
+        key: 'kbd',
+        value: [], // 为空表示过滤所有属性，放开属性则添加对应项，如['id', 'style']
+      },
+    ])
     const customRendererRules = ref([
       {
         key: 'link_open',
@@ -69,7 +75,7 @@ export default defineComponent({
         },
       },
     ]);
-    return { content, customRendererRules };
+    return { content, customRendererRules, customRenderRules };
   },
 });
 </script>

From c767cfbc5f88ff0ffd991c0a04120b9754f0c411 Mon Sep 17 00:00:00 2001
From: GreatZP <greatzp@greatzp.cn>
Date: Wed, 3 Jan 2024 09:19:03 +0800
Subject: [PATCH 3/3] Chore: Update package.json

---
 packages/devui-vue/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/devui-vue/package.json b/packages/devui-vue/package.json
index c9cda2dd35..c615bc7510 100644
--- a/packages/devui-vue/package.json
+++ b/packages/devui-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-devui",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "license": "MIT",
   "description": "DevUI components based on Vite and Vue3",
   "keywords": [