Skip to content

Commit bd4ffc4

Browse files
author
zhigang.li
committed
Merge branch '2.0'
2 parents cb88361 + e33acdc commit bd4ffc4

File tree

8 files changed

+227
-3
lines changed

8 files changed

+227
-3
lines changed

‎package-lock.json

+15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"js-cookie": "^2.2.0",
2525
"simplemde": "^1.11.2",
2626
"sortablejs": "^1.7.0",
27+
"tree-table-vue": "^1.0.5",
2728
"vue": "^2.5.10",
2829
"vue-i18n": "^7.8.0",
2930
"vue-router": "^3.0.1",

‎src/locale/lang/en-US.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ export default {
3636
query: 'Query',
3737
params: 'Params',
3838
cropper_page: 'Cropper',
39-
message_page: 'Message Center'
39+
message_page: 'Message Center',
40+
tree_table_page: 'Tree Table'
4041
}

‎src/locale/lang/zh-CN.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ export default {
3636
query: '带参路由',
3737
params: '动态路由',
3838
cropper_page: '图片裁剪',
39-
message_page: '消息中心'
39+
message_page: '消息中心',
40+
tree_table_page: '树状表格'
4041
}

‎src/locale/lang/zh-TW.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,6 @@ export default {
3636
query: '帶參路由',
3737
params: '動態路由',
3838
cropper_page: '圖片裁剪',
39-
message_page: '消息中心'
39+
message_page: '消息中心',
40+
tree_table_page: '樹狀表格'
4041
}

‎src/main.js

+2
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@ import importDirective from '@/directive'
1111
import installPlugin from '@/plugin'
1212
import './index.less'
1313
import '@/assets/icons/iconfont.css'
14+
import TreeTable from 'tree-table-vue'
1415
// 实际打包时应该不引入mock
1516
/* eslint-disable */
1617
if (process.env.NODE_ENV !== 'production') require('@/mock')
1718

1819
Vue.use(iView, {
1920
i18n: (key, value) => i18n.t(key, value)
2021
})
22+
Vue.use(TreeTable)
2123
/**
2224
* @description 注册admin内置插件
2325
*/

‎src/router/routers.js

+9
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,15 @@ export default [
125125
},
126126
component: () => import('@/view/components/drag-list/drag-list.vue')
127127
},
128+
{
129+
path: 'tree_table_page',
130+
name: 'tree_table_page',
131+
meta: {
132+
icon: 'md-git-branch',
133+
title: '树状表格'
134+
},
135+
component: () => import('@/view/components/tree-table/index.vue')
136+
},
128137
{
129138
path: 'cropper_page',
130139
name: 'cropper_page',

‎src/view/components/tree-table/index.vue

+194
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
<template>
2+
<div>
3+
<Card shadow>
4+
树状表格组件tree-table-vue，基于<a href="https://github.com/MisterTaki/vue-table-with-tree-grid">vue-table-with-tree-grid</a>进行开发，修复了一些bug，添加了一些新属性
5+
<p><b>支持使用slot-scope进行自定义列渲染内容</b></p>
6+
<p>文档请看<a href="https://github.com/lison16/tree-table-vue">https://github.com/lison16/tree-table-vue</a></p>
7+
<tree-table expand-key="sex" :expand-type="false" :selection-type="false" :columns="columns" :data="data" >
8+
<template slot="likes" slot-scope="scope">
9+
<Button @click="handle(scope)">123</Button>
10+
</template>
11+
</tree-table>
12+
</Card>
13+
</div>
14+
</template>
15+
16+
<script>
17+
export default {
18+
name: 'tree_table_page',
19+
data () {
20+
return {
21+
columns: [
22+
{
23+
label: 'name',
24+
prop: 'name',
25+
width: '400px'
26+
},
27+
{
28+
label: 'sex',
29+
prop: 'sex',
30+
minWidth: '50px'
31+
},
32+
{
33+
label: 'score',
34+
prop: 'score'
35+
},
36+
{
37+
label: 'likes',
38+
prop: 'likes',
39+
minWidth: '200px',
40+
type: 'template',
41+
template: 'likes'
42+
}
43+
],
44+
data: [
45+
{
46+
name: 'Jack',
47+
sex: 'male',
48+
likes: ['football', 'basketball'],
49+
score: 10,
50+
children: [
51+
{
52+
name: 'Ashley',
53+
sex: 'female',
54+
likes: ['football', 'basketball'],
55+
score: 20,
56+
children: [
57+
{
58+
name: 'Ashley',
59+
sex: 'female',
60+
likes: ['football', 'basketball'],
61+
score: 20
62+
},
63+
{
64+
name: 'Taki',
65+
sex: 'male',
66+
likes: ['football', 'basketball'],
67+
score: 10,
68+
children: [
69+
{
70+
name: 'Ashley',
71+
sex: 'female',
72+
likes: ['football', 'basketball'],
73+
score: 20
74+
},
75+
{
76+
name: 'Taki',
77+
sex: 'male',
78+
likes: ['football', 'basketball'],
79+
score: 10,
80+
children: [
81+
{
82+
name: 'Ashley',
83+
sex: 'female',
84+
likes: ['football', 'basketball'],
85+
score: 20
86+
},
87+
{
88+
name: 'Taki',
89+
sex: 'male',
90+
likes: ['football', 'basketball'],
91+
score: 10
92+
}
93+
]
94+
}
95+
]
96+
}
97+
]
98+
},
99+
{
100+
name: 'Taki',
101+
sex: 'male',
102+
likes: ['football', 'basketball'],
103+
score: 10
104+
}
105+
]
106+
},
107+
{
108+
name: 'Tom',
109+
sex: 'male',
110+
likes: ['football', 'basketball'],
111+
score: 20,
112+
children: [
113+
{
114+
name: 'Ashley',
115+
sex: 'female',
116+
likes: ['football', 'basketball'],
117+
score: 20,
118+
children: [
119+
{
120+
name: 'Ashley',
121+
sex: 'female',
122+
likes: ['football', 'basketball'],
123+
score: 20
124+
},
125+
{
126+
name: 'Taki',
127+
sex: 'male',
128+
likes: ['football', 'basketball'],
129+
score: 10
130+
}
131+
]
132+
},
133+
{
134+
name: 'Taki',
135+
sex: 'male',
136+
likes: ['football', 'basketball'],
137+
score: 10,
138+
children: [
139+
{
140+
name: 'Ashley',
141+
sex: 'female',
142+
likes: ['football', 'basketball'],
143+
score: 20
144+
},
145+
{
146+
name: 'Taki',
147+
sex: 'male',
148+
likes: ['football', 'basketball'],
149+
score: 10
150+
}
151+
]
152+
}
153+
]
154+
},
155+
{
156+
name: 'Tom',
157+
sex: 'male',
158+
likes: ['football', 'basketball'],
159+
score: 20
160+
},
161+
{
162+
name: 'Tom',
163+
sex: 'male',
164+
likes: ['football', 'basketball'],
165+
score: 20,
166+
children: [
167+
{
168+
name: 'Ashley',
169+
sex: 'female',
170+
likes: ['football', 'basketball'],
171+
score: 20
172+
},
173+
{
174+
name: 'Taki',
175+
sex: 'male',
176+
likes: ['football', 'basketball'],
177+
score: 10
178+
}
179+
]
180+
}
181+
]
182+
}
183+
},
184+
methods: {
185+
handle (scope) {
186+
console.log(scope)
187+
}
188+
}
189+
}
190+
</script>
191+
192+
<style>
193+
194+
</style>

0 commit comments

Comments
 (0)