Просмотр исходного кода

품목명 노출관련,
팝업 콜백관련 수정

eskim 4 лет назад
Родитель
Сommit
47987d6635

+ 2 - 10
src/main/java/com/style24/scm/support/config/TssWebMvcConfig.java

@@ -1,28 +1,21 @@
 package com.style24.scm.support.config;
 
 import java.nio.charset.Charset;
-import java.util.Iterator;
-import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.StringHttpMessageConverter;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.support.MultipartFilter;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.style24.core.support.filter.TscXssServletFilter;
-
 import com.style24.scm.support.interceptor.TssDefaultInterceptor;
 
+import com.gagaframework.web.core.filter.GagaXssServletFilter;
 import com.gagaframework.web.rest.client.GagaRequestStringTrim;
 
 /**
@@ -67,8 +60,7 @@ public class TssWebMvcConfig implements WebMvcConfigurer {
 	@Bean
 	public FilterRegistrationBean xssFilterRegistrationBean() {
 		FilterRegistrationBean bean = new FilterRegistrationBean();
-//		bean.setFilter(new GagaXssServletFilter());
-		bean.setFilter(new TscXssServletFilter());
+		bean.setFilter(new GagaXssServletFilter());
 		bean.setOrder(2);
 		bean.addUrlPatterns("/*");
 		return bean;

+ 2 - 2
src/main/webapp/WEB-INF/views/business/BrandPopupForm.html

@@ -125,9 +125,9 @@
 			} else {
 				if (callbackFn) {
 					if (callbackFn.indexOf("(") == -1) {
-						eval(callbackFn + "(" + jsonData + ")");
+						(new Function(callbackFn + "(" + jsonData + ");"))();
 					} else {
-						eval(callbackFn(jsonData));
+						(new Function(callbackFn(jsonData)))();
 					}
 				}
 			}

+ 2 - 2
src/main/webapp/WEB-INF/views/business/SupplyCompanyPopupForm.html

@@ -127,9 +127,9 @@
 				} else {
 					if (callbackFn) {
 						if (callbackFn.indexOf("(") == -1) {
-							eval(callbackFn + "(" + jsonData + ")");
+							(new Function(callbackFn + "(" + jsonData + ");"))();
 						} else {
-							eval(callbackFn(jsonData));
+							(new Function(callbackFn(jsonData)))();
 						}
 					}
 				}

+ 2 - 2
src/main/webapp/WEB-INF/views/common/ExcelUploadPopupForm.html

@@ -99,8 +99,8 @@
 				callback(jsonData);
 			}else{
 				if( callback ) {
-					if( callback.indexOf("(") == -1 ) eval( callback +"(" + jsonData+")");
-					else eval( callback(jsonData) );
+					if( callback.indexOf("(") == -1 ) (new Function(callback + "(" + jsonData + ");"))();
+					else (new Function(callback(jsonData)))();
 				}
 			}
 			uifnPopupClose('popupExcelUpload');

+ 5 - 1
src/main/webapp/WEB-INF/views/goods/GoodsListForm.html

@@ -405,7 +405,11 @@
 				return '<a href="javascript:void(0);">' + params.value + '</a>';
 			}
 		},
-		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-center'},
+		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-center',
+			cellRenderer: function (params) {
+				return params.value.replaceAll("&gt;", ">");
+			}
+		},
 		{headerName: "전시재고", field: "stockQtySum", width: 120, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();},
 			cellStyle : function(params){

+ 7 - 3
src/main/webapp/WEB-INF/views/goods/GoodsPopupListForm.html

@@ -253,7 +253,11 @@
 		{headerName: "브랜드명", field: "brandEnm", width: 130, cellClass: 'text-center'},
 		{headerName: "상품코드", field: "goodsCd", width: 140, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
-		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-left'},
+		{headerName: "품목", field: "itemkindNm", width: 150, cellClass: 'text-left',
+			cellRenderer: function (params) {
+				return params.value.replaceAll("&gt;", ">");
+			}
+		},
 		{headerName: "재고", field: "stockQtySum", width: 80, cellClass: 'text-right',
 			valueFormatter: function(params) {	return params.value.addComma();}
 		},
@@ -476,8 +480,8 @@
 				callback(jsonData);
 			}else{
 				if( callback ) {
-					if( callback.indexOf("(") == -1 ) eval( callback +"(" + jsonData+")");
-					else eval( callback(jsonData) );
+					if( callback.indexOf("(") == -1 ) (new Function(callback + "(" + jsonData + ");"))();
+					else (new Function(callback(jsonData)))();
 				}
 			}
 			//uiPopupClose('goodsPopupForm');

+ 4 - 1
src/main/webapp/WEB-INF/views/goods/ItemkindBaseForm.html

@@ -59,7 +59,10 @@
 		},
 		{headerName: "품목명", field: "itemkindNm", width: 350, cellClass: 'text-center',
 			cellEditor: 'textCellEditor',
-			cellEditorParams: { maxlength: 50, required: true }
+			cellEditorParams: { maxlength: 50, required: true },
+			cellRenderer: function (params) {
+				return params.value.replaceAll("&gt;", ">");
+			}
 		},
 		/* {headerName: "품목영문명", field: "itemkindEnm", width: 350, cellClass: 'text-center',
 			cellEditor: 'textCellEditor',

+ 5 - 1
src/main/webapp/WEB-INF/views/stock/GoodsSizeStockForm.html

@@ -205,7 +205,11 @@
 		},
 		{headerName: "브랜드명", field: "brandEnm", width: 130, cellClass: 'text-center'},
 		{headerName: "상품명", field: "goodsNm", width: 200, cellClass: 'text-left'},
-		{headerName: "품목", field: "itemkindNm", width: 180, cellClass: 'text-left'},
+		{headerName: "품목", field: "itemkindNm", width: 180, cellClass: 'text-left',
+			cellRenderer: function (params) {
+				return params.value.replaceAll("&gt;", ">");
+			}
+		},
 		{headerName: "상품상태", field: "goodsStat" , width: 120, cellClass: 'text-center',
 			cellEditorParams: { values: gagaAgGrid.extractValues(goodsStatList) },
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(goodsStatList, params.value); },