Skip to content

Commit 0b06f36

Browse files
author
puhui999
committed
Merge remote-tracking branch 'yudao/master' into dev-to-dev
2 parents 73b918b + bc258db commit 0b06f36

File tree

53 files changed

+479
-395
lines changed

Some content is hidden

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

53 files changed

+479
-395
lines changed

‎.vscode/extensions.json

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
{
22
"recommendations": [
3-
"voorjaar.windicss-intellisense",
3+
"christian-kohler.path-intellisense",
44
"vscode-icons-team.vscode-icons",
55
"davidanson.vscode-markdownlint",
66
"stylelint.vscode-stylelint",
77
"dbaeumer.vscode-eslint",
88
"esbenp.prettier-vscode",
9-
"vue.volar",
9+
"mrmlnc.vscode-less",
1010
"lokalise.i18n-ally",
11+
"redhat.vscode-yaml",
12+
"csstools.postcss",
1113
"mikestead.dotenv",
1214
"eamodio.gitlens",
13-
"antfu.iconify"
15+
"antfu.iconify",
16+
"antfu.unocss",
17+
"Vue.volar"
1418
]
1519
}

‎.vscode/settings.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,12 @@
102102
"i18n-ally.displayLanguage": "zh-CN",
103103
"i18n-ally.enabledFrameworks": ["vue", "react"],
104104
"cSpell.words": [
105-
"vben",
106-
"windicss",
107-
"tailwind",
105+
"xingyu",
106+
"yudao",
107+
"unocss",
108108
"browserslist",
109-
"tailwindcss",
110109
"esnext",
111-
"antv",
112-
"tinymce",
110+
"unplugin",
113111
"qrcode",
114112
"sider",
115113
"pinia",
@@ -123,17 +121,17 @@
123121
"codemirror",
124122
"iconify",
125123
"commitlint",
126-
"vditor",
124+
"videojs",
127125
"echarts",
126+
"wangeditor",
128127
"cropperjs",
129128
"logicflow",
130129
"vueuse",
131130
"zxcvbn",
132131
"lintstagedrc",
133132
"brotli",
134133
"sider",
135-
"pnpm",
136-
"antd"
134+
"pnpm"
137135
],
138136
"vetur.format.scriptInitialIndent": true,
139137
"vetur.format.styleInitialIndent": true,

‎README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* 改换 saas，自动引入等功能
2525
* 使用 Element Plus 免费开源的中后台模版，具备如下特性：
2626

27-
![首页](preview/home.png)
27+
![首页](public/home.png)
2828

