github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: layout not render in vue3.1 #4173

pull/4175/head
tanjinzhou 2021-06-08 11:36:58 +08:00
parent b65a8672a4
commit b45a6250de
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/layout/layout.tsx
View File

@ -27,9 +27,9 @@ function generator({ suffixCls, tagName, name }: GeneratorArgument) {
const { prefixCls } = useConfigInject(suffixCls, props); const { prefixCls } = useConfigInject(suffixCls, props);
return () => { return () => {
const basicComponentProps = { const basicComponentProps = {
...props,
prefixCls: prefixCls.value, prefixCls: prefixCls.value,
tagName, tagName,
...props,
}; };
return <BasicComponent {...basicComponentProps}>{slots.default?.()}</BasicComponent>; return <BasicComponent {...basicComponentProps}>{slots.default?.()}</BasicComponent>;
}; };

8
package.json
View File

@ -58,8 +58,8 @@
}, },
"homepage": "https://www.antdv.com/", "homepage": "https://www.antdv.com/",
"peerDependencies": { "peerDependencies": {
"@vue/compiler-sfc": ">=3.0.9", "@vue/compiler-sfc": ">=3.1.0",
"vue": ">=3.0.9" "vue": ">=3.1.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.8.4", "@babel/cli": "^7.8.4",
@ -89,7 +89,7 @@
"@typescript-eslint/parser": "^4.1.0", "@typescript-eslint/parser": "^4.1.0",
"@vue/babel-plugin-jsx": "^1.0.0", "@vue/babel-plugin-jsx": "^1.0.0",
"@vue/cli-plugin-eslint": "^4.0.0", "@vue/cli-plugin-eslint": "^4.0.0",
"@vue/compiler-sfc": "^3.0.9", "@vue/compiler-sfc": "^3.1.0",
"@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-prettier": "^6.0.0",
"@vue/eslint-config-typescript": "^7.0.0", "@vue/eslint-config-typescript": "^7.0.0",
"@vue/test-utils": "^2.0.0-0", "@vue/test-utils": "^2.0.0-0",
@ -179,7 +179,7 @@
"umi-mock-middleware": "^1.0.0", "umi-mock-middleware": "^1.0.0",
"umi-request": "^1.3.5", "umi-request": "^1.3.5",
"url-loader": "^3.0.0", "url-loader": "^3.0.0",
"vue": "^3.0.9", "vue": "^3.1.0",
"vue-antd-md-loader": "^1.2.1-beta.1", "vue-antd-md-loader": "^1.2.1-beta.1",
"vue-clipboard2": "0.3.1", "vue-clipboard2": "0.3.1",
"vue-draggable-resizable": "^2.1.0", "vue-draggable-resizable": "^2.1.0",

2
v2-doc

@ -1 +1 @@
Subproject commit 0f6d531d088d5283250c8cec1c7e8be0e0d36a36 Subproject commit 6819090fbcc94b248bc761d5f26162f29c04b2ef