Merge pull request #2510 from dataease/pr@dev@fix_panel_filter
fix: 过滤组件删除默认选项后保存无效
This commit is contained in:
commit
63a0aa59af
@ -130,6 +130,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
bus.$off('reset-default-value')
|
||||
},
|
||||
methods: {
|
||||
onBlur() {
|
||||
this.onFocus = false
|
||||
|
||||
@ -2,12 +2,12 @@
|
||||
|
||||
<el-input
|
||||
v-if="element.options!== null && element.options.attrs!==null"
|
||||
ref="de-input-search"
|
||||
v-model="value"
|
||||
resize="vertical"
|
||||
:placeholder="$t(element.options.attrs.placeholder)"
|
||||
:size="size"
|
||||
class="de-range-tag"
|
||||
ref="de-input-search"
|
||||
@input="valueChange"
|
||||
@keypress.enter.native="search"
|
||||
@dblclick="setEdit"
|
||||
@ -78,6 +78,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
bus.$off('reset-default-value')
|
||||
},
|
||||
methods: {
|
||||
search() {
|
||||
if (!this.inDraw) {
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
<el-form v-if="element.options!== null && element.options.attrs!==null" ref="form" :model="form" :rules="rules">
|
||||
<div class="de-number-range-container">
|
||||
<el-form-item prop="min">
|
||||
<el-input ref='de-number-range-min' v-model="form.min" :placeholder="$t(element.options.attrs.placeholder_min)" :size="size" @input="inputChange" @change="handleMinChange" />
|
||||
<el-input ref="de-number-range-min" v-model="form.min" :placeholder="$t(element.options.attrs.placeholder_min)" :size="size" @input="inputChange" @change="handleMinChange" />
|
||||
</el-form-item>
|
||||
<span>{{ $t('denumberrange.split_placeholder') }}</span>
|
||||
<el-form-item prop="max">
|
||||
<el-input ref='de-number-range-max' v-model="form.max" :placeholder="$t(element.options.attrs.placeholder_max)" :size="size" @input="inputChange" @change="handleMaxChange" />
|
||||
<el-input ref="de-number-range-max" v-model="form.max" :placeholder="$t(element.options.attrs.placeholder_max)" :size="size" @input="inputChange" @change="handleMaxChange" />
|
||||
</el-form-item>
|
||||
</div>
|
||||
</el-form>
|
||||
@ -115,6 +115,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
bus.$off('reset-default-value')
|
||||
},
|
||||
methods: {
|
||||
searchWithKey(index) {
|
||||
this.timeMachine = setTimeout(() => {
|
||||
|
||||
@ -37,7 +37,7 @@ import { multFieldValues, linkMultFieldValues } from '@/api/dataset/dataset'
|
||||
import bus from '@/utils/bus'
|
||||
import { getLinkToken, getToken } from '@/utils/auth'
|
||||
import customInput from '@/components/widget/DeWidget/customInput'
|
||||
import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
|
||||
import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
|
||||
|
||||
export default {
|
||||
components: { ElVisualSelect },
|
||||
@ -182,6 +182,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
bus.$off('reset-default-value')
|
||||
},
|
||||
|
||||
methods: {
|
||||
onBlur() {
|
||||
@ -189,7 +192,7 @@ export default {
|
||||
},
|
||||
handleElTagStyle() {
|
||||
setTimeout(() => {
|
||||
textSelectWidget(this.$refs["deSelect"].$el, this.element.style)
|
||||
textSelectWidget(this.$refs['deSelect'].$el, this.element.style)
|
||||
}, 50)
|
||||
},
|
||||
initLoad() {
|
||||
@ -240,12 +243,12 @@ export default {
|
||||
},
|
||||
|
||||
setCondition() {
|
||||
console.log(this.element)
|
||||
const param = {
|
||||
component: this.element,
|
||||
value: this.formatFilterValue(),
|
||||
operator: this.operator
|
||||
}
|
||||
console.log(param.value)
|
||||
this.inDraw && this.$store.commit('addViewFilter', param)
|
||||
},
|
||||
formatFilterValue() {
|
||||
|
||||
@ -211,6 +211,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
bus.$off('reset-default-value')
|
||||
},
|
||||
|
||||
methods: {
|
||||
changeInputStyle() {
|
||||
|
||||
@ -27,7 +27,7 @@ import bus from '@/utils/bus'
|
||||
import { getLinkToken, getToken } from '@/utils/auth'
|
||||
import ElTreeSelect from '@/components/ElTreeSelect'
|
||||
import customInput from '@/components/widget/DeWidget/customInput'
|
||||
import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
|
||||
import { textSelectWidget } from '@/components/widget/DeWidget/serviceNameFn.js'
|
||||
|
||||
export default {
|
||||
components: { ElTreeSelect },
|
||||
@ -212,6 +212,9 @@ export default {
|
||||
}
|
||||
})
|
||||
},
|
||||
beforeDestroy() {
|
||||
bus.$off('reset-default-value')
|
||||
},
|
||||
|
||||
methods: {
|
||||
onFoucs() {
|
||||
@ -221,7 +224,7 @@ export default {
|
||||
},
|
||||
change() {
|
||||
setTimeout(() => {
|
||||
console.log(123, this.$refs.deSelectTree.$refs.select.$el);
|
||||
console.log(123, this.$refs.deSelectTree.$refs.select.$el)
|
||||
textSelectWidget(this.$refs.deSelectTree.$refs.select.$el, this.element.style)
|
||||
}, 50)
|
||||
},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user