mirror of
https://github.com/dataease/dataease.git
synced 2025-02-25 12:03:05 +08:00
Merge pull request #1990 from dataease/pr@dev@fix_panel-style
fix: 修复第三方参数未启用依然有效的问题
This commit is contained in:
commit
cf03e5aed2
@ -93,6 +93,7 @@
|
|||||||
LEFT JOIN panel_outer_params_target_view_info poptvi ON popi.params_info_id = poptvi.params_info_id
|
LEFT JOIN panel_outer_params_target_view_info poptvi ON popi.params_info_id = poptvi.params_info_id
|
||||||
WHERE
|
WHERE
|
||||||
pop.panel_id = #{panelId} and pop.checked=1
|
pop.panel_id = #{panelId} and pop.checked=1
|
||||||
|
and popi.checked=1
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
|
@ -1390,6 +1390,7 @@ export default {
|
|||||||
sure_bt: 'Confirm'
|
sure_bt: 'Confirm'
|
||||||
},
|
},
|
||||||
panel: {
|
panel: {
|
||||||
|
json_params_error: 'Third Party Parameters Parsing Failed. Please Check Whether The Parameters Format Is Correct',
|
||||||
inner_padding: 'Inner Padding',
|
inner_padding: 'Inner Padding',
|
||||||
board_radio: 'Board Radio',
|
board_radio: 'Board Radio',
|
||||||
background: 'Background',
|
background: 'Background',
|
||||||
|
@ -1391,6 +1391,7 @@ export default {
|
|||||||
sure_bt: '確定'
|
sure_bt: '確定'
|
||||||
},
|
},
|
||||||
panel: {
|
panel: {
|
||||||
|
json_params_error: '第三方参数解析失败,请检查参数格式是否正确',
|
||||||
inner_padding: '内边距',
|
inner_padding: '内边距',
|
||||||
board_radio: '边框半径',
|
board_radio: '边框半径',
|
||||||
background: '背景',
|
background: '背景',
|
||||||
|
@ -1399,6 +1399,7 @@ export default {
|
|||||||
sure_bt: '确定'
|
sure_bt: '确定'
|
||||||
},
|
},
|
||||||
panel: {
|
panel: {
|
||||||
|
json_params_error: '第三方参数解析失败,请检查参数格式是否正确',
|
||||||
inner_padding: '内边距',
|
inner_padding: '内边距',
|
||||||
board_radio: '边框半径',
|
board_radio: '边框半径',
|
||||||
background: '背景',
|
background: '背景',
|
||||||
|
@ -81,6 +81,12 @@ export default {
|
|||||||
if (--loadingCount === 0) {
|
if (--loadingCount === 0) {
|
||||||
this.show = true
|
this.show = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.$message({
|
||||||
|
message: this.$t('panel.json_params_error'),
|
||||||
|
type: 'error',
|
||||||
|
showClose: true
|
||||||
|
})
|
||||||
console.log('outerParams Decode error:', e)
|
console.log('outerParams Decode error:', e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user