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

Merge pull request #7459 from dataease/pr@dev@refactor_filter-adptor

Browse Source 
refactor: 过滤跳转适配
This commit is contained in:
王嘉豪 2023-12-28 21:01:37 +08:00 committed by GitHub
commit d38239c3d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/frontend/src/store/index.js
View File

@ -452,7 +452,7 @@ const data = {
currentFilters.push(condition)
}
if (element.type === 'custom' && element.id === targetViewId) { // 过滤组件处理
element.options.value = dimension.value
element.options.value = [dimension.value]
// 去掉动态时间
if (element.options.manualModify) {
element.options.manualModify = false
@ -486,23 +486,10 @@ const data = {
Object.keys(params).forEach(function(sourceInfo) {
// 获取外部参数的值 sourceInfo 是外部参数名称 支持数组传入
let paramValue = params[sourceInfo]
let paramValueStr = params[sourceInfo]
let paramValueTree = params[sourceInfo]
let operator = 'in'
if (paramValue && !Array.isArray(paramValue)) {
paramValue = [paramValue]
operator = 'eq'
} else if (paramValue && Array.isArray(paramValue)) {
paramValueStr = ''
paramValue.forEach((innerValue, index) => {
if (index === 0) {
paramValueStr = innerValue
paramValueTree = innerValue
} else {
paramValueStr = paramValueStr + ',' + innerValue
paramValueTree = paramValueTree + '-de-' + innerValue
}
})
}
// 获取所有目标联动信息
const targetInfoList = trackInfo[sourceInfo] || []
@ -526,13 +513,7 @@ const data = {
currentFilters.push(condition)
}
if (element.type === 'custom' && element.id === targetViewId) { // 过滤组件处理
if (element.component === 'de-number-range') {
element.options.value = paramValue
} else if (element.component === 'de-select-tree') {
element.options.value = paramValueTree
} else {
element.options.value = paramValueStr
}
element.options.value = paramValue
// 去掉动态时间
if (element.options.manualModify) {
element.options.manualModify = false

12
core/frontend/src/views/panel/linkJumpSet/index.vue
View File

@ -478,17 +478,7 @@ export default {
completeSingle: false // 当匹配只有一项的时候是否自动补全
}
},
widgetSubjectsFilter: {
timeYearWidget: '年份过滤组件',
timeMonthWidget: '年月过滤组件',
timeDateWidget: '日期过滤组件',
textSelectWidget: '文本下拉过滤组件',
textSelectGridWidget: '文本列表过滤组件',
textInputWidget: '文本搜索过滤组件',
textSelectTreeWidget: '下拉树过滤组件',
numberSelectWidget: '数字下拉过滤组件',
numberSelectGridWidget: '数字列表过滤组件',
},
widgetSubjectsFilter: ['textSelectWidget', 'textSelectGridWidget', 'textInputWidget', 'textSelectTreeWidget', 'numberSelectWidget', 'numberSelectGridWidget'],
widgetSubjectsTrans: {
timeYearWidget: '年份过滤组件',
timeMonthWidget: '年月过滤组件',