Merge pull request #11740 from dataease/pr@dev-v2@fix_outer-params

fix: 修复外部参数配置是被全选问题
This commit is contained in:
王嘉豪 2024-08-26 13:03:58 +08:00 committed by GitHub
commit f3ec6813e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -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 => {