--- src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java
+++ src/main/java/kcc/let/cop/bbs/web/EgovBBSManageController.java
... | ... | @@ -771,10 +771,11 @@ |
| 771 | 771 |
// 위/아래 게시글 번호, 제목 조회 |
| 772 | 772 |
EgovMap upDownNttid = bbsMngService.getUpDownNttIdNSj(boardVO); |
| 773 | 773 |
if(null != upDownNttid) {
|
| 774 |
- /*model.addAttribute("nextNttIdNSj", upDownNttid.get("nextNttIdNSj"));
|
|
| 775 |
- model.addAttribute("prevNttIdNSj", upDownNttid.get("prevNttIdNSj"));*/
|
|
| 776 |
- model.addAttribute("nextNttIdNSj", upDownNttid.get("nextnttidnsj"));
|
|
| 777 |
- model.addAttribute("prevNttIdNSj", upDownNttid.get("prevnttidnsj"));
|
|
| 774 |
+ // DB 드라이버에 따라 컬럼 별칭 대소문자가 달라 두 키 모두 확인 (MariaDB : prevNttIdNSj, CUBRID : prevnttidnsj) |
|
| 775 |
+ Object nextNttIdNSj = upDownNttid.get("nextNttIdNSj") != null ? upDownNttid.get("nextNttIdNSj") : upDownNttid.get("nextnttidnsj");
|
|
| 776 |
+ Object prevNttIdNSj = upDownNttid.get("prevNttIdNSj") != null ? upDownNttid.get("prevNttIdNSj") : upDownNttid.get("prevnttidnsj");
|
|
| 777 |
+ model.addAttribute("nextNttIdNSj", nextNttIdNSj);
|
|
| 778 |
+ model.addAttribute("prevNttIdNSj", prevNttIdNSj);
|
|
| 778 | 779 |
}else {
|
| 779 | 780 |
model.addAttribute("nextNttIdNSj", null);
|
| 780 | 781 |
model.addAttribute("prevNttIdNSj", null);
|
--- src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileList.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/fms/EgovBBSFileList.jsp
... | ... | @@ -137,7 +137,7 @@ |
| 137 | 137 |
|
| 138 | 138 |
<a href="javascript:fn_egov_downFile('<c:out value="${fileVO.atchFileId}"/>','<c:out value="${fileVO.fileSn}"/>')" class="fileName file_row" title="다운로드">
|
| 139 | 139 |
<i class="icon file"></i> |
| 140 |
- <span><c:out value="${fileVO.orignlFileNm}"/> <%-- [<c:out value="${fileVO.fileMg}"/> byte] --%></span>
|
|
| 140 |
+ <span title="<c:out value='${fileVO.orignlFileNm}'/>"><c:out value="${fileVO.orignlFileNm}"/> <%-- [<c:out value="${fileVO.fileMg}"/> byte] --%></span>
|
|
| 141 | 141 |
</a> |
| 142 | 142 |
</c:otherwise> |
| 143 | 143 |
</c:choose> |
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovUserSelectUpdt.jsp
... | ... | @@ -186,27 +186,7 @@ |
| 186 | 186 |
// 서명이미지 미리보기 (저장된 파일) |
| 187 | 187 |
function fn_sign_preview(atchFileId, fileSn) {
|
| 188 | 188 |
var src = "<c:url value='/cmm/fms/getImage.do'/>?atchFileId=" + encodeURIComponent(atchFileId) + "&fileSn=" + encodeURIComponent(fileSn); |
| 189 |
- fn_open_image_popup(src); |
|
| 190 |
-} |
|
| 191 |
- |
|
| 192 |
-// 이미지 미리보기 팝업 (새로 첨부한 파일은 ncms_common.js 의 previewNewFile 에서 호출) |
|
| 193 |
-// 화면 중앙 레이어로 표시. 바깥 영역 클릭, 닫기 버튼, ESC 로 닫힘 |
|
| 194 |
-function fn_open_image_popup(src) {
|
|
| 195 |
- fn_close_image_popup(); |
|
| 196 |
- var $layer = $('<div id="signPreviewLayer" style="position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;background:rgba(0,0,0,0.6);display:flex;align-items:center;justify-content:center;"></div>');
|
|
| 197 |
- var $box = $('<div style="position:relative;background:#fff;padding:20px;border-radius:8px;max-width:90vw;max-height:90vh;box-shadow:0 4px 20px rgba(0,0,0,0.3);"></div>');
|
|
| 198 |
- var $close = $('<button type="button" title="닫기" style="position:absolute;top:-14px;right:-14px;width:32px;height:32px;border-radius:50%;border:none;background:#333;color:#fff;font-size:18px;line-height:32px;cursor:pointer;">×</button>');
|
|
| 199 |
- var $img = $('<img alt="서명이미지" style="display:block;max-width:calc(90vw - 40px);max-height:calc(90vh - 40px);">').attr('src', src);
|
|
| 200 |
- $box.append($close).append($img).on('click', function(e){ e.stopPropagation(); });
|
|
| 201 |
- $close.on('click', fn_close_image_popup);
|
|
| 202 |
- $layer.append($box).on('click', fn_close_image_popup);
|
|
| 203 |
- $('body').append($layer);
|
|
| 204 |
- $(document).on('keydown.signPreview', function(e){ if (e.keyCode == 27) fn_close_image_popup(); });
|
|
| 205 |
-} |
|
| 206 |
- |
|
| 207 |
-function fn_close_image_popup() {
|
|
| 208 |
- $('#signPreviewLayer').remove();
|
|
| 209 |
- $(document).off('keydown.signPreview');
|
|
| 189 |
+ fn_open_image_popup(src); // ncms_common.js 공통 팝업 |
|
| 210 | 190 |
} |
| 211 | 191 |
|
| 212 | 192 |
function updateMemberAjax(){
|
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeList.jsp
... | ... | @@ -300,7 +300,7 @@ |
| 300 | 300 |
</td> |
| 301 | 301 |
<td><b style="color:#1e4fc0;">공지</b></td> |
| 302 | 302 |
<td> |
| 303 |
- <a href="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');">
|
|
| 303 |
+ <a href="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');" title="<c:out value='${result.nttSj}'/>">
|
|
| 304 | 304 |
<c:out value="${result.nttSj}" />
|
| 305 | 305 |
<c:if test="${brdMstrVO.openYn == 'Y'}">
|
| 306 | 306 |
<c:if test="${result.secretAt == 'Y'}">
|
... | ... | @@ -364,7 +364,7 @@ |
| 364 | 364 |
<i class="icon lock"></i> |
| 365 | 365 |
</c:if> |
| 366 | 366 |
</c:if> |
| 367 |
- <a href="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');">
|
|
| 367 |
+ <a href="javascript:fn_egov_inqire_notice('<c:out value="${result.bbsId}"/>', '<c:out value="${result.nttId}"/>');" title="<c:out value='${result.nttSj}'/>">
|
|
| 368 | 368 |
<c:out value="${result.nttSj}" />
|
| 369 | 369 |
</a> |
| 370 | 370 |
</td> |
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeRegist.jsp
... | ... | @@ -181,7 +181,8 @@ |
| 181 | 181 |
|
| 182 | 182 |
<!-- 드래그앤 드롭 파라미터 --> |
| 183 | 183 |
<input type="hidden" name="limitcount" value="${bdMstr.posblAtchFileNumber}" />
|
| 184 |
- |
|
| 184 |
+ <input type="hidden" name="filePreviewYn" value="Y" /><!-- 이미지 첨부 시 미리보기 버튼 노출 --> |
|
| 185 |
+ |
|
| 185 | 186 |
|
| 186 | 187 |
<!-- cont_tit --> |
| 187 | 188 |
<div class="content_title"> |
... | ... | @@ -332,7 +333,7 @@ |
| 332 | 333 |
<span class="required">*</span> |
| 333 | 334 |
첨부파일 |
| 334 | 335 |
</th> |
| 335 |
- <td> |
|
| 336 |
+ <td class="upload_area"> |
|
| 336 | 337 |
<!-- <input type="text" id="fileNm" size="30" class="file_input" readonly> --><!-- <button type="button" class="btnType01 btn_add_file">파일 첨부하기</button> --> |
| 337 | 338 |
<div class="file_upload_wrap"> |
| 338 | 339 |
<input type="file" id="file_temp" name="file_temp" class="uploadFile" style="display:none"/> |
--- src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cop/bbs/EgovNoticeUpdt.jsp
... | ... | @@ -185,6 +185,7 @@ |
| 185 | 185 |
<input type="hidden" name="previewImgs" value="" /> |
| 186 | 186 |
<input type="hidden" name="checkProhibitCn" value="" /> |
| 187 | 187 |
<input type="hidden" name="limitcount" value="${bdMstr.posblAtchFileNumber}" />
|
| 188 |
+ <input type="hidden" name="filePreviewYn" value="Y" /><!-- 이미지 첨부 시 미리보기 버튼 노출 --> |
|
| 188 | 189 |
<!-- 기 업로드 파일 개수 --> |
| 189 | 190 |
|
| 190 | 191 |
<!-- 드래그앤 드롭 파라미터 --> |
... | ... | @@ -349,7 +350,7 @@ |
| 349 | 350 |
<th class="req_text"> |
| 350 | 351 |
<p>첨부파일</p> |
| 351 | 352 |
</th> |
| 352 |
- <td> |
|
| 353 |
+ <td class="upload_area"> |
|
| 353 | 354 |
<!-- <input type="text" id="fileNm" size="30" class="file_input" readonly> --><!-- <button type="button" class="btnType01 btn_add_file">파일 첨부하기</button> --> |
| 354 | 355 |
|
| 355 | 356 |
<div class="file_upload_wrap"> |
... | ... | @@ -408,6 +409,10 @@ |
| 408 | 409 |
<td class="td_filename"> |
| 409 | 410 |
<!-- <img src="/direct/img/upload_hwp_img.png" alt="" /> --> |
| 410 | 411 |
<span class="file_name_text">${fileList.orignlFileNm}</span>
|
| 412 |
+ <c:set var="_ext" value="${fn:toLowerCase(fileList.fileExtsn)}"/>
|
|
| 413 |
+ <c:if test="${_ext eq 'jpg' or _ext eq 'jpeg' or _ext eq 'png' or _ext eq 'gif'}">
|
|
| 414 |
+ <button type="button" class="btn line primary ssmall" style="margin-left:10px;" onclick="fn_saved_file_preview('<c:out value='${fileList.atchFileId}'/>', '<c:out value='${fileList.fileSn}'/>'); return false;">미리보기</button>
|
|
| 415 |
+ </c:if> |
|
| 411 | 416 |
</td> |
| 412 | 417 |
<td class="td_filesort"> |
| 413 | 418 |
<span class="file_filesort_text" value="<c:out value="${fileList.fileExtsn}"/>"><c:out value="${fileList.fileExtsn}"/></span>
|
--- src/main/webapp/js/ncms_common.js
+++ src/main/webapp/js/ncms_common.js
... | ... | @@ -256,16 +256,37 @@ |
| 256 | 256 |
} |
| 257 | 257 |
} |
| 258 | 258 |
|
| 259 |
+/* 이미지 미리보기 팝업 (공통) |
|
| 260 |
+ * 화면 중앙 레이어로 표시. 바깥 영역 클릭, 닫기 버튼, ESC 로 닫힘 */ |
|
| 261 |
+function fn_open_image_popup(src) {
|
|
| 262 |
+ fn_close_image_popup(); |
|
| 263 |
+ var $layer = $('<div id="imagePreviewLayer" style="position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;background:rgba(0,0,0,0.6);display:flex;align-items:center;justify-content:center;"></div>');
|
|
| 264 |
+ var $box = $('<div style="position:relative;background:#fff;padding:20px;border-radius:8px;max-width:90vw;max-height:90vh;box-shadow:0 4px 20px rgba(0,0,0,0.3);"></div>');
|
|
| 265 |
+ var $close = $('<button type="button" title="닫기" style="position:absolute;top:-14px;right:-14px;width:32px;height:32px;border-radius:50%;border:none;background:#333;color:#fff;font-size:18px;line-height:32px;cursor:pointer;">×</button>');
|
|
| 266 |
+ var $img = $('<img alt="미리보기" style="display:block;max-width:calc(90vw - 40px);max-height:calc(90vh - 40px);">').attr('src', src);
|
|
| 267 |
+ $box.append($close).append($img).on('click', function(e){ e.stopPropagation(); });
|
|
| 268 |
+ $close.on('click', fn_close_image_popup);
|
|
| 269 |
+ $layer.append($box).on('click', fn_close_image_popup);
|
|
| 270 |
+ $('body').append($layer);
|
|
| 271 |
+ $(document).on('keydown.imagePreview', function(e){ if (e.keyCode == 27) fn_close_image_popup(); });
|
|
| 272 |
+} |
|
| 273 |
+ |
|
| 274 |
+function fn_close_image_popup() {
|
|
| 275 |
+ $('#imagePreviewLayer').remove();
|
|
| 276 |
+ $(document).off('keydown.imagePreview');
|
|
| 277 |
+} |
|
| 278 |
+ |
|
| 279 |
+/* 저장된 첨부 이미지 미리보기 */ |
|
| 280 |
+function fn_saved_file_preview(atchFileId, fileSn) {
|
|
| 281 |
+ fn_open_image_popup("/cmm/fms/getImage.do?atchFileId=" + encodeURIComponent(atchFileId) + "&fileSn=" + encodeURIComponent(fileSn));
|
|
| 282 |
+} |
|
| 283 |
+ |
|
| 259 | 284 |
/* 새로 첨부한 이미지 미리보기 (저장 전, 브라우저 메모리의 파일을 띄움) */ |
| 260 | 285 |
var _previewUrls = {};
|
| 261 | 286 |
function previewNewFile(idx){
|
| 262 | 287 |
var url = _previewUrls[idx]; |
| 263 | 288 |
if (!url) return; |
| 264 |
- if (typeof fn_open_image_popup === 'function') {
|
|
| 265 |
- fn_open_image_popup(url); |
|
| 266 |
- } else {
|
|
| 267 |
- window.open(url, "filePreview", "width=600,height=400,resizable=yes,scrollbars=yes"); |
|
| 268 |
- } |
|
| 289 |
+ fn_open_image_popup(url); |
|
| 269 | 290 |
} |
| 270 | 291 |
|
| 271 | 292 |
function sendFileToServer(formData, obj , fileObj, _fileIdx) |
--- src/main/webapp/publish/adm/css/table.css
+++ src/main/webapp/publish/adm/css/table.css
... | ... | @@ -50,3 +50,9 @@ |
| 50 | 50 |
.file_table#egov_file_view_table tr{border:0;}
|
| 51 | 51 |
.file_table#egov_file_view_table td{height:auto;text-align:left;}
|
| 52 | 52 |
.file_table#egov_file_view_table td .file_row{display:inline-flex;font-size:16px;font-weight:400;align-items:center;gap:8px;}
|
| 53 |
+ |
|
| 54 |
+/* 목록 제목/첨부파일명 말줄임(...) : 링크(a)가 inline-block 이라 칸 말줄임이 안 먹어 링크 자체에 적용 */ |
|
| 55 |
+.table_type_cols tbody>tr>td>a{max-width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;vertical-align:middle;}
|
|
| 56 |
+.table_type_cols td>.file_table#egov_file_view_table{width:100%;table-layout:fixed;}
|
|
| 57 |
+.table_type_cols td>.file_table#egov_file_view_table td .file_row{display:flex;max-width:100%;}
|
|
| 58 |
+.table_type_cols td>.file_table#egov_file_view_table td .file_row span{flex:1;min-width:0;width:auto;}
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?