From 03a6eab48dc7a15df3711b227b1b5a91c4b1588b Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 목, 27 1월 2022 19:30:44 +0900
Subject: [PATCH] url 정규식 표현 제거
---
src/main/webapp/scripts/app/ispField/ispFieldList.controller.js | 45 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 40 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
index c9028dd..21b6a3e 100644
--- a/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
+++ b/src/main/webapp/scripts/app/ispField/ispFieldList.controller.js
@@ -15,6 +15,7 @@
$scope.fn = {
getPageList : getPageList, // ISP 愿�由� 由ъ뒪�듃
makeTableConfigs : makeTableConfigs, // �뀒�씠釉� �꽕�젙
+ changePageRowCount : changePageRowCount, // �럹�씠吏� 蹂�寃�
initSearch : initSearch, //寃��깋 議곌굔 珥덇린�솕
add : add, //ISP �깮�꽦
removes : removes, //ISP �궘�젣
@@ -54,6 +55,11 @@
$scope.fn.getPageList(0);
}
+ // �럹�씠吏� 蹂�寃�
+ function changePageRowCount() {
+ $scope.fn.getPageList(0);
+ }
+
// �궗�슜�옄 �젙�쓽 �븘�뱶 紐⑸줉 �뀒�씠釉� �꽕�젙
function makeTableConfigs() {
$scope.vm.tableConfigs = [];
@@ -82,11 +88,13 @@
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("ispField.tel")
.setHWidth("bold")
+ .setHWidth("width-200-p bold")
.setDName("tel")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
.setHName("ispField.email")
.setHWidth("bold")
+ .setHWidth("width-200-p bold")
.setDName("email")
.setDAlign("text-center"));
$scope.vm.tableConfigs.push($tableProvider.config()
@@ -128,11 +136,38 @@
if (result.data.message.status === "success") {
$scope.vm.page.selectedPage = currentPage + 1;
- // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽� �빐�꽌 議고쉶
- result.data.data.forEach(function (telData) {
- let hyphen = telData.tel.trim();
- let phone = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
- telData.tel = phone
+ result.data.data.forEach(function (data) {
+ // �쟾�솕踰덊샇 議고쉶�떆 �븯�씠�뵂 異붽�, 諛곗뿴 �삎�깭 �젣嫄�, 肄ㅻ쭏 湲곗� 以꾨컮轅�
+ if (data.tel != null && data.tel !== "") {
+ var tels = data.tel;
+ if (data.tel.indexOf("[") !== -1){
+ tels = data.tel.substr(1, data.tel.indexOf("]")-1);
+ }
+ var telArr = tels.split(",");
+
+ for (var i = 0; i < telArr.length; i++) {
+ let hyphen = telArr[i].trim();
+ if (hyphen.length < 9) {
+ telArr[i] = hyphen.replace(/^(\d{3,4})(\d{4})$/, "$1-$2");
+ } else {
+ telArr[i] = hyphen.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/, "$1-$2-$3");
+ }
+ if (telArr[i] === "") {
+ telArr.splice(i,1);
+ }
+ }
+ data.tel = telArr.join();
+ data.tel = data.tel.replace(/\,/g,"</br>");
+ }
+ // �씠硫붿씪 議고쉶�떆 諛곗뿴 �삎�깭 �젣嫄� 諛� 肄ㅻ쭏 湲곗��쑝濡� 以꾨컮轅�
+ if ($rootScope.isDefined(data.email)) {
+ if (data.email.indexOf("[") !== -1){
+ data.email = data.email.substr(1, data.email.indexOf("]")-1);
+ }
+ if (data.email.indexOf(",") !== -1) {
+ data.email = data.email.replace(/\,/g,"</br>");
+ }
+ }
});
$scope.vm.responseData = result.data;
--
Gitblit v1.8.0