Commit ae8bf4d2 authored by Sendya's avatar Sendya

fix: basic-layout props

parent a3019d84
...@@ -56,7 +56,9 @@ module.exports = { ...@@ -56,7 +56,9 @@ module.exports = {
{ {
'ignoreReadBeforeAssign': false 'ignoreReadBeforeAssign': false
} }
] ],
'template-curly-spacing': 'off',
'indent': 'off'
}, },
parserOptions: { parserOptions: {
parser: 'babel-eslint' parser: 'babel-eslint'
......
<template> <template>
<page-header-wrapper :i18n-render="i18nRender"> <page-header-wrapper>
<div class="page-test-wrapper"> <div class="page-test-wrapper">
<h1>Test Page2 keepAlive: {{ $route.meta.keepAlive }}</h1> <h1>Test Page2 keepAlive: {{ $route.meta.keepAlive }}</h1>
<div class="box"> <div class="box">
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
<script> <script>
import ProLayout, { PageHeaderWrapper } from '@ant-design-vue/pro-layout' import ProLayout, { PageHeaderWrapper } from '@ant-design-vue/pro-layout'
import { i18nRender } from '@/locales'
export default { export default {
data () { data () {
...@@ -25,7 +24,6 @@ export default { ...@@ -25,7 +24,6 @@ export default {
} }
}, },
methods: { methods: {
i18nRender,
handleClick (e) { handleClick (e) {
this.$router.push({ path: '/dashboard/analysis' }) this.$router.push({ path: '/dashboard/analysis' })
} }
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"jest-serializer-vue": "^2.0.2", "jest-serializer-vue": "^2.0.2",
"np": "^5.1.1", "np": "^5.1.1",
"prettier": "^1.18.2", "prettier": "^1.18.2",
"vc-tools": "^1.0.0", "vc-tools": "^1.0.3",
"vue": ">=2.5.0", "vue": ">=2.5.0",
"vue-jest": "^2.5.0", "vue-jest": "^2.5.0",
"vue-template-compiler": ">=2.5.0" "vue-template-compiler": ">=2.5.0"
...@@ -71,5 +71,5 @@ ...@@ -71,5 +71,5 @@
] ]
} }
}, },
"description": "<h1 align=\"center\"> Ant Design Vue Pro Layout </h1>" "description": "ant-design-vue-pro layout, easy to use pro scaffolding."
} }
...@@ -77,14 +77,10 @@ const BasicLayout = { ...@@ -77,14 +77,10 @@ const BasicLayout = {
render (h, content) { render (h, content) {
const { props, children } = content const { props, children } = content
const { const {
menus,
layout, layout,
logo,
// contentWidth, // contentWidth,
// theme, // theme,
collapsed, collapsed,
// eslint-disable-next-line
// autoHideHeader,
mediaQuery, mediaQuery,
handleMediaQuery, handleMediaQuery,
handleCollapse, handleCollapse,
...@@ -110,12 +106,8 @@ const BasicLayout = { ...@@ -110,12 +106,8 @@ const BasicLayout = {
<Layout class={{ 'basicLayout': true, ...mediaQuery }}> <Layout class={{ 'basicLayout': true, ...mediaQuery }}>
<SiderMenuWrapper <SiderMenuWrapper
{ ...{ props: cdProps } } { ...{ props: cdProps } }
menus={menus}
mode={'inline'}
logo={logo}
collapsed={collapsed} collapsed={collapsed}
onCollapse={handleCollapse} onCollapse={handleCollapse}
handleCollapse={handleCollapse}
/> />
<Layout class={[layout]} style={{ paddingLeft: '0', minHeight: '100vh' }}> <Layout class={[layout]} style={{ paddingLeft: '0', minHeight: '100vh' }}>
{headerRender(h, { {headerRender(h, {
......
import PropTypes from 'ant-design-vue/es/_util/vue-types' import PropTypes from 'ant-design-vue/es/_util/vue-types'
const ConfigProvider = { const ConfigProvider = {
name: 'ConfigProvider', name: 'ProConfigProvider',
props: { props: {
i18nRender: PropTypes.any, i18nRender: PropTypes.any,
}, },
......
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