Skip to content

Commit 5376eb4

Browse files
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feature/bpm
2 parents 7cb68da + a7c37fa commit 5376eb4

File tree

191 files changed

+15235
-8311
lines changed

Some content is hidden

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

191 files changed

+15235
-8311
lines changed

.env

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@ VITE_APP_DOCALERT_ENABLE=true
1818

1919
# 百度统计
2020
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
21+
22+
# 默认账户密码
23+
VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码
24+
VITE_APP_DEFAULT_LOGIN_USERNAME = admin
25+
VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ node_modules
22
.DS_Store
33
dist
44
dist-ssr
5-
*.local
65
/dist*
76
pnpm-debug
87
auto-*.d.ts

.image/common/ai-feature.png

20.7 KB
Loading

.image/common/ai-preview.gif

348 KB
Loading

README.md

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,16 @@
5454

5555
推荐 VS Code 开发,配合插件如下:
5656

57-
| 插件名 | 功能 |
58-
|-------------------------------|--------------------------|
59-
| TypeScript Vue Plugin (Volar) | 用于 TypeScript 的 Vue 插件 |
60-
| Vue Language Features (Volar) | Vue3.0 语法支持 |
61-
| unocss | unocss for vscode |
62-
| Iconify IntelliSense | Iconify 预览和搜索 |
63-
| i18n Ally | 国际化智能提示 |
64-
| Stylelint | Css 格式化 |
65-
| Prettier | 代码格式化 |
66-
| ESLint | 脚本代码检查 |
67-
| DotENV | env 文件高亮 |
57+
| 插件名 | 功能 |
58+
|-------------------------------|---------------------|
59+
| Vue - Official | Vue 与 TypeScript 支持 |
60+
| unocss | unocss for vscode |
61+
| Iconify IntelliSense | Iconify 预览和搜索 |
62+
| i18n Ally | 国际化智能提示 |
63+
| Stylelint | Css 格式化 |
64+
| Prettier | 代码格式化 |
65+
| ESLint | 脚本代码检查 |
66+
| DotENV | env 文件高亮 |
6867

6968
## 🔥 后端架构
7069

@@ -192,26 +191,24 @@ ps:核心功能已经实现,正在对接微信小程序中...
192191

193192
### 商城系统
194193

194+
演示地址:<https://doc.iocoder.cn/mall-preview/>
195+
195196
![功能图](/.image/common/mall-feature.png)
196197

197198
![功能图](/.image/common/mall-preview.png)
198199

199-
_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入芋道快速开发平台_
200-
201-
演示地址:<https://doc.iocoder.cn/mall-preview/>
202-
203200
### ERP 系统
204201

205-
![功能图](/.image/common/erp-feature.png)
206-
207202
演示地址:<https://doc.iocoder.cn/erp-preview/>
208203

209-
### CRM 系统
204+
![功能图](/.image/common/erp-feature.png)
210205

211-
![功能图](/.image/common/crm-feature.png)
206+
### CRM 系统
212207

213208
演示地址:<https://doc.iocoder.cn/crm-preview/>
214209

210+
![功能图](/.image/common/crm-feature.png)
211+
215212
## 🐷 演示图
216213

217214
### 系统功能

build/vite/optimize.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ const include = [
2727
'echarts-wordcloud',
2828
'@wangeditor/editor',
2929
'@wangeditor/editor-for-vue',
30+
'@microsoft/fetch-event-source',
31+
'markdown-it',
32+
'markmap-view',
33+
'markmap-lib',
34+
'markmap-toolbar',
35+
'highlight.js',
3036
'element-plus',
3137
'element-plus/es',
3238
'element-plus/es/locale/lang/zh-cn',
@@ -104,7 +110,11 @@ const include = [
104110
'element-plus/es/components/collapse/style/css',
105111
'element-plus/es/components/collapse-item/style/css',
106112
'element-plus/es/components/button-group/style/css',
107-
'element-plus/es/components/text/style/css'
113+
'element-plus/es/components/text/style/css',
114+
'element-plus/es/components/segmented/style/css',
115+
'@element-plus/icons-vue',
116+
'element-plus/es/components/footer/style/css',
117+
'element-plus/es/components/empty/style/css'
108118
]
109119

110120
const exclude = ['@iconify/json']

package.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin-vue3",
3-
"version": "2.1.0-snapshot",
3+
"version": "2.2.0-snapshot",
44
"description": "基于vue3、vite4、element-plus、typesScript",
55
"author": "xingyu",
66
"private": false,
@@ -52,7 +52,11 @@
5252
"highlight.js": "^11.9.0",
5353
"jsencrypt": "^3.3.2",
5454
"lodash-es": "^4.17.21",
55-
"marked": "^12.0.2",
55+
"markdown-it": "^14.1.0",
56+
"markmap-common": "^0.16.0",
57+
"markmap-lib": "^0.16.1",
58+
"markmap-toolbar": "^0.17.0",
59+
"markmap-view": "^0.16.0",
5660
"min-dash": "^4.1.1",
5761
"mitt": "^3.0.1",
5862
"nprogress": "^0.2.0",
@@ -85,8 +89,8 @@
8589
"@types/qs": "^6.9.12",
8690
"@typescript-eslint/eslint-plugin": "^7.1.0",
8791
"@typescript-eslint/parser": "^7.1.0",
88-
"@unocss/transformer-variant-group": "^0.58.5",
8992
"@unocss/eslint-config": "^0.57.4",
93+
"@unocss/transformer-variant-group": "^0.58.5",
9094
"@vitejs/plugin-legacy": "^5.3.1",
9195
"@vitejs/plugin-vue": "^5.0.4",
9296
"@vitejs/plugin-vue-jsx": "^3.1.0",

0 commit comments

Comments
 (0)