github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修改select2选择数量限制提示语

pull/143/head
RuoYi 2019-11-08 10:47:07 +08:00
parent 5346af9ab0
commit fe8c142cd6
6 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.js vendored
View File

@ -4614,7 +4614,7 @@ S2.define('select2/i18n/en',[],function () {
return '载入更多结果…'; return '载入更多结果…';
}, },
maximumSelected: function (args) { maximumSelected: function (args) {
var message = '最多只能选择' + args.maximum + '个项目'; var message = '最多只能' + args.maximum + '个选项';
if (args.maximum != 1) { if (args.maximum != 1) {
message += 's'; message += 's';

2
ruoyi-admin/src/main/resources/static/ajax/libs/select2/select2.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
ruoyi-admin/src/main/resources/templates/system/user/add.html
View File

@ -248,7 +248,7 @@
$(function() { $(function() {
$('#post').select2({ $('#post').select2({
placeholder:"请选择岗位", placeholder: "请选择岗位",
allowClear: true allowClear: true
}); });
}) })

2
ruoyi-admin/src/main/resources/templates/system/user/edit.html
View File

@ -219,7 +219,7 @@
$(function() { $(function() {
$('#post').select2({ $('#post').select2({
placeholder:"请选择岗位", placeholder: "请选择岗位",
allowClear: true allowClear: true
}); });
}) })

1
ruoyi-framework/src/main/java/com/ruoyi/framework/shiro/session/OnlineSessionFactory.java
View File

@ -8,7 +8,6 @@ import org.apache.shiro.web.session.mgt.WebSessionContext;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.IpUtils; import com.ruoyi.common.utils.IpUtils;
import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.ServletUtils;
import eu.bitwalker.useragentutils.UserAgent; import eu.bitwalker.useragentutils.UserAgent;
/** /**

1
ruoyi-framework/src/main/java/com/ruoyi/framework/util/ShiroUtils.java
View File

@ -7,7 +7,6 @@ import org.apache.shiro.session.Session;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.subject.PrincipalCollection;
import org.apache.shiro.subject.SimplePrincipalCollection; import org.apache.shiro.subject.SimplePrincipalCollection;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.framework.shiro.realm.UserRealm; import com.ruoyi.framework.shiro.realm.UserRealm;