Skip to content

Commit 6eca8e4

Browse files
committed
add
1 parent 7bedb86 commit 6eca8e4

File tree

17 files changed

+323
-339
lines changed

17 files changed

+323
-339
lines changed

package.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
},
3636
"devDependencies": {
3737
"autoprefixer": "6.7.2",
38+
"axios-mock-adapter": "^1.8.1",
3839
"babel-core": "6.22.1",
3940
"babel-eslint": "7.1.1",
4041
"babel-loader": "6.2.10",
@@ -47,11 +48,11 @@
4748
"copy-webpack-plugin": "4.0.1",
4849
"css-loader": "0.26.1",
4950
"eslint": "3.14.1",
51+
"eslint-config-airbnb-base": "11.0.1",
5052
"eslint-friendly-formatter": "2.0.7",
53+
"eslint-import-resolver-webpack": "0.8.1",
5154
"eslint-loader": "1.6.1",
5255
"eslint-plugin-html": "2.0.0",
53-
"eslint-config-airbnb-base": "11.0.1",
54-
"eslint-import-resolver-webpack": "0.8.1",
5556
"eslint-plugin-import": "2.2.0",
5657
"eventsource-polyfill": "0.9.6",
5758
"express": "4.14.1",
@@ -61,26 +62,26 @@
6162
"function-bind": "1.1.0",
6263
"html-webpack-plugin": "2.28.0",
6364
"http-proxy-middleware": "0.17.3",
64-
"webpack-bundle-analyzer": "2.2.1",
65-
"semver": "5.3.0",
65+
"node-sass": "3.7.0",
6666
"opn": "4.0.2",
6767
"optimize-css-assets-webpack-plugin": "1.3.0",
6868
"ora": "1.1.0",
69+
"pushstate-server": "2.1.0",
6970
"rimraf": "2.6.0",
71+
"sass-loader": "4.0.2",
72+
"script-loader": "0.7.0",
73+
"semver": "5.3.0",
74+
"style-loader": "0.13.1",
7075
"url-loader": "0.5.7",
7176
"vue-loader": "11.3.4",
7277
"vue-style-loader": "2.0.0",
7378
"vue-template-compiler": "2.2.6",
7479
"webpack": "2.2.1",
80+
"webpack-bundle-analyzer": "2.2.1",
81+
"webpack-dashboard": "0.2.1",
7582
"webpack-dev-middleware": "1.10.0",
7683
"webpack-hot-middleware": "2.16.1",
77-
"webpack-merge": "2.6.1",
78-
"webpack-dashboard": "0.2.1",
79-
"node-sass": "3.7.0",
80-
"pushstate-server": "2.1.0",
81-
"sass-loader": "4.0.2",
82-
"script-loader": "0.7.0",
83-
"style-loader": "0.13.1"
84+
"webpack-merge": "2.6.1"
8485
},
8586
"engines": {
8687
"node": ">= 4.0.0",

src/components/Dropzone/index.vue

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,17 +57,20 @@
5757
}
5858
},
5959
accept: (file, done) => {
60-
const token = this.$store.getters.token;
61-
getToken(token).then(response => {
62-
file.token = response.data.qiniu_token;
63-
file.key = response.data.qiniu_key;
64-
file.url = response.data.qiniu_url;
65-
done();
66-
})
60+
/* 七牛*/
61+
// const token = this.$store.getters.token;
62+
// getToken(token).then(response => {
63+
// file.token = response.data.qiniu_token;
64+
// file.key = response.data.qiniu_key;
65+
// file.url = response.data.qiniu_url;
66+
// done();
67+
// })
68+
done();
6769
},
6870
sending: (file, xhr, formData) => {
69-
formData.append('token', file.token);
70-
formData.append('key', file.key);
71+
/* 七牛*/
72+
// formData.append('token', file.token);
73+
// formData.append('key', file.key);
7174
vm.initOnce = false;
7275
}
7376
});

src/components/SplitPane/Pane.vue

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,12 @@
77
<script>
88
export default {
99
name: 'Pane',
10-
props: {
11-
// split: {
12-
// validator: function (value) {
13-
// return ['vertical', 'horizontal'].indexOf(value) >= 0
14-
// },
15-
// required: true
16-
// }
17-
},
18-
// computed:{
19-
// classes () {
20-
// return this.$parent.split
21-
// },
22-
// },
2310
data() {
2411
const classes = ['Pane', this.$parent.split, 'className'];
2512
return {
2613
classes: classes.join(' '),
2714
percent: 50
2815
}
29-
},
30-
created() {
31-
// console.log(this.$parent.split)
32-
},
33-
34-
methods: {
35-
3616
}
3717
}
3818
</script>

src/components/SplitPane/Resizer.vue

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
11
<template>
22
<div :class="classes" @mousedown="onMouseDown"></div>
33
</template>
4+
<script>
5+
export default {
6+
props: {
7+
split: {
8+
validator(value) {
9+
return ['vertical', 'horizontal'].indexOf(value) >= 0
10+
},
11+
required: true
12+
},
13+
onMouseDown: {
14+
type: Function,
15+
required: true
16+
}
17+
},
18+
data() {
19+
const classes = ['Resizer', this.split, 'className'];
20+
return {
21+
classes: classes.join(' ')
22+
}
23+
}
24+
}
25+
</script>
426
<style scoped>
527
.Resizer {
628
-moz-box-sizing: border-box;
@@ -37,8 +59,6 @@
3759
.Resizer.vertical {
3860
width: 11px;
3961
height: 100%;
40-
/*margin: 0 -5px;*/
41-
4262
border-left: 5px solid rgba(255, 255, 255, 0);
4363
border-right: 5px solid rgba(255, 255, 255, 0);
4464
cursor: col-resize;
@@ -49,27 +69,3 @@
4969
border-right: 5px solid rgba(0, 0, 0, 0.5);
5070
}
5171
</style>
52-
<script>
53-
export default {
54-
props: {
55-
split: {
56-
validator(value) {
57-
return ['vertical', 'horizontal'].indexOf(value) >= 0
58-
},
59-
required: true
60-
},
61-
onMouseDown: {
62-
type: Function,
63-
required: true
64-
}
65-
},
66-
data() {
67-
const classes = ['Resizer', this.split, 'className'];
68-
return {
69-
classes: classes.join(' ')
70-
}
71-
},
72-
73-
methods: {}
74-
}
75-
</script>

src/components/SplitPane/SplitPane-backup.vue

Lines changed: 0 additions & 175 deletions
This file was deleted.

src/components/SplitPane/index.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/components/SplitPane/SplitPane.vue renamed to src/components/SplitPane/index.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
mounted() {
6767
const element = this.$el;
6868
const elementOffset = element.getBoundingClientRect();
69-
console.log(elementOffset.height)
7069
// this.height = elementOffset.height+'px';
7170
},
7271
methods: {

0 commit comments

Comments
 (0)