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

Tab页签支持拖拽排序；Grid列支持拖拽排序；Grid列支持显示隐藏；表头下放搜索工具条演示；

Browse Source
This commit is contained in:
thinkgem
2020-07-29 17:56:48 +08:00
parent 38ee55bd38
commit a4ca4aeb18
17 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/main/java/com/jeesite/common/collect/ListUtils.java
View File

@@ -46,6 +46,27 @@ public class ListUtils extends org.apache.commons.collections.ListUtils {
return false;
}
/**
* 是否包含字符串
* @param strs 验证字符串组
* @param strs2 字符串组
* @return 包含返回true
*/
public static boolean inString(List<String> strs, List<String> strs2){
if (strs != null && strs2 != null){
for (String s : strs){
if (s != null) {
for (String s2 : strs2){
if (StringUtils.trim(s).equals(StringUtils.trim(s2))){
return true;
}
}
}
}
}
return false;
}
public static <E> ArrayList<E> newArrayList() {
return new ArrayList<E>();
}

1
modules/core/src/main/resources/i18n/core/common_view/i18n_en.properties
View File

@@ -20,6 +20,7 @@
操作=Actions
更多=More
更多操作=More action
设置=Setting
基本信息=Basic information
详细信息=Detail information

1
modules/core/src/main/resources/i18n/core/common_view/i18n_ja_JP.properties
View File

@@ -20,6 +20,7 @@
操作=操作
更多=さらに多
更多操作=他の操作
设置=設置
基本信息=基本情報
详细信息=詳細情報

1
modules/core/src/main/resources/templates/modules/gen/crud/viewList.xml
View File

