From 398a4927e195755bd6a46be99337efd8dacc3dc2 Mon Sep 17 00:00:00 2001
From: 박지현 <jhpark@maprex.co.kr>
Date: 월, 07 3월 2022 18:08:13 +0900
Subject: [PATCH] Merge branch 'master' of http://maprex.iptime.org:9001/r/owl-kisa
---
src/main/webapp/scripts/app/companyField/companyFieldList.controller.js | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
index 33421f6..f3534dd 100644
--- a/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
+++ b/src/main/webapp/scripts/app/companyField/companyFieldList.controller.js
@@ -105,8 +105,25 @@
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.url")
- .setHWidth("bold")
+ .setHWidth("width-200-p bold")
.setDName("url")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("companyField.ipRange")
+ .setHWidth("width-120-p bold")
+ .setDName("ipRange")
+ .setDType("renderer")
+ .setDAlign("text-center")
+ .setDRenderer("COMPANYFIELD_IP"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.isp")
+ .setHWidth("bold")
+ .setDName("ispName")
+ .setDAlign("text-center"));
+ $scope.vm.tableConfigs.push($tableProvider.config()
+ .setHName("common.hosting")
+ .setHWidth("bold")
+ .setDName("hostingName")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("companyField.companyType")
@@ -132,11 +149,6 @@
.setHName("companyField.status")
.setHWidth("bold")
.setDName("statusName")
- .setDAlign("text-center"));
- $scope.vm.tableConfigs.push($tableProvider.config()
- .setHName("companyField.memo")
- .setHWidth("bold")
- .setDName("memo")
.setDAlign("text-center"));
}
@@ -198,6 +210,13 @@
data.email = data.email.replace(/\,/g,"</br>");
}
}
+ // url 議고쉶�떆 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.url)) {
+ data.url = data.url.trim();
+ if (data.url.indexOf(",") !== -1) {
+ data.url = data.url.replace(/\,/g,"</br>");
+ }
+ }
});
$scope.vm.responseData = result.data;
--
Gitblit v1.8.0