diff --git a/apps/cs/package.json b/apps/cs/package.json index 892c9be4e..1cd5c9c2c 100644 --- a/apps/cs/package.json +++ b/apps/cs/package.json @@ -24,6 +24,7 @@ "@radix-ui/react-icons": "^1.3.2", "@radix-ui/react-label": "^2.1.2", "@radix-ui/react-slot": "^1.1.2", + "@radix-ui/react-tooltip": "^1.1.8", "@tanstack/react-query": "^5.67.1", "@tanstack/react-query-devtools": "^5.75.5", "@tanstack/react-table": "^8.21.2", diff --git a/apps/cs/src/pages/menu/ui/base-menu-form.tsx b/apps/cs/src/pages/menu/ui/base-menu-form.tsx index 26ead2bb1..fceb66549 100644 --- a/apps/cs/src/pages/menu/ui/base-menu-form.tsx +++ b/apps/cs/src/pages/menu/ui/base-menu-form.tsx @@ -12,6 +12,7 @@ import { } from "@common/components"; import { FormItem, FormControl, FormField } from "@/shared/ui/form"; import { MENU_TYPE, type MenuFormData } from "../model/menu-interface"; +import { InfoTooltip } from "@/shared/ui/info-tooltip"; interface BaseMenuFormProps { form: UseFormReturn; @@ -37,7 +38,12 @@ function BaseMenuForm({ form, menuCd }: BaseMenuFormProps) { )} - 메뉴명 + +
+ 메뉴명 + +
+ + + + + +

{text}

