메인전시 임시커밋

src/main/java/com/style24/persistence/mybatis/shop/TsaDsiplay.xml

@@ -1337,6 +1337,7 @@
 		FROM TB_CONTENTS_PREVIEW A
 		WHERE A.CATE_NO = #{cateNo}
 		  AND A.CONTENTS_LOC = #{contentsLoc}
+		  AND A.USE_YN = 'Y'
 		ORDER BY A.DISP_ORD
 	</select>
 

src/main/webapp/WEB-INF/views/display/MainGnbContentsPopupForm.html

@@ -42,7 +42,7 @@
 	var contentsLoc = [[${contentsLoc}]];
 	var contentsTitle = [[${contentsTitle}]];
 	var contentsLocArr = gagajf.convertToArray([[${contentsLocList}]]);
-	var tdWidth = $("#sortable").find("td").width();
+	var tdWidth = $("#gnbTabList").find("td").width();
 	var tdDeleteWidth = parseInt(tdWidth/11, 10);
 	tdWidth = tdWidth - tdDeleteWidth;
 	var cate1List = [[${cate1List}]];
@@ -76,152 +76,91 @@
 		return html;
 	}
 
-	// 창닫기
-	var fnMainGnbContentsPopupFormClose = function (){
-		uifnPopupClose('popupMainGnbContents');
-	}
-
-	var fnChangeCateType = function (obj, idx){
-		let cateType = $("#tabTable"+idx).find("input:radio[name=cateType"+idx+"]:checked").val();
-
+	// 탭추가
+	var addIdx = 0;
+	var fnAddTab = function (param){
+		addIdx = tableIdx;
 		var html = '';
-		if(cateType=='B'){
-			$(obj).closest("table").find("[name=tabBrandRow]").show();
-			$(obj).closest("table").find("[name=tabCateRow]").hide();
-			$(obj).closest("table").find("[name=tabOutletRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkTitleRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkRow]").hide();
-			/*$(obj).closest("table").find("[name=title]").val("브랜드");
-			$(obj).closest("table").find("[name=link]").val("/brand/list");
-			$(obj).closest("table").find("[name=title]").attr("readOnly",true);
-			$(obj).closest("table").find("[name=link]").attr("readOnly",true);*/
-		}else if(cateType=='C'){
-			$(obj).closest("table").find("[name=tabBrandRow]").hide();
-			$(obj).closest("table").find("[name=tabBrandTitle]").hide();
-			$(obj).closest("table").find("[name=tabBrandLink]").hide();
-			$(obj).closest("table").find("[name=tabCateRow]").show();
-			$(obj).closest("table").find("[name=tabOutletRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkTitleRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkRow]").hide();
-			/*$(obj).closest("table").find("[name=title]").val("");
-			$(obj).closest("table").find("[name=link]").val("/category/form");
-			$(obj).closest("table").find("[name=title]").attr("readOnly",true);
-			$(obj).closest("table").find("[name=link]").attr("readOnly",true);*/
-		}else if(cateType=='O'){
-			$(obj).closest("table").find("[name=tabBrandRow]").hide();
-			$(obj).closest("table").find("[name=tabBrandTitle]").hide();
-			$(obj).closest("table").find("[name=tabBrandLink]").hide();
-			$(obj).closest("table").find("[name=tabCateRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkTitleRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkRow]").hide();
-			/*$(obj).closest("table").find("[name=title]").val("아울렛");
-			$(obj).closest("table").find("[name=link]").val("/outlet/main");
-			$(obj).closest("table").find("[name=title]").attr("readOnly",true);
-			$(obj).closest("table").find("[name=link]").attr("readOnly",true);*/
-		}else if(cateType=='L'){
-			$(obj).closest("table").find("[name=tabBrandRow]").hide();
-			$(obj).closest("table").find("[name=tabBrandTitle]").hide();
-			$(obj).closest("table").find("[name=tabBrandLink]").hide();
-			$(obj).closest("table").find("[name=tabCateRow]").hide();
-			$(obj).closest("table").find("[name=tabOutletRow]").hide();
-			$(obj).closest("table").find("[name=tabLinkTitleRow]").show();
-			$(obj).closest("table").find("[name=tabLinkRow]").show();
-			/*$(obj).closest("table").find("[name=title]").val("");
-			$(obj).closest("table").find("[name=link]").val("#");
-			$(obj).closest("table").find("[name=title]").attr("readOnly",false);
-			$(obj).closest("table").find("[name=link]").attr("readOnly",false);*/
+		html += '<table class="frmStyle tabTable" style="margin-bottom:30px" id="tabTable'+addIdx+'">';
+		html += '<input type="hidden" name="tableIdx" value="'+addIdx+'" data-id="'+addIdx+'" />';
+		html += '	<colgroup>';
+		html += '		<col style="width:10%;"/>';
+		html += '		<col style="width:55%;"/>';
+		html += '		<col/>';
+		html += '	</colgroup>';
+		html += '	<thead>';
+		if(contentsLoc=='STAB002'){
+			html += '<tr class="cateTypeTr">';
+			html += '	<th>유형선택</th>';
+			html += '	<td colspan="3">';
+			//html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="C" onclick="fnChangeCateType(this,'+addIdx+');"/>대카테고리</label>';
+			//html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="O" onclick="fnChangeCateType(this,'+addIdx+');"/>아울렛</label>';
+			//html += '		<label class="rdoBtn"><input type="radio" name="cateType'+addIdx+'" value="L" onclick="fnChangeCateType(this,'+addIdx+');"/>이벤트링크</label>';
+			html += '	</td>';
+			html += '</tr>';
 		}
-	}
-
-	/**
-	 * 몰메인 카테고리 탭일때
-	 */
-	var tabIdx = 0;
-	var fnAddTab = function (param){
-		tabIdx = tableIdx;
-
-		var html = '<table class="frmStyle tabTable" style="margin-bottom:30px" id="tabTable'+tabIdx+'">';
-		html += '<input type="hidden" name="idxTest" value="'+tabIdx+'" data-id="'+tabIdx+'">';
-		html += '<colgroup>';
-		html += '<col style="width:10%;"/>';
-		html += '<col style="width:55%;"/>';
-		html += '<col/>';
-		html += '</colgroup>';
-		html += '<thead>';
-		html += '<tr class="cateTypeTr">';
-		html += '<th>유형선택</th>';
-		html += '<td colspan="3">';
-		html += '<label class="rdoBtn"><input type="radio" name="cateType'+tabIdx+'" value="B" onclick="fnChangeCateType(this,'+tabIdx+');"/>브랜드</label>';
-		html += '<label class="rdoBtn"><input type="radio" name="cateType'+tabIdx+'" value="C" onclick="fnChangeCateType(this,'+tabIdx+');"/>대카테고리</label>';
-		html += '<label class="rdoBtn"><input type="radio" name="cateType'+tabIdx+'" value="O" onclick="fnChangeCateType(this,'+tabIdx+');"/>아울렛</label>';
-		html += '<label class="rdoBtn"><input type="radio" name="cateType'+tabIdx+'" value="L" onclick="fnChangeCateType(this,'+tabIdx+');"/>이벤트링크</label>';
-		html += '</td>';
-		html += '</tr>';
-		html += '<tr><th>전시일시</th><td><input name="dispStdt" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="노출시작일" data-valid-type="calendar"/>';
-		html += '<select name="stTimeHour" required="required" data-valid-name="노출기간 시작시간">';
+		html += '	<tr>';
+		html += '		<th>전시일시</th>';
+		html += '		<td><input name="dispStdt" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="노출시작일" data-valid-type="calendar"/>';
+		html += '			<select name="stTimeHour" required="required" data-valid-name="노출기간 시작시간">';
 		html += fnCreateTimeOption(24);
-		html += '</select>';
-		html += '<select name="stTimeMin" required="required" data-valid-name="노출기간 시작시간">';
+		html += '			</select>';
+		html += '			<select name="stTimeMin" required="required" data-valid-name="노출기간 시작시간">';
 		html += fnCreateTimeOption(60);
-		html += '</select>';
-		html += '<span> ~ </span>';
-		html += '<input name="dispEddt" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="노출종료일" data-valid-type="calendar"/>';
-		html += '<select name="edTimeHour" required="required" data-valid-name="노출기간 종료시간">';
+		html += '			</select>';
+		html += '			<span> ~ </span>';
+		html += '			<input name="dispEddt" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="노출종료일" data-valid-type="calendar"/>';
+		html += '			<select name="edTimeHour" required="required" data-valid-name="노출기간 종료시간">';
 		html += fnCreateTimeOption(24,23);
-		html += '</select>';
-		html += '<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
+		html += '			</select>';
+		html += '			<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
 		html += fnCreateTimeOption(60,59);
-		html += '</select>';
-		html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
-		html += '</td>';
-		html += '<td class="aL cateTypeBtnArea">';
-		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
-		html += '</tr>';
-		html += '</thead>';
-		html += '<tbody>';
-		html += '	<tr name="tabBrandRow" style="display:none;">';
-		html += '		<th>캐주얼<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+tabIdx+'\',1);">브랜드조회</button></th>';
-		html += '		<td colspan="3" id="tabBrand1">';
-		html += '			<ul class="brandGroupUl">';
-		html += '			</ul>';
-		html += '		</td>';
-		html += '	</tr>';
-		html += '	<tr name="tabBrandRow" style="display:none;">';
-		html += '		<th>골프<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+tabIdx+'\',2);">브랜드조회</button></th>';
-		html += '		<td colspan="3" id="tabBrand2">';
-		html += '			<ul class="brandGroupUl">';
-		html += '			</ul>';
-		html += '		</td>';
-		html += '	</tr>';
-		html += '	<tr name="tabBrandRow" style="display:none;">';
-		html += '		<th>키즈<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+tabIdx+'\',3);">브랜드조회</button></th>';
-		html += '		<td colspan="3" id="tabBrand3">';
-		html += '			<ul class="brandGroupUl">';
-		html += '			</ul>';
-		html += '		</td>';
-		html += '	</tr>';
-		html += '	<tr name="tabCateRow" style="display:none;">';
-		html += '		<th>카테고리</th>';
-		html += '		<td colspan="3">카테고리선택';
-		html += '			<select name="cate1List">';
-		html += '				<option value="">[선택]</option>';
-		for(let i=0; i<cate1List.length; i++){
-			html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-		}
 		html += '			</select>';
+		html += '			<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center"/>';
 		html += '		</td>';
+		html += '		<td class="aL cateTypeBtnArea">';
+		html += '		<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 		html += '	</tr>';
-		html += '	<tr name="tabLinkTitleRow" style="display:none;">';
-		html += '		<th>타이틀</th>';
-		html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value=""/></td>';
-		html += '	</tr>';
-		html += '	<tr name="tabLinkRow" style="display:none;">';
-		html += '		<th>링크 (없으면 #)</th>';
-		html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value=""/></td>';
-		html += '	</tr>';
-		html += '</tbody>';
+		html += '	</thead>';
+		html += '	<tbody>';
+		if(contentsLoc=='STAB001'){
+			for(var i=0; i<3; i++){
+				html += '	<tr>';
+				html += '		<th rowspan="2"><br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+addIdx+'\',i+1);">브랜드조회</button></th>';
+				html += '		<td id="brandTitle"+i> 그룹타이틀:';
+				html += '			<input type="text" name="brandGroup'+addIdx+'" id="bTitle"+i class="w200" value=""/>';
+				html += '		</td>';
+				html += '	</tr>';
+				html += '	<tr>';
+				html += '		<td name="brandArr'+addIdx+'" id="brandCdArr"+i>';
+				html += '			<ul class="brandGroupUl">dddddd';
+				html += '			</ul>';
+				html += '		</td>';
+				html += '	</tr>';
+			}
+		}else{
+			html += '	<tr name="tabCateRow" style="display:none;">';
+			html += '		<th>카테고리</th>';
+			html += '		<td colspan="3">카테고리선택';
+			html += '			<select name="cate1List">';
+			html += '				<option value="">[선택]</option>';
+			for(let i=0; i<cate1List.length; i++){
+				html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
+			}
+			html += '			</select>';
+			html += '		</td>';
+			html += '	</tr>';
+			html += '	<tr name="tabLinkTitleRow" style="display:none;">';
+			html += '		<th>타이틀</th>';
+			html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value=""/></td>';
+			html += '	</tr>';
+			html += '	<tr name="tabLinkRow" style="display:none;">';
+			html += '		<th>링크 (없으면 #)</th>';
+			html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value=""/></td>';
+			html += '	</tr>';
+		}
+		html += '	</tbody>';
 		html += '</table>';
-
 		$("#gnbTabList").prepend(html);
 		$("#gnbTabList").sortable();
 		$('.schDate').datepicker("destroy");
@@ -231,24 +170,6 @@
 			defaultDate: $('.schDate').val()
 		});
 		tableIdx = tableIdx+1;
-		fnResetTabIdx();
-		//fnResetCateTypeIdx();
-	}
-
-	var fnResetTabIdx = function (){
-		$(".tabTable").each(function(i){
-			//$(this).attr('id','tabTable'+i);
-			$(this).find("input[name=dispOrd]").val(i+1);
-		});
-
-	}
-
-	var fnResetCateTypeIdx = function (){
-		$(".cateTypeTr").each(function(i){
-			$(this).find("input:radio").attr('name','cateType'+i);
-			$(this).find("input:radio").removeAttr("onclick");
-			$(this).find("input:radio").attr("onclick","fnChangeCateType(this,"+i+");");
-		});
 	}
 
 	var tabTableRow;
