Skip to content

Commit 16561b1

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
� Conflicts: � build/vite/optimize.ts
2 parents 3feb482 + fa618ca commit 16561b1

File tree

20 files changed

+138
-122
lines changed

20 files changed

+138
-122
lines changed

‎README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
* nodejs > 16.0.0 && pnpm > 7.30.0
1313
* 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.yudao.iocoder.cn>
14+
* 演示地址【Vue3 + vben(ant-design-vue)】：<http://dashboard-vben.yudao.iocoder.cn>
1415
* 演示地址【Vue2 + element-ui】：<http://dashboard.yudao.iocoder.cn>
1516
* 启动文档：<https://doc.iocoder.cn/quick-start/>
1617
* 视频教程：<https://doc.iocoder.cn/video/>
@@ -19,8 +20,8 @@
1920

2021
**芋道**，以开发者为中心，打造中国第一流的快速开发平台，全部开源，个人与企业可 100% 免费使用。
2122

22-
* 采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin)
23-
* 改换saas，自动引入等功能 [vue-element-plus-admin](https://gitee.com/yudaocode/vue-element-plus-admin)
23+
* 采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) 实现
24+
* 改换 saas，自动引入等功能
2425
* 使用 Element Plus 免费开源的中后台模版，具备如下特性：
2526

