center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor: 优化联动设置，联动源字段只允许是维度字段

Browse Source
This commit is contained in:
wangjiahao 2024-06-04 12:07:29 +08:00
parent 2051674c85
commit 624d11c722
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/core-frontend/src/components/visualization/LinkageSet.vue
View File

@ -371,14 +371,9 @@ const linkageFieldAdaptor = async data => {
if (state.curLinkageViewInfo.tableId === targetChartDetails.tableId) { if (state.curLinkageViewInfo.tableId === targetChartDetails.tableId) {
const curCheckAllAxisStr = const curCheckAllAxisStr =
JSON.stringify(state.curLinkageViewInfo.xAxis) + JSON.stringify(state.curLinkageViewInfo.xAxis) +
JSON.stringify(state.curLinkageViewInfo.xAxisExt) + JSON.stringify(state.curLinkageViewInfo.xAxisExt)
JSON.stringify(state.curLinkageViewInfo.yAxis) +
JSON.stringify(state.curLinkageViewInfo.yAxisExt)
const targetCheckAllAxisStr = const targetCheckAllAxisStr =
JSON.stringify(targetChartDetails.xAxis) + JSON.stringify(targetChartDetails.xAxis) + JSON.stringify(targetChartDetails.xAxisExt)
JSON.stringify(targetChartDetails.xAxisExt) +
JSON.stringify(targetChartDetails.yAxis) +
JSON.stringify(targetChartDetails.yAxisExt)
state.sourceLinkageInfo.targetViewFields.forEach(item => { state.sourceLinkageInfo.targetViewFields.forEach(item => {
if (curCheckAllAxisStr.includes(item.id) && targetCheckAllAxisStr.includes(item.id)) { if (curCheckAllAxisStr.includes(item.id) && targetCheckAllAxisStr.includes(item.id)) {
addLinkageField(item.id, item.id) addLinkageField(item.id, item.id)
@ -395,9 +390,7 @@ const sourceLinkageInfoFilter = computed(() => {
if (state.sourceLinkageInfo.targetViewFields) { if (state.sourceLinkageInfo.targetViewFields) {
const curCheckAllAxisStr = const curCheckAllAxisStr =
JSON.stringify(state.curLinkageViewInfo.xAxis) + JSON.stringify(state.curLinkageViewInfo.xAxis) +
JSON.stringify(state.curLinkageViewInfo.xAxisExt) + JSON.stringify(state.curLinkageViewInfo.xAxisExt)
JSON.stringify(state.curLinkageViewInfo.yAxis) +
JSON.stringify(state.curLinkageViewInfo.yAxisExt)
return state.sourceLinkageInfo.targetViewFields.filter(item => return state.sourceLinkageInfo.targetViewFields.filter(item =>
curCheckAllAxisStr.includes(item.id) curCheckAllAxisStr.includes(item.id)
) )