Skip to content

Commit 29fd92e

Browse files
fessorfengfessorfeng
committed
Merge branch 'dev' of https://gitee.com/fessor/yudao-ui-admin-vue3 into dev
2 parents ca1b6df + 1ef6563 commit 29fd92e

File tree

145 files changed

+10349
-5623
lines changed

Some content is hidden

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

145 files changed

+10349
-5623
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ dist-ssr
66
/dist*
77
*-lock.*
88
pnpm-debug
9+
.idea

‎build/vite/index.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import vueSetupExtend from 'vite-plugin-vue-setup-extend'
1515
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
1616
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
1717

18-
export function createVitePlugins(VITE_APP_TITLE: string) {
18+
export function createVitePlugins() {
1919
const root = process.cwd()
2020
// 路径查找
2121
function pathResolve(dir: string) {
@@ -95,8 +95,6 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
9595
ext: '.gz', // 生成的压缩包后缀
9696
deleteOriginFile: false //压缩后是否删除源文件
9797
}),
98-
ViteEjsPlugin({
99-
title: VITE_APP_TITLE
100-
})
98+
ViteEjsPlugin()
10199
]
102100
}

‎index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
name="description"
1414
content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统！"
1515
/>
16-
<title><%= title %></title>
16+
<title>%VITE_APP_TITLE%</title>
1717
</head>
1818
<body>
1919
<div id="app">
@@ -137,7 +137,7 @@
137137
<div class="app-loading-wrap">
138138
<div class="app-loading-title">
139139
<img src="/logo.gif" class="app-loading-logo" alt="Logo" />
140-
<div class="app-loading-title"><%= title %></div>
140+
<div class="app-loading-title">%VITE_APP_TITLE%</div>
141141
</div>
142142
<div class="app-loading-item">
143143
<div class="app-loading-outter"></div>