+ + + ); +} + +export { InfoTooltip }; diff --git a/apps/cs/src/shared/ui/tooltip.tsx b/apps/cs/src/shared/ui/tooltip.tsx new file mode 100644 index 000000000..c7578a4d9 --- /dev/null +++ b/apps/cs/src/shared/ui/tooltip.tsx @@ -0,0 +1,61 @@ +"use client"; + +import * as React from "react"; +import * as TooltipPrimitive from "@radix-ui/react-tooltip"; + +import { cn } from "@common/components"; + +function TooltipProvider({ + delayDuration = 0, + ...props +}: React.ComponentProps) { + return ( + + ); +} + +function Tooltip({ + ...props +}: React.ComponentProps) { + return ( + + + + ); +} + +function TooltipTrigger({ + ...props +}: React.ComponentProps) { + return ; +} + +function TooltipContent({ + className, + sideOffset = 0, + children, + ...props +}: React.ComponentProps) { + return ( + + + {children} + + + + ); +} + +export { Tooltip, TooltipTrigger, TooltipContent, TooltipProvider }; diff --git a/apps/sn/.env.local b/apps/sn/.env.local index 109b519ea..dfb172cf0 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -1,9 +1,8 @@ NEXT_PUBLIC_SITE_ID = SN NEXT_PUBLIC_PORT = 3002 -NEXT_PUBLIC_PROXY_HOST = http://localhost:3002 -#NEXT_PUBLIC_PROXY_HOST = http://sn.hasu.or.kr:3002 -NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 -NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver +NEXT_PUBLIC_PROXY_HOST = http://con.mind-one.co.kr:11302 +NEXT_PUBLIC_SERVER_API_URL = http://dev.onasys.co.kr:8000 +NEXT_PUBLIC_GEOSERVER_URL = http://rsone.iptime.org:10010/geoserver NEXT_PUBLIC_LX_GEOSERVER_URL = http://con.mind-one.co.kr:11306/geoserver #TODO 운영에서 바꿔야 함 NEXT_PUBLIC_RSONE_DC_URL = https://apigateway.rsonesoft.com #자료관 데이터 NEXT_PUBLIC_CLAIM_NAME = Authorization diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx index cbaa5dafb..df9ac29a0 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/infilChart.tsx @@ -142,7 +142,7 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
침입수분석결과
-
+
@@ -165,9 +165,9 @@ const InfilChart = ({ pplMngNo }: ModalOpenProp) => {
{/* 차트 */} -
- +
+
{popupOpen && ( diff --git a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx index 653b568b5..22f0d8876 100644 --- a/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx +++ b/apps/sn/app/(map-layout)/map/components/popupComponent/chart/rdiiChart.tsx @@ -144,7 +144,7 @@ const RdiiChart = ({ pplMngNo }: ModalOpenProp) => {
{/* 차트 */} -
+
diff --git a/apps/sn/middleware.ts b/apps/sn/middleware.ts index 546516261..b5a8e7981 100644 --- a/apps/sn/middleware.ts +++ b/apps/sn/middleware.ts @@ -16,41 +16,52 @@ export function middleware(req: NextRequest) { if (pathname.startsWith("/server")) { const queryParams = searchParams.toString(); - const newUrl = `${SERVER_API_URL}${pathname.replace("/server", "")}${queryParams ? `?${queryParams}` : "" - }`; + const newUrl = `${SERVER_API_URL}${pathname.replace("/server", "")}${queryParams ? `?${queryParams}` : ""}`; console.log(`[Middleware] Rewriting from '/server' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } - - if (pathname.startsWith("/geoserver")) { - const queryParams = searchParams.toString(); - + else if (pathname.startsWith("/geoserver")) { + let queryParams = searchParams.toString(); const typename = searchParams.get("TYPENAME"); - let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : "" - }`; + let newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`; + if ( - typename == "hasudo:tb_ms_swage_ppl" || //관로 - typename == "hasudo:tb_ms_swage_mhl" || //맨홀 - typename == "hasudo:tb_ms_swage_pmstn" || //펌프장 - typename == "hasudo:tb_ms_stofcbr" //우수토실 + typename == "hasudo:tb_il_swage_prcs_fclt" //하수처리시설 + || typename == "hasudo:tb_ms_swage_prcs_zone" //하수처리구역 + || typename == "hasudo:tb_ms_sbmrg_dngr_map" //침수위험지도 + || typename == "hasudo:tb_ms_flood_dngr_map" //도시침수지도 ) { - newUrl = `${LX_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : "" - }`; + newUrl = `${GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`; } + else if ( + typename == "hasudo:tb_ms_swage_ppl" //관로 + || typename == "hasudo:tb_ms_swage_mhl" //맨홀 + || typename == "hasudo:tb_ms_swage_pmstn" //펌프장 + || typename == "hasudo:tb_ms_stofcbr" //우수토실 + ) { + newUrl = `${LX_GEOSERVER_URL}${pathname.replace("/geoserver", "")}${queryParams ? `?${queryParams}` : ""}`; + } + else if ( + typename == "hasudo:om_dt_untrt_swg_rain" //중점우수토실 + || typename == "hasudo:om_wqlt_station" //관측소 + || typename == "hasudo:tb_wr_bdst_ruse_fclt" //재이용시설 + || typename == "hasudo:tb_wr_rnwtr_utztn_fclt" //빗물이용시설 + || typename == "hasudo:tb_wr_rswtr_fclt" //중수도시설 + || typename == "hasudo:tb_wr_htdfl_fclt" //온배수시설 + || typename == "hasudo:tb_wr_ruse_fclt_dmd_co" //수요처 + || typename == "hasudo:tb_wr_tmpr_dmd_co" //잠재수요처 + ){ + const url = req.nextUrl.clone(); + url.searchParams.set('TYPENAME', typename.replace("hasudo:","")); + queryParams = url.searchParams.toString(); + newUrl = `${SEWERAGE_API_URL}/v1/map/geometry${queryParams ? `?${queryParams}` : ""}`; + } + console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); return NextResponse.rewrite(new URL(newUrl)); } - - if (pathname.startsWith("/sewerage-service")) { - const queryParams = searchParams.toString(); - const newUrl = `${SEWERAGE_API_URL}${pathname.replace("/sewerage-service/api", "")}${queryParams ? `?${queryParams}` : "" - }`; - console.log(`[Middleware] Rewriting from '/geoserver' path to: ${newUrl}`); - return NextResponse.rewrite(new URL(newUrl)); - } - - if ( + else if ( pathname.startsWith("/attach-service") || pathname.startsWith("/cms-service") ) { @@ -69,8 +80,7 @@ export function middleware(req: NextRequest) { headers: requestHeaders, }); } - - if (pathname.startsWith("/user-service")) { + else if (pathname.startsWith("/user-service")) { const requestHeaders = new Headers(req.headers); const newUrl = `${SERVER_API_URL}${pathname}`; @@ -81,8 +91,7 @@ export function middleware(req: NextRequest) { headers: requestHeaders, }); } - - if (pathname.startsWith("/dc-service")) { + else if (pathname.startsWith("/dc-service")) { const requestHeaders = new Headers(req.headers); const newUrl = `${RSONE_DC_URL}${pathname}`; @@ -103,8 +112,7 @@ export const config = { "/attach-service/:path*", "/user-service/:path*", "/cms-service/:path*", - "/sewerage-service/api/v1/map/geometry/:path*", "/dc-service/:path*", ], - + }; diff --git a/packages/common/business_components/src/ui/map/lib/gis.core.js b/packages/common/business_components/src/ui/map/lib/gis.core.js index ddfcec3a1..b1b02a732 100644 --- a/packages/common/business_components/src/ui/map/lib/gis.core.js +++ b/packages/common/business_components/src/ui/map/lib/gis.core.js @@ -31,8 +31,6 @@ const GisApp = {}; //레이어 정보 GisApp.layerInfos = []; //기본정보 -//GisApp.GEOSERVER_URL = 'http://rsone.iptime.org:10010/geoserver/hasudo/ows'; -//GisApp.GEOSERVER_WMS_URL = 'http://rsone.iptime.org:10010/geoserver/hasudo/wms'; GisApp.GEOSERVER_URL = '/geoserver/hasudo/ows'; GisApp.SN_GEOSERVER_URL = '/sewerage-service/api/v1/map/geometry'; GisApp.GEOSERVER_WMS_URL = '/geoserver/hasudo/wms'; @@ -56,7 +54,6 @@ GisApp.OPENSTREET_URL = '//tile.openstreetmap.org/{z}/{x}/{y}.png'; GisApp.BASE_MAP_TYPES = []; GisApp.FROM_PROJ = 'EPSG:4326'; -// GisApp.TO_PROJ = 'EPSG:3857'; GisApp.TO_PROJ = 'EPSG:5179'; //ngii 좌표계 GisApp.TO_DATA_PROJ = 'EPSG:4326'; GisApp.CONTEXT_LAYER_PATH = '/images/map/layericon/'; diff --git a/packages/common/business_components/src/ui/map/lib/gis.layer.js b/packages/common/business_components/src/ui/map/lib/gis.layer.js index 097c90ba5..7790aa5dc 100644 --- a/packages/common/business_components/src/ui/map/lib/gis.layer.js +++ b/packages/common/business_components/src/ui/map/lib/gis.layer.js @@ -77,19 +77,6 @@ GisOlLayer.prototype = { let lyrTyNm = options.lyrTyNm; let typename = this.storageNm + lyrTyNm; - if(options.lyrTyNm == "om_dt_untrt_swg_rain" //중점우수토실 - || options.lyrTyNm == "om_wqlt_station" //관측소 - || options.lyrTyNm == "tb_wr_bdst_ruse_fclt" //재이용시설 - || options.lyrTyNm == "tb_wr_rnwtr_utztn_fclt" //빗물이용시설 - || options.lyrTyNm == "tb_wr_rswtr_fclt" //중수도시설 - || options.lyrTyNm == "tb_wr_htdfl_fclt" //온배수시설 - || options.lyrTyNm == "tb_wr_tmpr_dmd_co" //잠재수요처 - ) - { - url = GisApp.SN_GEOSERVER_URL; - typename = lyrTyNm; - } - const params = {}; params['TYPENAME'] = typename; params['SERVICE'] = 'WFS'; @@ -97,16 +84,23 @@ GisOlLayer.prototype = { params['REQUEST'] = 'GetFeature'; params['SRS'] = toProj; params['OUTPUTFORMAT'] = 'application/json'; - if (options?.flterSql && options?.flterSql?.trim() !== 'null') { - params['CQL_FILTER'] = options?.flterSql; - } - const strParams = new URLSearchParams(params).toString(); + let source = new VectorSource({ format: new GeoJSON(), url: function (extent) { + + const [minX, minY, maxX, maxY] = extent; + const bboxFilter = `BBOX(geom, ${minX}, ${minY}, ${maxX}, ${maxY}, '${toProj}')`; + const filter = options?.flterSql && options.flterSql && options.flterSql.trim() !== '' + ? `(${options.flterSql}) AND ${bboxFilter}` + : bboxFilter; + + params['CQL_FILTER'] = filter; + + const strParams = new URLSearchParams(params).toString(); return url + '?' + strParams; }, - strategy: all, + strategy: bbox, }); return source; }, @@ -212,7 +206,7 @@ GisOlLayer.prototype = { return null; } let vectorSource = new VectorSource({ - strategy: all, + strategy: bbox, }); if (feature) { if (Object.prototype.toString.call(feature).slice(8, -1).indexOf('Object') > -1) { diff --git a/packages/common/components/src/ui/table/table.css b/packages/common/components/src/ui/table/table.css index b3a6493a6..4d25604c8 100644 --- a/packages/common/components/src/ui/table/table.css +++ b/packages/common/components/src/ui/table/table.css @@ -7,6 +7,10 @@ .table-ui th { @apply px-4 py-[1.2rem] text-[1.3rem] font-medium leading-[1.2]; } + .table-ui th[data-required]::before { + content: "*"; + color: red; + } .table-ui td { @apply px-2 py-[1.2rem] text-[1.3rem] font-normal leading-[1.2]; } diff --git a/packages/common/network/client.ts b/packages/common/network/client.ts index b1a9805c3..587fcf541 100644 --- a/packages/common/network/client.ts +++ b/packages/common/network/client.ts @@ -23,15 +23,10 @@ class Client { }); - console.log("config", config); - this.axiosInstance.interceptors.request.use((config) => { const token = Cookies.get(CLAIM_NAME); const userId = Cookies.get(AUTH_USER_ID); - console.log("token", token); - console.log("userId", userId); - if (!token || !userId) { throw new AxiosError( "The authentication token is invalid.", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5beecf860..142279c5e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -211,6 +211,9 @@ importers: '@radix-ui/react-slot': specifier: ^1.1.2 version: 1.1.2(@types/react@18.3.18)(react@18.3.1) + '@radix-ui/react-tooltip': + specifier: ^1.1.8 + version: 1.1.8(@types/react-dom@18.3.5)(@types/react@18.3.18)(react-dom@18.3.1)(react@18.3.1) '@tanstack/react-query': specifier: ^5.67.1 version: 5.67.1(react@18.3.1)