From 534e55efdf01d429aa030d0738573becfa4d61bb Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 화, 16 11월 2021 16:53:43 +0900 Subject: [PATCH] 이슈 만들기 진행[프론트] --- src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 82 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 80 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js index 732c3b0..960fd55 100644 --- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js +++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js @@ -81,6 +81,13 @@ } break; + // �봽濡쒖젥�듃 �씠由�(�봽濡쒖젥�듃 由ъ뒪�듃�뿉�꽌 �궗�슜) + case "PROJECT_BASIC_NAME" : + if (scope.data.projectVo != null) { + makeTag += "<span class='titlenameSelect'>" + myToken + scope.data.projectVo.name.replace(/</gi, '<') + "</span>"; + } + break; + // �봽濡쒖젥�듃 紐⑸줉�뿉�꽌 �궗�슜�옄 �젙�쓽 �븘�뱶 �꽕�젙 �몴�떆 case "CUSTOM_FIELD_CONFIG" : // 愿�由ъ옄留� �닔�젙�븷 �닔 �엳�떎. @@ -129,6 +136,21 @@ makeTag += "<li>" + issueTypeVo.name + "</li>"; }); + makeTag += "</ul>"; + break; + + case "USE_DEPARTMENT_LIST" : + makeTag += "<ul class='ul-not-comma'>"; + + if(scope.data.departmentVos != null && scope.data.departmentVos.length == 0){ //�냽�빐�엳�뒗 遺��꽌媛� �뾾�쓣 寃쎌슦 + makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>遺��꽌瑜� �꽑�깮�빐 二쇱꽭�슂.</div>"; + }else{ + makeTag += "<div style='cursor: pointer; color: #0066ff'' ng-click='event.modifyUserDepartments(data.id, data.userId)'>"; + angular.forEach(scope.data.departmentVos, function (departments) { + makeTag += "<li>" + departments.departmentName + "</li>"; + }); + makeTag += "</div>"; + } makeTag += "</ul>"; break; @@ -328,8 +350,37 @@ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.permGuide' ng-click='event.modifyLevelPermission(data)'><span class='slider round'></span></label>"; break; - case "DEPARTMENT_OPTION" : - makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change=''><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>"; + case "DEPARTMENT_MODIFY": + if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) { + makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.departmentModify(data.id)'>" + scope.data.departmentName + "</span>"; + } + else { + makeTag += "<span class='titlename cursor table-word-break-all'>" + scope.data.departmentName + "</span>"; + } + break; + + case "DEPARTMENT_EX": + makeTag += "<div style='margin-top: 5px;'>" + scope.data.departmentDescription + "</div>"; + break; + + case "DEPARTMENT_COUNT": + if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_WORKSPACE')) { + makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modifyDepartmentCount(data.id)'>" + scope.data.departmentCount + "</span>"; + } + else { + makeTag += "<span class='titlename cursor table-word-break-all'>" + scope.data.departmentCount + "</span>"; + } + break; + + case "DEPARTMENT_OPTION": + makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>"; + /*if (scope.data.departmentId != null){ + makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>"; + } + else{ + makeTag +="<select class='form-control input-sm' ng-model='data.departmentId' ng-change='event.modifyUserWorkspace(data)'><option>遺��꽌瑜� �꽑�깮 �븯�꽭�슂.</option>" + makeTag +="<option ng-repeat='department in data.departments' ng-value='department.fieldKey'>{{::department.fieldValue}}</option></select>"; + }*/ break; case "LEVEL_OPTION" : @@ -341,6 +392,33 @@ makeTag += "<label class='switch'><input type='checkbox' ng-model='data.useYn' ng-click='event.modifyUserWorkspace(data)'><span class='slider round'></span></label>"; break; + case "COMPANYFIELD_MODIFY" : + if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) { + makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>"; + } + else { + makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>"; + } + break; + + case "ISPFIELD_MODIFY" : + if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) { + makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>"; + } + else { + makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>"; + } + break; + + case "HOSTINGFIELD_MODIFY" : + if ($rootScope.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')) { + makeTag += "<span class='titlename cursor table-word-break-all' ng-click='event.modify(data.id)'>" + scope.data.name.replace(/</gi, '<') + "</span>"; + } + else { + makeTag += "<span class='titlename not-modify table-word-break-all'>" + scope.data.name + "</span>"; + } + break; + case "ISSUE_CUSTOM_FIELD_VALUE_VIEW" : var values = []; -- Gitblit v1.8.0