Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
zhigang.li committed Nov 21, 2018
2 parents 037c8e8 + 3ec36b6 commit 17b9ef2
Show file tree
Hide file tree
Showing 11 changed files with 104 additions and 24 deletions.
38 changes: 35 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"js-cookie": "^2.2.0",
"simplemde": "^1.11.2",
"sortablejs": "^1.7.0",
"tree-table-vue": "^1.0.5",
"tree-table-vue": "^1.1.0",
"vue": "^2.5.10",
"vue-i18n": "^7.8.0",
"vue-router": "^3.0.1",
Expand Down
16 changes: 14 additions & 2 deletions src/components/parent-view/parent-view.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
<template>
<router-view/>
<keep-alive :exclude="notCacheName">
<router-view ref="child"/>
</keep-alive>
</template>
<script>
export default {
name: 'ParentView'
name: 'ParentView',
data () {
return {
cacheChaildName: ''
}
},
computed: {
notCacheName () {
return (this.$route.meta && this.$route.meta.notCache) ? this.$route.name : ''
}
}
}
</script>
1 change: 1 addition & 0 deletions src/locale/lang/en-US.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default {
level_2_3: 'Level-2-3',
level_2_2: 'Level-2-2',
level_2_2_1: 'Level-2-2-1',
level_2_2_2: 'Level-2-2-2',
excel: 'Excel',
'upload-excel': 'Upload Excel',
'export-excel': 'Export Excel',
Expand Down
1 change: 1 addition & 0 deletions src/locale/lang/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default {
level_2_3: 'Level-2-3',
level_2_2: 'Level-2-2',
level_2_2_1: 'Level-2-2-1',
level_2_2_2: 'Level-2-2-2',
excel: 'Excel',
'upload-excel': '上传excel',
'export-excel': '导出excel',
Expand Down
1 change: 1 addition & 0 deletions src/locale/lang/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default {
level_2_3: 'Level-2-3',
level_2_2: 'Level-2-2',
level_2_2_1: 'Level-2-2-1',
level_2_2_2: 'Level-2-2-2',
excel: 'Excel',
'upload-excel': '上傳excel',
'export-excel': '導出excel',
Expand Down
11 changes: 10 additions & 1 deletion src/router/routers.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,16 @@ export default [
icon: 'md-funnel',
title: '三级'
},
component: () => import('@/view/multilevel/level-2-2/level-3-1.vue')
component: () => import('@/view/multilevel/level-2-2/level-2-2-1.vue')
},
{
path: 'level_2_2_2',
name: 'level_2_2_2',
meta: {
icon: 'md-funnel',
title: '三级'
},
component: () => import('@/view/multilevel/level-2-2/level-2-2-2.vue')
}
]
},
Expand Down
18 changes: 9 additions & 9 deletions src/view/components/tree-table/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
树状表格组件tree-table-vue,基于<a href="https://github.com/MisterTaki/vue-table-with-tree-grid">vue-table-with-tree-grid</a>进行开发,修复了一些bug,添加了一些新属性
<p><b>支持使用slot-scope进行自定义列渲染内容</b></p>
<p>文档请看<a href="https://github.com/lison16/tree-table-vue">https://github.com/lison16/tree-table-vue</a></p>
<tree-table expand-key="sex" :expand-type="false" :selection-type="false" :columns="columns" :data="data" >
<tree-table expand-key="sex" :expand-type="false" :selectable="false" :columns="columns" :data="data" >
<template slot="likes" slot-scope="scope">
<Button @click="handle(scope)">123</Button>
</template>
Expand All @@ -20,22 +20,22 @@ export default {
return {
columns: [
{
label: 'name',
prop: 'name',
title: 'name',
key: 'name',
width: '400px'
},
{
label: 'sex',
prop: 'sex',
title: 'sex',
key: 'sex',
minWidth: '50px'
},
{
label: 'score',
prop: 'score'
title: 'score',
key: 'score'
},
{
label: 'likes',
prop: 'likes',
title: 'likes',
key: 'likes',
minWidth: '200px',
type: 'template',
template: 'likes'
Expand Down
16 changes: 16 additions & 0 deletions src/view/multilevel/level-2-2/level-2-2-1.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<template>
<div>
<h3>多级菜单 -> 二级-2 -> 3级1</h3>
<Input v-model="val" style="width: 200px"></Input>
</div>
</template>
<script>
export default {
name: 'level_2_2_1',
data () {
return {
val: ''
}
}
}
</script>
16 changes: 16 additions & 0 deletions src/view/multilevel/level-2-2/level-2-2-2.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<template>
<div>
<h3>多级菜单 -> 二级-2 -> 3级2</h3>
<Input v-model="val" style="width: 200px"></Input>
</div>
</template>
<script>
export default {
name: 'level_2_2_2',
data () {
return {
val: ''
}
}
}
</script>
8 changes: 0 additions & 8 deletions src/view/multilevel/level-2-2/level-3-1.vue

This file was deleted.

0 comments on commit 17b9ef2

Please sign in to comment.