manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

国际化译文优化，访问日志国际化，感谢 SoleMan 分享

Browse Source
This commit is contained in:
thinkgem
2021-08-25 12:32:25 +08:00
parent 76ae202f04
commit 676ffb6bb2
12 changed files with 178 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/resources/i18n/core/common/i18n_en.properties
View File

@@ -34,8 +34,8 @@ sys.user.confirmPasswrodError=The new password is different from the confirm pas
sys.user.passwordModifySuccess=Change password success
sys.user.passwordModifyNotRepeat=The new password cannot be the same as the previous {0}.
sys.user.passwordModifySecurityLevel=Password update failed because you set the password to weak password!
sys.user.initPasswordModifyTip=Your password is the init password, please change the password!
sys.user.passwordModifyTip=Your password {0} day has not been modified , please change the password!
sys.user.initPasswordModifyTip=Your password is the initial password, please change the password!
sys.user.passwordModifyTip=Your password has not been modified for {0} days, please change the password!
sys.user.passwordError=Password error, please retype.
sys.user.pwdQuestionModifySuccess=The security problem modified success.
sys.user.pwdQuestionAnswerError=The questions and answers are incorrect.

4
modules/core/src/main/resources/i18n/core/job/i18n_en.properties
View File

@@ -101,7 +101,7 @@ Cron表达式生成器=Cron generator
不指定=do not specify
日开始,每=every day begins
天执行一次=daily execution
每月=a month
每月=Monthly
号最近的那个工作日=on the nearest working day
本月最后一天=the last day of the month
月=month
@@ -119,7 +119,7 @@ Cron表达式生成器=Cron generator
周五=Friday
周六=Saturday
非必填=Not required
每年=Every year,
每年=Annually
周期\ 从=Cycle from
表达式=expression
年=years

4
modules/core/src/main/resources/i18n/core/msg/i18n_en.properties
View File

@@ -30,8 +30,8 @@
消息类型=Message type
消息标题=Message title
消息内容=Message content
业务主键=Business key
业务类型=Business type
业务主键=Key
业务类型=Type
接受者信息=Receiver information
接受者账号=Receiver account
接受者姓名=Receiver name

3
modules/core/src/main/resources/i18n/core/state/i18n_en.properties
View File

@@ -19,6 +19,9 @@
核心数=Core number
最大功率=Maximum power
实时频率=Current frequency
核心个数=CPU cores
核心频率=CPU frequency
系统/用户=System/User
使用率=Used rate
内存=Memory
总内存=The total memory

123
modules/core/src/main/resources/i18n/core/sys/i18n_en.properties
View File

