ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(plugin-export): filter non-existent fields

Browse Source
This commit is contained in:
chenos 2022-09-15 09:27:28 +08:00
parent 1a9cd78eb8
commit 12c3915a57
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/plugins/export/src/server/actions/export-xlsx.ts
View File

@ -10,10 +10,10 @@ export async function exportXlsx(ctx: Context, next: Next) {
if (typeof columns === 'string') { if (typeof columns === 'string') {
columns = JSON.parse(columns); columns = JSON.parse(columns);
} }
const appends = columns2Appends(columns, ctx);
columns = columns?.filter((col) => col?.dataIndex?.length > 0);
const repository = ctx.db.getRepository<any>(resourceName, resourceOf) as Repository; const repository = ctx.db.getRepository<any>(resourceName, resourceOf) as Repository;
const collection = repository.collection; const collection = repository.collection;
columns = columns?.filter((col) => collection.hasField(col.dataIndex[0]) && col?.dataIndex?.length > 0);
const appends = columns2Appends(columns, ctx);
const data = await repository.find({ const data = await repository.find({
filter, filter,
fields, fields,

2
packages/plugins/export/src/server/utils/columns2Appends.ts
View File

@ -6,7 +6,7 @@ export function columns2Appends(columns, ctx) {
const appendColumns = []; const appendColumns = [];
for (let i = 0, iLen = column.dataIndex.length; i < iLen; i++) { for (let i = 0, iLen = column.dataIndex.length; i < iLen; i++) {
let field = collection.getField(column.dataIndex[i]); let field = collection.getField(column.dataIndex[i]);
if (field.target) { if (field?.target) {
appendColumns.push(column.dataIndex[i]); appendColumns.push(column.dataIndex[i]);
collection = ctx.db.getCollection(field.target); collection = ctx.db.getCollection(field.target);
} }