dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7390 from dataease/pr@dev@fix_select_first_full_screen

Browse Source 
fix: 文本下拉设置首项在全屏模式可能无效
This commit is contained in:
fit2cloud-chenyw 2023-12-27 12:06:23 +08:00 committed by GitHub
commit 8d07e7039b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/frontend/src/components/widget/deWidget/DeSelect.vue
View File

@ -501,7 +501,16 @@ export default {
if (!this.selectFirst) {
return
}
const defaultV = this.data[0].id
let defaultV = this.data[0].id
if (this.inDraw) {
let lastFilters = null
if (this.$store.state.lastValidFilters) {
lastFilters = this.$store.state.lastValidFilters[this.element.id]
if (lastFilters) {
defaultV = lastFilters.val === null ? '' : lastFilters.val.toString()
}
}
}
if (this.element.options.attrs.multiple) {
if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV === '[object Object]') return []
this.value = defaultV.split(this.separator)

2
core/frontend/src/utils/conditionUtil.js
View File

@ -121,7 +121,7 @@ export const buildViewKeyFilters = (panelItems, result, isEdit = false) => {
// 进行过滤时 如果过滤组件在主画布 则条件适用于所有画布视图 否则需要过滤组件和视图在相同画布
if (element.canvasId === 'canvas-main' || element.canvasId === canvasIdMap[viewId]) {
const vidMatch = viewIdMatch(condition.viewIds, viewId)
if (vidMatch && selectFirst && !element.options.loaded) {
if (vidMatch && selectFirst && !element.options.loaded && !lastFilter) {
const obj = {}
const promise = new Promise(resolve => {
cacheCondition(cbParam => {