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

新增subgrid子表数据展示实例；图标优化；

Browse Source
This commit is contained in:
thinkgem
2019-08-20 20:44:38 +08:00
parent fe2df80654
commit 57a8f10f6c
20 changed files with 104 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/main/resources/templates/modules/gen/crud/viewForm.xml
View File

@@ -19,7 +19,7 @@
<div class="box box-main">
<div class="box-header with-border">
<div class="box-title">
<i class="fa fa-list-alt"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')}
<i class="fa icon-note"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '编辑${functionNameSimple}')}
</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>

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

@@ -10,7 +10,7 @@
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa fa-list-alt"></i> \${text('${functionNameSimple}管理')}
<i class="fa icon-notebook"></i> \${text('${functionNameSimple}管理')}
</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>

2
modules/core/src/main/resources/templates/modules/gen/query/viewForm.xml
View File

@@ -19,7 +19,7 @@
<div class="box box-main">
<div class="box-header with-border">
<div class="box-title">
<i class="fa fa-list-alt"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '详情${functionNameSimple}')}
<i class="fa icon-note"></i> \${text(${className}.isNewRecord ? '新增${functionNameSimple}' : '详情${functionNameSimple}')}
</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>

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

@@ -10,7 +10,7 @@
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa fa-list-alt"></i> \${text('${functionNameSimple}查询')}
<i class="fa icon-notebook"></i> \${text('${functionNameSimple}查询')}
</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>

64
modules/core/src/main/resources/views/modules/sys/sysDesktop.html
View File

File diff suppressed because one or more lines are too long

2
modules/core/src/main/resources/views/modules/sys/user/corpAdminForm.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-list-alt"></i> ${user.isNewRecord ? op == 'addCorp' ? '新增租户' : '新增' : '编辑'}管理员
<i class="fa icon-badge"></i> ${user.isNewRecord ? op == 'addCorp' ? '新增租户' : '新增' : '编辑'}管理员
</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>

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

@@ -3,7 +3,7 @@
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-user"></i> ${@Global.getConfigToBoolean('user.useCorpModel', 'false') ? '租户' : '系统'}管理员
<i class="fa icon-badge"></i> ${@Global.getConfigToBoolean('user.useCorpModel', 'false') ? '租户' : '系统'}管理员
</div>
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>

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

@@ -3,7 +3,7 @@
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-people"></i> 二级管理员管理数据权限
<i class="fa icon-user-female"></i> 二级管理员管理数据权限
</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>

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

@@ -3,7 +3,7 @@
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-user"></i> 二级管理员
<i class="fa icon-user-female"></i> 二级管理员
</div>
<div class="box-tools pull-right">
<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>