@@ -29,7 +29,7 @@
组织管理=Organization
用户管理=User manage
机构管理=Office manage
机构管理=Organization manage
公司管理=Company manage
岗位管理=Position manage
@@ -59,7 +59,7 @@
研发工具=Develop Tools
用户选择=User select
机构选择=Office select
机构选择=Organization select
公司选择=Company select
区域选择=Area select
日期选择=Date select
@@ -102,11 +102,31 @@
仪表盘=Dashboard
全屏=Full screen
切换主题=Switch the theme
切换主题=Switch themes
蓝=Blue
白=White
黑-经典=Black
紫=Purple
绿=Green
红=Red
黄=Yellow
蓝灰-经典=Blue Grey
白灰=White Grey
黑灰=Black Grey
紫灰=Purple Grey
绿灰=Green Grey
红灰=Red Grey
黄灰=Yellow Grey
亮蓝（新）=Bright Blue
浅蓝（新）=Light Blue
表单弹窗模式=Form popup mode
取消页签模式=Cancel tab mode
个人中心=Personal center
修改密码=Change password
退出登录=Log out
选择身份=Select role
系统切换=System switching
当前租户=Current tenant
租户切换=Tenant switch
@@ -115,6 +135,51 @@
在线=Online
注销=Logout
# =========== 访问日志 ===========
日志标题=Log title
请求地址=Request address
日志类型=Type
操作时间=Date
客户端IP=Client IP
设备名称=Device
浏览器名=Browser
响应时间=Time
异常=Exception
今日=Today
本周=This week
上周=Last week
本月=This month
本季度=This quarter
上1个月=Last month
上3个月=Last 3 months
近1个周=Nearly 1 week
近1个月=Nearly 1 months
近3个月=Nearly 3 months
按组织查询=By Organization
按岗位查询=By Position
按角色查询=By Role
按用户类型=By User Type
系统登录=System Login
未知操作=Unknown
保存=Save
日志详情=Log Detail
提交的数据=Submitted data
操作账号=Operation account
用户代理=User agent
# =========== 时间单位 ===========
毫秒=ms
天=days
时=hours
分=minutes
秒=seconds
刚刚=just now
天前=days ago
小时前=hours ago
分钟前=minutes ago
秒前=seconds ago
# =========== 个人中心 ===========
修改密保=Security question
@@ -141,7 +206,7 @@
# =========== 用户管理 ===========
组织机构=Office
组织机构=Organization
新增用户=New user
编辑用户=Edit user
导出=Export
@@ -178,11 +243,11 @@
手机=Mobile
电话=Phone
姓名=Name
机构=Office
机构=Organization
公司=Company
岗位=Position
归属机构=Office
归属机构=Organization
归属公司=Company
登录账号=Account
用户昵称=Nick name
@@ -199,7 +264,7 @@
所在岗位=Position
英文名=English name
附属机构=Auxiliary office
附属机构=Auxiliary organization
附属岗位=Auxiliary post
角色名称=Role name
@@ -214,28 +279,28 @@
# =========== 机构管理 ===========
新增机构=New office
编辑机构=Edit office
新增机构=New organization
编辑机构=Edit organization
停用机构=Disable office
确认要停用该机构吗？=Are you sure want to disable this office?
启用机构=Enable office
确认要启用该机构吗？=Are you sure want to enable this office?
删除机构=Delete office
确认要删除该机构及所有子机构吗？=Are you sure want to delete this office and sub office?
新增下级机构=New sub office
停用机构=Disable organization
确认要停用该机构吗？=Are you sure want to disable this organization?
启用机构=Enable organization
确认要启用该机构吗？=Are you sure want to enable this organization?
删除机构=Delete organization
确认要删除该机构及所有子机构吗？=Are you sure want to delete this organization and sub organization?
新增下级机构=New sub organization
保存机构''{0}''成功=Save the office ''{0}'' success
该机构包含未停用的子机构！=The office contains enable sub office!
停用机构''{0}''成功=Disable office ''{0}'' success
启用机构''{0}''成功=Enable office ''{0}'' success
删除机构''{0}''成功=Delete office ''{0}'' success
保存机构''{0}''成功=Save the organization ''{0}'' success
该机构包含未停用的子机构！=The organization contains enable sub organization!
停用机构''{0}''成功=Disable organization ''{0}'' success
启用机构''{0}''成功=Enable organization ''{0}'' success
删除机构''{0}''成功=Delete organization ''{0}'' success
上级机构=Parent office
机构名称=Office name
机构代码=Office code
机构全称=Office full name
机构类型=Office type
上级机构=Parent organization
机构名称=Organization name
机构代码=Organization code
机构全称=Organization full name
机构类型=Organization type
负责人=Principal
联系地址=Address
邮政编码=Zip code
@@ -264,7 +329,7 @@
公司编码=Company code
公司全称=Company full name
归属区域=Area
包含机构=Office
包含机构=Organization
# =========== 岗位管理 ===========
@@ -306,9 +371,9 @@
未设置=None
全部数据=All data
自定义数据=Custom data
本部门数据=Current office data
本部门数据=Current organization data
本公司数据=Current company data
本部门和本公司数据=Current office and company data
本部门和本公司数据=Current organization and company data
控制业务范围=Business scope
新增角色=New role

2
modules/core/src/main/resources/views/include/sysIndex/topMenu.html
View File

