Merge pull request #7212 from dataease/pr@dev@feat_jump-filter

feat: 跳转支持和过滤组件允许配合使用 #5924
This commit is contained in:
王嘉豪 2023-12-19 16:20:46 +08:00 committed by GitHub
commit 17975631d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -173,6 +173,7 @@
<div class="select-filed"> <div class="select-filed">
<el-select <el-select
v-model="targetViewInfo.targetFieldId" v-model="targetViewInfo.targetFieldId"
:disabled="viewIdFieldArrayMap[targetViewInfo.targetViewId]&&viewIdFieldArrayMap[targetViewInfo.targetViewId].length===1 && viewIdFieldArrayMap[targetViewInfo.targetViewId][0].id === 0"
filterable filterable
style="width: 100%" style="width: 100%"
size="mini" size="mini"
@ -476,6 +477,19 @@ export default {
hintOptions: { // hintOptions: { //
completeSingle: false // completeSingle: false //
} }
},
widgetSubjectsTrans: {
timeYearWidget: '年份过滤组件',
timeMonthWidget: '年月过滤组件',
timeDateWidget: '日期过滤组件',
timeDateRangeWidget: '日期范围过滤组件',
textSelectWidget: '文本下拉过滤组件',
textSelectGridWidget: '文本列表过滤组件',
textInputWidget: '文本搜索过滤组件',
textSelectTreeWidget: '下拉树过滤组件',
numberSelectWidget: '数字下来过滤组件',
numberSelectGridWidget: '数字列表过滤组件',
numberRangeWidget: '数值区间过滤组件'
} }
} }
}, },
@ -621,6 +635,17 @@ export default {
this.viewIdFieldArrayMap[view.id] = view.tableFields this.viewIdFieldArrayMap[view.id] = view.tableFields
}) })
} }
//
this.componentData.forEach(componentItem => {
if (componentItem.type === 'custom') {
this.currentLinkPanelViewArray.push({
id: componentItem.id,
type: 'filter',
name: componentItem.options.attrs.title ? componentItem.options.attrs.title : this.widgetSubjectsTrans[componentItem.serviceName]
})
this.viewIdFieldArrayMap[componentItem.id] = [{ id: 'empty', name: this.$t('panel.filter_no_select') }]
}
})
}) })
}, },
panelNodeClick(data, node) { panelNodeClick(data, node) {