Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

이민희

2021-12-21 6565e26508224b5d1de1ff7cf0f263fe196790e9

Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

 src/main/webapp/assets/styles/main.css

@@ -5344,6 +5344,9 @@
    -ms-flex: 1 1 auto;
    flex: 1 1 auto;
    padding: 1rem;
    overflow-y: auto;
    overflow-x: hidden;
    max-height: 800px;
}

.modal-footer {

 src/main/webapp/scripts/app/issue/issueList.controller.js

@@ -56,6 +56,7 @@
                        title : "", //  제목
                        description : "",   //  내용
                        combinationIssueNumber : "",   //  이슈 번호
                        issueNumber : "",
                        projectType : "BTS_PROJECT",    //  프로젝트 유형
                        registerDateRange : "", //  등록일 기간 검색
                        startDateRange : "",    //  시작일 기간 검색
@@ -453,6 +454,7 @@
                        keyWord : $scope.vm.search.keyWord,
                        title : $scope.vm.search.title,
                        description : $scope.vm.search.description,
                        issueNumber : $scope.vm.search.issueNumber,
                        projectType : $scope.vm.search.projectType,
                        combinationIssueNumber : $scope.vm.search.combinationIssueNumber.trim(),
                        beginRegisterDate : "",

 src/main/webapp/scripts/components/utils/issueSearchArrayViewElement.directive.js

@@ -52,6 +52,10 @@
                                    case "project":
                                        makeTag += list.name;
                                        break;

                                    case "department":
                                        makeTag += list.byName;
                                        break;
                                }



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

@@ -47,6 +47,12 @@
                                                <issue-search-field-key-view-element lists="vm.issueStatuses"
                                                                                     keys="vm.search.issueStatusIds"></issue-search-field-key-view-element>

                                                <!-- 이슈 번호 -->
                                                <p ng-if="$root.isDefined(vm.search.issueNumber)">
                                                    {{vm.search.issueNumber}}
                                                    <span ng-click="vm.search.issueNumber = ''">×</span>
                                                </p>

                                                <!--    이슈 내용   -->
                                                <p ng-if="$root.isDefined(vm.search.description)">
                                                    {{vm.search.description}}
@@ -86,6 +92,10 @@
                                                    {{vm.search.registerDateRange}}
                                                    <span ng-click="vm.search.registerDateRange = ''">×</span>
                                                </p>

                                                <!-- 담당부서 -->
                                                <issue-search-array-view-element lists="vm.departments"
                                                                                 type="'department'"></issue-search-array-view-element>

                                                <!--    텍스트 입력 필드   -->
                                                <issue-search-custom-field-view-element
@@ -154,12 +164,12 @@
                                                    <div class="form-group">
                                                        <label> <span translate="issue.issueNumber">이슈 번호</span></label>
                                                        <input type="text"
                                                               name="name"
                                                               name="issueNumber"
                                                               class="form-control input-sm"
                                                               autocomplete="off"
                                                               kr-input
                                                               maxlength="20"
                                                               ng-model="vm.search.combinationIssueNumber">
                                                               ng-model="vm.search.issueNumber">
                                                    </div>
                                                </div>