@@ -11,7 +11,7 @@
<ul class="nav navbar-nav">
<% include('/include/sysIndex/topMenuCorp.html'){} %>
<li><a href="javascript:" id="fullScreen" title="${text('全屏')}" data-placement="bottom" data-container="body"><i class="fa fa-arrows-alt"></i></a></li>
<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;" data-placement="bottom" data-container="body" data-layer-width="560" data-layer-height="290"><i class="fa fa-dashboard"></i></a></li>
<li><a href="javascript:" id="switchSkin" title="${text('切换主题')}" style="margin-top:-1px;" data-placement="bottom" data-container="body" data-layer-width="600" data-layer-height="300"><i class="fa fa-dashboard"></i></a></li>
<% include('/include/sysIndex/topMenuLang.html'){} %>
<% include('/include/sysIndex/topMenuOnline.html'){} %>
<% include('/include/sysIndex/topMenuMsg.html'){} %>

30
modules/core/src/main/resources/views/modules/sys/logForm.html
View File

@@ -3,7 +3,7 @@
<div class="box box-main">
<div class="box-header with-border">
<div class="box-title">
<i class="fa fa-bug"></i> 日志详情
<i class="fa fa-bug"></i> ${text('日志详情')}
</div>
<div class="box-tools pull-right">
<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
@@ -16,7 +16,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 日志标题：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('日志标题')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="logTitle" maxlength="500" class="form-control required "/>
</div>
@@ -25,7 +25,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 日志类型：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('日志类型')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:select path="logType" dictType="sys_log_type" class="form-control required " />
</div>
@@ -36,7 +36,7 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 请求地址：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('请求地址')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<div class="input-group">
<span class="input-group-addon control-label">&nbsp;${log.serverAddr} &nbsp;</span>
@@ -51,7 +51,7 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 提交的数据：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('提交的数据')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:textarea path="requestParams" rows="1" class="form-control autoHeight"/>
</div>
@@ -62,7 +62,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 操作用户：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('操作用户')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="createByName" maxlength="100" class="form-control required "/>
</div>
@@ -71,7 +71,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 操作账号：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('操作账号')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="createBy" maxlength="100" class="form-control required "/>
</div>
@@ -82,7 +82,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 业务类型：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('业务类型')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="bizType" maxlength="64" class="form-control "/>
</div>
@@ -91,7 +91,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 业务主键：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('业务主键')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="bizKey" maxlength="64" class="form-control "/>
</div>
@@ -102,7 +102,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 操作时间：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('操作时间')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="createDate" dataFormat="datetime" class="form-control required "/>
</div>
@@ -111,7 +111,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 客户端IP：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('客户端IP')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="remoteAddr" maxlength="255" class="form-control required "/>
</div>
@@ -122,7 +122,7 @@
<div class="col-xs-12">
<div class="form-group">
<label class="control-label col-sm-2" title="">
<span class="required hide">*</span> 用户代理：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('用户代理')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-10">
<#form:input path="userAgent" maxlength="500" class="form-control "/>
</div>
@@ -133,7 +133,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 设备名称：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('设备名称')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="deviceName" maxlength="100" class="form-control "/>
</div>
@@ -142,7 +142,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 浏览器名称：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('浏览器名')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="browserName" maxlength="100" class="form-control "/>
</div>
@@ -153,7 +153,7 @@
<div class="col-xs-6">
<div class="form-group">
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 响应时间：<i class="fa icon-question hide"></i></label>
<span class="required hide">*</span> ${text('响应时间')}：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:input path="executeTimeFormat" maxlength="100" class="form-control "/>
</div>

72
modules/core/src/main/resources/views/modules/sys/logList.html
View File

