diff --git a/.gitignore b/.gitignore index 988e912..5fd2ede 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.settings/ /.project /target/ +/.classpath diff --git a/src/main/webapp/resources/js/base/actionGroup.js b/src/main/webapp/resources/js/base/actionGroup.js index 1773b7d..83066bf 100644 --- a/src/main/webapp/resources/js/base/actionGroup.js +++ b/src/main/webapp/resources/js/base/actionGroup.js @@ -38,10 +38,9 @@ class ActionGroupControl { if (!this.linked) return; let row = item ? item.data : null; - if (row) { - this.actions.query.groupIDs = row.GRP_ID; - this.actions.load(); - } else + if (row) + this.getActions(row.GRP_ID, 1); + else this.actions.dataset.clear(); }; this.groups.onSelectionChange = selected => this.onGroupSelect(selected); diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js index e9f7a29..370f610 100644 --- a/src/main/webapp/resources/js/base/base.js +++ b/src/main/webapp/resources/js/base/base.js @@ -107,7 +107,7 @@ var dialog = { else { var self = this; ajax.get({ - url:wctx.url("/resources/html/dialog.html"), + url:wctx.url("/webjars/html/dialog.html"), success:function(resp) { self.template = resp; self.create(conf); @@ -151,6 +151,7 @@ var dialog = { if (conf.onOK) { let footer = dlg.find(".modal-footer"); + footer.removeClass("hidden"); footer.show(); footer.find("button").unbind("click").click(function() { if (conf.getData) { @@ -643,6 +644,12 @@ $.fn.setPaging = function(config) { config.last = function(index, label) {return '
  • '.replace(/{func}/, config.func.replace(/{index}/, label));}; return this.each(function(){ + let list = config.list, + start = list.empty ? 0 : config.start + 1, + end = list.empty ? 0 : config.start + list.length, + pagingInfo = list.empty ? "" : start + " ~ " + numberFormat.format(end) + " / " + numberFormat.format(config.totalSize); + $("#"+ config.prefix + "PagingInfo").html(pagingInfo); + let tag = paginate(config), container = $(this); if (tag) @@ -651,12 +658,16 @@ $.fn.setPaging = function(config) { if (config.hideIfEmpty != false) container.hide(); } - + + }); +} + +$.fn.setPagingInfo = function(config) { + return this.each(function(){ let list = config.list; - let pagingInfo = list.empty ? "" : - numberFormat.format(config.start + 1) + let pagingInfo = list.empty ? "" : 1 + " ~ " - + numberFormat.format(config.start + list.length) + + numberFormat.format(list.length) + " / " + numberFormat.format(config.totalSize); $("#"+ config.prefix + "PagingInfo").html(pagingInfo); }); diff --git a/src/main/webapp/resources/js/base/code-support.js b/src/main/webapp/resources/js/base/code-support.js index 4522758..6fc734a 100644 --- a/src/main/webapp/resources/js/base/code-support.js +++ b/src/main/webapp/resources/js/base/code-support.js @@ -3,6 +3,9 @@ class CommonCodes { codeList.forEach(item => this[item.code] = !asObject ? item.value : item); this.codes = () => codeList.map(item => item.code); this.list = () => codeList; + this.format = (code) => { + return this.value(code, ""); + } } _value(code, field) { diff --git a/src/main/webapp/resources/js/base/user.js b/src/main/webapp/resources/js/base/user.js index ba70e33..9e4f1aa 100644 --- a/src/main/webapp/resources/js/base/user.js +++ b/src/main/webapp/resources/js/base/user.js @@ -21,6 +21,7 @@ class UserControl extends DatasetControl { dialog.open({ title:"사용자 선택", content:resp, + size:"xl", getData:() => {return getSelectedUser();}, onOK:(selected) => resolve(selected) });