From 174dc12380c54730014e86c8897be16389fc804f Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 21 2월 2022 11:42:38 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
index 8692998..970a9ff 100644
--- a/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
+++ b/src/main/webapp/custom_components/js-autocomplete-single/js-autocomplete-single.js
@@ -22,7 +22,7 @@
source : '&',
page : "=",
totalPage : "=",
- inputDisabled : "=",
+ inputDisabled : "=?",
customInput : "=",
},
templateUrl : "custom_components/js-autocomplete-single/js-autocomplete-single.html",
@@ -31,7 +31,7 @@
var blank_pattern = /^\s+|\s+$/g;
// �엯�젰 �븘�뱶 鍮꾪솢�꽦�솕
- if (!angular.isDefined($scope.inputDisabled)) {
+ if (!$rootScope.isDefined($scope.inputDisabled)) {
$scope.inputDisabled = false;
}
@@ -227,13 +227,13 @@
function toggleDropdown() {
// �븘�씠�뀥�씠 �꽑�깮�릺�뼱 �엳�쓣 寃쎌슦 紐⑸줉 �젅�씠�뼱�뒗 �몴�떆�맆 �닔 �뾾�떎.
$scope.open = true;
- // if ($scope.selectedModel.length > 0) {
- // $scope.open = false;
- // $scope.options = [];
- // }
- // else {
- // $scope.open = true;
- // }
+ if ($rootScope.isDefined($scope.search) && $rootScope.isDefined($scope.selectedModel) && $scope.selectedModel.length > 0) {
+ $scope.open = false;
+ $scope.options = [];
+ }
+ else {
+ $scope.open = true;
+ }
// �뙘�뾽 李쎌뿉�꽌 �엯�젰 �븘�뱶�뿉 �룷而ㅼ뒪媛� 媛�硫� �옄�룞 �뒪�겕濡�.
if ($scope.settings.autoResize) {
--
Gitblit v1.8.0