Skip to content

Commit 688ec72

Browse files
demonraydemonray
committed
remove local vuescroll
1 parent e10f78c commit 688ec72

File tree

13 files changed

+198
-284
lines changed

13 files changed

+198
-284
lines changed

Diff for: ‎.eslintrc.js

+66-66
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
module.exports = {
2-
root: true,
3-
env: {
4-
node: true
5-
},
6-
'extends': [
7-
'plugin:vue/essential',
8-
'@vue/standard'
9-
],
10-
rules: {
11-
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12-
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
13-
'key-spacing': ['error'],
14-
'keyword-spacing': ['error'],
15-
'standard/no-callback-literal': 0,
16-
'handle-callback-err': 0,
17-
'no-return-assign': 0,
18-
'eqeqeq': 0,
19-
'comma-dangle': 0,
20-
'semi': 0,
21-
'space-before-function-paren': 0,
22-
'keyword-spacing': 0,
23-
'no-useless-escape': 0,
24-
'no-invalid-this': 0,
25-
'operator-linebreak': 0,
26-
'indent': [
27-
'error',
28-
4,
29-
{
30-
'SwitchCase': 1
31-
}
2+
root: true,
3+
env: {
4+
node: true
5+
},
6+
'extends': [
7+
'plugin:vue/essential',
8+
'@vue/standard'
329
],
33-
'no-const-assign': 'warn',
34-
'no-this-before-super': 'warn',
35-
'no-undef': 2,
36-
'no-unreachable': 'warn',
37-
'no-unused-vars': 'warn',
38-
'constructor-super': 'warn',
39-
'valid-typeof': 'warn',
40-
'one-var': 'warn',
41-
'max-len': 'off',
42-
'no-trailing-spaces': 'off',
43-
'require-jsdoc': 'warn',
44-
'camelcase': 'warn',
45-
'no-invalid-this': 'warn',
46-
'linebreak-style': 0,
47-
'vue/no-parsing-error': [2, {
48-
'x-invalid-end-tag': false,
49-
'invalid-first-character-of-tag-name': false
50-
}],
51-
'no-tabs': 0,
52-
'vue/html-indent': [2, 2, {
53-
'attribute': 1,
54-
'closeBracket': 0,
55-
'alignAttributesVertically': false
56-
}],
57-
'vue/require-default-prop': 0,
58-
'vue/component-name-in-template-casing': 0,
59-
'vue/html-closing-bracket-spacing': 0,
60-
'vue/html-closing-bracket-newline': 0,
61-
'vue/singleline-html-element-content-newline': 0,
62-
'vue/multiline-html-element-content-newline': 0,
63-
'vue/attributes-order': 0,
64-
'vue/html-self-closing': 0
65-
},
66-
parserOptions: {
67-
parser: 'babel-eslint'
68-
}
10+
rules: {
11+
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
12+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
13+
'key-spacing': ['error'],
14+
'keyword-spacing': ['error'],
15+
'standard/no-callback-literal': 0,
16+
'handle-callback-err': 0,
17+
'no-return-assign': 0,
18+
'eqeqeq': 0,
19+
'comma-dangle': 0,
20+
'semi': 0,
21+
'space-before-function-paren': 0,
22+
'keyword-spacing': 0,
23+
'no-useless-escape': 0,
24+
'no-invalid-this': 0,
25+
'operator-linebreak': 0,
26+
'indent': [
27+
'error',
28+
4,
29+
{
30+
'SwitchCase': 1
31+
}
32+
],
33+
'no-const-assign': 'warn',
34+
'no-this-before-super': 'warn',
35+
'no-undef': 2,
36+
'no-unreachable': 'warn',
37+
'no-unused-vars': 'warn',
38+
'constructor-super': 'warn',
39+
'valid-typeof': 'warn',
40+
'one-var': 'warn',
41+
'max-len': 'off',
42+
'no-trailing-spaces': 'off',
43+
'require-jsdoc': 'warn',
44+
'camelcase': 'warn',
45+
'no-invalid-this': 'warn',
46+
'linebreak-style': 0,
47+
'vue/no-parsing-error': [2, {
48+
'x-invalid-end-tag': false,
49+
'invalid-first-character-of-tag-name': false
50+
}],
51+
'no-tabs': 0,
52+
'vue/html-indent': [2, 2, {
53+
'attribute': 1,
54+
'closeBracket': 0,
55+
'alignAttributesVertically': false
56+
}],
57+
'vue/require-default-prop': 0,
58+
'vue/component-name-in-template-casing': 0,
59+
'vue/html-closing-bracket-spacing': 0,
60+
'vue/html-closing-bracket-newline': 0,
61+
'vue/singleline-html-element-content-newline': 0,
62+
'vue/multiline-html-element-content-newline': 0,
63+
'vue/attributes-order': 0,
64+
'vue/html-self-closing': 0
65+
},
66+
parserOptions: {
67+
parser: 'babel-eslint'
68+
}
6969
}

Diff for: ‎babel.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
presets: [
3-
'@vue/app'
4-
]
2+
presets: [
3+
'@vue/app'
4+
]
55
}

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"sql-formatter": "^2.1.0",
2626
"vue": "^2.6.6",
2727
"vue-router": "^3.0.1",
28-
"vuescroll": "^4.10.5"
28+
"vuescroll": "^4.13.1"
2929
},
3030
"devDependencies": {
3131
"@vue/cli-plugin-babel": "^3.8.0",

Diff for: ‎postcss.config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module.exports = {
2-
plugins: {
3-
autoprefixer: {}
4-
}
2+
plugins: {
3+
autoprefixer: {}
4+
}
55
}

Diff for: ‎src/js/component/panel/panel.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export default {
103103
}
104104
});
105105
this.items.forEach((element) => {
106-
if (!element.width) {
106+
if (element && !element.width) {
107107
element.currentWidth = this.readyToAllocationWidth / this.readyToAllocationItemLength;
108108
}
109109
});

Diff for: ‎src/js/component/table/index.scss

+23-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ $border-color : #e0e0e0;
88
}
99
}
1010
.we-table-header{
11+
height: 40px;
12+
line-height: 40px;
1113
background-color: rgb(94, 157, 224);
1214
color: #fff;
1315
ul{
@@ -22,6 +24,22 @@ $border-color : #e0e0e0;
2224
}
2325
}
2426
}
27+
.list-header .list-view-item{
28+
color: #fff;
29+
border-right: 1px solid #e8eaec;
30+
}
31+
.we-column-item{
32+
border-right: 1px solid #e8eaec;
33+
&.null-text {
34+
color: #ed4014;
35+
}
36+
&.active {
37+
background-color: #ebf7ff;
38+
}
39+
}
40+
.header-list::-webkit-scrollbar{
41+
display: none;
42+
}
2543
.caret-wrapper{
2644
display: -ms-inline-flexbox;
2745
display: inline-flex;
@@ -40,7 +58,11 @@ $border-color : #e0e0e0;
4058
position: absolute;
4159
top: 0;
4260
left:0px;
43-
overflow: hidden;
61+
width: 100%;
62+
height: 100%;
63+
}
64+
.we-table-body{
65+
height: calc(100% - 40px);
4466
}
4567
.we-table-sort-caret{
4668
width: 0;

Diff for: ‎src/js/component/table/list.vue

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div
33
class="list-view"
44
ref="list">
5-
<vue-scroll
5+
<vuescroll
66
:ops="ops"
77
@handle-scroll="handleScroll">
88
<list-body
@@ -24,15 +24,15 @@
2424
</div>
2525
</div>
2626
</list-body>
27-
</vue-scroll>
27+
</vuescroll>
2828
</div>
2929
</template>
3030
<script>
3131
import listBody from './body.vue';
32-
import vueScroll from './vuescroll/vuescroll-native.js';
32+
import vuescroll from 'vuescroll/dist/vuescroll-native';
3333
export default {
3434
components: {
35-
vueScroll,
35+
vuescroll,
3636
listBody,
3737
},
3838
props: {

0 commit comments

Comments
 (0)