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

国际化一些组件和组织管理功能

Browse Source
This commit is contained in:
thinkgem
2018-04-21 16:09:51 +08:00
parent 503e14b146
commit cc8da29107
33 changed files with 285 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
web/src/main/java/com/jeesite/modules/test/entity/TestData.java
View File

@@ -35,7 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_date", attrName="testDate", label="日期选择"),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="部门选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),
@Column(name="test_area_code", attrName="testAreaCode", label="区域选择"),
@Column(name="test_area_name", attrName="testAreaName", label="区域名称"),
@Column(includeEntity=DataEntity.class),
@@ -47,8 +47,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
}),
@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u11",
on="u11.office_code = a.test_office_code", columns={
@Column(name="office_code", label="部门编码", isPK=true),
@Column(name="office_name", label="部门名称", isQuery=false),
@Column(name="office_code", label="机构编码", isPK=true),
@Column(name="office_name", label="机构名称", isQuery=false),
}),
}, orderBy="a.update_date DESC"
)
@@ -64,7 +64,7 @@ public class TestData extends DataEntity<TestData> {
private Date testDate; // 日期选择
private Date testDatetime; // 日期时间
private User testUser; // 用户选择
private Office testOffice; // 部门选择
private Office testOffice; // 机构选择
private String testAreaCode; // 区域选择
private String testAreaName; // 区域名称
private List<TestDataChild> testDataChildList = ListUtils.newArrayList(); // 子表列表

8
web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java
View File

@@ -35,7 +35,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
@Column(name="test_date", attrName="testDate", label="日期选择"),
@Column(name="test_datetime", attrName="testDatetime", label="日期时间"),
@Column(name="test_user_code", attrName="testUser.userCode", label="用户选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="部门选择"),
@Column(name="test_office_code", attrName="testOffice.officeCode", label="机构选择"),
@Column(name="test_area_code", attrName="testAreaCode", label="区域选择"),
@Column(name="test_area_name", attrName="testAreaName", label="区域名称", isQuery=false),
}, joinTable={
@@ -46,8 +46,8 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
}),
@JoinTable(type=Type.LEFT_JOIN, entity=Office.class, attrName="testOffice", alias="u13",
on="u13.office_code = a.test_office_code", columns={
@Column(name="office_code", label="部门编码", isPK=true),
@Column(name="office_name", label="部门名称", isQuery=false),
@Column(name="office_code", label="机构编码", isPK=true),
@Column(name="office_name", label="机构名称", isQuery=false),
}),
}, orderBy="a.id ASC"
)
@@ -65,7 +65,7 @@ public class TestDataChild extends DataEntity<TestDataChild> {
private Date testDate; // 日期选择
private Date testDatetime; // 日期时间
private User testUser; // 用户选择
private Office testOffice; // 部门选择
private Office testOffice; // 机构选择
private String testAreaCode; // 区域选择
private String testAreaName; // 区域名称

2
web/src/main/resources/config/jeesite.yml
View File

@@ -165,7 +165,7 @@ jdbc:
# [{
# moduleCode: "core",
# ctrlPermi: "0",
# ctrlName: "部门权限",
# ctrlName: "机构权限",
# ctrlType: "Office",
# ctrlDataUrl: "/sys/office/treeData",
# chkboxType: {"Y":"ps","N":"ps"},

16
web/src/main/resources/views/modules/demo/dataGridEditGrid.html
View File

@@ -74,15 +74,15 @@
<div class="form-group">
<label class="control-label">用户选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
</div>
</div>
<div class="form-group">
<label class="control-label">部门选择：</label>
<label class="control-label">机构选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData" allowClear="true"/>
</div>
@@ -90,7 +90,7 @@
<div class="form-group">
<label class="control-label">区域选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData" allowClear="true"/>
</div>
@@ -168,7 +168,7 @@ $('#dataGrid').dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'user_'+editOptions.id, title: '用户',
id: 'user_'+editOptions.id, title: '用户选择',
name: 'testUser.userCode', value: val.split('|')[0],
labelName: 'testUser.userName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
@@ -176,13 +176,13 @@ $('#dataGrid').dataGrid({
}
}
},
{header:'部门选择', name:'testOffice', width:150,
{header:'机构选择', name:'testOffice', width:150,
formatter: function(val, obj, row, act){
return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'office_'+editOptions.id, title: '部门',
id: 'office_'+editOptions.id, title: '机构选择',
name: 'testOffice.officeCode', value: val.split('|')[0],
labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: ''
@@ -196,7 +196,7 @@ $('#dataGrid').dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'area_'+editOptions.id, title: '区域',
id: 'area_'+editOptions.id, title: '区域选择',
name: 'testAreaCode', value: val.split('|')[0],
labelName: 'testAreaName', labelValue: val.split('|')[1],
url: '${ctx}/sys/area/treeData', cssClass: ''

10
web/src/main/resources/views/modules/demo/dataGridGroupGrid.html
View File

@@ -74,15 +74,15 @@
<div class="form-group">
<label class="control-label">用户选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
</div>
</div>
<div class="form-group">
<label class="control-label">部门选择：</label>
<label class="control-label">机构选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData" allowClear="true"/>
</div>
@@ -90,7 +90,7 @@
<div class="form-group">
<label class="control-label">区域选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData" allowClear="true"/>
</div>
@@ -151,7 +151,7 @@ $('#dataGrid').dataGrid({
{header:'日期选择', name:'testDate', index:'a.test_date', width:150, align:"center"},
{header:'日期时间', name:'testDatetime', index:'a.test_datetime', width:150, align:"center"},
{header:'用户选择', name:'testUser.userName', index:'a.test_user_code', width:150, align:"center"},
{header:'部门选择', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"},
{header:'机构选择', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"},
{header:'区域选择', name:'testAreaName', index:'a.test_area_code', width:150, align:"center"},
{header:'区域名称', name:'testAreaName', index:'a.test_area_name', width:150, align:"left"},
{header:'状态', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){

16
web/src/main/resources/views/modules/demo/formEditForm.html
View File

@@ -103,7 +103,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 用户选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true"
class="" allowClear="true"/>
@@ -113,9 +113,9 @@
<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> 机构选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData"
class="" allowClear="true"/>
@@ -129,7 +129,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 区域选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData"
class="" allowClear="true"/>
@@ -263,7 +263,7 @@ $("#testDataChildDataGrid").dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'user_'+editOptions.id, title: '用户',
id: 'user_'+editOptions.id, title: '用户选择',
name: 'testUser.userCode', value: val.split('|')[0],
labelName: 'testUser.userName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
@@ -271,13 +271,13 @@ $("#testDataChildDataGrid").dataGrid({
}
}
},
{header:'部门选择', name:'testOffice', width:150,
{header:'机构选择', name:'testOffice', width:150,
formatter: function(val, obj, row, act){
return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'office_'+editOptions.id, title: '部门',
id: 'office_'+editOptions.id, title: '机构选择',
name: 'testOffice.officeCode', value: val.split('|')[0],
labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: ''
@@ -291,7 +291,7 @@ $("#testDataChildDataGrid").dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'area_'+editOptions.id, title: '区域',
id: 'area_'+editOptions.id, title: '区域选择',
name: 'testAreaCode', value: val.split('|')[0],
labelName: 'testAreaName', labelValue: val.split('|')[1],
url: '${ctx}/sys/area/treeData', cssClass: ''

8
web/src/main/resources/views/modules/demo/formLayoutForm.html
View File

@@ -103,7 +103,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 用户：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true"
class="" allowClear="true"/>
@@ -115,9 +115,9 @@
<div class="col-xs-4">
<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> 机构：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData"
class="" allowClear="true"/>
@@ -129,7 +129,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 区域：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData"
class="" allowClear="true"/>

16
web/src/main/resources/views/modules/demo/formTableForm.html
View File

@@ -103,7 +103,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 用户选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true"
class="" allowClear="true"/>
@@ -113,9 +113,9 @@
<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> 机构选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData"
class="" allowClear="true"/>
@@ -129,7 +129,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 区域选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData"
class="" allowClear="true"/>
@@ -263,7 +263,7 @@ $("#testDataChildDataGrid").dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'user_'+editOptions.id, title: '用户',
id: 'user_'+editOptions.id, title: '用户选择',
name: 'testUser.userCode', value: val.split('|')[0],
labelName: 'testUser.userName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
@@ -271,13 +271,13 @@ $("#testDataChildDataGrid").dataGrid({
}
}
},
{header:'部门选择', name:'testOffice', width:150,
{header:'机构选择', name:'testOffice', width:150,
formatter: function(val, obj, row, act){
return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'office_'+editOptions.id, title: '部门',
id: 'office_'+editOptions.id, title: '机构选择',
name: 'testOffice.officeCode', value: val.split('|')[0],
labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: ''
@@ -291,7 +291,7 @@ $("#testDataChildDataGrid").dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'area_'+editOptions.id, title: '区域',
id: 'area_'+editOptions.id, title: '区域选择',
name: 'testAreaCode', value: val.split('|')[0],
labelName: 'testAreaName', labelValue: val.split('|')[1],
url: '${ctx}/sys/area/treeData', cssClass: ''

16
web/src/main/resources/views/modules/test/testDataForm.html
View File

@@ -103,7 +103,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 用户选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true"
class="" allowClear="true"/>
@@ -113,9 +113,9 @@
<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> 机构选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData"
class="" allowClear="true"/>
@@ -129,7 +129,7 @@
<label class="control-label col-sm-4" title="">
<span class="required hide">*</span> 区域选择：<i class="fa icon-question hide"></i></label>
<div class="col-sm-8">
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData"
class="" allowClear="true"/>
@@ -263,7 +263,7 @@ $("#testDataChildDataGrid").dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'user_'+editOptions.id, title: '用户',
id: 'user_'+editOptions.id, title: '用户选择',
name: 'testUser.userCode', value: val.split('|')[0],
labelName: 'testUser.userName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?isLoadUser=true', cssClass: ''
@@ -271,13 +271,13 @@ $("#testDataChildDataGrid").dataGrid({
}
}
},
{header:'部门选择', name:'testOffice', width:150,
{header:'机构选择', name:'testOffice', width:150,
formatter: function(val, obj, row, act){
return js.val(row, 'testOffice.officeCode')+'|'+js.val(row, 'testOffice.officeName');
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'office_'+editOptions.id, title: '部门',
id: 'office_'+editOptions.id, title: '机构选择',
name: 'testOffice.officeCode', value: val.split('|')[0],
labelName: 'testOffice.officeName', labelValue: val.split('|')[1],
url: '${ctx}/sys/office/treeData?officeTypes=1,2', cssClass: ''
@@ -291,7 +291,7 @@ $("#testDataChildDataGrid").dataGrid({
}, editable: true, edittype: "custom", editoptions: {
custom_element: function(val, editOptions) {
return js.template('treeselectTpl', {
id: 'area_'+editOptions.id, title: '区域',
id: 'area_'+editOptions.id, title: '区域选择',
name: 'testAreaCode', value: val.split('|')[0],
labelName: 'testAreaName', labelValue: val.split('|')[1],
url: '${ctx}/sys/area/treeData', cssClass: ''

10
web/src/main/resources/views/modules/test/testDataList.html
View File

@@ -74,15 +74,15 @@
<div class="form-group">
<label class="control-label">用户选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testUser" title="用户"
<#form:treeselect id="testUser" title="用户选择"
path="testUser.userCode" labelPath="testUser.userName"
url="${ctx}/sys/office/treeData?isLoadUser=true" allowClear="true"/>
</div>
</div>
<div class="form-group">
<label class="control-label">部门选择：</label>
<label class="control-label">机构选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testOffice" title="部门"
<#form:treeselect id="testOffice" title="机构选择"
path="testOffice.officeCode" labelPath="testOffice.officeName"
url="${ctx}/sys/office/treeData" allowClear="true"/>
</div>
@@ -90,7 +90,7 @@
<div class="form-group">
<label class="control-label">区域选择：</label>
<div class="control-inline width-120" >
<#form:treeselect id="testAreaCode" title="区域"
<#form:treeselect id="testAreaCode" title="区域选择"
path="testAreaCode" labelPath="testAreaName"
url="${ctx}/sys/area/treeData" allowClear="true"/>
</div>
@@ -142,7 +142,7 @@ $('#dataGrid').dataGrid({
{header:'日期选择', name:'testDate', index:'a.test_date', width:150, align:"center"},
{header:'日期时间', name:'testDatetime', index:'a.test_datetime', width:150, align:"center"},
{header:'用户选择', name:'testUser.userName', index:'a.test_user_code', width:150, align:"center"},
{header:'部门选择', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"},
{header:'机构选择', name:'testOffice.officeName', index:'a.test_office_code', width:150, align:"center"},
{header:'区域选择', name:'testAreaName', index:'a.test_area_code', width:150, align:"center"},
{header:'区域名称', name:'testAreaName', index:'a.test_area_name', width:150, align:"left"},
{header:'状态', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){