@@ -1,9 +1,9 @@
<% layout('/layouts/default.html', {title: '访问日志查询', libs: ['dataGrid']}){ %>
<% layout('/layouts/default.html', {title: '访问日志', libs: ['dataGrid']}){ %>
<div class="main-content">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa fa-bug"></i> 访问日志
<i class="fa fa-bug"></i> ${text('访问日志')}
</div>
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
@@ -14,52 +14,52 @@
<#form:form id="searchForm" model="${log}" action="${ctx}/sys/log/listData" method="post" class="form-inline "
data-page-no="${parameter.pageNo}" data-page-size="${parameter.pageSize}" data-order-by="${parameter.orderBy}">
<div class="form-group">
<label class="control-label">日志标题：</label>
<label class="control-label">${text('日志标题')}：</label>
<div class="control-inline">
<#form:input path="logTitle" maxlength="500" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">请求地址：</label>
<label class="control-label">${text('请求地址')}：</label>
<div class="control-inline">
<#form:input path="requestUri" maxlength="255" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">日志类型：</label>
<label class="control-label">${text('日志类型')}：</label>
<div class="control-inline width-date">
<#form:select path="logType" dictType="sys_log_type" blankOption="true" class="form-control required " />
</div>
</div>
<div class="form-group">
<label class="control-label">操作用户：</label>
<label class="control-label">${text('操作用户')}：</label>
<div class="control-inline width-120">
<#form:listselect id="userSelect" title="用户选择" path="createBy"
<#form:listselect id="userSelect" title="${text('用户选择')}" path="createBy"
url="${ctx}/sys/empUser/empUserSelect" allowClear="false"
checkbox="false" itemCode="userCode" itemName="userName"/>
</div>
</div>
<div class="form-group">
<label class="control-label">是否异常：</label>
<label class="control-label">${text('是否异常')}：</label>
<div class="control-inline width-60">
<#form:select path="isException" dictType="sys_yes_no" blankOption="true" class="form-control"/>
</div>
</div>
<div class="clearfix"></div>
<div class="form-group">
<label class="control-label">业务类型：</label>
<label class="control-label">${text('业务类型')}：</label>
<div class="control-inline">
<#form:input path="bizType" maxlength="64" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">业务主键：</label>
<label class="control-label">${text('业务主键')}：</label>
<div class="control-inline">
<#form:input path="bizKey" maxlength="64" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<label class="control-label">操作时间：</label>
<label class="control-label">${text('操作时间')}：</label>
<div class="control-inline">
<#form:input path="createDate_gte" readonly="true" maxlength="20" class="form-control laydate width-date"
dataFormat="date" data-type="date" data-format="yyyy-MM-dd" data-done="createDate_lte.click()"/> -
@@ -68,24 +68,24 @@
</div>
<div class="control-inline" style="width:75px;">
<select onchange="js.quickSelectDate(this.value, 'createDate_gte', 'createDate_lte');" class="form-control">
<option value="0">&nbsp;</option><option value="1">今日</option>
<option value="2">本周</option><option value="2|7">上周</option>
<option value="3">本月</option><option value="4">本季度</option>
<option value="5">上1个月</option><option value="5|3">上3个月</option>
<option value="1|7">近1个周</option><option value="6">近1个月</option>
<option value="6|3">近3个月</option>
<option value="0">&nbsp;</option><option value="1">${text('今日')}</option>
<option value="2">${text('本周')}</option><option value="2|7">${text('上周')}</option>
<option value="3">${text('本月')}</option><option value="4">${text('本季度')}</option>
<option value="5">${text('上1个月')}</option><option value="5|3">${text('上3个月')}</option>
<option value="1|7">${text('近1个周')}</option><option value="6">${text('近1个月')}</option>
<option value="6|3">${text('近3个月')}</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label">客户端IP：</label>
<label class="control-label">${text('客户端IP')}：</label>
<div class="control-inline">
<#form:input path="remoteAddr" maxlength="255" class="form-control width-90"/>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-primary btn-sm">查询</button>
<button type="reset" class="btn btn-default btn-sm">重置</button>
<button type="submit" class="btn btn-primary btn-sm">${text('查询')}</button>
<button type="reset" class="btn btn-default btn-sm">${text('重置')}</button>
</div>
</#form:form>
<table id="dataGrid"></table>
@@ -99,32 +99,32 @@
$('#dataGrid').dataGrid({
searchForm: $("#searchForm"),
columnModel: [
{header:'日志标题', name:'logTitle', index:'a.log_title', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" data-title="日志详情">'+(val||row.id)+'</a>';
{header:'${text("日志标题")}', name:'logTitle', index:'a.log_title', width:200, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" data-title="${text("日志详情")}">'+(val||row.id)+'</a>';
}},
{header:'请求地址', name:'requestUri', index:'a.request_uri', width:260, align:"left", formatter: function(val, obj, row, act){
{header:'${text("请求地址")}', name:'requestUri', index:'a.request_uri', width:260, align:"left", formatter: function(val, obj, row, act){
return '<span title="['+row.requestMethod+'] '+row.serverAddr+row.requestUri+'">'+ row.requestUri;
}},
{header:'日志类型', name:'logType', index:'a.log_type', width:100, align:"center", formatter: function(val, obj, row, act){
{header:'${text("日志类型")}', name:'logType', index:'a.log_type', width:100, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_log_type')}, val, '未知', true);
}},
{header:'操作用户', name:'createByName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){
return '<span title="账号：'+row.createBy+'">'+ row.createByName;
{header:'${text("操作用户")}', name:'createByName', index:'a.create_by_name', width:100, align:"center", formatter: function(val, obj, row, act){
return '<span title="${text("账号")}：'+row.createBy+'">'+ row.createByName;
}},
{header:'异常', name:'isException', index:'a.is_exception', width:60, align:"center", formatter: function(val, obj, row, act){
{header:'${text("异常")}', name:'isException', index:'a.is_exception', width:60, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_yes_no')}, val, '未知', true);
}},
{header:'业务类型', name:'bizType', index:'a.biz_type', width:90, align:"center"},
{header:'业务主键', name:'bizKey', index:'a.biz_key', width:90, align:"center"},
{header:'操作时间', name:'createDate', index:'a.create_date', width:100, align:"center"},
{header:'客户端IP', name:'remoteAddr', index:'a.remote_addr', width:100, align:"center"},
{header:'设备名称', name:'deviceName', index:'a.device_name', width:100, align:"center"},
{header:'浏览器名', name:'browserName', index:'a.browser_name', width:100, align:"center"},
{header:'响应时间', name:'executeTimeFormat', index:'a.execute_time', width:100, align:"center"}/* ,
{header:'操作', name:'actions', width:130, formatter: function(val, obj, row, act){
{header:'${text("业务类型")}', name:'bizType', index:'a.biz_type', width:90, align:"center"},
{header:'${text("业务主键")}', name:'bizKey', index:'a.biz_key', width:90, align:"center"},
{header:'${text("操作时间")}', name:'createDate', index:'a.create_date', width:100, align:"center"},
{header:'${text("客户端IP")}', name:'remoteAddr', index:'a.remote_addr', width:100, align:"center"},
{header:'${text("设备名称")}', name:'deviceName', index:'a.device_name', width:100, align:"center"},
{header:'${text("浏览器名")}', name:'browserName', index:'a.browser_name', width:100, align:"center"},
{header:'${text("响应时间")}', name:'executeTimeFormat', index:'a.execute_time', width:100, align:"center"}/* ,
{header:'${text("操作")}', name:'actions', width:130, formatter: function(val, obj, row, act){
var actions = [];
<% if(hasPermi('sys:log:edit')){ %>
actions.push('<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" title="日志详情"><i class="fa fa-pencil"></i></a>&nbsp;');
actions.push('<a href="${ctx}/sys/log/form?id='+row.id+'" class="btnList" title="${text('日志详情')}"><i class="fa fa-pencil"></i></a>&nbsp;');
<% } %>
return actions.join('');
}} */

2
modules/core/src/main/resources/views/modules/sys/officeIndex.html
View File

@@ -27,7 +27,7 @@
// 初始化布局
$('body').layout({
west__initClosed: $(window).width() <= 767, // 是否默认关闭
west__size: 170
west__size: 200
});
// 主页框架
var win = $("#mainFrame")[0].contentWindow;

38
modules/core/src/main/resources/views/modules/sys/switchSkin.html
View File

@@ -1,4 +1,4 @@
<% layout('/layouts/default.html', {title:'切换主题风格'}){ %>
<% layout('/layouts/default.html', {title:'切换主题'}){ %>
<link rel="stylesheet" href="${ctxStatic}/icheck/1.0/square/blue.css?${_version}">
<style>
.list-unstyled{margin:10px;}
@@ -13,7 +13,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">蓝</p>
<p class="text-center no-margin">${text('蓝')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;display:none;">
<a href="javascript:" data-skin="skin-black" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -22,7 +22,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">白</p>
<p class="text-center no-margin">${text('白')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-black2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -31,7 +31,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黑-经典</p>
<p class="text-center no-margin">${text('黑-经典')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-purple" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -40,7 +40,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">紫</p>
<p class="text-center no-margin">${text('紫')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-green" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -49,7 +49,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">绿</p>
<p class="text-center no-margin">${text('绿')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-red" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -58,7 +58,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">红</p>
<p class="text-center no-margin">${text('红')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-yellow" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -67,7 +67,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#222d32"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黄</p>
<p class="text-center no-margin">${text('黄')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-blue-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -76,7 +76,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">蓝灰-经典</p>
<p class="text-center no-margin">${text('蓝灰-经典')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;display:none;">
<a href="javascript:" data-skin="skin-black-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -85,7 +85,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">白灰</p>
<p class="text-center no-margin">${text('白灰')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-black-light2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -94,7 +94,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黑灰</p>
<p class="text-center no-margin">${text('黑灰')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-purple-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -103,7 +103,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">紫灰</p>
<p class="text-center no-margin">${text('紫灰')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-green-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -112,7 +112,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">绿灰</p>
<p class="text-center no-margin">${text('绿灰')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-red-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -121,7 +121,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">红灰</p>
<p class="text-center no-margin">${text('红灰')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-yellow-light" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -130,7 +130,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">黄灰</p>
<p class="text-center no-margin">${text('黄灰')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-blue2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -139,7 +139,7 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">亮蓝（新）</p>
<p class="text-center no-margin">${text('亮蓝（新）')}</p>
</li>
<li style="float:left;width:16.66666%;padding:5px;">
<a href="javascript:" data-skin="skin-blue-light2" style="display:block;box-shadow:0 0 3px rgba(0,0,0,0.4)" class="clearfix full-opacity-hover">
@@ -148,11 +148,11 @@
<span style="display:block;width:20%;float:left;height:30px;background:#f9fafc"></span>
<span style="display:block;width:80%;float:left;height:30px;background:#f4f5f7"></span>
</a>
<p class="text-center no-margin">浅蓝（新）</p>
<p class="text-center no-margin">${text('浅蓝（新）')}</p>
</li>
<li style="float:left;padding:18px 0 0 45px;">
<#form:checkbox name="formLayerModel" label="表单弹窗模式" class="form-control" data-style="square-blue" style="margin-right:20px"/>
<#form:checkbox name="tabPageModel" label="取消页签模式" class="form-control" data-style="square-blue"/>
<#form:checkbox name="formLayerModel" label="${text('表单弹窗模式')}" class="form-control" data-style="square-blue" style="margin-right:20px"/>
<#form:checkbox name="tabPageModel" label="${text('取消页签模式')}" class="form-control" data-style="square-blue"/>
</li>
</ul>
<% } %>

4
modules/core/src/main/resources/views/modules/sys/user/empUserIndex.html
View File

@@ -24,13 +24,13 @@
<div class="ui-layout-center">
<iframe id="mainFrame" name="mainFrame" class="ui-layout-content p0"
src="${ctx}/sys/empUser/list"></iframe>
</div>
</div>
<% } %>
<script>
// 初始化布局
$('body').layout({
west__initClosed: $(window).width() <= 767, // 是否默认关闭
west__size: 200
west__size: window.lang == 'en' ? 215 : 200
});
// 主页框架
var win = $("#mainFrame")[0].contentWindow;

2
modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html
View File

@@ -95,7 +95,7 @@
<script>
// 初始化布局
$('body').layout({
west__size: 200,
west__size: window.lang == 'en' ? 225 : 200,
onresize_end: function(){
$('#dataGrid').dataGrid('resize');
}