|
|
@@ -7,6 +7,9 @@ export interface IHomeCommonCategoryCategoryDynamicDataMergeTypeGetColumns {
|
|
|
params: {
|
|
|
modelId: number,
|
|
|
mainBodyColumnId: number,
|
|
|
+ overrideItems: ({
|
|
|
+ id: number,
|
|
|
+ } & IHomeCommonCategoryListTabNestCategoryItemDefine)[],
|
|
|
},
|
|
|
}
|
|
|
export interface IHomeCommonCategoryCategoryDynamicDataMergeTypeGetColumn {
|
|
|
@@ -37,19 +40,23 @@ export async function doLoadDynamicCategoryDataMergeTypeGetColumns(
|
|
|
data.params.modelId,
|
|
|
data.params.mainBodyColumnId
|
|
|
)
|
|
|
- const newArray = result.map((item) => ({
|
|
|
- ...category,
|
|
|
- params: undefined,
|
|
|
- text: item.name as string,
|
|
|
- type,
|
|
|
- data: {
|
|
|
- type: 'commonContent',
|
|
|
- params: {
|
|
|
- modelId: item.modelId,
|
|
|
- mainBodyColumnId: item.id,
|
|
|
- },
|
|
|
- } as IHomeCommonCategoryDynamicDataCommonContent,
|
|
|
- }));
|
|
|
+ const newArray = result.map((item) => {
|
|
|
+ const overrideItem = data.params.overrideItems.find((i) => i.id === item.id);
|
|
|
+ return {
|
|
|
+ ...category,
|
|
|
+ params: undefined,
|
|
|
+ text: item.name as string,
|
|
|
+ type,
|
|
|
+ ...overrideItem,
|
|
|
+ data: {
|
|
|
+ type: 'commonContent',
|
|
|
+ params: {
|
|
|
+ modelId: item.modelId,
|
|
|
+ mainBodyColumnId: item.id,
|
|
|
+ },
|
|
|
+ } as IHomeCommonCategoryDynamicDataCommonContent,
|
|
|
+ }
|
|
|
+ });
|
|
|
categorys.splice(i, 1, ...newArray);
|
|
|
break;
|
|
|
}
|