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-16 16:30:23 +08:00
parent cb88361a0d e33acdc8d2
commit bd4ffc49c8
8 changed files with 227 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package-lock.json generated
View File

@ -13663,6 +13663,21 @@
}
}
},
"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==",
"requires": {
"vue": "2.5.17"
},
"dependencies": {
"vue": {
"version": "2.5.17",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.5.17.tgz",
"integrity": "sha512-mFbcWoDIJi0w0Za4emyLiW72Jae0yjANHbCVquMKijcavBGypqlF7zHRgMa5k4sesdv7hv2rB4JPdZfR+TPfhQ=="
}
}
},
"trim-newlines": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",

1
package.json
View File

@ -24,6 +24,7 @@
"js-cookie": "^2.2.0",
"simplemde": "^1.11.2",
"sortablejs": "^1.7.0",
"tree-table-vue": "^1.0.5",
"vue": "^2.5.10",
"vue-i18n": "^7.8.0",
"vue-router": "^3.0.1",

3
src/locale/lang/en-US.js
View File

@ -36,5 +36,6 @@ export default {
query: 'Query',
params: 'Params',
cropper_page: 'Cropper',
message_page: 'Message Center'
message_page: 'Message Center',
tree_table_page: 'Tree Table'
}

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

@ -36,5 +36,6 @@ export default {
query: '带参路由',
params: '动态路由',
cropper_page: '图片裁剪',
message_page: '消息中心'
message_page: '消息中心',
tree_table_page: '树状表格'
}

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

@ -36,5 +36,6 @@ export default {
query: '帶參路由',
params: '動態路由',
cropper_page: '圖片裁剪',
message_page: '消息中心'
message_page: '消息中心',
tree_table_page: '樹狀表格'
}

2
src/main.js
View File

@ -11,6 +11,7 @@ import importDirective from '@/directive'
import installPlugin from '@/plugin'
import './index.less'
import '@/assets/icons/iconfont.css'
import TreeTable from 'tree-table-vue'
// 实际打包时应该不引入mock
/* eslint-disable */
if (process.env.NODE_ENV !== 'production') require('@/mock')
@ -18,6 +19,7 @@ if (process.env.NODE_ENV !== 'production') require('@/mock')
Vue.use(iView, {
i18n: (key, value) => i18n.t(key, value)
})
Vue.use(TreeTable)
/**
* @description 注册admin内置插件
*/

9
src/router/routers.js
View File

@ -125,6 +125,15 @@ export default [
},
component: () => import('@/view/components/drag-list/drag-list.vue')
},
{
path: 'tree_table_page',
name: 'tree_table_page',
meta: {
icon: 'md-git-branch',
title: '树状表格'
},
component: () => import('@/view/components/tree-table/index.vue')
},
{
path: 'cropper_page',
name: 'cropper_page',

194
src/view/components/tree-table/index.vue Normal file
View File

@ -0,0 +1,194 @@
<template>
<div>
<Card shadow>
树状表格组件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" >
<template slot="likes" slot-scope="scope">
<Button @click="handle(scope)">123</Button>
</template>
</tree-table>
</Card>
</div>
</template>
<script>
export default {
name: 'tree_table_page',
data () {
return {
columns: [
{
label: 'name',
prop: 'name',
width: '400px'
},
{
label: 'sex',
prop: 'sex',
minWidth: '50px'
},
{
label: 'score',
prop: 'score'
},
{
label: 'likes',
prop: 'likes',
minWidth: '200px',
type: 'template',
template: 'likes'
}
],
data: [
{
name: 'Jack',
sex: 'male',
likes: ['football', 'basketball'],
score: 10,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10
}
]
}
]
}
]
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10
}
]
},
{
name: 'Tom',
sex: 'male',
likes: ['football', 'basketball'],
score: 20,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10
}
]
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10
}
]
}
]
},
{
name: 'Tom',
sex: 'male',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Tom',
sex: 'male',
likes: ['football', 'basketball'],
score: 20,
children: [
{
name: 'Ashley',
sex: 'female',
likes: ['football', 'basketball'],
score: 20
},
{
name: 'Taki',
sex: 'male',
likes: ['football', 'basketball'],
score: 10
}
]
}
]
}
},
methods: {
handle (scope) {
console.log(scope)
}
}
}
</script>
<style>
</style>