Merge pull request #11850 from dataease/pr@dev-v2@fix_jump

refactor(仪表板、数据大屏): 优化跳转图表过滤,禁用无数据集图表
This commit is contained in:
王嘉豪 2024-08-29 16:26:51 +08:00 committed by GitHub
commit 405e0c1a52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -117,16 +117,28 @@
</select>
<select id="getViewTableDetails" resultMap="ViewTableFieldDetailsMap">
SELECT core_chart_view.id,
core_chart_view.title,
core_chart_view.type,
core_chart_view.scene_id as dv_id, core_dataset_table_field.id AS field_id, core_dataset_table_field.origin_name,
core_dataset_table_field.`name` AS field_name, core_dataset_table_field.type AS field_type, core_dataset_table_field.de_type
FROM core_chart_view
LEFT JOIN core_dataset_table_field
ON core_chart_view.table_id = core_dataset_table_field.dataset_group_id
WHERE core_chart_view.scene_id = #{dvId}
and core_chart_view.type != 'VQuery'
SELECT
core_chart_view.id,
core_chart_view.title,
core_chart_view.type,
core_chart_view.scene_id AS dv_id,
core_dataset_table_field.id AS field_id,
core_dataset_table_field.origin_name,
core_dataset_table_field.`name` AS field_name,
core_dataset_table_field.type AS field_type,
core_dataset_table_field.de_type
FROM
core_chart_view
LEFT JOIN core_dataset_table_field ON core_chart_view.table_id = core_dataset_table_field.dataset_group_id
INNER JOIN data_visualization_info dvi ON core_chart_view.scene_id = dvi.id
WHERE
core_chart_view.scene_id = #{dvId}
AND core_chart_view.type != 'VQuery'
AND core_chart_view.table_id IS NOT NULL
AND dvi.id = #{dvId}
AND LOCATE(
core_chart_view.id,
dvi.component_data)
</select>
<select id="queryWithViewId" resultMap="BaseResultMapDTO">