Skip to content

P
pro-layout
Commit 1eb4eba0 authored by Sendya's avatar Sendya Committed by 言肆
Browse files
Options

fix: loss headerHeight

parent 49bf02d3
Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 106 deletions
examples/demo/page1.tsx
View file @ 1eb4eba0
......@@ -117,6 +117,48 @@ export default defineComponent({
}} */
>
<pre>{JSON.stringify(route.meta, null, 4)}</pre>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
<p>
<p>block</p>
...
<br />
long text..
</p>
</PageContainer>
);
},
......
examples/index.tsx
View file @ 1eb4eba0
......@@ -71,7 +71,7 @@ const BasicLayout = defineComponent({
watch(route, () => {
updateSelectedMenu();
updateOpenKeys();
})
});
});
return () => (
......@@ -145,9 +145,8 @@ const BasicLayout = defineComponent({
routes: breadcrumb.value,
}}
>
<WaterMark content="Pro Layout">
<router-view />
</WaterMark>
<router-view />
<FooterToolbar>
<Space>
<Button
......
package.json
View file @ 1eb4eba0
......@@ -72,10 +72,11 @@
},
"dependencies": {
"@babel/runtime": "^7.11.2",
"ant-design-vue": "^2.2.0-beta.3",
"ant-design-vue": "^2.2.0-rc.1",
"core-js": "^3.9.1",
"lodash-es": "^4.17.20",
"omit.js": "^2.0.2",
"vue": "^3.1.0",
"vue-types": "^3.0.1"
},
"files": [
......
src/BasicLayout.tsx
View file @ 1eb4eba0
......@@ -189,6 +189,7 @@ const ProLayout = defineComponent({
fixedHeader: refProps.fixSiderbar,
fixSiderbar: refProps.fixSiderbar,
sideWidth: siderWidth,
headerHeight: refProps.headerHeight,
hasFooterToolbar: false,
menuData: refProps.menuData,
selectedKeys: refProps.selectedKeys,
......
src/PageContainer/index.tsx
View file @ 1eb4eba0
......@@ -314,5 +314,5 @@ const PageContainer = defineComponent({
);
},
});
// <WaterMark content="Pro Layout"></WaterMark>
export default withInstall(PageContainer);
src/RouteContext.tsx
View file @ 1eb4eba0
......@@ -45,6 +45,7 @@ export interface RouteContextProps extends Partial<PureSettings>, MenuState {
hasSideMenu?: boolean;
hasHeader?: boolean;
sideWidth?: number;
headerHeight?: number;
hasFooterToolbar?: boolean;
hasFooter?: boolean;
setHasFooterToolbar?: (bool: boolean) => void;
......
yarn.lock
View file @ 1eb4eba0
......@@ -105,16 +105,6 @@
xtemplate "^4.6.1"
xtpl "^3.4.0"
"@ant-design-vue/use@^0.0.1-0":
version "0.0.1-alpha.9"
resolved "https://registry.yarnpkg.com/@ant-design-vue/use/-/use-0.0.1-alpha.9.tgz#b7df26150469391383ba1c2dd4ba250267a58411"
integrity sha512-X+ESJt+e95sRwlSkpzETjc0opE5l34tCjMEm92JkoM4BVl6YxG9IgyX1dBy0W2jF74SSCOiCc7GdIlsPFQvE/g==
dependencies:
async-validator "^3.4.0"
lodash-es "^4.17.15"
resize-observer-polyfill "^1.5.1"
vue "^3.0.0"
"@ant-design/colors@^5.0.0":
version "5.1.1"
resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-5.1.1.tgz#800b2186b1e27e66432e67d03ed96af3e21d8940"
......@@ -2256,17 +2246,6 @@
semver "^6.1.0"
strip-ansi "^6.0.0"
"@vue/compiler-core@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.0.11.tgz#5ef579e46d7b336b8735228758d1c2c505aae69a"
integrity sha512-6sFj6TBac1y2cWCvYCA8YzHJEbsVkX7zdRs/3yK/n1ilvRqcn983XvpBbnN3v4mZ1UiQycTvOiajJmOgN9EVgw==
dependencies:
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.0.11"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-core@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.1.1.tgz#4f2c5d70eabd454675714cc8bd2b97f6a8efb196"
......@@ -2278,13 +2257,16 @@
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-dom@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
integrity sha512-+3xB50uGeY5Fv9eMKVJs2WSRULfgwaTJsy23OIltKgMrynnIj8hTYY2UL97HCoz78aDw1VDXdrBQ4qepWjnQcw==
"@vue/compiler-core@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fcompiler-core%2Fdownload%2F%40vue%2Fcompiler-core-3.1.2.tgz#31ab1d88e1706a5c7a545faeeb64c31bd0101db0"
integrity sha1-MasdiOFwalx6VF+u62TDG9AQHbA=
dependencies:
"@vue/compiler-core" "3.0.11"
"@vue/shared" "3.0.11"
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.1.2"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-dom@3.1.1":
version "3.1.1"
......@@ -2294,6 +2276,14 @@
"@vue/compiler-core" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/compiler-dom@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fcompiler-dom%2Fdownload%2F%40vue%2Fcompiler-dom-3.1.2.tgz#75a7731bcc5d9718183a3c56c18e992f7c13e7b1"
integrity sha1-dadzG8xdlxgYOjxWwY6ZL3wT57E=
dependencies:
"@vue/compiler-core" "3.1.2"
"@vue/shared" "3.1.2"
"@vue/compiler-sfc@^3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.1.1.tgz#d4e4507c013d0b219f0b106b317ec5bb1cde3398"
......@@ -2359,64 +2349,40 @@
resolved "https://registry.yarnpkg.com/@vue/preload-webpack-plugin/-/preload-webpack-plugin-1.1.2.tgz#ceb924b4ecb3b9c43871c7a429a02f8423e621ab"
integrity sha512-LIZMuJk38pk9U9Ur4YzHjlIyMuxPlACdBIHH9/nGYVTsaGKOSnSuELiE8vS9wa+dJpIYspYUOqk+L1Q4pgHQHQ==
"@vue/reactivity@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.0.11.tgz#07b588349fd05626b17f3500cbef7d4bdb4dbd0b"
integrity sha512-SKM3YKxtXHBPMf7yufXeBhCZ4XZDKP9/iXeQSC8bBO3ivBuzAi4aZi0bNoeE2IF2iGfP/AHEt1OU4ARj4ao/Xw==
dependencies:
"@vue/shared" "3.0.11"
"@vue/reactivity@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.1.1.tgz#9c02fd146a6c3b03e7d658b7cf76f4b69b0f98c8"
integrity sha512-DsH5woNVCcPK1M0RRYVgJEU1GJDU2ASOKpAqW3ppHk+XjoFLCbqc/26RTCgTpJYd9z8VN+79Q1u7/QqgQPbuLQ==
dependencies:
"@vue/shared" "3.1.1"
"@vue/runtime-core@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.0.11.tgz#c52dfc6acf3215493623552c1c2919080c562e44"
integrity sha512-87XPNwHfz9JkmOlayBeCCfMh9PT2NBnv795DSbi//C/RaAnc/bGZgECjmkD7oXJ526BZbgk9QZBPdFT8KMxkAg==
dependencies:
"@vue/reactivity" "3.0.11"
"@vue/shared" "3.0.11"
"@vue/runtime-core@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.1.1.tgz#542110c09a643d7d80646a2f071aff6b324c4158"
integrity sha512-GboqR02txOtkd9F3Ysd8ltPL68vTCqIx2p/J52/gFtpgb5FG9hvOAPEwFUqxeEJRu7ResvQnmdOHiEycGPCLhQ==
"@vue/reactivity@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/reactivity/download/@vue/reactivity-3.1.2.tgz?cache=0&sync_timestamp=1624386356780&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Freactivity%2Fdownload%2F%40vue%2Freactivity-3.1.2.tgz#66fa530dd726d2fef285ae55d02106a727db463b"
integrity sha1-ZvpTDdcm0v7yha5V0CEGpyfbRjs=
dependencies:
"@vue/reactivity" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/shared" "3.1.2"
"@vue/runtime-dom@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.0.11.tgz#7a552df21907942721feb6961c418e222a699337"
integrity sha512-jm3FVQESY3y2hKZ2wlkcmFDDyqaPyU3p1IdAX92zTNeCH7I8zZ37PtlE1b9NlCtzV53WjB4TZAYh9yDCMIEumA==
"@vue/runtime-core@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/runtime-core/download/@vue/runtime-core-3.1.2.tgz?cache=0&sync_timestamp=1624386357169&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fruntime-core%2Fdownload%2F%40vue%2Fruntime-core-3.1.2.tgz#f4dbc503cfc9a02ab5f1ebe002c3322512064a54"
integrity sha1-9NvFA8/JoCq18evgAsMyJRIGSlQ=
dependencies:
"@vue/runtime-core" "3.0.11"
"@vue/shared" "3.0.11"
csstype "^2.6.8"
"@vue/reactivity" "3.1.2"
"@vue/shared" "3.1.2"
"@vue/runtime-dom@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.1.1.tgz#5539bbce132d29f6445b4964cb7b4164a89a5ce6"
integrity sha512-o57n/199e/BBAmLRMSXmD2r12Old/h/gf6BgL0RON1NT2pwm6MWaMY4Ul55eyq+FsDILz4jR/UgoPQ9vYB8xcw==
"@vue/runtime-dom@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/runtime-dom/download/@vue/runtime-dom-3.1.2.tgz#0fd8724f14bc7ba64b6c954d874a8d8a4fcb5fe9"
integrity sha1-D9hyTxS8e6ZLbJVNh0qNik/LX+k=
dependencies:
"@vue/runtime-core" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/runtime-core" "3.1.2"
"@vue/shared" "3.1.2"
csstype "^2.6.8"
"@vue/shared@3.0.11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
integrity sha512-b+zB8A2so8eCE0JsxjL24J7vdGl8rzPQ09hZNhystm+KqSbKcAej1A+Hbva1rCMmTTqA+hFnUSDc5kouEo0JzA==
"@vue/shared@3.1.1":
version "3.1.1"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.1.1.tgz#2287cfc3dc20e5b20aeb65c2c3a56533bdca801c"
integrity sha512-g+4pzAw7PYSjARtLBoDq6DmcblX8i9KJHSCnyM5VDDFFifUaUT9iHbFpOF/KOizQ9f7QAqU2JH3Y6aXjzUMhVA==
"@vue/shared@3.1.2":
version "3.1.2"
resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.1.2.tgz?cache=0&sync_timestamp=1624386358410&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40vue%2Fshared%2Fdownload%2F%40vue%2Fshared-3.1.2.tgz#1069c0bc7d6f4bd15ccf3a5f3be29450aca368f9"
integrity sha1-EGnAvH1vS9FczzpfO+KUUKyjaPk=
"@vue/test-utils@^2.0.0-rc.6":
version "2.0.0-rc.6"
resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-2.0.0-rc.6.tgz#d0aac24d20450d379e183f70542c0822670b8783"
......@@ -2835,12 +2801,11 @@ ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
ant-design-vue@^2.2.0-beta.3:
version "2.2.0-beta.3"
resolved "https://registry.yarnpkg.com/ant-design-vue/-/ant-design-vue-2.2.0-beta.3.tgz#ef01b99b8b823a00ace4d373539bfd393b96a640"
integrity sha512-bFcAZK4mUaiHQwYLof+quY/6X2HBwEAYXcEEe2bOzAZZ8o3dTalpkEBAYSIPAGuQ+swdWRGGgEMIVJoeyW36oA==
ant-design-vue@^2.2.0-rc.1:
version "2.2.0-rc.1"
resolved "https://registry.nlark.com/ant-design-vue/download/ant-design-vue-2.2.0-rc.1.tgz?cache=0&sync_timestamp=1624956690599&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fant-design-vue%2Fdownload%2Fant-design-vue-2.2.0-rc.1.tgz#5e32e102c64f517d469c7af403cd6133b4ac8b45"
integrity sha1-XjLhAsZPUX1GnHr0A81hM7Ssi0U=
dependencies:
"@ant-design-vue/use" "^0.0.1-0"
"@ant-design/icons-vue" "^6.0.0"
"@babel/runtime" "^7.10.5"
"@simonwep/pickr" "~1.8.0"
......@@ -3177,7 +3142,7 @@ async-settle@^1.0.0:
dependencies:
async-done "^1.2.2"
async-validator@^3.3.0, async-validator@^3.4.0:
async-validator@^3.3.0:
version "3.5.1"
resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-3.5.1.tgz#cd62b9688b2465f48420e27adb47760ab1b5559f"
integrity sha512-DDmKA7sdSAJtTVeNZHrnr2yojfFaoeW8MfQN8CeuXg8DDQHTqKk9Fdv38dSvnesHoO8MUwMI2HphOeSyIF+wmQ==
......@@ -13590,11 +13555,6 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
resize-observer-polyfill@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
......@@ -15880,23 +15840,14 @@ vue-types@^3.0.0, vue-types@^3.0.1:
dependencies:
is-plain-object "3.0.1"
vue@^3.0.0:
version "3.0.11"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.0.11.tgz#c82f9594cbf4dcc869241d4c8dd3e08d9a8f4b5f"
integrity sha512-3/eUi4InQz8MPzruHYSTQPxtM3LdZ1/S/BvaU021zBnZi0laRUyH6pfuE4wtUeLvI8wmUNwj5wrZFvbHUXL9dw==
dependencies:
"@vue/compiler-dom" "3.0.11"
"@vue/runtime-dom" "3.0.11"
"@vue/shared" "3.0.11"
vue@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.1.1.tgz#9ad655758a0fa6c0dee5b3d2431d3912a9b381aa"
integrity sha512-j9fj3PNPMxo2eqOKYjMuss9XBS8ZtmczLY3kPvjcp9d3DbhyNqLYbaMQH18+1pDIzzVvQCQBvIf774LsjjqSKA==
vue@^3.1.0:
version "3.1.2"
resolved "https://registry.nlark.com/vue/download/vue-3.1.2.tgz#647f8e3949a3d600771dca25d50225dc3e594c64"
integrity sha1-ZH+OOUmj1gB3Hcol1QIl3D5ZTGQ=
dependencies:
"@vue/compiler-dom" "3.1.1"
"@vue/runtime-dom" "3.1.1"
"@vue/shared" "3.1.1"
"@vue/compiler-dom" "3.1.2"
"@vue/runtime-dom" "3.1.2"
"@vue/shared" "3.1.2"
w3c-hr-time@^1.0.1, w3c-hr-time@^1.0.2:
version "1.0.2"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment