Merge pull request #11740 from dataease/pr@dev-v2@fix_outer-params
fix: 修复外部参数配置是被全选问题
This commit is contained in:
commit
f3ec6813e7
@ -204,6 +204,7 @@
|
|||||||
style="margin-top: -4px"
|
style="margin-top: -4px"
|
||||||
v-model="baseDatasetInfo.checkAll"
|
v-model="baseDatasetInfo.checkAll"
|
||||||
:indeterminate="baseDatasetInfo.checkAllIsIndeterminate"
|
:indeterminate="baseDatasetInfo.checkAllIsIndeterminate"
|
||||||
|
:disabled="!baseDatasetInfo.fieldIdSelected"
|
||||||
@change="batchSelectChange($event, baseDatasetInfo)"
|
@change="batchSelectChange($event, baseDatasetInfo)"
|
||||||
>全选</el-checkbox
|
>全选</el-checkbox
|
||||||
>
|
>
|
||||||
@ -218,6 +219,7 @@
|
|||||||
<div>
|
<div>
|
||||||
<el-checkbox
|
<el-checkbox
|
||||||
v-model="viewInfo.checked"
|
v-model="viewInfo.checked"
|
||||||
|
:disabled="!baseDatasetInfo.fieldIdSelected"
|
||||||
@change="datasetInfoChange(baseDatasetInfo)"
|
@change="datasetInfoChange(baseDatasetInfo)"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
@ -484,11 +486,13 @@ const save = () => {
|
|||||||
// 存在数据集字段被选中
|
// 存在数据集字段被选中
|
||||||
if (baseDatasetInfo.fieldIdSelected) {
|
if (baseDatasetInfo.fieldIdSelected) {
|
||||||
baseDatasetInfo.datasetViews?.forEach(dsView => {
|
baseDatasetInfo.datasetViews?.forEach(dsView => {
|
||||||
outerParamsInfo.targetViewInfoList.push({
|
if (dsView.checked) {
|
||||||
targetViewId: dsView.chartId,
|
outerParamsInfo.targetViewInfoList.push({
|
||||||
targetDsId: baseDatasetInfo.id,
|
targetViewId: dsView.chartId,
|
||||||
targetFieldId: baseDatasetInfo.fieldIdSelected
|
targetDsId: baseDatasetInfo.id,
|
||||||
})
|
targetFieldId: baseDatasetInfo.fieldIdSelected
|
||||||
|
})
|
||||||
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -601,8 +605,8 @@ const batchSelectChange = (value, baseDatasetInfo) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const optInit = () => {
|
const optInit = () => {
|
||||||
state.outerParamsSetVisible = true
|
|
||||||
initParams()
|
initParams()
|
||||||
|
state.outerParamsSetVisible = true
|
||||||
}
|
}
|
||||||
|
|
||||||
const findFilterName = id => {
|
const findFilterName = id => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user