Skip to content

Commit 8951a46

Browse files
committed
refactor: update antd-vue 1.5.3
- merge components use js to lazy_use.js - remove old Result components - remove Vue.ls - add `store.js` - rename axios service
1 parent 000f8e9 commit 8951a46

File tree

23 files changed

+210
-373
lines changed

23 files changed

+210
-373
lines changed

β€Žpackage.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
},
1414
"dependencies": {
1515
"@antv/data-set": "^0.10.2",
16-
"ant-design-vue": "1.5.0-rc.6",
16+
"ant-design-vue": "1.5.3",
1717
"axios": "^0.19.0",
1818
"core-js": "^3.1.2",
1919
"enquire.js": "^2.1.6",
@@ -24,11 +24,11 @@
2424
"mockjs2": "1.0.8",
2525
"moment": "^2.24.0",
2626
"nprogress": "^0.2.0",
27+
"store": "^2.0.12",
2728
"viser-vue": "^2.4.6",
2829
"vue": "^2.6.10",
2930
"vue-clipboard2": "^0.2.1",
3031
"vue-cropper": "0.4.9",
31-
"vue-ls": "^3.2.1",
3232
"vue-quill-editor": "^3.0.6",
3333
"vue-router": "^3.1.2",
3434
"vue-svg-component-runtime": "^1.0.1",

β€Žsrc/api/index.js

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

β€Žsrc/api/login.js

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1-
import api from './index'
2-
import { axios } from '@/utils/request'
1+
import request from '@/utils/request'
2+
3+
const userApi = {
4+
Login: '/auth/login',
5+
Logout: '/auth/logout',
6+
ForgePassword: '/auth/forge-password',
7+
Register: '/auth/register',
8+
twoStepCode: '/auth/2step-code',
9+
SendSms: '/account/sms',
10+
SendSmsErr: '/account/sms_err',
11+
// get my info
12+
UserInfo: '/user/info',
13+
UserMenu: '/user/nav'
14+
}
315

416
/**
517
* login func
@@ -13,41 +25,41 @@ import { axios } from '@/utils/request'
1325
* @returns {*}
1426
*/
1527
export function login (parameter) {
16-
return axios({
17-
url: '/auth/login',
28+
return request({
29+
url: userApi.Login,
1830
method: 'post',
1931
data: parameter
2032
})
2133
}
2234

2335
export function getSmsCaptcha (parameter) {
24-
return axios({
25-
url: api.SendSms,
36+
return request({
37+
url: userApi.SendSms,
2638
method: 'post',
2739
data: parameter
2840
})
2941
}
3042

3143
export function getInfo () {
32-
return axios({
33-
url: '/user/info',
44+
return request({
45+
url: userApi.UserInfo,
3446
method: 'get',
3547
headers: {
3648
'Content-Type': 'application/json;charset=UTF-8'
3749
}
3850
})
3951
}
4052

41-
export function getCurrentUserNav (token) {
42-
return axios({
43-
url: '/user/nav',
53+
export function getCurrentUserNav () {
54+
return request({
55+
url: userApi.UserMenu,
4456
method: 'get'
4557
})
4658
}
4759

4860
export function logout () {
49-
return axios({
50-
url: '/auth/logout',
61+
return request({
62+
url: userApi.Logout,
5163
method: 'post',
5264
headers: {
5365
'Content-Type': 'application/json;charset=UTF-8'
@@ -60,8 +72,8 @@ export function logout () {
6072
* @param parameter {*}
6173
*/
6274
export function get2step (parameter) {
63-
return axios({
64-
url: api.twoStepCode,
75+
return request({
76+
url: userApi.twoStepCode,
6577
method: 'post',
6678
data: parameter
6779
})

β€Žsrc/api/manage.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { axios } from '@/utils/request'
1+
import request from '@/utils/request'
22

33
const api = {
44
user: '/user',
@@ -12,39 +12,39 @@ const api = {
1212
export default api
1313

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

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

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

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

4646
export function getOrgTree (parameter) {
47-
return axios({
47+
return request({
4848
url: api.orgTree,
4949
method: 'get',
5050
params: parameter
@@ -54,7 +54,7 @@ export function getOrgTree (parameter) {
5454
// id == 0 add post
5555
// id != 0 update put
5656
export function saveService (parameter) {
57-
return axios({
57+
return request({
5858
url: api.service,
5959
method: parameter.id === 0 ? 'post' : 'put',
6060
data: parameter

β€Žsrc/components/GlobalFooter/GlobalFooter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</div>
1717
<div class="copyright">
1818
Copyright
19-
<a-icon type="copyright" /> 2018 <span>η™½ιΉ­ε­¦ε›­ζŠ€ζœ―η»„ε‡Ίε“</span>
19+
<a-icon type="copyright" /> 2018 <span>vueComponent</span>
2020
</div>
2121
</div>
2222
</template>

β€Žsrc/components/Result/Result.vue

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

β€Žsrc/components/Result/index.js

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

β€Žsrc/components/SettingDrawer/SettingDrawer.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -230,13 +230,7 @@ export default {
230230
autoHideHeader: ${this.autoHideHeader}, // auto hide header
231231
colorWeak: ${this.colorWeak},
232232
multiTab: ${this.multiTab},
233-
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true',
234-
// vue-ls options
235-
storageOptions: {
236-
namespace: 'pro__',
237-
name: 'ls',
238-
storage: 'local',
239-
}
233+
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
240234
}`
241235
this.$copyText(text).then(message => {
242236
console.log('copy', message)

β€Žsrc/components/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import Tree from '@/components/Tree/Tree'
2222
import Trend from '@/components/Trend'
2323
import STable from '@/components/Table'
2424
import MultiTab from '@/components/MultiTab'
25-
import Result from '@/components/Result'
2625
import IconSelector from '@/components/IconSelector'
2726
import TagSelect from '@/components/TagSelect'
2827
import ExceptionPage from '@/components/Exception'
@@ -55,7 +54,6 @@ export {
5554
Tree,
5655
STable,
5756
MultiTab,
58-
Result,
5957
ExceptionPage,
6058
IconSelector,
6159
TagSelect,

β€Žsrc/config/defaultSettings.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,5 @@ export default {
2323
autoHideHeader: false, // auto hide header
2424
colorWeak: false,
2525
multiTab: false,
26-
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true',
27-
// vue-ls options
28-
storageOptions: {
29-
namespace: 'pro__', // key prefix
30-
name: 'ls', // name variable Vue.[ls] or this.[$ls],
31-
storage: 'local' // storage name session, local, memory
32-
}
26+
production: process.env.NODE_ENV === 'production' && process.env.VUE_APP_PREVIEW !== 'true'
3327
}

0 commit comments

Comments
Β (0)