diff --git a/README.md b/README.md index 0535be600..f037c0003 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,14 @@ 一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适的。于是利用空闲休息时间开始自己写了一套后台系统。如此有了若依。她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。 -性别男，若依是给还没有出生女儿取的名字（寓意：你若不离不弃，我必生死相依） +性别男，若依是给女儿取的名字（寓意：你若不离不弃，我必生死相依） + +若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。 -* 感谢 [hplus](https://gitee.com/hplus_admin/hplus) 后台主题 UI 框架。 * 前后端分离版本，请移步[RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)，微服务版本，请移步[RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) -* 阿里云优惠券：[点我进入](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   +* 感谢 [hplus](https://gitee.com/hplus_admin/hplus) 后台主题 UI 框架。 +* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)   +* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)   ## 内置功能 @@ -40,43 +43,43 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
diff --git a/pom.xml b/pom.xml index 4c971f3d1..dbb9ba962 100644 --- a/pom.xml +++ b/pom.xml @@ -5,27 +5,26 @@ com.ruoyi ruoyi - 4.4.0 + 4.5.0 ruoyi http://www.ruoyi.vip 若依管理系统 - 4.4.0 + 4.5.0 UTF-8 UTF-8 1.8 3.1.1 1.6.0 2.0.0 - 1.3.2 - 1.1.22 + 1.2.2 1.19 2.3.2 2.9.2 - 1.2.5 - 1.2.73 + 1.3.0 + 1.2.74 5.2.5 5.5.0 2.5 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index a87900b03..e6f372c6b 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi com.ruoyi - 4.4.0 + 4.5.0 4.0.0 jar diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java index e01dc1c84..3ae9e81ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java @@ -16,9 +16,9 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.enums.OnlineStatus; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.framework.shiro.session.OnlineSession; import com.ruoyi.framework.shiro.session.OnlineSessionDAO; -import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysUserOnline; import com.ruoyi.system.service.ISysUserOnlineService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java index 1937c795f..96307b84f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java @@ -17,8 +17,8 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysConfig; import com.ruoyi.system.service.ISysConfigService; 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 91cb80ec9..b0cba0472 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 @@ -16,11 +16,11 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysDept; -import com.ruoyi.system.domain.SysRole; import com.ruoyi.system.service.ISysDeptService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index 945109858..87109589d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -14,11 +14,11 @@ 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.entity.SysDictData; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysDictData; import com.ruoyi.system.service.ISysDictDataService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java index cde8ae798..e8b352190 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java @@ -16,11 +16,11 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.core.domain.entity.SysDictType; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysDictType; import com.ruoyi.system.service.ISysDictTypeService; /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java index 030c8d6be..8d24e13d8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java @@ -1,5 +1,6 @@ package com.ruoyi.web.controller.system; +import java.util.Date; import java.util.List; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -10,12 +11,14 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import com.ruoyi.common.config.Global; import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.utils.CookieUtils; +import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.ServletUtils; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysConfigService; import com.ruoyi.system.service.ISysMenuService; @@ -48,6 +51,8 @@ public class SysIndexController extends BaseController mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter")); mmap.put("copyrightYear", Global.getCopyrightYear()); mmap.put("demoEnabled", Global.isDemoEnabled()); + mmap.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate())); + mmap.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate())); // 菜单导航显示风格 String menuStyle = configService.selectConfigByKey("sys.index.menuStyle"); @@ -89,4 +94,28 @@ public class SysIndexController extends BaseController mmap.put("version", Global.getVersion()); return "main"; } + + // 检查初始密码是否提醒修改 + public boolean initPasswordIsModify(Date pwdUpdateDate) + { + int initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify")); + return initPasswordModify == 1 && pwdUpdateDate == null; + } + + // 检查密码是否过期 + public boolean passwordIsExpiration(Date pwdUpdateDate) + { + int passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays")); + if (passwordValidateDays > 0) + { + if (StringUtils.isNull(pwdUpdateDate)) + { + // 如果从未修改过初始密码，直接提醒过期 + return true; + } + Date nowDate = DateUtils.getNowDate(); + return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays; + } + return false; + } } 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 3615c7599..05d6e2595 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 @@ -16,10 +16,11 @@ import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.Ztree; +import com.ruoyi.common.core.domain.entity.SysMenu; +import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysMenu; -import com.ruoyi.system.domain.SysRole; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.framework.shiro.util.AuthorizationUtils; import com.ruoyi.system.service.ISysMenuService; /** @@ -70,7 +71,7 @@ public class SysMenuController extends BaseController { return AjaxResult.warn("菜单已分配,不允许删除"); } - ShiroUtils.clearCachedAuthorizationInfo(); + AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(menuService.deleteMenuById(menuId)); } @@ -109,7 +110,7 @@ public class SysMenuController extends BaseController return error("新增菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } menu.setCreateBy(ShiroUtils.getLoginName()); - ShiroUtils.clearCachedAuthorizationInfo(); + AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(menuService.insertMenu(menu)); } @@ -137,7 +138,7 @@ public class SysMenuController extends BaseController return error("修改菜单'" + menu.getMenuName() + "'失败，菜单名称已存在"); } menu.setUpdateBy(ShiroUtils.getLoginName()); - ShiroUtils.clearCachedAuthorizationInfo(); + AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(menuService.updateMenu(menu)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java index 671dc11e3..5b3d478d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java @@ -15,7 +15,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.framework.util.ShiroUtils; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.system.domain.SysNotice; import com.ruoyi.system.service.ISysNoticeService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java index d6db9fdf0..966361b95 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java @@ -17,8 +17,8 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.framework.util.ShiroUtils; import com.ruoyi.system.domain.SysPost; import com.ruoyi.system.service.ISysPostService; 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 f8a462dda..77255f50b 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 @@ -15,12 +15,12 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.config.Global; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.ShiroUtils; 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.ISysUserService; /** @@ -81,21 +81,23 @@ public class SysProfileController extends BaseController public AjaxResult resetPwd(String oldPassword, String newPassword) { SysUser user = ShiroUtils.getSysUser(); - if (StringUtils.isNotEmpty(newPassword) && passwordService.matches(user, oldPassword)) - { - user.setSalt(ShiroUtils.randomSalt()); - user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt())); - if (userService.resetUserPwd(user) > 0) - { - ShiroUtils.setSysUser(userService.selectUserById(user.getUserId())); - return success(); - } - return error(); - } - else + if (!passwordService.matches(user, oldPassword)) { return error("修改密码失败，旧密码错误"); } + if (passwordService.matches(user, newPassword)) + { + return error("新密码不能与旧密码相同"); + } + user.setSalt(ShiroUtils.randomSalt()); + user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt())); + user.setPwdUpdateDate(DateUtils.getNowDate()); + if (userService.resetUserPwd(user) > 0) + { + ShiroUtils.setSysUser(userService.selectUserById(user.getUserId())); + return success(); + } + return error("修改密码异常，请联系管理员"); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java index a0f0a4848..24f67ac6a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java @@ -8,8 +8,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.framework.shiro.service.SysRegisterService; -import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysConfigService; /** 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 0f7379d1a..49510f606 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 @@ -15,12 +15,13 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; 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.framework.shiro.util.AuthorizationUtils; import com.ruoyi.system.domain.SysUserRole; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; @@ -97,7 +98,7 @@ public class SysRoleController extends BaseController return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); } role.setCreateBy(ShiroUtils.getLoginName()); - ShiroUtils.clearCachedAuthorizationInfo(); + AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(roleService.insertRole(role)); } @@ -131,7 +132,7 @@ public class SysRoleController extends BaseController return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); } role.setUpdateBy(ShiroUtils.getLoginName()); - ShiroUtils.clearCachedAuthorizationInfo(); + AuthorizationUtils.clearAllCachedAuthorizationInfo(); return toAjax(roleService.updateRole(role)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java index f5109d291..1d41ff1e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java @@ -17,13 +17,14 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysRole; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.ShiroUtils; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.shiro.service.SysPasswordService; -import com.ruoyi.framework.util.ShiroUtils; -import com.ruoyi.system.domain.SysRole; -import com.ruoyi.system.domain.SysUser; import com.ruoyi.system.service.ISysPostService; import com.ruoyi.system.service.ISysRoleService; import com.ruoyi.system.service.ISysUserService; @@ -125,11 +126,13 @@ public class SysUserController extends BaseController { return error("新增用户'" + user.getLoginName() + "'失败，登录账号已存在"); } - else if (UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) + else if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error("新增用户'" + user.getLoginName() + "'失败，手机号码已存在"); } - else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) + else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error("新增用户'" + user.getLoginName() + "'失败，邮箱账号已存在"); } @@ -162,11 +165,13 @@ public class SysUserController extends BaseController public AjaxResult editSave(@Validated SysUser user) { userService.checkUserAllowed(user); - if (UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) + if (StringUtils.isNotEmpty(user.getPhonenumber()) + && UserConstants.USER_PHONE_NOT_UNIQUE.equals(userService.checkPhoneUnique(user))) { return error("修改用户'" + user.getLoginName() + "'失败，手机号码已存在"); } - else if (UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) + else if (StringUtils.isNotEmpty(user.getEmail()) + && UserConstants.USER_EMAIL_NOT_UNIQUE.equals(userService.checkEmailUnique(user))) { return error("修改用户'" + user.getLoginName() + "'失败，邮箱账号已存在"); } diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index cb273afba..f9bc9da00 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: 4.4.0 + version: 4.5.0 # 版权年份 copyrightYear: 2019 # 实例演示开关 diff --git a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml index 72469e13a..7e5970a90 100644 --- a/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml +++ b/ruoyi-admin/src/main/resources/ehcache/ehcache-shiro.xml @@ -28,7 +28,7 @@ timeToIdleSeconds="600" timeToLiveSeconds="0" overflowToDisk="false" - statistics="true"> + statistics="false"> @@ -39,7 +39,7 @@ diskPersistent="false" timeToLiveSeconds="0" timeToIdleSeconds="0" - statistics="true"> + statistics="false"> @@ -47,7 +47,7 @@ maxEntriesLocalHeap="1000" eternal="true" overflowToDisk="true" - statistics="true"> + statistics="false"> @@ -55,7 +55,7 @@ maxEntriesLocalHeap="1000" eternal="true" overflowToDisk="true" - statistics="true"> + statistics="false"> @@ -63,19 +63,18 @@ maxEntriesLocalHeap="1000" eternal="true" overflowToDisk="true" - statistics="true"> + statistics="false"> - + statistics="false"/> \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/highlight/default.min.css b/ruoyi-admin/src/main/resources/static/ajax/libs/highlight/default.min.css new file mode 100644 index 000000000..237c8e416 --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/highlight/default.min.css @@ -0,0 +1,79 @@ +/** + * GitHub Gist Theme + * Author : Anthony Attard - https://github.com/AnthonyAttard + * Author : Louis Barranqueiro - https://github.com/LouisBarranqueiro + */ + +.hljs { + display: block; + background: white; + padding: 0.5em; + color: #333333; + overflow-x: auto; +} + +.hljs-comment, +.hljs-meta { + color: #969896; +} + +.hljs-variable, +.hljs-template-variable, +.hljs-strong, +.hljs-emphasis, +.hljs-quote { + color: #df5000; +} + +.hljs-keyword, +.hljs-selector-tag, +.hljs-type { + color: #d73a49; +} + +.hljs-literal, +.hljs-symbol, +.hljs-bullet, +.hljs-attribute { + color: #0086b3; +} + +.hljs-section, +.hljs-name { + color: #63a35c; +} + +.hljs-tag { + color: #333333; +} + +.hljs-title, +.hljs-attr, +.hljs-selector-id, +.hljs-selector-class, +.hljs-selector-attr, +.hljs-selector-pseudo { + color: #6f42c1; +} + +.hljs-addition { + color: #55a532; + background-color: #eaffea; +} + +.hljs-deletion { + color: #bd2c00; + background-color: #ffecec; +} + +.hljs-link { + text-decoration: underline; +} + +.hljs-number { + color: #005cc5; +} + +.hljs-string { + color: #032f62; +} diff --git a/ruoyi-admin/src/main/resources/static/ajax/libs/highlight/highlight.min.js b/ruoyi-admin/src/main/resources/static/ajax/libs/highlight/highlight.min.js new file mode 100644 index 000000000..e8b9ab33b --- /dev/null +++ b/ruoyi-admin/src/main/resources/static/ajax/libs/highlight/highlight.min.js @@ -0,0 +1,1102 @@ +/* + Highlight.js 10.3.2 (31e1fc40) + License: BSD-3-Clause + Copyright (c) 2006-2020, Ivan Sagalaev +*/ +var hljs=function(){"use strict";function e(n){Object.freeze(n) +;var t="function"==typeof n +;return Object.getOwnPropertyNames(n).forEach((function(r){ +!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r]) +})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data} +ignoreMatch(){this.ignore=!0}}function t(e){ +return e.replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/'/g,"'") +}function r(e,...n){var t={};for(const n in e)t[n]=e[n] +;return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){ +return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null, +escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){ +for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({ +event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({ +event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){ +var i=0,s="",o=[];function l(){ +return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset"}function u(e){ +s+=""}function g(e){("start"===e.event?c:u)(e.node)} +for(;e.length||n.length;){var d=l() +;if(s+=t(r.substring(i,d[0].offset)),i=d[0].offset,d===e){o.reverse().forEach(u) +;do{g(d.splice(0,1)[0]),d=l()}while(d===e&&d.length&&d[0].offset===i) +;o.reverse().forEach(c) +}else"start"===d[0].event?o.push(d[0].node):o.pop(),g(d.splice(0,1)[0])} +return s+t(r.substr(i))}});const s=e=>!!e.kind;class o{constructor(e,n){ +this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){ +this.buffer+=t(e)}openNode(e){if(!s(e))return;let n=e.kind +;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){ +s(e)&&(this.buffer+="")}value(){return this.buffer}span(e){ +this.buffer+=``}}class l{constructor(){this.rootNode={ +children:[]},this.stack=[this.rootNode]}get top(){ +return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){ +this.top.children.push(e)}openNode(e){const n={kind:e,children:[]} +;this.add(n),this.stack.push(n)}closeNode(){ +if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){ +for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)} +walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){ +return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n), +n.children.forEach((n=>this._walk(e,n))),e.closeNode(n)),e}static _collapse(e){ +"string"!=typeof e&&e.children&&(e.children.every((e=>"string"==typeof e))?e.children=[e.children.join("")]:e.children.forEach((e=>{ +l._collapse(e)})))}}class c extends l{constructor(e){super(),this.options=e} +addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())} +addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root +;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){ +return new o(this,this.options).value()}finalize(){return!0}}function u(e){ +return e?"string"==typeof e?e:e.source:null} +const g="[a-zA-Z]\\w*",d="[a-zA-Z_]\\w*",h="\\b\\d+(\\.\\d+)?",f="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",p="\\b(0b[01]+)",m={ +begin:"\\\\[\\s\\S]",relevance:0},b={className:"string",begin:"'",end:"'", +illegal:"\\n",contains:[m]},v={className:"string",begin:'"',end:'"', +illegal:"\\n",contains:[m]},x={ +begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/ +},E=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[] +},t);return a.contains.push(x),a.contains.push({className:"doctag", +begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a +},_=E("//","$"),w=E("/\\*","\\*/"),N=E("#","$");var y=Object.freeze({ +__proto__:null,IDENT_RE:g,UNDERSCORE_IDENT_RE:d,NUMBER_RE:h,C_NUMBER_RE:f, +BINARY_NUMBER_RE:p, +RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~", +SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){ +return e.map((e=>u(e))).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({ +className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{ +0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:m,APOS_STRING_MODE:b, +QUOTE_STRING_MODE:v,PHRASAL_WORDS_MODE:x,COMMENT:E,C_LINE_COMMENT_MODE:_, +C_BLOCK_COMMENT_MODE:w,HASH_COMMENT_MODE:N,NUMBER_MODE:{className:"number", +begin:h,relevance:0},C_NUMBER_MODE:{className:"number",begin:f,relevance:0}, +BINARY_NUMBER_MODE:{className:"number",begin:p,relevance:0},CSS_NUMBER_MODE:{ +className:"number", +begin:h+"(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?", +relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp", +begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[m,{begin:/\[/,end:/\]/, +relevance:0,contains:[m]}]}]},TITLE_MODE:{className:"title",begin:g,relevance:0 +},UNDERSCORE_TITLE_MODE:{className:"title",begin:d,relevance:0},METHOD_GUARD:{ +begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){ +return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]}, +"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})} +}),R="of and for in not or if then".split(" ");function k(e){function n(n,t){ +return RegExp(u(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{ +constructor(){ +this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0} +addRule(e,n){ +n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]), +this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1 +}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null) +;const e=this.regexes.map((e=>e[1]));this.matcherRe=n(function(e,n="|"){ +for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o) +;if(null==l){a+=o;break} +a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length), +"\\"===l[0][0]&&l[1]?a+="\\"+(Number(l[1])+s):(a+=l[0],"("===l[0]&&r++)}a+=")"} +return a}(e),!0),this.lastIndex=0}exec(e){ +this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e) +;if(!n)return null +;const t=n.findIndex(((e,n)=>n>0&&void 0!==e)),r=this.matchIndexes[t] +;return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){ +this.rules=[],this.multiRegexes=[], +this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){ +if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t +;return this.rules.slice(e).forEach((([e,t])=>n.addRule(e,t))), +n.compile(),this.multiRegexes[e]=n,n}resumingScanAtSamePosition(){ +return 0!==this.regexIndex}considerAll(){this.regexIndex=0}addRule(e,n){ +this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){ +const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex +;let t=n.exec(e) +;if(this.resumingScanAtSamePosition())if(t&&t.index===this.lastIndex);else{ +const n=this.getMatcher(0);n.lastIndex=this.lastIndex+1,t=n.exec(e)} +return t&&(this.regexIndex+=t.position+1, +this.regexIndex===this.count&&this.considerAll()),t}}function i(e,n){ +const t=e.input[e.index-1],r=e.input[e.index+e[0].length] +;"."!==t&&"."!==r||n.ignoreMatch()} +if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language. See documentation.") +;return function t(s,o){const l=s;if(s.compiled)return l +;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords +;let c=null +;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern), +s.keywords&&(s.keywords=function(e,n){var t={} +;return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){ +r(n,e[n])})),t;function r(e,r){ +n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|") +;t[r[0]]=[e,O(r[0],r[1])]}))} +}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ") +;return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0), +o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)", +s.__beforeBegin=i), +s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin), +s.end||s.endsWithParent||(s.end=/\B|\b/), +s.end&&(l.endRe=n(s.end)),l.terminator_end=u(s.end)||"", +s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)), +s.illegal&&(l.illegalRe=n(s.illegal)), +void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]), +s.contains=[].concat(...s.contains.map((function(e){return function(e){ +return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){ +return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:M(e)?r(e,{ +starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e) +}))),s.contains.forEach((function(e){t(e,l) +})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a +;return e.contains.forEach((e=>n.addRule(e.begin,{rule:e,type:"begin" +}))),e.terminator_end&&n.addRule(e.terminator_end,{type:"end" +}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}function M(e){ +return!!e&&(e.endsWithParent||M(e.starts))}function O(e,n){ +return n?Number(n):function(e){return R.includes(e.toLowerCase())}(e)?0:1} +const L={props:["language","code","autodetect"],data:function(){return{ +detectedLanguage:"",unknownLanguage:!1}},computed:{className(){ +return this.unknownLanguage?"":"hljs "+this.detectedLanguage},highlighted(){ +if(!this.autoDetect&&!hljs.getLanguage(this.language))return console.warn(`The language "${this.language}" you specified could not be found.`), +this.unknownLanguage=!0,t(this.code);let e +;return this.autoDetect?(e=hljs.highlightAuto(this.code), +this.detectedLanguage=e.language):(e=hljs.highlight(this.language,this.code,this.ignoreIllegals), +this.detectectLanguage=this.language),e.value},autoDetect(){ +return!(this.language&&(e=this.autodetect,!e&&""!==e));var e}, +ignoreIllegals:()=>!0},render(e){return e("pre",{},[e("code",{ +class:this.className,domProps:{innerHTML:this.highlighted}})])}},j={install(e){ +e.component("highlightjs",L)} +},I=t,T=r,{nodeStream:S,mergeStreams:A}=i,B=Symbol("nomatch") +;return function(t){ +var r=[],a=Object.create(null),i=Object.create(null),s=[],o=!0,l=/(^(<[^>]+>|\t|)+|\n)/gm,u="Could not find the language '{}', did you forget to load/include a language module?" +;const g={disableAutodetect:!0,name:"Plain text",contains:[]};var d={ +noHighlightRe:/^(no-?highlight)$/i, +languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-", +tabReplace:null,useBR:!1,languages:null,__emitter:c};function h(e){ +return d.noHighlightRe.test(e)}function f(e,n,t,r){var a={code:n,language:e} +;N("before:highlight",a);var i=a.result?a.result:p(a.language,a.code,t,r) +;return i.code=a.code,N("after:highlight",i),i}function p(e,t,r,i){var s=t +;function l(e,n){var t=_.case_insensitive?n[0].toLowerCase():n[0] +;return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]} +function c(){null!=y.subLanguage?function(){if(""!==O){var e=null +;if("string"==typeof y.subLanguage){ +if(!a[y.subLanguage])return void M.addText(O) +;e=p(y.subLanguage,O,!0,R[y.subLanguage]),R[y.subLanguage]=e.top +}else e=m(O,y.subLanguage.length?y.subLanguage:null) +;y.relevance>0&&(L+=e.relevance),M.addSublanguage(e.emitter,e.language)} +}():function(){if(!y.keywords)return void M.addText(O);let e=0 +;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(O),t="";for(;n;){ +t+=O.substring(e,n.index);const r=l(y,n);if(r){const[e,a]=r +;M.addText(t),t="",L+=a,M.addKeyword(n[0],e)}else t+=n[0] +;e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(O)} +t+=O.substr(e),M.addText(t)}(),O=""}function g(e){ +return e.className&&M.openNode(e.className),y=Object.create(e,{parent:{value:y} +})}function h(e,t,r){let a=function(e,n){var t=e&&e.exec(n) +;return t&&0===t.index}(e.endRe,r);if(a){if(e["on:end"]){const r=new n(e) +;e["on:end"](t,r),r.ignore&&(a=!1)}if(a){for(;e.endsParent&&e.parent;)e=e.parent +;return e}}if(e.endsWithParent)return h(e.parent,t,r)}function f(e){ +return 0===y.matcher.regexIndex?(O+=e[0],1):(S=!0,0)}function b(e){ +var n=e[0],t=s.substr(e.index),r=h(y,e,t);if(!r)return B;var a=y +;a.skip?O+=n:(a.returnEnd||a.excludeEnd||(O+=n),c(),a.excludeEnd&&(O=n));do{ +y.className&&M.closeNode(),y.skip||y.subLanguage||(L+=y.relevance),y=y.parent +}while(y!==r.parent) +;return r.starts&&(r.endSameAsBegin&&(r.starts.endRe=r.endRe), +g(r.starts)),a.returnEnd?0:n.length}var v={};function x(t,a){var i=a&&a[0] +;if(O+=t,null==i)return c(),0 +;if("begin"===v.type&&"end"===a.type&&v.index===a.index&&""===i){ +if(O+=s.slice(a.index,a.index+1),!o){const n=Error("0 width match regex") +;throw n.languageName=e,n.badRule=v.rule,n}return 1} +if(v=a,"begin"===a.type)return function(e){var t=e[0],r=e.rule +;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]] +;for(const n of i)if(n&&(n(e,a),a.ignore))return f(t) +;return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")), +r.skip?O+=t:(r.excludeBegin&&(O+=t), +c(),r.returnBegin||r.excludeBegin||(O=t)),g(r),r.returnBegin?0:t.length}(a) +;if("illegal"===a.type&&!r){ +const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"")+'"') +;throw e.mode=y,e}if("end"===a.type){var l=b(a);if(l!==B)return l} +if("illegal"===a.type&&""===i)return 1 +;if(T>1e5&&T>3*a.index)throw Error("potential infinite loop, way more iterations than matches") +;return O+=i,i.length}var _=E(e) +;if(!_)throw console.error(u.replace("{}",e)),Error('Unknown language: "'+e+'"') +;var w=k(_),N="",y=i||w,R={},M=new d.__emitter(d);!function(){ +for(var e=[],n=y;n!==_;n=n.parent)n.className&&e.unshift(n.className) +;e.forEach((e=>M.openNode(e)))}();var O="",L=0,j=0,T=0,S=!1;try{ +for(y.matcher.considerAll();;){ +T++,S?S=!1:y.matcher.considerAll(),y.matcher.lastIndex=j +;const e=y.matcher.exec(s);if(!e)break;const n=x(s.substring(j,e.index),e) +;j=e.index+n}return x(s.substr(j)),M.closeAllNodes(),M.finalize(),N=M.toHTML(),{ +relevance:L,value:N,language:e,illegal:!1,emitter:M,top:y}}catch(n){ +if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{ +msg:n.message,context:s.slice(j-100,j+100),mode:n.mode},sofar:N,relevance:0, +value:I(s),emitter:M};if(o)return{illegal:!1,relevance:0,value:I(s),emitter:M, +language:e,top:y,errorRaised:n};throw n}}function m(e,n){ +n=n||d.languages||Object.keys(a);var t=function(e){const n={relevance:0, +emitter:new d.__emitter(d),value:I(e),illegal:!1,top:g} +;return n.emitter.addText(e),n}(e),r=t +;return n.filter(E).filter(w).forEach((function(n){var a=p(n,e,!1);a.language=n, +a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a) +})),r.language&&(t.second_best=r),t}function b(e){ +return d.tabReplace||d.useBR?e.replace(l,(e=>"\n"===e?d.useBR?"
":e:d.tabReplace?e.replace(/\t/g,d.tabReplace):e)):e +}function v(e){let n=null;const t=function(e){var n=e.className+" " +;n+=e.parentNode?e.parentNode.className:"";const t=d.languageDetectRe.exec(n) +;if(t){var r=E(t[1]) +;return r||(console.warn(u.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)), +r?t[1]:"no-highlight"}return n.split(/\s+/).find((e=>h(e)||E(e)))}(e) +;if(h(t))return;N("before:highlightBlock",{block:e,language:t +}),d.useBR?(n=document.createElement("div"), +n.innerHTML=e.innerHTML.replace(/\n/g,"").replace(//g,"\n")):n=e +;const r=n.textContent,a=t?f(t,r,!0):m(r),s=S(n);if(s.length){ +const e=document.createElement("div");e.innerHTML=a.value,a.value=A(s,S(e),r)} +a.value=b(a.value),N("after:highlightBlock",{block:e,result:a +}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?i[n]:t,a=[e.trim()] +;return e.match(/\bhljs\b/)||a.push("hljs"), +e.includes(r)||a.push(r),a.join(" ").trim() +}(e.className,t,a.language),e.result={language:a.language,re:a.relevance, +relavance:a.relevance},a.second_best&&(e.second_best={ +language:a.second_best.language,re:a.second_best.relevance, +relavance:a.second_best.relevance})}const x=()=>{if(!x.called){x.called=!0 +;var e=document.querySelectorAll("pre code");r.forEach.call(e,v)}} +;function E(e){return e=(e||"").toLowerCase(),a[e]||a[i[e]]} +function _(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach((e=>{i[e]=n +}))}function w(e){var n=E(e);return n&&!n.disableAutodetect}function N(e,n){ +var t=e;s.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:f, +highlightAuto:m,fixMarkup:function(e){ +return console.warn("fixMarkup is deprecated and will be removed entirely in v11.0"), +console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2534"), +b(e)},highlightBlock:v,configure:function(e){ +e.useBR&&(console.warn("'useBR' option is deprecated and will be removed entirely in v11.0"), +console.warn("Please see https://github.com/highlightjs/highlight.js/issues/2559")), +d=T(d,e)},initHighlighting:x,initHighlightingOnLoad:function(){ +window.addEventListener("DOMContentLoaded",x,!1)}, +registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){ +if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)), +!o)throw n;console.error(n),r=g} +r.name||(r.name=e),a[e]=r,r.rawDefinition=n.bind(null,t), +r.aliases&&_(r.aliases,{languageName:e})},listLanguages:function(){ +return Object.keys(a)},getLanguage:E,registerAliases:_, +requireLanguage:function(e){var n=E(e);if(n)return n +;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))}, +autoDetection:w,inherit:T,addPlugin:function(e){s.push(e)},vuePlugin:j +}),t.debugMode=function(){o=!1},t.safeMode=function(){o=!0 +},t.versionString="10.3.2";for(const n in y)"object"==typeof y[n]&&e(y[n]) +;return Object.assign(t,y),t}({})}() +;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs); +hljs.registerLanguage("apache",function(){"use strict";return function(e){ +var n={className:"number", +begin:"\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?"};return{ +name:"Apache config",aliases:["apacheconf"],case_insensitive:!0, +contains:[e.HASH_COMMENT_MODE,{className:"section",begin:"", +contains:[n,{className:"number",begin:":\\d{1,5}" +},e.inherit(e.QUOTE_STRING_MODE,{relevance:0})]},{className:"attribute", +begin:/\w+/,relevance:0,keywords:{ +nomarkup:"order deny allow setenv rewriterule rewriteengine rewritecond documentroot sethandler errordocument loadmodule options header listen serverroot servername" +},starts:{end:/$/,relevance:0,keywords:{literal:"on off all deny allow"}, +contains:[{className:"meta",begin:"\\s\\[",end:"\\]$"},{className:"variable", +begin:"[\\$%]\\{",end:"\\}",contains:["self",{className:"number", +begin:"[\\$%]\\d+"}]},n,{className:"number",begin:"\\d+"},e.QUOTE_STRING_MODE]} +}],illegal:/\S/}}}()); +hljs.registerLanguage("bash",function(){"use strict";return function(e){ +const s={};Object.assign(s,{className:"variable",variants:[{ +begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:["self",{begin:/:-/, +contains:[s]}]}]});const n={className:"subst",begin:/\$\(/,end:/\)/, +contains:[e.BACKSLASH_ESCAPE]},t={begin:/<<-?\s*(?=\w+)/,starts:{ +contains:[e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,className:"string"})]} +},a={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,n]} +;n.contains.push(a);const i={begin:/\$\(\(/,end:/\)\)/,contains:[{ +begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},c=e.SHEBANG({ +binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),o={ +className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0, +contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{ +name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b[a-z._-]+\b/, +keyword:"if then else elif fi for while in do done case esac function", +literal:"true false", +built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp" +},contains:[c,e.SHEBANG(),o,i,e.HASH_COMMENT_MODE,t,a,{className:"",begin:/\\"/ +},{className:"string",begin:/'/,end:/'/},s]}}}()); +hljs.registerLanguage("c-like",function(){"use strict";return function(e){ +function t(e){return"(?:"+e+")?"}var n=e.COMMENT("//","$",{contains:[{ +begin:/\\\n/}] +}),r="[a-zA-Z_]\\w*::",a="(decltype\\(auto\\)|"+t(r)+"[a-zA-Z_]\\w*"+t("<.*?>")+")",i={ +className:"keyword",begin:"\\b[a-z\\d_]*_t\\b"},s={className:"string", +variants:[{begin:'(u8?|U|L)?"',end:'"',illegal:"\\n", +contains:[e.BACKSLASH_ESCAPE]},{ +begin:"(u8?|U|L)?'(\\\\(x[0-9A-Fa-f]{2}|u[0-9A-Fa-f]{4,8}|[0-7]{3}|\\S)|.)", +end:"'",illegal:"."},e.END_SAME_AS_BEGIN({ +begin:/(?:u8?|U|L)?R"([^()\\ ]{0,16})\(/,end:/\)([^()\\ ]{0,16})"/})]},o={ +className:"number",variants:[{begin:"\\b(0b[01']+)"},{ +begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{ +begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)" +}],relevance:0},c={className:"meta",begin:/#\s*[a-z]+\b/,end:/$/,keywords:{ +"meta-keyword":"if else elif endif define undef warning error line pragma _Pragma ifdef ifndef include" +},contains:[{begin:/\\\n/,relevance:0},e.inherit(s,{className:"meta-string"}),{ +className:"meta-string",begin:/<.*?>/,end:/$/,illegal:"\\n" +},n,e.C_BLOCK_COMMENT_MODE]},l={className:"title",begin:t(r)+e.IDENT_RE, +relevance:0},d=t(r)+e.IDENT_RE+"\\s*\\(",u={ +keyword:"int float while private char char8_t char16_t char32_t catch import module export virtual operator sizeof dynamic_cast|10 typedef const_cast|10 const for static_cast|10 union namespace unsigned long volatile static protected bool template mutable if public friend do goto auto void enum else break extern using asm case typeid wchar_t short reinterpret_cast|10 default double register explicit signed typename try this switch continue inline delete alignas alignof constexpr consteval constinit decltype concept co_await co_return co_yield requires noexcept static_assert thread_local restrict final override atomic_bool atomic_char atomic_schar atomic_uchar atomic_short atomic_ushort atomic_int atomic_uint atomic_long atomic_ulong atomic_llong atomic_ullong new throw return and and_eq bitand bitor compl not not_eq or or_eq xor xor_eq", +built_in:"std string wstring cin cout cerr clog stdin stdout stderr stringstream istringstream ostringstream auto_ptr deque list queue stack vector map set pair bitset multiset multimap unordered_set unordered_map unordered_multiset unordered_multimap priority_queue make_pair array shared_ptr abort terminate abs acos asin atan2 atan calloc ceil cosh cos exit exp fabs floor fmod fprintf fputs free frexp fscanf future isalnum isalpha iscntrl isdigit isgraph islower isprint ispunct isspace isupper isxdigit tolower toupper labs ldexp log10 log malloc realloc memchr memcmp memcpy memset modf pow printf putchar puts scanf sinh sin snprintf sprintf sqrt sscanf strcat strchr strcmp strcpy strcspn strlen strncat strncmp strncpy strpbrk strrchr strspn strstr tanh tan vfprintf vprintf vsprintf endl initializer_list unique_ptr _Bool complex _Complex imaginary _Imaginary", +literal:"true false nullptr NULL"},m=[c,i,n,e.C_BLOCK_COMMENT_MODE,o,s],p={ +variants:[{begin:/=/,end:/;/},{begin:/\(/,end:/\)/},{ +beginKeywords:"new throw return else",end:/;/}],keywords:u,contains:m.concat([{ +begin:/\(/,end:/\)/,keywords:u,contains:m.concat(["self"]),relevance:0}]), +relevance:0},_={className:"function",begin:"("+a+"[\\*&\\s]+)+"+d, +returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:u,illegal:/[^\w\s\*&:<>]/, +contains:[{begin:"decltype\\(auto\\)",keywords:u,relevance:0},{begin:d, +returnBegin:!0,contains:[l],relevance:0},{className:"params",begin:/\(/, +end:/\)/,keywords:u,relevance:0,contains:[n,e.C_BLOCK_COMMENT_MODE,s,o,i,{ +begin:/\(/,end:/\)/,keywords:u,relevance:0, +contains:["self",n,e.C_BLOCK_COMMENT_MODE,s,o,i]}] +},i,n,e.C_BLOCK_COMMENT_MODE,c]};return{ +aliases:["c","cc","h","c++","h++","hpp","hh","hxx","cxx"],keywords:u, +disableAutodetect:!0,illegal:"",keywords:u,contains:["self",i]},{begin:e.IDENT_RE+"::",keywords:u},{ +className:"class",beginKeywords:"enum class struct union",end:/[{;:<>=]/, +contains:[{beginKeywords:"final class struct"},e.TITLE_MODE]}]),exports:{ +preprocessor:c,strings:s,keywords:u}}}}()); +hljs.registerLanguage("c",function(){"use strict";return function(e){ +var n=e.requireLanguage("c-like").rawDefinition() +;return n.name="C",n.aliases=["c","h"],n}}()); +hljs.registerLanguage("coffeescript",function(){"use strict" +;const e=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],n=["true","false","null","undefined","NaN","Infinity"],a=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]) +;return function(r){var t,i={ +keyword:e.concat(["then","unless","until","loop","by","when","and","or","is","isnt","not"]).filter((t=["var","const","let","function","static"], +e=>!t.includes(e))).join(" "), +literal:n.concat(["yes","no","on","off"]).join(" "), +built_in:a.concat(["npm","print"]).join(" ")},s="[A-Za-z$_][0-9A-Za-z$_]*",o={ +className:"subst",begin:/#\{/,end:/}/,keywords:i +},c=[r.BINARY_NUMBER_MODE,r.inherit(r.C_NUMBER_MODE,{starts:{end:"(\\s*/)?", +relevance:0}}),{className:"string",variants:[{begin:/'''/,end:/'''/, +contains:[r.BACKSLASH_ESCAPE]},{begin:/'/,end:/'/,contains:[r.BACKSLASH_ESCAPE] +},{begin:/"""/,end:/"""/,contains:[r.BACKSLASH_ESCAPE,o]},{begin:/"/,end:/"/, +contains:[r.BACKSLASH_ESCAPE,o]}]},{className:"regexp",variants:[{begin:"///", +end:"///",contains:[o,r.HASH_COMMENT_MODE]},{begin:"//[gim]{0,3}(?=\\W)", +relevance:0},{begin:/\/(?![ *]).*?(?![\\]).\/[gim]{0,3}(?=\W)/}]},{begin:"@"+s +},{subLanguage:"javascript",excludeBegin:!0,excludeEnd:!0,variants:[{ +begin:"```",end:"```"},{begin:"`",end:"`"}]}];o.contains=c +;var l=r.inherit(r.TITLE_MODE,{begin:s}),d="(\\(.*\\))?\\s*\\B[-=]>",g={ +className:"params",begin:"\\([^\\(]",returnBegin:!0,contains:[{begin:/\(/, +end:/\)/,keywords:i,contains:["self"].concat(c)}]};return{name:"CoffeeScript", +aliases:["coffee","cson","iced"],keywords:i,illegal:/\/\*/, +contains:c.concat([r.COMMENT("###","###"),r.HASH_COMMENT_MODE,{ +className:"function",begin:"^\\s*"+s+"\\s*=\\s*"+d,end:"[-=]>",returnBegin:!0, +contains:[l,g]},{begin:/[:\(,=]\s*/,relevance:0,contains:[{className:"function", +begin:d,end:"[-=]>",returnBegin:!0,contains:[g]}]},{className:"class", +beginKeywords:"class",end:"$",illegal:/[:="\[\]]/,contains:[{ +beginKeywords:"extends",endsWithParent:!0,illegal:/[:="\[\]]/,contains:[l]},l] +},{begin:s+":",end:":",returnBegin:!0,returnEnd:!0,relevance:0}])}}}()); +hljs.registerLanguage("cpp",function(){"use strict";return function(e){ +var i=e.requireLanguage("c-like").rawDefinition();return i.disableAutodetect=!1, +i.name="C++",i.aliases=["cc","c++","h++","hpp","hh","hxx","cxx"],i}}()); +hljs.registerLanguage("csharp",function(){"use strict";return function(e){ +var n={ +keyword:["abstract","as","base","break","case","class","const","continue","do","else","event","explicit","extern","finally","fixed","for","foreach","goto","if","implicit","in","interface","internal","is","lock","namespace","new","operator","out","override","params","private","protected","public","readonly","record","ref","return","sealed","sizeof","stackalloc","static","struct","switch","this","throw","try","typeof","unchecked","unsafe","using","virtual","void","volatile","while"].concat(["add","alias","and","ascending","async","await","by","descending","equals","from","get","global","group","init","into","join","let","nameof","not","notnull","on","or","orderby","partial","remove","select","set","unmanaged","value","var","when","where","with","yield"]).join(" "), +built_in:"bool byte char decimal delegate double dynamic enum float int long nint nuint object sbyte short string ulong unit ushort", +literal:"default false null true"},i=e.inherit(e.TITLE_MODE,{ +begin:"[a-zA-Z](\\.?\\w)*"}),a={className:"number",variants:[{ +begin:"\\b(0b[01']+)"},{ +begin:"(-?)\\b([\\d']+(\\.[\\d']*)?|\\.[\\d']+)(u|U|l|L|ul|UL|f|F|b|B)"},{ +begin:"(-?)(\\b0[xX][a-fA-F0-9']+|(\\b[\\d']+(\\.[\\d']*)?|\\.[\\d']+)([eE][-+]?[\\d']+)?)" +}],relevance:0},s={className:"string",begin:'@"',end:'"',contains:[{begin:'""'}] +},t=e.inherit(s,{illegal:/\n/}),r={className:"subst",begin:"{",end:"}", +keywords:n},l=e.inherit(r,{illegal:/\n/}),c={className:"string",begin:/\$"/, +end:'"',illegal:/\n/,contains:[{begin:"{{"},{begin:"}}"},e.BACKSLASH_ESCAPE,l] +},o={className:"string",begin:/\$@"/,end:'"',contains:[{begin:"{{"},{begin:"}}" +},{begin:'""'},r]},d=e.inherit(o,{illegal:/\n/,contains:[{begin:"{{"},{ +begin:"}}"},{begin:'""'},l]}) +;r.contains=[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.C_BLOCK_COMMENT_MODE], +l.contains=[d,c,t,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,a,e.inherit(e.C_BLOCK_COMMENT_MODE,{ +illegal:/\n/})];var g={variants:[o,c,s,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE] +},E={begin:"<",end:">",contains:[{beginKeywords:"in out"},i] +},_=e.IDENT_RE+"(<"+e.IDENT_RE+"(\\s*,\\s*"+e.IDENT_RE+")*>)?(\\[\\])?",b={ +begin:"@"+e.IDENT_RE,relevance:0};return{name:"C#",aliases:["cs","c#"], +keywords:n,illegal:/::/,contains:[e.COMMENT("///","$",{returnBegin:!0, +contains:[{className:"doctag",variants:[{begin:"///",relevance:0},{ +begin:"\x3c!--|--\x3e"},{begin:""}]}] +}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{className:"meta",begin:"#", +end:"$",keywords:{ +"meta-keyword":"if else elif endif define undef warning error line region endregion pragma checksum" +}},g,a,{beginKeywords:"class interface",end:/[{;=]/,illegal:/[^\s:,]/, +contains:[{beginKeywords:"where class" +},i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{beginKeywords:"namespace", +end:/[{;=]/,illegal:/[^\s:]/, +contains:[i,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{ +beginKeywords:"record",end:/[{;=]/,illegal:/[^\s:]/, +contains:[i,E,e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"meta", +begin:"^\\s*\\[",excludeBegin:!0,end:"\\]",excludeEnd:!0,contains:[{ +className:"meta-string",begin:/"/,end:/"/}]},{ +beginKeywords:"new return throw await else",relevance:0},{className:"function", +begin:"("+_+"\\s+)+"+e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0, +end:/\s*[{;=]/,excludeEnd:!0,keywords:n,contains:[{ +beginKeywords:"public private protected static internal protected abstract async extern override unsafe virtual new sealed partial" +},{begin:e.IDENT_RE+"\\s*(\\<.+\\>)?\\s*\\(",returnBegin:!0, +contains:[e.TITLE_MODE,E],relevance:0},{className:"params",begin:/\(/,end:/\)/, +excludeBegin:!0,excludeEnd:!0,keywords:n,relevance:0, +contains:[g,a,e.C_BLOCK_COMMENT_MODE] +},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},b]}}}()); +hljs.registerLanguage("css",function(){"use strict";return function(e){var n={ +begin:/(?:[A-Z\_\.\-]+|--[a-zA-Z0-9_-]+)\s*:/,returnBegin:!0,end:";", +endsWithParent:!0,contains:[{className:"attribute",begin:/\S/,end:":", +excludeEnd:!0,starts:{endsWithParent:!0,excludeEnd:!0,contains:[{ +begin:/[\w-]+\(/,returnBegin:!0,contains:[{className:"built_in",begin:/[\w-]+/ +},{begin:/\(/,end:/\)/, +contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE]}] +},e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{ +className:"number",begin:"#[0-9A-Fa-f]+"},{className:"meta",begin:"!important"}] +}}]};return{name:"CSS",case_insensitive:!0,illegal:/[=\/|'\$]/, +contains:[e.C_BLOCK_COMMENT_MODE,{className:"selector-id", +begin:/#[A-Za-z0-9_-]+/},{className:"selector-class",begin:/\.[A-Za-z0-9_-]+/},{ +className:"selector-attr",begin:/\[/,end:/\]/,illegal:"$", +contains:[e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},{className:"selector-pseudo", +begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"@(page|font-face)", +lexemes:"@[a-z-]+",keywords:"@page @font-face"},{begin:"@",end:"[{;]", +illegal:/:/,returnBegin:!0,contains:[{className:"keyword", +begin:/@\-?\w[\w]*(\-\w+)*/},{begin:/\s/,endsWithParent:!0,excludeEnd:!0, +relevance:0,keywords:"and or not only",contains:[{begin:/[a-z-]+:/, +className:"attribute"},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.CSS_NUMBER_MODE] +}]},{className:"selector-tag",begin:"[a-zA-Z-][a-zA-Z0-9_-]*",relevance:0},{ +begin:"{",end:"}",illegal:/\S/,contains:[e.C_BLOCK_COMMENT_MODE,n]}]}}}()); +hljs.registerLanguage("diff",function(){"use strict";return function(e){return{ +name:"Diff",aliases:["patch"],contains:[{className:"meta",relevance:10, +variants:[{begin:/^@@ +\-\d+,\d+ +\+\d+,\d+ +@@$/},{ +begin:/^\*\*\* +\d+,\d+ +\*\*\*\*$/},{begin:/^\-\-\- +\d+,\d+ +\-\-\-\-$/}]},{ +className:"comment",variants:[{begin:/Index: /,end:/$/},{begin:/={3,}/,end:/$/ +},{begin:/^\-{3}/,end:/$/},{begin:/^\*{3} /,end:/$/},{begin:/^\+{3}/,end:/$/},{ +begin:/^\*{15}$/}]},{className:"addition",begin:"^\\+",end:"$"},{ +className:"deletion",begin:"^\\-",end:"$"},{className:"addition",begin:"^\\!", +end:"$"}]}}}()); +hljs.registerLanguage("go",function(){"use strict";return function(e){var n={ +keyword:"break default func interface select case map struct chan else goto package switch const fallthrough if range type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune", +literal:"true false iota nil", +built_in:"append cap close complex copy imag len make new panic print println real recover delete" +};return{name:"Go",aliases:["golang"],keywords:n,illegal:"e(n))).join("")}return function(a){var s={className:"number", +relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}] +},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={ +className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}] +},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={ +className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''", +end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"' +},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"], +relevance:0 +},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map((n=>e(n))).join("|")+")" +;return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/, +contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{ +begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr", +starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}()); +hljs.registerLanguage("java",function(){"use strict";function e(e){ +return e?"string"==typeof e?e:e.source:null}function n(e){return a("(",e,")?")} +function a(...n){return n.map((n=>e(n))).join("")}function s(...n){ +return"("+n.map((n=>e(n))).join("|")+")"}return function(e){ +var r="false synchronized int abstract float private char boolean var static null if const for true while long strictfp finally protected import native final void enum else break transient catch instanceof byte super volatile case assert short package default double public try this switch continue throws protected public private module requires exports do",i={ +className:"meta",begin:"@[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*", +contains:[{begin:/\(/,end:/\)/,contains:["self"]}] +},t=e=>a("[",e,"]+([",e,"_]*[",e,"]+)?"),c={className:"number",variants:[{ +begin:`\\b(0[bB]${t("01")})[lL]?`},{begin:`\\b(0${t("0-7")})[dDfFlL]?`},{ +begin:a(/\b0[xX]/,s(a(t("a-fA-F0-9"),/\./,t("a-fA-F0-9")),a(t("a-fA-F0-9"),/\.?/),a(/\./,t("a-fA-F0-9"))),/([pP][+-]?(\d+))?/,/[fFdDlL]?/) +},{begin:a(/\b/,s(a(/\d*\./,t("\\d")),t("\\d")),/[eE][+-]?[\d]+[dDfF]?/)},{ +begin:a(/\b/,t(/\d/),n(/\.?/),n(t(/\d/)),/[dDfFlL]?/)}],relevance:0};return{ +name:"Java",aliases:["jsp"],keywords:r,illegal:/<\/|#/, +contains:[e.COMMENT("/\\*\\*","\\*/",{relevance:0,contains:[{begin:/\w+@/, +relevance:0},{className:"doctag",begin:"@[A-Za-z]+"}] +}),e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{ +className:"class",beginKeywords:"class interface enum",end:/[{;=]/, +excludeEnd:!0,keywords:"class interface enum",illegal:/[:"\[\]]/,contains:[{ +beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{ +beginKeywords:"new throw return else",relevance:0},{className:"class", +begin:"record\\s+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,excludeEnd:!0, +end:/[{;=]/,keywords:r,contains:[{beginKeywords:"record"},{ +begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0, +contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/, +keywords:r,relevance:0,contains:[e.C_BLOCK_COMMENT_MODE] +},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{className:"function", +begin:"([\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*(<[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*(\\s*,\\s*[\xc0-\u02b8a-zA-Z_$][\xc0-\u02b8a-zA-Z_$0-9]*)*>)?\\s+)+"+e.UNDERSCORE_IDENT_RE+"\\s*\\(", +returnBegin:!0,end:/[{;=]/,excludeEnd:!0,keywords:r,contains:[{ +begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0, +contains:[e.UNDERSCORE_TITLE_MODE]},{className:"params",begin:/\(/,end:/\)/, +keywords:r,relevance:0, +contains:[i,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE] +},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},c,i]}}}()); +hljs.registerLanguage("javascript",function(){"use strict" +;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],s=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]) +;function r(e){return i("(?=",e,")")}function t(e){return i("(",e,")?")} +function i(...e){return e.map((e=>{ +return(n=e)?"string"==typeof n?n:n.source:null;var n})).join("")} +return function(c){const o=e,l={begin:/<[A-Za-z0-9\\._:-]+/, +end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{ +const a=e[0].length+e.index,s=e.input[a];"<"!==s?">"===s&&(((e,{after:n})=>{ +const a=e[0].replace("<","`\\b0[${e}][${n}]([${n}_]*[${n}])?n?`,b=/[1-9]([0-9_]*\d)?/,E=/\d([0-9_]*\d)?/,u=i(/[eE][+-]?/,E),_={ +className:"number",variants:[{begin:d("bB","01")},{begin:d("oO","0-7")},{ +begin:d("xX","0-9a-fA-F")},{begin:i(/\b/,b,"n")},{begin:i(/(\b0)?\./,E,t(u))},{ +begin:i(/\b/,b,t(i(/\./,t(E))),t(u))},{begin:/\b0[\.n]?/}],relevance:0},m={ +className:"subst",begin:"\\$\\{",end:"\\}",keywords:g,contains:[]},N={ +begin:"html`",end:"",starts:{end:"`",returnEnd:!1, +contains:[c.BACKSLASH_ESCAPE,m],subLanguage:"xml"}},y={begin:"css`",end:"", +starts:{end:"`",returnEnd:!1,contains:[c.BACKSLASH_ESCAPE,m],subLanguage:"css"} +},f={className:"string",begin:"`",end:"`",contains:[c.BACKSLASH_ESCAPE,m]},A={ +className:"comment",variants:[c.COMMENT("/\\*\\*","\\*/",{relevance:0, +contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type", +begin:"\\{",end:"\\}",relevance:0},{className:"variable", +begin:o+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/, +relevance:0}]}]}),c.C_BLOCK_COMMENT_MODE,c.C_LINE_COMMENT_MODE] +},p=[c.APOS_STRING_MODE,c.QUOTE_STRING_MODE,N,y,f,_,c.REGEXP_MODE] +;m.contains=p.concat({begin:/{/,end:/}/,keywords:g,contains:["self"].concat(p)}) +;const O=[].concat(A,m.contains),T=O.concat([{begin:/\(/,end:/\)/,keywords:g, +contains:["self"].concat(O)}]),R={className:"params",begin:/\(/,end:/\)/, +excludeBegin:!0,excludeEnd:!0,keywords:g,contains:T};return{name:"Javascript", +aliases:["js","jsx","mjs","cjs"],keywords:g,exports:{PARAMS_CONTAINS:T}, +illegal:/#(?![$_A-z])/,contains:[c.SHEBANG({label:"shebang",binary:"node", +relevance:5}),{label:"use_strict",className:"meta",relevance:10, +begin:/^\s*['"]use (strict|asm)['"]/ +},c.APOS_STRING_MODE,c.QUOTE_STRING_MODE,N,y,f,A,_,{ +begin:i(/[{,\n]\s*/,r(i(/(\/\/.*$)*/,/(\/\*(.|\n)*\*\/)*/,/\s*/,o+"\\s*:"))), +relevance:0,contains:[{className:"attr",begin:o+r("\\s*:"),relevance:0}]},{ +begin:"("+c.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*", +keywords:"return throw case",contains:[A,c.REGEXP_MODE,{className:"function", +begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\))*[^()]*\\))*[^()]*\\)|"+c.UNDERSCORE_IDENT_RE+")\\s*=>", +returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{ +begin:c.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{ +begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:g,contains:T}]}]},{ +begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{ +begin:"<>",end:""},{begin:l.begin,"on:begin":l.isTrulyOpeningTag,end:l.end}], +subLanguage:"xml",contains:[{begin:l.begin,end:l.end,skip:!0,contains:["self"]}] +}],relevance:0},{className:"function",beginKeywords:"function",end:/[{;]/, +excludeEnd:!0,keywords:g,contains:["self",c.inherit(c.TITLE_MODE,{begin:o}),R], +illegal:/%/},{className:"function", +begin:c.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\))*[^()]*\\))*[^()]*\\)\\s*{", +returnBegin:!0,contains:[R,c.inherit(c.TITLE_MODE,{begin:o})]},{variants:[{ +begin:"\\."+o},{begin:"\\$"+o}],relevance:0},{className:"class", +beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{ +beginKeywords:"extends"},c.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/, +end:/[\{;]/,excludeEnd:!0,contains:[c.inherit(c.TITLE_MODE,{begin:o}),"self",R] +},{begin:"(get|set)\\s+(?="+o+"\\()",end:/{/,keywords:"get set", +contains:[c.inherit(c.TITLE_MODE,{begin:o}),{begin:/\(\)/},R]},{begin:/\$[(.]/}] +}}}()); +hljs.registerLanguage("json",function(){"use strict";return function(n){var e={ +literal:"true false null" +},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={ +end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{", +end:"}",contains:[{className:"attr",begin:/"/,end:/"/, +contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/ +})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)], +illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{ +name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}()); +hljs.registerLanguage("kotlin",function(){"use strict";return function(e){ +var n={ +keyword:"abstract as val var vararg get set class object open private protected public noinline crossinline dynamic final enum if else do while for when throw try catch finally import package is in fun override companion reified inline lateinit init interface annotation data sealed internal infix operator out by constructor super tailrec where const inner suspend typealias external expect actual", +built_in:"Byte Short Char Int Long Boolean Float Double Void Unit Nothing", +literal:"true false null"},a={className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"@" +},i={className:"subst",begin:"\\${",end:"}",contains:[e.C_NUMBER_MODE]},s={ +className:"variable",begin:"\\$"+e.UNDERSCORE_IDENT_RE},t={className:"string", +variants:[{begin:'"""',end:'"""(?=[^"])',contains:[s,i]},{begin:"'",end:"'", +illegal:/\n/,contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"',illegal:/\n/, +contains:[e.BACKSLASH_ESCAPE,s,i]}]};i.contains.push(t);var r={className:"meta", +begin:"@(?:file|property|field|get|set|receiver|param|setparam|delegate)\\s*:(?:\\s*"+e.UNDERSCORE_IDENT_RE+")?" +},l={className:"meta",begin:"@"+e.UNDERSCORE_IDENT_RE,contains:[{begin:/\(/, +end:/\)/,contains:[e.inherit(t,{className:"meta-string"})]}] +},c=e.COMMENT("/\\*","\\*/",{contains:[e.C_BLOCK_COMMENT_MODE]}),o={variants:[{ +className:"type",begin:e.UNDERSCORE_IDENT_RE},{begin:/\(/,end:/\)/,contains:[]}] +},d=o;return d.variants[1].contains=[o],o.variants[1].contains=[d],{ +name:"Kotlin",aliases:["kt"],keywords:n,contains:[e.COMMENT("/\\*\\*","\\*/",{ +relevance:0,contains:[{className:"doctag",begin:"@[A-Za-z]+"}] +}),e.C_LINE_COMMENT_MODE,c,{className:"keyword", +begin:/\b(break|continue|return|this)\b/,starts:{contains:[{className:"symbol", +begin:/@\w+/}]}},a,r,l,{className:"function",beginKeywords:"fun",end:"[(]|$", +returnBegin:!0,excludeEnd:!0,keywords:n, +illegal:/fun\s+(<.*>)?[^\s\(]+(\s+[^\s\(]+)\s*=/,relevance:5,contains:[{ +begin:e.UNDERSCORE_IDENT_RE+"\\s*\\(",returnBegin:!0,relevance:0, +contains:[e.UNDERSCORE_TITLE_MODE]},{className:"type",begin://, +keywords:"reified",relevance:0},{className:"params",begin:/\(/,end:/\)/, +endsParent:!0,keywords:n,relevance:0,contains:[{begin:/:/,end:/[=,\/]/, +endsWithParent:!0,contains:[o,e.C_LINE_COMMENT_MODE,c],relevance:0 +},e.C_LINE_COMMENT_MODE,c,r,l,t,e.C_NUMBER_MODE]},c]},{className:"class", +beginKeywords:"class interface trait",end:/[:\{(]|$/,excludeEnd:!0, +illegal:"extends implements",contains:[{ +beginKeywords:"public protected internal private constructor" +},e.UNDERSCORE_TITLE_MODE,{className:"type",begin://,excludeBegin:!0, +excludeEnd:!0,relevance:0},{className:"type",begin:/[,:]\s*/,end:/[<\(,]|$/, +excludeBegin:!0,returnEnd:!0},r,l]},t,{className:"meta",begin:"^#!/usr/bin/env", +end:"$",illegal:"\n"},{className:"number", +begin:"\\b(0[bB]([01]+[01_]+[01]+|[01]+)|0[xX]([a-fA-F0-9]+[a-fA-F0-9_]+[a-fA-F0-9]+|[a-fA-F0-9]+)|(([\\d]+[\\d_]+[\\d]+|[\\d]+)(\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))?|\\.([\\d]+[\\d_]+[\\d]+|[\\d]+))([eE][-+]?\\d+)?)[lLfF]?", +relevance:0}]}}}()); +hljs.registerLanguage("less",function(){"use strict";return function(e){ +var n="([\\w-]+|@{[\\w-]+})",a=[],s=[],t=function(e){return{className:"string", +begin:"~?"+e+".*?"+e}},r=function(e,n,a){return{className:e,begin:n,relevance:a} +},i={begin:"\\(",end:"\\)",contains:s,relevance:0} +;s.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t("'"),t('"'),e.CSS_NUMBER_MODE,{ +begin:"(url|data-uri)\\(",starts:{className:"string",end:"[\\)\\n]", +excludeEnd:!0} +},r("number","#[0-9A-Fa-f]+\\b"),i,r("variable","@@?[\\w-]+",10),r("variable","@{[\\w-]+}"),r("built_in","~?`[^`]*?`"),{ +className:"attribute",begin:"[\\w-]+\\s*:",end:":",returnBegin:!0,excludeEnd:!0 +},{className:"meta",begin:"!important"});var c=s.concat({begin:"{",end:"}", +contains:a}),l={beginKeywords:"when",endsWithParent:!0,contains:[{ +beginKeywords:"and not"}].concat(s)},o={begin:n+"\\s*:",returnBegin:!0, +end:"[;}]",relevance:0,contains:[{className:"attribute",begin:n,end:":", +excludeEnd:!0,starts:{endsWithParent:!0,illegal:"[<=$]",relevance:0,contains:s} +}]},g={className:"keyword", +begin:"@(import|media|charset|font-face|(-[a-z]+-)?keyframes|supports|document|namespace|page|viewport|host)\\b", +starts:{end:"[;{}]",returnEnd:!0,contains:s,relevance:0}},d={ +className:"variable",variants:[{begin:"@[\\w-]+\\s*:",relevance:15},{ +begin:"@[\\w-]+"}],starts:{end:"[;}]",returnEnd:!0,contains:c}},b={variants:[{ +begin:"[\\.#:&\\[>]",end:"[;{}]"},{begin:n,end:"{"}],returnBegin:!0, +returnEnd:!0,illegal:"[<='$\"]",relevance:0, +contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,l,r("keyword","all\\b"),r("variable","@{[\\w-]+}"),r("selector-tag",n+"%?",0),r("selector-id","#"+n),r("selector-class","\\."+n,0),r("selector-tag","&",0),{ +className:"selector-attr",begin:"\\[",end:"\\]"},{className:"selector-pseudo", +begin:/:(:)?[a-zA-Z0-9\_\-\+\(\)"'.]+/},{begin:"\\(",end:"\\)",contains:c},{ +begin:"!important"}]} +;return a.push(e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,g,d,o,b),{ +name:"Less",case_insensitive:!0,illegal:"[=>'/<($\"]",contains:a}}}()); +hljs.registerLanguage("lua",function(){"use strict";return function(e){ +var t="\\[=*\\[",a="\\]=*\\]",n={begin:t,end:a,contains:["self"] +},o=[e.COMMENT("--(?!\\[=*\\[)","$"),e.COMMENT("--\\[=*\\[",a,{contains:[n], +relevance:10})];return{name:"Lua",keywords:{$pattern:e.UNDERSCORE_IDENT_RE, +literal:"true false nil", +keyword:"and break do else elseif end for goto if in local not or repeat return then until while", +built_in:"_G _ENV _VERSION __index __newindex __mode __call __metatable __tostring __len __gc __add __sub __mul __div __mod __pow __concat __unm __eq __lt __le assert collectgarbage dofile error getfenv getmetatable ipairs load loadfile loadstring module next pairs pcall print rawequal rawget rawset require select setfenv setmetatable tonumber tostring type unpack xpcall arg self coroutine resume yield status wrap create running debug getupvalue debug sethook getmetatable gethook setmetatable setlocal traceback setfenv getinfo setupvalue getlocal getregistry getfenv io lines write close flush open output type read stderr stdin input stdout popen tmpfile math log max acos huge ldexp pi cos tanh pow deg tan cosh sinh random randomseed frexp ceil floor rad abs sqrt modf asin min mod fmod log10 atan2 exp sin atan os exit setlocale date getenv difftime remove time clock tmpname rename execute package preload loadlib loaded loaders cpath config path seeall string sub upper len gfind rep find match char dump gmatch reverse byte format gsub lower table setn insert getn foreachi maxn foreach concat sort remove" +},contains:o.concat([{className:"function",beginKeywords:"function",end:"\\)", +contains:[e.inherit(e.TITLE_MODE,{ +begin:"([_a-zA-Z]\\w*\\.)*([_a-zA-Z]\\w*:)?[_a-zA-Z]\\w*"}),{className:"params", +begin:"\\(",endsWithParent:!0,contains:o}].concat(o) +},e.C_NUMBER_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,{className:"string", +begin:t,end:a,contains:[n],relevance:5}])}}}()); +hljs.registerLanguage("makefile",function(){"use strict";return function(e){ +var i={className:"variable",variants:[{ +begin:"\\$\\("+e.UNDERSCORE_IDENT_RE+"\\)",contains:[e.BACKSLASH_ESCAPE]},{ +begin:/\$[@%`]+/}]}]}]};return{name:"HTML, XML", +aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"], +case_insensitive:!0,contains:[{className:"meta",begin:"", +relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{ +className:"meta",begin:"",contains:[a,s,i,t]}]}] +},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[", +end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/, +relevance:10},{className:"tag",begin:")",end:">",keywords:{ +name:"style"},contains:[c],starts:{end:"",returnEnd:!0, +subLanguage:["css","xml"]}},{className:"tag",begin:")",end:">", +keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0, +subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}} +}()); +hljs.registerLanguage("markdown",function(){"use strict";return function(n){ +const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={ +begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{ +className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0, +relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0, +excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0, +excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{ +begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis", +contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/, +relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a] +;return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{ +name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section", +variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{ +begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n", +contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)", +end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c, +end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{ +begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~", +end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{ +begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$" +},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol", +begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link", +begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}()); +hljs.registerLanguage("nginx",function(){"use strict";return function(e){var n={ +className:"variable",variants:[{begin:/\$\d+/},{begin:/\$\{/,end:/}/},{ +begin:"[\\$\\@]"+e.UNDERSCORE_IDENT_RE}]},a={endsWithParent:!0,keywords:{ +$pattern:"[a-z/_]+", +literal:"on off yes no true false none blocked debug info notice warn error crit select break last permanent redirect kqueue rtsig epoll poll /dev/poll" +},relevance:0,illegal:"=>",contains:[e.HASH_COMMENT_MODE,{className:"string", +contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:/"/,end:/"/},{begin:/'/,end:/'/ +}]},{begin:"([a-z]+):/",end:"\\s",endsWithParent:!0,excludeEnd:!0,contains:[n] +},{className:"regexp",contains:[e.BACKSLASH_ESCAPE,n],variants:[{begin:"\\s\\^", +end:"\\s|{|;",returnEnd:!0},{begin:"~\\*?\\s+",end:"\\s|{|;",returnEnd:!0},{ +begin:"\\*(\\.[a-z\\-]+)+"},{begin:"([a-z\\-]+\\.)+\\*"}]},{className:"number", +begin:"\\b\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}(:\\d{1,5})?\\b"},{ +className:"number",begin:"\\b\\d+[kKmMgGdshdwy]*\\b",relevance:0},n]};return{ +name:"Nginx config",aliases:["nginxconf"],contains:[e.HASH_COMMENT_MODE,{ +begin:e.UNDERSCORE_IDENT_RE+"\\s+{",returnBegin:!0,end:"{",contains:[{ +className:"section",begin:e.UNDERSCORE_IDENT_RE}],relevance:0},{ +begin:e.UNDERSCORE_IDENT_RE+"\\s",end:";|{",returnBegin:!0,contains:[{ +className:"attribute",begin:e.UNDERSCORE_IDENT_RE,starts:a}],relevance:0}], +illegal:"[^\\s\\}]"}}}()); +hljs.registerLanguage("objectivec",function(){"use strict";return function(e){ +var n=/[a-zA-Z@][a-zA-Z0-9_]*/,_={$pattern:n, +keyword:"@interface @class @protocol @implementation"};return{ +name:"Objective-C",aliases:["mm","objc","obj-c","obj-c++","objective-c++"], +keywords:{$pattern:n, +keyword:"int float while char export sizeof typedef const struct for union unsigned long volatile static bool mutable if do return goto void enum else break extern asm case short default double register explicit signed typename this switch continue wchar_t inline readonly assign readwrite self @synchronized id typeof nonatomic super unichar IBOutlet IBAction strong weak copy in out inout bycopy byref oneway __strong __weak __block __autoreleasing @private @protected @public @try @property @end @throw @catch @finally @autoreleasepool @synthesize @dynamic @selector @optional @required @encode @package @import @defs @compatibility_alias __bridge __bridge_transfer __bridge_retained __bridge_retain __covariant __contravariant __kindof _Nonnull _Nullable _Null_unspecified __FUNCTION__ __PRETTY_FUNCTION__ __attribute__ getter setter retain unsafe_unretained nonnull nullable null_unspecified null_resettable class instancetype NS_DESIGNATED_INITIALIZER NS_UNAVAILABLE NS_REQUIRES_SUPER NS_RETURNS_INNER_POINTER NS_INLINE NS_AVAILABLE NS_DEPRECATED NS_ENUM NS_OPTIONS NS_SWIFT_UNAVAILABLE NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_REFINED_FOR_SWIFT NS_SWIFT_NAME NS_SWIFT_NOTHROW NS_DURING NS_HANDLER NS_ENDHANDLER NS_VALUERETURN NS_VOIDRETURN", +literal:"false true FALSE TRUE nil YES NO NULL", +built_in:"BOOL dispatch_once_t dispatch_queue_t dispatch_sync dispatch_async dispatch_once" +},illegal:"/,end:/$/, +illegal:"\\n"},e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE]},{ +className:"class",begin:"("+_.keyword.split(" ").join("|")+")\\b",end:"({|$)", +excludeEnd:!0,keywords:_,contains:[e.UNDERSCORE_TITLE_MODE]},{ +begin:"\\."+e.UNDERSCORE_IDENT_RE,relevance:0}]}}}()); +hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={ +$pattern:/[\w.]+/, +keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when" +},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{", +end:"}"},r={variants:[{begin:/\$\d/},{ +begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/, +relevance:0}] +},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{ +endsWithParent:!0}),s,{className:"string",contains:i,variants:[{ +begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[", +end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{ +begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<", +end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'", +contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`", +contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{ +begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number", +begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b", +relevance:0},{ +begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*", +keywords:"split return print reverse grep",relevance:0, +contains:[e.HASH_COMMENT_MODE,{className:"regexp", +begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{ +className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE], +relevance:0}]},{className:"function",beginKeywords:"sub", +end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{ +begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$", +subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}] +}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n, +contains:a}}}()); +hljs.registerLanguage("php",function(){"use strict";return function(e){var r={ +begin:"\\$+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"},t={className:"meta", +variants:[{begin:/<\?php/,relevance:10},{begin:/<\?[=]?/},{begin:/\?>/}]},a={ +className:"subst",variants:[{begin:/\$\w+/},{begin:/\{\$/,end:/\}/}] +},n=e.inherit(e.APOS_STRING_MODE,{illegal:null +}),i=e.inherit(e.QUOTE_STRING_MODE,{illegal:null, +contains:e.QUOTE_STRING_MODE.contains.concat(a)}),o=e.END_SAME_AS_BEGIN({ +begin:/<<<[ \t]*(\w+)\n/,end:/[ \t]*(\w+)\b/, +contains:e.QUOTE_STRING_MODE.contains.concat(a)}),l={className:"string", +contains:[e.BACKSLASH_ESCAPE,t],variants:[e.inherit(n,{begin:"b'",end:"'" +}),e.inherit(i,{begin:'b"',end:'"'}),i,n,o]},s={ +variants:[e.BINARY_NUMBER_MODE,e.C_NUMBER_MODE]},c={ +keyword:"__CLASS__ __DIR__ __FILE__ __FUNCTION__ __LINE__ __METHOD__ __NAMESPACE__ __TRAIT__ die echo exit include include_once print require require_once array abstract and as binary bool boolean break callable case catch class clone const continue declare default do double else elseif empty enddeclare endfor endforeach endif endswitch endwhile eval extends final finally float for foreach from global goto if implements instanceof insteadof int integer interface isset iterable list match new object or private protected public real return string switch throw trait try unset use var void while xor yield", +literal:"false null true", +built_in:"Error|0 AppendIterator ArgumentCountError ArithmeticError ArrayIterator ArrayObject AssertionError BadFunctionCallException BadMethodCallException CachingIterator CallbackFilterIterator CompileError Countable DirectoryIterator DivisionByZeroError DomainException EmptyIterator ErrorException Exception FilesystemIterator FilterIterator GlobIterator InfiniteIterator InvalidArgumentException IteratorIterator LengthException LimitIterator LogicException MultipleIterator NoRewindIterator OutOfBoundsException OutOfRangeException OuterIterator OverflowException ParentIterator ParseError RangeException RecursiveArrayIterator RecursiveCachingIterator RecursiveCallbackFilterIterator RecursiveDirectoryIterator RecursiveFilterIterator RecursiveIterator RecursiveIteratorIterator RecursiveRegexIterator RecursiveTreeIterator RegexIterator RuntimeException SeekableIterator SplDoublyLinkedList SplFileInfo SplFileObject SplFixedArray SplHeap SplMaxHeap SplMinHeap SplObjectStorage SplObserver SplObserver SplPriorityQueue SplQueue SplStack SplSubject SplSubject SplTempFileObject TypeError UnderflowException UnexpectedValueException ArrayAccess Closure Generator Iterator IteratorAggregate Serializable Throwable Traversable WeakReference Directory __PHP_Incomplete_Class parent php_user_filter self static stdClass" +};return{aliases:["php","php3","php4","php5","php6","php7","php8"], +case_insensitive:!0,keywords:c, +contains:[e.HASH_COMMENT_MODE,e.COMMENT("//","$",{contains:[t] +}),e.COMMENT("/\\*","\\*/",{contains:[{className:"doctag",begin:"@[A-Za-z]+"}] +}),e.COMMENT("__halt_compiler.+?;",!1,{endsWithParent:!0, +keywords:"__halt_compiler"}),t,{className:"keyword",begin:/\$this\b/},r,{ +begin:/(::|->)+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/},{className:"function", +beginKeywords:"fn function",end:/[;{]/,excludeEnd:!0,illegal:"[$%\\[]", +contains:[e.UNDERSCORE_TITLE_MODE,{className:"params",begin:"\\(",end:"\\)", +excludeBegin:!0,excludeEnd:!0,keywords:c, +contains:["self",r,e.C_BLOCK_COMMENT_MODE,l,s]}]},{className:"class", +beginKeywords:"class interface",end:"{",excludeEnd:!0,illegal:/[:\(\$"]/, +contains:[{beginKeywords:"extends implements"},e.UNDERSCORE_TITLE_MODE]},{ +beginKeywords:"namespace",end:";",illegal:/[\.']/, +contains:[e.UNDERSCORE_TITLE_MODE]},{beginKeywords:"use",end:";", +contains:[e.UNDERSCORE_TITLE_MODE]},{begin:"=>"},l,s]}}}()); +hljs.registerLanguage("php-template",function(){"use strict";return function(n){ +return{name:"PHP template",subLanguage:"xml",contains:[{begin:/<\?(php|=)?/, +end:/\?>/,subLanguage:"php",contains:[{begin:"/\\*",end:"\\*/",skip:!0},{ +begin:'b"',end:'"',skip:!0},{begin:"b'",end:"'",skip:!0 +},n.inherit(n.APOS_STRING_MODE,{illegal:null,className:null,contains:null, +skip:!0}),n.inherit(n.QUOTE_STRING_MODE,{illegal:null,className:null, +contains:null,skip:!0})]}]}}}()); +hljs.registerLanguage("plaintext",function(){"use strict";return function(t){ +return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}()); +hljs.registerLanguage("properties",function(){"use strict";return function(e){ +var n="[ \\t\\f]*",t="("+n+"[:=]"+n+"|[ \\t\\f]+)",a="([^\\\\\\W:= \\t\\f\\n]|\\\\.)+",s="([^\\\\:= \\t\\f\\n]|\\\\.)+",r={ +end:t,relevance:0,starts:{className:"string",end:/$/,relevance:0,contains:[{ +begin:"\\\\\\n"}]}};return{name:".properties",case_insensitive:!0,illegal:/\S/, +contains:[e.COMMENT("^\\s*[!#]","$"),{begin:a+t,returnBegin:!0,contains:[{ +className:"attr",begin:a,endsParent:!0,relevance:0}],starts:r},{begin:s+t, +returnBegin:!0,relevance:0,contains:[{className:"meta",begin:s,endsParent:!0, +relevance:0}],starts:r},{className:"attr",relevance:0,begin:s+n+"$"}]}}}()); +hljs.registerLanguage("python",function(){"use strict";return function(e){ +const n={ +keyword:"and as assert async await break class continue def del elif else except finally for from global if import in is lambda nonlocal|10 not or pass raise return try while with yield", +built_in:"__import__ abs all any ascii bin bool breakpoint bytearray bytes callable chr classmethod compile complex delattr dict dir divmod enumerate eval exec filter float format frozenset getattr globals hasattr hash help hex id input int isinstance issubclass iter len list locals map max memoryview min next object oct open ord pow print property range repr reversed round set setattr slice sorted staticmethod str sum super tuple type vars zip", +literal:"__debug__ Ellipsis False None NotImplemented True"},a={ +className:"meta",begin:/^(>>>|\.\.\.) /},s={className:"subst",begin:/\{/, +end:/\}/,keywords:n,illegal:/#/},i={begin:/\{\{/,relevance:0},r={ +className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{ +begin:/([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?'''/,end:/'''/, +contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{ +begin:/([uU]|[bB]|[rR]|[bB][rR]|[rR][bB])?"""/,end:/"""/, +contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{ +begin:/([fF][rR]|[rR][fF]|[fF])'''/,end:/'''/, +contains:[e.BACKSLASH_ESCAPE,a,i,s]},{begin:/([fF][rR]|[rR][fF]|[fF])"""/, +end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,i,s]},{begin:/([uU]|[rR])'/,end:/'/, +relevance:10},{begin:/([uU]|[rR])"/,end:/"/,relevance:10},{ +begin:/([bB]|[bB][rR]|[rR][bB])'/,end:/'/},{begin:/([bB]|[bB][rR]|[rR][bB])"/, +end:/"/},{begin:/([fF][rR]|[rR][fF]|[fF])'/,end:/'/, +contains:[e.BACKSLASH_ESCAPE,i,s]},{begin:/([fF][rR]|[rR][fF]|[fF])"/,end:/"/, +contains:[e.BACKSLASH_ESCAPE,i,s]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},t={ +className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{ +begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},l={ +className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{ +begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:n, +contains:["self",a,t,r,e.HASH_COMMENT_MODE]}]};return s.contains=[r,t,a],{ +name:"Python",aliases:["py","gyp","ipython"],keywords:n, +illegal:/(<\/|->|\?)|=>/,contains:[a,t,{beginKeywords:"if",relevance:0 +},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{ +className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/, +contains:[e.UNDERSCORE_TITLE_MODE,l,{begin:/->/,endsWithParent:!0, +keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{ +begin:/\b(print|exec)\(/}]}}}()); +hljs.registerLanguage("python-repl",function(){"use strict";return function(n){ +return{aliases:["pycon"],contains:[{className:"meta",starts:{end:/ |$/,starts:{ +end:"$",subLanguage:"python"}},variants:[{begin:/^>>>(?=[ ]|$)/},{ +begin:/^\.\.\.(?=[ ]|$)/}]}]}}}()); +hljs.registerLanguage("ruby",function(){"use strict";return function(e){ +var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={ +keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor", +literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={ +begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s] +}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10 +}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}", +keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{ +begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{ +begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{ +begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/", +end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{ +begin:"%[qQwWx]?\\|",end:"\\|"},{ +begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{ +begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{ +begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/, +contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(", +end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class", +beginKeywords:"class module",end:"$|;",illegal:/=/, +contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{ +begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{ +className:"function",beginKeywords:"def",end:"$|;", +contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::" +},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{ +className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{ +className:"number", +begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b", +relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params", +begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*", +keywords:"unless",contains:[i,{className:"regexp", +contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*" +},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!", +end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0 +}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$", +contains:d}},{className:"meta", +begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)", +starts:{end:"$",contains:d}}];return{name:"Ruby", +aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/, +contains:r.concat(g).concat(d)}}}()); +hljs.registerLanguage("rust",function(){"use strict";return function(e){ +var n="([ui](8|16|32|64|128|size)|f(32|64))?",t="drop i8 i16 i32 i64 i128 isize u8 u16 u32 u64 u128 usize f32 f64 str char bool Box Option Result String Vec Copy Send Sized Sync Drop Fn FnMut FnOnce ToOwned Clone Debug PartialEq PartialOrd Eq Ord AsRef AsMut Into From Default Iterator Extend IntoIterator DoubleEndedIterator ExactSizeIterator SliceConcatExt ToString assert! assert_eq! bitflags! bytes! cfg! col! concat! concat_idents! debug_assert! debug_assert_eq! env! panic! file! format! format_args! include_bin! include_str! line! local_data_key! module_path! option_env! print! println! select! stringify! try! unimplemented! unreachable! vec! write! writeln! macro_rules! assert_ne! debug_assert_ne!" +;return{name:"Rust",aliases:["rs"],keywords:{$pattern:e.IDENT_RE+"!?", +keyword:"abstract as async await become box break const continue crate do dyn else enum extern false final fn for if impl in let loop macro match mod move mut override priv pub ref return self Self static struct super trait true try type typeof unsafe unsized use virtual where while yield", +literal:"true false Some None Ok Err",built_in:t},illegal:""}]}}}()); +hljs.registerLanguage("scss",function(){"use strict";return function(e){ +var t="@[a-z-]+",i={className:"variable",begin:"(\\$[a-zA-Z-][a-zA-Z0-9_-]*)\\b" +},r={className:"number",begin:"#[0-9A-Fa-f]+"} +;return e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE, +e.APOS_STRING_MODE,e.C_BLOCK_COMMENT_MODE,{name:"SCSS",case_insensitive:!0, +illegal:"[=/|']",contains:[e.C_LINE_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,{ +className:"selector-id",begin:"\\#[A-Za-z0-9_-]+",relevance:0},{ +className:"selector-class",begin:"\\.[A-Za-z0-9_-]+",relevance:0},{ +className:"selector-attr",begin:"\\[",end:"\\]",illegal:"$"},{ +className:"selector-tag", +begin:"\\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|div|dl|dt|em|embed|fieldset|figcaption|figure|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|keygen|label|legend|li|link|map|mark|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|samp|script|section|select|small|span|strike|strong|style|sub|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\\b", +relevance:0},{className:"selector-pseudo", +begin:":(visited|valid|root|right|required|read-write|read-only|out-range|optional|only-of-type|only-child|nth-of-type|nth-last-of-type|nth-last-child|nth-child|not|link|left|last-of-type|last-child|lang|invalid|indeterminate|in-range|hover|focus|first-of-type|first-line|first-letter|first-child|first|enabled|empty|disabled|default|checked|before|after|active)" +},{className:"selector-pseudo", +begin:"::(after|before|choices|first-letter|first-line|repeat-index|repeat-item|selection|value)" +},i,{className:"attribute", +begin:"\\b(src|z-index|word-wrap|word-spacing|word-break|width|widows|white-space|visibility|vertical-align|unicode-bidi|transition-timing-function|transition-property|transition-duration|transition-delay|transition|transform-style|transform-origin|transform|top|text-underline-position|text-transform|text-shadow|text-rendering|text-overflow|text-indent|text-decoration-style|text-decoration-line|text-decoration-color|text-decoration|text-align-last|text-align|tab-size|table-layout|right|resize|quotes|position|pointer-events|perspective-origin|perspective|page-break-inside|page-break-before|page-break-after|padding-top|padding-right|padding-left|padding-bottom|padding|overflow-y|overflow-x|overflow-wrap|overflow|outline-width|outline-style|outline-offset|outline-color|outline|orphans|order|opacity|object-position|object-fit|normal|none|nav-up|nav-right|nav-left|nav-index|nav-down|min-width|min-height|max-width|max-height|mask|marks|margin-top|margin-right|margin-left|margin-bottom|margin|list-style-type|list-style-position|list-style-image|list-style|line-height|letter-spacing|left|justify-content|initial|inherit|ime-mode|image-orientation|image-resolution|image-rendering|icon|hyphens|height|font-weight|font-variant-ligatures|font-variant|font-style|font-stretch|font-size-adjust|font-size|font-language-override|font-kerning|font-feature-settings|font-family|font|float|flex-wrap|flex-shrink|flex-grow|flex-flow|flex-direction|flex-basis|flex|filter|empty-cells|display|direction|cursor|counter-reset|counter-increment|content|column-width|column-span|column-rule-width|column-rule-style|column-rule-color|column-rule|column-gap|column-fill|column-count|columns|color|clip-path|clip|clear|caption-side|break-inside|break-before|break-after|box-sizing|box-shadow|box-decoration-break|bottom|border-width|border-top-width|border-top-style|border-top-right-radius|border-top-left-radius|border-top-color|border-top|border-style|border-spacing|border-right-width|border-right-style|border-right-color|border-right|border-radius|border-left-width|border-left-style|border-left-color|border-left|border-image-width|border-image-source|border-image-slice|border-image-repeat|border-image-outset|border-image|border-color|border-collapse|border-bottom-width|border-bottom-style|border-bottom-right-radius|border-bottom-left-radius|border-bottom-color|border-bottom|border|background-size|background-repeat|background-position|background-origin|background-image|background-color|background-clip|background-attachment|background-blend-mode|background|backface-visibility|auto|animation-timing-function|animation-play-state|animation-name|animation-iteration-count|animation-fill-mode|animation-duration|animation-direction|animation-delay|animation|align-self|align-items|align-content)\\b", +illegal:"[^\\s]"},{ +begin:"\\b(whitespace|wait|w-resize|visible|vertical-text|vertical-ideographic|uppercase|upper-roman|upper-alpha|underline|transparent|top|thin|thick|text|text-top|text-bottom|tb-rl|table-header-group|table-footer-group|sw-resize|super|strict|static|square|solid|small-caps|separate|se-resize|scroll|s-resize|rtl|row-resize|ridge|right|repeat|repeat-y|repeat-x|relative|progress|pointer|overline|outside|outset|oblique|nowrap|not-allowed|normal|none|nw-resize|no-repeat|no-drop|newspaper|ne-resize|n-resize|move|middle|medium|ltr|lr-tb|lowercase|lower-roman|lower-alpha|loose|list-item|line|line-through|line-edge|lighter|left|keep-all|justify|italic|inter-word|inter-ideograph|inside|inset|inline|inline-block|inherit|inactive|ideograph-space|ideograph-parenthesis|ideograph-numeric|ideograph-alpha|horizontal|hidden|help|hand|groove|fixed|ellipsis|e-resize|double|dotted|distribute|distribute-space|distribute-letter|distribute-all-lines|disc|disabled|default|decimal|dashed|crosshair|collapse|col-resize|circle|char|center|capitalize|break-word|break-all|bottom|both|bolder|bold|block|bidi-override|below|baseline|auto|always|all-scroll|absolute|table|table-cell)\\b" +},{begin:":",end:";", +contains:[i,r,e.CSS_NUMBER_MODE,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,{ +className:"meta",begin:"!important"}]},{begin:"@(page|font-face)",lexemes:t, +keywords:"@page @font-face"},{begin:"@",end:"[{;]",returnBegin:!0, +keywords:"and or not only",contains:[{begin:t,className:"keyword" +},i,e.QUOTE_STRING_MODE,e.APOS_STRING_MODE,r,e.CSS_NUMBER_MODE]}]}}}()); +hljs.registerLanguage("shell",function(){"use strict";return function(s){return{ +name:"Shell Session",aliases:["console"],contains:[{className:"meta", +begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"} +}]}}}()); +hljs.registerLanguage("sql",function(){"use strict";return function(e){ +var t=e.COMMENT("--","$");return{name:"SQL",case_insensitive:!0, +illegal:/[<>{}*]/,contains:[{ +beginKeywords:"begin end start commit rollback savepoint lock alter create drop rename call delete do handler insert load replace select truncate update set show pragma grant merge describe use explain help declare prepare execute deallocate release unlock purge reset change stop analyze cache flush optimize repair kill install uninstall checksum restore check backup revoke comment values with", +end:/;/,endsWithParent:!0,keywords:{$pattern:/[\w\.]+/, +keyword:"as abort abs absolute acc acce accep accept access accessed accessible account acos action activate add addtime admin administer advanced advise aes_decrypt aes_encrypt after agent aggregate ali alia alias all allocate allow alter always analyze ancillary and anti any anydata anydataset anyschema anytype apply archive archived archivelog are as asc ascii asin assembly assertion associate asynchronous at atan atn2 attr attri attrib attribu attribut attribute attributes audit authenticated authentication authid authors auto autoallocate autodblink autoextend automatic availability avg backup badfile basicfile before begin beginning benchmark between bfile bfile_base big bigfile bin binary_double binary_float binlog bit_and bit_count bit_length bit_or bit_xor bitmap blob_base block blocksize body both bound bucket buffer_cache buffer_pool build bulk by byte byteordermark bytes cache caching call calling cancel capacity cascade cascaded case cast catalog category ceil ceiling chain change changed char_base char_length character_length characters characterset charindex charset charsetform charsetid check checksum checksum_agg child choose chr chunk class cleanup clear client clob clob_base clone close cluster_id cluster_probability cluster_set clustering coalesce coercibility col collate collation collect colu colum column column_value columns columns_updated comment commit compact compatibility compiled complete composite_limit compound compress compute concat concat_ws concurrent confirm conn connec connect connect_by_iscycle connect_by_isleaf connect_by_root connect_time connection consider consistent constant constraint constraints constructor container content contents context contributors controlfile conv convert convert_tz corr corr_k corr_s corresponding corruption cos cost count count_big counted covar_pop covar_samp cpu_per_call cpu_per_session crc32 create creation critical cross cube cume_dist curdate current current_date current_time current_timestamp current_user cursor curtime customdatum cycle data database databases datafile datafiles datalength date_add date_cache date_format date_sub dateadd datediff datefromparts datename datepart datetime2fromparts day day_to_second dayname dayofmonth dayofweek dayofyear days db_role_change dbtimezone ddl deallocate declare decode decompose decrement decrypt deduplicate def defa defau defaul default defaults deferred defi defin define degrees delayed delegate delete delete_all delimited demand dense_rank depth dequeue des_decrypt des_encrypt des_key_file desc descr descri describ describe descriptor deterministic diagnostics difference dimension direct_load directory disable disable_all disallow disassociate discardfile disconnect diskgroup distinct distinctrow distribute distributed div do document domain dotnet double downgrade drop dumpfile duplicate duration each edition editionable editions element ellipsis else elsif elt empty enable enable_all enclosed encode encoding encrypt end end-exec endian enforced engine engines enqueue enterprise entityescaping eomonth error errors escaped evalname evaluate event eventdata events except exception exceptions exchange exclude excluding execu execut execute exempt exists exit exp expire explain explode export export_set extended extent external external_1 external_2 externally extract failed failed_login_attempts failover failure far fast feature_set feature_value fetch field fields file file_name_convert filesystem_like_logging final finish first first_value fixed flash_cache flashback floor flush following follows for forall force foreign form forma format found found_rows freelist freelists freepools fresh from from_base64 from_days ftp full function general generated get get_format get_lock getdate getutcdate global global_name globally go goto grant grants greatest group group_concat group_id grouping grouping_id groups gtid_subtract guarantee guard handler hash hashkeys having hea head headi headin heading heap help hex hierarchy high high_priority hosts hour hours http id ident_current ident_incr ident_seed identified identity idle_time if ifnull ignore iif ilike ilm immediate import in include including increment index indexes indexing indextype indicator indices inet6_aton inet6_ntoa inet_aton inet_ntoa infile initial initialized initially initrans inmemory inner innodb input insert install instance instantiable instr interface interleaved intersect into invalidate invisible is is_free_lock is_ipv4 is_ipv4_compat is_not is_not_null is_used_lock isdate isnull isolation iterate java join json json_exists keep keep_duplicates key keys kill language large last last_day last_insert_id last_value lateral lax lcase lead leading least leaves left len lenght length less level levels library like like2 like4 likec limit lines link list listagg little ln load load_file lob lobs local localtime localtimestamp locate locator lock locked log log10 log2 logfile logfiles logging logical logical_reads_per_call logoff logon logs long loop low low_priority lower lpad lrtrim ltrim main make_set makedate maketime managed management manual map mapping mask master master_pos_wait match matched materialized max maxextents maximize maxinstances maxlen maxlogfiles maxloghistory maxlogmembers maxsize maxtrans md5 measures median medium member memcompress memory merge microsecond mid migration min minextents minimum mining minus minute minutes minvalue missing mod mode model modification modify module monitoring month months mount move movement multiset mutex name name_const names nan national native natural nav nchar nclob nested never new newline next nextval no no_write_to_binlog noarchivelog noaudit nobadfile nocheck nocompress nocopy nocycle nodelay nodiscardfile noentityescaping noguarantee nokeep nologfile nomapping nomaxvalue nominimize nominvalue nomonitoring none noneditionable nonschema noorder nopr nopro noprom nopromp noprompt norely noresetlogs noreverse normal norowdependencies noschemacheck noswitch not nothing notice notnull notrim novalidate now nowait nth_value nullif nulls num numb numbe nvarchar nvarchar2 object ocicoll ocidate ocidatetime ociduration ociinterval ociloblocator ocinumber ociref ocirefcursor ocirowid ocistring ocitype oct octet_length of off offline offset oid oidindex old on online only opaque open operations operator optimal optimize option optionally or oracle oracle_date oradata ord ordaudio orddicom orddoc order ordimage ordinality ordvideo organization orlany orlvary out outer outfile outline output over overflow overriding package pad parallel parallel_enable parameters parent parse partial partition partitions pascal passing password password_grace_time password_lock_time password_reuse_max password_reuse_time password_verify_function patch path patindex pctincrease pctthreshold pctused pctversion percent percent_rank percentile_cont percentile_disc performance period period_add period_diff permanent physical pi pipe pipelined pivot pluggable plugin policy position post_transaction pow power pragma prebuilt precedes preceding precision prediction prediction_cost prediction_details prediction_probability prediction_set prepare present preserve prior priority private private_sga privileges procedural procedure procedure_analyze processlist profiles project prompt protection public publishingservername purge quarter query quick quiesce quota quotename radians raise rand range rank raw read reads readsize rebuild record records recover recovery recursive recycle redo reduced ref reference referenced references referencing refresh regexp_like register regr_avgx regr_avgy regr_count regr_intercept regr_r2 regr_slope regr_sxx regr_sxy reject rekey relational relative relaylog release release_lock relies_on relocate rely rem remainder rename repair repeat replace replicate replication required reset resetlogs resize resource respect restore restricted result result_cache resumable resume retention return returning returns reuse reverse revoke right rlike role roles rollback rolling rollup round row row_count rowdependencies rowid rownum rows rtrim rules safe salt sample save savepoint sb1 sb2 sb4 scan schema schemacheck scn scope scroll sdo_georaster sdo_topo_geometry search sec_to_time second seconds section securefile security seed segment select self semi sequence sequential serializable server servererror session session_user sessions_per_user set sets settings sha sha1 sha2 share shared shared_pool short show shrink shutdown si_averagecolor si_colorhistogram si_featurelist si_positionalcolor si_stillimage si_texture siblings sid sign sin size size_t sizes skip slave sleep smalldatetimefromparts smallfile snapshot some soname sort soundex source space sparse spfile split sql sql_big_result sql_buffer_result sql_cache sql_calc_found_rows sql_small_result sql_variant_property sqlcode sqldata sqlerror sqlname sqlstate sqrt square standalone standby start starting startup statement static statistics stats_binomial_test stats_crosstab stats_ks_test stats_mode stats_mw_test stats_one_way_anova stats_t_test_ stats_t_test_indep stats_t_test_one stats_t_test_paired stats_wsr_test status std stddev stddev_pop stddev_samp stdev stop storage store stored str str_to_date straight_join strcmp strict string struct stuff style subdate subpartition subpartitions substitutable substr substring subtime subtring_index subtype success sum suspend switch switchoffset switchover sync synchronous synonym sys sys_xmlagg sysasm sysaux sysdate sysdatetimeoffset sysdba sysoper system system_user sysutcdatetime table tables tablespace tablesample tan tdo template temporary terminated tertiary_weights test than then thread through tier ties time time_format time_zone timediff timefromparts timeout timestamp timestampadd timestampdiff timezone_abbr timezone_minute timezone_region to to_base64 to_date to_days to_seconds todatetimeoffset trace tracking transaction transactional translate translation treat trigger trigger_nestlevel triggers trim truncate try_cast try_convert try_parse type ub1 ub2 ub4 ucase unarchived unbounded uncompress under undo unhex unicode uniform uninstall union unique unix_timestamp unknown unlimited unlock unnest unpivot unrecoverable unsafe unsigned until untrusted unusable unused update updated upgrade upped upper upsert url urowid usable usage use use_stored_outlines user user_data user_resources users using utc_date utc_timestamp uuid uuid_short validate validate_password_strength validation valist value values var var_samp varcharc vari varia variab variabl variable variables variance varp varraw varrawc varray verify version versions view virtual visible void wait wallet warning warnings week weekday weekofyear wellformed when whene whenev wheneve whenever where while whitespace window with within without work wrapped xdb xml xmlagg xmlattributes xmlcast xmlcolattval xmlelement xmlexists xmlforest xmlindex xmlnamespaces xmlpi xmlquery xmlroot xmlschema xmlserialize xmltable xmltype xor year year_to_month years yearweek", +literal:"true false null unknown", +built_in:"array bigint binary bit blob bool boolean char character date dec decimal float int int8 integer interval number numeric real record serial serial8 smallint text time timestamp tinyint varchar varchar2 varying void" +},contains:[{className:"string",begin:"'",end:"'",contains:[{begin:"''"}]},{ +className:"string",begin:'"',end:'"',contains:[{begin:'""'}]},{ +className:"string",begin:"`",end:"`" +},e.C_NUMBER_MODE,e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE] +},e.C_BLOCK_COMMENT_MODE,t,e.HASH_COMMENT_MODE]}}}()); +hljs.registerLanguage("swift",function(){"use strict";return function(e){var i={ +keyword:"#available #colorLiteral #column #else #elseif #endif #file #fileLiteral #function #if #imageLiteral #line #selector #sourceLocation _ __COLUMN__ __FILE__ __FUNCTION__ __LINE__ Any as as! as? associatedtype associativity break case catch class continue convenience default defer deinit didSet do dynamic dynamicType else enum extension fallthrough false fileprivate final for func get guard if import in indirect infix init inout internal is lazy left let mutating nil none nonmutating open operator optional override postfix precedence prefix private protocol Protocol public repeat required rethrows return right self Self set static struct subscript super switch throw throws true try try! try? Type typealias unowned var weak where while willSet", +literal:"true false nil", +built_in:"abs advance alignof alignofValue anyGenerator assert assertionFailure bridgeFromObjectiveC bridgeFromObjectiveCUnconditional bridgeToObjectiveC bridgeToObjectiveCUnconditional c compactMap contains count countElements countLeadingZeros debugPrint debugPrintln distance dropFirst dropLast dump encodeBitsAsWords enumerate equal fatalError filter find getBridgedObjectiveCType getVaList indices insertionSort isBridgedToObjectiveC isBridgedVerbatimToObjectiveC isUniquelyReferenced isUniquelyReferencedNonObjC join lazy lexicographicalCompare map max maxElement min minElement numericCast overlaps partition posix precondition preconditionFailure print println quickSort readLine reduce reflect reinterpretCast reverse roundUpToAlignment sizeof sizeofValue sort split startsWith stride strideof strideofValue swap toString transcode underestimateCount unsafeAddressOf unsafeBitCast unsafeDowncast unsafeUnwrap unsafeReflect withExtendedLifetime withObjectAtPlusZero withUnsafePointer withUnsafePointerToObject withUnsafeMutablePointer withUnsafeMutablePointers withUnsafePointer withUnsafePointers withVaList zip" +},n=e.COMMENT("/\\*","\\*/",{contains:["self"]}),t={className:"subst", +begin:/\\\(/,end:"\\)",keywords:i,contains:[]},a={className:"string", +contains:[e.BACKSLASH_ESCAPE,t],variants:[{begin:/"""/,end:/"""/},{begin:/"/, +end:/"/}]},r={className:"number", +begin:"\\b([\\d_]+(\\.[\\deE_]+)?|0x[a-fA-F0-9_]+(\\.[a-fA-F0-9p_]+)?|0b[01_]+|0o[0-7_]+)\\b", +relevance:0};return t.contains=[r],{name:"Swift",keywords:i, +contains:[a,e.C_LINE_COMMENT_MODE,n,{className:"type", +begin:"\\b[A-Z][\\w\xc0-\u02b8']*[!?]"},{className:"type", +begin:"\\b[A-Z][\\w\xc0-\u02b8']*",relevance:0},r,{className:"function", +beginKeywords:"func",end:"{",excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{ +begin:/[A-Za-z$_][0-9A-Za-z$_]*/}),{begin://},{className:"params", +begin:/\(/,end:/\)/,endsParent:!0,keywords:i, +contains:["self",r,a,e.C_BLOCK_COMMENT_MODE,{begin:":"}],illegal:/["']/}], +illegal:/\[|%/},{className:"class", +beginKeywords:"struct protocol class extension enum",keywords:i,end:"\\{", +excludeEnd:!0,contains:[e.inherit(e.TITLE_MODE,{ +begin:/[A-Za-z$_][\u00C0-\u02B80-9A-Za-z$_]*/})]},{className:"meta", +begin:"(@discardableResult|@warn_unused_result|@exported|@lazy|@noescape|@NSCopying|@NSManaged|@objc|@objcMembers|@convention|@required|@noreturn|@IBAction|@IBDesignable|@IBInspectable|@IBOutlet|@infix|@prefix|@postfix|@autoclosure|@testable|@available|@nonobjc|@NSApplicationMain|@UIApplicationMain|@dynamicMemberLookup|@propertyWrapper)\\b" +},{beginKeywords:"import",end:/$/,contains:[e.C_LINE_COMMENT_MODE,n]}]}}}()); +hljs.registerLanguage("typescript",function(){"use strict" +;const e="[A-Za-z$_][0-9A-Za-z$_]*",n=["as","in","of","if","for","while","finally","var","new","function","do","return","void","else","break","catch","instanceof","with","throw","case","default","try","switch","continue","typeof","delete","let","yield","const","class","debugger","async","await","static","import","from","export","extends"],a=["true","false","null","undefined","NaN","Infinity"],s=[].concat(["setInterval","setTimeout","clearInterval","clearTimeout","require","exports","eval","isFinite","isNaN","parseFloat","parseInt","decodeURI","decodeURIComponent","encodeURI","encodeURIComponent","escape","unescape"],["arguments","this","super","console","window","document","localStorage","module","global"],["Intl","DataView","Number","Math","Date","String","RegExp","Object","Function","Boolean","Error","Symbol","Set","Map","WeakSet","WeakMap","Proxy","Reflect","JSON","Promise","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Float32Array","Array","Uint8Array","Uint8ClampedArray","ArrayBuffer"],["EvalError","InternalError","RangeError","ReferenceError","SyntaxError","TypeError","URIError"]) +;function t(e){return r("(?=",e,")")}function i(e){return r("(",e,")?")} +function r(...e){return e.map((e=>{ +return(n=e)?"string"==typeof n?n:n.source:null;var n})).join("")} +return function(c){const o={$pattern:e, +keyword:n.concat(["type","namespace","typedef","interface","public","private","protected","implements","declare","abstract","readonly"]).join(" "), +literal:a.join(" "), +built_in:s.concat(["any","void","number","boolean","string","object","never","enum"]).join(" ") +},l={className:"meta",begin:"@[A-Za-z$_][0-9A-Za-z$_]*"},d=(e,n,a)=>{ +const s=e.contains.findIndex((e=>e.label===n)) +;if(-1===s)throw Error("can not find mode to replace");e.contains.splice(s,1,a) +},g=function(c){const o=e,l={begin:/<[A-Za-z0-9\\._:-]+/, +end:/\/[A-Za-z0-9\\._:-]+>|\/>/,isTrulyOpeningTag:(e,n)=>{ +const a=e[0].length+e.index,s=e.input[a];"<"!==s?">"===s&&(((e,{after:n})=>{ +const a=e[0].replace("<","`\\b0[${e}][${n}]([${n}_]*[${n}])?n?`,b=/[1-9]([0-9_]*\d)?/,u=/\d([0-9_]*\d)?/,E=r(/[eE][+-]?/,u),m={ +className:"number",variants:[{begin:g("bB","01")},{begin:g("oO","0-7")},{ +begin:g("xX","0-9a-fA-F")},{begin:r(/\b/,b,"n")},{begin:r(/(\b0)?\./,u,i(E))},{ +begin:r(/\b/,b,i(r(/\./,i(u))),i(E))},{begin:/\b0[\.n]?/}],relevance:0},y={ +className:"subst",begin:"\\$\\{",end:"\\}",keywords:d,contains:[]},p={ +begin:"html`",end:"",starts:{end:"`",returnEnd:!1, +contains:[c.BACKSLASH_ESCAPE,y],subLanguage:"xml"}},_={begin:"css`",end:"", +starts:{end:"`",returnEnd:!1,contains:[c.BACKSLASH_ESCAPE,y],subLanguage:"css"} +},N={className:"string",begin:"`",end:"`",contains:[c.BACKSLASH_ESCAPE,y]},f={ +className:"comment",variants:[c.COMMENT("/\\*\\*","\\*/",{relevance:0, +contains:[{className:"doctag",begin:"@[A-Za-z]+",contains:[{className:"type", +begin:"\\{",end:"\\}",relevance:0},{className:"variable", +begin:o+"(?=\\s*(-)|$)",endsParent:!0,relevance:0},{begin:/(?=[^\n])\s/, +relevance:0}]}]}),c.C_BLOCK_COMMENT_MODE,c.C_LINE_COMMENT_MODE] +},A=[c.APOS_STRING_MODE,c.QUOTE_STRING_MODE,p,_,N,m,c.REGEXP_MODE] +;y.contains=A.concat({begin:/{/,end:/}/,keywords:d,contains:["self"].concat(A)}) +;const O=[].concat(f,y.contains),S=O.concat([{begin:/\(/,end:/\)/,keywords:d, +contains:["self"].concat(O)}]),T={className:"params",begin:/\(/,end:/\)/, +excludeBegin:!0,excludeEnd:!0,keywords:d,contains:S};return{name:"Javascript", +aliases:["js","jsx","mjs","cjs"],keywords:d,exports:{PARAMS_CONTAINS:S}, +illegal:/#(?![$_A-z])/,contains:[c.SHEBANG({label:"shebang",binary:"node", +relevance:5}),{label:"use_strict",className:"meta",relevance:10, +begin:/^\s*['"]use (strict|asm)['"]/ +},c.APOS_STRING_MODE,c.QUOTE_STRING_MODE,p,_,N,f,m,{ +begin:r(/[{,\n]\s*/,t(r(/(\/\/.*$)*/,/(\/\*(.|\n)*\*\/)*/,/\s*/,o+"\\s*:"))), +relevance:0,contains:[{className:"attr",begin:o+t("\\s*:"),relevance:0}]},{ +begin:"("+c.RE_STARTERS_RE+"|\\b(case|return|throw)\\b)\\s*", +keywords:"return throw case",contains:[f,c.REGEXP_MODE,{className:"function", +begin:"(\\([^()]*(\\([^()]*(\\([^()]*\\))*[^()]*\\))*[^()]*\\)|"+c.UNDERSCORE_IDENT_RE+")\\s*=>", +returnBegin:!0,end:"\\s*=>",contains:[{className:"params",variants:[{ +begin:c.UNDERSCORE_IDENT_RE},{className:null,begin:/\(\s*\)/,skip:!0},{ +begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,keywords:d,contains:S}]}]},{ +begin:/,/,relevance:0},{className:"",begin:/\s/,end:/\s*/,skip:!0},{variants:[{ +begin:"<>",end:""},{begin:l.begin,"on:begin":l.isTrulyOpeningTag,end:l.end}], +subLanguage:"xml",contains:[{begin:l.begin,end:l.end,skip:!0,contains:["self"]}] +}],relevance:0},{className:"function",beginKeywords:"function",end:/[{;]/, +excludeEnd:!0,keywords:d,contains:["self",c.inherit(c.TITLE_MODE,{begin:o}),T], +illegal:/%/},{className:"function", +begin:c.UNDERSCORE_IDENT_RE+"\\([^()]*(\\([^()]*(\\([^()]*\\))*[^()]*\\))*[^()]*\\)\\s*{", +returnBegin:!0,contains:[T,c.inherit(c.TITLE_MODE,{begin:o})]},{variants:[{ +begin:"\\."+o},{begin:"\\$"+o}],relevance:0},{className:"class", +beginKeywords:"class",end:/[{;=]/,excludeEnd:!0,illegal:/[:"\[\]]/,contains:[{ +beginKeywords:"extends"},c.UNDERSCORE_TITLE_MODE]},{begin:/\b(?=constructor)/, +end:/[\{;]/,excludeEnd:!0,contains:[c.inherit(c.TITLE_MODE,{begin:o}),"self",T] +},{begin:"(get|set)\\s+(?="+o+"\\()",end:/{/,keywords:"get set", +contains:[c.inherit(c.TITLE_MODE,{begin:o}),{begin:/\(\)/},T]},{begin:/\$[(.]/}] +}}(c) +;return Object.assign(g.keywords,o),g.exports.PARAMS_CONTAINS.push(l),g.contains=g.contains.concat([l,{ +beginKeywords:"namespace",end:/\{/,excludeEnd:!0},{beginKeywords:"interface", +end:/\{/,excludeEnd:!0,keywords:"interface extends" +}]),d(g,"shebang",c.SHEBANG()),d(g,"use_strict",{className:"meta",relevance:10, +begin:/^\s*['"]use strict['"]/ +}),g.contains.find((e=>"function"===e.className)).relevance=0,Object.assign(g,{ +name:"TypeScript",aliases:["ts"]}),g}}()); +hljs.registerLanguage("yaml",function(){"use strict";return function(e){ +var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={ +className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/ +},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable", +variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{ +variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={ +end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={ +begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[", +end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr", +variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{ +begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)" +}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string", +begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{ +begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0, +relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type", +begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a +},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta", +begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)", +relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{ +className:"number", +begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b" +},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(), +c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"], +contains:b}}}()); \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css index 5f79f3220..c425b9de0 100644 --- a/ruoyi-admin/src/main/resources/static/css/style.css +++ b/ruoyi-admin/src/main/resources/static/css/style.css @@ -50,7 +50,7 @@ a:focus { color: #fff; font-size: 14px; height: 50px; - padding: 18px 15px; + padding: 15px 15px; } .nav>li.active>a { diff --git a/ruoyi-admin/src/main/resources/static/img/pay.png b/ruoyi-admin/src/main/resources/static/img/pay.png index c32dca198..bb8b96723 100644 Binary files a/ruoyi-admin/src/main/resources/static/img/pay.png and b/ruoyi-admin/src/main/resources/static/img/pay.png differ diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/index.js b/ruoyi-admin/src/main/resources/static/ruoyi/index.js index a4ff28f13..29f21242f 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/index.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/index.js @@ -24,9 +24,9 @@ $(function() { // 菜单切换 $('.navbar-minimalize').click(function() { if (isMobile) { - $("body").toggleClass("canvas-menu"); + $("body").toggleClass("canvas-menu"); } else { - $("body").toggleClass("mini-navbar"); + $("body").toggleClass("mini-navbar"); } SmoothlyMenu(); }); @@ -62,12 +62,12 @@ $(window).bind("load resize", function() { $('.navbar-static-side').fadeOut(); } else { if($('body').hasClass('canvas-menu')) { - $('body').addClass('fixed-sidebar'); - $('body').removeClass('canvas-menu'); - $("body").removeClass("mini-navbar"); - $("nav .logo").removeClass("hide"); - $(".slimScrollDiv").css({ "overflow": "visible" }); - $('.navbar-static-side').fadeIn(); + $('body').addClass('fixed-sidebar'); + $('body').removeClass('canvas-menu'); + $("body").removeClass("mini-navbar"); + $("nav .logo").removeClass("hide"); + $(".slimScrollDiv").css({ "overflow": "visible" }); + $('.navbar-static-side').fadeIn(); } } }); @@ -89,7 +89,7 @@ function syncMenuTab(dataId) { $("#tab_" + menuId + " a").click(); } } - } + } } function NavToggle() { @@ -97,12 +97,11 @@ function NavToggle() { } function fixedSidebar() { - $('#side-menu').hide(); - $("nav .logo").addClass("hide"); + $('#side-menu').hide(); + $("nav .logo").addClass("hide"); setTimeout(function() { $('#side-menu').fadeIn(500); - }, - 100); + }, 100); } function SmoothlyMenu() { @@ -263,8 +262,8 @@ $(function() { var $dataObj = $('a[href$="' + decodeURI(dataUrl) + '"]'); if (!$dataObj.hasClass("noactive")) { - $('.tab-pane li').removeClass("active"); - $('.nav ul').removeClass("in"); + $('.tab-pane li').removeClass("active"); + $('.nav ul').removeClass("in"); $dataObj.parents("ul").addClass("in") $dataObj.parents("li").addClass("active").siblings().removeClass("active").find('li').removeClass("active"); $dataObj.parents("ul").css('height', 'auto').height(); @@ -395,7 +394,7 @@ $(function() { $(this).show().siblings('.RuoYi_iframe').hide(); return false; } - }); + }); } } } @@ -450,14 +449,14 @@ $(function() { var currentId = $('.page-tabs-content').find('.active').attr('data-id'); var target = $('.RuoYi_iframe[data-id="' + currentId + '"]'); var url = target.attr('src'); - target.attr('src', url).ready(); + target.attr('src', url).ready(); } // 页签全屏 function fullScreenTab() { var currentId = $('.page-tabs-content').find('.active').attr('data-id'); var target = $('.RuoYi_iframe[data-id="' + currentId + '"]'); - target.fullScreen(true); + target.fullScreen(true); } // 关闭当前选项卡 @@ -538,11 +537,11 @@ $(function() { // 设置锚点 function setIframeUrl(href) { if($.common.equals("history", mode)) { - storage.set('publicPath', href); + storage.set('publicPath', href); } else { - var nowUrl = window.location.href; - var newUrl = nowUrl.substring(0, nowUrl.indexOf("#")); - window.location.href = newUrl + "#" + href; + var nowUrl = window.location.href; + var newUrl = nowUrl.substring(0, nowUrl.indexOf("#")); + window.location.href = newUrl + "#" + href; } } @@ -569,14 +568,14 @@ $(function() { name: "关闭当前", icon: "fa-close", callback: function(key, opt) { - opt.$trigger.find('i').trigger("click"); + opt.$trigger.find('i').trigger("click"); } }, "close_other": { name: "关闭其他", icon: "fa-window-close-o", callback: function(key, opt) { - setActiveTab(this); + setActiveTab(this); tabCloseOther(); } }, @@ -584,23 +583,23 @@ $(function() { name: "关闭左侧", icon: "fa-reply", callback: function(key, opt) { - setActiveTab(this); - this.prevAll('.menuTab').not(":last").each(function() { - if ($(this).hasClass('active')) { - setActiveTab(this); - } - $('.RuoYi_iframe[data-id="' + $(this).data('id') + '"]').remove(); - $(this).remove(); - }); - $('.page-tabs-content').css("margin-left", "0"); + setActiveTab(this); + this.prevAll('.menuTab').not(":last").each(function() { + if ($(this).hasClass('active')) { + setActiveTab(this); + } + $('.RuoYi_iframe[data-id="' + $(this).data('id') + '"]').remove(); + $(this).remove(); + }); + $('.page-tabs-content').css("margin-left", "0"); } }, "close_right": { name: "关闭右侧", icon: "fa-share", callback: function(key, opt) { - setActiveTab(this); - this.nextAll('.menuTab').each(function() { + setActiveTab(this); + this.nextAll('.menuTab').each(function() { $('.menuTab[data-id="' + $(this).data('id') + '"]').remove(); $(this).remove(); }); @@ -618,18 +617,18 @@ $(function() { name: "全屏显示", icon: "fa-arrows-alt", callback: function(key, opt) { - setActiveTab(this); + setActiveTab(this); var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); - target.fullScreen(true); + target.fullScreen(true); } }, "refresh": { name: "刷新页面", icon: "fa-refresh", callback: function(key, opt) { - setActiveTab(this); - var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); - var url = target.attr('src'); + setActiveTab(this); + var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); + var url = target.attr('src'); $.modal.loading("数据加载中，请稍后..."); target.attr('src', url).load(function () { $.modal.closeLoading(); @@ -640,7 +639,7 @@ $(function() { name: "新窗口打开", icon: "fa-link", callback: function(key, opt) { - var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); + var target = $('.RuoYi_iframe[data-id="' + this.data('id') + '"]'); window.open(target.attr('src')); } }, diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js index 48c711f06..874994fe5 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/common.js @@ -4,195 +4,195 @@ */ $(function() { - // layer扩展皮肤 - if (window.layer !== undefined) { - layer.config({ - extend: 'moon/style.css', - skin: 'layer-ext-moon' - }); - } + // layer扩展皮肤 + if (window.layer !== undefined) { + layer.config({ + extend: 'moon/style.css', + skin: 'layer-ext-moon' + }); + } - // 回到顶部绑定 - if ($.fn.toTop !== undefined) { - $('#scroll-up').toTop(); - } + // 回到顶部绑定 + if ($.fn.toTop !== undefined) { + $('#scroll-up').toTop(); + } - // select2复选框事件绑定 - if ($.fn.select2 !== undefined) { + // select2复选框事件绑定 + if ($.fn.select2 !== undefined) { $.fn.select2.defaults.set( "theme", "bootstrap" ); - $("select.form-control:not(.noselect2)").each(function () { - $(this).select2().on("change", function () { - $(this).valid(); - }) - }) - } + $("select.form-control:not(.noselect2)").each(function () { + $(this).select2().on("change", function () { + $(this).valid(); + }) + }) + } - // iCheck单选框及复选框事件绑定 - if ($.fn.iCheck !== undefined) { - $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() { + // iCheck单选框及复选框事件绑定 + if ($.fn.iCheck !== undefined) { + $(".check-box:not(.noicheck),.radio-box:not(.noicheck)").each(function() { $(this).iCheck({ checkboxClass: 'icheckbox-blue', radioClass: 'iradio-blue', }) }) - } + } - // 气泡弹出框特效（移到元素时） - $(document).on("mouseenter", '.table [data-toggle="popover"]', function() { - var _this = this; - $(this).popover("show"); - $(".popover").on("mouseleave", function() { - $(_this).popover('hide'); - }); - }) + // 气泡弹出框特效（移到元素时） + $(document).on("mouseenter", '.table [data-toggle="popover"]', function() { + var _this = this; + $(this).popover("show"); + $(".popover").on("mouseleave", function() { + $(_this).popover('hide'); + }); + }) - // 气泡弹出框特效（离开元素时） - $(document).on("mouseleave", '.table [data-toggle="popover"]', function() { - var _this = this; - setTimeout(function() { - if (!$(".popover:hover").length) $(_this).popover("hide"); - }, 100); - }); + // 气泡弹出框特效（离开元素时） + $(document).on("mouseleave", '.table [data-toggle="popover"]', function() { + var _this = this; + setTimeout(function() { + if (!$(".popover:hover").length) $(_this).popover("hide"); + }, 100); + }); - // 取消回车自动提交表单 - $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) { + // 取消回车自动提交表单 + $(document).on("keypress", ":input:not(textarea):not([type=submit])", function(event) { if (event.keyCode == 13) { event.preventDefault(); } }); - // laydate 时间控件绑定 - if ($(".select-time").length > 0) { - layui.use('laydate', function() { - var laydate = layui.laydate; - var startDate = laydate.render({ - elem: '#startTime', - max: $('#endTime').val(), - theme: 'molv', - trigger: 'click', - done: function(value, date) { - // 结束时间大于开始时间 - if (value !== '') { - endDate.config.min.year = date.year; - endDate.config.min.month = date.month - 1; - endDate.config.min.date = date.date; - } else { - endDate.config.min.year = ''; - endDate.config.min.month = ''; - endDate.config.min.date = ''; - } - } - }); - var endDate = laydate.render({ - elem: '#endTime', - min: $('#startTime').val(), - theme: 'molv', - trigger: 'click', - done: function(value, date) { - // 开始时间小于结束时间 - if (value !== '') { - startDate.config.max.year = date.year; - startDate.config.max.month = date.month - 1; - startDate.config.max.date = date.date; - } else { - startDate.config.max.year = '2099'; - startDate.config.max.month = '12'; - startDate.config.max.date = '31'; - } - } - }); - }); - } + // laydate 时间控件绑定 + if ($(".select-time").length > 0) { + layui.use('laydate', function() { + var laydate = layui.laydate; + var startDate = laydate.render({ + elem: '#startTime', + max: $('#endTime').val(), + theme: 'molv', + trigger: 'click', + done: function(value, date) { + // 结束时间大于开始时间 + if (value !== '') { + endDate.config.min.year = date.year; + endDate.config.min.month = date.month - 1; + endDate.config.min.date = date.date; + } else { + endDate.config.min.year = ''; + endDate.config.min.month = ''; + endDate.config.min.date = ''; + } + } + }); + var endDate = laydate.render({ + elem: '#endTime', + min: $('#startTime').val(), + theme: 'molv', + trigger: 'click', + done: function(value, date) { + // 开始时间小于结束时间 + if (value !== '') { + startDate.config.max.year = date.year; + startDate.config.max.month = date.month - 1; + startDate.config.max.date = date.date; + } else { + startDate.config.max.year = '2099'; + startDate.config.max.month = '12'; + startDate.config.max.date = '31'; + } + } + }); + }); + } - // laydate time-input 时间控件绑定 - if ($(".time-input").length > 0) { - layui.use('laydate', function () { - var com = layui.laydate; - $(".time-input").each(function (index, item) { - var time = $(item); - // 控制控件外观 - var type = time.attr("data-type") || 'date'; - // 控制回显格式 - var format = time.attr("data-format") || 'yyyy-MM-dd'; - // 控制日期控件按钮 - var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = []; - // 日期控件选择完成后回调处理 - var callback = time.attr("data-callback") || {}; - if (buttons) { - if (buttons.indexOf("|") > 0) { - var btnArr = buttons.split("|"), btnLen = btnArr.length; - for (var j = 0; j < btnLen; j++) { - if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) { - newBtnArr.push(btnArr[j]); - } - } - } else { - if ("clear" === buttons || "now" === buttons || "confirm" === buttons) { - newBtnArr.push(buttons); - } - } - } else { - newBtnArr = ['clear', 'now', 'confirm']; - } - com.render({ - elem: item, - theme: 'molv', - trigger: 'click', - type: type, - format: format, - btns: newBtnArr, - done: function (value, data) { - if (typeof window[callback] != 'undefined' - && window[callback] instanceof Function) { - window[callback](value, data); - } - } - }); - }); - }); - } + // laydate time-input 时间控件绑定 + if ($(".time-input").length > 0) { + layui.use('laydate', function () { + var com = layui.laydate; + $(".time-input").each(function (index, item) { + var time = $(item); + // 控制控件外观 + var type = time.attr("data-type") || 'date'; + // 控制回显格式 + var format = time.attr("data-format") || 'yyyy-MM-dd'; + // 控制日期控件按钮 + var buttons = time.attr("data-btn") || 'clear|now|confirm', newBtnArr = []; + // 日期控件选择完成后回调处理 + var callback = time.attr("data-callback") || {}; + if (buttons) { + if (buttons.indexOf("|") > 0) { + var btnArr = buttons.split("|"), btnLen = btnArr.length; + for (var j = 0; j < btnLen; j++) { + if ("clear" === btnArr[j] || "now" === btnArr[j] || "confirm" === btnArr[j]) { + newBtnArr.push(btnArr[j]); + } + } + } else { + if ("clear" === buttons || "now" === buttons || "confirm" === buttons) { + newBtnArr.push(buttons); + } + } + } else { + newBtnArr = ['clear', 'now', 'confirm']; + } + com.render({ + elem: item, + theme: 'molv', + trigger: 'click', + type: type, + format: format, + btns: newBtnArr, + done: function (value, data) { + if (typeof window[callback] != 'undefined' + && window[callback] instanceof Function) { + window[callback](value, data); + } + } + }); + }); + }); + } - // tree 关键字搜索绑定 - if ($("#keyword").length > 0) { - $("#keyword").bind("focus", function focusKey(e) { - if ($("#keyword").hasClass("empty")) { - $("#keyword").removeClass("empty"); - } - }).bind("blur", function blurKey(e) { - if ($("#keyword").val() === "") { - $("#keyword").addClass("empty"); - } - $.tree.searchNode(e); - }).bind("input propertychange", $.tree.searchNode); - } + // tree 关键字搜索绑定 + if ($("#keyword").length > 0) { + $("#keyword").bind("focus", function focusKey(e) { + if ($("#keyword").hasClass("empty")) { + $("#keyword").removeClass("empty"); + } + }).bind("blur", function blurKey(e) { + if ($("#keyword").val() === "") { + $("#keyword").addClass("empty"); + } + $.tree.searchNode(e); + }).bind("input propertychange", $.tree.searchNode); + } - // tree表格树 展开/折叠 - var expandFlag; - $("#expandAllBtn").click(function() { - var dataExpand = $.common.isEmpty(table.options.expandAll) ? true : table.options.expandAll; - expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag; - if (!expandFlag) { - $.bttTable.bootstrapTreeTable('expandAll'); - } else { - $.bttTable.bootstrapTreeTable('collapseAll'); - } - expandFlag = expandFlag ? false: true; - }) + // tree表格树 展开/折叠 + var expandFlag; + $("#expandAllBtn").click(function() { + var dataExpand = $.common.isEmpty(table.options.expandAll) ? true : table.options.expandAll; + expandFlag = $.common.isEmpty(expandFlag) ? dataExpand : expandFlag; + if (!expandFlag) { + $.bttTable.bootstrapTreeTable('expandAll'); + } else { + $.bttTable.bootstrapTreeTable('collapseAll'); + } + expandFlag = expandFlag ? false: true; + }) - // 按下ESC按钮关闭弹层 - $('body', document).on('keyup', function(e) { - if (e.which === 27) { - $.modal.closeAll(); - } - }); + // 按下ESC按钮关闭弹层 + $('body', document).on('keyup', function(e) { + if (e.which === 27) { + $.modal.closeAll(); + } + }); }); (function ($) { 'use strict'; $.fn.toTop = function(opt) { var elem = this; - var win = $(window); - var doc = $('html, body'); + var win = (opt && opt.hasOwnProperty('win')) ? opt.win : $(window); + var doc = (opt && opt.hasOwnProperty('doc')) ? opt.doc : $('html, body'); var options = $.extend({ autohide: true, offset: 50, @@ -233,8 +233,8 @@ $(function() { /** 刷新选项卡 */ var refreshItem = function(){ var topWindow = $(window.parent.document); - var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id'); - var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow); + var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-id'); + var target = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow); var url = target.attr('src'); target.attr('src', url).ready(); } @@ -243,29 +243,29 @@ var refreshItem = function(){ var closeItem = function(dataId){ var topWindow = $(window.parent.document); if($.common.isNotEmpty(dataId)){ - window.parent.$.modal.closeLoading(); - // 根据dataId关闭指定选项卡 - $('.menuTab[data-id="' + dataId + '"]', topWindow).remove(); - // 移除相应tab对应的内容区 - $('.mainContent .RuoYi_iframe[data-id="' + dataId + '"]', topWindow).remove(); - return; + window.parent.$.modal.closeLoading(); + // 根据dataId关闭指定选项卡 + $('.menuTab[data-id="' + dataId + '"]', topWindow).remove(); + // 移除相应tab对应的内容区 + $('.mainContent .RuoYi_iframe[data-id="' + dataId + '"]', topWindow).remove(); + return; } var panelUrl = window.frameElement.getAttribute('data-panel'); $('.page-tabs-content .active i', topWindow).click(); if($.common.isNotEmpty(panelUrl)){ - $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active'); - $('.mainContent .RuoYi_iframe', topWindow).each(function() { - if ($(this).data('id') == panelUrl) { - $(this).show().siblings('.RuoYi_iframe').hide(); - return false; + $('.menuTab[data-id="' + panelUrl + '"]', topWindow).addClass('active').siblings('.menuTab').removeClass('active'); + $('.mainContent .RuoYi_iframe', topWindow).each(function() { + if ($(this).data('id') == panelUrl) { + $(this).show().siblings('.RuoYi_iframe').hide(); + return false; } - }); - } + }); + } } /** 创建选项卡 */ function createMenuItem(dataUrl, menuName) { - var panelUrl = window.frameElement.getAttribute('data-id'); + var panelUrl = window.frameElement.getAttribute('data-id'); dataIndex = $.common.random(1, 100), flag = true; if (dataUrl == undefined || $.trim(dataUrl).length == 0) return false; @@ -300,7 +300,7 @@ function createMenuItem(dataUrl, menuName) { window.parent.$.modal.loading("数据加载中，请稍后..."); $('.mainContent iframe:visible', topWindow).load(function () { - window.parent.$.modal.closeLoading(); + window.parent.$.modal.closeLoading(); }); // 添加选项卡 @@ -312,7 +312,7 @@ function createMenuItem(dataUrl, menuName) { // 滚动到指定选项卡 function scrollToTab(element) { - var topWindow = $(window.parent.document); + var topWindow = $(window.parent.document); var marginLeftVal = calSumWidth($(element).prevAll()), marginRightVal = calSumWidth($(element).nextAll()); // 可视区域非tab宽度 @@ -349,28 +349,28 @@ function calSumWidth(elements) { /** 密码规则范围验证 */ function checkpwd(chrtype, password) { - if (chrtype == 1) { - if(!$.common.numValid(password)){ - $.modal.alertWarning("密码只能为0-9数字"); - return false; - } - } else if (chrtype == 2) { - if(!$.common.enValid(password)){ - $.modal.alertWarning("密码只能为a-z和A-Z字母"); - return false; - } - } else if (chrtype == 3) { - if(!$.common.enNumValid(password)){ - $.modal.alertWarning("密码必须包含字母以及数字"); - return false; - } - } else if (chrtype == 4) { - if(!$.common.charValid(password)){ - $.modal.alertWarning("密码必须包含字母、数字、以及特殊符号-、_"); - return false; - } - } - return true; + if (chrtype == 1) { + if(!$.common.numValid(password)){ + $.modal.alertWarning("密码只能为0-9数字"); + return false; + } + } else if (chrtype == 2) { + if(!$.common.enValid(password)){ + $.modal.alertWarning("密码只能为a-z和A-Z字母"); + return false; + } + } else if (chrtype == 3) { + if(!$.common.enNumValid(password)){ + $.modal.alertWarning("密码必须包含字母以及数字"); + return false; + } + } else if (chrtype == 4) { + if(!$.common.charValid(password)){ + $.modal.alertWarning("密码必须包含字母、数字、以及特殊符号~!@#$%^&*()-=_+"); + return false; + } + } + return true; } // 日志打印封装处理 @@ -411,21 +411,21 @@ var sub = { var count = $("#" + table.options.id).bootstrapTable('getData').length; var params = new Array(); for (var dataIndex = 0; dataIndex <= count; dataIndex++) { - var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td'); - var obj = new Object(); - for (var i = 0; i < columns.length; i++) { - var inputValue = $(columns[i]).find('input'); - var selectValue = $(columns[i]).find('select'); - var key = table.options.columns[i].field; - if ($.common.isNotEmpty(inputValue.val())) { - obj[key] = inputValue.val(); - } else if ($.common.isNotEmpty(selectValue.val())) { - obj[key] = selectValue.val(); - } else { - obj[key] = ""; - } - } - params.push({ index: dataIndex, row: obj }); + var columns = $('#' + table.options.id + ' tr[data-index="' + dataIndex + '"] td'); + var obj = new Object(); + for (var i = 0; i < columns.length; i++) { + var inputValue = $(columns[i]).find('input'); + var selectValue = $(columns[i]).find('select'); + var key = table.options.columns[i].field; + if ($.common.isNotEmpty(inputValue.val())) { + obj[key] = inputValue.val(); + } else if ($.common.isNotEmpty(selectValue.val())) { + obj[key] = selectValue.val(); + } else { + obj[key] = ""; + } + } + params.push({ index: dataIndex, row: obj }); } $("#" + table.options.id).bootstrapTable("updateRow", params); }, @@ -441,16 +441,35 @@ var sub = { } }; +// 动态加载css文件 +function loadCss(file, headElem) { + var link = document.createElement('link'); + link.href = file; + link.rel = 'stylesheet'; + link.type = 'text/css'; + if (headElem) headElem.appendChild(link); + else document.getElementsByTagName('head')[0].appendChild(link); +} + +// 动态加载js文件 +function loadJs(file, headElem) { + var script = document.createElement('script'); + script.src = file; + script.type = 'text/javascript'; + if (headElem) headElem.appendChild(script); + else document.getElementsByTagName('head')[0].appendChild(script); +} + /** 设置全局ajax处理 */ $.ajaxSetup({ complete: function(XMLHttpRequest, textStatus) { if (textStatus == 'timeout') { - $.modal.alertWarning("服务器超时，请稍后再试！"); - $.modal.enable(); + $.modal.alertWarning("服务器超时，请稍后再试！"); + $.modal.enable(); $.modal.closeLoading(); } else if (textStatus == "parsererror" || textStatus == "error") { - $.modal.alertWarning("服务器错误，请联系管理员！"); - $.modal.enable(); + $.modal.alertWarning("服务器错误，请联系管理员！"); + $.modal.enable(); $.modal.closeLoading(); } } 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 b586e965e..4bc7780ff 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 @@ -11,7 +11,7 @@ var table = { // 设置实例配置 set: function(id) { if($.common.getLength(table.config) > 1) { - var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id; + var tableId = $.common.isEmpty(id) ? $(event.currentTarget).parents(".bootstrap-table").find("table.table").attr("id") : id; if ($.common.isNotEmpty(tableId)) { table.options = table.get(tableId); } @@ -36,25 +36,25 @@ var table = { // 初始化表格参数 init: function(options) { var defaults = { - id: "bootstrap-table", - type: 0, // 0 代表bootstrapTable 1代表bootstrapTreeTable - method: 'post', - height: undefined, - sidePagination: "server", - sortName: "", - sortOrder: "asc", - pagination: true, - paginationLoop: false, - pageSize: 10, - pageNumber: 1, - pageList: [10, 25, 50], - toolbar: "toolbar", - loadingFontSize: 13, - striped: false, - escape: false, - firstLoad: true, - showFooter: false, - search: false, + id: "bootstrap-table", + type: 0, // 0 代表bootstrapTable 1代表bootstrapTreeTable + method: 'post', + height: undefined, + sidePagination: "server", + sortName: "", + sortOrder: "asc", + pagination: true, + paginationLoop: false, + pageSize: 10, + pageNumber: 1, + pageList: [10, 25, 50], + toolbar: "toolbar", + loadingFontSize: 13, + striped: false, + escape: false, + firstLoad: true, + showFooter: false, + search: false, showSearch: true, showPageGo: false, showRefresh: true, @@ -66,18 +66,18 @@ var table = { mobileResponsive: true, maintainSelected: false, rememberSelected: false, - fixedColumns: false, - fixedNumber: 0, - fixedRightNumber: 0, - queryParams: $.table.queryParams, - rowStyle: {}, - }; + fixedColumns: false, + fixedNumber: 0, + fixedRightNumber: 0, + queryParams: $.table.queryParams, + rowStyle: {}, + }; var options = $.extend(defaults, options); table.options = options; table.config[options.id] = options; $.table.initEvent(); $('#' + options.id).bootstrapTable({ - id: options.id, + id: options.id, url: options.url, // 请求后台的URL（*） contentType: "application/x-www-form-urlencoded", // 编码类型 method: options.method, // 请求方式（*） @@ -103,15 +103,15 @@ var table = { search: options.search, // 是否显示搜索框功能 searchText: options.searchText, // 搜索框初始显示的内容，默认为空 showSearch: options.showSearch, // 是否显示检索信息 - showPageGo: options.showPageGo, // 是否显示跳转页 + showPageGo: options.showPageGo, // 是否显示跳转页 showRefresh: options.showRefresh, // 是否显示刷新按钮 showColumns: options.showColumns, // 是否显示隐藏某列下拉框 showToggle: options.showToggle, // 是否显示详细视图和列表视图的切换按钮 showExport: options.showExport, // 是否支持导出文件 showHeader: options.showHeader, // 是否显示表头 showFullscreen: options.showFullscreen, // 是否显示全屏按钮 - uniqueId: options.uniqueId, // 唯 一的标识符 - clickToSelect: options.clickToSelect, // 是否启用点击选中行 + uniqueId: options.uniqueId, // 唯一的标识符 + clickToSelect: options.clickToSelect, // 是否启用点击选中行 singleSelect: options.singleSelect, // 是否单选checkbox mobileResponsive: options.mobileResponsive, // 是否支持移动端适配 cardView: options.cardView, // 是否启用显示卡片视图 @@ -145,36 +145,36 @@ var table = { var _separator = $.common.isEmpty(separator) ? "," : separator; var optionsIds = ""; $.each(table.config, function(key, value){ - optionsIds += "#" + key + _separator; + optionsIds += "#" + key + _separator; }); return optionsIds.substring(0, optionsIds.length - 1); }, // 查询条件 queryParams: function(params) { - var curParams = { - // 传递参数查询参数 - pageSize: params.limit, - pageNum: params.offset / params.limit + 1, - searchValue: params.search, - orderByColumn: params.sort, - isAsc: params.order - }; + var curParams = { + // 传递参数查询参数 + pageSize: params.limit, + pageNum: params.offset / params.limit + 1, + searchValue: params.search, + orderByColumn: params.sort, + isAsc: params.order + }; var currentId = $.common.isEmpty(table.options.formId) ? $('form').attr('id') : table.options.formId; return $.extend(curParams, $.common.formToJSON(currentId)); }, // 请求获取数据后处理回调函数 responseHandler: function(res) { if (typeof table.get(this.id).responseHandler == "function") { - table.get(this.id).responseHandler(res); + table.get(this.id).responseHandler(res); } if (res.code == 0) { if ($.common.isNotEmpty(table.options.sidePagination) && table.options.sidePagination == 'client') { return res.rows; } else { if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { - var column = $.common.isEmpty(table.options.uniqueId) ? table.options.columns[1].field : table.options.uniqueId; - $.each(res.rows, function(i, row) { - row.state = $.inArray(row[column], table.rememberSelectedIds[table.options.id]) !== -1; + var column = $.common.isEmpty(table.options.uniqueId) ? table.options.columns[1].field : table.options.uniqueId; + $.each(res.rows, function(i, row) { + row.state = $.inArray(row[column], table.rememberSelectedIds[table.options.id]) !== -1; }) } return { rows: res.rows, total: res.total }; @@ -190,143 +190,143 @@ var table = { var optionsIds = $.table.getOptionsIds(); // 监听事件处理 $(optionsIds).on(TABLE_EVENTS, function () { - table.set($(this).attr("id")); + table.set($(this).attr("id")); }); // 在表格体渲染完成，并在 DOM 中可见后触发（事件） $(optionsIds).on("post-body.bs.table", function (e, args) { - // 浮动提示框特效 - $(".table [data-toggle='tooltip']").tooltip(); + // 浮动提示框特效 + $(".table [data-toggle='tooltip']").tooltip(); }); // 选中、取消、全部选中、全部取消（事件） $(optionsIds).on("check.bs.table check-all.bs.table uncheck.bs.table uncheck-all.bs.table", function (e, rowsAfter, rowsBefore) { - // 复选框分页保留保存选中数组 - var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter; - var rowIds = $.table.affectedRowIds(rows); - if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { - func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference'; - var selectedIds = table.rememberSelectedIds[table.options.id]; - if($.common.isNotEmpty(selectedIds)) { - table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds); - } else { - table.rememberSelectedIds[table.options.id] = _[func]([], rowIds); - } - var selectedRows = table.rememberSelecteds[table.options.id]; - if($.common.isNotEmpty(selectedRows)) { - table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows); - } else { - table.rememberSelecteds[table.options.id] = _[func]([], rows); - } - } + // 复选框分页保留保存选中数组 + var rows = $.common.equals("uncheck-all", e.type) ? rowsBefore : rowsAfter; + var rowIds = $.table.affectedRowIds(rows); + if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { + func = $.inArray(e.type, ['check', 'check-all']) > -1 ? 'union' : 'difference'; + var selectedIds = table.rememberSelectedIds[table.options.id]; + if($.common.isNotEmpty(selectedIds)) { + table.rememberSelectedIds[table.options.id] = _[func](selectedIds, rowIds); + } else { + table.rememberSelectedIds[table.options.id] = _[func]([], rowIds); + } + var selectedRows = table.rememberSelecteds[table.options.id]; + if($.common.isNotEmpty(selectedRows)) { + table.rememberSelecteds[table.options.id] = _[func](selectedRows, rows); + } else { + table.rememberSelecteds[table.options.id] = _[func]([], rows); + } + } }); // 加载成功、选中、取消、全部选中、全部取消（事件） $(optionsIds).on("check.bs.table uncheck.bs.table check-all.bs.table uncheck-all.bs.table load-success.bs.table", function () { - var toolbar = table.options.toolbar; - var uniqueId = table.options.uniqueId; - // 工具栏按钮控制 - var rows = $.common.isEmpty(uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(uniqueId); - // 非多个禁用 - $('#' + toolbar + ' .multiple').toggleClass('disabled', !rows.length); - // 非单个禁用 - $('#' + toolbar + ' .single').toggleClass('disabled', rows.length!=1); + var toolbar = table.options.toolbar; + var uniqueId = table.options.uniqueId; + // 工具栏按钮控制 + var rows = $.common.isEmpty(uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(uniqueId); + // 非多个禁用 + $('#' + toolbar + ' .multiple').toggleClass('disabled', !rows.length); + // 非单个禁用 + $('#' + toolbar + ' .single').toggleClass('disabled', rows.length!=1); }); // 图片预览事件 $(optionsIds).off("click").on("click", '.img-circle', function() { - var src = $(this).attr('src'); - var target = $(this).data('target'); - if($.common.equals("self", target)) { - var height = $(this).data('height'); - var width = $(this).data('width'); - // 如果是移动端，就使用自适应大小弹窗 - if ($.common.isMobile()) { - width = 'auto'; - height = 'auto'; - } - layer.open({ - title: false, - type: 1, - closeBtn: true, - shadeClose: true, - area: ['auto', 'auto'], - content: "" - }); - } else if ($.common.equals("blank", target)) { - window.open(src); - } - }); + var src = $(this).attr('src'); + var target = $(this).data('target'); + if($.common.equals("self", target)) { + var height = $(this).data('height'); + var width = $(this).data('width'); + // 如果是移动端，就使用自适应大小弹窗 + if ($.common.isMobile()) { + width = 'auto'; + height = 'auto'; + } + layer.open({ + title: false, + type: 1, + closeBtn: true, + shadeClose: true, + area: ['auto', 'auto'], + content: "" + }); + } else if ($.common.equals("blank", target)) { + window.open(src); + } + }); // 单击tooltip事件 $(optionsIds).on("click", '.tooltip-show', function() { - var target = $(this).data('target'); - var input = $(this).prev(); - if ($.common.equals("copy", target)) { - input.select(); - document.execCommand("copy"); - } else if ($.common.equals("open", target)) { - parent.layer.alert(input.val(), { - title: "信息内容", - shadeClose: true, - btn: ['确认'], - btnclass: ['btn btn-primary'], - }); - } + var target = $(this).data('target'); + var input = $(this).prev(); + if ($.common.equals("copy", target)) { + input.select(); + document.execCommand("copy"); + } else if ($.common.equals("open", target)) { + parent.layer.alert(input.val(), { + title: "信息内容", + shadeClose: true, + btn: ['确认'], + btnclass: ['btn btn-primary'], + }); + } }); }, // 当所有数据被加载时触发 onLoadSuccess: function(data) { if (typeof table.options.onLoadSuccess == "function") { - table.options.onLoadSuccess(data); + table.options.onLoadSuccess(data); } }, // 表格销毁 destroy: function (tableId) { var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId; $("#" + currentId).bootstrapTable('destroy'); - }, + }, // 序列号生成 serialNumber: function (index, tableId) { - var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId; - var tableParams = $("#" + currentId).bootstrapTable('getOptions'); - var pageSize = $.common.isNotEmpty(tableParams.pageSize) ? tableParams.pageSize: table.options.pageSize; - var pageNumber = $.common.isNotEmpty(tableParams.pageNumber) ? tableParams.pageNumber: table.options.pageNumber; - return pageSize * (pageNumber - 1) + index + 1; - }, - // 列超出指定长度浮动提示 target（copy单击复制文本 open弹窗打开文本） - tooltip: function (value, length, target) { - var _length = $.common.isEmpty(length) ? 20 : length; - var _text = ""; - var _value = $.common.nullToStr(value); - var _target = $.common.isEmpty(target) ? 'copy' : target; - if (_value.length > _length) { - _text = _value.substr(0, _length) + "..."; - _value = _value.replace(/\'/g,"'"); - _value = _value.replace(/\"/g,"""); - var actions = []; - actions.push($.common.sprintf('', _value)); - actions.push($.common.sprintf('%s', _target, _value, _text)); - return actions.join(''); - } else { - _text = _value; - return _text; - } - }, - // 下拉按钮切换 - dropdownToggle: function (value) { - var actions = []; - actions.push('
'); - actions.push(''); - actions.push('
    '); - actions.push(value.replace(//g,"")); - actions.push('
'); - actions.push('
'); - return actions.join(''); - }, - // 图片预览 - imageView: function (value, height, width, target) { - if ($.common.isEmpty(width)) { - width = 'auto'; + var currentId = $.common.isEmpty(tableId) ? table.options.id : tableId; + var tableParams = $("#" + currentId).bootstrapTable('getOptions'); + var pageSize = $.common.isNotEmpty(tableParams.pageSize) ? tableParams.pageSize: table.options.pageSize; + var pageNumber = $.common.isNotEmpty(tableParams.pageNumber) ? tableParams.pageNumber: table.options.pageNumber; + return pageSize * (pageNumber - 1) + index + 1; + }, + // 列超出指定长度浮动提示 target（copy单击复制文本 open弹窗打开文本） + tooltip: function (value, length, target) { + var _length = $.common.isEmpty(length) ? 20 : length; + var _text = ""; + var _value = $.common.nullToStr(value); + var _target = $.common.isEmpty(target) ? 'copy' : target; + if (_value.length > _length) { + _text = _value.substr(0, _length) + "..."; + _value = _value.replace(/\'/g,"'"); + _value = _value.replace(/\"/g,"""); + var actions = []; + actions.push($.common.sprintf('', _value)); + actions.push($.common.sprintf('%s', _target, _value, _text)); + return actions.join(''); + } else { + _text = _value; + return _text; + } + }, + // 下拉按钮切换 + dropdownToggle: function (value) { + var actions = []; + actions.push('
'); + actions.push(''); + actions.push('
    '); + actions.push(value.replace(//g,"")); + actions.push('
'); + actions.push('
'); + return actions.join(''); + }, + // 图片预览 + imageView: function (value, height, width, target) { + if ($.common.isEmpty(width)) { + width = 'auto'; } if ($.common.isEmpty(height)) { - height = 'auto'; + height = 'auto'; } // blank or self var _target = $.common.isEmpty(target) ? 'self' : target; @@ -351,102 +351,106 @@ var table = { } else { return $.common.nullToStr(value); } - }, + + }, + // 搜索-默认第一个form search: function(formId, tableId) { - table.set(tableId); - table.options.formId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; - var params = $.common.isEmpty(tableId) ? $("#" + table.options.id).bootstrapTable('getOptions') : $("#" + tableId).bootstrapTable('getOptions'); - if($.common.isNotEmpty(tableId)){ - $("#" + tableId).bootstrapTable('refresh', params); - } else{ - $("#" + table.options.id).bootstrapTable('refresh', params); - } - }, - // 导出数据 - exportExcel: function(formId) { - table.set(); - $.modal.confirm("确定导出所有" + table.options.modalName + "吗？", function() { - var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; - var params = $("#" + table.options.id).bootstrapTable('getOptions'); - var dataParam = $("#" + currentId).serializeArray(); - dataParam.push({ "name": "orderByColumn", "value": params.sortName }); - dataParam.push({ "name": "isAsc", "value": params.sortOrder }); - $.modal.loading("正在导出数据，请稍后..."); - $.post(table.options.exportUrl, dataParam, 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(); - }); - }); - }, - // 下载模板 - importTemplate: function() { - table.set(); - $.get(table.options.importTemplateUrl, 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) { + table.set(tableId); + table.options.formId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + var params = $.common.isEmpty(tableId) ? $("#" + table.options.id).bootstrapTable('getOptions') : $("#" + tableId).bootstrapTable('getOptions'); + if($.common.isNotEmpty(tableId)){ + $("#" + tableId).bootstrapTable('refresh', params); + } else{ + $("#" + table.options.id).bootstrapTable('refresh', params); + } + }, + // 导出数据 + exportExcel: function(formId) { + table.set(); + $.modal.confirm("确定导出所有" + table.options.modalName + "吗？", function() { + var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; + var params = $("#" + table.options.id).bootstrapTable('getOptions'); + var dataParam = $("#" + currentId).serializeArray(); + dataParam.push({ "name": "orderByColumn", "value": params.sortName }); + dataParam.push({ "name": "isAsc", "value": params.sortOrder }); + $.modal.loading("正在导出数据，请稍后..."); + $.post(table.options.exportUrl, dataParam, 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(); + }); + }); + }, + // 下载模板 + importTemplate: function() { + table.set(); + $.get(table.options.importTemplateUrl, 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.alertError(result.msg); + } + }); }, // 导入数据 - importExcel: function(formId) { + importExcel: function(formId, width, height) { table.set(); var currentId = $.common.isEmpty(formId) ? 'importTpl' : formId; + var _width = $.common.isEmpty(width) ? "400" : width; + var _height = $.common.isEmpty(height) ? "230" : height; layer.open({ - type: 1, - area: ['400px', '230px'], - fix: false, - //不固定 - maxmin: true, - shade: 0.3, - title: '导入' + table.options.modalName + '数据', - content: $('#' + currentId).html(), - btn: [' 导入', ' 取消'], - // 弹层外区域关闭 - shadeClose: true, - btn1: function(index, layero){ - var file = layero.find('#file').val(); - if (file == '' || (!$.common.endWith(file, '.xls') && !$.common.endWith(file, '.xlsx'))){ - $.modal.msgWarning("请选择后缀为 “xls”或“xlsx”的文件。"); - return false; - } - var index = layer.load(2, {shade: false}); - $.modal.disable(); - var formData = new FormData(layero.find('form')[0]); - $.ajax({ - url: table.options.importUrl, - data: formData, - cache: false, - contentType: false, - processData: false, - type: 'POST', - success: function (result) { - if (result.code == web_status.SUCCESS) { - $.modal.closeAll(); - $.modal.alertSuccess(result.msg); - $.table.refresh(); - } 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); - } - } - }); - } + type: 1, + area: [_width + 'px', _height + 'px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: '导入' + table.options.modalName + '数据', + content: $('#' + currentId).html(), + btn: [' 导入', ' 取消'], + // 弹层外区域关闭 + shadeClose: true, + btn1: function(index, layero){ + var file = layero.find('#file').val(); + if (file == '' || (!$.common.endWith(file, '.xls') && !$.common.endWith(file, '.xlsx'))){ + $.modal.msgWarning("请选择后缀为 “xls”或“xlsx”的文件。"); + return false; + } + var index = layer.load(2, {shade: false}); + $.modal.disable(); + var formData = new FormData(layero.find('form')[0]); + $.ajax({ + url: table.options.importUrl, + data: formData, + cache: false, + contentType: false, + processData: false, + type: 'POST', + success: function (result) { + if (result.code == web_status.SUCCESS) { + $.modal.closeAll(); + $.modal.alertSuccess(result.msg); + $.table.refresh(); + } 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); + } + } + }); + } }); }, // 刷新表格 @@ -459,15 +463,15 @@ var table = { // 查询表格指定列值 selectColumns: function(column) { var rows = $.map($("#" + table.options.id).bootstrapTable('getSelections'), function (row) { - return $.common.getItemField(row, column); - }); + return $.common.getItemField(row, column); + }); if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { - var selectedRows = table.rememberSelecteds[table.options.id]; - if($.common.isNotEmpty(selectedRows)) { - rows = $.map(table.rememberSelecteds[table.options.id], function (row) { - return $.common.getItemField(row, column); - }); - } + var selectedRows = table.rememberSelecteds[table.options.id]; + if($.common.isNotEmpty(selectedRows)) { + rows = $.map(table.rememberSelecteds[table.options.id], function (row) { + return $.common.getItemField(row, column); + }); + } } return $.common.uniqueFn(rows); }, @@ -487,15 +491,15 @@ var table = { // 查询表格首列值 selectFirstColumns: function() { var rows = $.map($("#" + table.options.id).bootstrapTable('getSelections'), function (row) { - return $.common.getItemField(row, table.options.columns[1].field); - }); + return $.common.getItemField(row, table.options.columns[1].field); + }); if ($.common.isNotEmpty(table.options.rememberSelected) && table.options.rememberSelected) { - var selectedRows = table.rememberSelecteds[table.options.id]; - if($.common.isNotEmpty(selectedRows)) { - rows = $.map(selectedRows, function (row) { + var selectedRows = table.rememberSelecteds[table.options.id]; + if($.common.isNotEmpty(selectedRows)) { + rows = $.map(selectedRows, function (row) { return $.common.getItemField(row, table.options.columns[1].field); }); - } + } } return $.common.uniqueFn(rows); }, @@ -513,16 +517,19 @@ var table = { }, // 回显数据字典（字符串数组） selectDictLabels: function(datas, value, separator) { + if ($.common.isEmpty(value)) { + return ''; + } var currentSeparator = $.common.isEmpty(separator) ? "," : separator; var actions = []; $.each(value.split(currentSeparator), function(i, val) { - $.each(datas, function(index, dict) { - if (dict.dictValue == ('' + val)) { - var listClass = $.common.equals("default", dict.listClass) || $.common.isEmpty(dict.listClass) ? "" : "badge badge-" + dict.listClass; - actions.push($.common.sprintf("%s ", listClass, dict.dictLabel)); + $.each(datas, function(index, dict) { + if (dict.dictValue == ('' + val)) { + var listClass = $.common.equals("default", dict.listClass) || $.common.isEmpty(dict.listClass) ? "" : "badge badge-" + dict.listClass; + actions.push($.common.sprintf("%s ", listClass, dict.dictLabel)); return false; } - }); + }); }); return actions.join(''); }, @@ -552,46 +559,46 @@ var table = { // 初始化表格 init: function(options) { var defaults = { - id: "bootstrap-tree-table", + id: "bootstrap-tree-table", type: 1, // 0 代表bootstrapTable 1代表bootstrapTreeTable - height: 0, - rootIdValue: null, - ajaxParams: {}, - toolbar: "toolbar", - striped: false, - expandColumn: 1, - showSearch: true, - showRefresh: true, - showColumns: true, - expandAll: true, - expandFirst: true - }; + height: 0, + rootIdValue: null, + ajaxParams: {}, + toolbar: "toolbar", + striped: false, + expandColumn: 1, + showSearch: true, + showRefresh: true, + showColumns: true, + expandAll: true, + expandFirst: true + }; var options = $.extend(defaults, options); table.options = options; table.config[options.id] = options; $.table.initEvent(); $.bttTable = $('#' + options.id).bootstrapTreeTable({ - code: options.code, // 用于设置父子关系 - parentCode: options.parentCode, // 用于设置父子关系 - type: 'post', // 请求方式（*） - url: options.url, // 请求后台的URL（*） - data: options.data, // 无url时用于渲染的数据 - ajaxParams: options.ajaxParams, // 请求数据的ajax的data属性 - rootIdValue: options.rootIdValue, // 设置指定根节点id值 - height: options.height, // 表格树的高度 - expandColumn: options.expandColumn, // 在哪一列上面显示展开按钮 - striped: options.striped, // 是否显示行间隔色 - bordered: false, // 是否显示边框 - toolbar: '#' + options.toolbar, // 指定工作栏 - showSearch: options.showSearch, // 是否显示检索信息 - showRefresh: options.showRefresh, // 是否显示刷新按钮 - showColumns: options.showColumns, // 是否显示隐藏某列下拉框 - expandAll: options.expandAll, // 是否全部展开 - expandFirst: options.expandFirst, // 是否默认第一级展开--expandAll为false时生效 - columns: options.columns, // 显示列信息（*） - responseHandler: $.treeTable.responseHandler, // 在加载服务器发送来的数据之前处理函数 - onLoadSuccess: $.table.onLoadSuccess // 当所有数据被加载时触发处理函数 - }); + code: options.code, // 用于设置父子关系 + parentCode: options.parentCode, // 用于设置父子关系 + type: 'post', // 请求方式（*） + url: options.url, // 请求后台的URL（*） + data: options.data, // 无url时用于渲染的数据 + ajaxParams: options.ajaxParams, // 请求数据的ajax的data属性 + rootIdValue: options.rootIdValue, // 设置指定根节点id值 + height: options.height, // 表格树的高度 + expandColumn: options.expandColumn, // 在哪一列上面显示展开按钮 + striped: options.striped, // 是否显示行间隔色 + bordered: false, // 是否显示边框 + toolbar: '#' + options.toolbar, // 指定工作栏 + showSearch: options.showSearch, // 是否显示检索信息 + showRefresh: options.showRefresh, // 是否显示刷新按钮 + showColumns: options.showColumns, // 是否显示隐藏某列下拉框 + expandAll: options.expandAll, // 是否全部展开 + expandFirst: options.expandFirst, // 是否默认第一级展开--expandAll为false时生效 + columns: options.columns, // 显示列信息（*） + responseHandler: $.treeTable.responseHandler, // 在加载服务器发送来的数据之前处理函数 + onLoadSuccess: $.table.onLoadSuccess // 当所有数据被加载时触发处理函数 + }); }, // 条件查询 search: function(formId) { @@ -605,19 +612,19 @@ var table = { }, // 查询表格树指定列值 selectColumns: function(column) { - var rows = $.map($.bttTable.bootstrapTreeTable('getSelections'), function (row) { - return $.common.getItemField(row, column); - }); - return $.common.uniqueFn(rows); + var rows = $.map($.bttTable.bootstrapTreeTable('getSelections'), function (row) { + return $.common.getItemField(row, column); + }); + return $.common.uniqueFn(rows); }, // 请求获取数据后处理回调函数，校验异常状态提醒 responseHandler: function(res) { if (typeof table.options.responseHandler == "function") { - table.options.responseHandler(res); + table.options.responseHandler(res); } if (res.code != undefined && res.code != 0) { - $.modal.alertWarning(res.msg); - return []; + $.modal.alertWarning(res.msg); + return []; } else { return res; } @@ -625,67 +632,67 @@ var table = { }, // 表单封装处理 form: { - // 表单重置 - reset: function(formId, tableId) { - table.set(tableId); + // 表单重置 + reset: function(formId, tableId) { + table.set(tableId); var currentId = $.common.isEmpty(formId) ? $('form').attr('id') : formId; $("#" + currentId)[0].reset(); if (table.options.type == table_type.bootstrapTable) { - if($.common.isEmpty(tableId)){ - $("#" + table.options.id).bootstrapTable('refresh'); - } else{ - $("#" + tableId).bootstrapTable('refresh'); - } + if($.common.isEmpty(tableId)){ + $("#" + table.options.id).bootstrapTable('refresh'); + } else{ + $("#" + tableId).bootstrapTable('refresh'); + } } else if (table.options.type == table_type.bootstrapTreeTable) { - if($.common.isEmpty(tableId)){ - $("#" + table.options.id).bootstrapTreeTable('refresh', []); - } else{ - $("#" + tableId).bootstrapTreeTable('refresh', []); - } + if($.common.isEmpty(tableId)){ + $("#" + table.options.id).bootstrapTreeTable('refresh', []); + } else{ + $("#" + tableId).bootstrapTreeTable('refresh', []); + } } }, // 获取选中复选框项 selectCheckeds: function(name) { var checkeds = ""; - $('input:checkbox[name="' + name + '"]:checked').each(function(i) { - if (0 == i) { - checkeds = $(this).val(); - } else { - checkeds += ("," + $(this).val()); - } - }); - return checkeds; + $('input:checkbox[name="' + name + '"]:checked').each(function(i) { + if (0 == i) { + checkeds = $(this).val(); + } else { + checkeds += ("," + $(this).val()); + } + }); + return checkeds; }, // 获取选中下拉框项 selectSelects: function(name) { var selects = ""; - $('#' + name + ' option:selected').each(function (i) { - if (0 == i) { - selects = $(this).val(); - } else { - selects += ("," + $(this).val()); - } - }); - return selects; + $('#' + name + ' option:selected').each(function (i) { + if (0 == i) { + selects = $(this).val(); + } else { + selects += ("," + $(this).val()); + } + }); + return selects; } }, // 弹出层封装处理 modal: { - // 显示图标 - icon: function(type) { - var icon = ""; - if (type == modal_status.WARNING) { - icon = 0; - } else if (type == modal_status.SUCCESS) { - icon = 1; - } else if (type == modal_status.FAIL) { - icon = 2; - } else { - icon = 3; - } - return icon; + // 显示图标 + icon: function(type) { + var icon = ""; + if (type == modal_status.WARNING) { + icon = 0; + } else if (type == modal_status.SUCCESS) { + icon = 1; + } else if (type == modal_status.FAIL) { + icon = 2; + } else { + icon = 3; + } + return icon; }, - // 消息提示 + // 消息提示 msg: function(content, type) { if (type != undefined) { layer.msg(content, { icon: $.modal.icon(type), time: 1000, shift: 5 }); @@ -705,14 +712,14 @@ var table = { msgWarning: function(content) { $.modal.msg(content, modal_status.WARNING); }, - // 弹出提示 + // 弹出提示 alert: function(content, type) { - layer.alert(content, { - icon: $.modal.icon(type), - title: "系统提示", - btn: ['确认'], - btnclass: ['btn btn-primary'], - }); + layer.alert(content, { + icon: $.modal.icon(type), + title: "系统提示", + btn: ['确认'], + btnclass: ['btn btn-primary'], + }); }, // 消息提示并刷新父窗体 msgReload: function(msg, type) { @@ -739,12 +746,12 @@ var table = { }, // 关闭窗体 close: function (index) { - if($.common.isEmpty(index)){ - var index = parent.layer.getFrameIndex(window.name); + if($.common.isEmpty(index)){ + var index = parent.layer.getFrameIndex(window.name); parent.layer.close(index); - } else { - layer.close(index); - } + } else { + layer.close(index); + } }, // 关闭全部窗体 closeAll: function () { @@ -752,14 +759,14 @@ var table = { }, // 确认窗体 confirm: function (content, callBack) { - layer.confirm(content, { - icon: 3, - title: "系统提示", - btn: ['确认', '取消'] - }, function (index) { - layer.close(index); - callBack(true); - }); + layer.confirm(content, { + icon: 3, + title: "系统提示", + btn: ['确认', '取消'] + }, function (index) { + layer.close(index); + callBack(true); + }); }, // 弹出层指定宽度 open: function (title, url, width, height, callback) { @@ -772,13 +779,13 @@ var table = { title = false; } if ($.common.isEmpty(url)) { - url = "/404.html"; + url = "/404.html"; } if ($.common.isEmpty(width)) { - width = 800; + width = 800; } if ($.common.isEmpty(height)) { - height = ($(window).height() - 50); + height = ($(window).height() - 50); } if ($.common.isEmpty(callback)) { callback = function(index, layero) { @@ -787,18 +794,18 @@ var table = { } } layer.open({ - type: 2, - area: [width + 'px', height + 'px'], - fix: false, - //不固定 - maxmin: true, - shade: 0.3, - title: title, - content: url, - btn: ['确定', '关闭'], + type: 2, + area: [width + 'px', height + 'px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: title, + content: url, + btn: ['确定', '关闭'], // 弹层外区域关闭 - shadeClose: true, - yes: callback, + shadeClose: true, + yes: callback, cancel: function(index) { return true; } @@ -812,38 +819,38 @@ var table = { var _height = $.common.isEmpty(options.height) ? ($(window).height() - 50) : options.height; var _btn = [' 确认', ' 关闭']; if ($.common.isEmpty(options.yes)) { - options.yes = function(index, layero) { - options.callBack(index, layero); + options.yes = function(index, layero) { + options.callBack(index, layero); } } var btnCallback = {}; - if(options.btn instanceof Array){ - for (var i = 1, len = options.btn.length; i < len; i++) { - var btn = options["btn" + (i + 1)]; - if (btn) { - btnCallback["btn" + (i + 1)] = btn; - } - } - } - var index = layer.open($.extend({ - type: 2, - maxmin: $.common.isEmpty(options.maxmin) ? true : options.maxmin, - shade: 0.3, - title: _title, - fix: false, - area: [_width + 'px', _height + 'px'], - content: _url, - shadeClose: $.common.isEmpty(options.shadeClose) ? true : options.shadeClose, - skin: options.skin, - btn: $.common.isEmpty(options.btn) ? _btn : options.btn, - yes: options.yes, - cancel: function () { - return true; - } - }, btnCallback)); - if ($.common.isNotEmpty(options.full) && options.full === true) { - layer.full(index); - } + if(options.btn instanceof Array){ + for (var i = 1, len = options.btn.length; i < len; i++) { + var btn = options["btn" + (i + 1)]; + if (btn) { + btnCallback["btn" + (i + 1)] = btn; + } + } + } + var index = layer.open($.extend({ + type: 2, + maxmin: $.common.isEmpty(options.maxmin) ? true : options.maxmin, + shade: 0.3, + title: _title, + fix: false, + area: [_width + 'px', _height + 'px'], + content: _url, + shadeClose: $.common.isEmpty(options.shadeClose) ? true : options.shadeClose, + skin: options.skin, + btn: $.common.isEmpty(options.btn) ? _btn : options.btn, + yes: options.yes, + cancel: function () { + return true; + } + }, btnCallback)); + if ($.common.isNotEmpty(options.full) && options.full === true) { + layer.full(index); + } }, // 弹出层全屏 openFull: function (title, url, width, height) { @@ -865,24 +872,24 @@ var table = { height = ($(window).height() - 50); } var index = layer.open({ - type: 2, - area: [width + 'px', height + 'px'], - fix: false, - //不固定 - maxmin: true, - shade: 0.3, - title: title, - content: url, - btn: ['确定', '关闭'], - // 弹层外区域关闭 - shadeClose: true, - yes: function(index, layero) { - var iframeWin = layero.find('iframe')[0]; - iframeWin.contentWindow.submitHandler(index, layero); - }, - cancel: function(index) { - return true; - } + type: 2, + area: [width + 'px', height + 'px'], + fix: false, + //不固定 + maxmin: true, + shade: 0.3, + title: title, + content: url, + btn: ['确定', '关闭'], + // 弹层外区域关闭 + shadeClose: true, + yes: function(index, layero) { + var iframeWin = layero.find('iframe')[0]; + iframeWin.contentWindow.submitHandler(index, layero); + }, + cancel: function(index) { + return true; + } }); layer.full(index); }, @@ -903,7 +910,7 @@ var table = { // 禁用按钮 disable: function() { var doc = window.top == window.parent ? window.document : window.parent.document; - $("a[class*=layui-layer-btn]", doc).addClass("layer-disabled"); + $("a[class*=layui-layer-btn]", doc).addClass("layer-disabled"); }, // 启用按钮 enable: function() { @@ -917,7 +924,7 @@ var table = { // 关闭遮罩层 closeLoading: function () { setTimeout(function(){ - $.unblockUI(); + $.unblockUI(); }, 50); }, // 重新加载 @@ -927,24 +934,24 @@ var table = { }, // 操作封装处理 operate: { - // 提交数据 - submit: function(url, type, dataType, data, callback) { - var config = { - url: url, - type: type, - dataType: dataType, - data: data, - beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); - }, - success: function(result) { - if (typeof callback == "function") { - callback(result); - } - $.operate.ajaxSuccess(result); - } - }; - $.ajax(config) + // 提交数据 + submit: function(url, type, dataType, data, callback) { + var config = { + url: url, + type: type, + dataType: dataType, + data: data, + beforeSend: function () { + $.modal.loading("正在处理中，请稍后..."); + }, + success: function(result) { + if (typeof callback == "function") { + callback(result); + } + $.operate.ajaxSuccess(result); + } + }; + $.ajax(config) }, // post请求传输 post: function(url, data, callback) { @@ -966,16 +973,16 @@ var table = { _height = 'auto'; } var options = { - title: table.options.modalName + "详细", - width: _width, - height: _height, - url: _url, - skin: 'layui-layer-gray', - btn: ['关闭'], - yes: function (index, layero) { - layer.close(index); + title: table.options.modalName + "详细", + width: _width, + height: _height, + url: _url, + skin: 'layui-layer-gray', + btn: ['关闭'], + yes: function (index, layero) { + layer.close(index); } - }; + }; $.modal.openOptions(options); }, // 详细访问地址 @@ -986,9 +993,9 @@ var table = { } else { var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); if (id.length == 0) { - $.modal.alertWarning("请至少选择一条记录"); - return; - } + $.modal.alertWarning("请至少选择一条记录"); + return; + } url = table.options.detailUrl.replace("{id}", id); } return url; @@ -1001,32 +1008,31 @@ var table = { if(table.options.type == table_type.bootstrapTreeTable) { $.operate.get(url); } else { - var data = { "ids": id }; - $.operate.submit(url, "post", "json", data); - } + var data = { "ids": id }; + $.operate.submit(url, "post", "json", data); + } }); - }, // 批量删除信息 removeAll: function() { table.set(); - var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); - if (rows.length == 0) { - $.modal.alertWarning("请至少选择一条记录"); - return; - } - $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() { - var url = table.options.removeUrl; - var data = { "ids": rows.join() }; - $.operate.submit(url, "post", "json", data); - }); + var rows = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + if (rows.length == 0) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + $.modal.confirm("确认要删除选中的" + rows.length + "条数据吗?", function() { + var url = table.options.removeUrl; + var data = { "ids": rows.join() }; + $.operate.submit(url, "post", "json", data); + }); }, // 清空信息 clean: function() { table.set(); $.modal.confirm("确定清空所有" + table.options.modalName + "吗？", function() { - var url = table.options.cleanUrl; - $.operate.submit(url, "post", "json", ""); + var url = table.options.cleanUrl; + $.operate.submit(url, "post", "json", ""); }); }, // 添加信息 @@ -1054,13 +1060,13 @@ var table = { edit: function(id) { table.set(); if($.common.isEmpty(id) && table.options.type == table_type.bootstrapTreeTable) { - var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; - if ($.common.isEmpty(row)) { - $.modal.alertWarning("请至少选择一条记录"); - return; - } - var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]); - $.modal.open("修改" + table.options.modalName, url); + var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; + if ($.common.isEmpty(row)) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + var url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]); + $.modal.open("修改" + table.options.modalName, url); } else { $.modal.open("修改" + table.options.modalName, $.operate.editUrl(id)); } @@ -1077,17 +1083,17 @@ var table = { if ($.common.isNotEmpty(id)) { url = table.options.updateUrl.replace("{id}", id); } else { - if(table.options.type == table_type.bootstrapTreeTable) { - var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; - if ($.common.isEmpty(row)) { - $.modal.alertWarning("请至少选择一条记录"); - return; - } - url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]); - } else { - var row = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); - url = table.options.updateUrl.replace("{id}", row); - } + if(table.options.type == table_type.bootstrapTreeTable) { + var row = $("#" + table.options.id).bootstrapTreeTable('getSelections')[0]; + if ($.common.isEmpty(row)) { + $.modal.alertWarning("请至少选择一条记录"); + return; + } + url = table.options.updateUrl.replace("{id}", row[table.options.uniqueId]); + } else { + var row = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); + url = table.options.updateUrl.replace("{id}", row); + } } $.modal.openFull("修改" + table.options.modalName, url); }, @@ -1099,9 +1105,9 @@ var table = { } else { var id = $.common.isEmpty(table.options.uniqueId) ? $.table.selectFirstColumns() : $.table.selectColumns(table.options.uniqueId); if (id.length == 0) { - $.modal.alertWarning("请至少选择一条记录"); - return; - } + $.modal.alertWarning("请至少选择一条记录"); + return; + } url = table.options.updateUrl.replace("{id}", id); } return url; @@ -1114,14 +1120,14 @@ var table = { dataType: "json", data: data, beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); - $.modal.disable(); + $.modal.loading("正在处理中，请稍后..."); + $.modal.disable(); }, success: function(result) { - if (typeof callback == "function") { - callback(result); - } - $.operate.successCallback(result); + if (typeof callback == "function") { + callback(result); + } + $.operate.successCallback(result); } }; $.ajax(config) @@ -1134,20 +1140,20 @@ var table = { dataType: "json", data: data, beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); + $.modal.loading("正在处理中，请稍后..."); }, success: function(result) { - if (typeof callback == "function") { - callback(result); - } - if (result.code == web_status.SUCCESS) { - $.modal.alertSuccess(result.msg) - } else if (result.code == web_status.WARNING) { + if (typeof callback == "function") { + callback(result); + } + if (result.code == web_status.SUCCESS) { + $.modal.alertSuccess(result.msg) + } else if (result.code == web_status.WARNING) { $.modal.alertWarning(result.msg) - } else { + } else { $.modal.alertError(result.msg); } - $.modal.closeLoading(); + $.modal.closeLoading(); } }; $.ajax(config) @@ -1155,54 +1161,54 @@ var table = { // 保存选项卡信息 saveTab: function(url, data, callback) { var config = { - url: url, - type: "post", - dataType: "json", - data: data, - beforeSend: function () { - $.modal.loading("正在处理中，请稍后..."); - }, - success: function(result) { - if (typeof callback == "function") { - callback(result); - } - $.operate.successTabCallback(result); - } - }; - $.ajax(config) + url: url, + type: "post", + dataType: "json", + data: data, + beforeSend: function () { + $.modal.loading("正在处理中，请稍后..."); + }, + success: function(result) { + if (typeof callback == "function") { + callback(result); + } + $.operate.successTabCallback(result); + } + }; + $.ajax(config) }, // 保存结果弹出msg刷新table表格 ajaxSuccess: function (result) { if (result.code == web_status.SUCCESS && table.options.type == table_type.bootstrapTable) { - $.modal.msgSuccess(result.msg); - $.table.refresh(); + $.modal.msgSuccess(result.msg); + $.table.refresh(); } else if (result.code == web_status.SUCCESS && table.options.type == table_type.bootstrapTreeTable) { - $.modal.msgSuccess(result.msg); - $.treeTable.refresh(); + $.modal.msgSuccess(result.msg); + $.treeTable.refresh(); } else if (result.code == web_status.SUCCESS && $.common.isEmpty(table.options.type)) { - $.modal.msgSuccess(result.msg) + $.modal.msgSuccess(result.msg) } else if (result.code == web_status.WARNING) { - $.modal.alertWarning(result.msg) + $.modal.alertWarning(result.msg) } else { - $.modal.alertError(result.msg); + $.modal.alertError(result.msg); } $.modal.closeLoading(); }, // 成功结果提示msg（父窗体全局更新） saveSuccess: function (result) { if (result.code == web_status.SUCCESS) { - $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); + $.modal.msgReload("保存成功,正在刷新数据请稍后……", modal_status.SUCCESS); } else if (result.code == web_status.WARNING) { - $.modal.alertWarning(result.msg) + $.modal.alertWarning(result.msg) } else { - $.modal.alertError(result.msg); + $.modal.alertError(result.msg); } $.modal.closeLoading(); }, // 成功回调执行事件（父窗体静默更新） successCallback: function(result) { if (result.code == web_status.SUCCESS) { - var parent = window.parent; + var parent = window.parent; if (parent.table.options.type == table_type.bootstrapTable) { $.modal.close(); parent.$.modal.msgSuccess(result.msg); @@ -1225,17 +1231,17 @@ var table = { // 选项卡成功回调执行事件（父窗体静默更新） successTabCallback: function(result) { if (result.code == web_status.SUCCESS) { - var topWindow = $(window.parent.document); + var topWindow = $(window.parent.document); var currentId = $('.page-tabs-content', topWindow).find('.active').attr('data-panel'); var $contentWindow = $('.RuoYi_iframe[data-id="' + currentId + '"]', topWindow)[0].contentWindow; $.modal.close(); $contentWindow.$.modal.msgSuccess(result.msg); $contentWindow.$(".layui-layer-padding").removeAttr("style"); if ($contentWindow.table.options.type == table_type.bootstrapTable) { - $contentWindow.$.table.refresh(); - } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) { - $contentWindow.$.treeTable.refresh(); - } + $contentWindow.$.table.refresh(); + } else if ($contentWindow.table.options.type == table_type.bootstrapTreeTable) { + $contentWindow.$.treeTable.refresh(); + } $.modal.closeTab(); } else if (result.code == web_status.WARNING) { $.modal.alertWarning(result.msg) @@ -1274,9 +1280,9 @@ var table = { }, // 校验封装处理 validate: { - // 判断返回标识是否唯一 false 不存在 true 存在 - unique: function (value) { - if (value == "0") { + // 判断返回标识是否唯一 false 不存在 true 存在 + unique: function (value) { + if (value == "0") { return true; } return false; @@ -1294,60 +1300,64 @@ var table = { }, // 树插件封装处理 tree: { - _option: {}, - _lastValue: {}, - // 初始化树结构 - init: function(options) { - var defaults = { - id: "tree", // 属性ID - expandLevel: 0, // 展开等级节点 - view: { - selectedMulti: false, // 设置是否允许同时选中多个节点 - nameIsHTML: true // 设置 name 属性是否支持 HTML 脚本 - }, - check: { - enable: false, // 置 zTree 的节点上是否显示 checkbox / radio - nocheckInherit: true, // 设置子节点是否自动继承 - chkboxType: { "Y": "ps", "N": "ps" } // 父子节点的关联关系 - }, - data: { - key: { - title: "title" // 节点数据保存节点提示信息的属性名称 - }, - simpleData: { - enable: true // true / false 分别表示 使用 / 不使用 简单数据模式 - } - }, - }; - var options = $.extend(defaults, options); - $.tree._option = options; - // 树结构初始化加载 - var setting = { - callback: { - onClick: options.onClick, // 用于捕获节点被点击的事件回调函数 - onCheck: options.onCheck, // 用于捕获 checkbox / radio 被勾选 或 取消勾选的事件回调函数 - onDblClick: options.onDblClick // 用于捕获鼠标双击之后的事件回调函数 - }, - check: options.check, - view: options.view, - data: options.data - }; - $.get(options.url, function(data) { - var treeId = $("#treeId").val(); - tree = $.fn.zTree.init($("#" + options.id), setting, data); - $._tree = tree; - for (var i = 0; i < options.expandLevel; i++) { - var nodes = tree.getNodesByParam("level", i); - for (var j = 0; j < nodes.length; j++) { - tree.expandNode(nodes[j], true, false, false); - } - } - var node = tree.getNodesByParam("id", treeId, null)[0]; - $.tree.selectByIdName(treeId, node); - }); - }, - // 搜索节点 - searchNode: function() { + _option: {}, + _lastValue: {}, + // 初始化树结构 + init: function(options) { + var defaults = { + id: "tree", // 属性ID + expandLevel: 0, // 展开等级节点 + view: { + selectedMulti: false, // 设置是否允许同时选中多个节点 + nameIsHTML: true // 设置 name 属性是否支持 HTML 脚本 + }, + check: { + enable: false, // 置 zTree 的节点上是否显示 checkbox / radio + nocheckInherit: true, // 设置子节点是否自动继承 + chkboxType: { "Y": "ps", "N": "ps" } // 父子节点的关联关系 + }, + data: { + key: { + title: "title" // 节点数据保存节点提示信息的属性名称 + }, + simpleData: { + enable: true // true / false 分别表示 使用 / 不使用 简单数据模式 + } + }, + }; + var options = $.extend(defaults, options); + $.tree._option = options; + // 树结构初始化加载 + var setting = { + callback: { + onClick: options.onClick, // 用于捕获节点被点击的事件回调函数 + onCheck: options.onCheck, // 用于捕获 checkbox / radio 被勾选 或 取消勾选的事件回调函数 + onDblClick: options.onDblClick // 用于捕获鼠标双击之后的事件回调函数 + }, + check: options.check, + view: options.view, + data: options.data + }; + $.get(options.url, function(data) { + var treeId = $("#treeId").val(); + tree = $.fn.zTree.init($("#" + options.id), setting, data); + $._tree = tree; + for (var i = 0; i < options.expandLevel; i++) { + var nodes = tree.getNodesByParam("level", i); + for (var j = 0; j < nodes.length; j++) { + tree.expandNode(nodes[j], true, false, false); + } + } + var node = tree.getNodesByParam("id", treeId, null)[0]; + $.tree.selectByIdName(treeId, node); + // 回调tree方法 + if(typeof(options.callBack) === "function"){ + options.callBack(tree); + } + }); + }, + // 搜索节点 + searchNode: function() { // 取得输入的关键字的值 var value = $.common.trim($("#keyword").val()); if ($.tree._lastValue == value) { @@ -1364,119 +1374,119 @@ var table = { $.tree.hideAllNode(nodes); // 根据搜索值模糊匹配 $.tree.updateNodes($._tree.getNodesByParamFuzzy("name", value)); - }, - // 根据Id和Name选中指定节点 - selectByIdName: function(treeId, node) { + }, + // 根据Id和Name选中指定节点 + selectByIdName: function(treeId, node) { if ($.common.isNotEmpty(treeId) && treeId == node.id) { $._tree.selectNode(node, true); } + }, + // 显示所有节点 + showAllNode: function(nodes) { + nodes = $._tree.transformToArray(nodes); + for (var i = nodes.length - 1; i >= 0; i--) { + if (nodes[i].getParentNode() != null) { + $._tree.expandNode(nodes[i], true, false, false, false); + } else { + $._tree.expandNode(nodes[i], true, true, false, false); + } + $._tree.showNode(nodes[i]); + $.tree.showAllNode(nodes[i].children); + } }, - // 显示所有节点 - showAllNode: function(nodes) { - nodes = $._tree.transformToArray(nodes); - for (var i = nodes.length - 1; i >= 0; i--) { - if (nodes[i].getParentNode() != null) { - $._tree.expandNode(nodes[i], true, false, false, false); - } else { - $._tree.expandNode(nodes[i], true, true, false, false); - } - $._tree.showNode(nodes[i]); - $.tree.showAllNode(nodes[i].children); - } + // 隐藏所有节点 + hideAllNode: function(nodes) { + var tree = $.fn.zTree.getZTreeObj("tree"); + var nodes = $._tree.transformToArray(nodes); + for (var i = nodes.length - 1; i >= 0; i--) { + $._tree.hideNode(nodes[i]); + } + }, + // 显示所有父节点 + showParent: function(treeNode) { + var parentNode; + while ((parentNode = treeNode.getParentNode()) != null) { + $._tree.showNode(parentNode); + $._tree.expandNode(parentNode, true, false, false); + treeNode = parentNode; + } + }, + // 显示所有孩子节点 + showChildren: function(treeNode) { + if (treeNode.isParent) { + for (var idx in treeNode.children) { + var node = treeNode.children[idx]; + $._tree.showNode(node); + $.tree.showChildren(node); + } + } + }, + // 更新节点状态 + updateNodes: function(nodeList) { + $._tree.showNodes(nodeList); + for (var i = 0, l = nodeList.length; i < l; i++) { + var treeNode = nodeList[i]; + $.tree.showChildren(treeNode); + $.tree.showParent(treeNode) + } + }, + // 获取当前被勾选集合 + getCheckedNodes: function(column) { + var _column = $.common.isEmpty(column) ? "id" : column; + var nodes = $._tree.getCheckedNodes(true); + return $.map(nodes, function (row) { + return row[_column]; + }).join(); }, - // 隐藏所有节点 - hideAllNode: function(nodes) { - var tree = $.fn.zTree.getZTreeObj("tree"); - var nodes = $._tree.transformToArray(nodes); - for (var i = nodes.length - 1; i >= 0; i--) { - $._tree.hideNode(nodes[i]); - } - }, - // 显示所有父节点 - showParent: function(treeNode) { - var parentNode; - while ((parentNode = treeNode.getParentNode()) != null) { - $._tree.showNode(parentNode); - $._tree.expandNode(parentNode, true, false, false); - treeNode = parentNode; - } - }, - // 显示所有孩子节点 - showChildren: function(treeNode) { - if (treeNode.isParent) { - for (var idx in treeNode.children) { - var node = treeNode.children[idx]; - $._tree.showNode(node); - $.tree.showChildren(node); - } - } - }, - // 更新节点状态 - updateNodes: function(nodeList) { - $._tree.showNodes(nodeList); - for (var i = 0, l = nodeList.length; i < l; i++) { - var treeNode = nodeList[i]; - $.tree.showChildren(treeNode); - $.tree.showParent(treeNode) - } - }, - // 获取当前被勾选集合 - getCheckedNodes: function(column) { - var _column = $.common.isEmpty(column) ? "id" : column; - var nodes = $._tree.getCheckedNodes(true); - return $.map(nodes, function (row) { - return row[_column]; - }).join(); - }, - // 不允许根父节点选择 - notAllowParents: function(_tree) { - var nodes = _tree.getSelectedNodes(); - if(nodes.length == 0){ + // 不允许根父节点选择 + notAllowParents: function(_tree) { + var nodes = _tree.getSelectedNodes(); + if(nodes.length == 0){ $.modal.msgError("请选择节点后提交"); return false; - } - for (var i = 0; i < nodes.length; i++) { - if (nodes[i].level == 0) { - $.modal.msgError("不能选择根节点（" + nodes[i].name + "）"); - return false; - } - if (nodes[i].isParent) { - $.modal.msgError("不能选择父节点（" + nodes[i].name + "）"); - return false; - } - } - return true; - }, - // 不允许最后层级节点选择 - notAllowLastLevel: function(_tree) { - var nodes = _tree.getSelectedNodes(); - for (var i = 0; i < nodes.length; i++) { + } + for (var i = 0; i < nodes.length; i++) { + if (nodes[i].level == 0) { + $.modal.msgError("不能选择根节点（" + nodes[i].name + "）"); + return false; + } + if (nodes[i].isParent) { + $.modal.msgError("不能选择父节点（" + nodes[i].name + "）"); + return false; + } + } + return true; + }, + // 不允许最后层级节点选择 + notAllowLastLevel: function(_tree) { + var nodes = _tree.getSelectedNodes(); + for (var i = 0; i < nodes.length; i++) { if (!nodes[i].isParent) { - $.modal.msgError("不能选择最后层级节点（" + nodes[i].name + "）"); - return false; - } - } - return true; - }, - // 隐藏/显示搜索栏 - toggleSearch: function() { - $('#search').slideToggle(200); - $('#btnShow').toggle(); - $('#btnHide').toggle(); - $('#keyword').focus(); - }, - // 折叠 - collapse: function() { - $._tree.expandAll(false); - }, - // 展开 - expand: function() { - $._tree.expandAll(true); - } + $.modal.msgError("不能选择最后层级节点（" + nodes[i].name + "）"); + return false; + } + } + return true; + }, + // 隐藏/显示搜索栏 + toggleSearch: function() { + $('#search').slideToggle(200); + $('#btnShow').toggle(); + $('#btnHide').toggle(); + $('#keyword').focus(); + }, + // 折叠 + collapse: function() { + $._tree.expandAll(false); + }, + // 展开 + expand: function() { + $._tree.expandAll(true); + } }, // 通用方法封装处理 common: { - // 判断字符串是否为空 + // 判断字符串是否为空 isEmpty: function (value) { if (value == null || this.trim(value) == "") { return true; @@ -1537,6 +1547,39 @@ var table = { }); return flag ? str : ''; }, + // 日期格式化 时间戳 -> yyyy-MM-dd HH-mm-ss + dateFormat: function(date, format) { + var that = this; + if (that.isEmpty(date)) return ""; + if (!date) return; + if (!format) format = "yyyy-MM-dd"; + switch (typeof date) { + case "string": + date = new Date(date.replace(/-/, "/")); + break; + case "number": + date = new Date(date); + break; + } + if (!date instanceof Date) return; + var dict = { + "yyyy": date.getFullYear(), + "M": date.getMonth() + 1, + "d": date.getDate(), + "H": date.getHours(), + "m": date.getMinutes(), + "s": date.getSeconds(), + "MM": ("" + (date.getMonth() + 101)).substr(1), + "dd": ("" + (date.getDate() + 100)).substr(1), + "HH": ("" + (date.getHours() + 100)).substr(1), + "mm": ("" + (date.getMinutes() + 100)).substr(1), + "ss": ("" + (date.getSeconds() + 100)).substr(1) + }; + return format.replace(/(yyyy|MM?|dd?|HH?|ss?|mm?)/g, + function() { + return dict[arguments[0]]; + }); + }, // 获取节点数据，支持多层级访问 getItemField: function (item, field) { var value = item; @@ -1584,14 +1627,14 @@ var table = { }, // 获取form下所有的字段并转换为json对象 formToJSON: function(formId) { - var json = {}; - $.each($("#" + formId).serializeArray(), function(i, field) { - if(json[field.name]) { - json[field.name] += ("," + field.value); - } else { - json[field.name] = field.value; - } - }); + var json = {}; + $.each($("#" + formId).serializeArray(), function(i, field) { + if(json[field.name]) { + json[field.name] += ("," + field.value); + } else { + json[field.name] = field.value; + } + }); return json; }, // 数据字典转下拉框 @@ -1599,7 +1642,7 @@ var table = { var actions = []; actions.push($.common.sprintf("