Skip to content

Commit 211298c

Browse files
author
puhui999
committed
Merge remote-tracking branch 'yudao/master'
2 parents 212681a + 50478da commit 211298c

File tree

13 files changed

+63
-42
lines changed

13 files changed

+63
-42
lines changed

‎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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
2727
progress(),
2828
PurgeIcons(),
2929
vueSetupExtend(),
30-
ElementPlus(),
30+
ElementPlus({}),
3131
AutoImport({
3232
include: [
3333
/\.[tj]sx?$/, // .ts, .tsx, .js, .jsx

‎package.json

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
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,
@@ -29,12 +29,12 @@
2929
"@form-create/designer": "^3.1.0",
3030
"@form-create/element-ui": "^3.1.17",
3131
"@iconify/iconify": "^3.1.0",
32-
"@vueuse/core": "^9.12.0",
32+
"@vueuse/core": "^9.13.0",
3333
"@wangeditor/editor": "^5.1.23",
3434
"@wangeditor/editor-for-vue": "^5.1.10",
3535
"@zxcvbn-ts/core": "^2.2.1",
3636
"animate.css": "^4.1.1",
37-
"axios": "^1.3.3",
37+
"axios": "^1.3.4",
3838
"bpmn-js-token-simulation": "^0.10.0",
3939
"camunda-bpmn-moddle": "^7.0.1",
4040
"cropperjs": "^1.5.13",
@@ -43,18 +43,18 @@
4343
"diagram-js": "^11.6.0",
4444
"echarts": "^5.4.1",
4545
"echarts-wordcloud": "^2.1.0",
46-
"element-plus": "2.2.30",
47-
"fast-xml-parser": "^4.1.2",
46+
"element-plus": "2.2.34",
47+
"fast-xml-parser": "^4.1.3",
4848
"highlight.js": "^11.7.0",
4949
"intro.js": "^6.0.0",
50-
"jsencrypt": "^3.3.1",
50+
"jsencrypt": "^3.3.2",
5151
"lodash-es": "^4.17.21",
5252
"min-dash": "^4.0.0",
5353
"mitt": "^3.0.0",
5454
"nprogress": "^0.2.0",
55-
"pinia": "^2.0.30",
55+
"pinia": "^2.0.33",
5656
"qrcode": "^1.5.1",
57-
"qs": "^6.11.0",
57+
"qs": "^6.11.1",
5858
"steady-xml": "^0.1.0",
5959
"url": "^0.11.0",
6060
"vue": "3.2.47",
@@ -68,28 +68,28 @@
6868
"xml-js": "^1.6.11"
6969
},
7070
"devDependencies": {
71-
"@commitlint/cli": "^17.4.3",
72-
"@commitlint/config-conventional": "^17.4.3",
73-
"@iconify/json": "^2.2.21",
71+
"@commitlint/cli": "^17.4.4",
72+
"@commitlint/config-conventional": "^17.4.4",
73+
"@iconify/json": "^2.2.31",
7474
"@intlify/unplugin-vue-i18n": "^0.8.2",
7575
"@purge-icons/generated": "^0.9.0",
76-
"@types/intro.js": "^5.1.0",
76+
"@types/intro.js": "^5.1.1",
7777
"@types/lodash-es": "^4.17.6",
78-
"@types/node": "^18.13.0",
78+
"@types/node": "^18.14.6",
7979
"@types/nprogress": "^0.2.0",
8080
"@types/qrcode": "^1.5.0",
8181
"@types/qs": "^6.9.7",
82-
"@typescript-eslint/eslint-plugin": "^5.52.0",
83-
"@typescript-eslint/parser": "^5.52.0",
82+
"@typescript-eslint/eslint-plugin": "^5.54.1",
83+
"@typescript-eslint/parser": "^5.54.1",
8484
"@vitejs/plugin-legacy": "^4.0.1",
8585
"@vitejs/plugin-vue": "^4.0.0",
8686
"@vitejs/plugin-vue-jsx": "^3.0.0",
8787
"autoprefixer": "^10.4.13",
8888
"bpmn-js": "^8.9.0",
8989
"bpmn-js-properties-panel": "^0.46.0",
9090
"consola": "^2.15.3",
91-
"eslint": "^8.34.0",
92-
"eslint-config-prettier": "^8.6.0",
91+
"eslint": "^8.35.0",
92+
"eslint-config-prettier": "^8.7.0",
9393
"eslint-define-config": "^1.15.0",
9494
"eslint-plugin-prettier": "^4.2.1",
9595
"eslint-plugin-vue": "^9.9.0",
@@ -98,21 +98,21 @@
9898
"postcss-html": "^1.5.0",
9999
"postcss-scss": "^4.0.6",
100100
"prettier": "^2.8.4",
101-
"rimraf": "^4.1.2",
102-
"rollup": "^3.15.0",
103-
"sass": "^1.58.1",
104-
"stylelint": "^15.1.0",
101+
"rimraf": "^4.3.1",
102+
"rollup": "^3.18.0",
103+
"sass": "^1.58.3",
104+
"stylelint": "^15.2.0",
105105
"stylelint-config-html": "^1.1.0",
106106
"stylelint-config-prettier": "^9.0.5",
107107
"stylelint-config-recommended": "^10.0.1",
108108
"stylelint-config-standard": "^30.0.1",
109109
"stylelint-order": "^6.0.2",
110-
"terser": "^5.16.3",
110+
"terser": "^5.16.5",
111111
"typescript": "4.9.5",
112-
"unplugin-auto-import": "^0.14.2",
113-
"unplugin-element-plus": "^0.6.0",
114-
"unplugin-vue-components": "^0.23.0",
115-
"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",
116116
"vite-plugin-compression": "^0.5.1",
117117
"vite-plugin-ejs": "^1.6.4",
118118
"vite-plugin-eslint": "^1.8.1",
@@ -121,7 +121,7 @@
121121
"vite-plugin-svg-icons": "^2.0.1",
122122
"vite-plugin-vue-setup-extend": "^0.4.0",
123123
"vite-plugin-windicss": "^1.8.10",
124-
"vue-tsc": "^1.0.24",
124+
"vue-tsc": "^1.2.0",
125125
"windicss": "^3.5.6"
126126
},
127127
"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/hooks/web/useCrudSchemas.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
282282

283283
// 给options添加国际化
284284
const filterOptions = (options: Recordable, labelField?: string) => {
285-
return options.map((v: Recordable) => {
285+
return options?.map((v: Recordable) => {
286286
if (labelField) {
287287
v['labelField'] = t(v.labelField)
288288
} else {

‎src/layout/components/TagsView/src/TagsView.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,10 @@ watch(
409409
{
410410
icon: 'ep:close',
411411
label: t('common.closeTab'),
412-
disabled: !!visitedViews?.length && selectedTag?.meta.affix
412+
disabled: !!visitedViews?.length && selectedTag?.meta.affix,
413+
command: () => {
414+
closeSelectedTag(selectedTag!)
415+
}
413416
},
414417
{
415418
divided: true,

‎src/layout/components/ThemeSwitch/src/ThemeSwitch.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,8 @@ const themeChange = (val: boolean) => {
3737
@change="themeChange"
3838
/>
3939
</template>
40+
<style lang="scss" scoped>
41+
:deep(.el-switch__core .el-switch__inner .is-icon) {
42+
overflow: visible;
43+
}
44+
</style>

‎src/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ import 'highlight.js/styles/github.css' //导入代码高亮样式 新版
5555
import Logger from '@/utils/Logger'
5656

5757
// 本地开发模式 全局引入 element-plus 样式，加快第一次进入速度
58-
if (isDevMode() == true) {
58+
if (isDevMode()) {
5959
import('element-plus/dist/index.css')
6060
}
6161

‎src/styles/index.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
margin-left: 2px !important;
77
}
88

9+
// 解决抽屉弹出时，body宽度变化的问题
10+
.el-popup-parent--hidden {
11+
width: 100% !important;
12+
}
13+
914
/* nprogress 适配 element-plus 的主题色 */
1015
#nprogress {
1116
& .bar {

‎src/types/auto-components.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
// generated by unplugin-vue-components
2-
// We suggest you to commit this file into source control
1+
/* eslint-disable */
2+
/* prettier-ignore */
3+
// @ts-nocheck
4+
// Generated by unplugin-vue-components
35
// Read more: https://github.com/vuejs/core/pull/3399
46
import '@vue/runtime-core'
57

0 commit comments

Comments
 (0)