Skip to content

Commit

Permalink
reactor: v2
Browse files Browse the repository at this point in the history
  • Loading branch information
sendya committed Mar 22, 2019
1 parent 3d67e5d commit a761331
Show file tree
Hide file tree
Showing 18 changed files with 39 additions and 94 deletions.
24 changes: 0 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,30 +121,6 @@ eg:
]
```
Docs
----
- [Router and Menu](https://github.com/sendya/ant-design-pro-vue/blob/master/src/router/README.md)
- [Table](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/table/README.md) [@Saraka](https://github.com/saraka-tsukai)
- [ANTD DefaultConfig](https://github.com/sendya/ant-design-pro-vue/blob/master/src/defaultSettings.js)
- [Frist page loading animate](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/add-page-loading-animate.md)
- [Multi-Tabs feature/multi-tabs](https://github.com/sendya/ant-design-pro-vue/tree/feature/multi-tabs) [How to remove](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/multi-tabs.md)
- [LoadOnDemand Demo feature/demand_load](https://github.com/sendya/ant-design-pro-vue/tree/feature/demand_load)
- [LoadOnDemand Docs](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/load-on-demand.md)
- [i18n feature/lang](https://github.com/sendya/ant-design-pro-vue/tree/feature/lang) Creator [@musnow](https://github.com/musnow)
- [Dependency analysis tool: analyzer](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/webpack-bundle-analyzer.md)
- ANTD PRO Components:
- Trend [Trend.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/Trend/index.md)
- AvatarList [AvatarList.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/AvatarList/index.md)
- CountDown [CountDown.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/CountDown/index.md)
- Ellipsis [Ellipsis.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/Ellipsis/index.md)
- NumberInfo [NumberInfo.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/NumberInfo/index.md)
- FooterToolbar [FooterToolbar.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/FooterToolbar/index.md)
- IconSelector [IconSelector.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/IconSelector/README.md) Creator: [@Saraka](https://github.com/saraka-tsukai)
- doing...
## Contributors
This project exists thanks to all the people who contribute.
Expand Down
24 changes: 0 additions & 24 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,30 +131,6 @@ yarn run lint
```
附属文档
----
- [路由/菜单说明](https://github.com/sendya/ant-design-pro-vue/blob/master/src/router/README.md)
- [Table 重封装组件](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/table/README.md) [@Saraka](https://github.com/saraka-tsukai)
- [ANTD 默认配置项](https://github.com/sendya/ant-design-pro-vue/blob/master/src/defaultSettings.js)
- [按需加载/减少打包大小](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/load-on-demand.md)
- [为首屏增加 Loading 动画](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/add-page-loading-animate.md)
- [多标签页组件 feature/multi-tabs](https://github.com/sendya/ant-design-pro-vue/tree/feature/multi-tabs) [如何移除](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/multi-tabs.md)
- [按需加载用例 feature/demand_load](https://github.com/sendya/ant-design-pro-vue/tree/feature/demand_load)
- [多语言使用案例 feature/lang](https://github.com/sendya/ant-design-pro-vue/tree/feature/lang) [@musnow](https://github.com/musnow) 提供
- [为项目增加依赖项分析工具 analyzer](https://github.com/sendya/ant-design-pro-vue/blob/master/docs/webpack-bundle-analyzer.md)
- ANTD PRO 额外组件
- Trend 趋势标记 [Trend.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/Trend/index.md)
- AvatarList 用户头像列表 [AvatarList.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/AvatarList/index.md)
- CountDown 倒计时 [CountDown.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/CountDown/index.md)
- Ellipsis 文本自动省略号 [Ellipsis.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/Ellipsis/index.md)
- NumberInfo 数据文本 [NumberInfo.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/NumberInfo/index.md)
- FooterToolbar 底部工具栏 [FooterToolbar.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/FooterToolbar/index.md)
- IconSelector 图标选择组件 [IconSelector.md](https://github.com/sendya/ant-design-pro-vue/blob/master/src/components/IconSelector/README.md) 提供: [@Saraka](https://github.com/saraka-tsukai)
- 其他待补充...
## Contributors
This project exists thanks to all the people who contribute.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-antd-pro",
"version": "1.3.0",
"version": "2.0.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand Down
1 change: 1 addition & 0 deletions src/config/defaultSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default {
autoHideHeader: false, // auto hide header
colorWeak: false,
multiTab: false,
production: process.env.NODE_ENV === 'production',
// vue-ls options
storageOptions: {
namespace: 'pro__', // key prefix
Expand Down
2 changes: 1 addition & 1 deletion src/config/router.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// eslint-disable-next-line
import { UserLayout, BasicLayout, RouteView, BlankLayout, PageView } from '@/components/layouts'
import { UserLayout, BasicLayout, RouteView, BlankLayout, PageView } from '@/layouts'
import { bxAnaalyse } from '@/core/icons'

export const asyncRouterMap = [
Expand Down
5 changes: 2 additions & 3 deletions src/views/account/center/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,15 @@
</template>

<script>
import PageLayout from '@/components/page/PageLayout'
import RouteView from '@/components/layouts/RouteView'
import { PageView, RouteView } from '@/layouts'
import { AppPage, ArticlePage, ProjectPage } from './page'
import { mapGetters } from 'vuex'
export default {
components: {
RouteView,
PageLayout,
PageView,
AppPage,
ArticlePage,
ProjectPage
Expand Down
4 changes: 2 additions & 2 deletions src/views/account/settings/Custom.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script>
import { colorList } from '@/components/tools/setting'
import { colorList } from '@/components/SettingDrawer/settingConfig'
import ASwitch from 'ant-design-vue/es/switch'
import AList from 'ant-design-vue/es/list'
import AListItem from 'ant-design-vue/es/list/Item'
import { mixin } from '@/utils/mixin.js'
import { mixin } from '@/utils/mixin'
const Meta = AListItem.Meta
Expand Down
7 changes: 3 additions & 4 deletions src/views/account/settings/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@
</template>

<script>
import PageLayout from '@/components/page/PageLayout'
import RouteView from '@/components/layouts/RouteView'
import { PageView, RouteView } from '@/layouts'
import { mixinDevice } from '@/utils/mixin.js'
export default {
components: {
RouteView,
PageLayout
PageView
},
mixins: [mixinDevice],
data () {
Expand Down Expand Up @@ -148,4 +147,4 @@ export default {
}
}
</style>
</style>
10 changes: 2 additions & 8 deletions src/views/dashboard/Analysis.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,9 @@
</template>

<script>
import ChartCard from '@/components/chart/ChartCard'
import ACol from 'ant-design-vue/es/grid/Col'
import ATooltip from 'ant-design-vue/es/tooltip/Tooltip'
import MiniArea from '@/components/chart/MiniArea'
import MiniBar from '@/components/chart/MiniBar'
import MiniProgress from '@/components/chart/MiniProgress'
import RankList from '@/components/chart/RankList'
import Bar from '@/components/chart/Bar'
import Trend from '@/components/Trend'
import { ChartCard, MiniArea, MiniBar, MiniProgress, RankList, Bar, Trend } from '@/components'
const rankList = []
for (let i = 0; i < 7; i++) {
Expand Down Expand Up @@ -204,4 +198,4 @@ export default {
}
}
}
</style>
</style>
15 changes: 8 additions & 7 deletions src/views/dashboard/Workplace.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

<template>
<page-layout :avatar="avatar">
<page-view :avatar="avatar" :title="false">
<div slot="headerContent">
<div class="title">{{ timeFix }},{{ user.name }}<span class="welcome-text">,{{ welcome() }}</span></div>
<div>前端工程师 | 蚂蚁金服 - 某某某事业群 - VUE平台</div>
Expand Down Expand Up @@ -106,16 +107,16 @@
</a-col>
</a-row>
</div>
</page-layout>
</page-view>
</template>

<script>
import { timeFix } from '@/utils/util'
import { mapGetters } from 'vuex'
import PageLayout from '@/components/page/PageLayout'
import { PageView } from '@/layouts'
import HeadInfo from '@/components/tools/HeadInfo'
import Radar from '@/components/chart/Radar'
import { Radar } from '@/components'
import { getRoleList, getServiceList } from '@/api/manage'
Expand All @@ -124,7 +125,7 @@ const DataSet = require('@antv/data-set')
export default {
name: 'Workplace',
components: {
PageLayout,
PageView,
HeadInfo,
Radar
},
Expand Down Expand Up @@ -227,7 +228,7 @@ export default {
this.radarLoading = true
this.$http.get('/workplace/radar')
.then(res => {
.then(res => {
const dv = new DataSet.View().source(res.result)
dv.transform({
type: 'fold',
Expand Down Expand Up @@ -356,4 +357,4 @@ export default {
}
}
</style>
</style>
4 changes: 2 additions & 2 deletions src/views/list/PermissionList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
</template>

<script>
import STable from '@/components/table/'
import { STable } from '@/components'
export default {
name: 'TableList',
Expand Down Expand Up @@ -269,4 +269,4 @@ export default {
*/
}
}
</script>
</script>
2 changes: 1 addition & 1 deletion src/views/list/RoleList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</template>

<script>
import STable from '@/components/table/'
import { STable } from '@/components'
import RoleModal from './modules/RoleModal'
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/views/list/TableInnerEditList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</template>

<script>
import STable from '@/components/table/'
import { STable } from '@/components'
export default {
name: 'TableList',
Expand Down
2 changes: 1 addition & 1 deletion src/views/list/TreeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<script>
import STree from '@/components/Tree/Tree'
import STable from '@/components/table/'
import { STable } from '@/components'
import OrgModal from './modules/OrgModal'
import { getOrgTree, getServiceList } from '@/api/manage'
Expand Down
2 changes: 1 addition & 1 deletion src/views/list/UserList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
</template>

<script>
import STable from '@/components/table/'
import { STable } from '@/components'
import { getRoleList, getServiceList } from '@/api/manage'
export default {
Expand Down
2 changes: 1 addition & 1 deletion src/views/list/table/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

<script>
import moment from 'moment'
import STable from '@/components/table/'
import { STable } from '@/components'
import { getRoleList, getServiceList } from '@/api/manage'
export default {
Expand Down
11 changes: 6 additions & 5 deletions src/views/profile/advanced/Advanced.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@

<template>
<page-layout title="单号:234231029431" logo="https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png">
<page-view title="单号:234231029431" logo="https://gw.alipayobjects.com/zos/rmsportal/nxkuOJlFJuAUhzlMTCEe.png">

<detail-list slot="headerContent" size="small" :col="2" class="detail-layout">
<detail-list-item term="创建人">曲丽丽</detail-list-item>
Expand Down Expand Up @@ -129,20 +130,20 @@
</a-table>
</a-card>

</page-layout>
</page-view>
</template>

<script>
import { mixinDevice } from '@/utils/mixin.js'
import PageLayout from '@/components/page/PageLayout'
import { mixinDevice } from '@/utils/mixin'
import { PageView } from '@/layouts'
import DetailList from '@/components/tools/DetailList'
const DetailListItem = DetailList.Item
export default {
name: 'Advanced',
components: {
PageLayout,
PageView,
DetailList,
DetailListItem
},
Expand Down
14 changes: 6 additions & 8 deletions src/views/profile/basic/Index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<page-layout :title="title">
<page-view :title="title">
<a-card :bordered="false">
<detail-list title="退款申请">
<detail-list-item term="取货单号">1000000000</detail-list-item>
Expand Down Expand Up @@ -39,20 +39,18 @@

</s-table>
</a-card>
</page-layout>
</page-view>
</template>

<script>
import PageLayout from '@/components/page/PageLayout'
import STable from '@/components/table/'
import { PageView } from '@/layouts'
import { STable } from '@/components'
import DetailList from '@/components/tools/DetailList'
import ABadge from 'ant-design-vue/es/badge/Badge'
const DetailListItem = DetailList.Item
export default {
components: {
PageLayout,
ABadge,
PageView,
DetailList,
DetailListItem,
STable
Expand Down Expand Up @@ -252,4 +250,4 @@ export default {
font-weight: 500;
margin-bottom: 16px;
}
</style>
</style>

0 comments on commit a761331

Please sign in to comment.