From 7d45bc37a87db965c0d201c2a18f070456b98775 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 27 Nov 2023 17:54:45 +0900 Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=95=88?= =?UTF-8?q?=EC=9D=98=20=EA=B8=B0=EC=A4=80=EC=BD=94=EB=93=9C=20=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EB=B9=84=ED=99=9C=EC=84=B1=ED=99=94.=20=EC=9D=B4?= =?UTF-8?q?=EB=AF=B8=EC=A7=80=20=EC=BA=A1=EC=85=98=20=EC=9C=84=EC=B9=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.=20style.js=20=EB=B6=84=EB=A6=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/css/base.css | 4 -- .../src/css/page.css | 6 +- .../src/pages/standardCode/BookmarkModal.js | 2 +- .../src/pages/standardCode/Sb.style.js | 10 --- .../src/pages/standardCode/Vw.style.js | 11 ++++ .../src/pages/standardCode/viewer.js | 64 +++++++++++-------- .../src/pages/standardCode/viwerComponents.js | 2 +- 7 files changed, 54 insertions(+), 45 deletions(-) create mode 100644 egovframe-template-simple-react-contribution/src/pages/standardCode/Vw.style.js diff --git a/egovframe-template-simple-react-contribution/src/css/base.css b/egovframe-template-simple-react-contribution/src/css/base.css index 4c4bf41..b4d7555 100644 --- a/egovframe-template-simple-react-contribution/src/css/base.css +++ b/egovframe-template-simple-react-contribution/src/css/base.css @@ -81,7 +81,3 @@ button {cursor: pointer;} .mt40 {margin-top: 40px !important;} .ml10 {margin-left: 10px !important;} .pb10 {padding-bottom: 10px !important;} - - -.detailInfoDiv > div > p { display: inline; } -.detailInfoDiv > div > input {margin-right: 5px;} diff --git a/egovframe-template-simple-react-contribution/src/css/page.css b/egovframe-template-simple-react-contribution/src/css/page.css index 82453e9..36f92fa 100644 --- a/egovframe-template-simple-react-contribution/src/css/page.css +++ b/egovframe-template-simple-react-contribution/src/css/page.css @@ -331,4 +331,8 @@ color: forestgreen; } .bookmark:hover{cursor: pointer} - .errorText{color:white; background-color: red; font-size: x-small; vertical-align: bottom; padding: 0 10px;} \ No newline at end of file + .errorText{color:white; background-color: red; font-size: x-small; vertical-align: bottom; padding: 0 10px;} + +/*기준코드 뷰어*/ +.titleCheckBox ~ p {display: inline} +.detailInfoDiv > div > input {margin-right: 5px;} \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/BookmarkModal.js b/egovframe-template-simple-react-contribution/src/pages/standardCode/BookmarkModal.js index 4180ea9..ac50ef0 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/BookmarkModal.js +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/BookmarkModal.js @@ -1,7 +1,7 @@ import {React, useCallback, useEffect, useState} from "react"; import Modal from "react-bootstrap/Modal"; import * as EgovNet from "../../api/egovFetch"; -import {VwDiv} from "./Sb.style"; +import {VwDiv} from "./Vw.style"; const BookmarkModal = ({docCode, docPart}) => { const [modalTitle, setModalTitle] = useState(); diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/Sb.style.js b/egovframe-template-simple-react-contribution/src/pages/standardCode/Sb.style.js index 425da12..e0b823f 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/Sb.style.js +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/Sb.style.js @@ -26,14 +26,4 @@ export const SbTitle = styled.div` cursor: pointer; border-right: solid 5px; } -`; - -export const VwDiv = styled.div` - padding-left: ${props => (props.depth * 10)}px; - color: ${props => (props.isTitle?'darkcyan':'black')}; - padding-top: ${props => (props.isTitle?'10':'')}px; -`; - -export const VwPtag = styled.p` - cursor: ${props => (props.isTitle?'pointer':'')}; `; \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/Vw.style.js b/egovframe-template-simple-react-contribution/src/pages/standardCode/Vw.style.js new file mode 100644 index 0000000..d868d9e --- /dev/null +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/Vw.style.js @@ -0,0 +1,11 @@ +import styled from "styled-components"; + +export const VwDiv = styled.div` + padding-left: ${props => (props.depth * 10)}px; + color: ${props => (props.isTitle?'darkcyan':'black')}; + padding-top: ${props => (props.isTitle?'10':'')}px; +`; + +export const VwPtag = styled.p` + cursor: ${props => (props.isTitle?'pointer':'')}; +`; \ No newline at end of file diff --git a/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer.js b/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer.js index 80d6264..6230fdc 100644 --- a/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer.js +++ b/egovframe-template-simple-react-contribution/src/pages/standardCode/viewer.js @@ -3,11 +3,13 @@ import { useLocation, useParams } from 'react-router-dom'; import SbItem from './SbItem' import Loading from '../../components/Loading' import BookmarkModal from './BookmarkModal'; -import {SbContainer, VwDiv, VwPtag} from './Sb.style' +import {SbContainer} from './Sb.style' +import {VwDiv, VwPtag} from './Vw.style' import Row from 'react-bootstrap/Row'; import Col from 'react-bootstrap/Col'; import Modal from 'react-bootstrap/Modal'; import * as EgovNet from 'api/egovFetch'; +import {getSessionItem} from "../../utils/storage"; function CodeViewer(props) { const [treeLoading, setTreeLoading] = useState(true); @@ -22,6 +24,10 @@ function CodeViewer(props) { const [show, setShow] = useState(false); const [bookMarkModal, setBookMarkModal] = useState(); + + const sessionUser = getSessionItem('loginUser'); + const sessionUserSe = sessionUser?.userSe; + const handleClose = () => setShow(false); const handleShow = () => setShow(true); @@ -144,35 +150,37 @@ function CodeViewer(props) { item.full_content = "
"+item.full_content; } } - if(docLinkReg.test(item.full_content)){ - const docCodeAry = item.full_content.match(docLinkReg); - const docCodeMap = new Map(); - for(let i=0; i' + docCode + '') - } - docCodeMap.forEach((docCodeLink, docCode)=>{ - item.full_content = item.full_content.replaceAll(docCode, docCodeLink); - }) - if(docPartReg.test(item.full_content)){ - const docPartAry = item.full_content.match(docPartReg); - const docPartMap = new Map(); - for(let i=0; i'+ - ''+ - ''); + if(!item.full_content.includes("' + docCode + '') } - docPartMap.forEach((docPartLink, docPart)=>{ - item.full_content = item.full_content.replaceAll(docPart, docPartLink); + docCodeMap.forEach((docCodeLink, docCode)=>{ + item.full_content = item.full_content.replaceAll(docCode, docCodeLink); }) + if(docPartReg.test(item.full_content)){ + const docPartAry = item.full_content.match(docPartReg); + const docPartMap = new Map(); + for(let i=0; i'+ + ''+ + ''); + } + docPartMap.forEach((docPartLink, docPart)=>{ + item.full_content = item.full_content.replaceAll(docPart, docPartLink); + }) + } } } if(item.full_content.includes("