From 6aff8eeb3f6720a584d773feb1c097d12333ca63 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 8 Jun 2021 16:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8element-ui=20Tooltip=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + resources/assets/js/app.js | 3 + resources/assets/js/components/AutoTip.vue | 13 +- resources/assets/js/components/ScrollerY.vue | 8 +- resources/assets/js/components/UserAvatar.vue | 23 ++-- .../pages/manage/components/ProjectList.vue | 56 ++++---- .../js/pages/manage/components/TaskAdd.vue | 4 +- .../pages/manage/components/TaskAddSimple.vue | 4 +- .../assets/js/pages/manage/messenger.vue | 2 +- .../js/pages/manage/setting/priority.vue | 12 +- resources/assets/js/store/mutations.js | 3 +- resources/assets/sass/app.scss | 10 +- resources/assets/sass/auto-tip.scss | 6 + resources/assets/sass/common-avatar.scss | 62 +++++++++ resources/assets/sass/element.scss | 5 + resources/assets/sass/main.scss | 129 ------------------ resources/assets/sass/task-add.scss | 28 +--- 17 files changed, 154 insertions(+), 215 deletions(-) create mode 100644 resources/assets/sass/auto-tip.scss create mode 100755 resources/assets/sass/common-avatar.scss create mode 100644 resources/assets/sass/element.scss diff --git a/package.json b/package.json index b1542382..a4cb5493 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ }, "dependencies": { "echarts": "^5.1.1", + "element-ui": "^2.15.2", "tinymce": "^5.8.1", "view-design-hi": "^4.5.0-11", "vue-clipboard2": "^0.3.1", diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index c9adc82a..12c196d2 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -29,6 +29,9 @@ Vue.component('TagInput', TagInput) Vue.component('TableAction', TableAction); Vue.component('UserAvatar', UserAvatar); +import { Tooltip } from 'element-ui'; +Vue.component('ETooltip', Tooltip); + const originalPush = VueRouter.prototype.push VueRouter.prototype.push = function push(location) { return originalPush.call(this, location).catch(err => err) diff --git a/resources/assets/js/components/AutoTip.vue b/resources/assets/js/components/AutoTip.vue index 86012f2c..16c266d6 100644 --- a/resources/assets/js/components/AutoTip.vue +++ b/resources/assets/js/components/AutoTip.vue @@ -1,10 +1,17 @@