Skip to content

Commit 4d16795

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
� Conflicts: � src/types/auto-components.d.ts
2 parents 1cd74f4 + e2895ba commit 4d16795

File tree

86 files changed

+703
-284
lines changed

Some content is hidden

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

86 files changed

+703
-284
lines changed

‎.env.front

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# 本地开发环境
2+
NODE_ENV=development
3+
4+
VITE_DEV=true
5+
6+
# 请求路径
7+
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
8+
9+
# 上传路径
10+
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
11+
12+
# 接口前缀
13+
VITE_API_BASEPATH=/dev-api
14+
15+
# 接口地址
16+
VITE_API_URL=/admin-api
17+
18+
# 打包路径
19+
VITE_BASE_PATH=/

‎.env.static

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# 开发环境
2+
NODE_ENV=production
3+
4+
VITE_DEV=false
5+
6+
# 请求路径
7+
VITE_BASE_URL='http://localhost:48080'
8+
9+
# 上传路径
10+
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
11+
12+
# 接口前缀
13+
VITE_API_BASEPATH=
14+
15+
# 接口地址
16+
VITE_API_URL=/admin-api
17+
18+
# 是否删除debugger
19+
VITE_DROP_DEBUGGER=true
20+
21+
# 是否删除console.log
22+
VITE_DROP_CONSOLE=true
23+
24+
# 是否sourcemap
25+
VITE_SOURCEMAP=false
26+
27+
# 打包路径
28+
VITE_BASE_PATH=/admin-ui-vue3/
29+
30+
# 输出路径
31+
VITE_OUT_DIR=dist-dev

