diff --git a/packages/common/business_components/src/ui/chart/LineBarChart.tsx b/packages/common/business_components/src/ui/chart/LineBarChart.tsx
index f26cb976c..271629e6a 100644
--- a/packages/common/business_components/src/ui/chart/LineBarChart.tsx
+++ b/packages/common/business_components/src/ui/chart/LineBarChart.tsx
@@ -210,8 +210,8 @@ export default function LineBarchart({
>
{setXAxisYearTick?
- value.slice(0,7)} fontSize="8px" fontWeight="bold"/> :
-
+ value.slice(0,7)} className="text-[12px] font-bold" /> :
+
}
{/* 왼쪽 Y축: lineVal */}
{yFieldText && value.slice(0,7)}
/> :
}
diff --git a/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx b/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx
index a1201d23a..40f28e867 100644
--- a/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx
+++ b/packages/common/business_components/src/ui/map/searchBar/searchBar.tsx
@@ -166,7 +166,10 @@ export const SearchBar = ({
let list: SelectDataType[] = [];
if (type === "tb_il_swage_prcs_fclt") {
- const cqlFilter = `ctpv_nm='${sidoNm}' and sgg_nm='${sggNm}' and swtrmt_fclt_nm like '%${fcltyNm}%'`;
+ // 하수처리시설
+ let cqlFilter = `swtrmt_fclt_nm like '%${fcltyNm}%'`;
+ if (sggNm !== "시군구" && sggNm) cqlFilter = `sgg_nm='${sggNm}' and ` + cqlFilter;
+ if (sidoNm !== "시도" && sidoNm) cqlFilter = `ctpv_nm='${sidoNm}' and ` + cqlFilter;
url += encodeURIComponent(cqlFilter);
const res = await fetch(url);
const json = await res.json();
diff --git a/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx b/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx
index c0ec33233..b3d3fdc40 100644
--- a/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx
+++ b/packages/common/business_components/src/ui/table/HeadMakeColSpan.tsx
@@ -8,7 +8,8 @@ interface TableUpperProps {
row? : number;
rowSpan?: number;
colSpan?: number;
- visible?:boolean;
+ visible?:boolean;
+ widthPercent?: number;
}
const HeadMakeColSpan = ({ upHeadList }: { upHeadList: TableUpperProps[] }) => {
@@ -52,7 +53,7 @@ const HeadMakeColSpan = ({ upHeadList }: { upHeadList: TableUpperProps[] }) => {
colSpan={head.colSpan || 1}
rowSpan={head.rowSpan || 1}
style={{ whiteSpace: 'pre-line' }}
- className="bg-gray-50"
+ className="bg-gray-50"
>
{head.title}
diff --git a/packages/common/business_components/src/ui/table/index.tsx b/packages/common/business_components/src/ui/table/index.tsx
index 6d5b24c70..dc763d00b 100644
--- a/packages/common/business_components/src/ui/table/index.tsx
+++ b/packages/common/business_components/src/ui/table/index.tsx
@@ -32,6 +32,7 @@ type UiTableProps = {
index?: number;
curPage?: number;
headButton?: React.ReactNode | undefined;
+ widthFixed?: boolean;
};
type UiHeadProps = {
@@ -39,6 +40,9 @@ type UiHeadProps = {
title: string;
align?: string;
visible?: boolean;
+ row?: number;
+ widthPercent?: number;
+ rowSpan?: number;
};
export function UiTable({
@@ -57,6 +61,7 @@ export function UiTable({
index = -1,
curPage = 1,
headButton = undefined,
+ widthFixed = false
}: UiTableProps) {
const [cur, setCur] = useState(curPage);
const [idx, setIdx] = useState(index);
@@ -104,6 +109,15 @@ export function UiTable({
}
};
+ const getLeafCols = (list: UiHeadProps[]) => {
+ const maxRow = list?.reduce((max, head) => Math.max(max, head.row || 0), 0);
+ return list
+ .filter(h => h.visible !== false)
+ .filter(h => ((h.row ?? 0) + (h.rowSpan ?? 1) - 1) >= maxRow)
+ ;
+ };
+
+ const leafCols = getLeafCols(headlist);
return (
<>
@@ -122,7 +136,13 @@ export function UiTable({
<>>
)}
-
+
+ {widthFixed?
+
+ {leafCols.map(col => (
+
+ ))}
+ :""}
{children ? children : }