diff --git a/src/common/js/commonJS.js b/src/common/js/commonJS.js index 627cd09..727b027 100644 --- a/src/common/js/commonJS.js +++ b/src/common/js/commonJS.js @@ -42,7 +42,7 @@ export default { str = capitalizeFirstLetter(str); // 添加蓝色标签 - const regex = /\[\d+(?:,\d+)*\]/g; + const regex = /\[(\d+(?:–\d+)?(?:,\d+(?:–\d+)?)*)\]/g;; if (regex.test(str)) { str = `${str}`; } diff --git a/src/components/common/Header.vue b/src/components/common/Header.vue index f08432a..b088e1d 100644 --- a/src/components/common/Header.vue +++ b/src/components/common/Header.vue @@ -123,6 +123,10 @@ }; }, created() { + if(this.$route.meta.hideSidebar){ + this.collapse=false + + } this.initORCID(); if (this.user_id == 24) { this.daojishi = '2021.9.3 - 2021.9.30' @@ -272,6 +276,7 @@ }, }, mounted() { + if (document.body.clientWidth < 1000) { this.collapseChage(); } diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue index d48f9ed..368f624 100644 --- a/src/components/common/Home.vue +++ b/src/components/common/Home.vue @@ -34,6 +34,10 @@ export default { vTags }, created() { + if(this.$route.meta.hideSidebar){ + this.collapse=false + + } bus.$on('collapse-content', (msg) => { this.collapse = msg; localStorage.setItem('collapse', this.collapse); diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 0eceee8..1685db3 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -636,6 +636,10 @@ export default { } }, created() { + if(this.$route.meta.hideSidebar){ + this.collapse=false + + } localStorage.setItem('collapse', this.collapse); if (this.userrole == 2) { //其余的身份(显示作者) diff --git a/src/components/page/GenerateCharts.vue b/src/components/page/GenerateCharts.vue index 469b66e..e55d230 100644 --- a/src/components/page/GenerateCharts.vue +++ b/src/components/page/GenerateCharts.vue @@ -1,10 +1,10 @@