From b69416fc721e8f0eb478536bf0d98ae3f6c4811e Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 수, 24 11월 2021 17:57:08 +0900 Subject: [PATCH] 이슈 상세 연관,하위 테이블 표시 설정 - [프론트] --- src/main/webapp/views/issue/issueDetail.html | 95 ++++++++++++++++++++++++++++------------------- 1 files changed, 57 insertions(+), 38 deletions(-) diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index 3fe8695..5b82040 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -189,18 +189,45 @@ <div class="col-md-4"> <div class="form-group"> <h6 class="info_font" translate="common.detectingInfo">�깘吏��젙蹂�</h6> - <div class=""> - <label class="issue-detail-label"><span translate="common.diffuserURL">�쑀�룷�옄URL</span> </label> - <label class="issue-detail-label offset-2"><span translate="common.country">援�媛�</span></label> - <div class=""> - <span>200.11.13.123</span> - <span class="country">US</span> - </div> -<!-- <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span>--> + </div> + </div> + </div> + <!-- �궗�슜�옄 �젙�쓽 �븘�뱶 --> + <div class="row"> + <div class="col-md-2" ng-repeat="issueCustomField in vm.viewer.issueCustomFields"> + <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label> + + <div ng-switch on="issueCustomField.customFieldVo.customFieldType"> + <!-- 湲곕낯 �엯�젰 --> + <div ng-switch-when="INPUT"> + <!-- �씫湲� 紐⑤뱶 --> + <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span> + <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span> + </div> + + <!-- �떒�씪 ���젆�듃 --> + <div ng-switch-when="SINGLE_SELECT"> + <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span> + <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span> + </div> + + <!-- 硫��떚 ���젆�듃 --> + <div ng-switch-when="MULTI_SELECT"> + <span class="issue-detail-word-break" + ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span> + <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span> </div> </div> </div> </div> + + <!-- <div class=""> + <label class="issue-detail-label"><span>{{vm.viewer.issueCustomFieldValueVos[0].useValue}}</span> </label> + <div class=""> + <span>{{vm.viewer.issueCustomFieldValueVos[0].customFieldVo.name}}</span> + </div> + <span ng-if="vm.viewer.userVos.length < 1" translate="common.noAssignee">�떞�떦�옄媛� �뾾�뒿�땲�떎.</span> + </div>--> <hr> <!-- <span class="tag">{{vm.viewer.projectVo.projectKey}}-{{vm.viewer.issueNumber}} / {{vm.viewer.projectVo.name}}</span>--> <div class="row"> @@ -377,36 +404,17 @@ </div> - <div class="row"> - <div class="col-md-4" ng-repeat="issueCustomField in vm.viewer.issueCustomFields"> - <label class="issue-detail-label">{{::issueCustomField.customFieldVo.name}}</label> - <div ng-switch on="issueCustomField.customFieldVo.customFieldType"> - <!-- 湲곕낯 �엯�젰 --> - <div ng-switch-when="INPUT" class="form-group"> - <!-- �씫湲� 紐⑤뱶 --> - <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span> - <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span> - </div> - - <!-- �떒�씪 ���젆�듃 --> - <div ng-switch-when="SINGLE_SELECT" class="form-group"> - <span class="issue-detail-word-break">{{::issueCustomField.useValues}}</span> - <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span> - </div> - - <!-- 硫��떚 ���젆�듃 --> - <div ng-switch-when="MULTI_SELECT" class="form-group"> - <span class="issue-detail-word-break" - ng-repeat="useValue in issueCustomField.useValues">{{::useValue.value}}, </span> - <span ng-if="!$root.isDefined(issueCustomField.useValues)">-</span> - </div> - </div> + <div class="row mt-30"> + <div class="col-md-10"> + <span class="info_font h3" translate="issue.relationIssue">�뿰愿� �씠�뒋</span> + </div> + <div class="col-md-1"> + <button class="btn btn-darkgrey offset-12" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button> </div> </div> - <h6 class="todo-content-subheader mt-20" translate="issue.relationIssue">�뿰愿� �씪媛�</h6> - <!-- �뀒�씠釉� --> + <!-- �뿰愿� �씠�뒋 �뀒�씠釉� --> <div class="mt-10 issue-detail-word-break width-100"> <js-table data="vm.viewer.issueRelationVos" table-configs="vm.relTableConfigs" event="relTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table> @@ -438,14 +446,22 @@ <div class="col-auto vertical-middle"> <button type="button" class="btn btn-primary form-control input-sm" ng-click="fn.addRelationIssue()" - translate="issue.addRelationIssue">異붽�</button> + translate="issue.addRelationIssue">�뿰愿� �씠�뒋 異붽�</button> </div> </div> </div> - <h6 class="todo-content-subheader mt-20" translate="issue.downIssue">�븯�쐞 �씪媛�</h6> - <!-- �뀒�씠釉� --> + <div class="row mt-30"> + <div class="col-md-10"> + <span class="info_font h3" translate="issue.downIssue">�븯�쐞 �씠�뒋</span> + </div> + <div class="col-md-1"> + <button class="btn btn-darkgrey offset-12" ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button> + </div> + </div> + + <!-- �븯�쐞 �씠�뒋 �뀒�씠釉� --> <div class="mt-10 issue-detail-word-break width-100"> <js-table data="vm.viewer.issueDownVos" table-configs="vm.downTableConfigs" event="downTableEvent" detail-view="true" hide-header="false" use-sort="false"></js-table> @@ -472,7 +488,7 @@ </div> </div> - <h6 class="todo-content-subheader mt-20" translate="common.content">�궡�슜</h6> + <h6 class="todo-content-subheader mt-30" translate="common.content">�궡�슜</h6> <div class="box mt-10 issue-detail-word-break width-100" > <div ng-bind-html="$root.$sce.trustAsHtml(vm.viewer.description)"></div> <span class="fc-grey" ng-if="!$root.isDefined(vm.viewer.description)" translate="common.noContent"> @@ -664,6 +680,9 @@ translate="common.noRecord"> 湲곕줉�씠 �뾾�뒿�땲�떎. </div> + <div> + {{vm.viewer.issueHistoryVos}} + </div> <div class="activity-item" ng-repeat="issueHistory in vm.viewer.issueHistoryVos"> -- Gitblit v1.8.0