From 1bcea4755d662f243400ac916f43550a3bc13ded Mon Sep 17 00:00:00 2001
From: wyu <kknd09321@nate.com>
Date: 월, 15 11월 2021 10:10:13 +0900
Subject: [PATCH] 엑셀 이름 커밋
---
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 61 +++++++++++++++++++++++++++---
1 files changed, 54 insertions(+), 7 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 4b63fd6..cd59e36 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -132,6 +132,21 @@
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;
+
case "CONFIG" :
makeTag += '<a ng-click="event.modify(data.id)"><i class="fa fa-pencil fa-lg" uib-tooltip="�닔�젙"></i></a>';
break;
@@ -337,6 +352,10 @@
}
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>";
@@ -346,14 +365,15 @@
}
break;
- case "DEPARTMENT_OPTION" :
- //if (scope.data.departmentId != null){
+ 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>";
- //}
+ }
+ 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" :
@@ -365,6 +385,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