Skip to content

Commit 7bd9405

Browse files
author
Chan
committed
Squashed commit of the following:
commit 6850312 Author: 李小斐 <[email protected]> Date: Sat Jan 11 10:25:59 2020 +0800 fix: fixed redirect path regex (PanJiaChen#2933) commit d634e2a Author: 花裤衩 <[email protected]> Date: Thu Jan 9 20:24:48 2020 +0800 fix: fixed require mock bug in production commit b57f200 Author: 花裤衩 <[email protected]> Date: Thu Jan 9 17:36:49 2020 +0800 bump: update element-ui version commit c9affcf Author: 花裤衩 <[email protected]> Date: Thu Jan 9 17:21:36 2020 +0800 fix: fixed mock server (PanJiaChen#2929) * init * refine * update commit fbad7f4 Author: 花裤衩 <[email protected]> Date: Thu Jan 9 16:49:57 2020 +0800 fix[Charts]: fix charts resize in keep-alive bug (PanJiaChen#2922) * fix[Charts]: fix charts resize in keep-alive bug * refine commit 088f64e Author: RussXD <[email protected]> Date: Wed Jan 8 12:12:10 2020 +0800 perf: optimize checkCapslock method (PanJiaChen#2635) * optimize checkCapslock method * update Co-authored-by: 花裤衩 <[email protected]> commit 55b1bba Author: AndyLZC/AndyLZC.github.io <[email protected]> Date: Tue Jan 7 22:30:07 2020 +0800 perf[complex-table]:refine code (PanJiaChen#2825) * 解决无法删除列表的bug;优化代码； * perf: refine Co-authored-by: 花裤衩 <[email protected]> commit fd5a2e8 Author: Kaitian Xie <[email protected]> Date: Mon Jan 6 06:34:14 2020 -0800 perf[Menu]: remove unused menu-wrapper (PanJiaChen#2903) commit a0b39d5 Author: 任羽飞 <[email protected]> Date: Mon Jan 6 22:22:37 2020 +0800 perf: import mockXHR only in production (PanJiaChen#2910) * 自动排除mock 生产环境，使用webpack的条件编译自动排除mock数据 * perf: refine Co-authored-by: 花裤衩 <[email protected]> commit 4f563a7 Author: 韬 <[email protected]> Date: Tue Dec 31 14:14:34 2019 +0800 fix[Logout]: click blank area of ​​dropDown able to logout (PanJiaChen#2896) Fixed clicking blank area of ​​drop-down unable to log out commit 262c0ba Author: 花裤衩 <[email protected]> Date: Sun Dec 15 20:17:59 2019 +0800 perf[documentation]: refine css commit 594fc58 Author: flitrue <[email protected]> Date: Thu Dec 12 15:16:03 2019 +0800 fix[icons]:fixed eslint 1 error and 2 warnings (PanJiaChen#2835) commit 65d8c45 Author: monkeycf <[email protected]> Date: Wed Dec 4 10:34:23 2019 +0800 feat: plop new generate store (PanJiaChen#2805) commit e1554fd Author: xuanzai <[email protected]> Date: Sun Dec 1 15:48:30 2019 +0800 perf[views/icons]: use grid (PanJiaChen#2803) commit 53803d0 Author: Phạm Ngọc Hòa <[email protected]> Date: Wed Nov 27 09:06:28 2019 +0700 perf: format pdf download (PanJiaChen#2791) commit 25dddbb Merge: 683f68b 44203f8 Author: 花裤衩 <[email protected]> Date: Tue Nov 12 17:25:12 2019 +0800 update 'MarkdownEditor' components name (PanJiaChen#2743) commit 683f68b Author: Phạm Ngọc Hòa <[email protected]> Date: Tue Nov 12 16:24:30 2019 +0700 format: space in user card (PanJiaChen#2744) commit 44203f8 Author: bbigcd <[email protected]> Date: Tue Nov 12 12:08:45 2019 +0800 update 'MarkdownEditor' components name commit d5c013a Author: Phạm Ngọc Hòa <[email protected]> Date: Mon Nov 11 18:39:59 2019 +0700 perf: text i18n (PanJiaChen#2739) commit b11acb2 Author: Phạm Ngọc Hòa <[email protected]> Date: Fri Nov 8 10:26:53 2019 +0700 perf: complex table (PanJiaChen#2732) Move ont format `{row}` commit b2dd7ca Author: Phạm Ngọc Hòa <[email protected]> Date: Fri Nov 8 10:25:42 2019 +0700 perf: format drag table (PanJiaChen#2733) move one format `{row}` commit a4fa119 Author: Phạm Ngọc Hòa <[email protected]> Date: Thu Nov 7 12:37:05 2019 +0700 perf: format inline edit table (PanJiaChen#2725) move one format `{row}` commit 6a194d1 Author: Phạm Ngọc Hòa <[email protected]> Date: Tue Nov 5 13:26:24 2019 +0700 perf: format dropdown menu code (PanJiaChen#2720) commit 6739ab5 Author: 花裤衩 <[email protected]> Date: Fri Oct 25 19:45:21 2019 +0800 style: fix el-date-picker css style commit 6a214f0 Author: BradyBromley <[email protected]> Date: Sun Oct 13 19:25:30 2019 -0700 docs: improved README.md (PanJiaChen#2656) commit 5273e02 Author: 花裤衩 <[email protected]> Date: Sat Oct 12 17:51:26 2019 +0800 docs: add job ad
1 parent 252b8ca commit 7bd9405

32 files changed

+330
-345
lines changed

‎mock/article.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ for (let i = 0; i < count; i++) {
1818
forecast: '@float(0, 100, 2, 2)',
1919
importance: '@integer(1, 3)',
2020
'type|1': ['CN', 'US', 'JP', 'EU'],
21-
'status|1': ['published', 'draft', 'deleted'],
21+
'status|1': ['published', 'draft'],
2222
display_time: '@datetime',
2323
comment_disabled: true,
2424
pageviews: '@integer(300, 5000)',
@@ -29,7 +29,7 @@ for (let i = 0; i < count; i++) {
2929

3030
export default [
3131
{
32-
url: '/article/list',
32+
url: '/vue-element-admin/article/list',
3333
type: 'get',
3434
response: config => {
3535
const { importance, type, title, page = 1, limit = 20, sort } = config.query
@@ -58,7 +58,7 @@ export default [
5858
},
5959

6060
{
61-
url: '/article/detail',
61+
url: '/vue-element-admin/article/detail',
6262
type: 'get',
6363
response: config => {
6464
const { id } = config.query
@@ -74,7 +74,7 @@ export default [
7474
},
7575

7676
{
77-
url: '/article/pv',
77+
url: '/vue-element-admin/article/pv',
7878
type: 'get',
7979
response: _ => {
8080
return {
@@ -92,7 +92,7 @@ export default [
9292
},
9393

9494
{
95-
url: '/article/create',
95+
url: '/vue-element-admin/article/create',
9696
type: 'post',
9797
response: _ => {
9898
return {
@@ -103,7 +103,7 @@ export default [
103103
},
104104

105105
{
106-
url: '/article/update',
106+
url: '/vue-element-admin/article/update',
107107
type: 'post',
108108
response: _ => {
109109
return {

‎mock/index.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,10 @@ export function mockXHR() {
5757
// for mock server
5858
const responseFake = (url, type, respond) => {
5959
return {
60-
url: new RegExp(`/mock${url}`),
60+
url: new RegExp(`${process.env.VUE_APP_BASE_API}${url}`),
6161
type: type || 'get',
6262
response(req, res) {
63+
console.log('request invoke:' + req.path)
6364
res.json(Mock.mock(respond instanceof Function ? respond(req, res) : respond))
6465
}
6566
}

‎mock/remote-search.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ NameList.push({ name: 'mock-Pan' })
1313
export default [
1414
// username search
1515
{
16-
url: '/search/user',
16+
url: '/vue-element-admin/search/user',
1717
type: 'get',
1818
response: config => {
1919
const { name } = config.query
@@ -30,7 +30,7 @@ export default [
3030

3131
// transaction list
3232
{
33-
url: '/transaction/list',
33+
url: '/vue-element-admin/transaction/list',
3434
type: 'get',
3535
response: _ => {
3636
return {

‎mock/role/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const roles = [
3838
export default [
3939
// mock get all routes form server
4040
{
41-
url: '/routes',
41+
url: '/vue-element-admin/routes',
4242
type: 'get',
4343
response: _ => {
4444
return {
@@ -50,7 +50,7 @@ export default [
5050

5151
// mock get all roles form server
5252
{
53-
url: '/roles',
53+
url: '/vue-element-admin/roles',
5454
type: 'get',
5555
response: _ => {
5656
return {
@@ -62,7 +62,7 @@ export default [
6262

6363
// add role
6464
{
65-
url: '/role',
65+
url: '/vue-element-admin/role',
6666
type: 'post',
6767
response: {
6868
code: 20000,
@@ -74,7 +74,7 @@ export default [
7474

7575
// update role
7676
{
77-
url: '/role/[A-Za-z0-9]',
77+
url: '/vue-element-admin/role/[A-Za-z0-9]',
7878
type: 'put',
7979
response: {
8080
code: 20000,
@@ -86,7 +86,7 @@ export default [
8686

8787
// delete role
8888
{
89-
url: '/role/[A-Za-z0-9]',
89+
url: '/vue-element-admin/role/[A-Za-z0-9]',
9090
type: 'delete',
9191
response: {
9292
code: 20000,

‎mock/user.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const users = {
2626
export default [
2727
// user login
2828
{
29-
url: '/user/login',
29+
url: '/vue-element-admin/user/login',
3030
type: 'post',
3131
response: config => {
3232
const { username } = config.body
@@ -49,7 +49,7 @@ export default [
4949

5050
// get user info
5151
{
52-
url: '/user/info\.*',
52+
url: '/vue-element-admin/user/info\.*',
5353
type: 'get',
5454
response: config => {
5555
const { token } = config.query
@@ -72,7 +72,7 @@ export default [
7272

7373
// user logout
7474
{
75-
url: '/user/logout',
75+
url: '/vue-element-admin/user/logout',
7676
type: 'post',
7777
response: _ => {
7878
return {

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"driver.js": "0.9.5",
5252
"dropzone": "5.5.1",
5353
"echarts": "4.2.1",
54-
"element-ui": "^2.9.2",
54+
"element-ui": "2.13.0",
5555
"file-saver": "2.0.1",
5656
"fuse.js": "3.4.4",
5757
"js-cookie": "2.2.0",

‎plop-templates/store/index.hbs

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{{#if state}}
2+
const state = {}
3+
{{/if}}
4+
5+
{{#if mutations}}
6+
const mutations = {}
7+
{{/if}}
8+
9+
{{#if actions}}
10+
const actions = {}
11+
{{/if}}
12+
13+
export default {
14+
namespaced: true,
15+
{{options}}
16+
}

‎plop-templates/store/prompt.js

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
const { notEmpty } = require('../utils.js')
2+
3+
module.exports = {
4+
description: 'generate store',
5+
prompts: [{
6+
type: 'input',
7+
name: 'name',
8+
message: 'store name please',
9+
validate: notEmpty('name')
10+
},
11+
{
12+
type: 'checkbox',
13+
name: 'blocks',
14+
message: 'Blocks:',
15+
choices: [{
16+
name: 'state',
17+
value: 'state',
18+
checked: true
19+
},
20+
{
21+
name: 'mutations',
22+
value: 'mutations',
23+
checked: true
24+
},
25+
{
26+
name: 'actions',
27+
value: 'actions',
28+
checked: true
29+
}
30+
],
31+
validate(value) {
32+
if (!value.includes('state') || !value.includes('mutations')) {
33+
return 'store require at least state and mutations'
34+
}
35+
return true
36+
}
37+
}
38+
],
39+
actions(data) {
40+
const name = '{{name}}'
41+
const { blocks } = data
42+
const options = ['state', 'mutations']
43+
const joinFlag = `,
44+
`
45+
if (blocks.length === 3) {
46+
options.push('actions')
47+
}
48+
49+
const actions = [{
50+
type: 'add',
51+
path: `src/store/modules/${name}.js`,
52+
templateFile: 'plop-templates/store/index.hbs',
53+
data: {
54+
options: options.join(joinFlag),
55+
state: blocks.includes('state'),
56+
mutations: blocks.includes('mutations'),
57+
actions: blocks.includes('actions')
58+
}
59+
}]
60+
return actions
61+
}
62+
}

‎plopfile.js

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
const viewGenerator = require('./plop-templates/view/prompt')
22
const componentGenerator = require('./plop-templates/component/prompt')
3+
const storeGenerator = require('./plop-templates/store/prompt.js')
34

45
module.exports = function(plop) {
56
plop.setGenerator('view', viewGenerator)
67
plop.setGenerator('component', componentGenerator)
8+
plop.setGenerator('store', storeGenerator)
79
}

‎src/api/article.js

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
import request from '@/utils/request'
22

3-
export async function fetchList(query) {
4-
return await request({
5-
url: '/article/list',
3+
export function fetchList(query) {
4+
return request({
5+
url: '/vue-element-admin/article/list',
66
method: 'get',
77
params: query
88
})
99
}
1010

1111
export function fetchArticle(id) {
1212
return request({
13-
url: '/article/detail',
13+
url: '/vue-element-admin/article/detail',
1414
method: 'get',
1515
params: { id }
1616
})
1717
}
1818

1919
export function fetchPv(pv) {
2020
return request({
21-
url: '/article/pv',
21+
url: '/vue-element-admin/article/pv',
2222
method: 'get',
2323
params: { pv }
2424
})
2525
}
2626

2727
export function createArticle(data) {
2828
return request({
29-
url: '/article/create',
29+
url: '/vue-element-admin/article/create',
3030
method: 'post',
3131
data
3232
})
3333
}
3434

3535
export function updateArticle(data) {
3636
return request({
37-
url: '/article/update',
37+
url: '/vue-element-admin/article/update',
3838
method: 'post',
3939
data
4040
})

‎src/api/remote-search.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ import request from '@/utils/request'
22

33
export function searchUser(name) {
44
return request({
5-
url: '/search/user',
5+
url: '/vue-element-admin/search/user',
66
method: 'get',
77
params: { name }
88
})
99
}
1010

1111
export function transactionList(query) {
1212
return request({
13-
url: '/transaction/list',
13+
url: '/vue-element-admin/transaction/list',
1414
method: 'get',
1515
params: query
1616
})

‎src/api/role.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,37 @@ import request from '@/utils/request'
22

33
export function getRoutes() {
44
return request({
5-
url: '/routes',
5+
url: '/vue-element-admin/routes',
66
method: 'get'
77
})
88
}
99

1010
export function getRoles() {
1111
return request({
12-
url: '/roles',
12+
url: '/vue-element-admin/roles',
1313
method: 'get'
1414
})
1515
}
1616

1717
export function addRole(data) {
1818
return request({
19-
url: '/role',
19+
url: '/vue-element-admin/role',
2020
method: 'post',
2121
data
2222
})
2323
}
2424

2525
export function updateRole(id, data) {
2626
return request({
27-
url: `/role/${id}`,
27+
url: `/vue-element-admin/role/${id}`,
2828
method: 'put',
2929
data
3030
})
3131
}
3232

3333
export function deleteRole(id) {
3434
return request({
35-
url: `/role/${id}`,
35+
url: `/vue-element-admin/role/${id}`,
3636
method: 'delete'
3737
})
3838
}

‎src/api/user.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@ import request from '@/utils/request'
22

33
export function login(data) {
44
return request({
5-
url: '/user/login',
5+
url: '/vue-element-admin/user/login',
66
method: 'post',
77
data
88
})
99
}
1010

1111
export function getInfo(token) {
1212
return request({
13-
url: '/user/info',
13+
url: '/vue-element-admin/user/info',
1414
method: 'get',
1515
params: { token }
1616
})
1717
}
1818

1919
export function logout() {
2020
return request({
21-
url: '/user/logout',
21+
url: '/vue-element-admin/user/logout',
2222
method: 'post'
2323
})
2424
}

0 commit comments

Comments
 (0)