Merge remote-tracking branch 'origin/develop' into card007

src/main/webapp/WEB-INF/views/business/BrandGroupPopupForm.html

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

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

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

src/main/webapp/WEB-INF/views/business/MdListForm.html

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

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)))();
 						}
 					}
 				}

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

@@ -99,8 +99,11 @@
 				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');

src/main/webapp/WEB-INF/views/goods/FreeGoodsSearchForm.html

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

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

@@ -505,8 +505,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');

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

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