Merge branch 'iipbs/dm/dev' of https://www.onasys.co.kr:3000/ONAANDALL/frontend into iipbs/dm/dev

2026-06-22 17:55:20 +09:00
parent ea274f8f7d 7ac53e56d7
commit 013c07ef59
8 changed files with 65 additions and 10 deletions
@@ -226,7 +226,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
        <LoadingOverlay isLoading={isLoadingPlanFclty} />
        <div className="grid grid-cols-12 gap-1">
          <div className="col-span-5">
-            <Table variant="secondary">
+            <Table variant="default">
              <TableHeader>
                {upChangeRePlanFclty}
              </TableHeader>
@@ -239,7 +239,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
                      :((index === 6 || index === 7 || index === 8) && (head.id === 'now' || head.id === 'stepOne' || head.id === 'stepThree' || head.id === 'stepFour'))?
                      null
                      :((index ===  5) && (head.id === 'provisionalApproval' || head.id === 'stepTwo'))?
-                      <TableCell colSpan={3} className="text-center border border-[var(--border)] bg-[rgb(234,243,251)] text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
+                      <TableCell colSpan={3} className="text-center border border-[var(--border)] bg-[rgb(141,141,148)] !text-[rgb(255,255,255)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
                      :((index ===  5) && (head.id === 'now' || head.id === 'stepOne' || head.id === 'stepThree'|| head.id === 'stepFour'))?
                      null
                      :(index < 5 || index > 5)&& (index!= 4) && (head.id ==='provisionalApproval'||head.id ==='now'||head.id ==='stepOne'||head.id ==='stepTwo'||head.id ==='stepThree'||head.id ==='stepFour')
@@ -250,7 +250,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
                      ?null
                      :(head.id === 'item' && index != 5)?
                      <TableCell className="text-center text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
-                      :<TableCell className="text-center border border-[var(--border)] bg-[rgb(234,243,251)] text-[rgb(100,119,132)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
+                      :<TableCell className="text-center border border-[var(--border)] bg-[rgb(141,141,148)] !text-[rgb(255,255,255)]" style={{ whiteSpace: 'pre-line' }} key={head.id+index}>{el[head.id]}</TableCell>
                    ))}
                  </TableRow>
                ))}
@@ -260,7 +260,7 @@ export default function ProcessFacilitySearch({searchYear = '', fcltyList = []}:
          <div className="col-span-7 h-[600px] overflow-x-auto">
            <div className="w-[200%]">
              <LoadingOverlay isLoading={isLoadingOperationStatus} />
-              <Table variant="secondary">
+              <Table variant="default">
                <TableHeader>
                  {upChangeHeadListOperationStatus}
                </TableHeader>
@@ -1,5 +1,5 @@
 /**
- * 대시보드 - 표로보기 상단구역 페에지
+ * 대시보드 - 표로보기 상단구역 페이지
 * 
 * - 대시보드 - 표로보기의 3개의 탭 상단에 조회년도, 행정정보, 시설명의 구역을 컴포넌트
 */
@@ -15,12 +15,12 @@
  }

  [data-theme="red"] {
-    .card-border {
+    /* .card-border {
      @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)];
    }
    .card-header {
      @apply border-b-[#3f4042];
-    }
+    } */
  }

  input[type="file"] {
@@ -15,6 +15,52 @@
  }

  [data-theme="black"] {
+    .card {
+        color: #fff;
+        background-color: #0a0a0a !important;
+    }
+    form {
+        color: rgb(255 255 255);
+    }
+    label {
+        color: rgb(241, 241, 241);
+    }
+    input {
+        height: 3.2rem;
+        background-color: #1a1a1a;
+        border: 1px solid #262626;
+        border-radius: 4px;
+    }
+    input.text-gray-600 {
+        color: #f1f1f1;
+    }
+    button {
+        color: #171717;
+    }
+    button[role="combobox"] {
+        color: #f1f1f1;
+        background-color: rgb(26, 26, 26);
+    }
+    div [role='tablist'] {
+        border: unset;
+        gap: 4px;
+    }
+    .tabs-trigger[data-state="inactive"] {
+        color: #a4b7bf;
+        background: #55595d;
+    }
+    .tabs-trigger[data-state="inactive"]:hover {
+        color: #6bbaff;
+        background: #4c4f52;
+    }
+    .card-border {
+        box-shadow: 0 0 10px -1px #0000000f;
+        border: 1px solid #393939;
+    }
+    a[aria-current="page"] {
+        background-color: rgb(32, 148, 250);
+        color: #000;
+    }
    .card-border {
      @apply border-[#3f4042] bg-[rgba(255,255,255,0.065)];
    }
@@ -77,6 +123,13 @@
    .gis-layer-toggle:hover {
      background: #1a1c20;
    }
+
+    .table-ui.secondary th {
+        background-color : rgb(98, 104, 109) !important;
+    }
+    .table-ui.secondary tr {
+        background-color : rgb(84, 85, 86) !important;
+    }
  }

  input[type="file"] {
@@ -30,7 +30,7 @@ const UITab = React.forwardRef<
          <TabsTrigger 
            key={tab.value}
            value={tab.value}
-            className="py-2 px-4 text-sm font-medium border-b-2 focus:outline-none data-[state=active]:border-blue-500 data-[state=active]:text-blue-600 data-[state=inactive]:border-transparent data-[state=inactive]:text-gray-500 hover:text-gray-700 hover:border-gray-300"
+            className="py-2 px-4 text-sm font-medium border-b-2 focus:outline-none data-[state=active]:border-primary data-[state=active]:text-blue-600 data-[state=inactive]:border-transparent data-[state=inactive]:text-gray-500 hover:text-gray-700 hover:border-gray-300"
          >
            {tab.label}
          </TabsTrigger>
@@ -29,7 +29,7 @@ const HeadMakeColSpan = ({ upHeadList }: { upHeadList: TableUpperProps[] }) => {
              colSpan={head.colSpan || 1} 
              rowSpan={head.rowSpan || 1} 
              style={{ whiteSpace: 'pre-line' }} 
-              className="bg-gray-50"
+              className=""
            >
              {head.title}
            </TableHead>  
@@ -152,7 +152,7 @@ export function UiTable<T extends object = Record<string, unknown>>({
        <></>
      )}
      <div className={`card !p-0r !m-[1.2rem] ${className}`}>
-        <Table variant="secondary" className={widthFixed ? "table-fixed" : ""}>
+        <Table variant="default" className={widthFixed ? "table-fixed" : ""}>
          {widthFixed ?
            <colgroup>
              {leafCols.map(col => (
@@ -22,4 +22,6 @@
  .tabs[data-variant="outline"] .tabs-trigger {
    @apply relative rounded-none rounded-t-sm border-border bg-background text-muted-foreground after:absolute after:bottom-0 after:left-0 after:h-[0.1rem] after:w-full after:bg-border after:content-[''] data-[state=active]:border data-[state=active]:border-b-0 data-[state=active]:border-border data-[state=active]:text-foreground data-[state=active]:after:bg-transparent;
  }
+
+
 }