From 7410b4773ab3be6650163dde9bfb70870136d166 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 12 11월 2021 17:56:29 +0900
Subject: [PATCH] $injector 오류 해결
---
src/main/webapp/views/companyField/companyFieldList.html | 4 ++--
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 21 ++++++++++-----------
src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js | 4 ++++
src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js | 4 +++-
src/main/webapp/scripts/main.js | 3 ++-
5 files changed, 21 insertions(+), 15 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 068d62f..cd59e36 100644
--- a/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
+++ b/src/main/webapp/custom_components/js-table/tableColumnGenerator.directive.js
@@ -352,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>";
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 99d318e..f8e895b 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -17,8 +17,8 @@
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //�뾽泥� �깮�꽦
+ makeSearchConditions : makeSearchConditions, //�뿊�� �떎�슫濡쒕뱶
removes : removes, //�뾽泥� �궘�젣
- makeSearchConditions : makeSearchConditions //�뿊�� �떎�슫濡쒕뱶
};
// 蹂��닔
@@ -52,6 +52,13 @@
function initSearch() {
$scope.vm.search.name = "";
$scope.fn.getPageList(0);
+ }
+
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ function makeSearchConditions() {
+ return{
+ name: $scope.vm.search.name
+ };
}
// �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
@@ -107,9 +114,8 @@
currentPage = selectedPage;
}
- var conditions = {
- name : $scope.vm.search.name //�뾽泥대챸
- };
+ // �뾽泥� 愿�由� 寃��깋 議곌굔�쓣 留뚮뱺�떎.
+ var conditions = $scope.fn.makeSearchConditions();
//�뀒�씠釉� 由ъ뒪�듃 �뜲�씠�꽣 而⑦듃濡ㅻ윭 �슂泥�
CompanyField.find($resourceProvider.getContent(conditions,
@@ -217,13 +223,6 @@
});
}
});
- }
-
- function makeSearchConditions() {
- var conditions = {
- name: $scope.vm.search.name
- }
- return conditions;
}
$scope.fn.makeTableConfigs();
diff --git a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
index 11d3190..62ce1fd 100644
--- a/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
+++ b/src/main/webapp/scripts/app/workspace/workspaceDepartmentConfig.controller.js
@@ -71,7 +71,9 @@
.setHName("manageDepartment.departmentEx")
.setHWidth("width-100-p bold")
.setDAlign("text-center")
- .setDName("departmentDescription"));
+ .setDName("departmentDescription")
+ .setDType("renderer")
+ .setDRenderer("DEPARTMENT_EX"));
$scope.vm.tableConfigs2.push($tableProvider.config()
.setHName("manageDepartment.departmentCount")
.setHWidth("width-120-p")
diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index 1c90030..e0d48fe 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -553,7 +553,8 @@
'workflowStatusService',
'companyFieldService',
'ispFieldService',
- 'hostingFieldService'
+ 'hostingFieldService',
+ 'userWorkspaceService'
], function ($, angular, domReady, app, sortable, crypto) {
// ���떆蹂대뱶�뿉�꽌 Sortable �씤�떇 紐삵븯�뒗 臾몄젣 �빐寃�
window.Sortable = sortable;
diff --git a/src/main/webapp/views/companyField/companyFieldList.html b/src/main/webapp/views/companyField/companyFieldList.html
index b4d6165..531f7f6 100644
--- a/src/main/webapp/views/companyField/companyFieldList.html
+++ b/src/main/webapp/views/companyField/companyFieldList.html
@@ -67,7 +67,7 @@
<div class="col-5 text-right" ng-if="$root.checkMngPermission('USER_PERMISSION_MNG_CUSTOME_FIELD')">
<form class="form-inline justify-content-sm-end pull-right" method="post"
action="/companyField/downloadExcel"
- name="companyFieldList">
+ name="companyFieldListForm">
<input type="hidden" name="conditions">
<div class="btn-group">
<button aria-expanded="false" aria-haspopup="true"
@@ -76,7 +76,7 @@
</button>
<div aria-labelledby="dropdownMenuButton2" class="dropdown-menu left-menu"
x-placement="bottom-start">
- <a class="dropdown-item cursor" form-submit="companyFieldList" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
+ <a class="dropdown-item cursor" form-submit="companyFieldListForm" make-search-conditions="fn.makeSearchConditions()"><span translate="common.downloadExcel">�뿊�� �떎�슫濡쒕뱶</span></a>
<a class="dropdown-item cursor" ng-click="fn.removes()"> <span translate="common.delete">�궘�젣</span></a>
</div>
</div>
--
Gitblit v1.8.0