Skip to content

Commit 1f5dd5b

Browse files
committed
Merge branch 'feature/global_size_demo' into develop
Former-commit-id: e746458f12e94d6c47cad88474a7593924150499 [formerly e746458f12e94d6c47cad88474a7593924150499 [formerly e746458f12e94d6c47cad88474a7593924150499 [formerly e746458f12e94d6c47cad88474a7593924150499 [formerly 91f0c41 [formerly 00e5c5eae54fc83e51fb0e2b186805cc5e2bfb4b]]]]] Former-commit-id: a684147 Former-commit-id: 46e9b77 Former-commit-id: f8df39702ade9bcf300f8b928d4bdca6cbc562ca [formerly e674d94bf64629b40e37374ac14e8762e9ea461b] Former-commit-id: c552ab7d6efd7f20f0a72f9648b28e878d056d93 Former-commit-id: c9869b358d0078fe3a9dbb52f3ad9ddc5eb59bac Former-commit-id: f99d787f53181eea64c11a26f88ca48c1ccb8daf Former-commit-id: b54e8cd7586d68434a9f40ffc2457e7033c3ac0a Former-commit-id: 337ba58e8fbdf972de106a28a35e6b0ccaeffbc1
2 parents c5ff166 + f535d71 commit 1f5dd5b

File tree

5 files changed

+41
-175
lines changed

5 files changed

+41
-175
lines changed

src/menu/modules/demo-playground.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ export default {
6060
title: '全局状态管理',
6161
icon: 'bolt',
6262
children: [
63-
{ path: `${pre}store/sys`, title: '系统状态', icon: 'microchip' },
6463
{ path: `${pre}store/menu`, title: '菜单控制', icon: 'bars' },
64+
{ path: `${pre}store/size`, title: '全局尺寸', icon: 'font' },
6565
{ path: `${pre}store/ua`, title: '浏览器信息', icon: 'info-circle' },
6666
{ path: `${pre}store/gray`, title: '灰度模式', icon: 'eye' },
6767
{ path: `${pre}store/fullscreen`, title: '全屏', icon: 'arrows-alt' },
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<template>
2+
<d2-container type="card">
3+
<el-radio-group v-model="currentValue" @change="sizeSet">
4+
<el-radio-button label="default"></el-radio-button>
5+
<el-radio-button label="medium"></el-radio-button>
6+
<el-radio-button label="small"></el-radio-button>
7+
<el-radio-button label="mini"></el-radio-button>
8+
</el-radio-group>
9+
</d2-container>
10+
</template>
11+
12+
<script>
13+
import { mapState, mapMutations } from 'vuex'
14+
export default {
15+
data () {
16+
return {
17+
currentValue: ''
18+
}
19+
},
20+
computed: {
21+
...mapState('d2admin/size', [
22+
'value'
23+
])
24+
},
25+
watch: {
26+
value: {
27+
handler (val) {
28+
this.currentValue = val
29+
},
30+
immediate: true
31+
}
32+
},
33+
methods: {
34+
...mapMutations({
35+
sizeSet: 'd2admin/size/set'
36+
})
37+
}
38+
}
39+
</script>

src/pages/demo/playground/store/sys/index.vue

Lines changed: 0 additions & 172 deletions
This file was deleted.

src/plugin/d2admin/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export default {
2525
defaultValue: '',
2626
user: true
2727
})
28-
console.log('size: ', size)
2928
// Element
3029
Vue.use(ElementUI, {
3130
size

src/router/routes.js.REMOVED.git-id

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
58069f63d26f33421df3d333c4aa58af52c87aaa
1+
c62802e4146a602e5c498cdb99205b56768d4047

0 commit comments

Comments
 (0)