From c842319bc06053eb2c44d7a0ce03192ada118869 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 1 Jul 2021 16:44:49 +0800 Subject: [PATCH] no message --- package.json | 2 +- resources/assets/js/components/QuickEdit.vue | 30 +++++-- resources/assets/js/pages/login.vue | 2 +- resources/assets/js/pages/manage.vue | 12 ++- .../pages/manage/components/ProjectList.vue | 17 ++-- .../js/pages/manage/components/TaskAdd.vue | 2 +- .../pages/manage/components/TaskAddSimple.vue | 4 +- .../js/pages/manage/components/TaskDetail.vue | 26 +++--- .../js/pages/manage/components/TaskRow.vue | 12 +-- .../assets/js/pages/manage/dashboard.vue | 16 ++-- resources/assets/js/pages/manage/file.vue | 86 ++++++++++++++----- .../assets/js/pages/manage/messenger.vue | 4 +- resources/assets/js/store/actions.js | 2 +- resources/assets/sass/app.scss | 2 +- resources/assets/sass/iconfont.scss | 15 ---- .../sass/pages/components/project-list.scss | 8 +- .../pages/components/task-add-simple.scss | 4 +- .../sass/pages/components/task-add.scss | 2 +- .../sass/pages/components/task-detail.scss | 8 +- .../assets/sass/pages/page-dashboard.scss | 6 +- resources/assets/sass/pages/page-file.scss | 4 +- resources/assets/sass/pages/page-login.scss | 2 +- resources/assets/sass/taskfont.scss | 15 ++++ .../public/js/luckysheet/luckysheet.esm.js | 2 +- .../public/js/luckysheet/luckysheet.umd.js | 2 +- 25 files changed, 175 insertions(+), 110 deletions(-) delete mode 100644 resources/assets/sass/iconfont.scss create mode 100644 resources/assets/sass/taskfont.scss diff --git a/package.json b/package.json index 275671b3..bf404782 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "notification-koro1": "^1.1.1", "tinymce": "^5.8.1", "tui-calendar-hi": "^1.13.0-5", - "view-design-hi": "^4.6.1-1", + "view-design-hi": "^4.6.1-2", "vue-clipboard2": "^0.3.1", "vue-emoji-picker": "^1.0.1", "vue-kityminder-gg": "^1.3.6", diff --git a/resources/assets/js/components/QuickEdit.vue b/resources/assets/js/components/QuickEdit.vue index 053389a6..15de06a5 100644 --- a/resources/assets/js/components/QuickEdit.vue +++ b/resources/assets/js/components/QuickEdit.vue @@ -1,12 +1,12 @@ @@ -15,7 +15,12 @@ export default { name: 'QuickEdit', props: { - value: {}, + value: { + + }, + autoEdit: { + + }, }, data() { @@ -26,14 +31,25 @@ export default { } }, + mounted() { + if (this.autoEdit === true) { + this.onEdit(); + } + }, + watch: { isEdit(val) { - this.$emit("on-edit", val); + this.$emit("on-edit-change", val); + }, + autoEdit(val) { + if (val === true) { + this.onEdit(); + } } }, methods: { - onClick() { + onEdit() { this.content = this.value; this.isEdit = true; this.$nextTick(() => { @@ -41,6 +57,10 @@ export default { }) }, + onBlur() { + this.onEnter(); + }, + onEnter() { if (this.content == this.value) { this.isEdit = false; diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index 1d3779a8..fb16414c 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -29,7 +29,7 @@ {{item}} diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 905b7a60..2c158136 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -38,20 +38,20 @@