forked from github/dataease
fix(仪表板): 查询组件选择参数后依然可以选择自动
This commit is contained in:
parent
7d3e3de281
commit
943e21d89f
@ -36,7 +36,10 @@ export interface DatasetDetail {
|
|||||||
fields: {
|
fields: {
|
||||||
dimensionList: Array<Field>
|
dimensionList: Array<Field>
|
||||||
quotaList: Array<Field>
|
quotaList: Array<Field>
|
||||||
|
parameterList?: Array<Field>
|
||||||
}
|
}
|
||||||
|
activelist?: string
|
||||||
|
hasParameter?: boolean
|
||||||
checkList: string[]
|
checkList: string[]
|
||||||
list: Array<Field>
|
list: Array<Field>
|
||||||
}
|
}
|
||||||
|
@ -107,7 +107,6 @@ const activeCondition = ref('')
|
|||||||
const isIndeterminate = ref(false)
|
const isIndeterminate = ref(false)
|
||||||
const datasetTree = shallowRef([])
|
const datasetTree = shallowRef([])
|
||||||
const fields = ref<DatasetDetail[]>()
|
const fields = ref<DatasetDetail[]>()
|
||||||
const parameters = ref([])
|
|
||||||
|
|
||||||
const { queryElement } = toRefs(props)
|
const { queryElement } = toRefs(props)
|
||||||
|
|
||||||
@ -191,6 +190,9 @@ const setParameters = () => {
|
|||||||
|
|
||||||
if (!!curComponent.value.parameters.length) {
|
if (!!curComponent.value.parameters.length) {
|
||||||
curComponent.value.conditionType = 0
|
curComponent.value.conditionType = 0
|
||||||
|
if (curComponent.value.optionValueSource === 0) {
|
||||||
|
curComponent.value.optionValueSource = 1
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
setType()
|
setType()
|
||||||
@ -1386,7 +1388,9 @@ defineExpose({
|
|||||||
@change="handleValueSourceChange"
|
@change="handleValueSourceChange"
|
||||||
v-model="curComponent.optionValueSource"
|
v-model="curComponent.optionValueSource"
|
||||||
>
|
>
|
||||||
<el-radio :label="0">{{ t('chart.margin_model_auto') }}</el-radio>
|
<el-radio :disabled="!!curComponent.parameters.length" :label="0">{{
|
||||||
|
t('chart.margin_model_auto')
|
||||||
|
}}</el-radio>
|
||||||
<el-radio :label="1">{{ t('chart.select_dataset') }}</el-radio>
|
<el-radio :label="1">{{ t('chart.select_dataset') }}</el-radio>
|
||||||
<el-radio :label="2">手动输入</el-radio>
|
<el-radio :label="2">手动输入</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
|
Loading…
Reference in New Issue
Block a user