diff --git a/egovframe-template-simple-react-contribution/src/css/base.css b/egovframe-template-simple-react-contribution/src/css/base.css index 250e35d..2559717 100644 --- a/egovframe-template-simple-react-contribution/src/css/base.css +++ b/egovframe-template-simple-react-contribution/src/css/base.css @@ -84,6 +84,7 @@ button {cursor: pointer;} .mw_400 {max-width: 400px;} .mw_450 {max-width: 450px;} +.h_10 {height: 10px;} .h_20 {height: 20px;} .h_25 {height: 25px;} .h_30 {height: 30px;} @@ -119,5 +120,5 @@ button {cursor: pointer;} .text-224 {color: #22498E !important;} .clickable{cursor: pointer;} - +.cursor{cursor: pointer;} /*.MuiTab-root.Mui-selected { color: #22498E; }*/ diff --git a/egovframe-template-simple-react-contribution/src/css/page.css b/egovframe-template-simple-react-contribution/src/css/page.css index 64bcb6b..468e96e 100644 --- a/egovframe-template-simple-react-contribution/src/css/page.css +++ b/egovframe-template-simple-react-contribution/src/css/page.css @@ -647,7 +647,7 @@ .calendar_info ul li a {color: #222; font-size: 16px; font-weight: 300;} .calendar_info ul li span {position: absolute; right: 15px; top: 15px; color: #808080; font-size: 16px; font-weight: 300;} - .viewerDiv{height: calc(100vh - 190px); overflow-y: auto;} + .viewerDiv{height: calc(100vh - 153px); overflow-y: auto;} .openDoc{background-color: bisque;} .docLink{color: black;background-color: palegreen} .docLink:hover{cursor: pointer} @@ -671,7 +671,10 @@ .modalDocInfoActive{filter: grayscale(0%);} .docInfoRow > div{--bs-gutter-x: 0.5rem;} .bookmarkModalHeader{--bs-modal-title-line-height:1;} - .optionBtn{--bs-btn-padding-y: 0.1rem;--bs-btn-padding-x: 0.25rem;--bs-btn-font-size: 0.7rem; margin-right: 7px;} + .optionBtn{--bs-btn-padding-y: 0.15rem;--bs-btn-padding-x: 0.25rem;--bs-btn-font-size: 0.7rem; margin-right: 7px;} + .detailInfoDiv {position: relative;} + .datailcollapse {position: absolute; top: 0; left: 0; margin-top: 200px; margin-left: 0;} + .datailcollapse img {position: fixed;} /* 건설기준코드 안내*/ diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/CodeViewer.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/CodeViewer.jsx index 70ef815..dc620c4 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/CodeViewer.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/CodeViewer.jsx @@ -1,5 +1,5 @@ import React, { useState, useEffect, useCallback } from 'react'; -import { useLocation, useParams } from 'react-router-dom'; +import { useLocation, useParams, Link } from 'react-router-dom'; import Loading from 'components/Loading' import BookmarkModal from './BookmarkModal'; import {VwDiv, VwPtag} from './Vw.style' @@ -31,8 +31,7 @@ function CodeViewer(props) { const [show, setShow] = useState(false); const [bookMarkModal, setBookMarkModal] = useState(); - const [colList, setColList] = useState([3,2,7]); - + const [colList, setColList] = useState([3,7,2]); const sessionUser = parseJwt(getLocalItem('accessToken')); const sessionUserSe = sessionUser?.userSe; @@ -71,9 +70,9 @@ function CodeViewer(props) { if(docInfo.length>0){ let optionTag = []; let activeIndex = 0; - let docTitle = ""; let docFileGrpId = ""; let rvsnFileGrpId = ""; + let docTitle = ""; if(ymd===undefined){ activeIndex = docInfo.length-1 docTitle = docInfo[docInfo.length-1].doc_nm @@ -94,8 +93,8 @@ function CodeViewer(props) { buttonClass += "btn-primary " } if(index === activeIndex){ - buttonClass += "docInfoActive" - pClass += "yearInfoActive" + buttonClass += "docInfoActive " + pClass += "yearInfoActive " docFileGrpId = item.doc_file_grp_id; rvsnFileGrpId = item.rvsn_file_grp_id; } @@ -108,25 +107,51 @@ function CodeViewer(props) { onClick={docInfoSelectorChange} data-ymd={item.rvsn_ymd} data-doccode={item.kcsc_cd} - data-docinfoseq={item.doc_info_seq}/> -
-

{item.doc_yr}

+ data-docinfoseq={item.doc_info_seq} /> + {/*
*/} + {/* */} +
+

{item.doc_yr}

+ {/**/} ) }) headTag.push( <> - - - {docCode} {docTitle} - {optionTag} + {docCode} {docTitle} + + + + + + + {/*{docCode} {docTitle}*/} + {optionTag} + + + + + + {rvsnFileGrpId?:''} + {docFileGrpId?:''} + + + + + + + + + + {errorSelector} + + + - - - - {rvsnFileGrpId?{File.download(rvsnFileGrpId)}}/>:''} - {docFileGrpId?{File.standardCode(docFileGrpId)}}/>:''} - ) }else{ @@ -262,7 +287,7 @@ function CodeViewer(props) { setDocSummary(summaryTag); setDocDetail(detailTag); if(optionTag.length>0){ - errorTag.push({optionTag}) + errorTag.push({optionTag}) setErrorSelector(errorTag); } setDocLoading(false); @@ -403,9 +428,9 @@ function CodeViewer(props) { } function treeControl(){ if(colList[0]===3){ - setColList([0,3,9]); + setColList([0,10,2]); }else{ - setColList([3,2,7]); + setColList([3,7,2]); } } @@ -422,38 +447,44 @@ function CodeViewer(props) { - - - - - - + + {/**/} + {/**/} + {/* */} + {/* */} + {/* */} {docInfo} - - - - - - {errorSelector} - - - - + {/* */} + {/* */} + {/* */} + {/* */} + {/* */} + {/* {errorSelector}*/} + {/* */} + {/* */} + {/* */} + {/**/} {/*{codeTree}*/} - -
- + +
+ {/**/} + {colList[0]===3
- {docSummary} - - {docDetail} + + {docSummary} + {bookMarkModal} diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/ViwerComponents.jsx b/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/ViwerComponents.jsx index 1f986fb..e3f6e17 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/ViwerComponents.jsx +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer/ViwerComponents.jsx @@ -67,7 +67,7 @@ export function CodeTree({docCode, setdoccodandname}) { //TODO 추가 분리 작업 필요 export function CodeCotentData({docCode}) { const [codeChapter, setcodeChapter] = useState([]); - const [codeContent, setcodeContetn] = useState([]); + const [codeContent, setcodeContent] = useState([]); let result =[]; const getCodeDetail = (docCode) => { EgovNet.requestFetch( @@ -98,7 +98,7 @@ export function CodeCotentData({docCode}) { ) })) - setcodeContetn(result.map(item =>{ + setcodeContent(result.map(item =>{ const isTitle = item.full_content.includes(item.group_title); const docLinkReg = /([A-Z]{3,5}(\s[0-9]{2}){3,4})/g const docPartReg = /\((?:표|그림|부록)?\s*([A-Z]\.)?(?!\d\))\d+(\.\d+)*(\s?\(\d\))?(-\d+)?(?:\s*[A-Z])?\)/g