
Merge branch 'master' of http://210.180.118.83/jhpark/cms_frontend
@f27c0bdcb69c16d96abd3b9570188cf9bf51b571
--- client/views/pages/adm/boardManagement/boardManagement/BoardManagementSelectList.vue
+++ client/views/pages/adm/boardManagement/boardManagement/BoardManagementSelectList.vue
... | ... | @@ -2,11 +2,11 @@ |
2 | 2 |
<div class="search-wrap"> |
3 | 3 |
<div></div> |
4 | 4 |
<div class="search-bar border"> |
5 |
- <select name="selectType" id="selectType" class="form-select sm border-none" v-model="search.searchType"> |
|
5 |
+ <!-- <select name="selectType" id="selectType" class="form-select sm border-none" v-model="search.searchType"> |
|
6 | 6 |
<option value="">전체</option> |
7 | 7 |
<option v-for="(item, idx) in codeList" :key="idx" :value="item.cd">{{ item.cdNm }}</option> |
8 |
- </select> |
|
9 |
- <input type="text" class="form-control sm border-none" v-model="search.searchText" placeholder="검색어를 입력하세요" @keyup.enter="findAll"> |
|
8 |
+ </select> --> |
|
9 |
+ <input type="text" class="form-control sm border-none" v-model="search.searchText" placeholder="게시판 명을 입력해주세요" @keyup.enter="findAll"> |
|
10 | 10 |
|
11 | 11 |
<button class="btn-ico xsm ico-sch" @click="findAll"> |
12 | 12 |
<span class="sr-only">검색</span> |
... | ... | @@ -91,7 +91,7 @@ |
91 | 91 |
list: [], // 게시판 관리 목록 |
92 | 92 |
listCnt: 0, |
93 | 93 |
pagination: {}, |
94 |
- codeList: [{cd: 'bbsNm', cdNm: '게시판명'}], // 검색 조건 |
|
94 |
+ // codeList: [{cd: 'bbsNm', cdNm: '게시판명'}], // 검색 조건 |
|
95 | 95 |
} |
96 | 96 |
}, |
97 | 97 |
created() { |
--- client/views/pages/adm/boardManagement/template/galleryTemplate/GalleryInsert.vue
+++ client/views/pages/adm/boardManagement/template/galleryTemplate/GalleryInsert.vue
... | ... | @@ -260,6 +260,13 @@ |
260 | 260 |
alert("이미지 파일만 업로드 가능합니다."); |
261 | 261 |
return; |
262 | 262 |
} |
263 |
+ |
|
264 |
+ if (this.bbsMng.byteLmt != 0 && this.bbsMng.byteLmt != null) { |
|
265 |
+ if (file.size > this.bbsMng.byteLmt) { |
|
266 |
+ alert(this.bbsMng.fileSzLmt + "MB 이하의 파일만 등록 가능합니다."); |
|
267 |
+ return; |
|
268 |
+ } |
|
269 |
+ } |
|
263 | 270 |
} |
264 | 271 |
|
265 | 272 |
this.imgFileList = [...this.imgFileList, ...Array.from(this.imgFile)]; |
--- client/views/pages/adm/boardManagement/wordsManagement/WordsManagementSelectList.vue
+++ client/views/pages/adm/boardManagement/wordsManagement/WordsManagementSelectList.vue
... | ... | @@ -2,11 +2,11 @@ |
2 | 2 |
<div class="search-wrap"> |
3 | 3 |
<div></div> |
4 | 4 |
<div class="search-bar border"> |
5 |
- <select class="form-select sm border-none"> |
|
5 |
+ <!-- <select class="form-select sm border-none"> |
|
6 | 6 |
<option value="">전체</option> |
7 | 7 |
<option v-for="(item, idx) in codeList" :key="idx" :value="item.cd">{{ item.cdNm }}</option> |
8 |
- </select> |
|
9 |
- <input type="text" class="form-control sm border-none" placeholder="검색어를 입력하세요." |
|
8 |
+ </select> --> |
|
9 |
+ <input type="text" class="form-control sm border-none" placeholder="금지어를 입력해주세요." |
|
10 | 10 |
v-model="search.searchText" @keyup.enter="fnFindAllWord" /> |
11 | 11 |
<button class="btn-ico xsm ico-sch" @click="fnFindAllWord"> |
12 | 12 |
<span class="sr-only">검색</span> |
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?