From 719c18acfac48943d3a7e83d632234c1f8b3dab6 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 금, 10 12월 2021 18:43:44 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa

---
 src/main/webapp/scripts/main.js |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/scripts/main.js b/src/main/webapp/scripts/main.js
index 0973abc..eb07840 100644
--- a/src/main/webapp/scripts/main.js
+++ b/src/main/webapp/scripts/main.js
@@ -55,12 +55,14 @@
         'angularTranslate' : '../custom_components/angular-translate/angular-translate', //  �떎援��뼱 泥섎━�뿉 �궗�슜
         'commonController' : 'app/common/common.controller', //  怨듯넻 而⑦듃濡ㅻ윭
         'tableProvider' : '../custom_components/js-table/table.provider', //  �뀒�씠釉� �냽�꽦 媛믪쓣 愿�由ы븳�떎.
+        'treeProvider' : '../custom_components/js-tree/tree.provider', //   �듃由� �냽�꽦 媛믪쓣 愿�由ы븳�떎.
         'resourceProvider' : 'components/utils/resource.provider',   //  怨듯넻�쟻�쑝濡� �꽌踰� json �쟾�넚�뿉 �궗�슜
         'lodash' : '../bower_components/lodash/lodash.min', //  硫��떚 ���젆�듃, auto complete 而댄룷�꼳�듃�뱾�뿉�꽌 �궗�슜
         'angularDropMultiSelect' : '../custom_components/angular-multi-select/angularjs-dropdown-multiselect',  //  硫��떚 ���젆�듃 而댄룷�꼳�듃
         'jsTable' : '../custom_components/js-table/js-table.directive',   //  紐⑸줉 �솕硫댁뿉�꽌 �궗�슜�릺�뒗 �뀒�씠釉붿쓣 �샇異쒗븳�떎.
-        'jsTreeTable' : '../custom_components/js-table/js-tree-table.directive',   //  紐⑸줉 �솕硫댁뿉�꽌 �궗�슜�릺�뒗 �뀒�씠釉�(�듃由ш뎄議�)�쓣 �샇異쒗븳�떎.
+        'jsTree' : '../custom_components/js-tree/js-tree.directive',   //  紐⑸줉 �솕硫댁뿉�꽌 �궗�슜�릺�뒗 �뀒�씠釉�(�듃由ш뎄議�)�쓣 �샇異쒗븳�떎.
         'tableColumnGenerator' : '../custom_components/js-table/tableColumnGenerator.directive', //  �뀒�씠釉� �옖�뜑�윭瑜� �떞�떦�븳�떎.
+        'treeColumnGenerator' : '../custom_components/js-tree/treeColumnGenerator.directive', //  �뀒�씠釉� �옖�뜑�윭瑜� �떞�떦�븳�떎.
         'jsAutoCompleteMulti' : '../custom_components/js-autocomplete-multi/js-autocomplete-multi', //  �떎以� �꽑�깮�씠 媛��뒫�븳 autoComplete 而댄룷�꼳�듃
         'jsInputAutoComplete' : '../custom_components/js-input-autocomplete/js-input-autocomplete',   //  input 諛뺤뒪�뿉 autoComplete 湲곕뒫�씠 遺숈� 而댄룷�꼳�듃
         'jsAutoCompleteSingle' : '../custom_components/js-autocomplete-single/js-autocomplete-single',   //  input 諛뺤뒪�뿉 �븳媛쒖쓽 ���긽留� �꽑�깮 媛��뒫�븷�닔 �엳�뒗 autoComplete 湲곕뒫�씠 遺숈� 而댄룷�꼳�듃
@@ -400,10 +402,13 @@
         'jsTable' : {
             deps : ['app']
         },
-        'jsTreeTable' : {
+        'jsTree' : {
             deps : ['app']
         },
         'tableColumnGenerator' : {
+            deps : ['app']
+        },
+        'treeColumnGenerator' : {
             deps : ['app']
         },
         'ngStomp' : {
@@ -523,6 +528,7 @@
     'authInterceptor',
     'resourceProvider',
     'tableProvider',
+    'treeProvider',
     'permissionService',
     'authService',
     'userInviteService',

--
Gitblit v1.8.0