wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/izory/ZrAdminNetCore

Browse Source
This commit is contained in:
不做码农 2021-11-16 17:58:17 +08:00
commit b573e9194e
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ZR.CodeGenerator/CodeGeneratorTool.cs
View File

@ -482,6 +482,7 @@ namespace ZR.CodeGenerator
Create_by = genTable.Create_by, Create_by = genTable.Create_by,
Create_time = DateTime.Now, Create_time = DateTime.Now,
IsInsert = !column.IsIdentity,//非自增字段都需要插入 IsInsert = !column.IsIdentity,//非自增字段都需要插入
IsEdit = true,
IsQuery = false, IsQuery = false,
HtmlType = GenConstants.HTML_INPUT HtmlType = GenConstants.HTML_INPUT
}; };
@ -509,9 +510,9 @@ namespace ZR.CodeGenerator
genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA; genTableColumn.HtmlType = GenConstants.HTML_TEXTAREA;
} }
//编辑字段 //编辑字段
if (GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) && !column.IsIdentity && !column.IsPrimarykey) if (column.IsIdentity || column.IsPrimarykey || GenConstants.COLUMNNAME_NOT_EDIT.Any(f => column.DbColumnName.Contains(f)) )
{ {
genTableColumn.IsEdit = true; genTableColumn.IsEdit = false;
} }
//列表字段 //列表字段
if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey)) if (!GenConstants.COLUMNNAME_NOT_LIST.Any(f => column.DbColumnName.Contains(f) && !column.IsPrimarykey))

4
ZR.Vue/src/views/tool/gen/editTable.vue
View File

@ -51,7 +51,7 @@
<el-checkbox v-model="scope.row.isList"></el-checkbox> <el-checkbox v-model="scope.row.isList"></el-checkbox>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="查询" min-width="5%"> <!-- <el-table-column label="查询" min-width="5%">
<template slot-scope="scope"> <template slot-scope="scope">
<el-checkbox v-model="scope.row.isQuery"></el-checkbox> <el-checkbox v-model="scope.row.isQuery"></el-checkbox>
</template> </template>
@ -69,7 +69,7 @@
<el-option label="BETWEEN" value="BETWEEN" /> <el-option label="BETWEEN" value="BETWEEN" />
</el-select> </el-select>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="显示类型" min-width="12%"> <el-table-column label="显示类型" min-width="12%">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-model="scope.row.htmlType"> <el-select v-model="scope.row.htmlType">