Skip to content

Commit 2b1a910

Browse files
lianghx-319lianghx-319
committed
Merge branch 'dev'
2 parents ff070de + f7005e0 commit 2b1a910

File tree

43 files changed

+651
-392
lines changed

Some content is hidden

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

43 files changed

+651
-392
lines changed

‎README.md‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Create an enterprise nuxt app in seconds.
3535
- [x] [element-ui](https://element.eleme.io/) A Vue.js 2.0 UI Toolkit for Web
3636
- [x] [vant](https://youzan.github.io/vant) Lightweight Mobile UI Components built on Vue
3737
- [x] [PWA](https://pwa.nuxtjs.org) Nuxt Progressive Web Apps solution
38+
- [x] [API Manage](https://github.com/FEMessage/create-nuxt-app/blob/dev/docs/api.md) RESTful API management
3839

3940
[⬆ Back to Top](#table-of-contents)
4041

@@ -80,7 +81,7 @@ Options:
8081

8182
<details><summary>Preview</summary>
8283

83-
![preview](https://i.loli.net/2019/06/24/5d108d92206de47421.gif)
84+
![preview](https://i.loli.net/2020/02/17/B8FHNTerut53m14.gif)
8485

8586
</details>
8687

@@ -90,23 +91,20 @@ Options:
9091

9192
## Frameworks
9293

93-
### Single
94+
### Admin
9495

9596
```bash
96-
npx @femessage/create-nuxt-app -t single
97+
npx @femessage/create-nuxt-app -t admin
9798
```
9899

99-
![nuxt-element-dashboard](https://i.loli.net/2019/06/24/5d108e301184d60426.png)
100+
![nuxt-admin](https://i.loli.net/2020/02/17/sMtU3kHCefAyRTN.jpg)
100101

101-
### Multiple
102+
An PC admin template
102103

103-
```bash
104-
npx @femessage/create-nuxt-app -t multiple
105-
```
106-
107-
![nuxt-multiple-spa](https://i.loli.net/2019/06/24/5d108e300bc8e21918.png)
108-
109-
This is a pratice of micro-frontends
104+
Default account
105+
admin
106+
admin
107+
abcd1234
110108

111109
### Mobile
112110

‎docs/api.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
```javascript
88
// Page 1 获取一个用户的信息
9-
this.$axios.$get('/deepexi-cloud/users/1')
9+
this.$axios.$get('/security/users/1')
1010

1111
// Page 2 创建一个用户
12-
this.$axios.$post('/deepexi-cloud/users', body)
12+
this.$axios.$post('/security/users', body)
1313
```
1414

1515
对于 RESTful API 同一个资源，需要创建多个字符串来维护，即便可以通过抽离常量来维护，但对于调用者，还必须 import apiUrl，使用对应的 methods 来调用接口。

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"test": "ava test --verbose",
2424
"test:snapshot": "ava test --verbose --update-snapshots",
2525
"generate": "node bin/cli.js -a -o release",
26+
"clean": "rm -rf release",
2627
"zip": "node bin/zip.js",
2728
"build": "node bin/deploy/build.js",
2829
"release": "gren release --override"

‎template/framework-admin/.env‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
API_SERVER=https://mockapi.eolinker.com/IeZWjzy87c204a1f7030b2a17b00f3776ce0a07a5030a1b
2+
APP_ID=1204701543597604893

‎template/framework-admin/components/breadcrumb/bread-data.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
1-
const HOME = { name: '首页' }
2-
const ACCOUNT = { name: '账户管理', disabled: true }
3-
const FIELD = { name: '字段管理' }
4-
const GROUP = { name: '群组管理' }
5-
const ORGANNIZATION = { name: '组织管理' }
6-
const POSITION = { name: '职位管理' }
7-
const STAFF = { name: '员工管理' }
1+
const HOME = {name: '首页'}
2+
const ACCOUNT = {name: '账户管理', disabled: true}
3+
const FIELD = {name: '字段管理'}
4+
const GROUP = {name: '群组管理'}
5+
const ORGANNIZATION = {name: '组织管理'}
6+
const POSITION = {name: '职位管理'}
7+
const STAFF = {name: '员工管理'}
88

99
export default [
1010
{
1111
name: 'index',
12-
breadcrumb: [HOME]
12+
breadcrumb: [HOME],
1313
},
1414
{
15-
name: "account-field",
16-
breadcrumb: [ACCOUNT, FIELD]
15+
name: 'account-field',
16+
breadcrumb: [ACCOUNT, FIELD],
1717
},
1818
{
19-
name: "account-group",
20-
breadcrumb: [ACCOUNT, GROUP]
19+
name: 'account-group',
20+
breadcrumb: [ACCOUNT, GROUP],
2121
},
2222
{
23-
name: "account-organization",
24-
breadcrumb: [ACCOUNT, ORGANNIZATION]
23+
name: 'account-organization',
24+
breadcrumb: [ACCOUNT, ORGANNIZATION],
2525
},
2626
{
27-
name: "account-position",
28-
breadcrumb: [ACCOUNT, POSITION]
27+
name: 'account-position',
28+
breadcrumb: [ACCOUNT, POSITION],
2929
},
3030
{
31-
name: "account-staff",
32-
breadcrumb: [ACCOUNT, STAFF]
31+
name: 'account-staff',
32+
breadcrumb: [ACCOUNT, STAFF],
3333
},
3434
]

‎template/framework-admin/components/sidebar.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<template>
2-
<div :class="{hideSidebar: collapse}" class="sidebar-container scroller-vertical">
2+
<div
3+
:class="{hideSidebar: collapse}"
4+
class="sidebar-container scroller-vertical"
5+
>
36
<el-menu
47
:collapse="collapse"
58
:default-active="$route.path"

‎template/framework-admin/containers/header.vue‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
:key="index"
1616
class="navigation-menu"
1717
@click="handleHeaderMenu(item)"
18-
>{{ item.name }}</div>
18+
>
19+
{{ item.name }}
20+
</div>
1921
</el-col>
2022

2123
<!-- 头部操作栏 -->
@@ -47,7 +49,8 @@
4749
v-for="(item, index) in dropdown"
4850
:key="index"
4951
:command="index"
50-
>{{ item.name }}</el-dropdown-item>
52+
>{{ item.name }}</el-dropdown-item
53+
>
5154
</el-dropdown-menu>
5255
</el-dropdown>
5356
</el-col>

‎template/framework-admin/layouts/blank.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
@clickTitle="$router.push('/')"
99
>
1010
<template slot="title">
11-
<svg-icon icon-class="logo" style="margin-right: 5px;"></svg-icon>DEEPEXI ADMIN
11+
<svg-icon icon-class="logo" style="margin-right: 5px;"></svg-icon
12+
>DEEPEXI ADMIN
1213
</template>
1314
</layout-header>
1415

‎template/framework-admin/layouts/default.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
@clickTitle="$router.push('/')"
99
>
1010
<template slot="title">
11-
<svg-icon icon-class="logo" style="margin-right: 5px;"></svg-icon>DEEPEXI ADMIN
11+
<svg-icon icon-class="logo" style="margin-right: 5px;"></svg-icon
12+
>DEEPEXI ADMIN
1213
</template>
1314
</layout-header>
1415

‎template/framework-admin/pages/account/field.vue‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@
55
</template>
66

77
<script>
8-
export default {
9-
10-
}
8+
export default {}
119
</script>
1210

13-
<style lang="less">
14-
15-
</style>
11+
<style lang="less"></style>

0 commit comments

Comments
 (0)