TypeScript 오류 수정 및 Merge conflict 해결
- dataflowControlService.ts: condition.field non-null assertion 추가 - batchExternalDbService.ts: connection 속성들 non-null assertion 추가, error 타입 unknown으로 변경 - multiConnectionQueryService.ts: connection, schemaResult.data non-null assertion 추가 - dataflowExecutionController.ts: 도달할 수 없는 코드 제거 - TableListComponent.tsx, SingleTableWithSticky.tsx: merge conflict 마커 제거 - 모든 TypeScript 컴파일 오류 해결 완료
This commit is contained in:
@@ -88,11 +88,7 @@ export const SingleTableWithSticky: React.FC<SingleTableWithStickyProps> = ({
|
||||
? "h-12 border-0 px-6 py-4 text-center align-middle"
|
||||
: "h-12 cursor-pointer border-0 px-6 py-4 text-left align-middle font-semibold whitespace-nowrap text-gray-700 select-none transition-all duration-200 hover:text-gray-900",
|
||||
`text-${column.align}`,
|
||||
<<<<<<< HEAD
|
||||
column.sortable && "hover:bg-orange-50 hover:text-orange-700",
|
||||
=======
|
||||
column.sortable && "hover:bg-orange-200/70",
|
||||
>>>>>>> 8c19d57ced949bde4c9ffcce6544791d3e4b051f
|
||||
// 고정 컬럼 스타일
|
||||
column.fixed === "left" && "sticky z-10 border-r border-gray-200/40 bg-gradient-to-r from-slate-50/90 to-gray-50/70 shadow-sm",
|
||||
column.fixed === "right" && "sticky z-10 border-l border-gray-200/40 bg-gradient-to-r from-slate-50/90 to-gray-50/70 shadow-sm",
|
||||
|
||||
@@ -1329,11 +1329,7 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
|
||||
{/* 헤더 */}
|
||||
{tableConfig.showHeader && (
|
||||
<div
|
||||
<<<<<<< HEAD
|
||||
className="flex items-center justify-between border-b border-gray-200 bg-gray-100 px-6 py-4"
|
||||
=======
|
||||
className="flex items-center justify-between border-b border-gray-200/40 bg-gradient-to-r from-slate-50/80 to-gray-50/60 px-6 py-5"
|
||||
>>>>>>> 8c19d57ced949bde4c9ffcce6544791d3e4b051f
|
||||
style={{
|
||||
width: "100%",
|
||||
maxWidth: "100%",
|
||||
|
||||
Reference in New Issue
Block a user