lemons
/
zb-admin
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/yuanzbz/vue-admin-perfect into vue-i18n

This commit is contained in:
zouzhibing 2022-11-14 00:40:27 +08:00
parent 7590502878 78e38f9e92
commit dba9155b18
8 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package-lock.json generated
View File

@ -44,7 +44,7 @@
"vue-i18n": "^9.2.2",
"vue-mugen-scroll": "^0.2.6",
"vue-qr": "^4.0.6",
"vue-router": "^4.0.0-0",
"vue-router": "^4.1.6",
"vue-splitpane": "^1.0.6",
"vuedraggable": "^4.1.0",
"vuex": "^4.0.0-0",
@ -816,10 +816,9 @@
}
},
"node_modules/@vue/devtools-api": {
"version": "6.2.1",
"resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
"integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ==",
"license": "MIT"
"version": "6.4.5",
"resolved": "https://r.cnpmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
"integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
},
"node_modules/@vue/reactivity": {
"version": "3.2.41",
@ -8119,15 +8118,11 @@
}
},
"node_modules/vue-router": {
"version": "4.1.3",
"resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.3.tgz",
"integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
"license": "MIT",
"version": "4.1.6",
"resolved": "https://r.cnpmjs.org/vue-router/-/vue-router-4.1.6.tgz",
"integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
"dependencies": {
"@vue/devtools-api": "^6.1.4"
},
"funding": {
"url": "https://github.com/sponsors/posva"
"@vue/devtools-api": "^6.4.5"
},
"peerDependencies": {
"vue": "^3.2.0"
@ -8902,9 +8897,9 @@
}
},
"@vue/devtools-api": {
"version": "6.2.1",
"resolved": "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz",
"integrity": "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
"version": "6.4.5",
"resolved": "https://r.cnpmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz",
"integrity": "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
},
"@vue/reactivity": {
"version": "3.2.41",
@ -13916,11 +13911,11 @@
}
},
"vue-router": {
"version": "4.1.3",
"resolved": "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.3.tgz",
"integrity": "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA==",
"version": "4.1.6",
"resolved": "https://r.cnpmjs.org/vue-router/-/vue-router-4.1.6.tgz",
"integrity": "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ==",
"requires": {
"@vue/devtools-api": "^6.1.4"
"@vue/devtools-api": "^6.4.5"
}
},
"vue-splitpane": {

2
package.json
View File

@ -51,7 +51,7 @@
"vue-i18n": "^9.2.2",
"vue-mugen-scroll": "^0.2.6",
"vue-qr": "^4.0.6",
"vue-router": "^4.0.0-0",
"vue-router": "^4.1.6",
"vue-splitpane": "^1.0.6",
"vuedraggable": "^4.1.0",
"vuex": "^4.0.0-0",

4
src/layout/Main/index.vue
View File

@ -1,9 +1,9 @@
<template>
<div class="app-main" v-if="isReload">
<div class="app-main" >
<div class="app-main-inner">
<router-view v-slot="{ Component, route }">
<transition name="fade-slide" mode="out-in" appear>
<keep-alive :include="cacheRoutes">
<keep-alive :include="cacheRoutes" v-if="isReload">
<component :is="Component" :key="route.path" />
</keep-alive>
</transition>

14
src/views/nested/menu1/index.vue
View File

@ -1,7 +1,13 @@
<template>
<div style="padding: 30px">
<el-alert title="menu 1" :closable="false">
<router-view />
</el-alert>
<div class="app-container">
<div class="app-container-inner">
<el-alert title="menu 1" :closable="false">
</el-alert>
<router-view v-slot="{ Component }">
<component :is="Component"></component>
</router-view>
</div>
</div>
</template>
<script lang="ts" setup name="menu1"></script>

3
src/views/nested/menu1/menu1-1/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div style="padding: 30px">
<el-alert title="menu 1-1" type="success" :closable="false">
<router-view />
</el-alert>
<router-view />
</div>
</template>
<script lang="ts" setup name="menu1-1"></script>

2
src/views/nested/menu1/menu1-2/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div style="padding: 30px">
<el-alert title="menu 1-2" type="success" :closable="false">
<router-view />
</el-alert>
<router-view />
</div>
</template>

6
src/views/nested/menu2/index.vue
View File

@ -1,5 +1,7 @@
<template>
<div style="padding: 30px">
<el-alert title="menu 2" :closable="false" />
<div class="app-container">
<div class="app-container-inner">
<el-alert title="menu 2" :closable="false" />
</div>
</div>
</template>

18
yarn.lock
View File

@ -442,10 +442,10 @@
"@vue/compiler-dom" "3.2.41"
"@vue/shared" "3.2.41"
"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.1.4", "@vue/devtools-api@^6.2.1":
"integrity" "sha512-OEgAMeQXvCoJ+1x8WyQuVZzFo0wcyCmUR3baRVLmKBo1LmYZWMlRiXlux5jd0fqVJu6PfDbOrZItVqUEzLobeQ=="
"resolved" "https://registry.npmmirror.com/@vue/devtools-api/-/devtools-api-6.2.1.tgz"
"version" "6.2.1"
"@vue/devtools-api@^6.0.0-beta.11", "@vue/devtools-api@^6.2.1", "@vue/devtools-api@^6.4.5":
"integrity" "sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ=="
"resolved" "https://r.cnpmjs.org/@vue/devtools-api/-/devtools-api-6.4.5.tgz"
"version" "6.4.5"
"@vue/reactivity-transform@3.2.41":
"integrity" "sha512-mK5+BNMsL4hHi+IR3Ft/ho6Za+L3FA5j8WvreJ7XzHrqkPq8jtF/SMo7tuc9gHjLDwKZX1nP1JQOKo9IEAn54A=="
@ -4157,12 +4157,12 @@
"simple-get" "^4.0.1"
"string-split-by" "^1.0.0"
"vue-router@^4.0.0-0":
"integrity" "sha512-XvK81bcYglKiayT7/vYAg/f36ExPC4t90R/HIpzrZ5x+17BOWptXLCrEPufGgZeuq68ww4ekSIMBZY1qdUdfjA=="
"resolved" "https://registry.npmmirror.com/vue-router/-/vue-router-4.1.3.tgz"
"version" "4.1.3"
"vue-router@^4.1.6":
"integrity" "sha512-DYWYwsG6xNPmLq/FmZn8Ip+qrhFEzA14EI12MsMgVxvHFDYvlr4NXpVF5hrRH1wVcDP8fGi5F4rxuJSl8/r+EQ=="
"resolved" "https://r.cnpmjs.org/vue-router/-/vue-router-4.1.6.tgz"
"version" "4.1.6"
dependencies:
"@vue/devtools-api" "^6.1.4"
"@vue/devtools-api" "^6.4.5"
"vue-splitpane@^1.0.6":
"integrity" "sha512-6sneVSEeF1VsCD025HP93nRxwzYhv3rotCeYi2Ah1FmGxwtfqbCZEIzaHGberdGNCpMlEzGD/1OIE1kK5QukLA=="