‎package.json

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin-vue3",
3-
"version": "1.7.1-snapshot.1941",
3+
"version": "1.7.1-snapshot.1961",
44
"description": "基于vue3、vite4、element-plus、typesScript",
55
"author": "xingyu",
66
"private": false,
@@ -35,6 +35,7 @@
3535
"@zxcvbn-ts/core": "^2.2.1",
3636
"animate.css": "^4.1.1",
3737
"axios": "^1.3.4",
38+
"benz-amr-recorder": "^1.1.5",
3839
"bpmn-js-token-simulation": "^0.10.0",
3940
"camunda-bpmn-moddle": "^7.0.1",
4041
"cropperjs": "^1.5.13",
@@ -43,7 +44,7 @@
4344
"diagram-js": "^11.6.0",
4445
"echarts": "^5.4.1",
4546
"echarts-wordcloud": "^2.1.0",
46-
"element-plus": "2.2.34",
47+
"element-plus": "2.3.1",
4748
"fast-xml-parser": "^4.1.3",
4849
"highlight.js": "^11.7.0",
4950
"intro.js": "^6.0.0",
@@ -62,57 +63,57 @@
6263
"vue-router": "^4.1.6",
6364
"vue-types": "^5.0.2",
6465
"vuedraggable": "^4.1.0",
65-
"vxe-table": "^4.3.10",
66+
"vxe-table": "^4.3.11",
6667
"web-storage-cache": "^1.1.1",
6768
"xe-utils": "^3.5.7",
6869
"xml-js": "^1.6.11"
6970
},
7071
"devDependencies": {
71-
"@commitlint/cli": "^17.4.4",
72+
"@commitlint/cli": "^17.5.0",
7273
"@commitlint/config-conventional": "^17.4.4",
73-
"@iconify/json": "^2.2.31",
74-
"@intlify/unplugin-vue-i18n": "^0.8.2",
74+
"@iconify/json": "^2.2.38",
75+
"@intlify/unplugin-vue-i18n": "^0.10.0",
7576
"@purge-icons/generated": "^0.9.0",
7677
"@types/intro.js": "^5.1.1",
77-
"@types/lodash-es": "^4.17.6",
78-
"@types/node": "^18.14.6",
78+
"@types/lodash-es": "^4.17.7",
79+
"@types/node": "^18.15.5",
7980
"@types/nprogress": "^0.2.0",
8081
"@types/qrcode": "^1.5.0",
8182
"@types/qs": "^6.9.7",
82-
"@typescript-eslint/eslint-plugin": "^5.54.1",
83-
"@typescript-eslint/parser": "^5.54.1",
84-
"@vitejs/plugin-legacy": "^4.0.1",
85-
"@vitejs/plugin-vue": "^4.0.0",
86-
"@vitejs/plugin-vue-jsx": "^3.0.0",
87-
"autoprefixer": "^10.4.13",
83+
"@typescript-eslint/eslint-plugin": "^5.56.0",
84+
"@typescript-eslint/parser": "^5.56.0",
85+
"@vitejs/plugin-legacy": "^4.0.2",
86+
"@vitejs/plugin-vue": "^4.1.0",
87+
"@vitejs/plugin-vue-jsx": "^3.0.1",
88+
"autoprefixer": "^10.4.14",
8889
"bpmn-js": "^8.9.0",
8990
"bpmn-js-properties-panel": "^0.46.0",
9091
"consola": "^2.15.3",
91-
"eslint": "^8.35.0",
92-
"eslint-config-prettier": "^8.7.0",
93-
"eslint-define-config": "^1.15.0",
92+
"eslint": "^8.36.0",
93+
"eslint-config-prettier": "^8.8.0",
94+
"eslint-define-config": "^1.17.0",
9495
"eslint-plugin-prettier": "^4.2.1",
9596
"eslint-plugin-vue": "^9.9.0",
96-
"lint-staged": "^13.1.2",
97+
"lint-staged": "^13.2.0",
9798
"postcss": "^8.4.21",
9899
"postcss-html": "^1.5.0",
99100
"postcss-scss": "^4.0.6",
100-
"prettier": "^2.8.4",
101-
"rimraf": "^4.3.1",
102-
"rollup": "^3.18.0",
103-
"sass": "^1.58.3",
104-
"stylelint": "^15.2.0",
101+
"prettier": "^2.8.6",
102+
"rimraf": "^4.4.1",
103+
"rollup": "^3.20.0",
104+
"sass": "^1.59.3",
105+
"stylelint": "^15.3.0",
105106
"stylelint-config-html": "^1.1.0",
106107
"stylelint-config-prettier": "^9.0.5",
107-
"stylelint-config-recommended": "^10.0.1",
108-
"stylelint-config-standard": "^30.0.1",
109-
"stylelint-order": "^6.0.2",
110-
"terser": "^5.16.5",
111-
"typescript": "4.9.5",
108+
"stylelint-config-recommended": "^11.0.0",
109+
"stylelint-config-standard": "^31.0.0",
110+
"stylelint-order": "^6.0.3",
111+
"terser": "^5.16.6",
112+
"typescript": "5.0.2",
112113
"unplugin-auto-import": "^0.15.1",
113114
"unplugin-element-plus": "^0.7.0",
114115
"unplugin-vue-components": "^0.24.1",
115-
"vite": "4.1.4",
116+
"vite": "4.2.1",
116117
"vite-plugin-compression": "^0.5.1",
117118
"vite-plugin-ejs": "^1.6.4",
118119
"vite-plugin-eslint": "^1.8.1",
@@ -125,7 +126,7 @@
125126
"windicss": "^3.5.6"
126127
},
127128
"engines": {
128-
"node": ">=16.0.0"
129+
"node": ">=16.18.0"
129130
},
130131
"license": "MIT",
131132
"repository": {

‎src/api/bpm/definition/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import request from '@/config/axios'
22

3-
export const getProcessDefinitionBpmnXMLApi = async (id: number) => {
3+
export const getProcessDefinitionBpmnXML = async (id: number) => {
44
return await request.get({
55
url: '/bpm/process-definition/get-bpmn-xml?id=' + id
66
})
77
}
88

9-
export const getProcessDefinitionPageApi = async (params) => {
9+
export const getProcessDefinitionPage = async (params) => {
1010
return await request.get({
1111
url: '/bpm/process-definition/page',
1212
params
1313
})
1414
}
1515

16-
export const getProcessDefinitionListApi = async (params) => {
16+
export const getProcessDefinitionList = async (params) => {
1717
return await request.get({
1818
url: '/bpm/process-definition/list',
1919
params

‎src/api/bpm/form/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,45 +11,45 @@ export type FormVO = {
1111
}
1212

1313
// 创建工作流的表单定义
14-
export const createFormApi = async (data: FormVO) => {
14+
export const createForm = async (data: FormVO) => {
1515
return await request.post({
1616
url: '/bpm/form/create',
1717
data: data
1818
})
1919
}
2020

2121
// 更新工作流的表单定义
22-
export const updateFormApi = async (data: FormVO) => {
22+
export const updateForm = async (data: FormVO) => {
2323
return await request.put({
2424
url: '/bpm/form/update',
2525
data: data
2626
})
2727
}
2828

2929
// 删除工作流的表单定义
30-
export const deleteFormApi = async (id: number) => {
30+
export const deleteForm = async (id: number) => {
3131
return await request.delete({
3232
url: '/bpm/form/delete?id=' + id
3333
})
3434
}
3535

3636
// 获得工作流的表单定义
37-
export const getFormApi = async (id: number) => {
37+
export const getForm = async (id: number) => {
3838
return await request.get({
3939
url: '/bpm/form/get?id=' + id
4040
})
4141
}
4242

4343
// 获得工作流的表单定义分页
44-
export const getFormPageApi = async (params) => {
44+
export const getFormPage = async (params) => {
4545
return await request.get({
4646
url: '/bpm/form/page',
4747
params
4848
})
4949
}
5050

5151
// 获得动态表单的精简列表
52-
export const getSimpleFormsApi = async () => {
52+
export const getSimpleFormList = async () => {
5353
return await request.get({
5454
url: '/bpm/form/list-all-simple'
5555
})

‎src/api/bpm/model/index.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,35 +25,35 @@ export type ModelVO = {
2525
bpmnXml: string
2626
}
2727

28-
export const getModelPageApi = async (params) => {
28+
export const getModelPage = async (params) => {
2929
return await request.get({ url: '/bpm/model/page', params })
3030
}
3131

32-
export const getModelApi = async (id: number) => {
32+
export const getModel = async (id: number) => {
3333
return await request.get({ url: '/bpm/model/get?id=' + id })
3434
}
3535

36-
export const updateModelApi = async (data: ModelVO) => {
36+
export const updateModel = async (data: ModelVO) => {
3737
return await request.put({ url: '/bpm/model/update', data: data })
3838
}
3939

4040
// 任务状态修改
41-
export const updateModelStateApi = async (id: number, state: number) => {
41+
export const updateModelState = async (id: number, state: number) => {
4242
const data = {
4343
id: id,
4444
state: state
4545
}
4646
return await request.put({ url: '/bpm/model/update-state', data: data })
4747
}
4848

49-
export const createModelApi = async (data: ModelVO) => {
49+
export const createModel = async (data: ModelVO) => {
5050
return await request.post({ url: '/bpm/model/create', data: data })
5151
}
5252

53-
export const deleteModelApi = async (id: number) => {
53+
export const deleteModel = async (id: number) => {
5454
return await request.delete({ url: '/bpm/model/delete?id=' + id })
5555
}
5656

57-
export const deployModelApi = async (id: number) => {
57+
export const deployModel = async (id: number) => {
5858
return await request.post({ url: '/bpm/model/deploy?id=' + id })
5959
}

‎src/api/bpm/userGroup/index.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,37 @@ export type UserGroupVO = {
1111
}
1212

1313
// 创建用户组
14-
export const createUserGroupApi = async (data: UserGroupVO) => {
14+
export const createUserGroup = async (data: UserGroupVO) => {
1515
return await request.post({
1616
url: '/bpm/user-group/create',
1717
data: data
1818
})
1919
}
2020

2121
// 更新用户组
22-
export const updateUserGroupApi = async (data: UserGroupVO) => {
22+
export const updateUserGroup = async (data: UserGroupVO) => {
2323
return await request.put({
2424
url: '/bpm/user-group/update',
2525
data: data
2626
})
2727
}
2828

2929
// 删除用户组
30-
export const deleteUserGroupApi = async (id: number) => {
30+
export const deleteUserGroup = async (id: number) => {
3131
return await request.delete({ url: '/bpm/user-group/delete?id=' + id })
3232
}
3333

3434
// 获得用户组
35-
export const getUserGroupApi = async (id: number) => {
35+
export const getUserGroup = async (id: number) => {
3636
return await request.get({ url: '/bpm/user-group/get?id=' + id })
3737
}
3838

3939
// 获得用户组分页
40-
export const getUserGroupPageApi = async (params) => {
40+
export const getUserGroupPage = async (params) => {
4141
return await request.get({ url: '/bpm/user-group/page', params })
4242
}
4343

4444
// 获取用户组精简信息列表
45-
export const listSimpleUserGroupsApi = async () => {
45+
export const getSimpleUserGroupList = async (): Promise<UserGroupVO[]> => {
4646
return await request.get({ url: '/bpm/user-group/list-all-simple' })
4747
}

‎src/api/infra/apiAccessLog/index.ts

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,12 @@ export interface ApiAccessLogVO {
1919
createTime: Date
2020
}
2121

22-
export interface ApiAccessLogPageReqVO extends PageParam {
23-
userId?: number
24-
userType?: number
25-
applicationName?: string
26-
requestUrl?: string
27-
beginTime?: Date[]
28-
duration?: number
29-
resultCode?: number
30-
}
31-
32-
export interface ApiAccessLogExportReqVO {
33-
userId?: number
34-
userType?: number
35-
applicationName?: string
36-
requestUrl?: string
37-
beginTime?: Date[]
38-
duration?: number
39-
resultCode?: number
40-
}
41-
4222
// 查询列表API 访问日志
43-
export const getApiAccessLogPageApi = (params: ApiAccessLogPageReqVO) => {
23+
export const getApiAccessLogPage = (params: PageParam) => {
4424
return request.get({ url: '/infra/api-access-log/page', params })
4525
}
4626

4727
// 导出API 访问日志
48-
export const exportApiAccessLogApi = (params: ApiAccessLogExportReqVO) => {
28+
export const exportApiAccessLog = (params) => {
4929
return request.download({ url: '/infra/api-access-log/export-excel', params })
5030
}

‎src/api/infra/apiErrorLog/index.ts

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -27,38 +27,20 @@ export interface ApiErrorLogVO {
2727
createTime: Date
2828
}
2929

30-
export interface ApiErrorLogPageReqVO extends PageParam {
31-
userId?: number
32-
userType?: number
33-
applicationName?: string
34-
requestUrl?: string
35-
exceptionTime?: Date[]
36-
processStatus: number
37-
}
38-
39-
export interface ApiErrorLogExportReqVO {
40-
userId?: number
41-
userType?: number
42-
applicationName?: string
43-
requestUrl?: string
44-
exceptionTime?: Date[]
45-
processStatus: number
46-
}
47-
4830
// 查询列表API 访问日志
49-
export const getApiErrorLogPageApi = (params: ApiErrorLogPageReqVO) => {
31+
export const getApiErrorLogPage = (params: PageParam) => {
5032
return request.get({ url: '/infra/api-error-log/page', params })
5133
}
5234

5335
// 更新 API 错误日志的处理状态
54-
export const updateApiErrorLogPageApi = (id: number, processStatus: number) => {
36+
export const updateApiErrorLogPage = (id: number, processStatus: number) => {
5537
return request.put({
5638
url: '/infra/api-error-log/update-status?id=' + id + '&processStatus=' + processStatus
5739
})
5840
}
5941

6042
// 导出API 访问日志
61-
export const exportApiErrorLogApi = (params: ApiErrorLogExportReqVO) => {
43+
export const exportApiErrorLog = (params) => {
6244
return request.download({
6345
url: '/infra/api-error-log/export-excel',
6446
params

0 commit comments

Comments
 (0)