p42579631
/
datagear
forked from p85126437/datagear
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

图表、看板查询页显示ID列并支持模糊查询

This commit is contained in:
datagear 2020-02-22 19:51:10 +08:00
parent cf64d59f2d
commit fbe46e944a
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
datagear-management/src/main/resources/org/datagear/management/mapper/HtmlChartWidgetEntityMapper.xml
View File

@ -166,7 +166,7 @@
<if test="queryKeyword != null">
AND
(
${_iq_}name${_iq_} LIKE #{queryKeyword}
${_iq_}id${_iq_} LIKE #{queryKeyword} OR ${_iq_}name${_iq_} LIKE #{queryKeyword}
)
</if>
<include refid="commonDataPermission.dataFilterCondition" />

2
datagear-management/src/main/resources/org/datagear/management/mapper/HtmlTplDashboardWidgetEntityMapper.xml
View File

@ -154,7 +154,7 @@
<if test="queryKeyword != null">
AND
(
${_iq_}name${_iq_} LIKE #{queryKeyword}
${_iq_}id${_iq_} LIKE #{queryKeyword} OR ${_iq_}name${_iq_} LIKE #{queryKeyword}
)
</if>
<include refid="commonDataPermission.dataFilterCondition" />

2
datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/chart/chart_grid.ftl
View File

@ -209,7 +209,7 @@ selectonly 是否选择操作，允许为null
};
var tableColumns = [
$.buildDataTablesColumnSimpleOption("<@spring.message code='id' />", "id"),
$.buildDataTablesColumnSimpleOption($.buildDataTablesColumnTitleSearchable("<@spring.message code='id' />"), "id"),
$.buildDataTablesColumnSimpleOption($.buildDataTablesColumnTitleSearchable("<@spring.message code='chart.name' />"), "name"),
$.buildDataTablesColumnSimpleOption("<@spring.message code='chart.htmlChartPlugin' />", "chartPluginName"),
updateIntervalColumn,

2
datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dashboard/dashboard_grid.ftl
View File

@ -195,7 +195,7 @@ selectonly 是否选择操作，允许为null
</#if>
var tableColumns = [
$.buildDataTablesColumnSimpleOption("<@spring.message code='id' />", "id", true),
$.buildDataTablesColumnSimpleOption($.buildDataTablesColumnTitleSearchable("<@spring.message code='id' />"), "id"),
$.buildDataTablesColumnSimpleOption($.buildDataTablesColumnTitleSearchable("<@spring.message code='dashboard.name' />"), "name"),
$.buildDataTablesColumnSimpleOption("<@spring.message code='dashboard.createUser' />", "createUser.realName"),
$.buildDataTablesColumnSimpleOption("<@spring.message code='dashboard.createTime' />", "createTime")