diff --git a/modules/cms/src/main/resources/views/modules/cms/articleList.html b/modules/cms/src/main/resources/views/modules/cms/articleList.html index 11f59ef8..8499485e 100644 --- a/modules/cms/src/main/resources/views/modules/cms/articleList.html +++ b/modules/cms/src/main/resources/views/modules/cms/articleList.html @@ -68,7 +68,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"}, // {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"}, - {header:'${text("操作")}', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('cms:article:edit')){ %> actions.push(' '); diff --git a/modules/cms/src/main/resources/views/modules/cms/categoryList.html b/modules/cms/src/main/resources/views/modules/cms/categoryList.html index c6a95bb3..fa57490f 100644 --- a/modules/cms/src/main/resources/views/modules/cms/categoryList.html +++ b/modules/cms/src/main/resources/views/modules/cms/categoryList.html @@ -85,7 +85,7 @@ $('#dataGrid').dataGrid({ {header:'${text("展现方式")}', name:'showModes', index:'a.show_modes', width:150, fixed:true, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('cms_show_modes')}, val, '未知', true); }}, - {header:'${text("操作")}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('cms:category:edit')){ %> actions.push(' '); diff --git a/modules/cms/src/main/resources/views/modules/cms/commentList.html b/modules/cms/src/main/resources/views/modules/cms/commentList.html index a6982d53..a1f70a02 100644 --- a/modules/cms/src/main/resources/views/modules/cms/commentList.html +++ b/modules/cms/src/main/resources/views/modules/cms/commentList.html @@ -127,7 +127,7 @@ $('#dataGrid').dataGrid({ {header:'${text('状态')}', name:'status', index:'a.status', width:150, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text('未知')}', true); }}, - {header:'${text('操作')}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('cms:comment:edit')){ %> actions.push(' '); diff --git a/modules/cms/src/main/resources/views/modules/cms/reportList.html b/modules/cms/src/main/resources/views/modules/cms/reportList.html index 2fbf77bb..a912d99f 100644 --- a/modules/cms/src/main/resources/views/modules/cms/reportList.html +++ b/modules/cms/src/main/resources/views/modules/cms/reportList.html @@ -68,7 +68,7 @@ $('#dataGrid').dataGrid({ {header:'${text('举报的URL')}', name:'reportUrl', index:'a.report_url', width:150, align:"left"}, {header:'${text('举报类型')}', name:'reportType', index:'a.report_type', width:150, align:"left"}, {header:'${text('举报原因')}', name:'reportCause', index:'a.report_cause', 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, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('cms:report:edit')){ %> actions.push(' '); diff --git a/modules/cms/src/main/resources/views/modules/cms/siteList.html b/modules/cms/src/main/resources/views/modules/cms/siteList.html index da056567..8a72a9da 100644 --- a/modules/cms/src/main/resources/views/modules/cms/siteList.html +++ b/modules/cms/src/main/resources/views/modules/cms/siteList.html @@ -67,7 +67,7 @@ $('#dataGrid').dataGrid({ return js.getDictLabel(${@DictUtils.getDictListJson('sys_search_status')}, val, '${text('未知')}', true); }}, {header:'${text('创建时间')}', name:'createDate', index:'a.create_date', width:150, align:"center"}, - {header:'${text('操作')}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text('操作')}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('cms:site:edit')){ %> actions.push(' '); diff --git a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html index 75968d3d..8463bc5a 100644 --- a/modules/cms/src/main/resources/views/modules/cms/visitLogList.html +++ b/modules/cms/src/main/resources/views/modules/cms/visitLogList.html @@ -89,7 +89,7 @@ $('#dataGrid').dataGrid({ {header:'${text('访问页面标题')}', name:'contentTitle', index:'a.content_title', width:150, align:"left"}, {header:'${text('访问用户编码')}', name:'visitUserCode', index:'a.visit_user_code', 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, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('cms:visitLog:edit')){ %> actions.push(' '); 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 0f3ab15a..943742a3 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 @@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({ } } %> - {header:'\${text("操作")}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'\${text("操作")}', name:'actions', width:${table.isTreeEntity?150:120}, formatter: function(val, obj, row, act){ var actions = []; <% if(isQueryTpl){ %> actions.push(' '); diff --git a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html index e6ac4681..3922ea63 100644 --- a/modules/core/src/main/resources/views/modules/msg/msgInnerList.html +++ b/modules/core/src/main/resources/views/modules/msg/msgInnerList.html @@ -87,7 +87,7 @@ $('#dataGrid').dataGrid({ {header:'${text("状态")}', name:'status', index:'a.status', width:80, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('msg_inner_msg_status')}, val, '${text("未知")}', true); }}, - {header:'${text("操作")}', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; if(row.status == Global.STATUS_DRAFT){ <% if(hasPermi('msg:msgInner:edit')){ %> diff --git a/modules/core/src/main/resources/views/modules/sys/areaList.html b/modules/core/src/main/resources/views/modules/sys/areaList.html index 6a76d9b9..db05c71d 100644 --- a/modules/core/src/main/resources/views/modules/sys/areaList.html +++ b/modules/core/src/main/resources/views/modules/sys/areaList.html @@ -65,7 +65,7 @@ $('#dataGrid').dataGrid({ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, {header:'更新时间', name:'updateDate', index:'a.update_date', width:150, align:"center"}, - {header:'操作', name:'actions', width:130, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'操作', name:'actions', width:130, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:area:edit')){ %> actions.push(' '); 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 5482534c..c8805c4f 100644 --- a/modules/core/src/main/resources/views/modules/sys/companyList.html +++ b/modules/core/src/main/resources/views/modules/sys/companyList.html @@ -70,7 +70,7 @@ $('#dataGrid').dataGrid({ {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:150, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:company:edit')){ %> actions.push(' '); diff --git a/modules/core/src/main/resources/views/modules/sys/logList.html b/modules/core/src/main/resources/views/modules/sys/logList.html index 46d01a02..de26cf89 100644 --- a/modules/core/src/main/resources/views/modules/sys/logList.html +++ b/modules/core/src/main/resources/views/modules/sys/logList.html @@ -121,7 +121,7 @@ $('#dataGrid').dataGrid({ {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, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'操作', name:'actions', width:130, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:log:edit')){ %> actions.push(' '); 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 699a61e7..556a8b0a 100644 --- a/modules/core/src/main/resources/views/modules/sys/officeList.html +++ b/modules/core/src/main/resources/views/modules/sys/officeList.html @@ -79,7 +79,7 @@ $('#dataGrid').dataGrid({ {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, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:office:edit')){ %> actions.push(' '); diff --git a/modules/core/src/main/resources/views/modules/sys/onlineList.html b/modules/core/src/main/resources/views/modules/sys/onlineList.html index 10c381e8..fb7f7a70 100644 --- a/modules/core/src/main/resources/views/modules/sys/onlineList.html +++ b/modules/core/src/main/resources/views/modules/sys/onlineList.html @@ -62,7 +62,7 @@ $('#dataGrid').dataGrid({ return js.getDictLabel(${@DictUtils.getDictListJson('sys_device_type')}, val, 'PC', true); }} <% if(hasPermi('sys:online:edit')){ %> - ,{header:'${text("操作")}', name:'actions', width:50, sortable:false, formatter: function(val, obj, row, act){ + ,{header:'${text("操作")}', name:'actions', width:100, sortable:false, formatter: function(val, obj, row, act){ var actions = []; 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 4cecd950..0cea7b8c 100644 --- a/modules/core/src/main/resources/views/modules/sys/postList.html +++ b/modules/core/src/main/resources/views/modules/sys/postList.html @@ -69,7 +69,7 @@ $('#dataGrid').dataGrid({ {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, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:post:edit')){ %> actions.push(' '); diff --git a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html index 5681d442..ff13a2f8 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html @@ -83,7 +83,7 @@ $('#dataGrid').dataGrid({ {header:'${text("状态")}', name:'status', index:'a.status', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, - {header:'${text("操作")}', name:'actions', width:250, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:corpAdmin:edit')){ %> actions.push(' '); 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 47e6f971..17523048 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 @@ -123,21 +123,21 @@ $('#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){ + {header:'${text("登录账号")}', name:'loginCode', index:'a.login_code', width:150, 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:135, align:"center"}, + {header:'${text("员工姓名")}', name:'refName', index:'a.ref_name', width:135, align:"center"}, + {header:'${text("归属机构")}', name:'employee.office.officeName', index:'o.office_name', width:135, align:"center"}, + {header:'${text("归属公司")}', name:'employee.company.companyName', index:'c.company_name', width:135, align:"center"}, + {header:'${text("电子邮箱")}', name:'email', index:'a.email', width:135, align:"center"}, + {header:'${text("手机号码")}', name:'mobile', index:'a.mobile', width:135, align:"center"}, + {header:'${text("办公电话")}', name:'phone', index:'a.phone', width:135, align:"center"}, + {header:'${text("更新时间")}', name:'updateDate', index:'a.update_date', width:135, align:"center"}, + {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:270, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:empUser:edit')){ %> actions.push(' '); diff --git a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html index 2525716c..83a8b958 100644 --- a/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html +++ b/modules/core/src/main/resources/views/modules/sys/user/secAdminList.html @@ -89,7 +89,7 @@ $('#dataGrid').dataGrid({ {header:'${text("状态")}', name:'status', index:'a.status', width:100, align:"center", formatter: function(val, obj, row, act){ return js.getDictLabel(${@DictUtils.getDictListJson('sys_status')}, val, '未知', true); }}, - {header:'${text("操作")}', name:'actions', width:150, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:150, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('sys:secAdmin:edit')){ %> actions.push(' '); diff --git a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html index cd2a90b5..c232c361 100644 --- a/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html +++ b/web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html @@ -160,7 +160,7 @@ $('#dataGrid').dataGrid({ }}, {header:'创建时间', name:'createDate', index:'a.create_date', width:150, align:"center"}, {header:'备注信息', name:'remarks', index:'a.remarks', width:150, align:"left"}, - {header:'操作', name:'actions', width:120, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'操作', name:'actions', width:120, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('test:testData:edit')){ %> actions.push(' '); diff --git a/web/src/main/resources/views/modules/test/testDataList.html b/web/src/main/resources/views/modules/test/testDataList.html index 3abcd49c..279178ec 100644 --- a/web/src/main/resources/views/modules/test/testDataList.html +++ b/web/src/main/resources/views/modules/test/testDataList.html @@ -151,7 +151,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("创建时间")}', name:'createDate', index:'a.create_date', firstsortorder:'desc', width:150, align:"center"}, {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', width:150, align:"left"}, - {header:'${text("操作")}', name:'actions', width:200, sortable:false, title:false, formatter: function(val, obj, row, act){ + {header:'${text("操作")}', name:'actions', width:200, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('test:testData:edit')){ %> actions.push(' '); diff --git a/web/src/main/resources/views/modules/test/testTreeList.html b/web/src/main/resources/views/modules/test/testTreeList.html index 38e52e4e..f1e6c8a2 100644 --- a/web/src/main/resources/views/modules/test/testTreeList.html +++ b/web/src/main/resources/views/modules/test/testTreeList.html @@ -62,7 +62,7 @@ $('#dataGrid').dataGrid({ }}, {header:'${text("创建时间")}', name:'createDate', index:'a.create_date', width:150, align:"center"}, {header:'${text("备注信息")}', name:'remarks', index:'a.remarks', 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, formatter: function(val, obj, row, act){ var actions = []; <% if(hasPermi('test:testTree:edit')){ %> actions.push(' ');