topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-04-19 13:04:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge f3ffcb94f1 into d2a43a99c8

Browse Source
This commit is contained in:
beat4ocean
2025-03-23 07:51:23 +00:00
committed by GitHub
parent d2a43a99c8 f3ffcb94f1
commit 4b51dc6cca
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/packages/chat-sdk/src/components/ChatItem/index.tsx
View File

@@ -420,7 +420,7 @@ const ChatItem: React.FC<Props> = ({
if (!!queryResults) {
const exportData = queryResults.map(item => {
return Object.keys(item).reduce((result, key) => {
const columnName = queryColumns?.find(column => column.nameEn === key)?.name || key;
const columnName = queryColumns?.find(column => column.name === key)?.name || key;
result[columnName] = item[key];
return result;
}, {});

17
webapp/packages/chat-sdk/src/components/ChatMsg/MetricTrend/index.tsx
View File

@@ -48,12 +48,13 @@ const MetricTrend: React.FC<Props> = ({
const { queryColumns, queryResults, aggregateInfo, entityInfo, chatContext } = data;
const [chartType, setChartType] = useState('line');
const dateField: any = queryColumns?.find(
const dateField = queryColumns?.find(
(column: any) => column.showType === 'DATE' || column.type === 'DATE'
);
const dateColumnName = dateField?.bizName || '';
const categoryColumnName =
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
let categoryColumnName =
queryColumns?.find((column: any) => column.showType === 'CATEGORY')?.bizName || '';
categoryColumnName = categoryColumnName === dateColumnName ? '' : categoryColumnName;
const metricFields = queryColumns?.filter((column: any) => column.showType === 'NUMBER');
const currentMetricField = queryColumns?.find((column: any) => column.showType === 'NUMBER');
@@ -80,11 +81,11 @@ const MetricTrend: React.FC<Props> = ({
<MetricInfo aggregateInfo={aggregateInfo} currentMetricField={currentMetricField} />
)}
<div className={`${prefixCls}-select-options`}>
<DateOptions
chatContext={chatContext}
currentDateOption={currentDateOption}
onSelectDateOption={onSelectDateOption}
/>
{/*<DateOptions*/}
{/* chatContext={chatContext}*/}
{/* currentDateOption={currentDateOption}*/}
{/* onSelectDateOption={onSelectDateOption}*/}
{/*/>*/}
<div>
<Select
defaultValue="line"

42
webapp/packages/supersonic-fe/src/pages/SemanticModel/Datasource/components/ModelFieldForm.tsx
View File

@@ -8,7 +8,7 @@ import { ISemantic } from '../../data';
import {
AGG_OPTIONS,
DATE_FORMATTER,
DATE_OPTIONS,
// DATE_OPTIONS,
DIM_OPTIONS,
EnumDataSourceType,
EnumModelDataType,
@@ -275,7 +275,7 @@ const ModelFieldForm: React.FC<Props> = ({
}
}
if ([EnumDataSourceType.TIME, EnumDataSourceType.PARTITION_TIME].includes(type)) {
const { dateFormat, timeGranularity } = record;
const { dateFormat } = record;
const dateFormatterOptions =
type === EnumDataSourceType.PARTITION_TIME ? PARTITION_TIME_FORMATTER : DATE_FORMATTER;
@@ -302,25 +302,25 @@ const ModelFieldForm: React.FC<Props> = ({
<ExclamationCircleOutlined />
</Tooltip>
</Space>
<Space>
<span>时间粒度:</span>
<Select
placeholder="时间粒度"
value={timeGranularity === '' ? undefined : timeGranularity}
onChange={(value) => {
handleFieldChange(record, 'timeGranularity', value);
}}
defaultValue={timeGranularity === '' ? undefined : DATE_OPTIONS[0]}
style={{ minWidth: 180 }}
allowClear
>
{DATE_OPTIONS.map((item) => (
<Option key={item} value={item}>
{item}
</Option>
))}
</Select>
</Space>
{/*<Space>*/}
{/* <span>时间粒度:</span>*/}
{/* <Select*/}
{/* placeholder="时间粒度"*/}
{/* value={timeGranularity === '' ? undefined : timeGranularity}*/}
{/* onChange={(value) => {*/}
{/* handleFieldChange(record, 'timeGranularity', value);*/}
{/* }}*/}
{/* defaultValue={timeGranularity === '' ? undefined : DATE_OPTIONS[0]}*/}
{/* style={{ minWidth: 180 }}*/}
{/* allowClear*/}
{/* >*/}
{/* {DATE_OPTIONS.map((item) => (*/}
{/* <Option key={item} value={item}>*/}
{/* {item}*/}
{/* </Option>*/}
{/* ))}*/}
{/* </Select>*/}
{/*</Space>*/}
</Space>
);
}