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 2022-07-28 17:37:09 +08:00
parent bd956d4333
commit 9104c1e0bd
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
View File

@ -51,8 +51,7 @@
LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
WHERE WHERE
chart_view.id =#{source_view_id} chart_view.id =#{source_view_id}
ORDER BY ORDER BY CONVERT(dataset_table_field.NAME using gbk)
ifnull( panel_link_jump_info.checked, 0 ) DESC
</select> </select>
<select id="queryWithPanelId" resultMap="BaseResultMapDTO"> <select id="queryWithPanelId" resultMap="BaseResultMapDTO">

16
frontend/src/components/canvas/custom-component/UserView.vue
View File

@ -289,13 +289,13 @@ export default {
const trackMenuInfo = [] const trackMenuInfo = []
let linkageCount = 0 let linkageCount = 0
let jumpCount = 0 let jumpCount = 0
this.chart.data && this.chart.data.sourceFields && this.chart.data.sourceFields.forEach(item => { this.chart.data && this.chart.data.fields && this.chart.data.fields.forEach(item => {
const sourceInfo = this.chart.id + '#' + item.id const sourceInfo = this.chart.id + '#' + item.id
if (this.nowPanelTrackInfo[sourceInfo]) { if (this.nowPanelTrackInfo[sourceInfo]) {
linkageCount++ linkageCount++
} }
}) })
this.chart.data && this.chart.data.sourceFields && this.chart.data.sourceFields.forEach(item => { this.chart.data && this.chart.data.fields && this.chart.data.fields.forEach(item => {
const sourceInfo = this.chart.id + '#' + item.id const sourceInfo = this.chart.id + '#' + item.id
if (this.nowPanelJumpInfo[sourceInfo]) { if (this.nowPanelJumpInfo[sourceInfo]) {
jumpCount++ jumpCount++
@ -685,11 +685,13 @@ export default {
window.open(url, jumpInfo.jumpType) window.open(url, jumpInfo.jumpType)
} }
} else { } else {
this.$message({ if (this.chart.type.indexOf('table') === -1) {
type: 'warn', this.$message({
message: '未获取跳转信息', type: 'warn',
showClose: true message: '未获取跳转信息',
}) showClose: true
})
}
} }
}, },
setIdValueTrans(from, to, content, colList) { setIdValueTrans(from, to, content, colList) {

2
frontend/src/views/panel/LinkJumpSet/index.vue
View File

@ -580,7 +580,7 @@ export default {
} }
.bottom { .bottom {
margin-top: 20px; margin-top: 10px;
text-align: center; text-align: center;
} }