From 1724e3ead1ec50a5903841e5de4a816830de57dd Mon Sep 17 00:00:00 2001 From: thinkgem Date: Sun, 16 Dec 2018 16:18:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E5=87=8F=E5=B0=91=E4=B8=80=E4=BA=9Bjs=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E3=80=82=E5=BB=BA=E8=AE=AE=E8=AE=BE?= =?UTF-8?q?=E7=BD=AEIDE=E5=BF=BD=E7=95=A5=E4=B8=80=E4=BA=9B=E6=97=A0?= =?UTF-8?q?=E5=85=B3=E7=B4=A7=E8=A6=81=E7=9A=84=E8=AD=A6=E5=91=8A=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/gen/include/dataGridScript.html | 34 +++--- .../gen/include/formChildTableScript.html | 24 ++-- .../views/modules/sys/companyList.html | 28 ++--- .../views/modules/sys/officeList.html | 32 ++--- .../resources/views/modules/sys/postList.html | 26 ++--- .../views/modules/sys/user/corpAdminForm.html | 4 +- .../views/modules/sys/user/empUserForm.html | 4 +- .../views/modules/sys/user/empUserList.html | 40 +++---- .../views/modules/sys/user/empUserSelect.html | 20 ++-- .../views/modules/test/testDataForm.html | 38 +++--- .../views/modules/test/testDataList.html | 104 ++++++++--------- .../views/modules/test/testTreeForm.html | 48 ++++---- .../views/modules/test/testTreeList.html | 110 +++++++++--------- 13 files changed, 256 insertions(+), 256 deletions(-) diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html index aead9aac..e8d1deda 100644 --- a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html +++ b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html @@ -18,8 +18,8 @@ $('#dataGrid').dataGrid({ for(c in table.columnList){ if(c.attrName == table.treeViewNameAttrName){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', index:'a.${c.columnName}', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.${table.treeViewCodeAttrName}+' ) '+''+(val||row.id)+''; + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ + return '( '+row.${table.treeViewCodeAttrName}+' ) '+''+(val||row.id)+''; }}, <% firstColumn = false; @@ -41,55 +41,55 @@ $('#dataGrid').dataGrid({ else if(firstColumn){ firstColumn = false; %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"left", frozen:true, formatter: function(val, obj, row, act){ + return ''+(val||row.id)+''; }}, <% }else if(c.showType == 'select' || c.showType == 'select_multiple' || c.showType == 'checkbox' || c.showType == 'radio'){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"center", formatter: function(val, obj, row, act){ - return js.getDictLabel(\${@DictUtils.getDictListJson('${c.optionMap['dictType']}')}, val, '\${text('未知')}', true); + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(\${@DictUtils.getDictListJson('${c.optionMap['dictType']}')}, val, '\${text("未知")}', true); }}, <% }else if(c.showType == "userselect" || c.showType == "officeselect" || c.showType == "areaselect"){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName2}', index:'a.${c.columnName}', width:150, align:"center"}, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName2}', index:'a.${c.columnName}', width:150, align:"center"}, <% }else{ if (@StringUtils.inString(c.attrType, 'java.util.Date', 'Integer', 'Long')){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"center"}, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"center"}, <% }else if (@StringUtils.inString(c.attrType, 'Float', 'Double')){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"right", formatter: function(val, obj, row, act){ + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"right", formatter: function(val, obj, row, act){ return js.formatNumber(val, 2, false, ''); // 数值类型格式化 (原始数值, 小数位数, 是否千分位, 默认值，金额情况下设置0.00); }}, <% }else { %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"left"}, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:150, align:"left"}, <% } } } } %> - {header:'\${text('操作')}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'\${text("操作")}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(isQueryTpl){ %> - actions.push(' '); + actions.push(' '); <% }else{ %> \<% if(hasPermi('${permissionPrefix}:edit')){ %> - actions.push(' '); + actions.push(' '); <% if(@ObjectUtils.toBoolean(table.optionMap['isHaveDisableEnable'])){ %> if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } <% } %> <% if(@ObjectUtils.toBoolean(table.optionMap['isHaveDelete'])){ %> - actions.push(' data-deltreenode="'+row.id+'"<% } %>> '); + actions.push('及所有子${functionNameSimple}<% } %>吗？")}"<% if(table.isTreeEntity){ %> data-deltreenode="'+row.id+'"<% } %>> '); <% } %> <% if(table.isTreeEntity){ %> - actions.push(' '); + actions.push(' '); <% } %> \<% } %> <% } %> diff --git a/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html b/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html index 58524b0c..de1f5b32 100644 --- a/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html +++ b/modules/core/src/main/resources/templates/modules/gen/include/formChildTableScript.html @@ -26,7 +26,7 @@ for (c in child.columnList){ // 如果是外键，父级的主键 if(child.parentExists && child.parentTableFkName == c.columnName){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', editable:true, hidden:true}, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', editable:true, hidden:true}, <% continue; } @@ -49,15 +49,15 @@ for (c in child.columnList){ } // 输出列字段 if(c.showType == 'input'){ -%> {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', width:150, editable:true, edittype:'text', editoptions:{${attrs}'class':'form-control${cssClass}'}}, +%> {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', width:150, editable:true, edittype:'text', editoptions:{${attrs}'class':'form-control${cssClass}'}}, <% }else if(c.showType == 'textarea'){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', width:150, editable:true, edittype:'textarea', editoptions:{${attrs}'class':'form-control${cssClass}', 'rows':'1'}}, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', width:150, editable:true, edittype:'textarea', editoptions:{${attrs}'class':'form-control${cssClass}', 'rows':'1'}}, <% }else if(c.showType == 'select' || c.showType == 'select_multiple' || c.showType == 'radio' || c.showType == 'checkbox'){ %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', width:100, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', width:100, editable:true, edittype:'select', editoptions:{<%if (c.showType == 'select_multiple' || c.showType == 'checkbox'){ %>multiple:true, <% } %>'class':'form-control${cssClass}', items: $.merge([<%if (!(c.showType == 'select_multiple' || c.showType == 'checkbox')){ %>{dictLabel:' ',dictValue:''}<% } %>], \${@DictUtils.getDictListJson('${c.optionMap['dictType']}')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ @@ -69,7 +69,7 @@ for (c in child.columnList){ }else if(c.showType == 'date' || c.showType == 'datetime'){ var isTime = (c.showType == 'datetime'); %> - {header:'\${text('${c.columnLabel}')}', name:'${c.attrName}', width:150, + {header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', width:150, formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d${isTime?' H:i:s':''}'}, editable:true, edittype:'text', editoptions:{'class':'form-control Wdate${cssClass}', 'readonly':'true', dataInit: function(element){ $(element).on('focus', function(){ @@ -80,7 +80,7 @@ for (c in child.columnList){ <% }else if(c.showType == 'userselect'){ treeselectExists = true; %> - {header:'\${text('${c.columnLabel}')}', name:'${c.simpleAttrName}', width:150, + {header:'\${text("${c.columnLabel}")}', name:'${c.simpleAttrName}', width:150, formatter: function(val, obj, row, act){ return js.val(row, '${c.attrName}')+'|'+js.val(row, '${c.attrName2}'); }, editable: true, edittype: "custom", editoptions: { @@ -98,7 +98,7 @@ for (c in child.columnList){ }else if(c.showType == 'officeselect'){ treeselectExists = true; %> - {header:'\${text('${c.columnLabel}')}', name:'${c.simpleAttrName}', width:150, + {header:'\${text("${c.columnLabel}")}', name:'${c.simpleAttrName}', width:150, formatter: function(val, obj, row, act){ return js.val(row, '${c.attrName}')+'|'+js.val(row, '${c.attrName2}'); }, editable: true, edittype: "custom", editoptions: { @@ -116,7 +116,7 @@ for (c in child.columnList){ }else if(c.showType == 'areaselect'){ treeselectExists = true; %> - {header:'\${text('${c.columnLabel}')}', name:'${c.simpleAttrName}', width:150, + {header:'\${text("${c.columnLabel}")}', name:'${c.simpleAttrName}', width:150, formatter: function(val, obj, row, act){ return js.val(row, '${c.attrName}')+'|'+js.val(row, '${c.attrName2}'); }, editable: true, edittype: "custom", editoptions: { @@ -135,17 +135,17 @@ for (c in child.columnList){ } if (table.tplCategory != 'query'){ %> - {header:'\${text('操作')}', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){ + {header:'\${text("操作")}', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){ var actions = []; if (val == 'new'){ - actions.push(' '); + actions.push(' '); }else{ - actions.push(' '); + actions.push(' '); } return actions.join(''); }, editoptions: {defaultValue: 'new'}} <% }else{ %> - {header:'\${text('操作')}', name:'actions', hidden: true} + {header:'\${text("操作")}', name:'actions', hidden: true} <% } %> ], diff --git a/modules/core/src/main/resources/views/modules/sys/companyList.html b/modules/core/src/main/resources/views/modules/sys/companyList.html index ac0f932d..b53fd8f3 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -58,29 +58,29 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'${text('公司名称')}', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.viewCode+' ) '+''+(val||row.id)+''; + {header:'${text("公司名称")}', name:'companyName', index:'a.company_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ + return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, - {header:'${text('公司全称')}', name:'fullName', index:'a.full_name', width:200, align:"left"}, - {header:'${text('排序号')}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, - {header:'${text('归属区域')}', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"}, - {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, - {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:200, align:"left"}, - {header:'${text('状态')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("公司全称")}', name:'fullName', index:'a.full_name', width:200, align:"left"}, + {header:'${text("排序号")}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, + {header:'${text("归属区域")}', name:'area.treeNames', index:'a.areaCode', width:200, align:"center"}, + {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, + {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:200, align:"left"}, + {header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, - {header:'${text('操作')}', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:company:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); - actions.push(' '); + actions.push(' '); + actions.push(' '); <% } %> return actions.join(''); }} diff --git a/modules/core/src/main/resources/views/modules/sys/officeList.html b/modules/core/src/main/resources/views/modules/sys/officeList.html index 79cfd097..8f038bb1 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -64,31 +64,31 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'${text('机构名称')}', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ - return '( '+row.viewCode+' ) '+''+(val||row.id)+''; + {header:'${text("机构名称")}', name:'officeName', index:'a.office_name', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){ + return '( '+row.viewCode+' ) '+''+(val||row.id)+''; }}, - {header:'${text('机构全称')}', name:'fullName', index:'a.full_name', width:200, align:"left"}, - {header:'${text('排序号')}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, - {header:'${text('机构类型')}', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_office_type')}, val, '${text('未知')}', true); + {header:'${text("机构全称")}', name:'fullName', index:'a.full_name', width:200, align:"left"}, + {header:'${text("排序号")}', name:'treeSort', index:'a.tree_sort', width:80, align:"center"}, + {header:'${text("机构类型")}', name:'officeType', index:'a.office_type', width:100, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_office_type')}, val, '${text("未知")}', true); }}, - {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:150, align:"center"}, - {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:200, align:"left"}, - {header:'${text('状态')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ - return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '${text('未知')}', true); + {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"}, + {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:200, align:"left"}, + {header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ + return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '${text("未知")}', true); }}, - {header:'${text('操作')}', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:office:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); - actions.push(' '); + actions.push(' '); + actions.push(' '); <% } %> return actions.join(''); }} diff --git a/modules/core/src/main/resources/views/modules/sys/postList.html b/modules/core/src/main/resources/views/modules/sys/postList.html index a3610d9a..d40929d1 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -55,30 +55,30 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'${text('岗位名称')}', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + {header:'${text("岗位名称")}', name:'postName', index:'a.post_name', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ + return ''+(val||row.id)+''; }}, - {header:'${text('岗位编码')}', name:'postCode', index:'a.post_code', width:200, align:"center"}, - {header:'${text('排序号')}', name:'postSort', index:'a.post_sort', width:80, align:"center"}, - {header:'${text('岗位分类')}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("岗位编码")}', name:'postCode', index:'a.post_code', width:200, align:"center"}, + {header:'${text("排序号")}', name:'postSort', index:'a.post_sort', width:80, align:"center"}, + {header:'${text("岗位分类")}', name:'postType', index:'a.post_type', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_post_type')}, val, '未知', true); }}, - {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:150, align:"center"}, - {header:'${text('备注信息')}', name:'remarks', index:'a.remarks', width:200, align:"left"}, - {header:'${text('状态')}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:150, align:"center"}, + {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:200, align:"left"}, + {header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, - {header:'${text('操作')}', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:post:edit')){ %> - actions.push(' '); + actions.push(' '); if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } - actions.push(' '); + actions.push(' '); <% } %> return actions.join(''); }} diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html index e21ea0fc..984a8ad9 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.html @@ -180,8 +180,8 @@ var roleGrid = $("#roleGrid").dataGrid({ {name:'isAll',value:'true'} <% // 显示所有角色（与上方两个条件互斥） %> ], columnModel: [ - {header:'${text('角色名称')}', name:'name', sortable:false, width:100, align:"center"}, - {header:'${text('角色编码')}', name:'id', sortable:false, width:100, align:"center"} + {header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"}, + {header:'${text("角色编码")}', name:'id', sortable:false, width:100, align:"center"} ], showCheckbox: true, autoGridHeight: function(){ diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html index 0ea1c413..b4408dcf 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserForm.html @@ -220,8 +220,8 @@ var roleGrid = $("#roleGrid").dataGrid({ {name:'ctrlPermi',value:'2'} ], columnModel: [ - {header:'${text('角色名称')}', name:'name', sortable:false, width:100, align:"center"}, - {header:'${text('角色编码')}', name:'id', sortable:false, width:100, align:"center"} + {header:'${text("角色名称")}', name:'name', sortable:false, width:100, align:"center"}, + {header:'${text("角色编码")}', name:'id', sortable:false, width:100, align:"center"} ], showCheckbox: true, autoGridHeight: function(){ diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html index 169b0eb6..65fd380a 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserList.html @@ -107,47 +107,47 @@ $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'${text('登录账号')}', name:'loginCode', index:'a.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ - return ''+(val||row.id)+''; + {header:'${text("登录账号")}', name:'loginCode', index:'a.login_code', width:200, align:"center", frozen:true, formatter: function(val, obj, row, act){ + return ''+(val||row.id)+''; }}, - {header:'${text('用户昵称')}', name:'userName', index:'a.user_name', width:200, align:"center"}, - {header:'${text('员工姓名')}', name:'refName', index:'a.ref_name', width:200, align:"center"}, - {header:'${text('归属机构')}', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, - {header:'${text('归属公司')}', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"}, - {header:'${text('电子邮箱')}', name:'email', index:'a.email', width:200, align:"center"}, - {header:'${text('手机号码')}', name:'mobile', index:'a.mobile', width:200, align:"center"}, - {header:'${text('办公电话')}', name:'phone', index:'a.phone', width:200, align:"center"}, - {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, - {header:'${text('状态')}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("用户昵称")}', name:'userName', index:'a.user_name', width:200, align:"center"}, + {header:'${text("员工姓名")}', name:'refName', index:'a.ref_name', width:200, align:"center"}, + {header:'${text("归属机构")}', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, + {header:'${text("归属公司")}', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"}, + {header:'${text("电子邮箱")}', name:'email', index:'a.email', width:200, align:"center"}, + {header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:200, align:"center"}, + {header:'${text("办公电话")}', name:'phone', index:'a.phone', width:200, align:"center"}, + {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, + {header:'${text("状态")}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, - {header:'${text('操作')}', name:'actions', width:260, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:260, sortable:false, title:false, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:empUser:edit')){ %> - actions.push(' '); + actions.push(' '); <% } %> <% if(hasPermi('sys:empUser:updateStatus')){ %> if (row.status == Global.STATUS_NORMAL){ - actions.push(' '); + actions.push(' '); } if (row.status == Global.STATUS_DISABLE){ - actions.push(' '); + actions.push(' '); } <% } %> <% if(hasPermi('sys:empUser:edit')){ %> - actions.push(' '); + actions.push(' '); <% } %> <% if(hasPermi('sys:empUser:authRole,sys:empUser:authDataScope,sys:empUser:resetpwd', 'or')){ %> - actions.push(' '); + actions.push(' '); actions.push('
'); <% if(hasPermi('sys:empUser:authRole')){ %> - actions.push(' ${text('分配角色')} '); + actions.push(' ${text("分配角色")} '); <% } %> <% if(hasPermi('sys:empUser:authDataScope')){ %> - actions.push(' ${text('数据权限')} '); + actions.push(' ${text("数据权限")} '); <% } %> <% if(hasPermi('sys:empUser:resetpwd')){ %> - actions.push(' ${text('重置密码')} '); + actions.push(' ${text("重置密码")} '); <% } %> actions.push('
'); <% } %> diff --git a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html index 983a5568..b43c28ab 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html +++ b/modules/core/src/main/resources/views/modules/sys/user/empUserSelect.html @@ -82,16 +82,16 @@ var selectData = ${isNotBlank(selectData!) ? selectData! : "{\}"}, selectNum = 0, dataGrid = $('#dataGrid').dataGrid({ searchForm: $("#searchForm"), columnModel: [ - {header:'${text('登录账号')}', name:'loginCode', index:'a.login_code', width:200, align:"center"}, - {header:'${text('用户昵称')}', name:'userName', index:'a.user_name', width:200, align:"center"}, - {header:'${text('员工姓名')}', name:'refName', index:'a.ref_name', width:200, align:"center"}, - {header:'${text('归属机构')}', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, - {header:'${text('归属公司')}', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"}, - {header:'${text('电子邮箱')}', name:'email', index:'a.email', width:200, align:"center"}, - {header:'${text('手机号码')}', name:'mobile', index:'a.mobile', width:200, align:"center"}, - {header:'${text('办公电话')}', name:'phone', index:'a.phone', width:200, align:"center"}, - {header:'${text('更新时间')}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, - {header:'${text('状态')}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){ + {header:'${text("登录账号")}', name:'loginCode', index:'a.login_code', width:200, align:"center"}, + {header:'${text("用户昵称")}', name:'userName', index:'a.user_name', width:200, align:"center"}, + {header:'${text("员工姓名")}', name:'refName', index:'a.ref_name', width:200, align:"center"}, + {header:'${text("归属机构")}', name:'employee.office.officeName', index:'o.office_name', width:200, align:"center"}, + {header:'${text("归属公司")}', name:'employee.company.companyName', index:'c.company_name', width:200, align:"center"}, + {header:'${text("电子邮箱")}', name:'email', index:'a.email', width:200, align:"center"}, + {header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:200, align:"center"}, + {header:'${text("办公电话")}', name:'phone', index:'a.phone', width:200, align:"center"}, + {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:200, align:"center"}, + {header:'${text("状态")}', name:'status', index:'a.status', width:140, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, {header:'行数据', name:'rowData', hidden:true, formatter: function(val, obj, row, act){ diff --git a/web/src/main/resources/views/modules/test/testDataForm.html b/web/src/main/resources/views/modules/test/testDataForm.html index 0747d794..7055a13e 100644 --- a/web/src/main/resources/views/modules/test/testDataForm.html +++ b/web/src/main/resources/views/modules/test/testDataForm.html @@ -92,7 +92,7 @@ * ${text('日期时间')}：
<#form:input path="testDatetime" readonly="true" maxlength="20" class="form-control Wdate" - dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false});"/> + dataFormat="datetime" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:true});"/>
@@ -204,11 +204,11 @@ $("#testDataChildDataGrid").dataGrid({ columnModel: [ {header:'状态', name:'status', editable:true, hidden:true}, {header:'主键', name:'id', editable:true, hidden:true}, - {header:'${text('排序号')}', name:'testSort', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits'}}, - {header:'${text('父表主键')}', name:'testData.id', editable:true, hidden:true}, - {header:'${text('单行文本')}', name:'testInput', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}}, - {header:'${text('多行文本')}', name:'testTextarea', width:150, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, - {header:'${text('下拉框')}', name:'testSelect', width:100, + {header:'${text("排序号")}', name:'testSort', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'11', 'class':'form-control digits'}}, + {header:'${text("父表主键")}', name:'testData.id', editable:true, hidden:true}, + {header:'${text("单行文本")}', name:'testInput', width:150, editable:true, edittype:'text', editoptions:{'maxlength':'200', 'class':'form-control'}}, + {header:'${text("多行文本")}', name:'testTextarea', width:150, editable:true, edittype:'textarea', editoptions:{'maxlength':'200', 'class':'form-control', 'rows':'1'}}, + {header:'${text("下拉框")}', name:'testSelect', width:100, editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ @@ -216,7 +216,7 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('下拉多选')}', name:'testSelectMultiple', width:100, + {header:'${text("下拉多选")}', name:'testSelectMultiple', width:100, editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ @@ -224,7 +224,7 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('单选框')}', name:'testRadio', width:100, + {header:'${text("单选框")}', name:'testRadio', width:100, editable:true, edittype:'select', editoptions:{'class':'form-control', items: $.merge([{dictLabel:' ',dictValue:''}], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ @@ -232,7 +232,7 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('复选框')}', name:'testCheckbox', width:100, + {header:'${text("复选框")}', name:'testCheckbox', width:100, editable:true, edittype:'select', editoptions:{multiple:true, 'class':'form-control', items: $.merge([], ${@DictUtils.getDictListJson('sys_menu_type')}), itemLabel: 'dictLabel', itemValue: 'dictValue', dataInit: function(element){ @@ -240,23 +240,23 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('日期选择')}', name:'testDate', width:150, + {header:'${text("日期选择")}', name:'testDate', width:150, formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d'}, editable:true, edittype:'text', editoptions:{'class':'form-control Wdate', 'readonly':'true', dataInit: function(element){ $(element).on('focus', function(){ - WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:false}); + WdatePicker({dateFmt:'yyyy-MM-dd',isShowClear:true}); }); }} }, - {header:'${text('日期时间')}', name:'testDatetime', width:150, + {header:'${text("日期时间")}', name:'testDatetime', width:150, formatter:'date', formatoptions:{srcformat:'Y-m-d H:i:s',newformat:'Y-m-d H:i:s'}, editable:true, edittype:'text', editoptions:{'class':'form-control Wdate', 'readonly':'true', dataInit: function(element){ $(element).on('focus', function(){ - WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:false}); + WdatePicker({dateFmt:'yyyy-MM-dd HH:mm',isShowClear:true}); }); }} }, - {header:'${text('用户选择')}', name:'testUser', width:150, + {header:'${text("用户选择")}', name:'testUser', width:150, formatter: function(val, obj, row, act){ return js.val(row, 'testUser.userCode')+'|'+js.val(row, 'testUser.userName'); }, editable: true, edittype: "custom", editoptions: { @@ -270,7 +270,7 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('机构选择')}', name:'testOffice', width:150, + {header:'${text("机构选择")}', 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: { @@ -284,7 +284,7 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('区域选择')}', name:'testAreaCode', width:150, + {header:'${text("区域选择")}', name:'testAreaCode', width:150, formatter: function(val, obj, row, act){ return js.val(row, 'testAreaCode')+'|'+js.val(row, 'testAreaName'); }, editable: true, edittype: "custom", editoptions: { @@ -298,12 +298,12 @@ $("#testDataChildDataGrid").dataGrid({ } } }, - {header:'${text('操作')}', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:80, sortable:false, fixed:true, formatter: function(val, obj, row, act){ var actions = []; if (val == 'new'){ - actions.push(' '); + actions.push(' '); }else{ - actions.push(' '); + actions.push(' '); } return actions.join(''); }, editoptions: {defaultValue: 'new'}} diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index 8ae9e6f4..d958dcb0 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -118,56 +118,56 @@ <% } %> - \ No newline at end of file diff --git a/web/src/main/resources/views/modules/test/testTreeForm.html b/web/src/main/resources/views/modules/test/testTreeForm.html index 5e3cb307..22fa2c20 100644 --- a/web/src/main/resources/views/modules/test/testTreeForm.html +++ b/web/src/main/resources/views/modules/test/testTreeForm.html @@ -23,27 +23,27 @@ class="" allowClear="true" canSelectRoot="true" canSelectParent="true"/> - -
-
- -
- <#form:hidden path="isNewRecord"/> - <#form:input path="treeCode" maxlength="64" readonly="${!testTree.isNewRecord}" class="form-control required abc"/> -
-
+
+
+
+ +
+ <#form:hidden path="isNewRecord"/> + <#form:input path="treeCode" maxlength="64" readonly="${!testTree.isNewRecord}" class="form-control required abc"/> +
+
-
-
-
- -
- <#form:input path="treeName" maxlength="200" class="form-control required"/> -
-
+
+
+
+ +
+ <#form:input path="treeName" maxlength="200" class="form-control required"/> +
+
@@ -53,9 +53,9 @@ <#form:input path="treeSort" class="form-control required digits"/>
-
-
-
+
+
+