From f70afaa8f93aac20634713265308feb3a111ff8d Mon Sep 17 00:00:00 2001 From: RuoYi Date: Sun, 31 Mar 2019 12:56:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=A5=E4=BE=9D3.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 34 +- ...0.3.docx => 若依环境使用手册.docx} | Bin 427636 -> 427779 bytes pom.xml | 8 +- .../controller/system/SysDeptController.java | 5 +- .../controller/system/SysMenuController.java | 5 +- .../system/SysProfileController.java | 5 - .../controller/system/SysRoleController.java | 103 +++++- .../src/main/resources/application.yml | 2 +- .../bootstrap-table/bootstrap-table.min.js | 2 +- .../main/resources/static/ruoyi/css/ry-ui.css | 124 +++++++ .../main/resources/static/ruoyi/js/ry-ui.js | 131 ++++++-- .../src/main/resources/templates/include.html | 73 +++- .../src/main/resources/templates/index.html | 4 +- .../src/main/resources/templates/login.html | 4 +- .../src/main/resources/templates/main.html | 57 +++- .../monitor/logininfor/logininfor.html | 12 +- .../templates/monitor/online/online.html | 11 +- .../templates/monitor/operlog/detail.html | 14 +- .../templates/monitor/operlog/operlog.html | 12 +- .../templates/monitor/server/server.html | 12 +- .../templates/system/config/add.html | 7 +- .../templates/system/config/config.html | 8 +- .../templates/system/config/edit.html | 7 +- .../resources/templates/system/dept/add.html | 7 +- .../resources/templates/system/dept/dept.html | 10 +- .../resources/templates/system/dept/edit.html | 7 +- .../resources/templates/system/dept/tree.html | 15 +- .../templates/system/dict/data/add.html | 7 +- .../templates/system/dict/data/data.html | 12 +- .../templates/system/dict/data/edit.html | 7 +- .../templates/system/dict/type/add.html | 9 +- .../templates/system/dict/type/edit.html | 9 +- .../templates/system/dict/type/type.html | 11 +- .../resources/templates/system/menu/add.html | 7 +- .../resources/templates/system/menu/edit.html | 7 +- .../resources/templates/system/menu/menu.html | 10 +- .../resources/templates/system/menu/tree.html | 15 +- .../templates/system/notice/add.html | 17 +- .../templates/system/notice/edit.html | 17 +- .../templates/system/notice/notice.html | 10 +- .../resources/templates/system/post/add.html | 7 +- .../resources/templates/system/post/edit.html | 7 +- .../resources/templates/system/post/post.html | 11 +- .../resources/templates/system/role/add.html | 11 +- .../templates/system/role/authUser.html | 154 +++++++++ .../system/role/{rule.html => dataScope.html} | 19 +- .../resources/templates/system/role/edit.html | 11 +- .../resources/templates/system/role/role.html | 26 +- .../templates/system/role/selectUser.html | 124 +++++++ .../resources/templates/system/user/add.html | 10 +- .../resources/templates/system/user/edit.html | 12 +- .../templates/system/user/profile/avatar.html | 13 +- .../templates/system/user/profile/edit.html | 122 ------- .../system/user/profile/profile.html | 313 ++++++++++++++---- .../system/user/profile/resetPwd.html | 7 +- .../templates/system/user/resetPwd.html | 7 +- .../resources/templates/system/user/user.html | 19 +- .../resources/templates/tool/build/build.html | 17 +- ruoyi-common/pom.xml | 4 +- .../java/com/ruoyi/common/config/Global.java | 2 +- .../core/controller/BaseController.java | 5 +- .../ruoyi/common/core/domain/AjaxResult.java | 204 ++++++++++-- ruoyi-framework/pom.xml | 2 +- ruoyi-generator/pom.xml | 10 +- .../com/ruoyi/generator/util/GenUtils.java | 2 +- .../resources/templates/tool/gen/gen.html | 8 +- .../src/main/resources/vm/html/add.html.vm | 9 +- .../src/main/resources/vm/html/edit.html.vm | 9 +- .../src/main/resources/vm/html/list.html.vm | 7 +- ruoyi-quartz/pom.xml | 2 +- .../resources/templates/monitor/job/add.html | 7 +- .../templates/monitor/job/detail.html | 8 +- .../resources/templates/monitor/job/edit.html | 7 +- .../resources/templates/monitor/job/job.html | 11 +- .../templates/monitor/job/jobLog.html | 10 +- ruoyi-system/pom.xml | 4 +- .../java/com/ruoyi/system/domain/SysUser.java | 13 + .../ruoyi/system/mapper/SysUserMapper.java | 18 +- .../system/mapper/SysUserRoleMapper.java | 18 + .../ruoyi/system/service/ISysRoleService.java | 28 +- .../ruoyi/system/service/ISysUserService.java | 18 +- .../service/impl/SysRoleServiceImpl.java | 48 ++- .../service/impl/SysUserServiceImpl.java | 27 +- .../resources/mapper/system/SysUserMapper.xml | 35 ++ .../mapper/system/SysUserRoleMapper.xml | 10 + sql/quartz.sql | 22 +- sql/{ry_20190313.sql => ry_20190401.sql} | 80 ++--- 87 files changed, 1727 insertions(+), 608 deletions(-) rename doc/{若依环境使用手册v1.0.3.docx => 若依环境使用手册.docx} (95%) create mode 100644 ruoyi-admin/src/main/resources/templates/system/role/authUser.html rename ruoyi-admin/src/main/resources/templates/system/role/{rule.html => dataScope.html} (83%) create mode 100644 ruoyi-admin/src/main/resources/templates/system/role/selectUser.html delete mode 100644 ruoyi-admin/src/main/resources/templates/system/user/profile/edit.html rename sql/{ry_20190313.sql => ry_20190401.sql} (93%) diff --git a/README.md b/README.md index ec80b539..c5d9ccec 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,9 @@ 若依基于hplus和inspinia两套后台系统模板开发。有需要可自行到群内下载。 -> RuoYi从3.0开始，进行模块拆分，将原先的单应用转变为多模块，如需单应用，请移步 [RuoYi-fast](https://gitee.com/y_project/RuoYi-fast) +> 如需单应用，请移步 [RuoYi-fast](https://gitee.com/y_project/RuoYi-fast) `(保持同步更新)`，如需Oracle版本，请移步 [RuoYi-oracle](http://doc.ruoyi.vip/#/standard/xmkz) `(不定时更新)` -> 推荐使用阿里云部署，通用云产品代金券 ：[点我领取](https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof) - -> 2019阿里云开年Hi购季 云服务器全场限时5折 ：[活动入口](https://www.aliyun.com/acts/product-section-2019/new-users?spm=5176.11533457.1089570.1.424777e3bwsfme&userCode=brki8iof) +> 阿里云通用云产品1888优惠券 ：[点我领取](https://promotion.aliyun.com/ntms/yunparter/invite.html?userCode=brki8iof)    腾讯云通用云产品2860优惠券 ：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)  `(仅限新用户)` ## 内置功能 @@ -44,30 +42,34 @@ - + - - + + - - + + + + + + - - + + - - + + - - + + - +
diff --git a/doc/若依环境使用手册v1.0.3.docx b/doc/若依环境使用手册.docx similarity index 95% rename from doc/若依环境使用手册v1.0.3.docx rename to doc/若依环境使用手册.docx index dd8af7ec1f5bab2890c4c7c1cb374621ae3a9396..3a14f84bf8745e1c46a4fa45293ef30d68d3d93c 100644 GIT binary patch delta 16459 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�e@#}AB*uNt@%niW5l|ZVRsS6pkA)G=3E_2 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 diff --git a/pom.xml b/pom.xml index ab9ba7d4..b2aa6b97 100644 --- a/pom.xml +++ b/pom.xml @@ -6,21 +6,21 @@ com.ruoyi ruoyi - 3.2 + 3.3 ruoyi http://www.ruoyi.vip 若依管理系统 - 3.2 + 3.3 UTF-8 UTF-8 1.8 1.4.0 2.0.0 1.3.2 - 1.1.13 + 1.1.14 1.19 2.3.2 2.7.0 @@ -34,7 +34,7 @@ 1.7 - + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index b2594de9..9bc9e813 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.AjaxResult.Type; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.StringUtils; @@ -113,11 +114,11 @@ public class SysDeptController extends BaseController { if (deptService.selectDeptCount(deptId) > 0) { - return error(1, "存在下级部门,不允许删除"); + return error(Type.WARN, "存在下级部门,不允许删除"); } if (deptService.checkDeptExistUser(deptId)) { - return error(1, "部门存在用户,不允许删除"); + return error(Type.WARN, "部门存在用户,不允许删除"); } return toAjax(deptService.deleteDeptById(deptId)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java index 07bdf367..79fb74ee 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.AjaxResult.Type; import com.ruoyi.common.core.domain.Ztree; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.util.ShiroUtils; @@ -61,11 +62,11 @@ public class SysMenuController extends BaseController { if (menuService.selectCountMenuByParentId(menuId) > 0) { - return error(1, "存在子菜单,不允许删除"); + return error(Type.WARN, "存在子菜单,不允许删除"); } if (menuService.selectCountRoleMenuByMenuId(menuId) > 0) { - return error(1, "菜单已分配,不允许删除"); + return error(Type.WARN, "菜单已分配,不允许删除"); } ShiroUtils.clearCachedAuthorizationInfo(); return toAjax(menuService.deleteMenuById(menuId)); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java index 433041fe..f8a462dd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java @@ -21,7 +21,6 @@ import com.ruoyi.common.utils.file.FileUploadUtils; import com.ruoyi.framework.shiro.service.SysPasswordService; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysUser; -import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysUserService; /** @@ -43,9 +42,6 @@ public class SysProfileController extends BaseController @Autowired private SysPasswordService passwordService; - @Autowired - private ISysDictDataService dictDataService; - /** * 个人信息 */ @@ -53,7 +49,6 @@ public class SysProfileController extends BaseController public String profile(ModelMap mmap) { SysUser user = ShiroUtils.getSysUser(); - user.setSex(dictDataService.selectDictLabel("sys_user_sex", user.getSex())); mmap.put("user", user); mmap.put("roleGroup", userService.selectUserRoleGroup(user.getUserId())); mmap.put("postGroup", userService.selectUserPostGroup(user.getUserId())); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java index 90dbe548..f35318cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java @@ -18,7 +18,10 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysRole; +import com.ruoyi.system.domain.SysUser; +import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysRoleService; +import com.ruoyi.system.service.ISysUserService; /** * 角色信息 @@ -34,6 +37,9 @@ public class SysRoleController extends BaseController @Autowired private ISysRoleService roleService; + @Autowired + private ISysUserService userService; + @RequiresPermissions("system:role:view") @GetMapping() public String role() @@ -111,26 +117,25 @@ public class SysRoleController extends BaseController } /** - * 新增数据权限 + * 角色分配数据权限 */ - @GetMapping("/rule/{roleId}") - public String rule(@PathVariable("roleId") Long roleId, ModelMap mmap) + @GetMapping("/authDataScope/{roleId}") + public String authDataScope(@PathVariable("roleId") Long roleId, ModelMap mmap) { mmap.put("role", roleService.selectRoleById(roleId)); - return prefix + "/rule"; + return prefix + "/dataScope"; } /** - * 修改保存数据权限 + * 保存角色分配数据权限 */ @RequiresPermissions("system:role:edit") @Log(title = "角色管理", businessType = BusinessType.UPDATE) - @PostMapping("/rule") + @PostMapping("/authDataScope") @ResponseBody - public AjaxResult ruleSave(SysRole role) + public AjaxResult authDataScopeSave(SysRole role) { - role.setUpdateBy(ShiroUtils.getLoginName()); - return toAjax(roleService.updateRule(role)); + return toAjax(roleService.authDataScope(role)); } @RequiresPermissions("system:role:remove") @@ -189,4 +194,84 @@ public class SysRoleController extends BaseController { return toAjax(roleService.changeStatus(role)); } + + /** + * 分配用户 + */ + @RequiresPermissions("system:role:edit") + @GetMapping("/authUser/{roleId}") + public String authUser(@PathVariable("roleId") Long roleId, ModelMap mmap) + { + mmap.put("role", roleService.selectRoleById(roleId)); + return prefix + "/authUser"; + } + + /** + * 查询已分配用户角色列表 + */ + @RequiresPermissions("system:role:list") + @PostMapping("/authUser/allocatedList") + @ResponseBody + public TableDataInfo allocatedList(SysUser user) + { + startPage(); + List list = userService.selectAllocatedList(user); + return getDataTable(list); + } + + /** + * 取消授权 + */ + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PostMapping("/authUser/cancel") + @ResponseBody + public AjaxResult cancelAuthUser(SysUserRole userRole) + { + return toAjax(roleService.deleteAuthUser(userRole)); + } + + /** + * 批量取消授权 + */ + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PostMapping("/authUser/cancelAll") + @ResponseBody + public AjaxResult cancelAuthUserAll(Long roleId, String userIds) + { + return toAjax(roleService.deleteAuthUsers(roleId, userIds)); + } + + /** + * 选择用户 + */ + @GetMapping("/authUser/selectUser/{roleId}") + public String selectUser(@PathVariable("roleId") Long roleId, ModelMap mmap) + { + mmap.put("role", roleService.selectRoleById(roleId)); + return prefix + "/selectUser"; + } + + /** + * 查询未分配用户角色列表 + */ + @RequiresPermissions("system:role:list") + @PostMapping("/authUser/unallocatedList") + @ResponseBody + public TableDataInfo unallocatedList(SysUser user) + { + startPage(); + List list = userService.selectUnallocatedList(user); + return getDataTable(list); + } + + /** + * 批量选择用户授权 + */ + @Log(title = "角色管理", businessType = BusinessType.GRANT) + @PostMapping("/authUser/selectAll") + @ResponseBody + public AjaxResult selectAuthUserAll(Long roleId, String userIds) + { + return toAjax(roleService.insertAuthUsers(roleId, userIds)); + } } \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index c75c1166..7fae75f7 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 名称 name: RuoYi # 版本 - version: 3.2.0 + version: 3.3.0 # 版权年份 copyrightYear: 2019 # 文件上传 diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js index 22fb13f2..31f567b6 100644 --- a/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/bootstrap-table.min.js @@ -5,4 +5,4 @@ * Licensed MIT License */ (function(j){var k=null;var m=function(u){var s=arguments,r=true,t=1;u=u.replace(/%s/g,function(){var v=s[t++];if(typeof v==="undefined"){r=false;return""}return v});return r?u:""};var c=function(t,v,u,s){var r="";j.each(t,function(w,x){if(x[v]===s){r=x[u];return false}return true});return r};var i=function(s,t){var r=-1;j.each(s,function(u,v){if(v.field===t){r=u;return false}return true});return r};var l=function(u){var y,x,w,A=0,B=[];for(y=0;y").addClass("fixed-table-scroll-inner"),u=j("
").addClass("fixed-table-scroll-outer"),s,r;u.append(t);j("body").append(u);s=t[0].offsetWidth;u.css("overflow","scroll");r=t[0].offsetWidth;if(s===r){r=u[0].clientWidth}u.remove();k=s-r}return k};var q=function(s,u,t,r){var v=u;if(typeof u==="string"){var w=u.split(".");if(w.length>1){v=window;j.each(w,function(x,y){v=v[y]})}else{v=window[u]}}if(typeof v==="object"){return v}if(typeof v==="function"){return v.apply(s,t)}if(!v&&typeof u==="string"&&m.apply(this,[u].concat(t))){return m.apply(this,[u].concat(t))}return r};var f=function(s,r,w){var x=Object.getOwnPropertyNames(s),u=Object.getOwnPropertyNames(r),v="";if(w){if(x.length!==u.length){return false}}for(var t=0;t-1){if(s[v]!==r[v]){return false}}}return true};var p=function(r){if(typeof r==="string"){return r.replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/'/g,"'").replace(/`/g,"`")}return r};var d=function(s){var r=0;s.children().each(function(){if(r0||!!navigator.userAgent.match(/Trident.*rv\:11\./))};var h=function(){if(!Object.keys){Object.keys=(function(){var t=Object.prototype.hasOwnProperty,u=!({toString:null}).propertyIsEnumerable("toString"),s=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"],r=s.length;return function(x){if(typeof x!=="object"&&(typeof x!=="function"||x===null)){throw new TypeError("Object.keys called on non-object")}var v=[],y,w;for(y in x){if(t.call(x,y)){v.push(y)}}if(u){for(w=0;w','
',this.options.paginationVAlign==="top"||this.options.paginationVAlign==="both"?'
':"",'
','
','
','
',this.options.formatLoadingMessage(),"
","
",'
',this.options.paginationVAlign==="bottom"||this.options.paginationVAlign==="both"?'
':"","
","
"].join(""));this.$container.insertAfter(this.$el);this.$tableContainer=this.$container.find(".fixed-table-container");this.$tableHeader=this.$container.find(".fixed-table-header");this.$tableBody=this.$container.find(".fixed-table-body");this.$tableLoading=this.$container.find(".fixed-table-loading");this.$tableFooter=this.$container.find(".fixed-table-footer");this.$toolbar=this.$container.find(".fixed-table-toolbar");this.$pagination=this.$container.find(".fixed-table-pagination");this.$tableBody.append(this.$el);this.$container.after('
');this.$el.addClass(this.options.classes);if(this.options.striped){this.$el.addClass("table-striped")}if(j.inArray("table-no-bordered",this.options.classes.split(" "))!==-1){this.$tableContainer.addClass("table-no-bordered")}};e.prototype.initTable=function(){var t=this,s=[],u=[];this.$header=this.$el.find(">thead");if(!this.$header.length){this.$header=j("").appendTo(this.$el)}this.$header.find("tr").each(function(){var v=[];j(this).find("th").each(function(){if(typeof j(this).data("field")!=="undefined"){j(this).data("field",j(this).data("field")+"")}v.push(j.extend({},{title:j(this).html(),"class":j(this).attr("class"),titleTooltip:j(this).attr("title"),rowspan:j(this).attr("rowspan")?+j(this).attr("rowspan"):undefined,colspan:j(this).attr("colspan")?+j(this).attr("colspan"):undefined},j(this).data()))});s.push(v)});if(!j.isArray(this.options.columns[0])){this.options.columns=[this.options.columns]}this.options.columns=j.extend(true,[],s,this.options.columns);this.columns=[];l(this.options.columns);j.each(this.options.columns,function(w,v){j.each(v,function(x,y){y=j.extend({},e.COLUMN_DEFAULTS,y);if(typeof y.fieldIndex!=="undefined"){t.columns[y.fieldIndex]=y}t.options.columns[w][x]=y})});if(this.options.data.length){return}var r=[];this.$el.find(">tbody>tr").each(function(w){var v={};v._id=j(this).attr("id");v._class=j(this).attr("class");v._data=g(j(this).data());j(this).find(">td").each(function(z){var E=j(this),B=+E.attr("colspan")||1,C=+E.attr("rowspan")||1,A,y;for(;r[w]&&r[w][z];z++){}for(A=z;A");if(v===0&&!t.options.cardView&&t.options.detailView){s.push(m('
',t.options.columns.length))}j.each(u,function(B,A){var F="",C="",E="",w="",D=m(' class="%s"',A["class"]),z=t.options.sortOrder||A.order,y="px",x=A.width;if(A.width!==undefined&&(!t.options.cardView)){if(typeof A.width==="string"){if(A.width.indexOf("%")!==-1){y="%"}}}if(A.width&&typeof A.width==="string"){x=A.width.replace("%","").replace("px","")}C=m("text-align: %s; ",A.halign?A.halign:A.align);E=m("text-align: %s; ",A.align);w=m("vertical-align: %s; ",A.valign);w+=m("width: %s; ",(A.checkbox||A.radio)&&!x?"36px":(x?x+y:undefined));if(typeof A.fieldIndex!=="undefined"){t.header.fields[A.fieldIndex]=A.field;t.header.styles[A.fieldIndex]=E+w;t.header.classes[A.fieldIndex]=D;t.header.formatters[A.fieldIndex]=A.formatter;t.header.events[A.fieldIndex]=A.events;t.header.sorters[A.fieldIndex]=A.sorter;t.header.sortNames[A.fieldIndex]=A.sortName;t.header.cellStyles[A.fieldIndex]=A.cellStyle;t.header.searchables[A.fieldIndex]=A.searchable;if(!A.visible){return}if(t.options.cardView&&(!A.cardVisible)){return}r[A.field]=A}s.push("");s.push(m('
',t.options.sortable&&A.sortable?"sortable both":""));F=A.title;if(A.checkbox){if(!t.options.singleSelect&&t.options.checkboxHeader){F=''}t.header.stateField=A.field}if(A.radio){F="";t.header.stateField=A.field;t.options.singleSelect=true}s.push(F);s.push("
");s.push('
');s.push("");s.push("")});s.push("")});this.$header.html(s.join(""));this.$header.find("th[data-field]").each(function(u){j(this).data(r[j(this).data("field")])});this.$container.off("click",".th-inner").on("click",".th-inner",function(u){var v=j(this);if(t.options.detailView){if(v.closest(".bootstrap-table")[0]!==t.$container[0]){return false}}if(t.options.sortable&&v.parent().data().sortable){t.onSort(u)}});this.$header.children().children().off("keypress").on("keypress",function(v){if(t.options.sortable&&j(this).data().sortable){var u=v.keyCode||v.which;if(u==13){t.onSort(v)}}});j(window).off("resize.bootstrap-table");if(!this.options.showHeader||this.options.cardView){this.$header.hide();this.$tableHeader.hide();this.$tableLoading.css("top",0)}else{this.$header.show();this.$tableHeader.show();this.$tableLoading.css("top",this.$header.outerHeight()+1);this.getCaret();j(window).on("resize.bootstrap-table",j.proxy(this.resetWidth,this))}this.$selectAll=this.$header.find('[name="btSelectAll"]');this.$selectAll.off("click").on("click",function(){var u=j(this).prop("checked");t[u?"checkAll":"uncheckAll"]();t.updateSelected()})};e.prototype.initFooter=function(){if(!this.options.showFooter||this.options.cardView){this.$tableFooter.hide()}else{this.$tableFooter.show()}};e.prototype.initData=function(s,r){if(r==="append"){this.data=this.data.concat(s)}else{if(r==="prepend"){this.data=[].concat(s).concat(this.data)}else{this.data=s||this.options.data}}if(r==="append"){this.options.data=this.options.data.concat(s)}else{if(r==="prepend"){this.options.data=[].concat(s).concat(this.options.data)}else{this.options.data=this.data}}if(this.options.sidePagination==="server"){return}this.initSort()};e.prototype.initSort=function(){var u=this,t=this.options.sortName,r=this.options.sortOrder==="desc"?-1:1,s=j.inArray(this.options.sortName,this.header.fields);if(this.options.customSort!==j.noop){this.options.customSort.apply(this,[this.options.sortName,this.options.sortOrder]);return}if(s!==-1){if(this.options.sortStable){j.each(this.data,function(v,w){if(!w.hasOwnProperty("_position")){w._position=v}})}this.data.sort(function(w,v){if(u.header.sortNames[s]){t=u.header.sortNames[s]}var y=o(w,t,u.options.escape),z=o(v,t,u.options.escape),x=q(u.header,u.header.sorters[s],[y,z]);if(x!==undefined){return r*x}if(y===undefined||y===null){y=""}if(z===undefined||z===null){z=""}if(u.options.sortStable&&y===z){y=w._position;z=v._position}if(j.isNumeric(y)&&j.isNumeric(z)){y=parseFloat(y);z=parseFloat(z);if(y',this.options.toolbarAlign)).appendTo(this.$toolbar).append(j(this.options.toolbar))}t=[m('
',this.options.buttonsAlign,this.options.buttonsAlign)];if(typeof this.options.icons==="string"){this.options.icons=q(null,this.options.icons)}if(this.options.showSearch){t.push(m('")}if(this.options.showPaginationSwitch){t.push(m('")}if(this.options.showRefresh){t.push(m('")}if(this.options.showToggle){t.push(m('")}if(this.options.showColumns){t.push(m('
',this.options.formatColumns()),'",'","
")}t.push("
");if(this.showToolbar||t.length>2){this.$toolbar.append(t.join(""))}if(this.options.showPaginationSwitch){this.$toolbar.find('button[name="paginationSwitch"]').off("click").on("click",j.proxy(this.togglePagination,this))}if(this.options.showRefresh){this.$toolbar.find('button[name="refresh"]').off("click").on("click",j.proxy(this.refresh,this))}if(this.options.showToggle){this.$toolbar.find('button[name="toggle"]').off("click").on("click",function(){u.toggleView()})}if(this.options.showSearch){this.$toolbar.find('button[name="showSearch"]').off("click").on("click",function(){j(".search-collapse").slideToggle()})}if(this.options.showColumns){s=this.$toolbar.find(".keep-open");if(r<=this.options.minimumCountColumns){s.find("input").prop("disabled",true)}s.find("li").off("click").on("click",function(x){x.stopImmediatePropagation()});s.find("input").off("click").on("click",function(){var x=j(this);u.toggleColumn(j(this).val(),x.prop("checked"),false);u.trigger("column-switch",j(this).data("field"),x.prop("checked"))})}if(this.options.search){t=[];t.push('
',m('',this.options.formatSearch()),"
");this.$toolbar.append(t.join(""));v=this.$toolbar.find(".search input");v.off("keyup drop").on("keyup drop",function(x){if(u.options.searchOnEnterKey&&x.keyCode!==13){return}if(j.inArray(x.keyCode,[37,38,39,40])>-1){return}clearTimeout(w);w=setTimeout(function(){u.onSearch(x)},u.options.searchTimeOut)});if(b()){v.off("mouseup").on("mouseup",function(x){clearTimeout(w);w=setTimeout(function(){u.onSearch(x)},u.options.searchTimeOut)})}}};e.prototype.onSearch=function(r){var s=j.trim(j(r.currentTarget).val());if(this.options.trimOnSearch&&j(r.currentTarget).val()!==s){j(r.currentTarget).val(s)}if(s===this.searchText){return}this.searchText=s;this.options.searchText=s;this.options.pageNumber=1;this.initSearch();this.updatePagination();this.trigger("search",s)};e.prototype.initSearch=function(){var t=this;if(this.options.sidePagination!=="server"){if(this.options.customSearch!==j.noop){this.options.customSearch.apply(this,[this.searchText]);return}var r=this.searchText&&(this.options.escape?p(this.searchText):this.searchText).toLowerCase();var u=j.isEmptyObject(this.filterColumns)?null:this.filterColumns;this.data=u?j.grep(this.options.data,function(w,v){for(var s in u){if(j.isArray(u[s])&&j.inArray(w[s],u[s])===-1||w[s]!==u[s]){return false}}return true}):this.options.data;this.data=r?j.grep(this.data,function(A,x){for(var v=0;v-1){r=true}}}this.totalPages=~~((this.options.totalRows-1)/this.options.pageSize)+1;this.options.totalPages=this.totalPages}if(this.totalPages>0&&this.options.pageNumber>this.totalPages){this.options.pageNumber=this.totalPages}this.pageFrom=(this.options.pageNumber-1)*this.options.pageSize+1;this.pageTo=this.options.pageNumber*this.options.pageSize;if(this.pageTo>this.options.totalRows){this.pageTo=this.options.totalRows}x.push('
','',this.options.onlyInfoPagination?this.options.formatDetailPagination(this.options.totalRows):this.options.formatShowingRows(this.pageFrom,this.pageTo,this.options.totalRows),"");if(!this.options.onlyInfoPagination){x.push('');var F=[m('',this.options.paginationVAlign==="top"||this.options.paginationVAlign==="both"?"dropdown":"dropup"),'",'");x.push(this.options.formatRecordsPerPage(F.join("")));x.push("");x.push("
",'")}this.$pagination.html(x.join(""));if(!this.options.onlyInfoPagination){w=this.$pagination.find(".page-list a");G=this.$pagination.find(".page-first");I=this.$pagination.find(".page-pre");E=this.$pagination.find(".page-next");y=this.$pagination.find(".page-last");u=this.$pagination.find(".page-number");if(this.options.smartDisplay){if(this.totalPages<=1){this.$pagination.find("div.pagination").hide()}if(t.length<2||this.options.totalRows<=t[0]){this.$pagination.find("span.page-list").hide()}this.$pagination[this.getData().length?"show":"hide"]()}if(r){this.options.pageSize=this.options.formatAllRows()}w.off("click").on("click",j.proxy(this.onPageListChange,this));G.off("click").on("click",j.proxy(this.onPageFirst,this));I.off("click").on("click",j.proxy(this.onPagePre,this));E.off("click").on("click",j.proxy(this.onPageNext,this));y.off("click").on("click",j.proxy(this.onPageLast,this));u.off("click").on("click",j.proxy(this.onPageNumber,this))}if(this.options.showPageGo){var v=this,C=this.$pagination.find("ul.pagination"),B=C.find("li.pageGo");if(!B.length){B=j(['
  • ',m('',this.options.pageNumber),'","
    • "].join("")).appendTo(C);B.find("button").click(function(){var K=parseInt(B.find("input").val())||1;if(K<1||K>v.options.totalPages){K=1}v.selectPage(K)})}}};e.prototype.updatePagination=function(r){if(r&&j(r.currentTarget).hasClass("disabled")){return}if(!this.options.maintainSelected){this.resetRows()}this.initPagination();if(this.options.sidePagination==="server"){this.initServer()}else{this.initBody()}this.trigger("page-change",this.options.pageNumber,this.options.pageSize)};e.prototype.onPageListChange=function(r){var s=j(r.currentTarget);s.parent().addClass("active").siblings().removeClass("active");this.options.pageSize=s.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+s.text();this.$toolbar.find(".page-size").text(this.options.pageSize);this.updatePagination(r)};e.prototype.onPageFirst=function(r){this.options.pageNumber=1;this.updatePagination(r)};e.prototype.onPagePre=function(r){if((this.options.pageNumber-1)===0){this.options.pageNumber=this.options.totalPages}else{this.options.pageNumber--}this.updatePagination(r) -};e.prototype.onPageNext=function(r){if((this.options.pageNumber+1)>this.options.totalPages){this.options.pageNumber=1}else{this.options.pageNumber++}this.updatePagination(r)};e.prototype.onPageLast=function(r){this.options.pageNumber=this.totalPages;this.updatePagination(r)};e.prototype.onPageNumber=function(r){if(this.options.pageNumber===+j(r.currentTarget).text()){return}this.options.pageNumber=+j(r.currentTarget).text();this.updatePagination(r)};e.prototype.initBody=function(x){var z=this,y=[],v=this.getData();this.trigger("pre-body",v);this.$body=this.$el.find(">tbody");if(!this.$body.length){this.$body=j("").appendTo(this.$el)}if(!this.options.pagination||this.options.sidePagination==="server"){this.pageFrom=1;this.pageTo=v.length}for(var w=this.pageFrom-1;w");if(this.options.cardView){y.push(m('
    ',this.header.fields.length))}if(!this.options.cardView&&this.options.detailView){y.push("",'',m('',this.options.iconsPrefix,this.options.icons.detailOpen),"","")}j.each(this.header.fields,function(I,L){var P="",M=o(C,L,z.options.escape),K="",E={},Q="",J=z.header.classes[I],G="",O="",R="",H="",F=z.columns[I];if(z.fromHtml&&typeof M==="undefined"){return}if(!F.visible){return}if(z.options.cardView&&!F.cardVisible){return}r=m('style="%s"',s.concat(z.header.styles[I]).join("; "));if(C["_"+L+"_id"]){Q=m(' id="%s"',C["_"+L+"_id"])}if(C["_"+L+"_class"]){J=m(' class="%s"',C["_"+L+"_class"])}if(C["_"+L+"_rowspan"]){O=m(' rowspan="%s"',C["_"+L+"_rowspan"])}if(C["_"+L+"_colspan"]){R=m(' colspan="%s"',C["_"+L+"_colspan"])}if(C["_"+L+"_title"]){H=m(' title="%s"',C["_"+L+"_title"])}E=q(z.header,z.header.cellStyles[I],[M,C,w,L],E);if(E.classes){J=m(' class="%s"',E.classes)}if(E.css){var D=[];for(var N in E.css){D.push(N+": "+E.css[N])}r=m('style="%s"',D.concat(z.header.styles[I]).join("; "))}M=q(F,z.header.formatters[I],[M,C,w],M);if(C["_"+L+"_data"]&&!j.isEmptyObject(C["_"+L+"_data"])){j.each(C["_"+L+"_data"],function(T,S){if(T==="index"){return}G+=m(' data-%s="%s"',T,S)})}if(F.checkbox||F.radio){K=F.checkbox?"checkbox":K;K=F.radio?"radio":K;P=[m(z.options.cardView?'
    ':'',F["class"]||""),"",z.header.formatters[I]&&typeof M==="string"?M:"",z.options.cardView?"
    ":""].join("");C[z.header.stateField]=M===true||(M&&M.checked)}else{M=typeof M==="undefined"||M===null?z.options.undefinedText:M;P=z.options.cardView?['
    ',z.options.showHeader?m('%s',r,c(z.columns,"field","title",L)):"",m('%s',M),"
    "].join(""):[m("",Q,J,r,G,O,R,H),M,""].join("");if(z.options.cardView&&z.options.smartDisplay&&M===""){P='
    '}}y.push(P)});if(this.options.cardView){y.push("
    ")}y.push("")}if(!y.length){y.push('',m('%s',this.$header.find("th").length,this.options.formatNoMatches()),"")}this.$body.html(y.join(""));if(!x){this.scrollTo(0)}this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",function(J){var D=j(this),F=D.parent(),M=z.data[F.data("index")],H=D[0].cellIndex,G=z.getVisibleFields(),K=G[z.options.detailView&&!z.options.cardView?H-1:H],E=z.columns[i(z.columns,K)],L=o(M,K,z.options.escape);if(D.find(".detail-icon").length){return}z.trigger(J.type==="click"?"click-cell":"dbl-click-cell",K,L,M,D);z.trigger(J.type==="click"?"click-row":"dbl-click-row",M,F,K);if(J.type==="click"&&z.options.clickToSelect&&E.clickToSelect){var I=F.find(m('[name="%s"]',z.options.selectItemName));if(I.length){I[0].click()}}});this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",function(){var H=j(this),G=H.parent().parent(),E=G.data("index"),I=v[E];if(G.next().is("tr.detail-view")){H.find("i").attr("class",m("%s %s",z.options.iconsPrefix,z.options.icons.detailOpen));G.next().remove();z.trigger("collapse-row",E,I)}else{H.find("i").attr("class",m("%s %s",z.options.iconsPrefix,z.options.icons.detailClose));G.after(m('',G.find("td").length));var D=G.next().find("td");var F=q(z.options,z.options.detailFormatter,[E,I,D],"");if(D.length===1){D.append(F)}z.trigger("expand-row",E,I,D)}z.resetView()});this.$selectItem=this.$body.find(m('[name="%s"]',this.options.selectItemName));this.$selectItem.off("click").on("click",function(E){E.stopImmediatePropagation();var F=j(this),D=F.prop("checked"),G=z.data[F.data("index")];if(z.options.maintainSelected&&j(this).is(":radio")){j.each(z.options.data,function(H,I){I[z.header.stateField]=false})}G[z.header.stateField]=D;if(z.options.singleSelect){z.$selectItem.not(this).each(function(){z.data[j(this).data("index")][z.header.stateField]=false});z.$selectItem.filter(":checked").not(this).prop("checked",false)}z.updateSelected();z.trigger(D?"check":"uncheck",G,F)});j.each(this.header.events,function(G,F){if(!F){return}if(typeof F==="string"){F=q(null,F)}var H=z.header.fields[G],D=j.inArray(H,z.getVisibleFields());if(z.options.detailView&&!z.options.cardView){D+=1}for(var E in F){z.$body.find(">tr:not(.no-records-found)").each(function(){var M=j(this),N=M.find(z.options.cardView?".card-view":"td").eq(D),J=E.indexOf(" "),I=E.substring(0,J),K=E.substring(J+1),L=F[E];N.find(K).off(I).on(I,function(Q){var O=M.data("index"),R=z.data[O],P=R[H];L.apply(this,[Q,P,R,O])})})}});this.updateSelected();this.resetView();this.trigger("post-body",v)};e.prototype.initServer=function(r,w,s){var u=this,v={},x={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder},t;if(this.options.pagination){x.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize;x.pageNumber=this.options.pageNumber}if(!(s||this.options.url)&&!this.options.ajax){return}if(this.options.queryParamsType==="limit"){x={search:x.searchText,sort:x.sortName,order:x.sortOrder};if(this.options.pagination){x.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1);x.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize}}if(!(j.isEmptyObject(this.filterColumnsPartial))){x.filter=JSON.stringify(this.filterColumnsPartial,null)}v=q(this.options,this.options.queryParams,[x],v);j.extend(v,w||{});if(v===false){return}if(!r){this.$tableLoading.show()}t=j.extend({},q(null,this.options.ajaxOptions),{type:this.options.method,url:s||this.options.url,data:this.options.contentType==="application/json"&&this.options.method==="post"?JSON.stringify(v):v,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(y){y=q(u.options,u.options.responseHandler,[y],y);u.load(y);u.trigger("load-success",y);if(!r){u.$tableLoading.hide()}},error:function(y){u.trigger("load-error",y.status,y);if(!r){u.$tableLoading.hide()}}});if(this.options.ajax){q(this,this.options.ajax,[t],null)}else{if(this._xhr&&this._xhr.readyState!==4){this._xhr.abort()}this._xhr=j.ajax(t)}};e.prototype.initSearchText=function(){if(this.options.search){if(this.options.searchText!==""){var r=this.$toolbar.find(".search input");r.val(this.options.searchText);this.onSearch({currentTarget:r})}}};e.prototype.getCaret=function(){var r=this;j.each(this.$header.find("th"),function(s,t){j(t).find(".sortable").removeClass("desc asc").addClass(j(t).data("field")===r.options.sortName?r.options.sortOrder:"both")})};e.prototype.updateSelected=function(){var r=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",r);this.$selectItem.each(function(){j(this).closest("tr")[j(this).prop("checked")?"addClass":"removeClass"]("selected")})};e.prototype.updateRows=function(){var r=this;this.$selectItem.each(function(){r.data[j(this).data("index")][r.header.stateField]=j(this).prop("checked")})};e.prototype.resetRows=function(){var r=this;j.each(this.data,function(s,t){r.$selectAll.prop("checked",false);r.$selectItem.prop("checked",false);if(r.header.stateField){t[r.header.stateField]=false}})};e.prototype.trigger=function(s){var r=Array.prototype.slice.call(arguments,1);s+=".bs.table";this.options[e.EVENTS[s]].apply(this.options,r);this.$el.trigger(j.Event(s),r);this.options.onAll(s,r);this.$el.trigger(j.Event("all.bs.table"),[s,r])};e.prototype.resetHeader=function(){clearTimeout(this.timeoutId_);this.timeoutId_=setTimeout(j.proxy(this.fitHeader,this),this.$el.is(":hidden")?100:0)};e.prototype.fitHeader=function(){var t=this,u,r,x,y;if(t.$el.is(":hidden")){t.timeoutId_=setTimeout(j.proxy(t.fitHeader,t),100);return}u=this.$tableBody.get(0);r=u.scrollWidth>u.clientWidth&&u.scrollHeight>u.clientHeight+this.$header.outerHeight()?a():0;this.$el.css("margin-top",-this.$header.outerHeight());x=j(":focus");if(x.length>0){var z=x.parents("th");if(z.length>0){var A=z.attr("data-field");if(A!==undefined){var s=this.$header.find("[data-field='"+A+"']");if(s.length>0){s.find(":input").addClass("focus-temp")}}}}this.$header_=this.$header.clone(true,true);this.$selectAll_=this.$header_.find('[name="btSelectAll"]');this.$tableHeader.css({"margin-right":r}).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_);y=j(".focus-temp:visible:eq(0)");if(y.length>0){y.focus();this.$header.find(".focus-temp").removeClass("focus-temp")}this.$header.find("th[data-field]").each(function(B){t.$header_.find(m('th[data-field="%s"]',j(this).data("field"))).data(j(this).data())});var w=this.getVisibleFields(),v=this.$header_.find("th");this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(C){var E=j(this),B=C;if(t.options.detailView&&!t.options.cardView){if(C===0){t.$header_.find("th.detail").find(".fht-cell").width(E.innerWidth())}B=C-1}var D=t.$header_.find(m('th[data-field="%s"]',w[B]));if(D.length>1){D=j(v[E[0].cellIndex])}D.find(".fht-cell").width(E.innerWidth())});this.$tableBody.off("scroll").on("scroll",function(){t.$tableHeader.scrollLeft(j(this).scrollLeft());if(t.options.showFooter&&!t.options.cardView){t.$tableFooter.scrollLeft(j(this).scrollLeft())}});t.trigger("post-header")};e.prototype.resetFooter=function(){var s=this,t=s.getData(),r=[];if(!this.options.showFooter||this.options.cardView){return}if(!this.options.cardView&&this.options.detailView){r.push('
     
    ')}j.each(this.columns,function(x,z){var w,B="",v="",A=[],y={},u=m(' class="%s"',z["class"]);if(!z.visible){return}if(s.options.cardView&&(!z.cardVisible)){return}B=m("text-align: %s; ",z.falign?z.falign:z.align);v=m("vertical-align: %s; ",z.valign);y=q(null,s.options.footerStyle);if(y&&y.css){for(w in y.css){A.push(w+": "+y.css[w])}}r.push("");r.push('
    ');r.push(q(z,z.footerFormatter,[t]," ")||" ");r.push("
    ");r.push('
    ');r.push("");r.push("")});this.$tableFooter.find("tr").html(r.join(""));this.$tableFooter.show();clearTimeout(this.timeoutFooter_);this.timeoutFooter_=setTimeout(j.proxy(this.fitFooter,this),this.$el.is(":hidden")?100:0)};e.prototype.fitFooter=function(){var u=this,r,t,s;clearTimeout(this.timeoutFooter_);if(this.$el.is(":hidden")){this.timeoutFooter_=setTimeout(j.proxy(this.fitFooter,this),100);return}t=this.$el.css("width");s=t>this.$tableBody.width()?a():0;this.$tableFooter.css({"margin-right":s}).find("table").css("width",t).attr("class",this.$el.attr("class"));r=this.$tableFooter.find("td");this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(v){var w=j(this);r.eq(v).find(".fht-cell").width(w.innerWidth())})};e.prototype.toggleColumn=function(r,s,u){if(r===-1){return}this.columns[r].visible=s;this.initHeader();this.initSearch();this.initPagination();this.initBody();if(this.options.showColumns){var t=this.$toolbar.find(".keep-open input").prop("disabled",false);if(u){t.filter(m('[value="%s"]',r)).prop("checked",s)}if(t.filter(":checked").length<=this.options.minimumCountColumns){t.filter(":checked").prop("disabled",true)}}};e.prototype.toggleRow=function(r,t,s){if(r===-1){return}this.$body.find(typeof r!=="undefined"?m('tr[data-index="%s"]',r):m('tr[data-uniqueid="%s"]',t))[s?"show":"hide"]()};e.prototype.getVisibleFields=function(){var s=this,r=[];j.each(this.header.fields,function(t,v){var u=s.columns[i(s.columns,v)];if(!u.visible){return}r.push(v)});return r};e.prototype.resetView=function(u){var s=0;if(u&&u.height){this.options.height=u.height}this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length);if(this.options.height){var t=d(this.$toolbar),v=d(this.$pagination),r=this.options.height-t-v;this.$tableContainer.css("height",r+"px")}if(this.options.cardView){this.$el.css("margin-top","0");this.$tableContainer.css("padding-bottom","0");this.$tableFooter.hide();return}if(this.options.showHeader&&this.options.height){this.$tableHeader.show();this.resetHeader();s+=this.$header.outerHeight()}else{this.$tableHeader.hide();this.trigger("post-header")}if(this.options.showFooter){this.resetFooter();if(this.options.height){s+=this.$tableFooter.outerHeight()+1}}this.getCaret();this.$tableContainer.css("padding-bottom",s+"px");this.trigger("reset-view")};e.prototype.getData=function(r){return(this.searchText||!j.isEmptyObject(this.filterColumns)||!j.isEmptyObject(this.filterColumnsPartial))?(r?this.data.slice(this.pageFrom-1,this.pageTo):this.data):(r?this.options.data.slice(this.pageFrom-1,this.pageTo):this.options.data)};e.prototype.load=function(s){var r=false;if(this.options.sidePagination==="server"){this.options.totalRows=s.total;r=s.fixedScroll;s=s[this.options.dataField]}else{if(!j.isArray(s)){r=s.fixedScroll;s=s.data}}this.initData(s);this.initSearch();this.initPagination();this.initBody(r)};e.prototype.append=function(r){this.initData(r,"append");this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.prepend=function(r){this.initData(r,"prepend");this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.remove=function(u){var r=this.options.data.length,s,t;if(!u.hasOwnProperty("field")||!u.hasOwnProperty("values")){return}for(s=r-1;s>=0;s--){t=this.options.data[s];if(!t.hasOwnProperty(u.field)){continue}if(j.inArray(t[u.field],u.values)!==-1){this.options.data.splice(s,1)}}if(r===this.options.data.length){return}this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.removeAll=function(){if(this.options.data.length>0){this.options.data.splice(0,this.options.data.length);this.initSearch();this.initPagination();this.initBody(true)}};e.prototype.getRowByUniqueId=function(x){var w=this.options.uniqueId,r=this.options.data.length,s=null,t,v,u;for(t=r-1;t>=0;t--){v=this.options.data[t];if(v.hasOwnProperty(w)){u=v[w]}else{if(v._data.hasOwnProperty(w)){u=v._data[w]}else{continue}}if(typeof u==="string"){x=x.toString()}else{if(typeof u==="number"){if((Number(u)===u)&&(u%1===0)){x=parseInt(x)}else{if((u===Number(u))&&(u!==0)){x=parseFloat(x)}}}}if(u===x){s=v;break}}return s};e.prototype.removeByUniqueId=function(t){var r=this.options.data.length,s=this.getRowByUniqueId(t);if(s){this.options.data.splice(this.options.data.indexOf(s),1)}if(r===this.options.data.length){return}this.initSearch();this.initPagination();this.initBody(true)};e.prototype.updateByUniqueId=function(t){var r=this;var s=j.isArray(t)?t:[t];j.each(s,function(u,w){var v;if(!w.hasOwnProperty("id")||!w.hasOwnProperty("row")){return}v=j.inArray(r.getRowByUniqueId(w.id),r.options.data);if(v===-1){return}j.extend(r.options.data[v],w.row)});this.initSearch();this.initSort();this.initBody(true)};e.prototype.insertRow=function(r){if(!r.hasOwnProperty("index")||!r.hasOwnProperty("row")){return}this.data.splice(r.index,0,r.row);this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.updateRow=function(t){var r=this;var s=j.isArray(t)?t:[t];j.each(s,function(u,v){if(!v.hasOwnProperty("index")||!v.hasOwnProperty("row")){return}j.extend(r.options.data[v.index],v.row)});this.initSearch();this.initSort();this.initBody(true)};e.prototype.showRow=function(r){if(!r.hasOwnProperty("index")&&!r.hasOwnProperty("uniqueId")){return}this.toggleRow(r.index,r.uniqueId,true)};e.prototype.hideRow=function(r){if(!r.hasOwnProperty("index")&&!r.hasOwnProperty("uniqueId")){return}this.toggleRow(r.index,r.uniqueId,false)};e.prototype.getRowsHidden=function(r){var t=j(this.$body[0]).children().filter(":hidden"),s=0;if(r){for(;str"),r;if(this.options.detailView&&!this.options.cardView){t+=1}r=x.eq(y).find(">td").eq(t);if(y<0||t<0||y>=this.data.length){return}for(w=y;wtd").eq(v).hide()}}r.attr("rowspan",u).attr("colspan",s).show()};e.prototype.updateCell=function(r){if(!r.hasOwnProperty("index")||!r.hasOwnProperty("field")||!r.hasOwnProperty("value")){return}this.data[r.index][r.field]=r.value;if(r.reinit===false){return}this.initSort();this.initBody(true)};e.prototype.getOptions=function(){return this.options};e.prototype.getSelections=function(){var r=this;return j.grep(this.options.data,function(s){return s[r.header.stateField]})};e.prototype.getAllSelections=function(){var r=this;return j.grep(this.options.data,function(s){return s[r.header.stateField]})};e.prototype.checkAll=function(){this.checkAll_(true)};e.prototype.uncheckAll=function(){this.checkAll_(false)};e.prototype.checkInvert=function(){var s=this;var t=s.$selectItem.filter(":enabled");var r=t.filter(":checked");t.each(function(){j(this).prop("checked",!j(this).prop("checked"))});s.updateRows();s.updateSelected();s.trigger("uncheck-some",r);r=s.getSelections();s.trigger("check-some",r)};e.prototype.checkAll_=function(r){var s;if(!r){s=this.getSelections()}this.$selectAll.add(this.$selectAll_).prop("checked",r);this.$selectItem.filter(":enabled").prop("checked",r);this.updateRows();if(r){s=this.getSelections()}this.trigger(r?"check-all":"uncheck-all",s)};e.prototype.check=function(r){this.check_(true,r)};e.prototype.uncheck=function(r){this.check_(false,r)};e.prototype.check_=function(t,r){var s=this.$selectItem.filter(m('[data-index="%s"]',r)).prop("checked",t);this.data[r][this.header.stateField]=t;this.updateSelected();this.trigger(t?"check":"uncheck",this.data[r],s)};e.prototype.checkBy=function(r){this.checkBy_(true,r)};e.prototype.uncheckBy=function(r){this.checkBy_(false,r)};e.prototype.checkBy_=function(s,u){if(!u.hasOwnProperty("field")||!u.hasOwnProperty("values")){return}var r=this,t=[];j.each(this.options.data,function(v,x){if(!x.hasOwnProperty(u.field)){return false}if(j.inArray(x[u.field],u.values)!==-1){var w=r.$selectItem.filter(":enabled").filter(m('[data-index="%s"]',v)).prop("checked",s);x[r.header.stateField]=s;t.push(x);r.trigger(s?"check":"uncheck",x,w)}});this.updateSelected();this.trigger(s?"check-some":"uncheck-some",t)};e.prototype.destroy=function(){this.$el.insertBefore(this.$container);j(this.options.toolbar).insertBefore(this.$el);this.$container.next().remove();this.$container.remove();this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")};e.prototype.showLoading=function(){this.$tableLoading.show()};e.prototype.hideLoading=function(){this.$tableLoading.hide()};e.prototype.togglePagination=function(){this.options.pagination=!this.options.pagination;var r=this.$toolbar.find('button[name="paginationSwitch"] i');if(this.options.pagination){r.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchDown)}else{r.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchUp)}this.updatePagination()};e.prototype.refresh=function(r){if(r&&r.url){this.options.pageNumber=1}this.initServer(r&&r.silent,r&&r.query,r&&r.url);this.trigger("refresh",r)};e.prototype.resetWidth=function(){if(this.options.showHeader&&this.options.height){this.fitHeader()}if(this.options.showFooter){this.fitFooter()}};e.prototype.showColumn=function(r){this.toggleColumn(i(this.columns,r),true,true)};e.prototype.hideColumn=function(r){this.toggleColumn(i(this.columns,r),false,true)};e.prototype.getHiddenColumns=function(){return j.grep(this.columns,function(r){return !r.visible})};e.prototype.getVisibleColumns=function(){return j.grep(this.columns,function(r){return r.visible})};e.prototype.toggleAllColumns=function(r){j.each(this.columns,function(t,u){this.columns[t].visible=r});this.initHeader();this.initSearch();this.initPagination();this.initBody();if(this.options.showColumns){var s=this.$toolbar.find(".keep-open input").prop("disabled",false);if(s.filter(":checked").length<=this.options.minimumCountColumns){s.filter(":checked").prop("disabled",true)}}};e.prototype.showAllColumns=function(){this.toggleAllColumns(true)};e.prototype.hideAllColumns=function(){this.toggleAllColumns(false)};e.prototype.filterBy=function(r){this.filterColumns=j.isEmptyObject(r)?{}:r;this.options.pageNumber=1;this.initSearch();this.updatePagination()};e.prototype.scrollTo=function(r){if(typeof r==="string"){r=r==="bottom"?this.$tableBody[0].scrollHeight:0}if(typeof r==="number"){this.$tableBody.scrollTop(r)}if(typeof r==="undefined"){return this.$tableBody.scrollTop()}};e.prototype.getScrollPosition=function(){return this.scrollTo()};e.prototype.selectPage=function(r){if(r>0&&r<=this.options.totalPages){this.options.pageNumber=r;this.updatePagination()}};e.prototype.prevPage=function(){if(this.options.pageNumber>1){this.options.pageNumber--;this.updatePagination()}};e.prototype.nextPage=function(){if(this.options.pageNumber tr[data-index="%s"]',r));if(t.next().is("tr.detail-view")===(s?false:true)){t.find("> td > .detail-icon").click()}};e.prototype.expandRow=function(r){this.expandRow_(true,r)};e.prototype.collapseRow=function(r){this.expandRow_(false,r)};e.prototype.expandAllRows=function(r){if(r){var w=this.$body.find(m('> tr[data-index="%s"]',0)),x=this,u=null,v=false,s=-1;if(!w.next().is("tr.detail-view")){w.find("> td > .detail-icon").click();v=true}else{if(!w.next().next().is("tr.detail-view")){w.next().find(".detail-icon").click();v=true}}if(v){try{s=setInterval(function(){u=x.$body.find("tr.detail-view").last().find(".detail-icon");if(u.length>0){u.click()}else{clearInterval(s)}},1)}catch(z){clearInterval(s)}}}else{var y=this.$body.children();for(var t=0;tthis.options.totalPages){this.options.pageNumber=1}else{this.options.pageNumber++}this.updatePagination(r)};e.prototype.onPageLast=function(r){this.options.pageNumber=this.totalPages;this.updatePagination(r)};e.prototype.onPageNumber=function(r){if(this.options.pageNumber===+j(r.currentTarget).text()){return}this.options.pageNumber=+j(r.currentTarget).text();this.updatePagination(r)};e.prototype.initBody=function(x){var z=this,y=[],v=this.getData();this.trigger("pre-body",v);this.$body=this.$el.find(">tbody");if(!this.$body.length){this.$body=j("").appendTo(this.$el)}if(!this.options.pagination||this.options.sidePagination==="server"){this.pageFrom=1;this.pageTo=v.length}for(var w=this.pageFrom-1;w");if(this.options.cardView){y.push(m('
    ',this.header.fields.length))}if(!this.options.cardView&&this.options.detailView){y.push("",'',m('',this.options.iconsPrefix,this.options.icons.detailOpen),"","")}j.each(this.header.fields,function(I,L){var P="",M=o(C,L,z.options.escape),K="",E={},Q="",J=z.header.classes[I],G="",O="",R="",H="",F=z.columns[I];if(z.fromHtml&&typeof M==="undefined"){return}if(!F.visible){return}if(z.options.cardView&&!F.cardVisible){return}r=m('style="%s"',s.concat(z.header.styles[I]).join("; "));if(C["_"+L+"_id"]){Q=m(' id="%s"',C["_"+L+"_id"])}if(C["_"+L+"_class"]){J=m(' class="%s"',C["_"+L+"_class"])}if(C["_"+L+"_rowspan"]){O=m(' rowspan="%s"',C["_"+L+"_rowspan"])}if(C["_"+L+"_colspan"]){R=m(' colspan="%s"',C["_"+L+"_colspan"])}if(C["_"+L+"_title"]){H=m(' title="%s"',C["_"+L+"_title"])}E=q(z.header,z.header.cellStyles[I],[M,C,w,L],E);if(E.classes){J=m(' class="%s"',E.classes)}if(E.css){var D=[];for(var N in E.css){D.push(N+": "+E.css[N])}r=m('style="%s"',D.concat(z.header.styles[I]).join("; "))}M=q(F,z.header.formatters[I],[M,C,w],M);if(C["_"+L+"_data"]&&!j.isEmptyObject(C["_"+L+"_data"])){j.each(C["_"+L+"_data"],function(T,S){if(T==="index"){return}G+=m(' data-%s="%s"',T,S)})}if(F.checkbox||F.radio){K=F.checkbox?"checkbox":K;K=F.radio?"radio":K;P=[m(z.options.cardView?'
    ':'',F["class"]||""),"",z.header.formatters[I]&&typeof M==="string"?M:"",z.options.cardView?"
    ":""].join("");C[z.header.stateField]=M===true||(M&&M.checked)}else{M=typeof M==="undefined"||M===null?z.options.undefinedText:M;P=z.options.cardView?['
    ',z.options.showHeader?m('%s',r,c(z.columns,"field","title",L)):"",m('%s',M),"
    "].join(""):[m("",Q,J,r,G,O,R,H),M,""].join("");if(z.options.cardView&&z.options.smartDisplay&&M===""){P='
    '}}y.push(P)});if(this.options.cardView){y.push("
    ")}y.push("")}if(!y.length){y.push('',m('%s',this.$header.find("th").length,this.options.formatNoMatches()),"")}this.$body.html(y.join(""));if(!x){this.scrollTo(0)}this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",function(J){var D=j(this),F=D.parent(),M=z.data[F.data("index")],H=D[0].cellIndex,G=z.getVisibleFields(),K=G[z.options.detailView&&!z.options.cardView?H-1:H],E=z.columns[i(z.columns,K)],L=o(M,K,z.options.escape);if(D.find(".detail-icon").length){return}z.trigger(J.type==="click"?"click-cell":"dbl-click-cell",K,L,M,D);z.trigger(J.type==="click"?"click-row":"dbl-click-row",M,F,K);if(J.type==="click"&&z.options.clickToSelect&&E.clickToSelect){var I=F.find(m('[name="%s"]',z.options.selectItemName));if(I.length){I[0].click()}}});this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",function(){var H=j(this),G=H.parent().parent(),E=G.data("index"),I=v[E];if(G.next().is("tr.detail-view")){H.find("i").attr("class",m("%s %s",z.options.iconsPrefix,z.options.icons.detailOpen));G.next().remove();z.trigger("collapse-row",E,I)}else{H.find("i").attr("class",m("%s %s",z.options.iconsPrefix,z.options.icons.detailClose));G.after(m('',G.find("td").length));var D=G.next().find("td");var F=q(z.options,z.options.detailFormatter,[E,I,D],"");if(D.length===1){D.append(F)}z.trigger("expand-row",E,I,D)}z.resetView()});this.$selectItem=this.$body.find(m('[name="%s"]',this.options.selectItemName));this.$selectItem.off("click").on("click",function(E){E.stopImmediatePropagation();var F=j(this),D=F.prop("checked"),G=z.data[F.data("index")];if(z.options.maintainSelected&&j(this).is(":radio")){j.each(z.options.data,function(H,I){I[z.header.stateField]=false})}G[z.header.stateField]=D;if(z.options.singleSelect){z.$selectItem.not(this).each(function(){z.data[j(this).data("index")][z.header.stateField]=false});z.$selectItem.filter(":checked").not(this).prop("checked",false)}z.updateSelected();z.trigger(D?"check":"uncheck",G,F)});j.each(this.header.events,function(G,F){if(!F){return}if(typeof F==="string"){F=q(null,F)}var H=z.header.fields[G],D=j.inArray(H,z.getVisibleFields());if(z.options.detailView&&!z.options.cardView){D+=1}for(var E in F){z.$body.find(">tr:not(.no-records-found)").each(function(){var M=j(this),N=M.find(z.options.cardView?".card-view":"td").eq(D),J=E.indexOf(" "),I=E.substring(0,J),K=E.substring(J+1),L=F[E];N.find(K).off(I).on(I,function(Q){var O=M.data("index"),R=z.data[O],P=R[H];L.apply(this,[Q,P,R,O])})})}});this.updateSelected();this.resetView();this.trigger("post-body",v)};e.prototype.initServer=function(r,w,s){var u=this,v={},x={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder},t;if(this.options.pagination){x.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize;x.pageNumber=this.options.pageNumber}if(!(s||this.options.url)&&!this.options.ajax){return}if(this.options.queryParamsType==="limit"){x={search:x.searchText,sort:x.sortName,order:x.sortOrder};if(this.options.pagination){x.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1);x.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize}}if(!(j.isEmptyObject(this.filterColumnsPartial))){x.filter=JSON.stringify(this.filterColumnsPartial,null)}v=q(this.options,this.options.queryParams,[x],v);j.extend(v,w||{});if(v===false){return}if(!r){this.$tableLoading.show()}t=j.extend({},q(null,this.options.ajaxOptions),{type:this.options.method,url:s||this.options.url,data:this.options.contentType==="application/json"&&this.options.method==="post"?JSON.stringify(v):v,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(y){y=q(u.options,u.options.responseHandler,[y],y);u.load(y);u.trigger("load-success",y);if(!r){u.$tableLoading.hide()}},error:function(y){u.trigger("load-error",y.status,y);if(!r){u.$tableLoading.hide()}}});if(this.options.ajax){q(this,this.options.ajax,[t],null)}else{if(this._xhr&&this._xhr.readyState!==4){this._xhr.abort()}this._xhr=j.ajax(t)}};e.prototype.initSearchText=function(){if(this.options.search){if(this.options.searchText!==""){var r=this.$toolbar.find(".search input");r.val(this.options.searchText);this.onSearch({currentTarget:r})}}};e.prototype.getCaret=function(){var r=this;j.each(this.$header.find("th"),function(s,t){j(t).find(".sortable").removeClass("desc asc").addClass(j(t).data("field")===r.options.sortName?r.options.sortOrder:"both")})};e.prototype.updateSelected=function(){var r=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",r);this.$selectItem.each(function(){j(this).closest("tr")[j(this).prop("checked")?"addClass":"removeClass"]("selected")})};e.prototype.updateRows=function(){var r=this;this.$selectItem.each(function(){r.data[j(this).data("index")][r.header.stateField]=j(this).prop("checked")})};e.prototype.resetRows=function(){var r=this;j.each(this.data,function(s,t){r.$selectAll.prop("checked",false);r.$selectItem.prop("checked",false);if(r.header.stateField){t[r.header.stateField]=false}})};e.prototype.trigger=function(s){var r=Array.prototype.slice.call(arguments,1);s+=".bs.table";this.options[e.EVENTS[s]].apply(this.options,r);this.$el.trigger(j.Event(s),r);this.options.onAll(s,r);this.$el.trigger(j.Event("all.bs.table"),[s,r])};e.prototype.resetHeader=function(){clearTimeout(this.timeoutId_);this.timeoutId_=setTimeout(j.proxy(this.fitHeader,this),this.$el.is(":hidden")?100:0)};e.prototype.fitHeader=function(){var t=this,u,r,x,y;if(t.$el.is(":hidden")){t.timeoutId_=setTimeout(j.proxy(t.fitHeader,t),100);return}u=this.$tableBody.get(0);r=u.scrollWidth>u.clientWidth&&u.scrollHeight>u.clientHeight+this.$header.outerHeight()?a():0;this.$el.css("margin-top",-this.$header.outerHeight());x=j(":focus");if(x.length>0){var z=x.parents("th");if(z.length>0){var A=z.attr("data-field");if(A!==undefined){var s=this.$header.find("[data-field='"+A+"']");if(s.length>0){s.find(":input").addClass("focus-temp")}}}}this.$header_=this.$header.clone(true,true);this.$selectAll_=this.$header_.find('[name="btSelectAll"]');this.$tableHeader.css({"margin-right":r}).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_);y=j(".focus-temp:visible:eq(0)");if(y.length>0){y.focus();this.$header.find(".focus-temp").removeClass("focus-temp")}this.$header.find("th[data-field]").each(function(B){t.$header_.find(m('th[data-field="%s"]',j(this).data("field"))).data(j(this).data())});var w=this.getVisibleFields(),v=this.$header_.find("th");this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(C){var E=j(this),B=C;if(t.options.detailView&&!t.options.cardView){if(C===0){t.$header_.find("th.detail").find(".fht-cell").width(E.innerWidth())}B=C-1}var D=t.$header_.find(m('th[data-field="%s"]',w[B]));if(D.length>1){D=j(v[E[0].cellIndex])}D.find(".fht-cell").width(E.innerWidth())});this.$tableBody.off("scroll").on("scroll",function(){t.$tableHeader.scrollLeft(j(this).scrollLeft());if(t.options.showFooter&&!t.options.cardView){t.$tableFooter.scrollLeft(j(this).scrollLeft())}});t.trigger("post-header")};e.prototype.resetFooter=function(){var s=this,t=s.getData(),r=[];if(!this.options.showFooter||this.options.cardView){return}if(!this.options.cardView&&this.options.detailView){r.push('
     
    ')}j.each(this.columns,function(x,z){var w,B="",v="",A=[],y={},u=m(' class="%s"',z["class"]);if(!z.visible){return}if(s.options.cardView&&(!z.cardVisible)){return}B=m("text-align: %s; ",z.falign?z.falign:z.align);v=m("vertical-align: %s; ",z.valign);y=q(null,s.options.footerStyle);if(y&&y.css){for(w in y.css){A.push(w+": "+y.css[w])}}r.push("");r.push('
    ');r.push(q(z,z.footerFormatter,[t]," ")||" ");r.push("
    ");r.push('
    ');r.push("");r.push("")});this.$tableFooter.find("tr").html(r.join(""));this.$tableFooter.show();clearTimeout(this.timeoutFooter_);this.timeoutFooter_=setTimeout(j.proxy(this.fitFooter,this),this.$el.is(":hidden")?100:0)};e.prototype.fitFooter=function(){var u=this,r,t,s;clearTimeout(this.timeoutFooter_);if(this.$el.is(":hidden")){this.timeoutFooter_=setTimeout(j.proxy(this.fitFooter,this),100);return}t=this.$el.css("width");s=t>this.$tableBody.width()?a():0;this.$tableFooter.css({"margin-right":s}).find("table").css("width",t).attr("class",this.$el.attr("class"));r=this.$tableFooter.find("td");this.$body.find(">tr:first-child:not(.no-records-found) > *").each(function(v){var w=j(this);r.eq(v).find(".fht-cell").width(w.innerWidth())})};e.prototype.toggleColumn=function(r,s,u){if(r===-1){return}this.columns[r].visible=s;this.initHeader();this.initSearch();this.initPagination();this.initBody();if(this.options.showColumns){var t=this.$toolbar.find(".keep-open input").prop("disabled",false);if(u){t.filter(m('[value="%s"]',r)).prop("checked",s)}if(t.filter(":checked").length<=this.options.minimumCountColumns){t.filter(":checked").prop("disabled",true)}}};e.prototype.toggleRow=function(r,t,s){if(r===-1){return}this.$body.find(typeof r!=="undefined"?m('tr[data-index="%s"]',r):m('tr[data-uniqueid="%s"]',t))[s?"show":"hide"]()};e.prototype.getVisibleFields=function(){var s=this,r=[];j.each(this.header.fields,function(t,v){var u=s.columns[i(s.columns,v)];if(!u.visible){return}r.push(v)});return r};e.prototype.resetView=function(u){var s=0;if(u&&u.height){this.options.height=u.height}this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length);if(this.options.height){var t=d(this.$toolbar),v=d(this.$pagination),r=this.options.height-t-v;this.$tableContainer.css("height",r+"px")}if(this.options.cardView){this.$el.css("margin-top","0");this.$tableContainer.css("padding-bottom","0");this.$tableFooter.hide();return}if(this.options.showHeader&&this.options.height){this.$tableHeader.show();this.resetHeader();s+=this.$header.outerHeight()}else{this.$tableHeader.hide();this.trigger("post-header")}if(this.options.showFooter){this.resetFooter();if(this.options.height){s+=this.$tableFooter.outerHeight()+1}}this.getCaret();this.$tableContainer.css("padding-bottom",s+"px");this.trigger("reset-view")};e.prototype.getData=function(r){return(this.searchText||!j.isEmptyObject(this.filterColumns)||!j.isEmptyObject(this.filterColumnsPartial))?(r?this.data.slice(this.pageFrom-1,this.pageTo):this.data):(r?this.options.data.slice(this.pageFrom-1,this.pageTo):this.options.data)};e.prototype.load=function(s){var r=false;if(this.options.sidePagination==="server"){this.options.totalRows=s.total;r=s.fixedScroll;s=s[this.options.dataField]}else{if(!j.isArray(s)){r=s.fixedScroll;s=s.data}}this.initData(s);this.initSearch();this.initPagination();this.initBody(r)};e.prototype.append=function(r){this.initData(r,"append");this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.prepend=function(r){this.initData(r,"prepend");this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.remove=function(u){var r=this.options.data.length,s,t;if(!u.hasOwnProperty("field")||!u.hasOwnProperty("values")){return}for(s=r-1;s>=0;s--){t=this.options.data[s];if(!t.hasOwnProperty(u.field)){continue}if(j.inArray(t[u.field],u.values)!==-1){this.options.data.splice(s,1)}}if(r===this.options.data.length){return}this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.removeAll=function(){if(this.options.data.length>0){this.options.data.splice(0,this.options.data.length);this.initSearch();this.initPagination();this.initBody(true)}};e.prototype.getRowByUniqueId=function(x){var w=this.options.uniqueId,r=this.options.data.length,s=null,t,v,u;for(t=r-1;t>=0;t--){v=this.options.data[t];if(v.hasOwnProperty(w)){u=v[w]}else{if(v._data.hasOwnProperty(w)){u=v._data[w]}else{continue}}if(typeof u==="string"){x=x.toString()}else{if(typeof u==="number"){if((Number(u)===u)&&(u%1===0)){x=parseInt(x)}else{if((u===Number(u))&&(u!==0)){x=parseFloat(x)}}}}if(u===x){s=v;break}}return s};e.prototype.removeByUniqueId=function(t){var r=this.options.data.length,s=this.getRowByUniqueId(t);if(s){this.options.data.splice(this.options.data.indexOf(s),1)}if(r===this.options.data.length){return}this.initSearch();this.initPagination();this.initBody(true)};e.prototype.updateByUniqueId=function(t){var r=this;var s=j.isArray(t)?t:[t];j.each(s,function(u,w){var v;if(!w.hasOwnProperty("id")||!w.hasOwnProperty("row")){return}v=j.inArray(r.getRowByUniqueId(w.id),r.options.data);if(v===-1){return}j.extend(r.options.data[v],w.row)});this.initSearch();this.initSort();this.initBody(true)};e.prototype.insertRow=function(r){if(!r.hasOwnProperty("index")||!r.hasOwnProperty("row")){return}this.data.splice(r.index,0,r.row);this.initSearch();this.initPagination();this.initSort();this.initBody(true)};e.prototype.updateRow=function(t){var r=this;var s=j.isArray(t)?t:[t];j.each(s,function(u,v){if(!v.hasOwnProperty("index")||!v.hasOwnProperty("row")){return}j.extend(r.options.data[v.index],v.row)});this.initSearch();this.initSort();this.initBody(true)};e.prototype.showRow=function(r){if(!r.hasOwnProperty("index")&&!r.hasOwnProperty("uniqueId")){return}this.toggleRow(r.index,r.uniqueId,true)};e.prototype.hideRow=function(r){if(!r.hasOwnProperty("index")&&!r.hasOwnProperty("uniqueId")){return}this.toggleRow(r.index,r.uniqueId,false)};e.prototype.getRowsHidden=function(r){var t=j(this.$body[0]).children().filter(":hidden"),s=0;if(r){for(;str"),r;if(this.options.detailView&&!this.options.cardView){t+=1}r=x.eq(y).find(">td").eq(t);if(y<0||t<0||y>=this.data.length){return}for(w=y;wtd").eq(v).hide()}}r.attr("rowspan",u).attr("colspan",s).show()};e.prototype.updateCell=function(r){if(!r.hasOwnProperty("index")||!r.hasOwnProperty("field")||!r.hasOwnProperty("value")){return}this.data[r.index][r.field]=r.value;if(r.reinit===false){return}this.initSort();this.initBody(true)};e.prototype.getOptions=function(){return this.options};e.prototype.getSelections=function(){var r=this;return j.grep(this.options.data,function(s){return s[r.header.stateField]})};e.prototype.getAllSelections=function(){var r=this;return j.grep(this.options.data,function(s){return s[r.header.stateField]})};e.prototype.checkAll=function(){this.checkAll_(true)};e.prototype.uncheckAll=function(){this.checkAll_(false)};e.prototype.checkInvert=function(){var s=this;var t=s.$selectItem.filter(":enabled");var r=t.filter(":checked");t.each(function(){j(this).prop("checked",!j(this).prop("checked"))});s.updateRows();s.updateSelected();s.trigger("uncheck-some",r);r=s.getSelections();s.trigger("check-some",r)};e.prototype.checkAll_=function(r){var s;if(!r){s=this.getSelections()}this.$selectAll.add(this.$selectAll_).prop("checked",r);this.$selectItem.filter(":enabled").prop("checked",r);this.updateRows();if(r){s=this.getSelections()}this.trigger(r?"check-all":"uncheck-all",s)};e.prototype.check=function(r){this.check_(true,r)};e.prototype.uncheck=function(r){this.check_(false,r)};e.prototype.check_=function(t,r){var s=this.$selectItem.filter(m('[data-index="%s"]',r)).prop("checked",t);this.data[r][this.header.stateField]=t;this.updateSelected();this.trigger(t?"check":"uncheck",this.data[r],s)};e.prototype.checkBy=function(r){this.checkBy_(true,r)};e.prototype.uncheckBy=function(r){this.checkBy_(false,r)};e.prototype.checkBy_=function(s,u){if(!u.hasOwnProperty("field")||!u.hasOwnProperty("values")){return}var r=this,t=[];j.each(this.options.data,function(v,x){if(!x.hasOwnProperty(u.field)){return false}if(j.inArray(x[u.field],u.values)!==-1){var w=r.$selectItem.filter(":enabled").filter(m('[data-index="%s"]',v)).prop("checked",s);x[r.header.stateField]=s;t.push(x);r.trigger(s?"check":"uncheck",x,w)}});this.updateSelected();this.trigger(s?"check-some":"uncheck-some",t)};e.prototype.destroy=function(){this.$el.insertBefore(this.$container);j(this.options.toolbar).insertBefore(this.$el);this.$container.next().remove();this.$container.remove();this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")};e.prototype.showLoading=function(){this.$tableLoading.show()};e.prototype.hideLoading=function(){this.$tableLoading.hide()};e.prototype.togglePagination=function(){this.options.pagination=!this.options.pagination;var r=this.$toolbar.find('button[name="paginationSwitch"] i');if(this.options.pagination){r.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchDown)}else{r.attr("class",this.options.iconsPrefix+" "+this.options.icons.paginationSwitchUp)}this.updatePagination()};e.prototype.refresh=function(r){if(r&&r.url){this.options.pageNumber=1}if(selectionIds.length>0){selectionIds=[]}this.initServer(r&&r.silent,r&&r.query,r&&r.url);this.trigger("refresh",r)};e.prototype.resetWidth=function(){if(this.options.showHeader&&this.options.height){this.fitHeader()}if(this.options.showFooter){this.fitFooter()}};e.prototype.showColumn=function(r){this.toggleColumn(i(this.columns,r),true,true)};e.prototype.hideColumn=function(r){this.toggleColumn(i(this.columns,r),false,true)};e.prototype.getHiddenColumns=function(){return j.grep(this.columns,function(r){return !r.visible})};e.prototype.getVisibleColumns=function(){return j.grep(this.columns,function(r){return r.visible})};e.prototype.toggleAllColumns=function(r){j.each(this.columns,function(t,u){this.columns[t].visible=r});this.initHeader();this.initSearch();this.initPagination();this.initBody();if(this.options.showColumns){var s=this.$toolbar.find(".keep-open input").prop("disabled",false);if(s.filter(":checked").length<=this.options.minimumCountColumns){s.filter(":checked").prop("disabled",true)}}};e.prototype.showAllColumns=function(){this.toggleAllColumns(true)};e.prototype.hideAllColumns=function(){this.toggleAllColumns(false)};e.prototype.filterBy=function(r){this.filterColumns=j.isEmptyObject(r)?{}:r;this.options.pageNumber=1;this.initSearch();this.updatePagination()};e.prototype.scrollTo=function(r){if(typeof r==="string"){r=r==="bottom"?this.$tableBody[0].scrollHeight:0}if(typeof r==="number"){this.$tableBody.scrollTop(r)}if(typeof r==="undefined"){return this.$tableBody.scrollTop()}};e.prototype.getScrollPosition=function(){return this.scrollTo()};e.prototype.selectPage=function(r){if(r>0&&r<=this.options.totalPages){this.options.pageNumber=r;this.updatePagination()}};e.prototype.prevPage=function(){if(this.options.pageNumber>1){this.options.pageNumber--;this.updatePagination()}};e.prototype.nextPage=function(){if(this.options.pageNumber tr[data-index="%s"]',r));if(t.next().is("tr.detail-view")===(s?false:true)){t.find("> td > .detail-icon").click()}};e.prototype.expandRow=function(r){this.expandRow_(true,r)};e.prototype.collapseRow=function(r){this.expandRow_(false,r)};e.prototype.expandAllRows=function(r){if(r){var w=this.$body.find(m('> tr[data-index="%s"]',0)),x=this,u=null,v=false,s=-1;if(!w.next().is("tr.detail-view")){w.find("> td > .detail-icon").click();v=true}else{if(!w.next().next().is("tr.detail-view")){w.next().find(".detail-icon").click();v=true}}if(v){try{s=setInterval(function(){u=x.$body.find("tr.detail-view").last().find(".detail-icon");if(u.length>0){u.click()}else{clearInterval(s)}},1)}catch(z){clearInterval(s)}}}else{var y=this.$body.children();for(var t=0;t .list-group-item { + border-left: 0; + border-right: 0; + border-radius: 0; + padding-left: 0; + padding-right: 0 +} + +.ibox-title-gray { + height: 41px; + background-color: #f0f3f4; + color: #333; + font-weight: 700; + border-radius: 2px 2px 0 0; + padding: 13px !important; + border-bottom: 1px solid #eee; + display: block; + clear: both; +} + +.dashboard-header h5 { + padding: 8px 0 0 0; + display: inline-block; + font-size: 14px; + text-overflow: ellipsis; + float: left; + font-weight: 400; +} + +.ibox-title-gray h5 { + display: inline-block; + font-size: 14px; + margin: 0 0 7px; + padding: 0; + text-overflow: ellipsis; + float: left; +} + +/* 导航页签 */ +.nav-tabs-custom { + margin-bottom: 20px; + background: #fff; + box-shadow: 0 1px 1px rgba(0,0,0,0.1); + border-radius: 3px +} + +.nav-tabs-custom>.nav-tabs { + margin: 0; + border-bottom-color: #f4f4f4; + border-top-right-radius: 3px; + border-top-left-radius: 3px +} + +.nav-tabs-custom>.nav-tabs>li { + border-top: 3px solid transparent; + margin-bottom: -2px; + margin-right: 5px +} + +.nav-tabs-custom>.nav-tabs>li.disabled>a { + color: #777 +} + +.nav-tabs-custom>.nav-tabs>li>a { + color: #444; + font-weight: normal; + border-radius: 0 +} + +.nav-tabs-custom>.nav-tabs>li>a,.nav-tabs-custom>.nav-tabs>li>a:hover { + background: transparent; + margin: 0 +} + +.nav-tabs-custom>.nav-tabs>li>a:hover { + color: #999 +} + +.nav-tabs-custom>.nav-tabs>li:not(.active)>a:hover,.nav-tabs-custom>.nav-tabs>li:not(.active)>a:focus,.nav-tabs-custom>.nav-tabs>li:not(.active)>a:active { + border-color: transparent +} + +.nav-tabs-custom>.nav-tabs>li.active { + border-top-color: #1890ff +} + +.nav-tabs-custom>.nav-tabs>li.active>a,.nav-tabs-custom>.nav-tabs>li.active:hover>a { + background-color: #fff; + color: #444 +} + +.nav-tabs-custom>.nav-tabs>li.active>a { + border-top-color: transparent; + border-bottom-color: transparent; + border-left-color: #f4f4f4; + border-right-color: #f4f4f4 +} + +.nav-tabs-custom>.tab-content { + background: #fff; + padding: 10px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px +} + /** 弹层组件 禁用样式 **/ .layer-disabled { border: 1px #dedede solid !important; diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 10f5d22f..248d1a8b 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -32,6 +32,7 @@ showToggle: true, showExport: false, clickToSelect: false, + rememberSelected: false, fixedColumns: false, fixedNumber: 0, rightFixedColumns: false, @@ -68,6 +69,7 @@ showToggle: options.showToggle, // 是否显示详细视图和列表视图的切换按钮 showExport: options.showExport, // 是否支持导出文件 clickToSelect: options.clickToSelect, // 是否启用点击选中行 + rememberSelected: options.rememberSelected, // 启用翻页记住前面的选择 fixedColumns: options.fixedColumns, // 是否启用冻结列（左侧） fixedNumber: options.fixedNumber, // 列冻结的个数（左侧） rightFixedColumns: options.rightFixedColumns, // 是否启用冻结列（右侧） @@ -106,11 +108,21 @@ onLoadSuccess: function(data) { // 浮动提示框特效 $("[data-toggle='tooltip']").tooltip(); - // 触发行点击事件 + // 触发行点击事件 加载成功事件 $("#" + $.table._option.id).on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table", function () { - var ids = $("#" + $.table._option.id).bootstrapTable("getSelections"); - $('#' + $.table._option.toolbar + ' .btn-del').toggleClass('disabled', !ids.length); - $('#' + $.table._option.toolbar + ' .btn-edit').toggleClass('disabled', ids.length!=1); + // 工具栏按钮控制 + var rows = $.common.isEmpty($.table._option.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.uniqueId); + $('#' + $.table._option.toolbar + ' .btn-del').toggleClass('disabled', !rows.length); + $('#' + $.table._option.toolbar + ' .btn-edit').toggleClass('disabled', rows.length!=1); + }); + // 绑定选中事件、取消事件、全部选中、全部取消 + $("#" + $.table._option.id).on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rows) { + // 复选框分页保留保存选中数组 + var rows = $.common.isEmpty($.table._option.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns($.table._option.uniqueId); + if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) { + func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference'; + selectionIds = _[func](selectionIds, rows); + } }); }, // 表格销毁 @@ -169,15 +181,19 @@ }, // 导出数据 exportExcel: function(formId) { - var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; - $.modal.loading("正在导出数据，请稍后..."); - $.post($.table._option.exportUrl, $("#" + currentId).serializeArray(), function(result) { - if (result.code == web_status.SUCCESS) { - window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; - } else { - $.modal.alertError(result.msg); - } - $.modal.closeLoading(); + $.modal.confirm("确定导出所有" + $.table._option.modalName + "吗？", function() { + var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + $.modal.loading("正在导出数据，请稍后..."); + $.post($.table._option.exportUrl, $("#" + currentId).serializeArray(), function(result) { + if (result.code == web_status.SUCCESS) { + window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + }); }); }, // 下载模板 @@ -185,7 +201,9 @@ $.get($.table._option.importTemplateUrl, function(result) { if (result.code == web_status.SUCCESS) { window.location.href = ctx + "common/download?fileName=" + encodeURI(result.msg) + "&delete=" + true; - } else { + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { $.modal.alertError(result.msg); } }); @@ -229,7 +247,11 @@ $.modal.closeAll(); $.modal.alertSuccess(result.msg); $.table.refresh(); - } else { + } else if (result.code == web_status.WARNING) { + layer.close(index); + $.modal.enable(); + $.modal.alertWarning(result.msg) + } else { layer.close(index); $.modal.enable(); $.modal.alertError(result.msg); @@ -247,15 +269,23 @@ }, // 查询表格指定列值 selectColumns: function(column) { - return $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) { + var rows = $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) { return row[column]; }); + if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) { + rows = rows.concat(selectionIds); + } + return $.common.uniqueFn(rows); }, // 查询表格首列值 selectFirstColumns: function() { - return $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) { + var rows = $.map($('#' + $.table._option.id).bootstrapTable('getSelections'), function (row) { return row[$.table._option.columns[1].field]; }); + if ($.common.isNotEmpty($.table._option.rememberSelected) && $.table._option.rememberSelected) { + rows = rows.concat(selectionIds); + } + return $.common.uniqueFn(rows); }, // 回显数据字典 selectDictLabel: function(datas, value) { @@ -736,7 +766,7 @@ } return url; }, - // 保存信息 + // 保存信息 刷新表格 save: function(url, data) { var config = { url: url, @@ -753,6 +783,29 @@ }; $.ajax(config) }, + // 保存信息 弹出提示框 + saveModal: function(url, data) { + var config = { + url: url, + type: "post", + dataType: "json", + data: data, + beforeSend: function () { + $.modal.loading("正在处理中，请稍后..."); + }, + success: function(result) { + if (result.code == web_status.SUCCESS) { + $.modal.alertSuccess(result.msg) + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { + $.modal.alertError(result.msg); + } + $.modal.closeLoading(); + } + }; + $.ajax(config) + }, // 保存选项卡信息 saveTab: function(url, data) { var config = { @@ -777,7 +830,9 @@ } else if (result.code == web_status.SUCCESS && $.table._option.type == table_type.bootstrapTreeTable) { $.modal.msgSuccess(result.msg); $.treeTable.refresh(); - } else { + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { $.modal.alertError(result.msg); } $.modal.closeLoading(); @@ -786,7 +841,9 @@ saveSuccess: function (result) { if (result.code == web_status.SUCCESS) { $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); - } else { + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { $.modal.alertError(result.msg); } $.modal.closeLoading(); @@ -806,7 +863,9 @@ } else { $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); } - } else { + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) + } else { $.modal.alertError(result.msg); } $.modal.closeLoading(); @@ -827,6 +886,8 @@ $contentWindow.$.treeTable.refresh(); } closeItem(); + } else if (result.code == web_status.WARNING) { + $.modal.alertWarning(result.msg) } else { $.modal.alertError(result.msg); } @@ -1057,6 +1118,19 @@ } return value.toString().replace(/(^\s*)|(\s*$)|\r|\n/g, ""); }, + // 字符串格式化(%s ) + sprintf: function (str) { + var args = arguments, flag = true, i = 1; + str = str.replace(/%s/g, function () { + var arg = args[i++]; + if (typeof arg === 'undefined') { + flag = false; + return ''; + } + return arg; + }); + return flag ? str : ''; + }, // 指定随机数返回 random: function (min, max) { return Math.floor((Math.random() * max) + min); @@ -1070,6 +1144,18 @@ endWith: function(value, end) { var reg = new RegExp(end + "$"); return reg.test(value) + }, + // 数组去重 + uniqueFn: function(array) { + var result = []; + var hashObj = {}; + for (var i = 0; i < array.length; i++) { + if (!hashObj[array[i]]) { + hashObj[array[i]] = true; + result.push(array[i]); + } + } + return result; } } }); @@ -1084,7 +1170,8 @@ table_type = { /** 消息状态码 */ web_status = { SUCCESS: 0, - FAIL: 500 + FAIL: 500, + WARNING: 301 }; /** 弹窗状态码 */ diff --git a/ruoyi-admin/src/main/resources/templates/include.html b/ruoyi-admin/src/main/resources/templates/include.html index fbfc20a0..0b35b766 100644 --- a/ruoyi-admin/src/main/resources/templates/include.html +++ b/ruoyi-admin/src/main/resources/templates/include.html @@ -1,9 +1,10 @@ - + + - + @@ -13,13 +14,13 @@ - + +
    - @@ -37,11 +38,69 @@ - + - - + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    + + +
    + + +
    +
    + + +
    + + +
    + +
    +
    + +
    + + +
    + +
    +
    + +
    \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 1c58aa72..4f74fa94 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -16,7 +16,7 @@ - + @@ -24,8 +25,8 @@ button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
    -
    - + + + + + - + + - + + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/role/rule.html b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html similarity index 83% rename from ruoyi-admin/src/main/resources/templates/system/role/rule.html rename to ruoyi-admin/src/main/resources/templates/system/role/dataScope.html index 655ac47a..8c7bcd4b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/rule.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/dataScope.html @@ -1,8 +1,9 @@ - - - + + + +
    @@ -29,7 +30,7 @@ 特殊情况下，设置为“自定数据权限”
    -
    +
    @@ -37,8 +38,8 @@
    -
    - + + diff --git a/ruoyi-admin/src/main/resources/templates/system/role/edit.html b/ruoyi-admin/src/main/resources/templates/system/role/edit.html index cd07869a..c1a4c667 100644 --- a/ruoyi-admin/src/main/resources/templates/system/role/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/role/edit.html @@ -1,8 +1,9 @@ - - - + + + +
    @@ -51,8 +52,8 @@
    -
    - + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index 71475d6f..993571ae 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -1,7 +1,9 @@ - - + + + +
    @@ -135,8 +137,8 @@
    -
    - + + - + + - - diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html index bf8b2b5b..224c0ce7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html @@ -1,78 +1,277 @@ - - - - 个人信息 - - - - - + + - -
    -
    -
    -
    -
    -
    个人信息
    -
    - - - - - - -
    + + +
    +
    +
    +
    +
    +
    个人资料
    +
    +
    +
    +

    +

    修改头像

    -
    -
    -
    - image -
    [[${user.loginIp}]]
    -
    -
    -
    -

    [[${user.loginName}]]

    -

    [[${user.userName}]] / [[${#strings.defaultString(roleGroup,'无角色')}]] -

    [[${user.phonenumber}]]

    -

    [[${user.dept?.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]

    -

    性别：[[${user.sex}]]

    -

    [[${user.email}]]

    -

    [[${#dates.format(user.createTime, 'yyyy-MM-dd HH:mm:ss')}]]

    -
    -
    - +
      +
    • + 登录名称： +

      [[${user.loginName}]]

      +
      • +
    • + 手机号码： +

      [[${user.phonenumber}]]

      +
      • +
    • + 所属部门： +

      [[${user.dept?.deptName}]] / [[${#strings.defaultString(postGroup,'无岗位')}]]

      +
      • +
    • + 邮箱地址： +

      [[${user.email}]]

      +
      • +
    • + 创建时间： +

      [[${#dates.format(user.createTime, 'yyyy-MM-dd')}]]

      +
      • +
    +
    +
    +
    + +
    +
    +
    +
    基本资料
    +
    +
    +
    + +
    + +
    + + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +   + +
    +
    + +
    + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +   + +
    +
    +
    +
    +
    +
    -
    + diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html index ee338541..e6a87b68 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/resetPwd.html @@ -1,7 +1,8 @@ - - + + +
    @@ -33,7 +34,7 @@
    -
    + - + + + - - + -