diff --git a/backend/template.yaml b/backend/template.yaml index e7bad6bc..05618089 100644 --- a/backend/template.yaml +++ b/backend/template.yaml @@ -12,10 +12,14 @@ template: - SQL查询中不能使用星号(*),必须明确指定字段名. - SQL查询的字段名不要自动翻译,别名必须为英文。 - 计算占比,百分比类型字段,保留两位小数,以%结尾。 - - 生成SQL时,必须避免关键字冲突: + - 生成SQL时,必须避免关键字冲突。 - 如数据库引擎是 PostgreSQL、Oracle,则在schema、表名、字段名、别名外层加双引号; - 如数据库引擎是 MySQL,则在表名、字段名、别名外层加反引号; - 如数据库引擎是 Microsoft SQL Server,则在schema、表名、字段名、别名外层加方括号。 + - 以PostgreSQL为例,查询Schema为TEST表TABLE下所有数据,则生成的SQL为: + SELECT * FROM "TEST"."TABLE" + - 注意在表名外双引号的位置,千万不要生成为: + SELECT * FROM "TEST.TABLE" - 如果生成SQL的字段内有时间格式的字段(重要): - 若提问中没有指定查询顺序,则默认按时间升序排序 - 若提问是时间,且没有指定具体格式,则格式化为yyyy-MM-dd HH:mm:ss的格式 diff --git a/frontend/src/views/chat/ChatRow.vue b/frontend/src/views/chat/ChatRow.vue index 400e50de..6e5c8147 100644 --- a/frontend/src/views/chat/ChatRow.vue +++ b/frontend/src/views/chat/ChatRow.vue @@ -22,7 +22,7 @@ withDefaults( -
+
diff --git a/frontend/src/views/chat/chat-block/UserChat.vue b/frontend/src/views/chat/chat-block/UserChat.vue index 39cc80a2..13422d32 100644 --- a/frontend/src/views/chat/chat-block/UserChat.vue +++ b/frontend/src/views/chat/chat-block/UserChat.vue @@ -23,7 +23,7 @@ function clickPredict() { {{ t('qa.data_predict') }} - {{ message?.content }} + {{ message?.content }} diff --git a/frontend/src/views/chat/component/charts/Bar.ts b/frontend/src/views/chat/component/charts/Bar.ts index f54fece9..d78c8e38 100644 --- a/frontend/src/views/chat/component/charts/Bar.ts +++ b/frontend/src/views/chat/component/charts/Bar.ts @@ -113,6 +113,12 @@ export class Bar extends BaseG2Chart { } return `${value}${_data.isPercent ? '%' : ''}` }, + position: (data: any) => { + if (data[y[0].value] < 0) { + return 'left' + } + return 'right' + }, transform: [ { type: 'contrastReverse' }, { type: 'exceedAdjust' }, diff --git a/frontend/src/views/chat/component/charts/Column.ts b/frontend/src/views/chat/component/charts/Column.ts index ad437abb..0159f81d 100644 --- a/frontend/src/views/chat/component/charts/Column.ts +++ b/frontend/src/views/chat/component/charts/Column.ts @@ -102,7 +102,12 @@ export class Column extends BaseG2Chart { } return `${value}${_data.isPercent ? '%' : ''}` }, - position: 'top', + position: (data: any) => { + if (data[y[0].value] < 0) { + return 'bottom' + } + return 'top' + }, transform: [ { type: 'contrastReverse' }, { type: 'exceedAdjust' },