diff --git a/components/layout/layout.tsx b/components/layout/layout.tsx index 6c79bbf362..0b37e1c047 100644 --- a/components/layout/layout.tsx +++ b/components/layout/layout.tsx @@ -27,9 +27,9 @@ function generator({ suffixCls, tagName, name }: GeneratorArgument) { const { prefixCls } = useConfigInject(suffixCls, props); return () => { const basicComponentProps = { + ...props, prefixCls: prefixCls.value, tagName, - ...props, }; return {slots.default?.()}; }; diff --git a/package.json b/package.json index b02a3aeab9..84686155cd 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ }, "homepage": "https://www.antdv.com/", "peerDependencies": { - "@vue/compiler-sfc": ">=3.0.9", - "vue": ">=3.0.9" + "@vue/compiler-sfc": ">=3.1.0", + "vue": ">=3.1.0" }, "devDependencies": { "@babel/cli": "^7.8.4", @@ -89,7 +89,7 @@ "@typescript-eslint/parser": "^4.1.0", "@vue/babel-plugin-jsx": "^1.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-typescript": "^7.0.0", "@vue/test-utils": "^2.0.0-0", @@ -179,7 +179,7 @@ "umi-mock-middleware": "^1.0.0", "umi-request": "^1.3.5", "url-loader": "^3.0.0", - "vue": "^3.0.9", + "vue": "^3.1.0", "vue-antd-md-loader": "^1.2.1-beta.1", "vue-clipboard2": "0.3.1", "vue-draggable-resizable": "^2.1.0", diff --git a/v2-doc b/v2-doc index 0f6d531d08..6819090fbc 160000 --- a/v2-doc +++ b/v2-doc @@ -1 +1 @@ -Subproject commit 0f6d531d088d5283250c8cec1c7e8be0e0d36a36 +Subproject commit 6819090fbcc94b248bc761d5f26162f29c04b2ef