2627
![首页](preview/home.png)
@@ -38,11 +39,11 @@
3839
| 框架 | 说明 | 版本 |
3940
|----------------------------------------------------------------------|------------------|--------|
4041
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 |
41-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.4 |
42-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.34 |
43-
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.9.5 |
44-
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.33 |
45-
| [vueuse](https://vueuse.org/) | 常用工具集 | 9.13.0 |
42+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.3.1 |
43+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.3 |
44+
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.0.4 |
45+
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.35 |
46+
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.1.0 |
4647
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
4748
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.1.6 |
4849
| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |

‎build/vite/optimize.ts

Lines changed: 58 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ const include = [
1717
'cropperjs',
1818
'lodash-es',
1919
'nprogress',
20-
'animate.css',
2120
'web-storage-cache',
2221
'@iconify/iconify',
2322
'@vueuse/core',
@@ -33,38 +32,58 @@ const include = [
3332
'element-plus/es',
3433
'element-plus/es/locale/lang/zh-cn',
3534
'element-plus/es/locale/lang/en',
36-
'element-plus/es/components/backtop/style/index',
37-
'element-plus/es/components/form/style/index',
38-
'element-plus/es/components/radio-group/style/index',
39-
'element-plus/es/components/radio/style/index',
40-
'element-plus/es/components/checkbox/style/index',
41-
'element-plus/es/components/checkbox-group/style/index',
42-
'element-plus/es/components/switch/style/index',
43-
'element-plus/es/components/time-picker/style/index',
44-
'element-plus/es/components/date-picker/style/index',
45-
'element-plus/es/components/col/style/index',
46-
'element-plus/es/components/form-item/style/index',
47-
'element-plus/es/components/alert/style/index',
48-
'element-plus/es/components/breadcrumb/style/index',
49-
'element-plus/es/components/select/style/index',
50-
'element-plus/es/components/input/style/index',
51-
'element-plus/es/components/breadcrumb-item/style/index',
52-
'element-plus/es/components/tag/style/index',
53-
'element-plus/es/components/pagination/style/index',
54-
'element-plus/es/components/table/style/index',
55-
'element-plus/es/components/table-column/style/index',
56-
'element-plus/es/components/card/style/index',
57-
'element-plus/es/components/row/style/index',
58-
'element-plus/es/components/button/style/index',
59-
'element-plus/es/components/menu/style/index',
60-
'element-plus/es/components/sub-menu/style/index',
61-
'element-plus/es/components/menu-item/style/index',
62-
'element-plus/es/components/option/style/index',
63-
'element-plus/es/components/dropdown/style/index',
64-
'element-plus/es/components/dropdown-menu/style/index',
65-
'element-plus/es/components/dropdown-item/style/index',
66-
'element-plus/es/components/skeleton/style/index',
67-
35+
'element-plus/es/components/backtop/style/css',
36+
'element-plus/es/components/form/style/css',
37+
'element-plus/es/components/radio-group/style/css',
38+
'element-plus/es/components/radio/style/css',
39+
'element-plus/es/components/checkbox/style/css',
40+
'element-plus/es/components/checkbox-group/style/css',
41+
'element-plus/es/components/switch/style/css',
42+
'element-plus/es/components/time-picker/style/css',
43+
'element-plus/es/components/date-picker/style/css',
44+
'element-plus/es/components/descriptions/style/css',
45+
'element-plus/es/components/descriptions-item/style/css',
46+
'element-plus/es/components/link/style/css',
47+
'element-plus/es/components/tooltip/style/css',
48+
'element-plus/es/components/drawer/style/css',
49+
'element-plus/es/components/dialog/style/css',
50+
'element-plus/es/components/checkbox-button/style/css',
51+
'element-plus/es/components/option-group/style/css',
52+
'element-plus/es/components/radio-button/style/css',
53+
'element-plus/es/components/cascader/style/css',
54+
'element-plus/es/components/color-picker/style/css',
55+
'element-plus/es/components/input-number/style/css',
56+
'element-plus/es/components/rate/style/css',
57+
'element-plus/es/components/select-v2/style/css',
58+
'element-plus/es/components/tree-select/style/css',
59+
'element-plus/es/components/slider/style/css',
60+
'element-plus/es/components/time-select/style/css',
61+
'element-plus/es/components/autocomplete/style/css',
62+
'element-plus/es/components/image-viewer/style/css',
63+
'element-plus/es/components/upload/style/css',
64+
'element-plus/es/components/col/style/css',
65+
'element-plus/es/components/form-item/style/css',
66+
'element-plus/es/components/alert/style/css',
67+
'element-plus/es/components/breadcrumb/style/css',
68+
'element-plus/es/components/select/style/css',
69+
'element-plus/es/components/input/style/css',
70+
'element-plus/es/components/breadcrumb-item/style/css',
71+
'element-plus/es/components/tag/style/css',
72+
'element-plus/es/components/pagination/style/css',
73+
'element-plus/es/components/table/style/css',
74+
'element-plus/es/components/table-v2/style/css',
75+
'element-plus/es/components/table-column/style/css',
76+
'element-plus/es/components/card/style/css',
77+
'element-plus/es/components/row/style/css',
78+
'element-plus/es/components/button/style/css',
79+
'element-plus/es/components/menu/style/css',
80+
'element-plus/es/components/sub-menu/style/css',
81+
'element-plus/es/components/menu-item/style/css',
82+
'element-plus/es/components/option/style/css',
83+
'element-plus/es/components/dropdown/style/css',
84+
'element-plus/es/components/dropdown-menu/style/css',
85+
'element-plus/es/components/dropdown-item/style/css',
86+
'element-plus/es/components/skeleton/style/css',
6887
'element-plus/es/components/skeleton/style/css',
6988
'element-plus/es/components/backtop/style/css',
7089
'element-plus/es/components/menu/style/css',
@@ -78,20 +97,12 @@ const include = [
7897
'element-plus/es/components/breadcrumb/style/css',
7998
'element-plus/es/components/breadcrumb-item/style/css',
8099
'element-plus/es/components/image/style/css',
81-
'element-plus/es/components/tag/style/css',
82-
'element-plus/es/components/dialog/style/css',
83-
'element-plus/es/components/form/style/css',
84-
'element-plus/es/components/form-item/style/css',
85-
'element-plus/es/components/card/style/css',
86-
'element-plus/es/components/tooltip/style/css',
87-
'element-plus/es/components/radio-group/style/css',
88-
'element-plus/es/components/radio/style/css',
89-
'element-plus/es/components/input-number/style/css',
90-
'element-plus/es/components/tree-select/style/css',
91-
'element-plus/es/components/drawer/style/css',
92-
'element-plus/es/components/image-viewer/style/css',
93-
'element-plus/es/components/upload/style/css',
94-
'element-plus/es/components/switch/style/css'
100+
'element-plus/es/components/collapse-transition/style/css',
101+
'element-plus/es/components/timeline/style/css',
102+
'element-plus/es/components/timeline-item/style/css',
103+
'element-plus/es/components/collapse/style/css',
104+
'element-plus/es/components/collapse-item/style/css',
105+
'element-plus/es/components/button-group/style/css'
95106
]
96107

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

‎package.json

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -33,32 +33,32 @@
3333
"@form-create/element-ui": "^3.1.17",
3434
"@iconify/iconify": "^3.1.0",
3535
"@videojs-player/vue": "^1.0.0",
36-
"@vueuse/core": "^9.13.0",
36+
"@vueuse/core": "^10.1.0",
3737
"@wangeditor/editor": "^5.1.23",
3838
"@wangeditor/editor-for-vue": "^5.1.10",
3939
"@zxcvbn-ts/core": "^2.2.1",
4040
"animate.css": "^4.1.1",
41-
"axios": "^1.3.5",
41+
"axios": "^1.3.6",
4242
"benz-amr-recorder": "^1.1.5",
4343
"bpmn-js-token-simulation": "^0.10.0",
4444
"camunda-bpmn-moddle": "^7.0.1",
4545
"cropperjs": "^1.5.13",
4646
"crypto-js": "^4.1.1",
4747
"dayjs": "^1.11.7",
4848
"diagram-js": "^11.6.0",
49-
"echarts": "^5.4.1",
49+
"echarts": "^5.4.2",
5050
"echarts-wordcloud": "^2.1.0",
5151
"element-plus": "2.3.3",
52-
"fast-xml-parser": "^4.1.3",
52+
"fast-xml-parser": "^4.2.2",
5353
"highlight.js": "^11.7.0",
5454
"intro.js": "^7.0.1",
5555
"jsencrypt": "^3.3.2",
5656
"lodash-es": "^4.17.21",
57-
"min-dash": "^4.0.0",
57+
"min-dash": "^4.1.0",
5858
"mitt": "^3.0.0",
5959
"nprogress": "^0.2.0",
60-
"pinia": "^2.0.34",
61-
"qrcode": "^1.5.1",
60+
"pinia": "^2.0.35",
61+
"qrcode": "^1.5.3",
6262
"qs": "^6.11.1",
6363
"steady-xml": "^0.1.0",
6464
"url": "^0.11.0",
@@ -73,61 +73,60 @@
7373
"xml-js": "^1.6.11"
7474
},
7575
"devDependencies": {
76-
"@commitlint/cli": "^17.5.0",
77-
"@commitlint/config-conventional": "^17.4.4",
78-
"@iconify/json": "^2.2.38",
76+
"@commitlint/cli": "^17.6.1",
77+
"@commitlint/config-conventional": "^17.6.1",
78+
"@iconify/json": "^2.2.54",
7979
"@intlify/unplugin-vue-i18n": "^0.10.0",
8080
"@purge-icons/generated": "^0.9.0",
8181
"@types/intro.js": "^5.1.1",
8282
"@types/lodash-es": "^4.17.7",
83-
"@types/node": "^18.15.5",
83+
"@types/node": "^18.16.0",
8484
"@types/nprogress": "^0.2.0",
8585
"@types/qrcode": "^1.5.0",
8686
"@types/qs": "^6.9.7",
87-
"@typescript-eslint/eslint-plugin": "^5.56.0",
88-
"@typescript-eslint/parser": "^5.56.0",
87+
"@typescript-eslint/eslint-plugin": "^5.59.0",
88+
"@typescript-eslint/parser": "^5.59.0",
8989
"@vitejs/plugin-legacy": "^4.0.2",
9090
"@vitejs/plugin-vue": "^4.1.0",
9191
"@vitejs/plugin-vue-jsx": "^3.0.1",
9292
"autoprefixer": "^10.4.14",
9393
"bpmn-js": "^8.9.0",
9494
"bpmn-js-properties-panel": "^0.46.0",
95-
"consola": "^2.15.3",
96-
"eslint": "^8.36.0",
95+
"consola": "^3.1.0",
96+
"eslint": "^8.39.0",
9797
"eslint-config-prettier": "^8.8.0",
98-
"eslint-define-config": "^1.17.0",
98+
"eslint-define-config": "^1.18.0",
9999
"eslint-plugin-prettier": "^4.2.1",
100-
"eslint-plugin-vue": "^9.9.0",
101-
"lint-staged": "^13.2.0",
102-
"postcss": "^8.4.21",
100+
"eslint-plugin-vue": "^9.11.0",
101+
"lint-staged": "^13.2.1",
102+
"postcss": "^8.4.23",
103103
"postcss-html": "^1.5.0",
104104
"postcss-scss": "^4.0.6",
105-
"prettier": "^2.8.6",
106-
"rimraf": "^4.4.1",
107-
"rollup": "^3.20.0",
108-
"sass": "^1.59.3",
109-
"stylelint": "^15.3.0",
105+
"prettier": "^2.8.8",
106+
"rimraf": "^5.0.0",
107+
"rollup": "^3.20.7",
108+
"sass": "^1.62.0",
109+
"stylelint": "^15.6.0",
110110
"stylelint-config-html": "^1.1.0",
111-
"stylelint-config-prettier": "^9.0.5",
112-
"stylelint-config-recommended": "^11.0.0",
113-
"stylelint-config-standard": "^31.0.0",
111+
"stylelint-config-recommended": "^12.0.0",
112+
"stylelint-config-standard": "^33.0.0",
114113
"stylelint-order": "^6.0.3",
115-
"terser": "^5.16.6",
116-
"typescript": "5.0.2",
117-
"unplugin-auto-import": "^0.15.1",
118-
"unplugin-element-plus": "^0.7.0",
114+
"terser": "^5.17.1",
115+
"typescript": "5.0.4",
116+
"unplugin-auto-import": "^0.15.3",
117+
"unplugin-element-plus": "^0.7.1",
119118
"unplugin-vue-components": "^0.24.1",
120-
"vite": "4.2.1",
119+
"vite": "4.3.1",
121120
"vite-plugin-compression": "^0.5.1",
122121
"vite-plugin-ejs": "^1.6.4",
123122
"vite-plugin-eslint": "^1.8.1",
124-
"vite-plugin-progress": "^0.0.6",
123+
"vite-plugin-progress": "^0.0.7",
125124
"vite-plugin-purge-icons": "^0.9.2",
126125
"vite-plugin-svg-icons": "^2.0.1",
127126
"vite-plugin-top-level-await": "^1.3.0",
128127
"vite-plugin-vue-setup-extend-plus": "^0.1.0",
129128
"vite-plugin-windicss": "^1.8.10",
130-
"vue-tsc": "^1.2.0",
129+
"vue-tsc": "^1.4.4",
131130
"windicss": "^3.5.6"
132131
},
133132
"engines": {

‎src/api/system/notify/template/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export const updateNotifyTemplate = async (data: NotifyTemplateVO) => {
3939
}
4040

4141
// 删除站内信模板
42-
export const deleteNotifyTemplateApi = async (id: number) => {
42+
export const deleteNotifyTemplate = async (id: number) => {
4343
return await request.delete({ url: '/system/notify-template/delete?id=' + id })
4444
}
4545

‎src/api/system/oauth2/token.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ export const getAccessTokenPage = (params: PageParam) => {
1717
}
1818

1919
// 删除 token
20-
export const deleteAccessToken = (accessToken: number) => {
20+
export const deleteAccessToken = (accessToken: string) => {
2121
return request.delete({ url: '/system/oauth2-token/delete?accessToken=' + accessToken })
2222
}

‎src/views/bpm/definition/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<MyProcessViewer
8888
key="designer"
8989
v-model="bpmnXML"
90-
:value="bpmnXML"
90+
:value="bpmnXML as any"
9191
v-bind="bpmnControlForm"
9292
:prefix="bpmnControlForm.prefix"
9393
/>

‎src/views/bpm/group/UserGroupForm.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const formRules = reactive({
6868
status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
6969
})
7070
const formRef = ref() // 表单 Ref
71-
const userList = ref([]) // 用户列表
71+
const userList = ref<any[]>([]) // 用户列表
7272
7373
/** 打开弹窗 */
7474
const open = async (type: string, id?: number) => {

‎src/views/bpm/group/index.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ import { dateFormatter } from '@/utils/formatTime'
117117
import * as UserGroupApi from '@/api/bpm/userGroup'
118118
import * as UserApi from '@/api/system/user'
119119
import UserGroupForm from './UserGroupForm.vue'
120+
import { UserVO } from '@/api/system/user'
120121
const message = useMessage() // 消息弹窗
121122
const { t } = useI18n() // 国际化
122123
@@ -131,7 +132,7 @@ const queryParams = reactive({
131132
createTime: []
132133
})
133134
const queryFormRef = ref() // 搜索的表单
134-
const userList = ref([]) // 用户列表
135+
const userList = ref<UserVO[]>([]) // 用户列表
135136
136137
/** 查询列表 */
137138
const getList = async () => {

‎src/views/bpm/model/editor/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<!-- 流程属性器，负责编辑每个流程节点的属性 -->
1717
<MyProcessPenal
1818
key="penal"
19-
:bpmnModeler="modeler"
19+
:bpmnModeler="modeler as any"
2020
:prefix="controlForm.prefix"
2121
class="process-panel"
2222
:model="model"

‎src/views/bpm/model/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<MyProcessViewer
220220
key="designer"
221221
v-model="bpmnXML"
222-
:value="bpmnXML"
222+
:value="bpmnXML as any"
223223
v-bind="bpmnControlForm"
224224
:prefix="bpmnControlForm.prefix"
225225
/>

0 commit comments

Comments
 (0)