Skip to content

Commit 3372d24

Browse files
sendyasendya
committed
Merge branch 'refactor/pro-v3'
# Conflicts: # src/components/Menu/SideMenu.vue # src/components/Other/CarbonAds.vue
2 parents 29b6ca3 + c9f7fe4 commit 3372d24

File tree

128 files changed

+6621
-8509
lines changed

Some content is hidden

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

128 files changed

+6621
-8509
lines changed

‎README.md

+14-45
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,28 @@
11
English | [简体中文](./README.zh-CN.md)
22

3-
<h1 align="center">Ant Design Pro Vue</h1>
3+
<h1 align="center">Ant Design Vue Pro</h1>
44
<div align="center">
55
An out-of-box UI solution for enterprise applications as a Vue boilerplate. based on <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/" target="_blank">Ant Design of Vue</a>
66
</div>
77

88
<div align="center">
99

10-
[![Backers on Open Collective](https://opencollective.com/ant-design-pro-vue/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/ant-design-pro-vue/sponsors/badge.svg)](#sponsors) [![License](https://img.shields.io/npm/l/package.json.svg?style=flat)](https://github.com/sendya/ant-design-pro-vue/blob/master/LICENSE)
11-
[![Release](https://img.shields.io/github/release/sendya/ant-design-pro-vue.svg?style=flat)](https://github.com/sendya/ant-design-pro-vue/releases/latest)
12-
[![Travis branch](https://travis-ci.org/sendya/ant-design-pro-vue.svg?branch=master)](https://travis-ci.org/sendya/ant-design-pro-vue)
10+
[![License](https://img.shields.io/npm/l/package.json.svg?style=flat)](https://github.com/vueComponent/ant-design-vue-pro/blob/master/LICENSE)
11+
[![Release](https://img.shields.io/github/release/vueComponent/ant-design-vue-pro.svg?style=flat)](https://github.com/vueComponent/ant-design-vue-pro/releases/latest)
12+
[![Travis branch](https://travis-ci.org/vueComponent/ant-design-vue-pro.svg?branch=master)](https://travis-ci.org/vueComponent/ant-design-vue-pro)
1313

1414
</div>
1515

16-
- Preview: https://preview.pro.loacg.com
17-
- Home Page: https://pro.loacg.com
18-
- Documentation: https://pro.loacg.com/docs/getting-started
19-
- ChangeLog: https://pro.loacg.com/docs/changelog
20-
- FAQ: https://pro.loacg.com/docs/faq
16+
- Preview: https://preview.pro.antdv.com
17+
- Home Page: https://pro.antdv.com
18+
- Documentation: https://pro.antdv.com/docs/getting-started
19+
- ChangeLog: https://pro.antdv.com/docs/changelog
20+
- FAQ: https://pro.antdv.com/docs/faq
2121

2222
Overview
2323
----
2424

25-
![dashboard + multi-tabs](https://static-2.loacg.com/open/static/github/20190224163345.jpg)
26-
27-
![dashboard + setting](https://static-2.loacg.com/open/static/github/20181126112124.png)
28-
29-
![user profile](https://static-2.loacg.com/open/static/github/20180916-134251.png)
30-
31-
![permission list](https://static-2.loacg.com/open/static/github/20180916-154937.png)
32-
25+
![dashboard](https://static-2.loacg.com/open/static/github/SP1.png)
3326

3427
### Env and dependencies
3528

@@ -50,8 +43,8 @@ Overview
5043

5144
- Clone repo
5245
```bash
53-
git clone https://github.com/sendya/ant-design-pro-vue.git
54-
cd ant-design-pro-vue
46+
git clone https://github.com/vueComponent/ant-design-vue-pro.git
47+
cd ant-design-vue-pro
5548
```
5649

5750
- Install dependencies
@@ -77,7 +70,7 @@ yarn run lint
7770

7871
### Other
7972

80-
- **IMPORTANT : About Issue feedback !! when opening Issue read [Issue / PR Contributing](https://github.com/sendya/ant-design-pro-vue/issues/90)**
73+
- **IMPORTANT : About Issue feedback !! when opening Issue read [Issue / PR Contributing](https://github.com/vueComponent/ant-design-vue-pro/issues/90)**
8174

8275
- [Vue-cli3](https://cli.vuejs.org/guide/) used by the project.
8376

@@ -105,28 +98,4 @@ Modern browsers and IE10.
10598
## Contributors
10699

107100
This project exists thanks to all the people who contribute.
108-
<a href="https://github.com/sendya/ant-design-pro-vue/graphs/contributors"><img src="https://opencollective.com/ant-design-pro-vue/contributors.svg?width=890&button=false" /></a>
109-
110-
111-
## Backers
112-
113-
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/ant-design-pro-vue#backer)]
114-
115-
<a href="https://opencollective.com/ant-design-pro-vue#backers" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/backers.svg?width=890"></a>
116-
117-
118-
## Sponsors
119-
120-
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/ant-design-pro-vue#sponsor)]
121-
122-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/0/avatar.svg"></a>
123-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/1/avatar.svg"></a>
124-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/2/avatar.svg"></a>
125-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/3/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/3/avatar.svg"></a>
126-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/4/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/4/avatar.svg"></a>
127-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/5/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/5/avatar.svg"></a>
128-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/6/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/6/avatar.svg"></a>
129-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/7/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/7/avatar.svg"></a>
130-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/8/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/8/avatar.svg"></a>
131-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/9/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/9/avatar.svg"></a>
132-
101+
<a href="https://github.com/vueComponent/ant-design-vue-pro/graphs/contributors"><img src="https://opencollective.com/ant-design-pro-vue/contributors.svg?width=890&button=false" /></a>

‎README.zh-CN.md

+14-42
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,31 @@
11
[English](./README.md) | 简体中文
22

3-
<h1 align="center">Ant Design Pro Vue</h1>
3+
<h1 align="center">Ant Design Vue Pro</h1>
44
<div align="center">
55
An out-of-box UI solution for enterprise applications as a Vue boilerplate. based on <a href="https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/" target="_blank">Ant Design of Vue</a>
66
</div>
77

88
<div align="center">
99

10-
[![Backers on Open Collective](https://opencollective.com/ant-design-pro-vue/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/ant-design-pro-vue/sponsors/badge.svg)](#sponsors) [![License](https://img.shields.io/npm/l/package.json.svg?style=flat)](https://github.com/sendya/ant-design-pro-vue/blob/master/LICENSE)
11-
[![Release](https://img.shields.io/github/release/sendya/ant-design-pro-vue.svg?style=flat)](https://github.com/sendya/ant-design-pro-vue/releases/latest)
12-
[![Travis branch](https://travis-ci.org/sendya/ant-design-pro-vue.svg?branch=master)](https://travis-ci.org/sendya/ant-design-pro-vue)
10+
[![License](https://img.shields.io/npm/l/package.json.svg?style=flat)](https://github.com/vueComponent/ant-design-vue-pro/blob/master/LICENSE)
11+
[![Release](https://img.shields.io/github/release/vueComponent/ant-design-vue-pro.svg?style=flat)](https://github.com/vueComponent/ant-design-vue-pro/releases/latest)
12+
[![Travis branch](https://travis-ci.org/vueComponent/ant-design-vue-pro.svg?branch=master)](https://travis-ci.org/vueComponent/ant-design-vue-pro)
1313

1414
</div>
1515

16-
- 预览: https://preview.pro.loacg.com
17-
- 首页: https://pro.loacg.com
18-
- 文档: https://pro.loacg.com/docs/getting-started
19-
- 更新日志: https://pro.loacg.com/docs/changelog
20-
- 常见问题: https://pro.loacg.com/docs/faq
16+
- 预览: https://preview.pro.antdv.com
17+
- 首页: https://pro.antdv.com
18+
- 文档: https://pro.antdv.com/docs/getting-started
19+
- 更新日志: https://pro.antdv.com/docs/changelog
20+
- 常见问题: https://pro.antdv.com/docs/faq
2121

2222

2323
Overview
2424
----
2525

2626
基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 [Ant Design Pro](https://pro.ant.design/)
2727

28-
![工作台-多标签模式](https://static-2.loacg.com/open/static/github/20190224163345.jpg)
29-
30-
![工作台+设置菜单](https://static-2.loacg.com/open/static/github/20181126112124.png)
31-
32-
![个人设置](https://static-2.loacg.com/open/static/github/20180916-134251.png)
33-
28+
![dashboard](https://static-2.loacg.com/open/static/github/SP1.png)
3429

3530
环境和依赖
3631
----
@@ -54,8 +49,8 @@ Overview
5449

5550
- 拉取项目代码
5651
```bash
57-
git clone https://github.com/sendya/ant-design-pro-vue.git
58-
cd ant-design-pro-vue
52+
git clone https://github.com/vueComponent/ant-design-vue-pro.git
53+
cd ant-design-vue-pro
5954
```
6055

6156
- 安装依赖
@@ -83,7 +78,7 @@ yarn run lint
8378
其他说明
8479
----
8580

86-
- **关于 Issue 反馈 (重要!重要!重要!) 请在开 *Issue* 前，先阅读该内容：[Issue / PR 编写建议](https://github.com/sendya/ant-design-pro-vue/issues/90)**
81+
- **关于 Issue 反馈 (重要!重要!重要!) 请在开 *Issue* 前，先阅读该内容：[Issue / PR 编写建议](https://github.com/vueComponent/ant-design-vue-pro/issues/90)**
8782

8883
- 项目使用的 [vue-cli3](https://cli.vuejs.org/guide/), 请确保你所使用的 vue-cli 是新版，并且已经学习 cli 官方文档使用教程
8984

@@ -111,27 +106,4 @@ Modern browsers and IE10.
111106
## Contributors
112107

113108
This project exists thanks to all the people who contribute.
114-
<a href="https://github.com/sendya/ant-design-pro-vue/graphs/contributors"><img src="https://opencollective.com/ant-design-pro-vue/contributors.svg?width=890&button=false" /></a>
115-
116-
117-
## Backers
118-
119-
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/ant-design-pro-vue#backer)]
120-
121-
<a href="https://opencollective.com/ant-design-pro-vue#backers" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/backers.svg?width=890"></a>
122-
123-
124-
## Sponsors
125-
126-
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/ant-design-pro-vue#sponsor)]
127-
128-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/0/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/0/avatar.svg"></a>
129-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/1/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/1/avatar.svg"></a>
130-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/2/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/2/avatar.svg"></a>
131-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/3/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/3/avatar.svg"></a>
132-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/4/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/4/avatar.svg"></a>
133-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/5/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/5/avatar.svg"></a>
134-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/6/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/6/avatar.svg"></a>
135-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/7/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/7/avatar.svg"></a>
136-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/8/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/8/avatar.svg"></a>
137-
<a href="https://opencollective.com/ant-design-pro-vue/sponsor/9/website" target="_blank"><img src="https://opencollective.com/ant-design-pro-vue/sponsor/9/avatar.svg"></a>
109+
<a href="https://github.com/vueComponent/ant-design-vue-pro/graphs/contributors"><img src="https://opencollective.com/ant-design-pro-vue/contributors.svg?width=890&button=false" /></a>

‎config/plugin.config.js

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ const themePluginOption = {
2626
case '.ant-steps-item-process .ant-steps-item-icon > .ant-steps-icon':
2727
case '.ant-steps-item-process .ant-steps-item-icon>.ant-steps-icon':
2828
return ':not(.ant-steps-item-process)' + selector
29+
// fixed https://github.com/vueComponent/ant-design-vue-pro/issues/876
30+
case '.ant-steps-item-process .ant-steps-item-icon':
31+
return ':not(.ant-steps-item-custom)' + selector
2932
case '.ant-menu-horizontal>.ant-menu-item-active,.ant-menu-horizontal>.ant-menu-item-open,.ant-menu-horizontal>.ant-menu-item-selected,.ant-menu-horizontal>.ant-menu-item:hover,.ant-menu-horizontal>.ant-menu-submenu-active,.ant-menu-horizontal>.ant-menu-submenu-open,.ant-menu-horizontal>.ant-menu-submenu-selected,.ant-menu-horizontal>.ant-menu-submenu:hover':
3033
case '.ant-menu-horizontal > .ant-menu-item-active,.ant-menu-horizontal > .ant-menu-item-open,.ant-menu-horizontal > .ant-menu-item-selected,.ant-menu-horizontal > .ant-menu-item:hover,.ant-menu-horizontal > .ant-menu-submenu-active,.ant-menu-horizontal > .ant-menu-submenu-open,.ant-menu-horizontal > .ant-menu-submenu-selected,.ant-menu-horizontal > .ant-menu-submenu:hover':
3134
return '.ant-menu-horizontal > .ant-menu-item-active,.ant-menu-horizontal > .ant-menu-item-open,.ant-menu-horizontal > .ant-menu-item-selected,.ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-item:hover,.ant-menu-horizontal > .ant-menu-submenu-active,.ant-menu-horizontal > .ant-menu-submenu-open,.ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu-selected,.ant-menu-horizontal:not(.ant-menu-dark) > .ant-menu-submenu:hover'

‎config/themePluginConfig.js

+115
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
export default {
2+
theme: [
3+
{
4+
key: 'dark',
5+
fileName: 'dark.css',
6+
theme: 'dark'
7+
},
8+
{
9+
key: '#F5222D',
10+
fileName: '#F5222D.css',
11+
modifyVars: {
12+
'@primary-color': '#F5222D'
13+
}
14+
},
15+
{
16+
key: '#FA541C',
17+
fileName: '#FA541C.css',
18+
modifyVars: {
19+
'@primary-color': '#FA541C'
20+
}
21+
},
22+
{
23+
key: '#FAAD14',
24+
fileName: '#FAAD14.css',
25+
modifyVars: {
26+
'@primary-color': '#FAAD14'
27+
}
28+
},
29+
{
30+
key: '#13C2C2',
31+
fileName: '#13C2C2.css',
32+
modifyVars: {
33+
'@primary-color': '#13C2C2'
34+
}
35+
},
36+
{
37+
key: '#52C41A',
38+
fileName: '#52C41A.css',
39+
modifyVars: {
40+
'@primary-color': '#52C41A'
41+
}
42+
},
43+
{
44+
key: '#2F54EB',
45+
fileName: '#2F54EB.css',
46+
modifyVars: {
47+
'@primary-color': '#2F54EB'
48+
}
49+
},
50+
{
51+
key: '#722ED1',
52+
fileName: '#722ED1.css',
53+
modifyVars: {
54+
'@primary-color': '#722ED1'
55+
}
56+
},
57+
58+
{
59+
key: '#F5222D',
60+
theme: 'dark',
61+
fileName: 'dark-#F5222D.css',
62+
modifyVars: {
63+
'@primary-color': '#F5222D'
64+
}
65+
},
66+
{
67+
key: '#FA541C',
68+
theme: 'dark',
69+
fileName: 'dark-#FA541C.css',
70+
modifyVars: {
71+
'@primary-color': '#FA541C'
72+
}
73+
},
74+
{
75+
key: '#FAAD14',
76+
theme: 'dark',
77+
fileName: 'dark-#FAAD14.css',
78+
modifyVars: {
79+
'@primary-color': '#FAAD14'
80+
}
81+
},
82+
{
83+
key: '#13C2C2',
84+
theme: 'dark',
85+
fileName: 'dark-#13C2C2.css',
86+
modifyVars: {
87+
'@primary-color': '#13C2C2'
88+
}
89+
},
90+
{
91+
key: '#52C41A',
92+
theme: 'dark',
93+
fileName: 'dark-#52C41A.css',
94+
modifyVars: {
95+
'@primary-color': '#52C41A'
96+
}
97+
},
98+
{
99+
key: '#2F54EB',
100+
theme: 'dark',
101+
fileName: 'dark-#2F54EB.css',
102+
modifyVars: {
103+
'@primary-color': '#2F54EB'
104+
}
105+
},
106+
{
107+
key: '#722ED1',
108+
theme: 'dark',
109+
fileName: 'dark-#722ED1.css',
110+
modifyVars: {
111+
'@primary-color': '#722ED1'
112+
}
113+
}
114+
]
115+
}

‎package.json

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"name": "vue-antd-pro",
3-
"version": "2.1.0",
3+
"version": "3.0.0",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",
77
"build": "vue-cli-service build",
88
"test:unit": "vue-cli-service test:unit",
99
"lint": "vue-cli-service lint",
1010
"build:preview": "vue-cli-service build --mode preview",
11-
"lint:nofix": "vue-cli-service lint --no-fix",
12-
"postinstall": "opencollective-postinstall"
11+
"lint:nofix": "vue-cli-service lint --no-fix"
1312
},
1413
"dependencies": {
14+
"@ant-design-vue/pro-layout": "^0.3.4",
1515
"@antv/data-set": "^0.10.2",
16-
"ant-design-vue": "1.5.0-rc.6",
16+
"ant-design-vue": "^1.6.2",
1717
"axios": "^0.19.0",
1818
"core-js": "^3.1.2",
1919
"enquire.js": "^2.1.6",
@@ -24,11 +24,12 @@
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",
32+
"vue-i18n": "^8.17.4",
3233
"vue-quill-editor": "^3.0.6",
3334
"vue-router": "^3.1.2",
3435
"vue-svg-component-runtime": "^1.0.1",
@@ -51,16 +52,13 @@
5152
"eslint": "^5.16.0",
5253
"eslint-plugin-html": "^5.0.0",
5354
"eslint-plugin-vue": "^5.2.3",
55+
"git-revision-webpack-plugin": "^3.0.6",
5456
"less": "^3.0.4",
5557
"less-loader": "^5.0.0",
5658
"opencollective": "^1.0.3",
5759
"opencollective-postinstall": "^2.0.2",
5860
"vue-svg-icon-loader": "^2.1.1",
5961
"vue-template-compiler": "^2.6.10",
60-
"webpack-theme-color-replacer": "^1.2.17"
61-
},
62-
"collective": {
63-
"type": "opencollective",
64-
"url": "https://opencollective.com/ant-design-pro-vue"
62+
"webpack-theme-color-replacer": "^1.3.12"
6563
}
6664
}

0 commit comments

Comments
 (0)