Skip to content

Commit c182d31

Browse files
committed
Merge branch 'feature/refector' into develop
2 parents 266c8c6 + 0029bec commit c182d31

File tree

4 files changed

+80
-277
lines changed

4 files changed

+80
-277
lines changed

demo/app.vue

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,30 @@
11
<template>
2-
<section class='main-container' :class='{full: index === 2, "width-full": index === 3}'>
2+
<section class='main-container' :class='{full: index === 2, "width-full": index === 1}'>
33
<div class='sidebar'>
44
<div class='inner'>
55
<div class="root-menu" @click='index = 1' :class='{active: index === 1}'>
6-
全局滚动
6+
垂直方向全局滚动/水平方向局部滚动
77
</div>
88
<div class="root-menu" @click='index = 2' :class='{active: index === 2}'>
99
局部滚动
1010
</div>
11-
<div class="root-menu" @click='index = 3' :class='{active: index === 3}'>
12-
垂直方向全局滚动/水平方向局部滚动
13-
</div>
1411
</div>
1512
</div>
16-
<div class='main-wraper' :class='{full: index === 2, "width-full": index === 3}'>
13+
<div class='main-wraper' :class='{full: index === 2, "width-full": index === 1}'>
1714
<div class='view'>
1815
<div class='view-title' v-if='index === 1'>
19-
表格一:全局滚动.滚动时固定顶部/左侧/右侧
16+
表格一:高度跟随全局,宽度自适应且x轴滚动. 出现虚拟x滚动条.解决滚动条太下无法拖动问题.同时固定顶部/左侧/右侧
2017
</div>
2118
<div class='view-title' v-if='index === 2'>
2219
表格二:容器内局部滚动,滚动时在容器内固定顶部/左侧/右侧
2320
</div>
24-
<div class='view-title' v-if='index === 3'>
25-
表格三:高度跟随全局,宽度自适应且x轴滚动. 出现虚拟x滚动条.解决滚动条太下无法拖动问题.同时固定顶部/左侧/右侧
26-
</div>
2721
<components class='markdown-body' :is='code'></components>
28-
<!-- <div class='code markdown-body' v-html='html'></div> -->
2922
<div class='view-content' v-loading='!load'>
3023
<template v-if='load'>
31-
<demo :data='data' v-if='index === 1' :offsetTop='50'></demo>
24+
<demo :data='data' self-scroll v-if='index === 1' :offsetTop='50'></demo>
3225
<div id='scroll' class='scroll-container border' v-if='index === 2'>
3326
<demo :data='data' scrollTarget='#scroll'></demo>
3427
</div>
35-
<demo :data='data' self-scroll v-if='index === 3' :offsetTop='50'></demo>
3628
</template>
3729
</div>
3830
</div>

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"cross-env": "^5.2.0",
4747
"css-loader": "^1.0.0",
4848
"cssnano": "^4.1.0",
49+
"cz-conventional-changelog": "^2.1.0",
4950
"element-ui": "^2.4.7",
5051
"eslint": "^5.6.0",
5152
"eslint-config-airbnb-base": "^13.1.0",
@@ -88,5 +89,10 @@
8889
"webpack-dev-server": "^3.1.8",
8990
"webpack-hot-middleware": "^2.24.0",
9091
"webpack-merge": "^4.1.4"
92+
},
93+
"config": {
94+
"commitizen": {
95+
"path": "./node_modules/cz-conventional-changelog"
96+
}
9197
}
9298
}

0 commit comments

Comments
 (0)