diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 2173cf19e..74520642f 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -170,6 +170,8 @@ const opensearchTable = ( const _searchCondition = {} // 判断查询条件中,是否存在指向主表的数据 if (searchCondition && searchCondition.length > 0) { + // 转换筛选条件所需 + let filters:any[] = [] searchCondition.forEach((item) => { // 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 if (item.isMainValue) { @@ -181,9 +183,22 @@ const opensearchTable = ( ? row[item.value] : '' } else { - _searchCondition[item.key] = item.value + // 扩展 转换为筛选条件进行查询 + if (item.isSearch) { + filters.push({ + action: item.action, + column: item.key, + value: item.value + }) + } else { + _searchCondition[item.key] = item.value + } } }) + if (filters.length > 0) { + _searchCondition.isSearch = true + _searchCondition.filters = filters + } } const _searchTableTitle = searchTitle const _searchTableAllSchemas = searchAllSchemas