Skip to content

Commit 6cf7669

Browse files
YunaiVYunaiV
committed
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feat/optimize_vite
� Conflicts: � package.json � src/types/auto-imports.d.ts
2 parents 000b005 + cab8c9a commit 6cf7669

File tree

79 files changed

+691
-286
lines changed

Some content is hidden

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

79 files changed

+691
-286
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

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,7 @@
55
/docs/*
66
/vite.config.ts
77
/src/types/env.d.ts
8+
/src/types/auto-components.d.ts
9+
/src/types/auto-imports.d.ts
810
/docs/**/*
911
CHANGELOG

‎README.md

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

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

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

2224
![首页](preview/home.png)
2325

@@ -34,16 +36,16 @@
3436
| 框架 | 说明 | 版本 |
3537
|----------------------------------------------------------------------|------------------|--------|
3638
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 |
37-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.1 |
38-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.29 |
39+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.4 |
40+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.34 |
3941
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.9.5 |
40-
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.30 |
41-
| [vueuse](https://vueuse.org/) | 常用工具集 | 9.12.0 |
42-
| [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.9 |
42+
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.33 |
43+
| [vueuse](https://vueuse.org/) | 常用工具集 | 9.13.0 |
44+
| [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.10 |
4345
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
4446
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.1.6 |
4547
| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
46-
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.1 |
48+
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.0 |
4749
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
4850

4951
## 开发工具

‎build/vite/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
3030
progress(),
3131
PurgeIcons(),
3232
vueSetupExtend(),
33-
ElementPlus(),
33+
ElementPlus({}),
3434
AutoImport({
3535
include: [
3636
/\.[tj]sx?$/, // .ts, .tsx, .js, .jsx

‎build/vite/optimize.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ const include = [
1616
'crypto-js',
1717
'cropperjs',
1818
'lodash-es',
19-
'vxe-table',
2019
'nprogress',
2120
'animate.css',
21+
'vxe-table',
2222
'vxe-table/es/style',
23+
'vxe-table/lib/locale/lang/zh-CN',
24+
'vxe-table/lib/locale/lang/en-US',
2325
'web-storage-cache',
2426
'@iconify/iconify',
2527
'@vueuse/core',
@@ -35,6 +37,7 @@ const include = [
3537
'element-plus/es',
3638
'element-plus/es/locale/lang/zh-cn',
3739
'element-plus/es/locale/lang/en',
40+
'element-plus/es/components/backtop/style/index',
3841
'element-plus/es/components/form/style/index',
3942
'element-plus/es/components/radio-group/style/index',
4043
'element-plus/es/components/radio/style/index',
@@ -60,7 +63,11 @@ const include = [
6063
'element-plus/es/components/menu/style/index',
6164
'element-plus/es/components/sub-menu/style/index',
6265
'element-plus/es/components/menu-item/style/index',
63-
'element-plus/es/components/option/style/index'
66+
'element-plus/es/components/option/style/index',
67+
'element-plus/es/components/dropdown/style/index',
68+
'element-plus/es/components/dropdown-menu/style/index',
69+
'element-plus/es/components/dropdown-item/style/index',
70+
'element-plus/es/components/skeleton/style/index'
6471
]
6572

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

‎package.json

Lines changed: 42 additions & 43 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",
9-
"dev": "DEBUG=vite:plugin:mkcert vite --mode base --force",
9+
"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.2",
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,79 +43,76 @@
4143
"diagram-js": "^11.6.0",
4244
"echarts": "^5.4.1",
4345
"echarts-wordcloud": "^2.1.0",
44-
"element-plus": "2.2.29",
45-
"fast-xml-parser": "^4.0.13",
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",
58-
"vite-plugin-mkcert": "^1.13.0",
59-
"vite-plugin-optimize-persist": "^0.1.2",
60-
"vite-plugin-package-config": "^0.1.1",
6160
"vue": "3.2.47",
6261
"vue-i18n": "9.2.2",
6362
"vue-router": "^4.1.6",
6463
"vue-types": "^5.0.2",
6564
"vuedraggable": "^4.1.0",
66-
"vxe-table": "^4.3.9",
65+
"vxe-table": "^4.3.10",
6766
"web-storage-cache": "^1.1.1",
6867
"xe-utils": "^3.5.7",
6968
"xml-js": "^1.6.11"
7069
},
7170
"devDependencies": {
72-
"@commitlint/cli": "^17.4.2",
73-
"@commitlint/config-conventional": "^17.4.2",
74-
"@iconify/json": "^2.2.19",
71+
"@commitlint/cli": "^17.4.4",
72+
"@commitlint/config-conventional": "^17.4.4",
73+
"@iconify/json": "^2.2.31",
7574
"@intlify/unplugin-vue-i18n": "^0.8.2",
7675
"@purge-icons/generated": "^0.9.0",
77-
"@types/intro.js": "^5.1.0",
76+
"@types/intro.js": "^5.1.1",
7877
"@types/lodash-es": "^4.17.6",
79-
"@types/node": "^18.13.0",
78+
"@types/node": "^18.14.6",
8079
"@types/nprogress": "^0.2.0",
8180
"@types/qrcode": "^1.5.0",
8281
"@types/qs": "^6.9.7",
83-
"@typescript-eslint/eslint-plugin": "^5.51.0",
84-
"@typescript-eslint/parser": "^5.51.0",
82+
"@typescript-eslint/eslint-plugin": "^5.54.1",
83+
"@typescript-eslint/parser": "^5.54.1",
8584
"@vitejs/plugin-legacy": "^4.0.1",
8685
"@vitejs/plugin-vue": "^4.0.0",
8786
"@vitejs/plugin-vue-jsx": "^3.0.0",
8887
"autoprefixer": "^10.4.13",
8988
"bpmn-js": "^8.9.0",
9089
"bpmn-js-properties-panel": "^0.46.0",
9190
"consola": "^2.15.3",
92-
"eslint": "^8.33.0",
93-
"eslint-config-prettier": "^8.6.0",
91+
"eslint": "^8.35.0",
92+
"eslint-config-prettier": "^8.7.0",
9493
"eslint-define-config": "^1.15.0",
9594
"eslint-plugin-prettier": "^4.2.1",
9695
"eslint-plugin-vue": "^9.9.0",
97-
"lint-staged": "^13.1.1",
96+
"lint-staged": "^13.1.2",
9897
"postcss": "^8.4.21",
9998
"postcss-html": "^1.5.0",
10099
"postcss-scss": "^4.0.6",
101100
"prettier": "^2.8.4",
102-
"rimraf": "^4.1.2",
103-
"rollup": "^3.14.0",
104-
"sass": "^1.58.0",
105-
"stylelint": "^14.16.1",
101+
"rimraf": "^4.3.1",
102+
"rollup": "^3.18.0",
103+
"sass": "^1.58.3",
104+
"stylelint": "^15.2.0",
106105
"stylelint-config-html": "^1.1.0",
107-
"stylelint-config-prettier": "^9.0.4",
108-
"stylelint-config-recommended": "^9.0.0",
109-
"stylelint-config-standard": "^29.0.0",
110-
"stylelint-order": "^6.0.1",
111-
"terser": "^5.16.3",
106+
"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",
112111
"typescript": "4.9.5",
113-
"unplugin-auto-import": "^0.14.2",
114-
"unplugin-element-plus": "^0.6.0",
115-
"unplugin-vue-components": "^0.23.0",
116-
"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",
117116
"vite-plugin-compression": "^0.5.1",
118117
"vite-plugin-ejs": "^1.6.4",
119118
"vite-plugin-eslint": "^1.8.1",
@@ -122,7 +121,7 @@
122121
"vite-plugin-svg-icons": "^2.0.1",
123122
"vite-plugin-vue-setup-extend": "^0.4.0",
124123
"vite-plugin-windicss": "^1.8.10",
125-
"vue-tsc": "^1.0.24",
124+
"vue-tsc": "^1.2.0",
126125
"windicss": "^3.5.6"
127126
},
128127
"engines": {
@@ -131,10 +130,10 @@
131130
"license": "MIT",
132131
"repository": {
133132
"type": "git",
134-
"url": "git+https://gitee.com/zhijiantianya/ruoyi-vue-pro"
133+
"url": "git+https://gitee.com/yudaocode/yudao-ui-admin-vue3"
135134
},
136135
"bugs": {
137-
"url": "https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues"
136+
"url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues"
138137
},
139-
"homepage": "https://gitee.com/zhijiantianya/ruoyi-vue-pro"
138+
"homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3"
140139
}

‎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/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)