fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-06 14:09:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
GitHub Actions Bot 2024-09-06 01:36:43 +00:00
commit c6e00e0404
2 changed files with 69 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/utils.test.ts
View File

@ -10,7 +10,8 @@
import { processData } from '../utils';
describe('utils', () => {
it('processFields', () => {
describe('process data', () => {
it('should process select field', () => {
expect(
processData(
[
@ -41,4 +42,40 @@ describe('utils', () => {
),
).toEqual([{ tag: 'Yes' }]);
});
it('should not process when aggregating', () => {
expect(
processData(
[
{
name: 'tag',
type: 'bigInt',
interface: 'select',
uiSchema: {
type: 'string',
enum: [
{
value: '1',
label: 'Yes',
},
{
value: '2',
label: 'No',
},
],
},
label: 'Tag',
value: 'tag',
key: 'tag',
query: {
field: 'tag',
aggregation: 'count',
},
},
],
[{ tag: 1 }],
{},
),
).toEqual([{ tag: 1 }]);
});
});
});

5
packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts
View File

@ -94,6 +94,7 @@ export const getSelectedFields = (fields: FieldOption[], query: QueryProps) => {
key: selectedField.alias || fieldProps?.key,
label: selectedField.alias || fieldProps?.label,
value: selectedField.alias || fieldProps?.value,
query: selectedField,
};
});
};
@ -105,7 +106,7 @@ export const getSelectedFields = (fields: FieldOption[], query: QueryProps) => {
return selectedFields;
};
export const processData = (selectedFields: FieldOption[], data: any[], scope: any) => {
export const processData = (selectedFields: (FieldOption & { query?: any })[], data: any[], scope: any) => {
const parseEnum = (field: FieldOption, value: any) => {
const options = field.uiSchema?.enum as { value: string; label: string }[];
if (!options || !Array.isArray(options)) {
@ -120,7 +121,7 @@ export const processData = (selectedFields: FieldOption[], data: any[], scope: a
return data.map((record) => {
const processed = {};
Object.entries(record).forEach(([key, value]) => {
const field = selectedFields.find((field) => field.value === key);
const field = selectedFields.find((field) => field.value === key && !field?.query?.aggregation);
if (!field) {
processed[key] = value;
return;