Skip to content

Commit 5e84b8d

Browse files
authored
Merge pull request #1 from WeBankFinTech/master
merge
2 parents edf07d5 + 07e865c commit 5e84b8d

File tree

12 files changed

+18
-18
lines changed

12 files changed

+18
-18
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ English | [Chinese](docs/zh_CN/README.md)
99

1010
Scriptis is for interactive data analysis with script development(SQL, Pyspark, HiveQL), task submission(Spark, Hive), UDF, function, resource management and intelligent diagnosis.
1111

12-
![运行时功能](docs/zh_CN/images/readme/running.gif)
12+
![running](docs/en_US/images/readme/running.gif)
1313

1414
## Features
1515

docs/en_US/images/readme/cs.gif

732 KB
Loading
-138 KB
Loading
-748 KB
Loading
2.8 MB
Loading
-870 KB
Loading

docs/en_US/images/readme/setup.gif

754 KB
Loading

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "scriptis",
3-
"version": "0.7.0",
3+
"version": "0.7.1",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",

src/js/component/table/list.vue

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div
33
class="list-view"
44
ref="list">
5-
<vuescroll
5+
<vue-scroll
66
:ops="ops"
77
@handle-scroll="handleScroll">
88
<list-body
@@ -24,15 +24,15 @@
2424
</div>
2525
</div>
2626
</list-body>
27-
</vuescroll>
27+
</vue-scroll>
2828
</div>
2929
</template>
3030
<script>
3131
import listBody from './body.vue';
32-
import vuescroll from 'vuescroll/dist/vuescroll-native';
32+
import vueScroll from './vuescroll/vuescroll-native.js';
3333
export default {
3434
components: {
35-
vuescroll,
35+
vueScroll,
3636
listBody,
3737
},
3838
props: {
@@ -77,7 +77,7 @@ export default {
7777
},
7878
methods: {
7979
handleScroll(v, h) {
80-
this.$emit('on-scroll', { v, h });
80+
this.$emit('on-scroll', {v, h});
8181
this.$refs.body.handleScroll(v, h);
8282
},
8383
columnItemClick(index) {

src/js/component/table/table.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export default {
180180
},
181181
};
182182
</script>
183-
<style lang="scss" src="./index.scss"></style>
183+
<style lang="sass" src="./index.scss"></style>
184184
<style>
185185
.list-view {
186186
width: 100%;

0 commit comments

Comments
 (0)