forked from github/dataease
commit
1ce6247557
@ -18,7 +18,7 @@
|
|||||||
:key-word="keyWord"
|
:key-word="keyWord"
|
||||||
popper-class="coustom-de-select"
|
popper-class="coustom-de-select"
|
||||||
:class="{'disabled-close': !inDraw && selectFirst && element.options.attrs.multiple, 'show-required-tips': showRequiredTips}"
|
:class="{'disabled-close': !inDraw && selectFirst && element.options.attrs.multiple, 'show-required-tips': showRequiredTips}"
|
||||||
:list="(element.options.attrs.showEmpty ? [{ text: '空数据', id: '_empty_$'}, ...data] : data)"
|
:list="(element.options.attrs.showEmpty ? [{ text: '空数据', id: '_empty_$'}, ...data.filter(ele => ele.id !== '_empty_$')] : data)"
|
||||||
:flag="flag"
|
:flag="flag"
|
||||||
:is-config="isConfig"
|
:is-config="isConfig"
|
||||||
:custom-style="customStyle"
|
:custom-style="customStyle"
|
||||||
@ -562,7 +562,7 @@ export default {
|
|||||||
} else if (!Array.isArray(this.resetKeyWordsVal) && this.resetKeyWordsVal) {
|
} else if (!Array.isArray(this.resetKeyWordsVal) && this.resetKeyWordsVal) {
|
||||||
tempData = [...new Set([this.resetKeyWordsVal, ...tempData])]
|
tempData = [...new Set([this.resetKeyWordsVal, ...tempData])]
|
||||||
}
|
}
|
||||||
this.filterInvalidValue(this.element.options.attrs.showEmpty ? [...tempData, '_empty_$'] : tempData)
|
this.filterInvalidValue(tempData)
|
||||||
return tempData.map(item => {
|
return tempData.map(item => {
|
||||||
return {
|
return {
|
||||||
id: item,
|
id: item,
|
||||||
|
Loading…
Reference in New Issue
Block a user