Skip to content

Commit b5de479

Browse files
cq-pandacq-panda
committed
增加代码生成器设置table排序功能
1 parent 46885fd commit b5de479

File tree

6 files changed

+40
-12
lines changed

6 files changed

+40
-12
lines changed

‎Vol.Vue/src/views/builder/builderData.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,27 +121,29 @@ let data = {
121121
// ]
122122
]
123123
},
124+
//2021.01.09增加代码生成器设置table排序功能
124125
columns: [
125126
{ field: 'columnId', title: 'ColumnId', width: 120, align: 'left', edit: { type: "text" }, hidden: true },
126127
{ field: 'table_Id', title: 'Table_Id', width: 120, align: 'left', editor: 'text', hidden: true },
127128
{ field: 'columnCnName', title: '列显示名称', fixed: true, width: 120, align: 'left', edit: { type: "text" } },
128129
{ field: 'columnName', title: '列名', fixed: true, width: 120, align: 'left', edit: { type: "text" } },
129130
{ field: 'isKey', title: '主键', width: 90, align: 'left', edit: { type: "switch" } },
130-
{ field: 'isImage', title: 'table列显示类型', hidden: false, width: 130, align: 'left', edit: { type: "select" }, bind: { data: columnType } },
131+
{ field: 'sortable', title: '是否排序', width: 90, align: 'left', edit: { type: "switch",keep:true } },
131132
{ field: 'searchRowNo', title: '查询行', width: 90, align: 'left', edit: { type: "text" } },
132133
{ field: 'searchColNo', title: '查询列', width: 90, align: 'left', edit: { type: "text" } },
133134
{ field: 'searchType', title: '查询类型', width: 150, align: 'left', edit: { type: "select" }, bind: { data: searchDataType } },
134135
{ field: 'editRowNo', title: '编辑行', width: 90, align: 'numberbox', edit: { type: "text" } },
135136
{ field: 'editColNo', title: '编辑列', width: 90, align: 'numberbox', edit: { type: "text" } },
136137
{ field: 'editType', title: '编辑类型', width: 150, align: 'left', edit: { type: "select" }, bind: { data: dataType } },
137138
{ field: 'dropNo', title: '数据源', width: 120, align: 'left', bind: { data: [] }, edit: { type: "select", data: [] } },
138-
{ field: 'orderNo', title: '列显示排序', width: 120, align: 'left', edit: { type: "text" } },
139+
{ field: 'isImage', title: 'table列显示类型', hidden: false, width: 130, align: 'left', edit: { type: "select" }, bind: { data: columnType } },
140+
{ field: 'orderNo', title: '列显示顺序', width: 120, align: 'left', edit: { type: "text" } },
139141
{ field: 'maxlength', title: '字段最大长度', width: 130, align: 'left', edit: { type: "text" } },
140142
{ field: 'columnType', title: '数据类型', width: 120, align: 'left', edit: { type: "text" } },
141-
{ field: 'isNull', title: '可为空', width: 120, align: 'left', edit: { type: "switch" } },
142-
{ field: 'isReadDataset', title: '是否只读', width: 120, align: 'left', edit: { type: "switch" } },
143-
{ field: 'isColumnData', title: '数据列', width: 120, align: 'left', edit: { type: "switch" } },
144-
{ field: 'isDisplay', title: '是否显示', width: 120, align: 'left', edit: { type: "switch" } },
143+
{ field: 'isNull', title: '可为空', width: 120, align: 'left', edit: { type: "switch" ,keep:true } },
144+
{ field: 'isReadDataset', title: '是否只读', width: 120, align: 'left', edit: { type: "switch",keep:true } },
145+
{ field: 'isColumnData', title: '数据列', width: 120, align: 'left', edit: { type: "switch" ,keep:true } },
146+
{ field: 'isDisplay', title: '是否显示', width: 120, align: 'left', edit: { type: "switch",keep:true } },
145147
{ field: 'columnWidth', title: 'table列宽度', width: 120, align: 'left', edit: { type: "text" } },
146148
{ field: 'colSize', title: '编辑列标签宽度colSize', width: 180, align: 'left', edit: { type: "text" } },
147149
// { field: 'import', title: '导入列', hidden: true, width: 100, align: 'left', edit: { type: "switch" } },

‎Vol.Vue/src/views/builder/coder.vue‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,13 @@ export default {
434434
if (!x.data.tableTrueName) {
435435
x.data.tableTrueName = x.data.tableName;
436436
}
437+
//2021.01.09增加代码生成器设置table排序功能
438+
const _fields=["sortable","isNull","isReadDataset","isColumnData","isDisplay"]
439+
x.data.tableColumns.forEach(item=>{
440+
for (let index = 0; index < _fields.length; index++) {
441+
item[_fields[index]]= item[_fields[index]]||0;
442+
}
443+
})
437444
this.tableInfo = x.data;
438445
this.$refs.form.reset(x.data);
439446
this.data = x.data.tableColumns;

‎Vue.Net/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,11 @@ private StringBuilder GetGridColumns(List<Sys_TableColumn> list, string expressF
14221422
{
14231423
sb.Append("link:true,");
14241424
}
1425+
//2021.01.09增加代码生成器设置table排序功能
1426+
if (item.Sortable==1)
1427+
{
1428+
sb.Append("sort:true,");
1429+
}
14251430
}
14261431
else
14271432
{

‎开发版dev/Vue.NetCore/Vol.Vue/src/views/builder/builderData.js‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,27 +121,29 @@ let data = {
121121
// ]
122122
]
123123
},
124+
//2021.01.09增加代码生成器设置table排序功能
124125
columns: [
125126
{ field: 'columnId', title: 'ColumnId', width: 120, align: 'left', edit: { type: "text" }, hidden: true },
126127
{ field: 'table_Id', title: 'Table_Id', width: 120, align: 'left', editor: 'text', hidden: true },
127128
{ field: 'columnCnName', title: '列显示名称', fixed: true, width: 120, align: 'left', edit: { type: "text" } },
128129
{ field: 'columnName', title: '列名', fixed: true, width: 120, align: 'left', edit: { type: "text" } },
129130
{ field: 'isKey', title: '主键', width: 90, align: 'left', edit: { type: "switch" } },
130-
{ field: 'isImage', title: 'table列显示类型', hidden: false, width: 130, align: 'left', edit: { type: "select" }, bind: { data: columnType } },
131+
{ field: 'sortable', title: '是否排序', width: 90, align: 'left', edit: { type: "switch",keep:true } },
131132
{ field: 'searchRowNo', title: '查询行', width: 90, align: 'left', edit: { type: "text" } },
132133
{ field: 'searchColNo', title: '查询列', width: 90, align: 'left', edit: { type: "text" } },
133134
{ field: 'searchType', title: '查询类型', width: 150, align: 'left', edit: { type: "select" }, bind: { data: searchDataType } },
134135
{ field: 'editRowNo', title: '编辑行', width: 90, align: 'numberbox', edit: { type: "text" } },
135136
{ field: 'editColNo', title: '编辑列', width: 90, align: 'numberbox', edit: { type: "text" } },
136137
{ field: 'editType', title: '编辑类型', width: 150, align: 'left', edit: { type: "select" }, bind: { data: dataType } },
137138
{ field: 'dropNo', title: '数据源', width: 120, align: 'left', bind: { data: [] }, edit: { type: "select", data: [] } },
138-
{ field: 'orderNo', title: '列显示排序', width: 120, align: 'left', edit: { type: "text" } },
139+
{ field: 'isImage', title: 'table列显示类型', hidden: false, width: 130, align: 'left', edit: { type: "select" }, bind: { data: columnType } },
140+
{ field: 'orderNo', title: '列显示顺序', width: 120, align: 'left', edit: { type: "text" } },
139141
{ field: 'maxlength', title: '字段最大长度', width: 130, align: 'left', edit: { type: "text" } },
140142
{ field: 'columnType', title: '数据类型', width: 120, align: 'left', edit: { type: "text" } },
141-
{ field: 'isNull', title: '可为空', width: 120, align: 'left', edit: { type: "switch" } },
142-
{ field: 'isReadDataset', title: '是否只读', width: 120, align: 'left', edit: { type: "switch" } },
143-
{ field: 'isColumnData', title: '数据列', width: 120, align: 'left', edit: { type: "switch" } },
144-
{ field: 'isDisplay', title: '是否显示', width: 120, align: 'left', edit: { type: "switch" } },
143+
{ field: 'isNull', title: '可为空', width: 120, align: 'left', edit: { type: "switch" ,keep:true } },
144+
{ field: 'isReadDataset', title: '是否只读', width: 120, align: 'left', edit: { type: "switch",keep:true } },
145+
{ field: 'isColumnData', title: '数据列', width: 120, align: 'left', edit: { type: "switch" ,keep:true } },
146+
{ field: 'isDisplay', title: '是否显示', width: 120, align: 'left', edit: { type: "switch",keep:true } },
145147
{ field: 'columnWidth', title: 'table列宽度', width: 120, align: 'left', edit: { type: "text" } },
146148
{ field: 'colSize', title: '编辑列标签宽度colSize', width: 180, align: 'left', edit: { type: "text" } },
147149
// { field: 'import', title: '导入列', hidden: true, width: 100, align: 'left', edit: { type: "switch" } },

‎开发版dev/Vue.NetCore/Vol.Vue/src/views/builder/coder.vue‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,13 @@ export default {
434434
if (!x.data.tableTrueName) {
435435
x.data.tableTrueName = x.data.tableName;
436436
}
437+
//2021.01.09增加代码生成器设置table排序功能
438+
const _fields=["sortable","isNull","isReadDataset","isColumnData","isDisplay"]
439+
x.data.tableColumns.forEach(item=>{
440+
for (let index = 0; index < _fields.length; index++) {
441+
item[_fields[index]]= item[_fields[index]]||0;
442+
}
443+
})
437444
this.tableInfo = x.data;
438445
this.$refs.form.reset(x.data);
439446
this.data = x.data.tableColumns;

‎开发版dev/Vue.NetCore/Vue.Net/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,11 @@ private StringBuilder GetGridColumns(List<Sys_TableColumn> list, string expressF
14221422
{
14231423
sb.Append("link:true,");
14241424
}
1425+
//2021.01.09增加代码生成器设置table排序功能
1426+
if (item.Sortable==1)
1427+
{
1428+
sb.Append("sort:true,");
1429+
}
14251430
}
14261431
else
14271432
{

0 commit comments

Comments
 (0)