fix:限制可以联动的组件

main
liu.shiyi 2 years ago
parent d504e8efb9
commit e29529533a

@ -154,7 +154,7 @@ export default {
}) })
} }
}) })
layouts = layouts?.filter(item => item.code !== code && !['Tabs', 'titles', 'currentTime', 'timeCountDown', 'iframeChart', 'linkChart', 'carousel'].includes(item.type)) layouts = layouts?.filter(item => item.code !== code && item?.option?.displayOption?.dataAllocation?.enable)
layouts = [...layouts, ...tabComponents]?.map(item => ({ layouts = [...layouts, ...tabComponents]?.map(item => ({
name: item.title, name: item.title,
componentKey: item.code componentKey: item.code

@ -645,8 +645,8 @@ export default {
return ( return (
list?.map(field => { list?.map(field => {
return { return {
label: field.comment, label: field.comment || field.fieldDesc,
value: field.name value: field.name || field.fieldName
} }
}) || [] }) || []
) )

@ -83,7 +83,7 @@ export function handleResData (data) {
chart.option.data = plotList?.find(plot => plot.name === chart.name)?.option?.data chart.option.data = plotList?.find(plot => plot.name === chart.name)?.option?.data
} }
// 如果没有版本号,或者版本号修改了则需要进行旧数据兼容 // 如果没有版本号,或者版本号修改了则需要进行旧数据兼容
if ((!chart.version) || chart.version !== originalConfig.version) { if ((!chart.version) || (originalConfig && chart.version !== originalConfig?.version)) {
chart = compatibility(chart, originalConfig) chart = compatibility(chart, originalConfig)
} }
} }

Loading…
Cancel
Save