Merge remote-tracking branch 'origin/master'

jhjang

2021-12-07 12a790240ef0301f839a55e1846ed0c5a32dffee

 src/main/webapp/views/issue/issueAdd.html

@@ -39,7 +39,7 @@
                                                source="fn.getProjectList(vm.projectName, vm.form.projects, vm.autoCompletePage.project.page, fn.getProjectListCallBack)"
                                                page="vm.autoCompletePage.project.page"
                                                total-page="vm.autoCompletePage.project.totalPage"
                                                input-disabled="false"
                                                input-disabled="vm.form.projects != null ? vm.form.projects.length > 0 : false"
                                                translation-texts="{ empty : 'common.emptyProject' }"
                                                extra-settings="{ displayProp : 'name' , idProp : 'id', imageable : false, imagePathProp : '',
                                                type : '', maxlength : 200, autoResize : false, stopRemoveBodyEvent : true }"></js-autocomplete-single>
@@ -59,7 +59,8 @@
                                        ng-model="vm.form.issueTypeId"
                                        ng-change="fn.getIssueTypeCustomFields()"
                                        ng-style="{ 'color' : fn.getOptionColor(vm.issueTypes, vm.form.issueTypeId) }"
                                        required>
                                        required
                                        disabled>
                                    <option value="" translate="common.selectTarget" ng-style="{ 'color' : '#353535' }"><span
                                            translate="common.selectTarget">대상 선택</span>
                                    </option>
@@ -210,6 +211,20 @@
                    </div>
                </div>
            </div>

            <div class="row">
                <div class="col-sm-4">
                    <label class="issue-label" translate="issue.relationIssueType">연관 이슈 구분</label>
                    <select id="relationIssueType"
                            name="relationIssueType"
                            class="form-control input-sm"
                            ng-options="option.name for option in vm.relationIssueTypes track by option.id"
                            ng-model="vm.relationIssueType"
                            required>
                    </select>
                </div>
            </div>

            <hr>
            <div class="row">
                <div class="col-lg-4 fontcolor_green">
@@ -217,7 +232,7 @@
                </div>
            </div>

            <div class="col-lg-8">
            <div class="col-lg-12">
                <div class="row">
                    <div class="col-md-12">
                        <div class="form-group mgb5" ng-show="vm.form.issueCustomFields.length < 1">
@@ -226,9 +241,9 @@
                        </div>
                    </div>

                    <div class="col-md-6" ng-repeat="issueCustomField in vm.form.issueCustomFields">
                    <div class="col-md-4" ng-repeat="issueCustomField in vm.form.issueCustomFields">
                        <div class="form-group mgb5">
                            <label class="issue-label">{{issueCustomField.customFieldVo.name}}</label>
                            <label class="issue-label">{{issueCustomField.customFieldVo.name}}<code ng-if="" class="highlighter-rouge">&nbsp;*</code></label>

                            <div ng-switch on="issueCustomField.customFieldVo.customFieldType">
                                <!-- 기본 입력 -->
@@ -314,7 +329,9 @@
                    </div>
                </div>
            </div>

            <hr>

            <div ng-show="fn.containsPartner('업체')" class="row">
                <div class="col-lg-8 fontcolor_green">
                    <label class="issue-label"><span class="fontcolor_green" translate="companyField.info">업체정보</span>