From afe9682f8afd8bda4b796bb63ded0221c707613e Mon Sep 17 00:00:00 2001
From: wuyiping0628 <42107997+wuyiping0628@users.noreply.github.com>
Date: Tue, 25 Jun 2024 20:34:11 -0700
Subject: [PATCH] feat(breadcrumb): [breadcrumb] adapts to xdesign theme
(#1693)
---
packages/design/smb/index.ts | 2 ++
packages/design/smb/src/breadcrumb-item/index.ts | 3 +++
packages/renderless/src/breadcrumb-item/vue.ts | 6 +++++-
packages/vue/src/breadcrumb-item/src/pc.vue | 2 +-
packages/vue/src/breadcrumb/src/index.ts | 2 +-
5 files changed, 12 insertions(+), 3 deletions(-)
create mode 100644 packages/design/smb/src/breadcrumb-item/index.ts
diff --git a/packages/design/smb/index.ts b/packages/design/smb/index.ts
index 72b0b81d06..479a8a9944 100644
--- a/packages/design/smb/index.ts
+++ b/packages/design/smb/index.ts
@@ -11,6 +11,7 @@ import Pager from './src/pager'
import Select from './src/select'
import TreeNode from './src/tree-node'
import UploadList from './src/upload-list'
+import BreadcrumbItem from './src/breadcrumb-item'
import { version } from './package.json'
export default {
@@ -29,6 +30,7 @@ export default {
Pager,
Select,
TreeNode,
+ BreadcrumbItem,
UploadList
}
}
diff --git a/packages/design/smb/src/breadcrumb-item/index.ts b/packages/design/smb/src/breadcrumb-item/index.ts
new file mode 100644
index 0000000000..b337e12eb6
--- /dev/null
+++ b/packages/design/smb/src/breadcrumb-item/index.ts
@@ -0,0 +1,3 @@
+export default {
+ separator: '/'
+}
diff --git a/packages/renderless/src/breadcrumb-item/vue.ts b/packages/renderless/src/breadcrumb-item/vue.ts
index f008fe5342..d1fce9f098 100644
--- a/packages/renderless/src/breadcrumb-item/vue.ts
+++ b/packages/renderless/src/breadcrumb-item/vue.ts
@@ -23,13 +23,17 @@ export const api = ['linkClick', 'state']
export const renderless = (
props: IBreadcrumbItemProps,
{ reactive, inject }: ISharedRenderlessParamHooks,
+ { designConfig },
{ refs, router, emit }: IBreadcrumbItemRenderlessParamUtils
) => {
const breadcrumbEmitter = inject('breadcrumbEmitter')
const breadcrumb = inject('breadcrumb')
const constants = breadcrumb._constants
+ // separator
+ const separator = props.separator || designConfig?.separator || '>'
const state = reactive({
- size: inject('size', null)
+ size: inject('size', null),
+ separator
})
const api: IBreadcrumbItemApi = {
state,
diff --git a/packages/vue/src/breadcrumb-item/src/pc.vue b/packages/vue/src/breadcrumb-item/src/pc.vue
index 3e0082833b..bb16c2ad16 100644
--- a/packages/vue/src/breadcrumb-item/src/pc.vue
+++ b/packages/vue/src/breadcrumb-item/src/pc.vue
@@ -21,7 +21,7 @@
:is="breadcrumb.separatorIcon"
class="tiny-svg-size tiny-breadcrumb__separator-cls"
/>
- {{ breadcrumb.separator }}
+ {{ state.separator }}
diff --git a/packages/vue/src/breadcrumb/src/index.ts b/packages/vue/src/breadcrumb/src/index.ts
index 00c57c32c9..6f410a7eb4 100644
--- a/packages/vue/src/breadcrumb/src/index.ts
+++ b/packages/vue/src/breadcrumb/src/index.ts
@@ -26,7 +26,7 @@ export const breadcrumbProps = {
},
separator: {
type: String,
- default: '>'
+ default: ''
},
separatorIcon: {
type: Object