diff --git a/resources/assets/js/components/QuickEdit.vue b/resources/assets/js/components/QuickEdit.vue
index 0a25054f2..e92d1e1c4 100644
--- a/resources/assets/js/components/QuickEdit.vue
+++ b/resources/assets/js/components/QuickEdit.vue
@@ -6,14 +6,14 @@
ref="input"
v-model="content"
:disabled="isLoad"
- @on-keyup="onKeyup"
+ @on-keydown="onKeydown"
@on-blur="onBlur"/>
@@ -89,10 +89,12 @@ export default {
})
},
- onKeyup(e) {
+ onKeydown(e) {
if (e.keyCode === 13) {
this.onEnter();
} else if (e.keyCode === 27) {
+ e.preventDefault()
+ e.stopPropagation()
this.isEdit = false;
this.isLoad = false;
}
diff --git a/resources/assets/js/pages/manage/components/TeamManagement.vue b/resources/assets/js/pages/manage/components/TeamManagement.vue
index 3e5ffe836..c1237d72d 100644
--- a/resources/assets/js/pages/manage/components/TeamManagement.vue
+++ b/resources/assets/js/pages/manage/components/TeamManagement.vue
@@ -88,7 +88,9 @@ export default {
return {
loadIng: 0,
- keys: {},
+ keys: {
+ identity: 'nodisable'
+ },
columns: [],
list: [],
@@ -133,7 +135,7 @@ export default {
if (email_verity) {
arr.push(h('Icon', {
props: {
- type: 'md-checkmark'
+ type: 'md-mail'
}
}))
}
diff --git a/resources/assets/sass/pages/components/project-dialog.scss b/resources/assets/sass/pages/components/project-dialog.scss
index c9975be7a..6d27f7381 100644
--- a/resources/assets/sass/pages/components/project-dialog.scss
+++ b/resources/assets/sass/pages/components/project-dialog.scss
@@ -50,6 +50,7 @@
display: block;
> li {
display: inline-block;
+ overflow: hidden;
}
}
}
diff --git a/resources/assets/sass/pages/components/team-management.scss b/resources/assets/sass/pages/components/team-management.scss
index 2db73bc22..0991eeb74 100644
--- a/resources/assets/sass/pages/components/team-management.scss
+++ b/resources/assets/sass/pages/components/team-management.scss
@@ -37,7 +37,8 @@
.ivu-icon {
color: $primary-color;
- margin-left: 4px;
+ margin-left: 6px;
+ font-size: 16px;
}
.ivu-tag {