diff --git a/examples/components/mainContent.vue b/examples/components/mainContent.vue
index 1062244b..2d0d1045 100644
--- a/examples/components/mainContent.vue
+++ b/examples/components/mainContent.vue
@@ -1,14 +1,13 @@
-
-
- 欢迎使用村微产品库
-
-
-
-
+
+
+
+
@@ -33,18 +32,22 @@ export default {
$route: {
immediate: true,
handler() {
- this.getTabs("route")
+ this.getTabs()
}
},
},
methods: {
handleTabClick({name}) {
- let {name: route, query, hash} = this.tabs.find(e => e.name == name),
- exps = []
- query.id && exps.push(query.id)
- hash && exps.push(hash)
- let reg = new RegExp(`(${exps.join("|")})`, 'g')
- this.$router.push({name: route.replace(reg, ''), query, hash})
+ if (name == '0') {
+ this.$router.push("/")
+ } else {
+ let {name: route, query, hash} = this.tabs.find(e => e.name == name),
+ exps = []
+ query.id && exps.push(query.id)
+ hash && exps.push(hash)
+ let reg = new RegExp(`(${exps.join("|")})`, 'g')
+ this.$router.push({name: route.replace(reg, ''), query, hash})
+ }
},
handleTabRemove(id = this.currentTab) {
let tabs = JSON.parse(JSON.stringify(this.tabs)),
@@ -55,9 +58,8 @@ export default {
}
this.tabs.splice(index, 1)
},
- getTabs(from) {
+ getTabs() {
let {name, query, hash} = this.$route
- console.log(`getTabs>>>>>>>>>%s>>>>>>>%s`, from, name)
let tab = this.tabs.find(e => e.name == this.currentTab),
tabName = [name, query?.id, hash].join("")
if (tab) {
@@ -68,6 +70,9 @@ export default {
}
},
},
+ beforeRouteUpdate(to, from) {
+ console.log(to, from)
+ }
}
@@ -75,9 +80,10 @@ export default {
.mainContent {
height: 100%;
width: 100%;
+ display: flex;
+ flex-direction: column;
::v-deep.layout {
- height: 100%;
background: #F5F6F9;
display: flex;
flex-direction: column;
@@ -95,7 +101,7 @@ export default {
}
.el-tabs__item {
- padding: 0 8px 0 12px;
+ padding: 0 8px 0 12px !important;
text-align: left;
min-width: 130px;
height: 36px;
@@ -146,15 +152,6 @@ export default {
}
}
}
-
- .el-tabs__content {
- flex: 1;
- min-height: 0;
-
- .el-tab-pane {
- height: 100%;
- }
- }
}
}
diff --git a/examples/router/autoRoutes.js b/examples/router/autoRoutes.js
index 13b207ab..ba1a7d65 100644
--- a/examples/router/autoRoutes.js
+++ b/examples/router/autoRoutes.js
@@ -1,6 +1,6 @@
import store from "../store";
import {waiting} from "../utils";
-import appEntry from "../views/apps/appEntry";
+import appEntry from "../views/appEntry";
import router from "./router";
import axios from "./axios";
diff --git a/examples/views/apps/appEntry.vue b/examples/views/appEntry.vue
similarity index 100%
rename from examples/views/apps/appEntry.vue
rename to examples/views/appEntry.vue
diff --git a/examples/views/index.vue b/examples/views/index.vue
deleted file mode 100644
index 9bf50526..00000000
--- a/examples/views/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-