Skip to content

Commit 4e618a6

Browse files
sendyasendya
committed
chore: update eslint rules & fix rule
1 parent 3ee153f commit 4e618a6

File tree

132 files changed

+5117
-5097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+5117
-5097
lines changed

‎package.json‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
"@vue/cli-plugin-babel": "^3.3.0",
3232
"@vue/cli-plugin-eslint": "^3.3.0",
3333
"@vue/cli-plugin-unit-jest": "^3.3.0",
34-
"@vue/cli-service": "^3.2.1",
34+
"@vue/cli-service": "^3.3.0",
3535
"@vue/eslint-config-standard": "^4.0.0",
3636
"@vue/test-utils": "^1.0.0-beta.20",
3737
"babel-core": "7.0.0-bridge.0",
3838
"babel-eslint": "^10.0.1",
3939
"babel-jest": "^23.6.0",
40-
"eslint": "^5.12.1",
40+
"eslint": "^5.8.0",
4141
"eslint-plugin-html": "^5.0.0",
42-
"eslint-plugin-vue": "^5.1.0",
42+
"eslint-plugin-vue": "^5.0.0",
4343
"less": "^3.8.1",
4444
"less-loader": "^4.1.0",
4545
"vue-template-compiler": "^2.5.22"
@@ -51,7 +51,7 @@
5151
},
5252
"extends": [
5353
"plugin:vue/strongly-recommended",
54-
"eslint:recommended"
54+
"@vue/standard"
5555
],
5656
"parserOptions": {
5757
"parser": "babel-eslint"
@@ -80,6 +80,7 @@
8080
"vue/html-closing-bracket-newline": 0,
8181
"vue/no-parsing-error": 0,
8282
"no-console": 0,
83+
"no-tabs": 0,
8384
"quotes": [
8485
2,
8586
"single",

‎src/App.vue‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,40 @@
77
</template>
88

99
<script>
10-
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
11-
import { deviceEnquire, DEVICE_TYPE } from '@/utils/device'
10+
import zhCN from 'ant-design-vue/lib/locale-provider/zh_CN'
11+
import { deviceEnquire, DEVICE_TYPE } from '@/utils/device'
1212
13-
export default {
14-
data () {
15-
return {
16-
locale: zhCN
17-
}
18-
},
19-
mounted () {
20-
const { $store } = this
21-
deviceEnquire(deviceType => {
22-
23-
switch (deviceType) {
24-
case DEVICE_TYPE.DESKTOP:
25-
$store.commit('TOGGLE_DEVICE', 'desktop')
26-
$store.dispatch('setSidebar', true)
27-
break
28-
case DEVICE_TYPE.TABLET:
29-
$store.commit('TOGGLE_DEVICE', 'tablet')
30-
$store.dispatch('setSidebar', false)
31-
break
32-
case DEVICE_TYPE.MOBILE:
33-
default:
34-
$store.commit('TOGGLE_DEVICE', 'mobile')
35-
$store.dispatch('setSidebar', true)
36-
break
37-
}
38-
console.log('deviceType', deviceType)
39-
})
13+
export default {
14+
data () {
15+
return {
16+
locale: zhCN
4017
}
18+
},
19+
mounted () {
20+
const { $store } = this
21+
deviceEnquire(deviceType => {
22+
switch (deviceType) {
23+
case DEVICE_TYPE.DESKTOP:
24+
$store.commit('TOGGLE_DEVICE', 'desktop')
25+
$store.dispatch('setSidebar', true)
26+
break
27+
case DEVICE_TYPE.TABLET:
28+
$store.commit('TOGGLE_DEVICE', 'tablet')
29+
$store.dispatch('setSidebar', false)
30+
break
31+
case DEVICE_TYPE.MOBILE:
32+
default:
33+
$store.commit('TOGGLE_DEVICE', 'mobile')
34+
$store.dispatch('setSidebar', true)
35+
break
36+
}
37+
console.log('deviceType', deviceType)
38+
})
4139
}
40+
}
4241
</script>
4342
<style>
4443
#app {
4544
height: 100%;
4645
}
47-
</style>
46+
</style>

‎src/api/index.js‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const api = {
2-
Login: '/auth/login',
3-
Logout: '/auth/logout',
4-
ForgePassword: '/auth/forge-password',
5-
Register: '/auth/register',
6-
twoStepCode: '/auth/2step-code',
7-
SendSms: '/account/sms',
8-
SendSmsErr: '/account/sms_err',
9-
// get my info
10-
UserInfo: '/user/info'
2+
Login: '/auth/login',
3+
Logout: '/auth/logout',
4+
ForgePassword: '/auth/forge-password',
5+
Register: '/auth/register',
6+
twoStepCode: '/auth/2step-code',
7+
SendSms: '/account/sms',
8+
SendSmsErr: '/account/sms_err',
9+
// get my info
10+
UserInfo: '/user/info'
1111
}
12-
export default api
12+
export default api

‎src/api/login.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,23 @@ import { axios } from '@/utils/request'
1212
* @param parameter
1313
* @returns {*}
1414
*/
15-
export function login(parameter) {
15+
export function login (parameter) {
1616
return axios({
1717
url: '/auth/login',
1818
method: 'post',
1919
data: parameter
2020
})
2121
}
2222

23-
export function getSmsCaptcha(parameter) {
23+
export function getSmsCaptcha (parameter) {
2424
return axios({
2525
url: api.SendSms,
2626
method: 'post',
2727
data: parameter
2828
})
2929
}
3030

31-
export function getInfo() {
31+
export function getInfo () {
3232
return axios({
3333
url: '/user/info',
3434
method: 'get',
@@ -38,7 +38,7 @@ export function getInfo() {
3838
})
3939
}
4040

41-
export function logout() {
41+
export function logout () {
4242
return axios({
4343
url: '/auth/logout',
4444
method: 'post',
@@ -52,10 +52,10 @@ export function logout() {
5252
* get user 2step code open?
5353
* @param parameter {*}
5454
*/
55-
export function get2step(parameter) {
55+
export function get2step (parameter) {
5656
return axios({
5757
url: api.twoStepCode,
5858
method: 'post',
5959
data: parameter
6060
})
61-
}
61+
}

‎src/api/manage.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@ const api = {
1111

1212
export default api
1313

14-
export function getUserList(parameter) {
14+
export function getUserList (parameter) {
1515
return axios({
1616
url: api.user,
1717
method: 'get',
1818
params: parameter
1919
})
2020
}
2121

22-
export function getRoleList(parameter) {
22+
export function getRoleList (parameter) {
2323
return axios({
2424
url: api.role,
2525
method: 'get',
2626
params: parameter
2727
})
2828
}
2929

30-
export function getServiceList(parameter) {
30+
export function getServiceList (parameter) {
3131
return axios({
3232
url: api.service,
3333
method: 'get',
3434
params: parameter
3535
})
3636
}
3737

38-
export function getPermissions(parameter) {
38+
export function getPermissions (parameter) {
3939
return axios({
4040
url: api.permissionNoPager,
4141
method: 'get',
4242
params: parameter
4343
})
4444
}
4545

46-
export function getOrgTree(parameter) {
46+
export function getOrgTree (parameter) {
4747
return axios({
4848
url: api.orgTree,
4949
method: 'get',
@@ -53,10 +53,10 @@ export function getOrgTree(parameter) {
5353

5454
// id == 0 add post
5555
// id != 0 update put
56-
export function saveService(parameter) {
56+
export function saveService (parameter) {
5757
return axios({
5858
url: api.service,
59-
method: parameter.id == 0 ? 'post' : 'put',
59+
method: parameter.id === 0 ? 'post' : 'put',
6060
data: parameter
6161
})
62-
}
62+
}

‎src/components/AvatarList/Item.vue‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,40 @@
77
</template>
88

99
<script>
10-
import Avatar from 'ant-design-vue/es/avatar'
11-
import Tooltip from 'ant-design-vue/es/tooltip'
10+
import Avatar from 'ant-design-vue/es/avatar'
11+
import Tooltip from 'ant-design-vue/es/tooltip'
1212
13-
export default {
14-
name: 'AvatarItem',
15-
components: {
16-
Avatar,
17-
Tooltip
13+
export default {
14+
name: 'AvatarItem',
15+
components: {
16+
Avatar,
17+
Tooltip
18+
},
19+
props: {
20+
tips: {
21+
type: String,
22+
default: '',
23+
required: false
1824
},
19-
props: {
20-
tips: {
21-
type: String,
22-
default: '',
23-
required: false
24-
},
25-
src: {
26-
type: String,
27-
default: ''
28-
}
29-
},
30-
data () {
31-
return {
32-
size: this.$parent.size
33-
}
34-
},
35-
computed: {
36-
avatarSize () {
37-
return this.size !== 'mini' && this.size || 20
38-
}
39-
},
40-
watch: {
41-
'$parent.size' (val) {
42-
this.size = val
43-
}
25+
src: {
26+
type: String,
27+
default: ''
28+
}
29+
},
30+
data () {
31+
return {
32+
size: this.$parent.size
33+
}
34+
},
35+
computed: {
36+
avatarSize () {
37+
return this.size !== 'mini' && this.size || 20
38+
}
39+
},
40+
watch: {
41+
'$parent.size' (val) {
42+
this.size = val
4443
}
4544
}
46-
</script>
45+
}
46+
</script>

0 commit comments

Comments
 (0)