diff --git a/resources/assets/js/components/SearchBox.vue b/resources/assets/js/components/SearchBox.vue index ed96ec823..a4ebfa719 100755 --- a/resources/assets/js/components/SearchBox.vue +++ b/resources/assets/js/components/SearchBox.vue @@ -14,7 +14,9 @@ - +
+ +
@@ -249,9 +251,9 @@ export default { if ($el) { $el.style.caretColor = 'transparent'; $el.focus() - const len = $el.value.length; - $el.setSelectionRange(len, len); setTimeout(() => { + const len = $el.value.length; + $el.setSelectionRange(len, len); $el.style.caretColor = null }, 300) } diff --git a/resources/assets/js/components/UserSelect.vue b/resources/assets/js/components/UserSelect.vue index fbfe60063..0c3595d75 100755 --- a/resources/assets/js/components/UserSelect.vue +++ b/resources/assets/js/components/UserSelect.vue @@ -59,7 +59,9 @@ - +
+ +
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 15d966a29..54e6159dd 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -177,7 +177,9 @@ - +
+ +
diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 5c5215211..e41971f4e 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -143,8 +143,10 @@ - -
{{searchLocation}}/{{searchResult.length}}
+
+ +
{{searchLocation}}/{{searchResult.length}}
+
{{$L('取消')}}
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 026cfeb8b..55c3c1b3a 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -7,7 +7,9 @@ - +
+ +
    diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index 187f3ab78..1f675aa10 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -9,20 +9,24 @@ - - +
    + + +
    diff --git a/resources/assets/sass/components/search-box.scss b/resources/assets/sass/components/search-box.scss index 240868150..32de14184 100755 --- a/resources/assets/sass/components/search-box.scss +++ b/resources/assets/sass/components/search-box.scss @@ -68,13 +68,17 @@ } } - .ivu-input { - border-color: transparent; - background-color: transparent; + .search-form { + flex: 1; - &:hover, - &:focus { - box-shadow: none; + .ivu-input { + border-color: transparent; + background-color: transparent; + + &:hover, + &:focus { + box-shadow: none; + } } } } diff --git a/resources/assets/sass/components/user-select.scss b/resources/assets/sass/components/user-select.scss index b304d6209..893fe36eb 100755 --- a/resources/assets/sass/components/user-select.scss +++ b/resources/assets/sass/components/user-select.scss @@ -185,12 +185,17 @@ } } - .ivu-input { - border-color: transparent; - background-color: transparent; - &:hover, - &:focus { - box-shadow: none; + .search-form { + flex: 1; + + .ivu-input { + border-color: transparent; + background-color: transparent; + + &:hover, + &:focus { + box-shadow: none; + } } } } diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 6231c2d33..e6e63b832 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -418,18 +418,22 @@ } } - .ivu-input { - border-color: transparent; - background-color: transparent; + .search-form { + flex: 1; - &:hover, - &:focus { - box-shadow: none; + .ivu-input { + border-color: transparent; + background-color: transparent; + + &:hover, + &:focus { + box-shadow: none; + } } - } - .search-total { - padding-right: 12px; + .search-total { + padding-right: 12px; + } } } .search-cancel { diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index 22bd0d1e0..c5c38205e 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -43,13 +43,17 @@ } } - .ivu-input { - border-color: transparent; - background-color: transparent; + .search-form { + flex: 1; - &:hover, - &:focus { - box-shadow: none; + .ivu-input { + border-color: transparent; + background-color: transparent; + + &:hover, + &:focus { + box-shadow: none; + } } } } diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss index 344b57f07..6638476a5 100644 --- a/resources/assets/sass/pages/page-manage.scss +++ b/resources/assets/sass/pages/page-manage.scss @@ -240,12 +240,15 @@ margin: 0; } } - .ivu-input { - border-color: transparent; - background-color: transparent; - &:hover, - &:focus { - box-shadow: none; + .search-form { + flex: 1; + .ivu-input { + border-color: transparent; + background-color: transparent; + &:hover, + &:focus { + box-shadow: none; + } } } } diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index 8777dce00..7ce6c3f54 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -56,12 +56,15 @@ margin: 0; } } - .ivu-input { - border-color: transparent; - background-color: transparent; - &:hover, - &:focus { - box-shadow: none; + .search-form { + flex: 1; + .ivu-input { + border-color: transparent; + background-color: transparent; + &:hover, + &:focus { + box-shadow: none; + } } } }