@@ -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 => ({
name: item.title,
componentKey: item.code
@@ -645,8 +645,8 @@ export default {
return (
list?.map(field => {
return {
- label: field.comment,
- value: field.name
+ label: field.comment || field.fieldDesc,
+ 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
// 如果没有版本号,或者版本号修改了则需要进行旧数据兼容
- if ((!chart.version) || chart.version !== originalConfig.version) {
+ if ((!chart.version) || (originalConfig && chart.version !== originalConfig?.version)) {
chart = compatibility(chart, originalConfig)