Merge remote-tracking branch 'origin/develop'
Former-commit-id: 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 933ec55590b4d6118a18472cee7f6c043eee77fa [formerly 72e651cc8ce92aa7e50fafe5f12d509e5e15b78c]]]]] Former-commit-id: e85058cd04998f35db1536f872c5b5e95eee9254 Former-commit-id: 8eeed912e7253ae13b23efa697c66c58d26cc2bf Former-commit-id: a34dbd28211fe87c83efd9ecdc07ffe51c335037 [formerly 5ca5d85a142c755454c7dc2084b8115de47a2bcf] Former-commit-id: 4dc8e397f374914f2eb4d9eee6c6599224df946e Former-commit-id: 9d56e2a187d18d0baa485d867cffe85bd0f668ae Former-commit-id: 50a7bad07be4e397b4f91b74d5aa9f2e04ef1602 Former-commit-id: c1ab4eb8cd1dd51a9adb9f7848279d5158185a7b Former-commit-id: 36c56b92d2acdccd437c5489ee584e58f0122153
This commit is contained in:
liyang
@@ -1 +1 @@
|
||||
0db501622270146313d905a0a5f39854fb2494ac
|
||||
12048ef98cbc909b11ea70298ee10637ece9fe87
|
||||
@@ -60,8 +60,8 @@ export default {
|
||||
title: '全局状态管理',
|
||||
icon: 'bolt',
|
||||
children: [
|
||||
{ path: `${pre}store/sys`, title: '系统状态', icon: 'microchip' },
|
||||
{ path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' },
|
||||
{ path: `${pre}store/size`, title: '全局尺寸', icon: 'font' },
|
||||
{ path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' },
|
||||
{ path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' },
|
||||
{ path: `${pre}store/fullscreen`, title: '全屏', icon: 'arrows-alt' },
|
||||
|
||||
39
src/pages/demo/playground/store/size/index.vue
Normal file
39
src/pages/demo/playground/store/size/index.vue
Normal file
@@ -0,0 +1,39 @@
|
||||
<template>
|
||||
<d2-container type="card">
|
||||
<el-radio-group v-model="currentValue" @change="sizeSet">
|
||||
<el-radio-button label="default"></el-radio-button>
|
||||
<el-radio-button label="medium"></el-radio-button>
|
||||
<el-radio-button label="small"></el-radio-button>
|
||||
<el-radio-button label="mini"></el-radio-button>
|
||||
</el-radio-group>
|
||||
</d2-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapState, mapMutations } from 'vuex'
|
||||
export default {
|
||||
data () {
|
||||
return {
|
||||
currentValue: ''
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState('d2admin/size', [
|
||||
'value'
|
||||
])
|
||||
},
|
||||
watch: {
|
||||
value: {
|
||||
handler (val) {
|
||||
this.currentValue = val
|
||||
},
|
||||
immediate: true
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
...mapMutations({
|
||||
sizeSet: 'd2admin/size/set'
|
||||
})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -1,172 +0,0 @@
|
||||
<template>
|
||||
<d2-container type="ghost">
|
||||
<template slot="header">version {{releasesVersion}} [ {{releasesUpdate ? '有新版本' : '已经是最新版本'}} ]</template>
|
||||
<div class="d2-mt d2-mr">
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">顶栏菜单数据</template>
|
||||
<div style="height: 260px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="menuHeader"
|
||||
:options="{ rootObjectKey: 'menuHeader', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">侧边栏菜单数据</template>
|
||||
<div style="height: 260px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="menuAside"
|
||||
:options="{ rootObjectKey: 'menuAside', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="6">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">全屏模式</template>
|
||||
<el-switch v-model="fullscreenActive" active-text="打开" inactive-text="关闭" disabled/>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">灰度模式</template>
|
||||
<el-switch v-model="grayActive" active-text="打开" inactive-text="关闭" disabled/>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">侧边栏折叠</template>
|
||||
<el-switch v-model="menuAsideCollapse" active-text="收缩" inactive-text="展开" disabled/>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">全局尺寸</template>
|
||||
{{sizeValue}}
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">当前主题</template>
|
||||
<div style="height: 300px; overflow: auto;">
|
||||
{{themeActiveName}}
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">已经注册的主题</template>
|
||||
<div style="height: 300px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="themeList"
|
||||
:options="{ rootObjectKey: 'themeList', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">当前主题信息</template>
|
||||
<div style="height: 300px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="themeActiveSetting"
|
||||
:options="{ rootObjectKey: 'themeActiveSetting', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">当前页面</template>
|
||||
{{pageCurrent}}
|
||||
</el-card>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">支持多页显示的页面列表</template>
|
||||
<div style="height: 300px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="pagePool"
|
||||
:options="{ rootObjectKey: 'pagePool', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">打开的标签页</template>
|
||||
<div style="height: 300px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="pageopened"
|
||||
:options="{ rootObjectKey: 'pageopened', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">缓存页面</template>
|
||||
<div style="height: 300px; overflow: auto;">
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="keepAlive"
|
||||
:options="{ rootObjectKey: 'keepAlive', maxDepth: 1 }"/>
|
||||
</div>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-card shadow="never" class="d2-card d2-mb">
|
||||
<template slot="header">最新版本数据 [ {{releasesUpdate ? '有新版本' : '已经是最新版本'}} ]</template>
|
||||
<tree-view
|
||||
class="tree-view-small"
|
||||
:data="releasesLatest"
|
||||
:options="{ rootObjectKey: 'releasesLatest', maxDepth: 1 }"/>
|
||||
</el-card>
|
||||
</div>
|
||||
</d2-container>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapState, mapGetters } from 'vuex'
|
||||
export default {
|
||||
computed: {
|
||||
...mapState('d2admin', {
|
||||
// 用户信息
|
||||
userInfo: state => state.user.info,
|
||||
// 版本
|
||||
releasesVersion: state => state.releases.version,
|
||||
releasesLatest: state => state.releases.latest,
|
||||
releasesUpdate: state => state.releases.update,
|
||||
// 菜单
|
||||
menuHeader: state => state.menu.header,
|
||||
menuAside: state => state.menu.aside,
|
||||
menuAsideCollapse: state => state.menu.asideCollapse,
|
||||
// 主题
|
||||
themeList: state => state.theme.list,
|
||||
themeActiveName: state => state.theme.activeName,
|
||||
// 全屏
|
||||
fullscreenActive: state => state.fullscreen.active,
|
||||
// 灰度模式
|
||||
grayActive: state => state.gray.active,
|
||||
// tag 池
|
||||
pagePool: state => state.page.pool,
|
||||
pageCurrent: state => state.page.current,
|
||||
pageopened: state => state.page.opened,
|
||||
// 全局尺寸
|
||||
sizeValue: state => state.size.value
|
||||
}),
|
||||
...mapGetters('d2admin', {
|
||||
keepAlive: 'page/keepAlive',
|
||||
themeActiveSetting: 'theme/activeSetting'
|
||||
})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -25,7 +25,6 @@ export default {
|
||||
defaultValue: '',
|
||||
user: true
|
||||
})
|
||||
console.log('size: ', size)
|
||||
// Element
|
||||
Vue.use(ElementUI, {
|
||||
size
|
||||
|
||||
@@ -1 +1 @@
|
||||
58069f63d26f33421df3d333c4aa58af52c87aaa
|
||||
c62802e4146a602e5c498cdb99205b56768d4047
|
||||
Reference in New Issue
Block a user