提交 6565d2ca 作者: 方治民

Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-vue-admin into dev

......@@ -71,6 +71,7 @@
"cropperjs": "^1.5.13",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.7",
"default-passive-events": "^2.0.0",
"echarts": "^5.4.2",
"exceljs": "^4.3.0",
"intro.js": "^6.0.0",
......
......@@ -54,6 +54,7 @@ specifiers:
cz-git: ^1.6.1
czg: ^1.6.1
dayjs: ^1.11.7
default-passive-events: ^2.0.0
dotenv: ^16.0.3
echarts: ^5.4.2
eslint: ^8.36.0
......@@ -150,6 +151,7 @@ dependencies:
cropperjs: 1.5.13
crypto-js: 4.1.1
dayjs: 1.11.7
default-passive-events: 2.0.0
echarts: 5.4.2
exceljs: 4.3.0
intro.js: 6.0.0
......@@ -4642,6 +4644,10 @@ packages:
engines: {node: '>=0.10.0'}
dev: true
/default-passive-events/2.0.0:
resolution: {integrity: sha512-eMtt76GpDVngZQ3ocgvRcNCklUMwID1PaNbCNxfpDXuiOXttSh0HzBbda1HU9SIUsDc02vb7g9+3I5tlqe/qMQ==}
dev: false
/defaults/1.0.4:
resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
dependencies:
......
......@@ -50,13 +50,13 @@
appear
>
<keep-alive v-if="openCache" :include="getCaches">
<div :key="route.name">
<div :key="route.fullPath">
<component :is="Component" />
</div>
</keep-alive>
<div v-else :key="route.name">
<div :key="route.fullPath">
<component :is="Component" :key="route.fullPath" />
<component :is="Component" />
</div>
</div>
</transition>
......
......@@ -18,6 +18,9 @@ import { registerGlobComp } from '/@/components/registerGlobComp'
import { isDevMode } from './utils/env'
// fix: Added non-passive event listener to a scroll-blocking 'wheel' event
import 'default-passive-events'
if (isDevMode()) {
import('ant-design-vue/es/style')
}
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论