center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #7733 from dataease/pr@dev@fixSql

Browse Source 
fix: 数字列表过滤组件支持参数
This commit is contained in:
taojinlong 2024-01-22 13:53:21 +08:00 committed by GitHub
commit c04468a492
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/frontend/src/views/panel/filter/FilterDialog.vue
View File

@ -655,14 +655,14 @@ export default {
if (this.widgetInfo.name.indexOf('time') !== -1) { if (this.widgetInfo.name.indexOf('time') !== -1) {
type = 'DATE' type = 'DATE'
} }
if (this.widgetInfo.name === 'numberSelectWidget') { if (this.widgetInfo.name.indexOf('numberSelect') !== -1) {
type = 'NUM' type = 'NUM'
} }
viewIds && viewIds.length > 0 && paramsWithIds(type, viewIds).then(res => { if(viewIds && viewIds.length > 0){
const data = res.data paramsWithIds(type, viewIds).then(res => {
this.childViews.datasetParams = res.data
this.childViews.datasetParams = data
}) })
}
}, },
updateParentName() { updateParentName() {
if (this.fieldsParent && this.viewInfos?.length && this.activeName !== 'dataset') { if (this.fieldsParent && this.viewInfos?.length && this.activeName !== 'dataset') {
@ -839,7 +839,7 @@ export default {
if (this.widgetInfo.name.indexOf('time') !== -1) { if (this.widgetInfo.name.indexOf('time') !== -1) {
type = 'DATE' type = 'DATE'
} }
if (this.widgetInfo.name === 'numberSelectWidget') { if (this.widgetInfo.name.indexOf('numberSelect') !== -1) {
type = 'NUM' type = 'NUM'
} }
datasetParams(tableId, type).then(res => { datasetParams(tableId, type).then(res => {