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

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-03-07 03:36:55 +00:00
commit af4959cee7
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts
View File

@ -424,16 +424,34 @@ export const querySchema: ISchema = {
order: {
type: 'string',
'x-decorator': 'FormItem',
'x-component': 'Radio.Group',
'x-component': 'Select',
'x-component-props': {
defaultValue: 'ASC',
optionType: 'button',
style: {
width: '128px',
},
},
enum: ['ASC', 'DESC'],
},
nulls: {
type: 'string',
'x-decorator': 'FormItem',
'x-component': 'Select',
'x-component-props': {
defaultValue: 'default',
},
enum: [
{
label: lang('Default'),
value: 'default',
},
{
label: lang('NULLS first'),
value: 'first',
},
{
label: lang('NULLS last'),
value: 'last',
},
],
},
},
{
'x-reactions': '{{ useOrderReaction }}',

9
packages/plugins/@nocobase/plugin-data-visualization/src/server/query-parser/query-parser.ts
View File

@ -84,7 +84,14 @@ export class QueryParser {
orders.forEach((item: OrderProps) => {
const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field as string);
order.push([name, item.order || 'ASC']);
let sort = item.order || 'ASC';
if (item.nulls === 'first') {
sort += ' NULLS FIRST';
}
if (item.nulls === 'last') {
sort += ' NULLS LAST';
}
order.push([name, sort]);
});
return order;
}

1
packages/plugins/@nocobase/plugin-data-visualization/src/server/types.ts
View File

@ -27,6 +27,7 @@ export type OrderProps = {
field: string | string[];
alias?: string;
order?: 'asc' | 'desc';
nulls?: 'default' | 'first' | 'last';
};
export type QueryParams = Partial<{