‎README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@
3636
| 框架 | 说明 | 版本 |
3737
|----------------------------------------------------------------------|------------------|--------|
3838
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 |
39-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.1 |
40-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.30 |
39+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.4 |
40+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.34 |
4141
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.9.5 |
42-
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.30 |
43-
| [vueuse](https://vueuse.org/) | 常用工具集 | 9.12.0 |
42+
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.33 |
43+
| [vueuse](https://vueuse.org/) | 常用工具集 | 9.13.0 |
4444
| [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.10 |
4545
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
4646
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.1.6 |
4747
| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
48-
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.1 |
48+
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.0 |
4949
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
5050

5151
## 开发工具

‎build/vite/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import viteCompression from 'vite-plugin-compression'
1414
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'
17+
1718
export function createVitePlugins(VITE_APP_TITLE: string) {
1819
const root = process.cwd()
1920
// 路径查找
@@ -27,7 +28,7 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
2728
progress(),
2829
PurgeIcons(),
2930
vueSetupExtend(),
30-
ElementPlus(),
31+
ElementPlus({}),
3132
AutoImport({
3233
include: [
3334
/\.[tj]sx?$/, // .ts, .tsx, .js, .jsx

‎build/vite/optimize.ts

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,19 @@ const include = [
6767
'element-plus/es/components/dropdown/style/index',
6868
'element-plus/es/components/dropdown-menu/style/index',
6969
'element-plus/es/components/dropdown-item/style/index',
70-
'element-plus/es/components/skeleton/style/index'
70+
'element-plus/es/components/skeleton/style/index',
71+
'element-plus/es/components/skeleton/style/css',
72+
'element-plus/es/components/backtop/style/css',
73+
'element-plus/es/components/menu/style/css',
74+
'element-plus/es/components/sub-menu/style/css',
75+
'element-plus/es/components/menu-item/style/css',
76+
'element-plus/es/components/dropdown/style/css',
77+
'element-plus/es/components/tree/style/css',
78+
'element-plus/es/components/dropdown-menu/style/css',
79+
'element-plus/es/components/dropdown-item/style/css',
80+
'element-plus/es/components/badge/style/css',
81+
'element-plus/es/components/breadcrumb/style/css',
82+
'element-plus/es/components/breadcrumb-item/style/css'
7183
]
7284

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

‎package.json

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
{
22
"name": "yudao-ui-admin-vue3",
3-
"version": "1.7.0-snapshot.1922",
3+
"version": "1.7.1-snapshot.1941",
44
"description": "基于vue3、vite4、element-plus、typesScript",
55
"author": "xingyu",
66
"private": false,
77
"scripts": {
88
"i": "pnpm install",
99
"dev": "vite --mode base",
10+
"front": "vite --mode front",
1011
"ts:check": "vue-tsc --noEmit",
11-
"build:pro": "vite build --mode pro",
12-
"build:dev": "vite build --mode dev",
13-
"build:test": "npm run ts:check && vite build --mode test",
12+
"build:pro": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode pro",
13+
"build:dev": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode dev",
14+
"build:test": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode test",
15+
"build:static": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode static",
1416
"serve:pro": "vite preview --mode pro",
1517
"serve:dev": "vite preview --mode dev",
1618
"serve:test": "vite preview --mode test",
@@ -27,12 +29,12 @@
2729
"@form-create/designer": "^3.1.0",
2830
"@form-create/element-ui": "^3.1.17",
2931
"@iconify/iconify": "^3.1.0",
30-
"@vueuse/core": "^9.12.0",
32+
"@vueuse/core": "^9.13.0",
3133
"@wangeditor/editor": "^5.1.23",
3234
"@wangeditor/editor-for-vue": "^5.1.10",
3335
"@zxcvbn-ts/core": "^2.2.1",
3436
"animate.css": "^4.1.1",
35-
"axios": "^1.3.3",
37+
"axios": "^1.3.4",
3638
"bpmn-js-token-simulation": "^0.10.0",
3739
"camunda-bpmn-moddle": "^7.0.1",
3840
"cropperjs": "^1.5.13",
@@ -41,18 +43,18 @@
4143
"diagram-js": "^11.6.0",
4244
"echarts": "^5.4.1",
4345
"echarts-wordcloud": "^2.1.0",
44-
"element-plus": "2.2.30",
45-
"fast-xml-parser": "^4.1.2",
46+
"element-plus": "2.2.34",
47+
"fast-xml-parser": "^4.1.3",
4648
"highlight.js": "^11.7.0",
4749
"intro.js": "^6.0.0",
48-
"jsencrypt": "^3.3.1",
50+
"jsencrypt": "^3.3.2",
4951
"lodash-es": "^4.17.21",
5052
"min-dash": "^4.0.0",
5153
"mitt": "^3.0.0",
5254
"nprogress": "^0.2.0",
53-
"pinia": "^2.0.30",
55+
"pinia": "^2.0.33",
5456
"qrcode": "^1.5.1",
55-
"qs": "^6.11.0",
57+
"qs": "^6.11.1",
5658
"steady-xml": "^0.1.0",
5759
"url": "^0.11.0",
5860
"vue": "3.2.47",
@@ -66,28 +68,28 @@
6668
"xml-js": "^1.6.11"
6769
},
6870
"devDependencies": {
69-
"@commitlint/cli": "^17.4.3",
70-
"@commitlint/config-conventional": "^17.4.3",
71-
"@iconify/json": "^2.2.21",
71+
"@commitlint/cli": "^17.4.4",
72+
"@commitlint/config-conventional": "^17.4.4",
73+
"@iconify/json": "^2.2.31",
7274
"@intlify/unplugin-vue-i18n": "^0.8.2",
7375
"@purge-icons/generated": "^0.9.0",
74-
"@types/intro.js": "^5.1.0",
76+
"@types/intro.js": "^5.1.1",
7577
"@types/lodash-es": "^4.17.6",
76-
"@types/node": "^18.13.0",
78+
"@types/node": "^18.14.6",
7779
"@types/nprogress": "^0.2.0",
7880
"@types/qrcode": "^1.5.0",
7981
"@types/qs": "^6.9.7",
80-
"@typescript-eslint/eslint-plugin": "^5.52.0",
81-
"@typescript-eslint/parser": "^5.52.0",
82+
"@typescript-eslint/eslint-plugin": "^5.54.1",
83+
"@typescript-eslint/parser": "^5.54.1",
8284
"@vitejs/plugin-legacy": "^4.0.1",
8385
"@vitejs/plugin-vue": "^4.0.0",
8486
"@vitejs/plugin-vue-jsx": "^3.0.0",
8587
"autoprefixer": "^10.4.13",
8688
"bpmn-js": "^8.9.0",
8789
"bpmn-js-properties-panel": "^0.46.0",
8890
"consola": "^2.15.3",
89-
"eslint": "^8.34.0",
90-
"eslint-config-prettier": "^8.6.0",
91+
"eslint": "^8.35.0",
92+
"eslint-config-prettier": "^8.7.0",
9193
"eslint-define-config": "^1.15.0",
9294
"eslint-plugin-prettier": "^4.2.1",
9395
"eslint-plugin-vue": "^9.9.0",
@@ -96,21 +98,21 @@
9698
"postcss-html": "^1.5.0",
9799
"postcss-scss": "^4.0.6",
98100
"prettier": "^2.8.4",
99-
"rimraf": "^4.1.2",
100-
"rollup": "^3.15.0",
101-
"sass": "^1.58.1",
102-
"stylelint": "^15.1.0",
101+
"rimraf": "^4.3.1",
102+
"rollup": "^3.18.0",
103+
"sass": "^1.58.3",
104+
"stylelint": "^15.2.0",
103105
"stylelint-config-html": "^1.1.0",
104106
"stylelint-config-prettier": "^9.0.5",
105107
"stylelint-config-recommended": "^10.0.1",
106108
"stylelint-config-standard": "^30.0.1",
107109
"stylelint-order": "^6.0.2",
108-
"terser": "^5.16.3",
110+
"terser": "^5.16.5",
109111
"typescript": "4.9.5",
110-
"unplugin-auto-import": "^0.14.2",
111-
"unplugin-element-plus": "^0.6.0",
112-
"unplugin-vue-components": "^0.23.0",
113-
"vite": "4.1.1",
112+
"unplugin-auto-import": "^0.15.1",
113+
"unplugin-element-plus": "^0.7.0",
114+
"unplugin-vue-components": "^0.24.1",
115+
"vite": "4.1.4",
114116
"vite-plugin-compression": "^0.5.1",
115117
"vite-plugin-ejs": "^1.6.4",
116118
"vite-plugin-eslint": "^1.8.1",
@@ -119,7 +121,7 @@
119121
"vite-plugin-svg-icons": "^2.0.1",
120122
"vite-plugin-vue-setup-extend": "^0.4.0",
121123
"vite-plugin-windicss": "^1.8.10",
122-
"vue-tsc": "^1.0.24",
124+
"vue-tsc": "^1.2.0",
123125
"windicss": "^3.5.6"
124126
},
125127
"engines": {

‎src/components/Descriptions/src/Descriptions.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,13 @@ const toggleClick = () => {
109109
v-bind="getBindItemValue(item)"
110110
>
111111
<template #label>
112-
<slot :name="`${item.field}-label`" :label="item.label">{{ item.label }}</slot>
112+
<slot
113+
:name="`${item.field}-label`"
114+
:row="{
115+
label: item.label
116+
}"
117+
>{{ item.label }}</slot
118+
>
113119
</template>
114120

115121
<template #default>

‎src/components/DictTag/src/DictTag.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,15 @@ export default defineComponent({
3333
if (!props.type) {
3434
return null
3535
}
36-
if (!props.value) {
36+
// 解决自定义字典标签值为零时标签不渲染的问题
37+
if (!props.value && props.value !== 0) {
3738
return null
3839
}
3940
getDictObj(props.type, props.value.toString())
41+
// 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
4042
return (
4143
<ElTag
44+
style={dictData.value?.cssClass ? 'color: #fff' : ''}
4245
type={dictData.value?.colorType}
4346
color={
4447
dictData.value?.cssClass && isHexColor(dictData.value?.cssClass)

‎src/components/Search/src/Search.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ const setVisible = () => {
123123
</ElButton>
124124
</div>
125125
</template>
126+
<template #[name] v-for="name in Object.keys($slots)" :key="name"
127+
><slot :name="name"></slot
128+
></template>
126129
</Form>
127130

128131
<template v-if="layout === 'bottom'">

‎src/components/XModal/src/XModal.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const props = defineProps({
1212
height: propTypes.string,
1313
minWidth: propTypes.string.def('460'),
1414
minHeight: propTypes.string.def('320'),
15-
showFooter: propTypes.bool.def(true)
15+
showFooter: propTypes.bool.def(true),
16+
maskClosable: propTypes.bool.def(false),
17+
escClosable: propTypes.bool.def(false)
1618
})
1719
1820
const getBindValue = computed(() => {

0 commit comments

Comments
 (0)