lisang
/
iview-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '2.0'

This commit is contained in:
zhigang.li 2018-11-21 18:37:23 +08:00
parent 037c8e820d 3ec36b6b8e
commit 17b9ef22aa
11 changed files with 104 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
package-lock.json generated
View File

@ -3403,6 +3403,11 @@
"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
"dev": true
},
"clonedeep": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/clonedeep/-/clonedeep-2.0.0.tgz",
"integrity": "sha1-jOygd39He78x/oyHGq9jo5C7wnI="
},
"co": {
"version": "4.6.0",
"resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
@ -13664,13 +13669,40 @@
}
},
"tree-table-vue": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/tree-table-vue/-/tree-table-vue-1.0.5.tgz",
"integrity": "sha512-dauAPky+jlUjW0G4TyYOFsBw9PgVTpcMS3GyPm9lvzTiWcF+wjoznLpfZLKNzheyv8oLE85Tc2qRzpwYQNTByg==",
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/tree-table-vue/-/tree-table-vue-1.1.0.tgz",
"integrity": "sha512-r5WUa5+s36Ud3Ycpp6+wqse6FkG3yDUsOUagjhoUbBld7H7JETntQRJ1oeL8jMj/oOH4gflkarG5h4QUX0zTtA==",
"requires": {
"clonedeep": "2.0.0",
"iview": "3.1.5",
"vue": "2.5.17"
},
"dependencies": {
"deepmerge": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz",
"integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA=="
},
"iview": {
"version": "3.1.5",
"resolved": "https://registry.npmjs.org/iview/-/iview-3.1.5.tgz",
"integrity": "sha512-lFom+Do/mJ4ejdu/+o/kCMWVGBpe85pIho7AsrOge/7IPuP5UbdSPu720qaEe4lC2T1AFczD74LlzqZ/mik0FA==",
"requires": {
"async-validator": "1.8.2",
"deepmerge": "2.2.1",
"element-resize-detector": "1.1.14",
"js-calendar": "1.2.3",
"lodash.throttle": "4.1.1",
"popper.js": "1.14.3",
"tinycolor2": "1.4.1",
"v-click-outside-x": "3.5.3"
}
},
"v-click-outside-x": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/v-click-outside-x/-/v-click-outside-x-3.5.3.tgz",
"integrity": "sha512-b7n42NTZ1lv4Q8MmRSyv4aatxnuH+jRbj+uL+EEihBJ2t93Vxt1/LQvca/qDRvvyVcrSGprS4HOYffX7Dk4uTg=="
},
"vue": {
"version": "2.5.17",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz",

2
package.json
View File

@ -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",

16
src/components/parent-view/parent-view.vue
View File

@ -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
src/locale/lang/en-US.js
View File

@ -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',

1
src/locale/lang/zh-CN.js
View File

@ -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',

1
src/locale/lang/zh-TW.js
View File

@ -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',

11
src/router/routers.js
View File

@ -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')
}
]
},

18
src/view/components/tree-table/index.vue
View File

@ -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>
@ -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'

16
src/view/multilevel/level-2-2/level-2-2-1.vue Normal file
View File

@ -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
src/view/multilevel/level-2-2/level-2-2-2.vue Normal file
View File

@ -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
src/view/multilevel/level-2-2/level-3-1.vue
View File

@ -1,8 +0,0 @@
<template>
<div>多级菜单 -> 二级-2 -> 3级</div>
</template>
<script>
export default {
name: 'level_3_1'
}
</script>