diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index d555c8f08..bf1f3331f 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -119,7 +119,7 @@ html { float: right; } .top-tools .top-tool-search { - width: 220px; + width: 320px; } .top-tools .el-button-group { float: left; diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index a45b1626a..6b30b3cb6 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -16,6 +16,8 @@ const en = { add: "Add", option: "Option", clearAll: "Clear All", + name: 'Name', + searchTip: 'Press Enter or click to search' }, tip: { confirmDelete: "Confirm Delete?", diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue new file mode 100644 index 000000000..8f3e87f29 --- /dev/null +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -0,0 +1,1292 @@ + + + + + diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 510797014..71125a8c5 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -2,6 +2,23 @@ .account { height: 100%; } + .right-box::-webkit-scrollbar-track { + -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); + border-radius: 0; + background: rgba(0,0,0,0.1); + } + .right-box::-webkit-scrollbar-thumb { + border-radius: 5px; + -webkit-box-shadow: inset 0 0 5px rgba(0,0,0,0.2); + background: rgba(0,0,0,0.2); + } + .right-box::-webkit-scrollbar { + width: 4px; + height: 4px; + } + .right-box { + overflow: auto; + } .account-list-option { cursor: pointer; display: inline-block; @@ -35,12 +52,14 @@ {{$t('overall.add')}} - + >--> + +
+
@@ -692,6 +693,7 @@
{{$t('overall.cancel')}}
{{currentModule.id == '' && moduleRightBox.isCreate ? $t('overall.create') : $t('overall.save')}}
+
diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 5bb4de70e..e53517303 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -15,7 +15,10 @@ import axios from 'axios'; import {post, get, put, del} from './http.js' import Pagination from "./components/common/pagination"; //引入全局分页组件 +import searchInput from "./components/common/searchInput"; + Vue.component("Pagination", Pagination); +Vue.component("searchInput", searchInput); Vue.prototype.$axios = axios Vue.prototype.$post = post;