2929
* **最新技术栈**：使用 Vue3、Vite4 等前端前沿技术开发
3030
* **TypeScript**: 应用程序级 JavaScript 的语言
@@ -39,15 +39,15 @@
3939
| 框架 | 说明 | 版本 |
4040
|----------------------------------------------------------------------|------------------|--------|
4141
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
42-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.3.9 |
43-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.7 |
44-
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.0.4 |
45-
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.4 |
46-
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.2.0 |
42+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.7 |
43+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.8 |
44+
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 |
45+
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
46+
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.2.1 |
4747
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
48-
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.1 |
49-
| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
50-
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.0 |
48+
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 |
49+
| [unocss](https://uno.antfu.me/) | 原子 css | 0.54.0 |
50+
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
5151
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
5252

5353
## 开发工具
@@ -56,14 +56,14 @@
5656

5757
| 插件名 | 功能 |
5858
|-------------------------------|--------------------------|
59-
| TypeScript Vue Plugin (Volar) | 用于 TypeScript 的 Vue 插件 |
59+
| TypeScript Vue Plugin (Volar) | 用于 TypeScript 的 Vue 插件 |
6060
| Vue Language Features (Volar) | Vue3.0 语法支持 |
61-
| WindiCSS IntelliSense | 自动完成、语法突出显示、代码折叠和构建等高级功能 |
62-
| Iconify IntelliSense | Iconify 预览和搜索 |
63-
| i18n Ally | 国际化智能提示 |
61+
| unocss | unocss for vscode |
62+
| Iconify IntelliSense | Iconify 预览和搜索 |
63+
| i18n Ally | 国际化智能提示 |
6464
| Stylelint | Css 格式化 |
65-
| Prettier | 代码格式化 |
66-
| ESLint | 脚本代码检查 |
65+
| Prettier | 代码格式化 |
66+
| ESLint | 脚本代码检查 |
6767
| DotENV | env 文件高亮 |
6868

6969
## 内置功能

‎build/vite/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { resolve } from 'path'
22
import Vue from '@vitejs/plugin-vue'
33
import VueJsx from '@vitejs/plugin-vue-jsx'
4-
import WindiCSS from 'vite-plugin-windicss'
54
import progress from 'vite-plugin-progress'
65
import EslintPlugin from 'vite-plugin-eslint'
76
import PurgeIcons from 'vite-plugin-purge-icons'
@@ -15,6 +14,7 @@ import viteCompression from 'vite-plugin-compression'
1514
import topLevelAwait from 'vite-plugin-top-level-await'
1615
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
1716
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
17+
import UnoCSS from 'unocss/vite'
1818

1919
export function createVitePlugins() {
2020
const root = process.cwd()
@@ -27,7 +27,7 @@ export function createVitePlugins() {
2727
return [
2828
Vue(),
2929
VueJsx(),
30-
WindiCSS(),
30+
UnoCSS(),
3131
progress(),
3232
PurgeIcons(),
3333
ElementPlus({}),

‎build/vite/optimize.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const include = [
88
'pinia',
99
'dayjs',
1010
'qrcode',
11-
'windicss',
11+
'unocss',
1212
'vue-router',
1313
'vue-types',
1414
'vue-i18n',

‎package.json

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin-vue3",
3-
"version": "1.7.3-snapshot",
3+
"version": "1.8.0-snapshot",
44
"description": "基于vue3、vite4、element-plus、typesScript",
55
"author": "xingyu",
66
"private": false,
@@ -32,102 +32,103 @@
3232
"@element-plus/icons-vue": "^2.1.0",
3333
"@form-create/designer": "^3.1.0",
3434
"@form-create/element-ui": "^3.1.17",
35-
"@iconify/iconify": "^3.1.0",
35+
"@iconify/iconify": "^3.1.1",
3636
"@videojs-player/vue": "^1.0.0",
37-
"@vueuse/core": "^10.2.0",
37+
"@vueuse/core": "^10.2.1",
3838
"@wangeditor/editor": "^5.1.23",
3939
"@wangeditor/editor-for-vue": "^5.1.10",
40-
"@zxcvbn-ts/core": "^3.0.2",
40+
"@zxcvbn-ts/core": "^3.0.3",
4141
"animate.css": "^4.1.1",
4242
"axios": "^1.4.0",
4343
"benz-amr-recorder": "^1.1.5",
4444
"bpmn-js-token-simulation": "^0.10.0",
4545
"camunda-bpmn-moddle": "^7.0.1",
4646
"cropperjs": "^1.5.13",
4747
"crypto-js": "^4.1.1",
48-
"dayjs": "^1.11.8",
48+
"dayjs": "^1.11.9",
4949
"diagram-js": "^11.6.0",
50-
"echarts": "^5.4.2",
50+
"echarts": "^5.4.3",
5151
"echarts-wordcloud": "^2.1.0",
52-
"element-plus": "2.3.7",
53-
"fast-xml-parser": "^4.2.4",
52+
"element-plus": "2.3.8",
53+
"fast-xml-parser": "^4.2.6",
5454
"highlight.js": "^11.8.0",
5555
"intro.js": "^7.0.1",
5656
"jsencrypt": "^3.3.2",
5757
"lodash-es": "^4.17.21",
5858
"min-dash": "^4.1.1",
59-
"mitt": "^3.0.0",
59+
"mitt": "^3.0.1",
6060
"nprogress": "^0.2.0",
61-
"pinia": "^2.1.4",
61+
"pinia": "^2.1.6",
6262
"qrcode": "^1.5.3",
6363
"qs": "^6.11.2",
6464
"steady-xml": "^0.1.0",
6565
"url": "^0.11.1",
66-
"video.js": "^8.3.0",
66+
"video.js": "^7.21.5",
6767
"vue": "3.3.4",
6868
"vue-dompurify-html": "^4.1.4",
6969
"vue-i18n": "9.2.2",
70-
"vue-router": "^4.2.2",
71-
"vue-types": "^5.0.4",
70+
"vue-router": "^4.2.4",
71+
"vue-types": "^5.1.1",
7272
"vuedraggable": "^4.1.0",
7373
"web-storage-cache": "^1.1.1",
7474
"xml-js": "^1.6.11"
7575
},
7676
"devDependencies": {
77-
"@commitlint/cli": "^17.6.5",
78-
"@commitlint/config-conventional": "^17.6.5",
79-
"@iconify/json": "^2.2.80",
80-
"@intlify/unplugin-vue-i18n": "^0.11.0",
77+
"@commitlint/cli": "^17.6.7",
78+
"@commitlint/config-conventional": "^17.6.7",
79+
"@iconify/json": "^2.2.95",
80+
"@intlify/unplugin-vue-i18n": "^0.12.2",
8181
"@purge-icons/generated": "^0.9.0",
8282
"@types/intro.js": "^5.1.1",
83-
"@types/lodash-es": "^4.17.7",
84-
"@types/node": "^20.3.1",
83+
"@types/lodash-es": "^4.17.8",
84+
"@types/node": "^20.4.0",
8585
"@types/nprogress": "^0.2.0",
86-
"@types/qrcode": "^1.5.0",
86+
"@types/qrcode": "^1.5.1",
8787
"@types/qs": "^6.9.7",
88-
"@typescript-eslint/eslint-plugin": "^5.59.11",
89-
"@typescript-eslint/parser": "^5.59.11",
90-
"@vitejs/plugin-legacy": "^4.0.4",
88+
"@typescript-eslint/eslint-plugin": "^6.2.0",
89+
"@typescript-eslint/parser": "^6.2.0",
90+
"@unocss/transformer-variant-group": "^0.51.4",
91+
"@vitejs/plugin-legacy": "^4.1.1",
9192
"@vitejs/plugin-vue": "^4.2.3",
9293
"@vitejs/plugin-vue-jsx": "^3.0.1",
94+
"@vue-macros/volar": "^0.12.3",
9395
"autoprefixer": "^10.4.14",
9496
"bpmn-js": "^8.9.0",
9597
"bpmn-js-properties-panel": "^0.46.0",
96-
"consola": "^3.1.0",
97-
"eslint": "^8.43.0",
98-
"eslint-config-prettier": "^8.8.0",
98+
"consola": "^3.2.3",
99+
"eslint": "^8.46.0",
100+
"eslint-config-prettier": "^8.9.0",
99101
"eslint-define-config": "^1.21.0",
100-
"eslint-plugin-prettier": "^4.2.1",
101-
"eslint-plugin-vue": "^9.15.0",
102-
"lint-staged": "^13.2.2",
103-
"postcss": "^8.4.24",
102+
"eslint-plugin-prettier": "^5.0.0",
103+
"eslint-plugin-vue": "^9.15.1",
104+
"lint-staged": "^13.2.3",
105+
"postcss": "^8.4.27",
104106
"postcss-html": "^1.5.0",
105107
"postcss-scss": "^4.0.6",
106-
"prettier": "^2.8.8",
108+
"prettier": "^3.0.0",
107109
"rimraf": "^5.0.1",
108-
"rollup": "^3.25.1",
109-
"sass": "^1.63.5",
110-
"stylelint": "^15.8.0",
111-
"stylelint-config-recommended": "^12.0.0",
112-
"stylelint-config-recommended-vue": "^1.4.0",
113-
"stylelint-config-standard": "^33.0.0",
110+
"rollup": "^3.27.0",
111+
"sass": "^1.64.1",
112+
"stylelint": "^15.10.2",
113+
"stylelint-config-recommended": "^13.0.0",
114+
"stylelint-config-recommended-vue": "^1.5.0",
115+
"stylelint-config-standard": "^34.0.0",
114116
"stylelint-order": "^6.0.3",
115-
"terser": "^5.18.1",
116-
"typescript": "5.0.4",
117-
"unplugin-auto-import": "^0.16.4",
118-
"unplugin-element-plus": "^0.7.1",
117+
"terser": "^5.19.2",
118+
"typescript": "5.1.6",
119+
"unocss": "^0.54.0",
120+
"unplugin-auto-import": "^0.16.6",
121+
"unplugin-element-plus": "^0.7.2",
119122
"unplugin-vue-components": "^0.25.1",
120-
"vite": "4.3.9",
123+
"vite": "4.4.7",
121124
"vite-plugin-compression": "^0.5.1",
122125
"vite-plugin-ejs": "^1.6.4",
123126
"vite-plugin-eslint": "^1.8.1",
124127
"vite-plugin-progress": "^0.0.7",
125128
"vite-plugin-purge-icons": "^0.9.2",
126129
"vite-plugin-svg-icons": "^2.0.1",
127130
"vite-plugin-top-level-await": "^1.3.1",
128-
"vite-plugin-windicss": "^1.9.0",
129-
"vue-tsc": "^1.8.1",
130-
"windicss": "^3.5.6"
131+
"vue-tsc": "^1.8.8"
131132
},
132133
"license": "MIT",
133134
"repository": {

‎preview/home.png renamed to ‎public/home.png

File renamed without changes.

‎src/api/login/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ export const getInfo = () => {
3737
return request.get({ url: '/system/auth/get-permission-info' })
3838
}
3939

40-
// 路由
41-
export const getAsyncRoutes = () => {
42-
return request.get({ url: '/system/auth/list-menus' })
43-
}
44-
4540
//获取登录验证码
4641
export const sendSmsCode = (data: SmsCodeVO) => {
4742
return request.post({ url: '/system/auth/send-sms-code', data })

‎src/api/mall/promotion/combination/combinationactivity.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import request from '@/config/axios'
22
import { Sku, Spu } from '@/api/mall/product/spu'
33

4+
// TODO @puhui999: combinationActivity.ts
5+
46
export interface CombinationActivityVO {
57
id?: number
68
name?: string

‎src/components/ContentDetailWrap/src/ContentDetailWrap.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ onMounted(() => {
2828
<div
2929
:class="[
3030
`${prefixCls}-header`,
31-
'flex border-bottom-1 h-50px items-center text-center pr-10px'
31+
'flex b-b-1 h-50px items-center text-center bg-white pr-10px'
3232
]"
3333
>
3434
<div :class="[`${prefixCls}-header__back`, 'flex pl-10px pr-10px ']">

0 commit comments

Comments
 (0)