forked from github/dataease
refactor(仪表板): 调整设置增加维度排序,按钮样式优化
This commit is contained in:
parent
bd956d4333
commit
9104c1e0bd
@ -51,8 +51,7 @@
|
||||
LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
|
||||
WHERE
|
||||
chart_view.id =#{source_view_id}
|
||||
ORDER BY
|
||||
ifnull( panel_link_jump_info.checked, 0 ) DESC
|
||||
ORDER BY CONVERT(dataset_table_field.NAME using gbk)
|
||||
</select>
|
||||
|
||||
<select id="queryWithPanelId" resultMap="BaseResultMapDTO">
|
||||
|
@ -289,13 +289,13 @@ export default {
|
||||
const trackMenuInfo = []
|
||||
let linkageCount = 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
|
||||
if (this.nowPanelTrackInfo[sourceInfo]) {
|
||||
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
|
||||
if (this.nowPanelJumpInfo[sourceInfo]) {
|
||||
jumpCount++
|
||||
@ -685,11 +685,13 @@ export default {
|
||||
window.open(url, jumpInfo.jumpType)
|
||||
}
|
||||
} else {
|
||||
this.$message({
|
||||
type: 'warn',
|
||||
message: '未获取跳转信息',
|
||||
showClose: true
|
||||
})
|
||||
if (this.chart.type.indexOf('table') === -1) {
|
||||
this.$message({
|
||||
type: 'warn',
|
||||
message: '未获取跳转信息',
|
||||
showClose: true
|
||||
})
|
||||
}
|
||||
}
|
||||
},
|
||||
setIdValueTrans(from, to, content, colList) {
|
||||
|
@ -580,7 +580,7 @@ export default {
|
||||
}
|
||||
|
||||
.bottom {
|
||||
margin-top: 20px;
|
||||
margin-top: 10px;
|
||||
text-align: center;
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user