Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/js/app/config.js

@@ -1752,7 +1752,7 @@ function itp_fn_grid_paging(grid_id, action, args) {
 	let currentPage = gridOption.page;
 	const lastPage = gridOption.lastpage;
     const userPage = $(suffix).find('.ui-pg-input').val();
-
+	if(!currentPage) currentPage=1;
     if (action == 'next') {
         if (currentPage < lastPage) {
             currentPage += 1;
@@ -1773,10 +1773,14 @@ function itp_fn_grid_paging(grid_id, action, args) {
         }
     }
 
-    args.gridPage = currentPage;
-    $(grid_id).setGridParam({
-        postData : JSON.stringify(args)
-    });
+    var param=$(grid_id).data('grid-param');
+	if( typeof param=='object' ) {
+		console.log("itp_fn_grid_paging param==",param);
+	} else {
+		param=args;
+	}
+    param.gridPage = currentPage;
+    $(grid_id).setGridParam( {'postData': JSON.stringify(param)});
 };
 
 function itp_fn_grid_sorting(grid_id, index, sortOrder, args) {

src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -46,45 +46,15 @@ let API_DETAIL_SAVE 		= '/api/user/save-user';
 let API_CHECK_DUPLICATE 	= '/api/user/check-duplicate';
 let API_INTI_USERPW 		= '/api/user/inti-userpw';
 let API_POP_GRID_LIST 		= '/api/brand/pop-grid-list';
-
-let gridParams=null;
-function itp_fn_grid_make_remote(option) {
-	var options = $.extend({
-		mtype: 'POST',
-		multiselect: false,
-		rownumbers: true,
-		
-		ondblClickRow: null,
-		loadBeforeSend: function(jqXHR) {
-			jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
-		},
-		onPaging: function(action) {
-			console.log("xxxxxx onPaging xxxxxxxx", option.param, gridParams );
-			itp_fn_grid_paging(option.gridId, action, gridParams);
-		},
-		loadError: function(jqXHR, textStatus, errorThrown) {
-			itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
-		}
-	}, option);
-
-	$(options.gridId).jqGrid({
-		colModel: options.colModel,
-		postData: JSON.stringify(options.param),
-		mtype: options.mtype,
-		url: options.url,
-		pager: options.pager,
-		multiselect: options.multiselect,
-		rownumbers: options.rownumbers,
-		loadBeforeSend: options.loadBeforeSend,
-		onCellSelect: options.onCellSelect,
-		ondblClickRow: options.ondblClickRow,
-		loadComplete: options.loadComplete,
-		loadError: options.loadError,
-		onPaging: options.onPaging
-	}).navGrid(options.pager, ITP_GRID_NAV_DEFAULTS.navGrid); 
-	console.log("xxxxxx itp_fn_grid_make_remote xxxxxxxx", options );
-}
-
+ 
+$(window).on('resize', function(e) {
+	setTimeout(()=>{
+		const left=$(OPER01010_GRID_PAGER+'_left'), pageing=$(OPER01010_GRID_PAGER+'_center').find('table');
+		left.width(60);
+		pageing.width(150);
+	}, 100);
+});
+ 
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
@@ -237,7 +207,6 @@ const gridColModel = {
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		itp_fn_jqgrid_resize(OPER01010_GRID_ID, OPER01010_GRID_LIST, 'lg');
 		this.ui.init();
 		this.event.init();
 		afflShopObj.init();
@@ -361,6 +330,7 @@ let pageObj = {
 			$(this).hide();
 		});
 		if(mode === 'LIST') { // 목록
+			itp_fn_fire_window_resize();
 			$('#ITP_AJAX_OPER01010_LIST_CONTAINER').show();
 			if(fn_make_user_info.get('authTpCd') === '10') {
 				$('#ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM').attr('readonly', false);
@@ -423,7 +393,7 @@ let listObj = {
 			let param = $('#ITP_FORM_OPER01010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.gridPage = $.jgrid.defaults.page;
-			gridParams=param;
+			$(OPER01010_GRID_ID).data('grid-param',param);
 			$(OPER01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 		},
 		create:  function () {
@@ -436,8 +406,7 @@ let listObj = {
 		init: function() {
 			// 데이터 없을때
 			this.itp_fn_OPER01010_empty.push();
-			//itp_fn_jqgrid_resize(OPER01010_GRID_ID, OPER01010_GRID_LIST, 'lg');
-			itp_fn_fire_window_resize();
+			itp_fn_jqgrid_resize(OPER01010_GRID_ID, OPER01010_GRID_LIST, 'lg'); 
 			this.search();
 		},
 		colModel: gridColModel.list,