@@ -259,6 +180,7 @@
 		cfnOpenBrandGroupListPopup("callBackBrandGroup", "S", "S");
 	}
 
+	// 브랜드 코드, 브랜드 명, 브랜드 이미지 3개 불러와야함 -> 로직 수정 필요
 	var brandCdIdx=0;
 	var callBackBrandGroup = function (result){
 		if(gagajf.isNull($("#tabTable"+tabTableRow+" #tabBrand"+callbackBrandTr +" .brandGroupUl").find("input[data-id]:last").val())){
@@ -280,258 +202,60 @@
 		$("#tabTable"+tabTableRow +" #tabBrand"+callbackBrandTr+" .brandGroupUl").append(html);
 	}
 
-	var fnRemoveBrand = function (obj, idx){
-		var divId = $(obj).closest('td').attr('id');
-		$("#"+divId+" #brandSpan"+idx).remove();
-	}
-
-	// 컨텐츠 행삭제
-	var fnDeleteContentsRow = function (obj){
-		$(obj).closest("table").remove();
-		fnResetTabIdx();
-	}
+	// 카테고리 유형 선택
+	var fnChangeCateType = function (obj, idx){
+		let cateType = $("#tabTable"+idx).find("input:radio[name=cateType"+idx+"]:checked").val();
 
-	/**
-	 * 임시저장
-	 */
-	var dataArr = [];
-	$("#btnGnbTabSave").on('click',function (){
-		if(!gagajf.checkRequired("#gnbTabList")){
-			return;
+		if(cateType=='C'){
+			$(obj).closest("table").find("[name=tabCateRow]").show();
+			$(obj).closest("table").find("[name=tabOutletRow]").hide();
+			$(obj).closest("table").find("[name=tabLinkTitleRow]").hide();
+			$(obj).closest("table").find("[name=tabLinkRow]").hide();
+		}else if(cateType=='O'){
+			$(obj).closest("table").find("[name=tabCateRow]").hide();
+			$(obj).closest("table").find("[name=tabLinkTitleRow]").hide();
+			$(obj).closest("table").find("[name=tabLinkRow]").hide();
+		}else if(cateType=='L'){
+			$(obj).closest("table").find("[name=tabCateRow]").hide();
+			$(obj).closest("table").find("[name=tabOutletRow]").hide();
+			$(obj).closest("table").find("[name=tabLinkTitleRow]").show();
+			$(obj).closest("table").find("[name=tabLinkRow]").show();
 		}
-		dataArr = [];
-		console.log('1');
-		$(".tabTable").each(function (){
-			console.log('2');
-			//var brandCasualArr = [];
-			//var brandGolfArr = [];
-			//var brandKidsArr = [];
-			var strTitle1 = "";		// 타이틀
-			var strTitle2 = "";		// category 일때, 카테코드
-			var strVar1 = "";		// 링크
-
-			var brnadCasualList = "";
-			var brnadGolfList = "";
-			var brnadKidsList = "";
-
-			var radioNm = $(this).find(".rdoBtn input").attr("name");
-			var radioValue = $(this).find("input:radio[name="+radioNm+"]:checked").val();
-
-			if(radioValue=='B'){
-				$(this).find("#tabBrand1 >ul >span").each(function (){
-					//brandCasualArr.push($(this).find("input[name=brandGroupNo]").val());
-					brnadCasualList += ','+$(this).find("input[name=brandGroupNo]").val();
-				});
-				$(this).find("#tabBrand2 >ul >span").each(function (){
-					//brandCasualArr.push($(this).find("input[name=brandGroupNo]").val());
-					brnadGolfList += ','+$(this).find("input[name=brandGroupNo]").val();
-				});
-				$(this).find("#tabBrand3 >ul >span").each(function (){
-					//brandCasualArr.push($(this).find("input[name=brandGroupNo]").val());
-					brnadKidsList += ','+$(this).find("input[name=brandGroupNo]").val();
-				});
-				strTitle1 = "브랜드";
-				strVar1 = "/brand/list";
-			}
-
-			if(radioValue=='C'){
-				var cateText = $(this).find("tr[name=tabCateRow]").find("select[name=cate1List] option:selected").text();
-				var cateValue = $(this).find("tr[name=tabCateRow]").find("select[name=cate1List] option:selected").val();
-				var cateTextArr = cateText.split(" ");
-				strTitle1 = cateTextArr[1];
-				strVar1 = "/category/form";
-				strVar2 = cateValue;
-			}
-
-			if(radioValue=='O'){
-				strTitle1 = "아울렛";
-				strVar1 = "/outlet/main";
-			}
-
-			if(radioValue=='L'){
-				strTitle1 = $(this).find("input[name=title]").val();
-				strVar1 = $(this).find("input[name=link]").val();
-			}
-
-			var dispStdt = $(this).find("[name=dispStdt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=stTimeHour]").val().replace('시', '') + "" +$(this).find("[name=stTimeMin]").val().replace('분', '') + "00";
-			var dispEddt = $(this).find("[name=dispEddt]").val().replace(/[^0-9]/g, '') + "" +$(this).find("[name=edTimeHour]").val().replace('시', '') + "" +$(this).find("[name=edTimeMin]").val().replace('분', '') + "59";
-			var dispOrd = $(this).find("[name=dispOrd]").val();
-			var newImgFileArr = [];
+	}
 
-			var data = {
-				cateNo : cateNo
-				, contentsLoc : contentsLoc
-				, contentsType : radioValue
-				, dispOrd : dispOrd
-				, dispStdt : dispStdt
-				, dispEddt : dispEddt
-				, newImgFileArr : newImgFileArr
-				, strVar1 : strVar1
-				, strVar2 : brnadCasualList
-				, strVar3 : brnadGolfList
-				, strVar4 : brnadKidsList
-				, strTitle1 : strTitle1
-				, strTitle2 : strTitle2
-				, useYn : 'Y'
-			}
-			dataArr.push(data);
-		});
-		var jsonData = JSON.stringify(dataArr);
-		mcxDialog.confirm('컨텐츠를 저장 하시겠습니까?', {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",
-			sureBtnClick: function(){
-				gagajf.ajaxJsonSubmit('/display/contents/preview/save', jsonData, fnGetGnbTabContentsPreviewList);
-			}
-		});
-	});
+	// 창닫기
+	var fnMainGnbContentsPopupFormClose = function (){
+		uifnPopupClose('popupMainGnbContents');
+	}
 
-	var fnGetGnbTabContentsPreviewList = function (){
+	// 브랜드 코드에 해당하는 브랜드 명, 브랜드 이미지 join해서 가져와야함 -> 로직 수정 필요
+	var fnGetGnbBrandContentsPreviewList = function (){
 		$("#gnbTabList").html('');
 		var data = {cateNo : cateNo
 			,contentsLoc : contentsLoc
 		};
 		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit('/display/contents/preview/list', jsonData, fnCreateGnbTabLayout);
+		gagajf.ajaxJsonSubmit('/display/contents/preview/list', jsonData, fnCreateGnbBrandLayout);
 	}
 
-	var fnCreateGnbTabLayout = function (result){
-		var html = '';
-		for(var i=0; i<result.length; i++){
-			var dispStdt = result[i].dispStdt.split(" ");
-			var dispEddt = result[i].dispEddt.split(" ");
+	var fnCreateGnbBrandLayout = function (result){
 
-			html += '<table class="frmStyle tabTable" style="margin-bottom:30px" id="tabTable'+i+'">';
-			html += '<input type="hidden" name="idxTest" value="'+i+'" data-id="'+i+'">';
-			html += '<colgroup>';
-			html += '<col style="width:10%;"/>';
-			html += '<col style="width:55%;"/>';
-			html += '<col/>';
-			html += '</colgroup>';
-			html += '<thead>';
-			html += '<tr class="cateTypeTr">';
-			html += '<th>유형선택</th>';
-			html += '<td colspan="3">';
-			if(result[i].contentsType=='B'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="B" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>브랜드</label>';
-			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="B" onclick="fnChangeCateType(this,'+i+');"/>브랜드</label>';
-			}
-			if(result[i].contentsType=='C'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>대카테고리</label>';
-			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="C" onclick="fnChangeCateType(this,'+i+');"/>대카테고리</label>';
-			}
-			if(result[i].contentsType=='O'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="O" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>아울렛</label>';
-			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="O" onclick="fnChangeCateType(this,'+i+');"/>아울렛</label>';
-			}
-			if(result[i].contentsType=='L'){
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeCateType(this,'+i+');" checked="checked"/>이벤트링크</label>';
-			}else{
-				html += '<label class="rdoBtn"><input type="radio" name="cateType'+i+'" value="L" onclick="fnChangeCateType(this,'+i+');"/>이벤트링크</label>';
-			}
-			html += '</td>';
-			html += '</tr>';
-			html += '<tr><th>전시일시</th><td><input name="dispStdt" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="노출시작일" data-valid-type="calendar" value="'+dispStdt[0]+'"/>';
-			html += '<select name="stTimeHour" required="required" data-valid-name="노출기간 시작시간">';
-			html += fnCreateTimeOption(24);
-			html += '</select>';
-			html += '<select name="stTimeMin" required="required" data-valid-name="노출기간 시작시간">';
-			html += fnCreateTimeOption(60);
-			html += '</select>';
-			html += '<span> ~ </span>';
-			html += '<input name="dispEddt" type="text" class="w80 schDate" maxlength="10" required="required" data-valid-name="노출종료일" data-valid-type="calendar" value="'+dispEddt[0]+'"/>';
-			html += '<select name="edTimeHour" required="required" data-valid-name="노출기간 종료시간">';
-			html += fnCreateTimeOption(24,23);
-			html += '</select>';
-			html += '<select name="edTimeMin" required="required" data-valid-name="노출기간 종료시간">';
-			html += fnCreateTimeOption(60,59);
-			html += '</select>';
-			html += '<input name="dispOrd" type="text" class="w80"placeholder="전시순서" style="margin-left:5px; text-align:center" value="'+result[i].dispOrd+'"/>';
-			html += '</td>';
-			html += '<td class="aL cateTypeBtnArea">';
-			html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
-			html += '</tr>';
-			html += '</thead>';
-			html += '<tbody>';
-			if(result[i].contentsType=='B'){
-				html += '	<tr name="tabBrandRow">';
-				html += '		<th>캐주얼<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+i+'\',1);">브랜드조회</button></th>';
-				html += '		<td colspan="3" id="tabBrand1">';
-				html += '			<ul class="brandGroupUl">';
-
-				html += '			</ul>';
-				html += '		</td>';
-				html += '	</tr>';
-				html += '	<tr name="tabBrandRow">';
-				html += '		<th>골프<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+i+'\',2);">브랜드조회</button></th>';
-				html += '		<td colspan="3" id="tabBrand2">';
-				html += '			<ul class="brandGroupUl">';
-
-				html += '			</ul>';
-				html += '		</td>';
-				html += '	</tr>';
-				html += '	<tr name="tabBrandRow">';
-				html += '		<th>키즈<br><button type="button" class="btn btn-base btn-lg" onclick="fnSearchBrand(\''+i+'\',3);">브랜드조회</button></th>';
-				html += '		<td colspan="3" id="tabBrand3">';
-				html += '			<ul class="brandGroupUl">';
-
-				html += '			</ul>';
-				html += '		</td>';
-				html += '	</tr>';
-			}
-			else if(result[i].contentsType=='C'){
-				html += '	<tr name="tabCateRow">';
-				html += '		<th>카테고리</th>';
-				html += '		<td colspan="3">카테고리선택';
-				html += '			<select name="cate1List">';
-				html += '				<option value="">[선택]</option>';
-				for(let i=0; i<cate1List.length; i++){
-					if(strTitle2==cate1List[i].cd){
-						html += '<option value="'+cate1List[i].cd+'" selected="selected">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-					}else{
-						html += '<option value="'+cate1List[i].cd+'">['+cate1List[i].cd+'] '+cate1List[i].cdNm+'</option>';
-					}
-				}
-				html += '			</select>';
-				html += '		</td>';
-				html += '	</tr>';
-			}
-			else if(result[i].contentsType=='L'){
-				html += '	<tr name="tabLinkTitleRow" style="display:none;">';
-				html += '		<th>타이틀</th>';
-				html += '		<td><input name="title" type="text" maxlength="200" data-valid-name="타이틀" value="'+result[i].strTitle1+'"/></td>';
-				html += '	</tr>';
-				html += '	<tr name="tabLinkRow" style="display:none;">';
-				html += '		<th>링크 (없으면 #)</th>';
-				html += '		<td><input name="link" type="text" maxlength="200" data-valid-name="링크" value="'+result[i].strVar1+'"/></td>';
-				html += '	</tr>';
-			}
-			html += '</tbody>';
-			html += '</table>';
-		}
-		$("#gnbTabList").append(html);
-		$("#gnbTabList").sortable();
-		$('.schDate').datepicker("destroy");
-		$('.schDate').datepicker({
-			changeMonth: true,
-			changeYear: true,
-			defaultDate: $('.schDate').val()
-		});
-		tableIdx = $(".tabTable").length;
 	}
 
 	$(document).ready(function() {
 		$("#gnbTabList").disableSelection();
 		$("#gnbTabList").sortable({
 			stop: function(event, ui) {
-				fnResetTabIdx();
+				//fnResetTabIdx();
 			}
 		});
 
-		fnGetGnbTabContentsPreviewList();
+		if(contentsLoc=='STAB001'){
+			fnGetGnbBrandContentsPreviewList();
+		}else{
+			fnGetGnbCategoryContentsPreviewList();
+		}
+
 	});
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/display/MainListForm.html

@@ -385,12 +385,14 @@
 
 		if(cate1No=='1700'){
 			contentsLocHtml += '<option value="SGNB001">[SGNB001] STYLE24MALL > GNB > TOP배너</option>';
-			contentsLocHtml += '<option value="STAB001">[STAB001] STYLE24MALL > GNB > 카테고리탭</option>';
+			contentsLocHtml += '<option value="STAB001">[STAB001] STYLE24MALL > GNB > 브랜드</option>';
+			contentsLocHtml += '<option value="STAB002">[STAB002] STYLE24MALL > GNB > 카테고리</option>';
 			contentsLocHtml += '<option value="SKEY001">[SKEY001] STYLE24MALL > GNB > 검색어</option>';
 		}
 		if(cate1No=='4700'){
 			contentsLocHtml += '<option value="SGNB002">[SGNB001] STYLE24MALL > GNB > TOP배너(모바일)</option>';
-			contentsLocHtml += '<option value="STAB001">[STAB001] STYLE24MALL > GNB > 카테고리탭</option>';
+			contentsLocHtml += '<option value="STAB001">[STAB001] STYLE24MALL > GNB > 브랜드</option>';
+			contentsLocHtml += '<option value="STAB002">[STAB002] STYLE24MALL > GNB > 카테고리</option>';
 			contentsLocHtml += '<option value="SKEY001">[SKEY001] STYLE24MALL > GNB > 검색어</option>';
 		}
 		for(var i=0; i<contentsLocList.length; i++){
@@ -612,7 +614,7 @@
 		// 브랜드픽, MD추천 다른 팝업 사용
 		if(contentsLoc=='SMM007'||contentsLoc=='SMM009'){
 			cfnOpenMainMultiContentsPopup(cateNo, contentsLoc);
-		}else if(contentsLoc=='STAB001'){
+		}else if(contentsLoc=='STAB001' || contentsLoc=='STAB002'){
 			cfnOpenMainGnbContentsPopup(cateNo, contentsLoc);
 		}else{
 			cfnOpenMainContentsPopup(cateNo, contentsLoc);