260625_06_ENH: table 간격 조정, body width 제한, 일부 label 수정, 지역 수정가능하게 열기, 지자체 양식 다운로드 버튼 제거
This commit is contained in:
@@ -90,14 +90,14 @@ const monitoringAddOptions: Code[] = [
|
|||||||
codeGroup: "monitoring_add",
|
codeGroup: "monitoring_add",
|
||||||
codeValue: 0,
|
codeValue: 0,
|
||||||
codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd,
|
codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd,
|
||||||
codeLabel: "추가 모니터링 X",
|
codeLabel: "추가 X",
|
||||||
memo: "",
|
memo: "",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
codeGroup: "monitoring_add",
|
codeGroup: "monitoring_add",
|
||||||
codeValue: 1,
|
codeValue: 1,
|
||||||
codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd,
|
codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd,
|
||||||
codeLabel: "추가 모니터링 O",
|
codeLabel: "추가 O",
|
||||||
memo: "",
|
memo: "",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@@ -353,10 +353,13 @@ const PerformancePage = () => {
|
|||||||
cell: ({row}) => row.original.performanceDetail["performanceNo"] ?? "",
|
cell: ({row}) => row.original.performanceDetail["performanceNo"] ?? "",
|
||||||
},
|
},
|
||||||
{accessorKey: "id", header: PERFORMANCE_FIELD_LABELS.id, cell: ({row}) => row.original.id},
|
{accessorKey: "id", header: PERFORMANCE_FIELD_LABELS.id, cell: ({row}) => row.original.id},
|
||||||
{accessorKey: "monitoringAdd", header: PERFORMANCE_FIELD_LABELS.monitoringAdd,
|
...(!isWrittenReviewer ? [
|
||||||
accessorFn: (row) => row.id % 100 !== 1? "추가" : "",
|
{accessorKey: "monitoringAdd", header: PERFORMANCE_FIELD_LABELS.monitoringAdd,
|
||||||
cell: ({row}) => row.original.id % 100 !== 1? "추가" : "",
|
accessorFn: (row) => row.id % 100 !== 1? "추가" : "",
|
||||||
},
|
cell: ({row}) => row.original.id % 100 !== 1? "추가" : "",
|
||||||
|
enableSorting: false
|
||||||
|
},
|
||||||
|
]: []) as DataTableColumn<PerformanceFull>[],
|
||||||
{id: "businessType", header: PERFORMANCE_FIELD_LABELS.businessType, cell: ({row}) => getCodeLabel(codes, "business_type", row.original.businessType)},
|
{id: "businessType", header: PERFORMANCE_FIELD_LABELS.businessType, cell: ({row}) => getCodeLabel(codes, "business_type", row.original.businessType)},
|
||||||
{id: "genre", header: PERFORMANCE_FIELD_LABELS.performanceGenre, cell: ({row}) => getCodeLabel(codes, "genre", row.original.performanceGenre)},
|
{id: "genre", header: PERFORMANCE_FIELD_LABELS.performanceGenre, cell: ({row}) => getCodeLabel(codes, "genre", row.original.performanceGenre)},
|
||||||
{id: "area", header: PERFORMANCE_FIELD_LABELS.performanceArea, cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)},
|
{id: "area", header: PERFORMANCE_FIELD_LABELS.performanceArea, cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)},
|
||||||
@@ -383,7 +386,7 @@ const PerformancePage = () => {
|
|||||||
]: []) as DataTableColumn<PerformanceFull>[],
|
]: []) as DataTableColumn<PerformanceFull>[],
|
||||||
{
|
{
|
||||||
id: "localReview",
|
id: "localReview",
|
||||||
header: "지자체 평가",
|
header: "자체 보고서",
|
||||||
cell: ({row}) => {
|
cell: ({row}) => {
|
||||||
if(row.original.id % 100 !== 1){
|
if(row.original.id % 100 !== 1){
|
||||||
return "-";
|
return "-";
|
||||||
@@ -473,7 +476,7 @@ const PerformancePage = () => {
|
|||||||
{!isWrittenReviewer && (
|
{!isWrittenReviewer && (
|
||||||
<MultiFilterSelect value={filters.monitoringAdd} onChange={(value) => updateFilters((prev) => ({...prev, monitoringAdd: value}))} options={monitoringAddOptions} placeholder={PERFORMANCE_FIELD_LABELS.monitoringAdd} />
|
<MultiFilterSelect value={filters.monitoringAdd} onChange={(value) => updateFilters((prev) => ({...prev, monitoringAdd: value}))} options={monitoringAddOptions} placeholder={PERFORMANCE_FIELD_LABELS.monitoringAdd} />
|
||||||
)}
|
)}
|
||||||
<MultiFilterSelect value={filters.localReviewStatus} onChange={(value) => updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="지자체 평가 상태" />
|
<MultiFilterSelect value={filters.localReviewStatus} onChange={(value) => updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="자체 보고서 상태" />
|
||||||
<MultiFilterSelect value={filters.monitoring1Status} onChange={(value) => updateFilters((prev) => ({...prev, monitoring1Status: value}))} options={monitoringStatusOptions} placeholder="모니터링1 상태" />
|
<MultiFilterSelect value={filters.monitoring1Status} onChange={(value) => updateFilters((prev) => ({...prev, monitoring1Status: value}))} options={monitoringStatusOptions} placeholder="모니터링1 상태" />
|
||||||
<MultiFilterSelect value={filters.monitoring2Status} onChange={(value) => updateFilters((prev) => ({...prev, monitoring2Status: value}))} options={monitoringStatusOptions} placeholder="모니터링2 상태" />
|
<MultiFilterSelect value={filters.monitoring2Status} onChange={(value) => updateFilters((prev) => ({...prev, monitoring2Status: value}))} options={monitoringStatusOptions} placeholder="모니터링2 상태" />
|
||||||
<MultiFilterSelect value={filters.writtenReviewStatus} onChange={(value) => updateFilters((prev) => ({...prev, writtenReviewStatus: value}))} options={writtenReviewStatusOptions} placeholder="서면평가 상태" />
|
<MultiFilterSelect value={filters.writtenReviewStatus} onChange={(value) => updateFilters((prev) => ({...prev, writtenReviewStatus: value}))} options={writtenReviewStatusOptions} placeholder="서면평가 상태" />
|
||||||
|
|||||||
@@ -244,7 +244,7 @@ export function DataTable<TData>({
|
|||||||
onClick={drag.wrapClick(() => handleRowClick(row))}
|
onClick={drag.wrapClick(() => handleRowClick(row))}
|
||||||
className={cn(
|
className={cn(
|
||||||
cellFontClass,
|
cellFontClass,
|
||||||
'[&>td]:py-3 [&>td]:px-3',
|
'[&>td]:py-2 [&>td]:px-2',
|
||||||
selectMode !== 'none' && 'cursor-pointer',
|
selectMode !== 'none' && 'cursor-pointer',
|
||||||
'data-[state=selected]:bg-slate-100 data-[state=selected]:font-semibold',
|
'data-[state=selected]:bg-slate-100 data-[state=selected]:font-semibold',
|
||||||
shouldHighlight && 'bg-emerald-50',
|
shouldHighlight && 'bg-emerald-50',
|
||||||
|
|||||||
@@ -215,7 +215,6 @@ export function MonitoringPerformanceDetailDialog({
|
|||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.businessType}>{getCodeLabel(codes, "business_type", performance.businessType)}</MobileDetailRow>
|
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.businessType}>{getCodeLabel(codes, "business_type", performance.businessType)}</MobileDetailRow>
|
||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceGenre}>{getCodeLabel(codes, "genre", performance.performanceGenre)}</MobileDetailRow>
|
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceGenre}>{getCodeLabel(codes, "genre", performance.performanceGenre)}</MobileDetailRow>
|
||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceArea}>{getCodeLabel(codes, "area", performance.performanceArea)}</MobileDetailRow>
|
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceArea}>{getCodeLabel(codes, "area", performance.performanceArea)}</MobileDetailRow>
|
||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceAreaDetail}>{performance.performanceDetail["performanceAreaDetail"] ?? ""}</MobileDetailRow>
|
|
||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.artistName}>{performance.artistName}</MobileDetailRow>
|
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.artistName}>{performance.artistName}</MobileDetailRow>
|
||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceName}>{performance.performanceName}</MobileDetailRow>
|
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceName}>{performance.performanceName}</MobileDetailRow>
|
||||||
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceStartMonth}>{performance.performanceStartMonth}월</MobileDetailRow>
|
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceStartMonth}>{performance.performanceStartMonth}월</MobileDetailRow>
|
||||||
|
|||||||
@@ -237,7 +237,7 @@ function LocalGovernmentReviewRow({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="space-y-2 border-b p-3">
|
<div className="space-y-2 border-b p-3">
|
||||||
<div className="font-semibold">지자체</div>
|
<div className="font-semibold">자체 보고서</div>
|
||||||
<div className="flex flex-wrap items-center gap-2">
|
<div className="flex flex-wrap items-center gap-2">
|
||||||
<StatusPill variant={display.variant}>{display.label}</StatusPill>
|
<StatusPill variant={display.variant}>{display.label}</StatusPill>
|
||||||
<ReviewFileActions
|
<ReviewFileActions
|
||||||
@@ -485,8 +485,8 @@ export function PerformanceDetailDialog({
|
|||||||
setIsEditing(false);
|
setIsEditing(false);
|
||||||
};
|
};
|
||||||
|
|
||||||
const downloadTemplate = (reviewType: number) => {
|
const downloadTemplate = (reviewType: number, classification: number) => {
|
||||||
downloadFromUrl(`/api/review/template/download/${reviewType}`);
|
downloadFromUrl(`/api/review/template/download/${reviewType}/${classification}`);
|
||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -506,7 +506,11 @@ export function PerformanceDetailDialog({
|
|||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringAdd}>{draft.id % 100 !== 1? "추가" : ""}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.monitoringAdd}>{draft.id % 100 !== 1? "추가" : ""}</DetailRow>
|
||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.businessType}>{getCodeLabel(codes, "business_type", draft.businessType)}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.businessType}>{getCodeLabel(codes, "business_type", draft.businessType)}</DetailRow>
|
||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceGenre}>{getCodeLabel(codes, "genre", draft.performanceGenre)}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceGenre}>{getCodeLabel(codes, "genre", draft.performanceGenre)}</DetailRow>
|
||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceArea}>{getCodeLabel(codes, "area", draft.performanceArea)}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceArea}>
|
||||||
|
{isEditing ? (
|
||||||
|
<FilterSelect value={String(draft.performanceArea ?? "")} onChange={(value) => updateDraft("performanceArea", Number(value))} options={codes.area ?? []} placeholder={PERFORMANCE_FIELD_LABELS.performanceArea} />
|
||||||
|
) : getCodeLabel(codes, "area", draft.performanceArea)}
|
||||||
|
</DetailRow>
|
||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceAreaDetail}>{isEditing ? <Input value={draft.performanceDetail["performanceAreaDetail"] ?? ""} onChange={(event) => updateDetail("performanceAreaDetail", event.target.value)} /> : draft.performanceDetail["performanceAreaDetail"] ?? ""}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceAreaDetail}>{isEditing ? <Input value={draft.performanceDetail["performanceAreaDetail"] ?? ""} onChange={(event) => updateDetail("performanceAreaDetail", event.target.value)} /> : draft.performanceDetail["performanceAreaDetail"] ?? ""}</DetailRow>
|
||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.artistName}>{draft.artistName}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.artistName}>{draft.artistName}</DetailRow>
|
||||||
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceName}>{isEditing ? <Input value={draft.performanceName} onChange={(event) => updateDraft("performanceName", event.target.value)} /> : draft.performanceName}</DetailRow>
|
<DetailRow label={PERFORMANCE_FIELD_LABELS.performanceName}>{isEditing ? <Input value={draft.performanceName} onChange={(event) => updateDraft("performanceName", event.target.value)} /> : draft.performanceName}</DetailRow>
|
||||||
@@ -563,14 +567,10 @@ export function PerformanceDetailDialog({
|
|||||||
<div className="flex flex-wrap items-center justify-between gap-2 border-b bg-muted px-3 py-2">
|
<div className="flex flex-wrap items-center justify-between gap-2 border-b bg-muted px-3 py-2">
|
||||||
<div className="font-semibold">평가 및 모니터링 현황</div>
|
<div className="font-semibold">평가 및 모니터링 현황</div>
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
<Button type="button" size="sm" variant="outline" onClick={() => downloadTemplate(1)}>
|
<Button type="button" size="sm" variant="outline" onClick={() => downloadTemplate(1, Number(String(performance?.id ?? 0).charAt(0)))}>
|
||||||
<Download className="h-4 w-4" />
|
<Download className="h-4 w-4" />
|
||||||
모니터링 양식
|
모니터링 양식
|
||||||
</Button>
|
</Button>
|
||||||
<Button type="button" size="sm" variant="outline" onClick={() => downloadTemplate(3)}>
|
|
||||||
<Download className="h-4 w-4" />
|
|
||||||
지자체 양식
|
|
||||||
</Button>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<LocalGovernmentReviewRow performance={performance ?? draft} codes={codes} />
|
<LocalGovernmentReviewRow performance={performance ?? draft} codes={codes} />
|
||||||
|
|||||||
@@ -48,9 +48,9 @@ const MainLayout = ({ children }: MainLayoutProps) => {
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
{/* 본문 */}
|
{/* 본문 */}
|
||||||
<div className="flex flex-1 min-h-0">
|
<div className="flex min-h-0 min-w-0 flex-1">
|
||||||
{/* 메인 콘텐츠만 가변 높이 적용 */}
|
{/* 메인 콘텐츠만 가변 높이 적용 */}
|
||||||
<main className="flex-1 p-4">
|
<main className="min-w-0 max-w-full flex-1 overflow-x-hidden p-4">
|
||||||
{children}
|
{children}
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ export const USER_FIELD_LABELS = {
|
|||||||
export const PERFORMANCE_FIELD_LABELS = {
|
export const PERFORMANCE_FIELD_LABELS = {
|
||||||
no: "No.",
|
no: "No.",
|
||||||
id: "연번",
|
id: "연번",
|
||||||
monitoringAdd: "추가 모니터링",
|
monitoringAdd: "분류",
|
||||||
businessType: "사업유형",
|
businessType: "사업유형",
|
||||||
performanceGenre: "분야(장르)",
|
performanceGenre: "분야(장르)",
|
||||||
performanceArea: "지역",
|
performanceArea: "지역",
|
||||||
|
|||||||
Reference in New Issue
Block a user