gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：修复高级搜索 编辑时层级不对 以及 select 滚动加载未触发的问题

Browse Source
This commit is contained in:
zhangyu
2023-06-12 11:46:54 +08:00
parent e4e952d405
commit 6577730e80
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nezha-fronted/src/components/common/js/tools.js
View File

@@ -1101,7 +1101,7 @@ export const loadMore = {
bind (el, binding) {
console.log(el, binding, el.parentNode, 'bind')
// 获取element，定义scroll
const selectDom = binding.dom ? el.querySelector(binding.dom) : el
const selectDom = binding.value.dom ? el.querySelector(binding.value.dom) : el
heightLoad = bus.debounce(function () {
if (!el.hasMore) {
return
@@ -1117,8 +1117,7 @@ export const loadMore = {
el.hasMore = binding.value.hasMore
},
unbind (el, binding) {
const selectDom = binding.dom ? el.querySelector(binding.dom) : el
console.log(selectDom, 'unbind')
const selectDom = binding.value.dom ? el.querySelector(binding.value.dom) : el
if (selectDom) {
selectDom.removeEventListener('scroll', heightLoad)
}

15
nezha-fronted/src/components/common/searchBox/searchBox.vue
View File

@@ -15,7 +15,7 @@
<div
v-for="(item, index) in historyArr"
@mouseenter="historyIndex = index"
:key="index"
:key="'search-item-history' + index"
class="search-item text-ellipsis"
:ref="'search-item' + index"
:class="{'search-item-select': index === historyIndex}"
@@ -24,7 +24,7 @@
>
<span v-for="(tag, tIndex) in item" :key="index + '-' +tIndex" class="search-box-tag" style="margin-right: 3px">
<span>{{tag.i18n}}:</span>
<span v-for="(value, vIndex) in tag.value" :key="value">{{value}} <span v-if="tag.value.length - 1 > vIndex">,</span></span>
<span v-for="(value, vIndex) in tag.value" :key="'history-item-'+index + '-' +tIndex+'-' + vIndex">{{value}} <span v-if="tag.value.length - 1 > vIndex">,</span></span>
</span>
</div>
</div>
@@ -112,12 +112,12 @@
<el-dialog :title="$t('overall.edit')" class="no-transform-dialog" :visible.sync="dialogShow" @close="dialogClose" :append-to-body="false" :modal-append-to-body="false" :destroy-on-close="true">
<el-form ref="tagEdit" v-model="editDialogObj" v-if="dialogShow">
<el-form-item prop="key" title="key">
<el-select prop="key" v-model="editDialogObj.name" size="small">
<el-select prop="key" v-model="editDialogObj.name" size="small" :popper-append-to-body="false">
<el-option v-for="item in oldSearchList" :value="item.name" :label="$t(item.i18n)" :key="item.name"></el-option>
</el-select>
</el-form-item>
<el-form-item prop="symbol" title="symbol" size="small" >
<el-select v-model="editDialogObj.symbol">
<el-select v-model="editDialogObj.symbol" :popper-append-to-body="false">
<el-option :value="1" :label="$t('searchBox.belong')"></el-option>
<el-option :value="2" :label="$t('searchBox.notbelong')"></el-option>
<el-option :value="3" :label="$t('searchBox.wildcard')"></el-option>
@@ -135,6 +135,7 @@
allow-create
default-first-option
:filter-method="dialogValueListSet"
:popper-append-to-body="false"
v-loadMore="{
load: dialogValueListLoad,
hasMore: valueListInfo.total > valueList.length,
@@ -162,13 +163,14 @@
v-loadMore="{
load: dialogValueListLoad,
hasMore: false,
dom: '.el-select-dropdown .el-select-dropdown__wrap'
dom: '.el-select-dropdown__wrap .el-scrollbar__wrap'
}"
:popper-append-to-body="false"
ref="dialogValueSelect"
>
<el-option
v-for="(item, index) in valueList"
:key="index"
:key="'dialogValueSelect' + '-' + index"
:label="item.label"
:value="item.value">
</el-option>
@@ -767,6 +769,7 @@ export default {
this.dialogValueListLoad()
},
dialogValueListLoad () {
this.contentShow('')
if (this.editDialogObj.type == 'enum') {
this.valueList = this.oldValueList.filter(item => item.label.indexOf(this.dialogSraechStr) !== -1)
return