밑꺽쇠 수정했음!
This commit is contained in:
@@ -16,6 +16,7 @@ import {
|
||||
PivotAreaType,
|
||||
AggregationType,
|
||||
FieldDataType,
|
||||
DateGroupInterval,
|
||||
} from "./types";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Input } from "@/components/ui/input";
|
||||
@@ -202,6 +203,28 @@ const AreaDropZone: React.FC<AreaDropZoneProps> = ({
|
||||
</Select>
|
||||
)}
|
||||
|
||||
{/* 행/열 영역에서 날짜 타입일 때 그룹화 옵션 */}
|
||||
{(area === "row" || area === "column") && field.dataType === "date" && (
|
||||
<Select
|
||||
value={field.groupInterval || "__none__"}
|
||||
onValueChange={(v) => onUpdateField(idx, {
|
||||
groupInterval: v === "__none__" ? undefined : v as DateGroupInterval
|
||||
})}
|
||||
>
|
||||
<SelectTrigger className="h-6 w-16 text-xs">
|
||||
<SelectValue placeholder="그룹" />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
<SelectItem value="__none__">없음</SelectItem>
|
||||
<SelectItem value="year">년</SelectItem>
|
||||
<SelectItem value="quarter">분기</SelectItem>
|
||||
<SelectItem value="month">월</SelectItem>
|
||||
<SelectItem value="week">주</SelectItem>
|
||||
<SelectItem value="day">일</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
)}
|
||||
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
@@ -295,7 +318,8 @@ export const PivotGridConfigPanel: React.FC<PivotGridConfigPanelProps> = ({
|
||||
const mappedColumns: ColumnInfo[] = columnList.map((c: any) => ({
|
||||
column_name: c.columnName || c.column_name,
|
||||
data_type: c.dataType || c.data_type || "text",
|
||||
column_comment: c.columnLabel || c.column_label || c.columnName || c.column_name,
|
||||
// 라벨 우선순위: displayName > comment > columnLabel > columnName
|
||||
column_comment: c.displayName || c.comment || c.columnLabel || c.column_label || c.columnName || c.column_name,
|
||||
}));
|
||||
setColumns(mappedColumns);
|
||||
} catch (error) {
|
||||
|
||||
Reference in New Issue
Block a user