Skip to content

Commit 869bac2

Browse files
author
puhui999
committed
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
2 parents dd5a1f2 + cf7ac2c commit 869bac2

File tree

146 files changed

+3352
-1295
lines changed

Some content is hidden

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

146 files changed

+3352
-1295
lines changed

‎.eslintrc.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ module.exports = defineConfig({
2222
'plugin:vue/vue3-recommended',
2323
'plugin:@typescript-eslint/recommended',
2424
'prettier',
25-
'plugin:prettier/recommended'
25+
'plugin:prettier/recommended',
26+
'@unocss'
2627
],
2728
rules: {
2829
'vue/script-setup-uses-vars': 'error',

‎.vscode/settings.json

Lines changed: 25 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
{
22
"typescript.tsdk": "./node_modules/typescript/lib",
3-
"volar.tsPlugin": true,
4-
"volar.tsPluginStatus": false,
53
"npm.packageManager": "pnpm",
64
"editor.tabSize": 2,
75
"prettier.printWidth": 100, // 超过最大值换行
@@ -102,57 +100,35 @@
102100
"i18n-ally.displayLanguage": "zh-CN",
103101
"i18n-ally.enabledFrameworks": ["vue", "react"],
104102
"cSpell.words": [
105-
"xingyu",
106-
"yudao",
107-
"unocss",
103+
"brotli",
108104
"browserslist",
105+
"codemirror",
106+
"commitlint",
107+
"cropperjs",
108+
"echarts",
109109
"esnext",
110-
"unplugin",
111-
"qrcode",
112-
"sider",
110+
"esno",
111+
"iconify",
112+
"INTLIFY",
113+
"lintstagedrc",
114+
"logicflow",
115+
"nprogress",
113116
"pinia",
117+
"pnpm",
118+
"qrcode",
114119
"sider",
115-
"nprogress",
116-
"INTLIFY",
117-
"stylelint",
118-
"esno",
119-
"vitejs",
120120
"sortablejs",
121-
"codemirror",
122-
"iconify",
123-
"commitlint",
121+
"stylelint",
122+
"unocss",
123+
"unplugin",
124+
"unref",
124125
"videojs",
125-
"echarts",
126-
"wangeditor",
127-
"cropperjs",
128-
"logicflow",
126+
"vitejs",
129127
"vueuse",
130-
"zxcvbn",
131-
"lintstagedrc",
132-
"brotli",
133-
"sider",
134-
"pnpm"
135-
],
136-
"vetur.format.scriptInitialIndent": true,
137-
"vetur.format.styleInitialIndent": true,
138-
"vetur.validation.script": false,
139-
"MicroPython.executeButton": [
140-
{
141-
"text": "▶",
142-
"tooltip": "运行",
143-
"alignment": "left",
144-
"command": "extension.executeFile",
145-
"priority": 3.5
146-
}
147-
],
148-
"MicroPython.syncButton": [
149-
{
150-
"text": "$(sync)",
151-
"tooltip": "同步",
152-
"alignment": "left",
153-
"command": "extension.execute",
154-
"priority": 4
155-
}
128+
"wangeditor",
129+
"xingyu",
130+
"yudao",
131+
"zxcvbn"
156132
],
157133
// 控制相关文件嵌套展示
158134
"explorer.fileNesting.enabled": true,
@@ -161,7 +137,8 @@
161137
"*.ts": "$(capture).test.ts, $(capture).test.tsx",
162138
"*.tsx": "$(capture).test.ts, $(capture).test.tsx",
163139
"*.env": "$(capture).env.*",
164-
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
140+
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
165141
},
166-
"terminal.integrated.scrollback": 10000
142+
"terminal.integrated.scrollback": 10000,
143+
"nuxt.isNuxtApp": false
167144
}

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
## 🐶 新手必读
1111

12-
* nodejs > 16.0.0 && pnpm > 8.6.0 (强制使用pnpm)
12+
* nodejs > 16.18.0 && pnpm > 8.6.0 (强制使用pnpm)
1313
* 演示地址【Vue3 + element-plus】：<http://dashboard-vue3.yudao.iocoder.cn>
1414
* 演示地址【Vue3 + vben(ant-design-vue)】：<http://dashboard-vben.yudao.iocoder.cn>
1515
* 演示地址【Vue2 + element-ui】：<http://dashboard.yudao.iocoder.cn>
@@ -40,13 +40,13 @@
4040
|----------------------------------------------------------------------|------------------|--------|
4141
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
4242
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
43-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.12 |
44-
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.1.6 |
43+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 |
44+
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
4545
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
4646
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 |
47-
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
48-
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.4 |
49-
| [unocss](https://uno.antfu.me/) | 原子 css | 0.55.3 |
47+
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 |
48+
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
49+
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 |
5050
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
5151
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
5252

‎package.json

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "yudao-ui-admin-vue3",
3-
"version": "1.8.0-snapshot",
3+
"version": "1.8.2-snapshot",
44
"description": "基于vue3、vite4、element-plus、typesScript",
55
"author": "xingyu",
66
"private": false,
@@ -22,32 +22,32 @@
2222
"clean:cache": "npx rimraf node_modules/.cache",
2323
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
2424
"lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
25-
"lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
25+
"lint:style": "stylelint --fix \"./src/**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
2626
"lint:lint-staged": "lint-staged -c "
2727
},
2828
"dependencies": {
2929
"@element-plus/icons-vue": "^2.1.0",
30-
"@form-create/designer": "^3.1.0",
31-
"@form-create/element-ui": "^3.1.17",
30+
"@form-create/designer": "^3.1.3",
31+
"@form-create/element-ui": "^3.1.24",
3232
"@iconify/iconify": "^3.1.1",
3333
"@videojs-player/vue": "^1.0.0",
3434
"@vueuse/core": "^10.4.1",
3535
"@wangeditor/editor": "^5.1.23",
3636
"@wangeditor/editor-for-vue": "^5.1.10",
37-
"@zxcvbn-ts/core": "^3.0.3",
37+
"@zxcvbn-ts/core": "^3.0.4",
3838
"animate.css": "^4.1.1",
3939
"axios": "^1.5.0",
4040
"benz-amr-recorder": "^1.1.5",
4141
"bpmn-js-token-simulation": "^0.10.0",
4242
"camunda-bpmn-moddle": "^7.0.1",
43-
"cropperjs": "^1.6.0",
43+
"cropperjs": "^1.6.1",
4444
"crypto-js": "^4.1.1",
45-
"dayjs": "^1.11.9",
45+
"dayjs": "^1.11.10",
4646
"diagram-js": "^12.3.0",
4747
"echarts": "^5.4.3",
4848
"echarts-wordcloud": "^2.1.0",
49-
"element-plus": "2.3.12",
50-
"fast-xml-parser": "^4.2.7",
49+
"element-plus": "2.3.14",
50+
"fast-xml-parser": "^4.3.0",
5151
"highlight.js": "^11.8.0",
5252
"intro.js": "^7.2.0",
5353
"jsencrypt": "^3.3.2",
@@ -59,12 +59,12 @@
5959
"qrcode": "^1.5.3",
6060
"qs": "^6.11.2",
6161
"steady-xml": "^0.1.0",
62-
"url": "^0.11.1",
62+
"url": "^0.11.3",
6363
"video.js": "^7.21.5",
64-
"vue": "3.3.4",
64+
"vue": "^3.3.4",
6565
"vue-dompurify-html": "^4.1.4",
66-
"vue-i18n": "9.2.2",
67-
"vue-router": "^4.2.4",
66+
"vue-i18n": "^9.4.1",
67+
"vue-router": "^4.2.5",
6868
"vue-types": "^5.1.1",
6969
"vuedraggable": "^4.1.0",
7070
"web-storage-cache": "^1.1.1",
@@ -73,50 +73,51 @@
7373
"devDependencies": {
7474
"@commitlint/cli": "^17.7.1",
7575
"@commitlint/config-conventional": "^17.7.0",
76-
"@iconify/json": "^2.2.107",
77-
"@intlify/unplugin-vue-i18n": "^0.12.3",
76+
"@iconify/json": "^2.2.119",
77+
"@intlify/unplugin-vue-i18n": "^1.2.0",
7878
"@purge-icons/generated": "^0.9.0",
7979
"@types/intro.js": "^5.1.1",
80-
"@types/lodash-es": "^4.17.8",
81-
"@types/node": "^20.5.0",
80+
"@types/lodash-es": "^4.17.9",
81+
"@types/node": "^20.6.0",
8282
"@types/nprogress": "^0.2.0",
83-
"@types/qrcode": "^1.5.1",
84-
"@types/qs": "^6.9.7",
85-
"@typescript-eslint/eslint-plugin": "^6.4.1",
86-
"@typescript-eslint/parser": "^6.4.1",
87-
"@unocss/transformer-variant-group": "^0.55.3",
83+
"@types/qrcode": "^1.5.2",
84+
"@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",
8889
"@vitejs/plugin-legacy": "^4.1.1",
89-
"@vitejs/plugin-vue": "^4.3.3",
90+
"@vitejs/plugin-vue": "^4.3.4",
9091
"@vitejs/plugin-vue-jsx": "^3.0.2",
91-
"@vue-macros/volar": "^0.14.2",
92-
"autoprefixer": "^10.4.15",
93-
"bpmn-js": "^8.9.0",
94-
"bpmn-js-properties-panel": "^0.46.0",
92+
"@vue-macros/volar": "^0.14.3",
93+
"autoprefixer": "^10.4.16",
94+
"bpmn-js": "8.9.0",
95+
"bpmn-js-properties-panel": "0.46.0",
9596
"consola": "^3.2.3",
96-
"eslint": "^8.48.0",
97+
"eslint": "^8.49.0",
9798
"eslint-config-prettier": "^9.0.0",
9899
"eslint-define-config": "^1.23.0",
99100
"eslint-plugin-prettier": "^5.0.0",
100101
"eslint-plugin-vue": "^9.17.0",
101102
"lint-staged": "^14.0.1",
102-
"postcss": "^8.4.28",
103+
"postcss": "^8.4.30",
103104
"postcss-html": "^1.5.0",
104-
"postcss-scss": "^4.0.7",
105-
"prettier": "^3.0.2",
105+
"postcss-scss": "^4.0.8",
106+
"prettier": "^3.0.3",
106107
"rimraf": "^5.0.1",
107-
"rollup": "^3.28.1",
108-
"sass": "^1.66.1",
108+
"rollup": "^3.29.2",
109+
"sass": "^1.68.0",
109110
"stylelint": "^15.10.3",
110111
"stylelint-config-html": "^1.1.0",
111112
"stylelint-config-recommended": "^13.0.0",
112113
"stylelint-config-standard": "^34.0.0",
113114
"stylelint-order": "^6.0.3",
114-
"terser": "^5.19.2",
115-
"typescript": "5.1.6",
116-
"unocss": "^0.55.3",
115+
"terser": "^5.20.0",
116+
"typescript": "5.2.2",
117+
"unocss": "^0.56.1",
117118
"unplugin-auto-import": "^0.16.6",
118119
"unplugin-element-plus": "^0.8.0",
119-
"unplugin-vue-components": "^0.25.1",
120+
"unplugin-vue-components": "^0.25.2",
120121
"vite": "4.4.9",
121122
"vite-plugin-compression": "^0.5.1",
122123
"vite-plugin-ejs": "^1.6.4",
@@ -126,7 +127,7 @@
126127
"vite-plugin-svg-icons": "^2.0.1",
127128
"vite-plugin-top-level-await": "^1.3.1",
128129
"vue-eslint-parser": "^9.3.1",
129-
"vue-tsc": "^1.8.8"
130+
"vue-tsc": "^1.8.13"
130131
},
131132
"license": "MIT",
132133
"repository": {

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,20 @@ export const getTaskListByProcessInstanceId = async (processInstanceId) => {
4141
export const exportTask = async (params) => {
4242
return await request.download({ url: '/bpm/task/export', params })
4343
}
44+
45+
// 获取所有可回退的节点
46+
export const getReturnList = async (params) => {
47+
return await request.get({ url: '/bpm/task/get-return-list', params })
48+
}
49+
50+
// 回退
51+
export const returnTask = async (data) => {
52+
return await request.put({ url: '/bpm/task/return', data })
53+
}
54+
55+
/**
56+
* 委派
57+
*/
58+
export const delegateTask = async (data) => {
59+
return await request.put({ url: '/bpm/task/delegate', data })
60+
}

‎src/api/mall/promotion/bargain/bargainActivity.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,16 @@ export interface BargainActivityVO {
77
startTime?: Date
88
endTime?: Date
99
status?: number
10-
userSize?: number // 达到该人数，才能砍到低价
10+
helpMaxCount?: number // 达到该人数，才能砍到低价
1111
bargainCount?: number // 最大帮砍次数
1212
totalLimitCount?: number // 最大购买次数
1313
spuId: number
1414
skuId: number
1515
bargainFirstPrice: number // 砍价起始价格，单位分
16-
bargainPrice: number // 砍价底价
16+
bargainMinPrice: number // 砍价底价
1717
stock: number // 活动库存
1818
randomMinPrice?: number // 用户每次砍价的最小金额，单位：分
1919
randomMaxPrice?: number // 用户每次砍价的最大金额，单位：分
20-
successCount?: number // 砍价成功数量
2120
}
2221

2322
// 砍价活动所需属性。选择的商品和属性的时候使用方便使用活动的通用封装

‎src/api/mall/promotion/bargain/bargainHelp.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import request from '@/config/axios'
2+
3+
export interface BargainHelpVO {
4+
id: number
5+
record: number
6+
userId: number
7+
reducePrice: number
8+
endTime: Date
9+
}
10+
11+
// 查询砍价记录列表
12+
export const getBargainHelpPage = async (params) => {
13+
return await request.get({ url: `/promotion/bargain-help/page`, params })
14+
}

‎src/api/mall/promotion/bargain/bargainRecord.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import request from '@/config/axios'
2+
3+
export interface BargainRecordVO {
4+
id: number
5+
activityId: number
6+
userId: number
7+
spuId: number
8+
skuId: number
9+
bargainFirstPrice: number
10+
bargainPrice: number
11+
status: number
12+
orderId: number
13+
endTime: Date
14+
}
15+
16+
// 查询砍价记录列表
17+
export const getBargainRecordPage = async (params) => {
18+
return await request.get({ url: `/promotion/bargain-record/page`, params })
19+
}

‎src/api/mall/promotion/seckill/seckillActivity.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@ export const updateSeckillActivity = async (data: SeckillActivityVO) => {
5757
return await request.put({ url: '/promotion/seckill-activity/update', data })
5858
}
5959

60+
// 关闭秒杀活动
61+
export const closeSeckillActivity = async (id: number) => {
62+
return await request.put({ url: '/promotion/seckill-activity/close?id=' + id })
63+
}
64+
6065
// 删除秒杀活动
6166
export const deleteSeckillActivity = async (id: number) => {
6267
return await request.delete({ url: '/promotion/seckill-activity/delete?id=' + id })

‎src/api/mall/trade/config/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ export interface ConfigVO {
44
brokerageEnabled: boolean
55
brokerageEnabledCondition: number
66
brokerageBindMode: number
7-
brokeragePostUrls: string
7+
brokeragePosterUrls: string
88
brokerageFirstPercent: number
99
brokerageSecondPercent: number
1010
brokerageWithdrawMinPrice: number
1111
brokerageBankNames: string
1212
brokerageFrozenDays: number
13-
brokerageWithdrawType: string
13+
brokerageWithdrawTypes: string
1414
}
1515

1616
// 查询交易中心配置详情

0 commit comments

Comments
 (0)