From 14e48d2c6e4f88533c958ebcd153606794ae48ac Mon Sep 17 00:00:00 2001 From: lin-xin Date: Thu, 26 Jul 2018 17:02:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?'=E6=9B=B4=E6=96=B0element=E7=89=88?= =?UTF-8?q?=E6=9C=AC'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 25 +++++++++++++------------ package.json | 2 +- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/package-lock.json b/package-lock.json index be7bb1c..5c07e46 100644 --- a/package-lock.json +++ b/package-lock.json @@ -250,9 +250,9 @@ "dev": true }, "async-validator": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.4.tgz", - "integrity": "sha512-9M6Q6Q3iqFKSdyhliLG8gUH9E73p/TQU1XNH/qiybX5eFIgwB++IIZ/wcPM1f+x9WeqemxGkm0CCx69Mkx3EEg==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", "requires": { "babel-runtime": "6.26.0" } @@ -2739,14 +2739,15 @@ "dev": true }, "element-ui": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.3.3.tgz", - "integrity": "sha512-0Xa0GlwR57+6XBQlHkzutgIgiupAM2O9XNI7y6A1vdDhKmvZM8IBSqrqb9gQ5+onKuQ5afh69vkX2eeumFF5rA==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.4.5.tgz", + "integrity": "sha512-gl1awKncY8HISSh9dmX+VR597T/JoLypanlnheiXPAMRlnBfuYncrrog5ep8qYmhAsss2tQ5KB3zNJV2wu3+XA==", "requires": { - "async-validator": "1.8.4", + "async-validator": "1.8.5", "babel-helper-vue-jsx-merge-props": "2.0.3", "deepmerge": "1.5.2", "normalize-wheel": "1.0.1", + "resize-observer-polyfill": "1.5.0", "throttle-debounce": "1.1.0" } }, @@ -5540,11 +5541,6 @@ "brorand": "1.1.0" } }, - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==" - }, "mime-db": { "version": "1.35.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz", @@ -8913,6 +8909,11 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.0.tgz", + "integrity": "sha512-M2AelyJDVR/oLnToJLtuDJRBBWUGUvvGigj1411hXhAdyFWqMaqHp7TixW3FpiLuVaikIcR1QL+zqoJoZlOgpg==" + }, "resolve": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", diff --git a/package.json b/package.json index 63abd20..eca03fc 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "axios": "^0.15.3", "babel-polyfill": "^6.23.0", - "element-ui": "2.3.3", + "element-ui": "^2.4.5", "mavon-editor": "^2.5.4", "vue": "^2.5.16", "vue-cropperjs": "^2.2.0", From 8b87d79f47562d6113e8c18c0b9db25be083d1ea Mon Sep 17 00:00:00 2001 From: lin-xin Date: Thu, 26 Jul 2018 17:26:43 +0800 Subject: [PATCH 2/4] =?UTF-8?q?'tags=E6=A0=8F=E4=BF=9D=E6=8C=81=E5=9C=A8?= =?UTF-8?q?=E9=A1=B6=E9=83=A8/tags=E6=A0=87=E7=AD=BE=E6=9C=80=E5=A4=9A?= =?UTF-8?q?=E6=98=BE=E7=A4=BA8=E4=B8=AA'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/common/Tags.vue | 16 +++++++++++----- static/css/main.css | 4 +++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/components/common/Tags.vue b/src/components/common/Tags.vue index d87fc42..da724e4 100644 --- a/src/components/common/Tags.vue +++ b/src/components/common/Tags.vue @@ -61,11 +61,16 @@ const isExist = this.tagsList.some(item => { return item.path === route.fullPath; }) - !isExist && this.tagsList.push({ - title: route.meta.title, - path: route.fullPath, - name: route.matched[1].components.default.name - }) + if(!isExist){ + if(this.tagsList.length >= 8){ + this.tagsList.shift(); + } + this.tagsList.push({ + title: route.meta.title, + path: route.fullPath, + name: route.matched[1].components.default.name + }) + } bus.$emit('tags', this.tagsList); }, handleTags(command){ @@ -97,6 +102,7 @@ overflow: hidden; background: #fff; padding-right: 120px; + box-shadow: 0 5px 10px #ddd; } .tags ul { diff --git a/static/css/main.css b/static/css/main.css index 68cc36b..3ae9fa6 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -26,7 +26,6 @@ a { right: 0; top: 70px; bottom: 0; - overflow-y: scroll; -webkit-transition: left .3s ease-in-out; transition: left .3s ease-in-out; background: #f0f0f0; @@ -34,7 +33,10 @@ a { .content { width: auto; + height: 100%; padding: 40px; + overflow-y: scroll; + box-sizing: border-box; } .content-collapse { From 23a33b27d675fde45a0a0b8d74fe9cc65aa1c91d Mon Sep 17 00:00:00 2001 From: lin-xin Date: Thu, 2 Aug 2018 08:32:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?'=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=89=E7=BA=A7=E5=AF=BC=E8=88=AA'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/components/common/Sidebar.vue | 32 ++++++++++++++++++++++--------- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index eca03fc..b168a7f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-manage-system", - "version": "3.1.0", + "version": "3.1.1", "description": "基于Vue.js 2.x系列 + element-ui 内容管理系统解决方案", "author": "lin-xin <2981207131@qq.com>", "private": true, diff --git a/src/components/common/Sidebar.vue b/src/components/common/Sidebar.vue index 0289fcf..fdc1d1c 100644 --- a/src/components/common/Sidebar.vue +++ b/src/components/common/Sidebar.vue @@ -8,9 +8,17 @@ - - {{ subItem.title }} - +