提交 adcafb3f authored 作者: 钟是志's avatar 钟是志

groupList 接口增加 appId 参数

上级 b9a7112b
...@@ -287,7 +287,7 @@ export async function destructionGetDetail(response) { ...@@ -287,7 +287,7 @@ export async function destructionGetDetail(response) {
addFields: await translateAddFields(fileds, tableInfo), addFields: await translateAddFields(fileds, tableInfo),
tableInfo, tableInfo,
allConfigSetInfo: response, allConfigSetInfo: response,
searchCondition: await getSearchCondition(basicPatternModel?.dataObjModels[0]?.id), searchCondition: await getSearchCondition(basicPatternModel?.dataObjModels[0]?.id, response.id),
}; };
} }
......
...@@ -65,9 +65,9 @@ const getHead = (dataObjId) => { ...@@ -65,9 +65,9 @@ const getHead = (dataObjId) => {
return apiRequest('/DataColumnApi/getHeaderList', { dataObjId }); return apiRequest('/DataColumnApi/getHeaderList', { dataObjId });
}; };
const getGroupList = (columnId) => { const getGroupList = ({columnId, appId = undefined}) => {
// 获取表头 workId // 获取表头 workId
return apiRequest('/DataColumnApi/getGroupList', { columnId }); return apiRequest('/DataColumnApi/getGroupList', { columnId, appId });
}; };
/** /**
......
...@@ -165,7 +165,7 @@ const getOpts = async (item) => { ...@@ -165,7 +165,7 @@ const getOpts = async (item) => {
return options; return options;
}; };
const getSearchCondition = async (id) => { const getSearchCondition = async (id, appId = undefined) => {
const searchHeaders = await service.getHead(id).then((res) => { const searchHeaders = await service.getHead(id).then((res) => {
if (res && res.length) { if (res && res.length) {
return res.filter((x) => { return res.filter((x) => {
...@@ -176,7 +176,10 @@ const getSearchCondition = async (id) => { ...@@ -176,7 +176,10 @@ const getSearchCondition = async (id) => {
for (let item of searchHeaders) { for (let item of searchHeaders) {
if (item.isGroupQuery && item.id) { if (item.isGroupQuery && item.id) {
// 获取下拉搜索条件的枚举项 // 获取下拉搜索条件的枚举项
item.options = await service.getGroupList(item.id).then((res) => { item.options = await service.getGroupList({
columnId: item.id,
appId,
}).then((res) => {
if (res && Array.isArray(res)) { if (res && Array.isArray(res)) {
return res return res
.filter((x) => { .filter((x) => {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论