@@ -22,6 +22,7 @@
\<% if(hasPermi('${permissionPrefix}:edit')){ %>
<a href="\${ctx}/${urlPrefix}/form" class="btn btn-default btnTool" title="\${text('新增${functionNameSimple}')}"><i class="fa fa-plus"></i> \${text('新增')}</a>
\<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="\${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/templates/modules/gen/query/viewList.xml
View File

@@ -19,6 +19,7 @@
<a href="#" class="btn btn-default" id="btnExpandTreeNode" title="\${text('展开一级')}"><i class="fa fa-angle-double-down"></i> \${text('展开')}</a>
<a href="#" class="btn btn-default" id="btnCollapseTreeNode" title="\${text('折叠全部')}"><i class="fa fa-angle-double-up"></i> \${text('折叠')}</a>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="\${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

4
modules/core/src/main/resources/views/include/jslibs.html
View File

@@ -7,6 +7,9 @@
<% if (@ListUtils.inString('zTree', libs!)){ %>
<script src="${ctxStatic}/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js?${_version}"></script>
<% } %>
<% if (@ListUtils.inString(['tabPage', 'dataGrid', 'fileupload'], libs!)){ %>
<script src="${ctxStatic}/jquery/jquery-ui-sortable-1.12.1.min.js"></script>
<% } %>
<% if (@ListUtils.inString('tabPage', libs!)){ %>
<script src="${ctxStatic}/wdScrollTab/js/TabPanel.js?${_version}"></script>
<script src="${ctxStatic}/wdScrollTab/js/TabPanel.extend.js?${_version}"></script>
@@ -34,7 +37,6 @@
<script src="${ctxStatic}/webuploader/0.1/webuploader.js?${_version}"></script>
<script src="${ctxStatic}/webuploader/0.1/webuploader.extend.js?${_version}"></script>
<script src="${ctxStatic}/webuploader/0.1/i18n/${lang()}.js?${_version}"></script>
<script src="${ctxStatic}/jquery/jquery-ui-sortable-1.12.1.min.js"></script>
<% } %>
<% if (@ListUtils.inString('ueditor', libs!)){ %>
<script src="${ctxStatic}/ueditor/1.4/ueditor.config.js?${_version}"></script>

1
modules/core/src/main/resources/views/modules/msg/msgInnerList.html
View File

@@ -10,6 +10,7 @@
<% if(hasPermi('msg:msgInner:edit')){ %>
<a href="${ctx}/msg/msgInner/form" class="btn btn-default btnTool" title="${text('新增')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/views/modules/sys/areaList.html
View File

@@ -13,6 +13,7 @@
<% if(hasPermi('sys:area:edit')){ %>
<a href="${ctx}/sys/area/form" class="btn btn-default btnTool" title="新增区域"><i class="fa fa-plus"></i> 新增</a>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/views/modules/sys/companyList.html
View File

@@ -13,6 +13,7 @@
<% if(hasPermi('sys:company:edit')){ %>
<a href="${ctx}/sys/company/form" class="btn btn-default btnTool" title="${text('新增公司')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

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

@@ -6,7 +6,8 @@
<i class="fa fa-bug"></i> 访问日志
</div>
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/views/modules/sys/officeList.html
View File

@@ -13,6 +13,7 @@
<% if(hasPermi('sys:office:edit')){ %>
<a href="${ctx}/sys/office/form" class="btn btn-default btnTool" title="${text('新增机构')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/views/modules/sys/onlineList.html
View File

@@ -7,6 +7,7 @@
</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>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/views/modules/sys/postList.html
View File

@@ -10,6 +10,7 @@
<% if(hasPermi('sys:post:edit')){ %>
<a href="${ctx}/sys/post/form" class="btn btn-default btnTool" title="${text('新增岗位')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

1
modules/core/src/main/resources/views/modules/sys/user/corpAdminList.html
View File

@@ -14,6 +14,7 @@
<a href="${ctx}/sys/corpAdmin/form?corpCode_=${user.currentUser.corpCode_}&corpName_=${user.currentUser.corpName_}&op=addAdmin" class="btn btn-default btnTool" title="${text('新增管理员')}"><i class="fa fa-plus"></i> ${text('新增管理员')}</a>
<% } %>
<% } %>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

3
modules/core/src/main/resources/views/modules/sys/user/empUserList.html
View File

@@ -17,6 +17,7 @@
<ul class="dropdown-menu">
<li><a href="javascript:" id="btnExport"><i class="glyphicon glyphicon-export"></i> ${text('导出')}</a></li>
<li><a href="javascript:" id="btnImport"><i class="glyphicon glyphicon-import"></i> ${text('导入')}</a></li>
<li><a href="javascript:" id="btnSetting"><i class="fa fa-navicon"></i> ${text('设置')}</a></li>
</ul>
</div>
</div>
@@ -126,7 +127,7 @@ $('#dataGrid').dataGrid({
{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:270, sortable:false, title:false, formatter: function(val, obj, row, act){
var actions = [];
<% if(hasPermi('sys:empUser:edit')){ %>
actions.push('<a href="${ctx}/sys/empUser/form?userCode='+row.userCode+'&op=edit" class="btnList" title="${text("编辑用户")}"><i class="fa fa-pencil"></i></a>&nbsp;');

1
modules/core/src/main/resources/views/modules/sys/user/secAdminList.html
View File

@@ -9,6 +9,7 @@
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="${text('查询')}"><i class="fa fa-filter"></i> ${text('查询')}</a>
<a href="#" class="btn btn-default" id="btnAddAdmin" title="${text('新增')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">

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

@@ -11,6 +11,7 @@
<a href="${ctx}/test/testData/form" class="btn btn-default btnTool" title="${text('新增数据')}"><i class="fa fa-plus"></i> ${text('新增')}</a>
<% } %>
<a href="#" class="btn btn-default" id="btnTrunsTest" title="事务测试"><i class="fa fa-refresh"></i> 事务测试</a>
<a href="#" class="btn btn-default" id="btnSetting" title="${text('设置')}"><i class="fa fa-navicon"></i></a>
</div>
</div>
<div class="box-body">
@@ -123,7 +124,9 @@ $('#dataGrid').dataGrid({
columnModel: [
{header:'${text("单行文本")}', name:'testInput', index:'a.test_input', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
return '<a href="${ctx}/test/testData/form?id='+row.id+'" class="btnList" data-title="${text("编辑数据")}">'+(val||row.id)+'</a>';
}},
}, searchoptions: { dataInit: function (element) {
$(element).attr('form', 'searchForm').attr('name', 'testInput2');
}}},
{header:'${text("多行文本")}', name:'testTextarea', index:'a.test_textarea', width:150, align:"left"},
{header:'${text("下拉框")}', name:'testSelect', index:'a.test_select', width:150, align:"center", formatter: function(val, obj, row, act){
return js.getDictLabel(${@DictUtils.getDictListJson('sys_menu_type')}, val, '${text("未知")}', true);
@@ -215,6 +218,12 @@ $('#dataGrid').dataGrid({
// $("#dataGrid").parent().append("<div class=\"ml10\">没有符合数据</div>");
// }
}
})
// 开启表头下放搜索工具条
//.jqGrid('filterToolbar')
// 列表设置显示隐藏或排序后的事件（可用于设置持久化）
.on('jqGridRemapColumns',function(){
log($('#dataGrid').dataGrid('getParam', 'columnModel'));
});
$("#btnTrunsTest").click(function(){
js.ajaxSubmit("${ctx}/test/testData/transTest", function(data){