Skip to content

Commit aa99c53

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts: # src/views/mall/statistics/member/index.vue
2 parents 66ec610 + 0242c84 commit aa99c53

File tree

27 files changed

+856
-98
lines changed

27 files changed

+856
-98
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
| 框架 | 说明 | 版本 |
4040
|----------------------------------------------------------------------|------------------|--------|
4141
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
42-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
43-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 |
42+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.11 |
43+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.4.0 |
4444
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
45-
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
46-
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 |
47-
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 |
45+
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.7 |
46+
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.5.0 |
47+
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.5.0 |
4848
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
49-
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 |
49+
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.5 |
5050
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
5151
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
5252

‎package.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -31,103 +31,103 @@
3131
"@form-create/element-ui": "^3.1.24",
3232
"@iconify/iconify": "^3.1.1",
3333
"@videojs-player/vue": "^1.0.0",
34-
"@vueuse/core": "^10.4.1",
34+
"@vueuse/core": "^10.5.0",
3535
"@wangeditor/editor": "^5.1.23",
3636
"@wangeditor/editor-for-vue": "^5.1.10",
3737
"@zxcvbn-ts/core": "^3.0.4",
3838
"animate.css": "^4.1.1",
39-
"axios": "^1.5.0",
39+
"axios": "^1.5.1",
4040
"benz-amr-recorder": "^1.1.5",
4141
"bpmn-js-token-simulation": "^0.10.0",
4242
"camunda-bpmn-moddle": "^7.0.1",
4343
"cropperjs": "^1.6.1",
4444
"crypto-js": "^4.1.1",
4545
"dayjs": "^1.11.10",
46-
"diagram-js": "^12.3.0",
46+
"diagram-js": "^12.4.0",
4747
"echarts": "^5.4.3",
4848
"echarts-wordcloud": "^2.1.0",
49-
"element-plus": "2.3.14",
50-
"fast-xml-parser": "^4.3.0",
51-
"highlight.js": "^11.8.0",
49+
"element-plus": "2.4.0",
50+
"fast-xml-parser": "^4.3.2",
51+
"highlight.js": "^11.9.0",
5252
"intro.js": "^7.2.0",
5353
"jsencrypt": "^3.3.2",
5454
"lodash-es": "^4.17.21",
5555
"min-dash": "^4.1.1",
5656
"mitt": "^3.0.1",
5757
"nprogress": "^0.2.0",
58-
"pinia": "^2.1.6",
58+
"pinia": "^2.1.7",
5959
"qrcode": "^1.5.3",
6060
"qs": "^6.11.2",
6161
"steady-xml": "^0.1.0",
6262
"url": "^0.11.3",
6363
"video.js": "^7.21.5",
6464
"vue": "^3.3.4",
6565
"vue-dompurify-html": "^4.1.4",
66-
"vue-i18n": "^9.4.1",
66+
"vue-i18n": "^9.5.0",
6767
"vue-router": "^4.2.5",
6868
"vue-types": "^5.1.1",
6969
"vuedraggable": "^4.1.0",
7070
"web-storage-cache": "^1.1.1",
7171
"xml-js": "^1.6.11"
7272
},
7373
"devDependencies": {
74-
"@commitlint/cli": "^17.7.1",
75-
"@commitlint/config-conventional": "^17.7.0",
76-
"@iconify/json": "^2.2.119",
77-
"@intlify/unplugin-vue-i18n": "^1.2.0",
74+
"@commitlint/cli": "^17.8.0",
75+
"@commitlint/config-conventional": "^17.8.0",
76+
"@iconify/json": "^2.2.129",
77+
"@intlify/unplugin-vue-i18n": "^1.4.0",
7878
"@purge-icons/generated": "^0.9.0",
79-
"@types/intro.js": "^5.1.1",
79+
"@types/intro.js": "^5.1.2",
8080
"@types/lodash-es": "^4.17.9",
81-
"@types/node": "^20.6.0",
82-
"@types/nprogress": "^0.2.0",
81+
"@types/node": "^20.8.6",
82+
"@types/nprogress": "^0.2.1",
8383
"@types/qrcode": "^1.5.2",
8484
"@types/qs": "^6.9.8",
85-
"@typescript-eslint/eslint-plugin": "^6.7.2",
86-
"@typescript-eslint/parser": "^6.7.2",
87-
"@unocss/transformer-variant-group": "^0.56.1",
88-
"@unocss/eslint-config": "^0.56.1",
85+
"@typescript-eslint/eslint-plugin": "^6.7.5",
86+
"@typescript-eslint/parser": "^6.7.5",
87+
"@unocss/transformer-variant-group": "^0.56.5",
88+
"@unocss/eslint-config": "^0.56.5",
8989
"@vitejs/plugin-legacy": "^4.1.1",
90-
"@vitejs/plugin-vue": "^4.3.4",
90+
"@vitejs/plugin-vue": "^4.4.0",
9191
"@vitejs/plugin-vue-jsx": "^3.0.2",
92-
"@vue-macros/volar": "^0.14.3",
92+
"@vue-macros/volar": "^0.17.0",
9393
"autoprefixer": "^10.4.16",
9494
"bpmn-js": "8.9.0",
9595
"bpmn-js-properties-panel": "0.46.0",
9696
"consola": "^3.2.3",
97-
"eslint": "^8.49.0",
97+
"eslint": "^8.51.0",
9898
"eslint-config-prettier": "^9.0.0",
99-
"eslint-define-config": "^1.23.0",
100-
"eslint-plugin-prettier": "^5.0.0",
99+
"eslint-define-config": "^1.24.1",
100+
"eslint-plugin-prettier": "^5.0.1",
101101
"eslint-plugin-vue": "^9.17.0",
102-
"lint-staged": "^14.0.1",
103-
"postcss": "^8.4.30",
102+
"lint-staged": "^15.0.1",
103+
"postcss": "^8.4.31",
104104
"postcss-html": "^1.5.0",
105-
"postcss-scss": "^4.0.8",
105+
"postcss-scss": "^4.0.9",
106106
"prettier": "^3.0.3",
107-
"rimraf": "^5.0.1",
108-
"rollup": "^3.29.2",
109-
"sass": "^1.68.0",
107+
"rimraf": "^5.0.5",
108+
"rollup": "^4.1.4",
109+
"sass": "^1.69.3",
110110
"stylelint": "^15.10.3",
111111
"stylelint-config-html": "^1.1.0",
112112
"stylelint-config-recommended": "^13.0.0",
113113
"stylelint-config-standard": "^34.0.0",
114114
"stylelint-order": "^6.0.3",
115-
"terser": "^5.20.0",
115+
"terser": "^5.21.0",
116116
"typescript": "5.2.2",
117-
"unocss": "^0.56.1",
117+
"unocss": "^0.56.5",
118118
"unplugin-auto-import": "^0.16.6",
119119
"unplugin-element-plus": "^0.8.0",
120120
"unplugin-vue-components": "^0.25.2",
121-
"vite": "4.4.9",
121+
"vite": "4.4.11",
122122
"vite-plugin-compression": "^0.5.1",
123123
"vite-plugin-ejs": "^1.6.4",
124124
"vite-plugin-eslint": "^1.8.1",
125125
"vite-plugin-progress": "^0.0.7",
126126
"vite-plugin-purge-icons": "^0.9.2",
127127
"vite-plugin-svg-icons": "^2.0.1",
128128
"vite-plugin-top-level-await": "^1.3.1",
129-
"vue-eslint-parser": "^9.3.1",
130-
"vue-tsc": "^1.8.13"
129+
"vue-eslint-parser": "^9.3.2",
130+
"vue-tsc": "^1.8.19"
131131
},
132132
"license": "MIT",
133133
"repository": {

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,24 @@ export const returnTask = async (data) => {
5858
export const delegateTask = async (data) => {
5959
return await request.put({ url: '/bpm/task/delegate', data })
6060
}
61+
62+
/**
63+
* 加签
64+
*/
65+
export const taskAddSign = async (data) => {
66+
return await request.put({ url: '/bpm/task/add-sign', data })
67+
}
68+
69+
/**
70+
* 获取减签任务列表
71+
*/
72+
export const getChildrenTaskList = async (id: string) => {
73+
return await request.get({ url: '/bpm/task/get-children-task-list?taskId=' + id })
74+
}
75+
76+
/**
77+
* 减签
78+
*/
79+
export const taskSubSign = async (data) => {
80+
return await request.put({ url: '/bpm/task/sub-sign', data })
81+
}

‎src/api/login/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ export const smsLogin = (data: SmsLoginVO) => {
4747
return request.post({ url: '/system/auth/sms-login', data })
4848
}
4949

50+
// 社交快捷登录，使用 code 授权码
51+
export function socialLogin(type: string, code: string, state: string) {
52+
return request.post({
53+
url: '/system/auth/social-login',
54+
data: {
55+
type,
56+
code,
57+
state
58+
}
59+
})
60+
}
61+
5062
// 社交授权的跳转
5163
export const socialAuthRedirect = (type: number, redirectUri: string) => {
5264
return request.get({

‎src/api/login/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ export type UserLoginVO = {
22
username: string
33
password: string
44
captchaVerification: string
5+
socialType?: string
6+
socialCode?: string
7+
socialState?: string
58
}
69

710
export type TokenType = {

‎src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,12 @@ const getResultCss = (result) => {
250250
} else if (result === 5) {
251251
// 退回
252252
return 'highlight-return'
253+
} else if (result === 6) {
254+
// 委派
255+
return 'highlight-return'
256+
} else if (result === 7 || result === 8 || result === 9) {
257+
// 待后加签任务完成/待前加签任务完成/待前置任务完成
258+
return 'highlight-return'
253259
}
254260
return ''
255261
}
@@ -362,7 +368,7 @@ const elementHover = (element) => {
362368
}
363369
}
364370
console.log(html, 'html111111111111111')
365-
elementOverlayIds.value[element.value.id] = toRaw(overlays.value).add(element.value, {
371+
elementOverlayIds.value[element.value.id] = toRaw(overlays.value)?.add(element.value, {
366372
position: { left: 0, bottom: 0 },
367373
html: `<div class="element-overlays">${html}</div>`
368374
})
@@ -591,14 +597,17 @@ watch(
591597
stroke: #e6a23c !important;
592598
fill-opacity: 0.2 !important;
593599
}
600+
594601
.highlight-return.djs-shape .djs-visual > :nth-child(2) {
595602
fill: #e6a23c !important;
596603
}
604+
597605
.highlight-return.djs-shape .djs-visual > path {
598606
fill: #e6a23c !important;
599607
fill-opacity: 0.2 !important;
600608
stroke: #e6a23c !important;
601609
}
610+
602611
.highlight-return.djs-connection > .djs-visual > path {
603612
stroke: #e6a23c !important;
604613
}
@@ -612,14 +621,17 @@ watch(
612621
stroke: #e6a23c !important;
613622
fill-opacity: 0.2 !important;
614623
}
624+
615625
:deep(.highlight-return.djs-shape .djs-visual > :nth-child(2)) {
616626
fill: #e6a23c !important;
617627
}
628+
618629
:deep(.highlight-return.djs-shape .djs-visual > path) {
619630
fill: #e6a23c !important;
620631
fill-opacity: 0.2 !important;
621632
stroke: #e6a23c !important;
622633
}
634+
623635
:deep(.highlight-return.djs-connection > .djs-visual > path) {
624636
stroke: #e6a23c !important;
625637
}

‎src/layout/components/Breadcrumb/src/Breadcrumb.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ $prefix-cls: #{$elNamespace}-breadcrumb;
114114
}
115115
}
116116
}
117+
117118
:deep(&__item):last-child {
118119
.#{$prefix-cls}__inner {
119120
display: flex;

‎src/locales/zh-CN.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ export default {
141141
},
142142
router: {
143143
login: '登录',
144+
socialLogin: '社交登录',
144145
home: '首页',
145146
analysis: '分析页',
146147
workplace: '工作台'

‎src/router/modules/remaining.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,16 @@ const remainingRouter: AppRouteRecordRaw[] = [
195195
noTagsView: true
196196
}
197197
},
198+
{
199+
path: '/social-login',
200+
component: () => import('@/views/Login/SocialLogin.vue'),
201+
name: 'SocialLogin',
202+
meta: {
203+
hidden: true,
204+
title: t('router.socialLogin'),
205+
noTagsView: true
206+
}
207+
},
198208
{
199209
path: '/403',
200210
component: () => import('@/views/Error/403.vue'),
@@ -333,6 +343,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
333343
{
334344
path: '/mall/product', // 商品中心
335345
component: Layout,
346+
name: 'ProductCenter',
336347
meta: {
337348
hidden: true
338349
},
@@ -394,6 +405,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
394405
{
395406
path: '/mall/trade', // 交易中心
396407
component: Layout,
408+
name: 'TradeCenter',
397409
meta: {
398410
hidden: true
399411
},
@@ -415,7 +427,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
415427
{
416428
path: '/member',
417429
component: Layout,
418-
name: 'member',
430+
name: 'MemberCenter',
419431
meta: { hidden: true },
420432
children: [
421433
{

‎src/utils/index.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ export const floatToFixed2 = (num: number | string | undefined): string => {
205205
case 1:
206206
str = f.toString() + '0'
207207
break
208+
case 2:
209+
str = f.toString()
210+
break
208211
}
209212
return str
210213
}

0 commit comments

Comments
 (0)