Skip to content

Commit 6af4491

Browse files
committed
fix(render-component): 优化renderComponent中的props合并逻辑,确保customDesignProps正确应用
1 parent 22aeaf0 commit 6af4491

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

packages/vue-common/src/adapter/vue2.7/index.ts

+6-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,12 @@ export const renderComponent = ({
3434
hooks.h(
3535
(view && view.value) || component,
3636
Object.assign(
37-
{ props, attrs, customDesignProps, [extend.isSvg ? 'nativeOn' : 'on']: on, scopedSlots: { ...slots } },
37+
{
38+
props: { ...props, ...customDesignProps },
39+
attrs,
40+
[extend.isSvg ? 'nativeOn' : 'on']: on,
41+
scopedSlots: { ...slots }
42+
},
3843
extend
3944
)
4045
)

packages/vue-common/src/adapter/vue2/index.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ export const renderComponent = ({
4343
(view && view.value) || component,
4444
Object.assign(
4545
{
46-
props,
46+
props: { ...props, ...customDesignProps },
4747
attrs,
48-
customDesignProps,
4948
[extend.isSvg ? 'nativeOn' : 'on']: on,
5049
ref: 'modeTemplate',
5150
scopedSlots: { ...slots }

0 commit comments

Comments
 (0)