Merge branch 'features/ui-improvements' into jenkins_with_weblogic
This commit is contained in:
@@ -85,8 +85,8 @@
|
|||||||
url: url,
|
url: url,
|
||||||
postData: gridPostData,
|
postData: gridPostData,
|
||||||
colNames: ['업무구분',
|
colNames: ['업무구분',
|
||||||
'API 명(*)',
|
'API ID(*)',
|
||||||
'API 설명',
|
'API 명',
|
||||||
'요청',
|
'요청',
|
||||||
'응답',
|
'응답',
|
||||||
'작성자',
|
'작성자',
|
||||||
@@ -387,11 +387,11 @@
|
|||||||
<td>
|
<td>
|
||||||
<select name="searchEaiBzwkDstcd" value="${param.searchEaiBzwkDstcd}"></select>
|
<select name="searchEaiBzwkDstcd" value="${param.searchEaiBzwkDstcd}"></select>
|
||||||
</td>
|
</td>
|
||||||
<th style="width:180px;">API 명</th>
|
<th style="width:180px;">API ID</th>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" name="searchEaiSvcName" value="${param.searchEaiSvcName}">
|
<input type="text" name="searchEaiSvcName" value="${param.searchEaiSvcName}">
|
||||||
</td>
|
</td>
|
||||||
<th style="width:180px;">API설명</th>
|
<th style="width:180px;">API 명</th>
|
||||||
<td>
|
<td>
|
||||||
<input type="text" name="searchEaiSvcDesc" value="${param.searchEaiSvcDesc}">
|
<input type="text" name="searchEaiSvcDesc" value="${param.searchEaiSvcDesc}">
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -61,7 +61,13 @@
|
|||||||
.input-group {
|
.input-group {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* 어댑터, 메서드 라이브 서치 사용시 width 깨짐 방지 */
|
||||||
|
.select2-container {
|
||||||
|
width: 100% !important;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
<script language="javascript" >
|
<script language="javascript" >
|
||||||
var isDetail = false;
|
var isDetail = false;
|
||||||
@@ -172,6 +178,25 @@
|
|||||||
}
|
}
|
||||||
$('#eaiBzwkDstcd').select2();
|
$('#eaiBzwkDstcd').select2();
|
||||||
|
|
||||||
|
$('#fromAdapter').select2();
|
||||||
|
$('#toAdapter').select2();
|
||||||
|
|
||||||
|
$('#fromResponseAdapter').select2();
|
||||||
|
$('#toResponseAdapter').select2();
|
||||||
|
|
||||||
|
$('#inboundHttpMethod').select2();
|
||||||
|
$('#outboundHttpMethod').select2();
|
||||||
|
|
||||||
|
$('#newBizCode').select2({
|
||||||
|
dropdownParent: $('#cloneInterfaceModal'),
|
||||||
|
width: '100%'
|
||||||
|
});
|
||||||
|
|
||||||
|
$('#newInboundHttpMethod').select2({
|
||||||
|
dropdownParent: $('#cloneInterfaceModal'),
|
||||||
|
width: '100%'
|
||||||
|
});
|
||||||
|
|
||||||
fromAdapterMessageKeyMap = json.fromAdapterMessageKeyMap;
|
fromAdapterMessageKeyMap = json.fromAdapterMessageKeyMap;
|
||||||
stdCommonFieldDefinitions = json.stdCommonFieldDefinitions;
|
stdCommonFieldDefinitions = json.stdCommonFieldDefinitions;
|
||||||
initStdCommonFieldDefinitions(stdCommonFieldDefinitions);
|
initStdCommonFieldDefinitions(stdCommonFieldDefinitions);
|
||||||
@@ -1344,7 +1369,6 @@
|
|||||||
<button type="button" class="cssbtn" id="btn_modify" level="R" status="DETAIL,NEW"><i class="material-icons">save</i> <%= localeMessage.getString("button.modify") %></button>
|
<button type="button" class="cssbtn" id="btn_modify" level="R" status="DETAIL,NEW"><i class="material-icons">save</i> <%= localeMessage.getString("button.modify") %></button>
|
||||||
<button type="button" class="cssbtn" id="btn_api_spec" level="R" status="DETAIL,NEW"><i class="material-icons">description</i> API 스펙</button>
|
<button type="button" class="cssbtn" id="btn_api_spec" level="R" status="DETAIL,NEW"><i class="material-icons">description</i> API 스펙</button>
|
||||||
<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
|
<button type="button" class="cssbtn" id="btn_previous" level="R" status="DETAIL,NEW"><i class="material-icons">arrow_back</i> <%= localeMessage.getString("button.previous") %></button>
|
||||||
<%-- <button type="button" class="cssbtn" id="btn_excel_export" level="R" status="DETAIL"><i class="material-icons">table_view</i> <%= localeMessage.getString("button.excel") %></button> --%>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="title" id="title" style="font-size:1.4em">${rmsMenuName}</div>
|
<div class="title" id="title" style="font-size:1.4em">${rmsMenuName}</div>
|
||||||
<form id="ajaxForm"
|
<form id="ajaxForm"
|
||||||
@@ -1363,7 +1387,7 @@
|
|||||||
|
|
||||||
<div class="form-group col-md-3">
|
<div class="form-group col-md-3">
|
||||||
<label for="eaiSvcName">
|
<label for="eaiSvcName">
|
||||||
<span class="material-icons-outlined">badge</span> API 명
|
<span class="material-icons-outlined">badge</span> API ID
|
||||||
</label>
|
</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input type="text"
|
<input type="text"
|
||||||
@@ -1389,7 +1413,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-group col-md-5">
|
<div class="form-group col-md-5">
|
||||||
<label for="eaiSvcDesc"><span class="material-icons-outlined">chat</span> 설명</label>
|
<label for="eaiSvcDesc"><span class="material-icons-outlined">chat</span> API 명</label>
|
||||||
<input type="text" class="form-control" id="eaiSvcDesc" name="eaiSvcDesc" required></input>
|
<input type="text" class="form-control" id="eaiSvcDesc" name="eaiSvcDesc" required></input>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-1">
|
<div class="form-group col-md-1">
|
||||||
@@ -1965,7 +1989,7 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group col-md-8">
|
<div class="form-group col-md-8">
|
||||||
<label for="newSvcName"><span class="material-icons-outlined">badge</span> API 명</label>
|
<label for="newSvcName"><span class="material-icons-outlined">badge</span> API ID</label>
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<input type="text" class="form-control" id="newSvcName" name="newSvcName" required>
|
<input type="text" class="form-control" id="newSvcName" name="newSvcName" required>
|
||||||
<span class="input-group-text" style="padding: 0; border: none;">
|
<span class="input-group-text" style="padding: 0; border: none;">
|
||||||
@@ -1984,8 +2008,8 @@
|
|||||||
<div class="form-group col-md-4">
|
<div class="form-group col-md-4">
|
||||||
<label for="newInboundHttpMethod"><span class="material-icons">http</span> <%= localeMessage.getString("apiInterface.recvMethod") %></label>
|
<label for="newInboundHttpMethod"><span class="material-icons">http</span> <%= localeMessage.getString("apiInterface.recvMethod") %></label>
|
||||||
<select id="newInboundHttpMethod" class="form-select" name="newInboundHttpMethod"></input>
|
<select id="newInboundHttpMethod" class="form-select" name="newInboundHttpMethod"></input>
|
||||||
<option value="get">GET</option>
|
|
||||||
<option value="post">POST</option>
|
<option value="post">POST</option>
|
||||||
|
<option value="get">GET</option>
|
||||||
<option value="put">PUT</option>
|
<option value="put">PUT</option>
|
||||||
<option value="patch">PATCH</option>
|
<option value="patch">PATCH</option>
|
||||||
<option value="delete">DELETE</option>
|
<option value="delete">DELETE</option>
|
||||||
|
|||||||
@@ -204,7 +204,7 @@
|
|||||||
error: function (e) {
|
error: function (e) {
|
||||||
alert(e.responseText);
|
alert(e.responseText);
|
||||||
},
|
},
|
||||||
complate: function() {
|
complete: function() {
|
||||||
$("[id^='btn_']").prop("disabled", false);
|
$("[id^='btn_']").prop("disabled", false);
|
||||||
$("#btn_save").text("수정");
|
$("#btn_save").text("수정");
|
||||||
}
|
}
|
||||||
@@ -277,7 +277,7 @@
|
|||||||
error: function(e) {
|
error: function(e) {
|
||||||
alert(e.responseText);
|
alert(e.responseText);
|
||||||
},
|
},
|
||||||
complate: function() {
|
complete: function() {
|
||||||
$("[id^='btn_']").prop("disabled", false);
|
$("[id^='btn_']").prop("disabled", false);
|
||||||
$("#btn_delete").text("삭제");
|
$("#btn_delete").text("삭제");
|
||||||
}
|
}
|
||||||
@@ -309,7 +309,7 @@
|
|||||||
error: function(e) {
|
error: function(e) {
|
||||||
alert("API 스펙 생성 중 오류가 발생했습니다: " + e.responseText);
|
alert("API 스펙 생성 중 오류가 발생했습니다: " + e.responseText);
|
||||||
},
|
},
|
||||||
complate: function() {
|
complete: function() {
|
||||||
$("[id^='btn_']").prop("disabled", false);
|
$("[id^='btn_']").prop("disabled", false);
|
||||||
$("#btn_generate_spec").text("SPEC 자동 생성");
|
$("#btn_generate_spec").text("SPEC 자동 생성");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -594,6 +594,7 @@ public class ApiInterfaceService extends OnlBaseService {
|
|||||||
|
|
||||||
// 25.11.25 HS04 APIFULLPATH 추가.
|
// 25.11.25 HS04 APIFULLPATH 추가.
|
||||||
List<AdapterUI> adapters = adapterGroup.getAdapters();
|
List<AdapterUI> adapters = adapterGroup.getAdapters();
|
||||||
|
String inboundHttpMethod = vo.getInboundHttpMethod().toUpperCase();
|
||||||
|
|
||||||
for (AdapterUI adapter : adapters) {
|
for (AdapterUI adapter : adapters) {
|
||||||
|
|
||||||
@@ -606,7 +607,7 @@ public class ApiInterfaceService extends OnlBaseService {
|
|||||||
for (AdapterPropUI prop : props) {
|
for (AdapterPropUI prop : props) {
|
||||||
if("API_PATH".equals(prop.getPrptyname())) {
|
if("API_PATH".equals(prop.getPrptyname())) {
|
||||||
|
|
||||||
String fullPath = prop.getPrpty2val() + "/" + vo.getInboundRestPath();
|
String fullPath = inboundHttpMethod + "|" + prop.getPrpty2val() + "/" + vo.getInboundRestPath();
|
||||||
vo.setApiFullPath(fullPath);
|
vo.setApiFullPath(fullPath);
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user