From f3d433b269f28e99dd352f5b69f8ef864c09e5b0 Mon Sep 17 00:00:00 2001
From: jhjang <jhjang@maprex.co.kr>
Date: 월, 29 11월 2021 14:33:06 +0900
Subject: [PATCH] - api 기본값 설정 기능 완료 - api 중복 필드 설정 기능 완료

---
 src/main/webapp/views/api/apiSettingOverlap.html |   74 +++++++++++++++++++++++++-----------
 1 files changed, 51 insertions(+), 23 deletions(-)

diff --git a/src/main/webapp/views/api/apiSettingOverlap.html b/src/main/webapp/views/api/apiSettingOverlap.html
index 6929f53..99d5598 100644
--- a/src/main/webapp/views/api/apiSettingOverlap.html
+++ b/src/main/webapp/views/api/apiSettingOverlap.html
@@ -2,35 +2,63 @@
 
 <div class="row">
     <div class="col-sm-5">
+
         <div class="element-wrapper">
-            <label for="issueAddForm4" class="issue-label"> <span
-                    translate="issue.issueType">�씠�뒋 ���엯</span>
-            </label>
-            <select id="issueAddForm4"
-                    name="issueType"
-                    class="form-control input-sm issue-select-label"
-                    ng-model="vm.form.issueTypeId"
-                    ng-change="fn.getIssueTypeCustomFields()"
-                    ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
-                    required>
-                <option ng-style="{ 'color' : '#353535' }" value="">�솃�럹�씠吏� 蹂�議� 媛먯�
-                </option>
-                <option ng-style="{ 'color' : '#353535' }" value="">寃쎌쑀吏� �깘吏�
-                </option>
-                <option ng-repeat="issueType in vm.issueTypes"
-                        ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
-                        value="{{issueType.id}}">�뿈&nbsp;{{issueType.name}}
-                </option>
-            </select>
+            <div class="form-group mb10">
+                <label for="issueTypeForm" class="issue-label">
+                    <span translate="issue.issueType">�씠�뒋 �쑀�삎</span>
+                </label>
+                <select id="issueTypeForm"
+                        name="issueType"
+                        class="form-control input-sm issue-select-label"
+                        ng-model="vm.issueTypeId"
+                        ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.issueTypeId) }"
+                        ng-change="fn.onChangeIssueTypeOverlap()"
+                        required>
+                    <option ng-repeat="issueType in vm.issueTypes"
+                            ng-style="{ 'color' : issueType.color, 'font-weight': 600 }"
+                            value="{{issueType.id}}"
+                            translate="{{issueType.name}}">
+                    </option>
+                </select>
+            </div>
         </div>
+
     </div>
 
 
 </div>
 
 <div class="element-box">
-    <p class="btn btn-secondary">
-        <span >寃쎌쑀吏�</span>
-        <span>횞</span>
-    </p>
+    <form role="form" name="apiSettingOverlapForm">
+        <div class="form-group">
+            <label><span translate="common.customField">�궗�슜�옄 �젙�쓽 �븘�뱶</span> </label>
+            <js-autocomplete-multi data-input-name="customField"
+                                   selected-model="vm.form.customFields"
+                                   search="vm.customFieldName"
+                                   source="fn.getCustomFieldList(vm.customFieldName, vm.form.customFields)"
+                                   input-disabled="false"
+                                   translation-texts="{ count : 'common.few', empty : 'common.emptyCustomField' }"
+                                   required
+                                   extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, maxlength : 100, autoResize : true }"></js-autocomplete-multi>
+
+            <div class="select3-selection__choicediv mt-10">
+                <span class="select3-selection__choice" ng-repeat="customField in vm.form.customFields">
+                    <span>{{customField.name}}</span>
+                    <span class="select3-selection__choice__remove" ng-click="fn.removeCustomField($index)">횞</span>
+                </span>
+            </div>
+        </div>
+
+        <div class="modal-footer buttons-on-right">
+            <button type="button" class="btn btn-md btn-secondary bold"
+                    ng-click="fn.resetOverlap()"><span translate="common.reset">珥덇린�솕</span>
+            </button>
+            <button type="button" class="btn btn-md btn-primary bold"
+                    js-short-cut
+                    js-short-cut-action="(fn.formCheck(apiSettingOverlapForm.$invalid) || $root.spinner) ? null : fn.formSubmitOverlap()"
+                    ng-click="fn.formSubmitOverlap()"><span translate="common.saved">�깮�꽦</span>
+            </button>
+      </div>
+    </form>
 </div>

--
Gitblit v1.8.0