diff --git a/core/core-frontend/src/components/dashboard/DbToolbar.vue b/core/core-frontend/src/components/dashboard/DbToolbar.vue
index 88a76582ff..9c65c4c3c0 100644
--- a/core/core-frontend/src/components/dashboard/DbToolbar.vue
+++ b/core/core-frontend/src/components/dashboard/DbToolbar.vue
@@ -354,7 +354,10 @@ const openOuterParamsSet = () => {
ElMessage.warning('请先保存当前页面')
return
}
- outerParamsSetRef.value.optInit()
+ //设置需要先触发保存
+ canvasSave(() => {
+ outerParamsSetRef.value.optInit()
+ })
}
const saveBatchChange = () => {
diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index 7bbbba187c..86a244e73a 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -247,7 +247,10 @@ const openOuterParamsSet = () => {
ElMessage.warning('请先保存当前页面')
return
}
- outerParamsSetRef.value.optInit()
+ //设置需要先触发保存
+ canvasSave(() => {
+ outerParamsSetRef.value.optInit()
+ })
}
const multiplexingCanvasOpen = () => {
diff --git a/core/core-frontend/src/components/visualization/OuterParamsSet.vue b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
index 68f820b335..e425c5a98b 100644
--- a/core/core-frontend/src/components/visualization/OuterParamsSet.vue
+++ b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
@@ -166,11 +166,24 @@
style="width: 100%"
placeholder="请选择"
>
+
+
+
- {{ t('commons.cancel') }}
- {{ t('commons.confirm') }}
-
+ {{ t('commons.cancel') }}
+ {{ t('commons.confirm') }}
@@ -390,6 +401,14 @@ const initParams = async () => {
getPanelViewList(dvInfo.value.id)
}
+const findFields = (type, datasetFields) => {
+ if (type === 'parameterList') {
+ return datasetFields.filter(field => field.attachId.indexOf('DE') > -1)
+ } else {
+ return datasetFields.filter(field => field.attachId.indexOf('DE') === -1)
+ }
+}
+
const datasetInfoChange = datasetInfo => {
let viewCheckCount = 0
datasetInfo.datasetViews.forEach(dsView => {
@@ -428,6 +447,11 @@ const paramsCheckedAdaptor = (outerParamsInfo, newBaseFilterInfo, newBaseDataset
datasetInfo['checkAll'] = viewCheckCount === datasetInfo.datasetViews.length
datasetInfo['checkAllIsIndeterminate'] =
viewCheckCount > 0 && viewCheckCount < datasetInfo.datasetViews.length
+ if (datasetInfo['fieldIdSelected'] && datasetInfo['fieldIdSelected'].indexOf('DE') > -1) {
+ datasetInfo['activelist'] = 'parameterList'
+ } else {
+ datasetInfo['activelist'] = 'dimensionList'
+ }
})
}
if (newBaseFilterInfo) {
@@ -445,7 +469,6 @@ const cancel = () => {
const save = () => {
const outerParamsCopy = deepCopy(state.outerParams)
- console.log('targetViewInfoList0==' + outerParamsCopy)
outerParamsCopy.outerParamsInfoArray?.forEach(outerParamsInfo => {
outerParamsInfo.targetViewInfoList = []
outerParamsInfo.filterInfo?.forEach(baseFilterInfo => {
@@ -458,7 +481,6 @@ const save = () => {
})
}
})
- console.log('targetViewInfoList1==' + outerParamsInfo.targetViewInfoList)
outerParamsInfo.datasetInfo?.forEach(baseDatasetInfo => {
// 存在数据集字段被选中
if (baseDatasetInfo.fieldIdSelected) {
@@ -471,7 +493,6 @@ const save = () => {
})
}
})
- console.log('targetViewInfoList2==' + outerParamsInfo.targetViewInfoList)
})
updateOuterParamsSet(outerParamsCopy).then(() => {
ElMessage({