github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

代码生成列属性根据sort排序

pull/159/head
RuoYi 2020-04-01 10:38:57 +08:00
parent 22d1e5882a
commit 55512bdbec
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-admin/src/main/resources/static/ruoyi/index.js
View File

@ -14,12 +14,10 @@ $(function() {
$('#side-menu').metisMenu(); $('#side-menu').metisMenu();
// 固定菜单栏 // 固定菜单栏
$(function() { $('.sidebar-collapse').slimScroll({
$('.sidebar-collapse').slimScroll({ height: '96%',
height: '96%', railOpacity: 0.9,
railOpacity: 0.9, alwaysVisible: false
alwaysVisible: false
});
}); });
// 菜单切换 // 菜单切换

4
ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
View File

@ -98,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id LEFT JOIN gen_table_column c ON t.table_id = c.table_id
where t.table_id = #{tableId} where t.table_id = #{tableId} order by c.sort
</select> </select>
<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult"> <select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
@ -106,7 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
FROM gen_table t FROM gen_table t
LEFT JOIN gen_table_column c ON t.table_id = c.table_id LEFT JOIN gen_table_column c ON t.table_id = c.table_id
where t.table_name = #{tableName} where t.table_name = #{tableName} order by c.sort
</select> </select>
<insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId"> <insert id="insertGenTable" parameterType="GenTable" useGeneratedKeys="true" keyProperty="tableId">

10
ruoyi-generator/src/main/resources/templates/tool/gen/gen.html
View File

@ -88,12 +88,18 @@
{ {
field: 'tableName', field: 'tableName',
title: '表名称', title: '表名称',
sortable: true sortable: true,
formatter: function(value, row, index) {
return $.table.tooltip(value);
}
}, },
{ {
field: 'tableComment', field: 'tableComment',
title: '表描述', title: '表描述',
sortable: true sortable: true,
formatter: function(value, row, index) {
return $.table.tooltip(value, 15);
}
}, },
{ {
field: 'className', field: 'className',