Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

代码生成新增加排序字段

Browse Source
This commit is contained in:
不做码农
2021-12-01 21:03:27 +08:00
parent 5a03ce182b
commit 31b2681028
14 changed files with 106 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
ZR.Vue/src/views/index.vue
View File

@@ -62,7 +62,7 @@
<li>Quartz.Net</li>
<li>MySql</li>
<li>Mapster</li>
<li>Epplus</li>
<li>Epplus</li>
<li>...</li>
</ul>
</el-col>
@@ -109,27 +109,25 @@
<span>更新日志</span>
</div>
<el-collapse accordion>
<el-collapse-item title="v3.7.1 - 2021-12-01">
<el-collapse-item title="v3.7.0 - 2021-12-01">
<ol>
<li>代码生成新增加排序字段</li>
<li>新增加登录验证码开关</li>
<li>替换代码生成器模板引擎</li>
<li>富文本组件Editor改用全局注册</li>
<li>新增加上传文件到阿里云</li>
<li>fix gen_table_column表表名字段长度不够</li>
<li>其他功能优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.7.0 - 2021-11-28">
<ol>
<li>替换代码生成器模板引擎</li>
<li>富文本组件Editor改用全局注册</li>
<li>新增加上传文件到阿里云</li>
<li>fix gen_table_column表表名字段长度不够</li>
<li>代码生成新增排序字段</li>
<li>fix 代码生成编辑表信息选择上级菜单bug</li>
<li>新增下拉框组件代码生成查询模块</li>
<li>优化代码生成模板</li>
<li>优化后端分页统一返回json</li>
<li>修改代码生成form表单显示</li>
<li>新增代码生成单选按钮动态绑定数据</li>
<li>代码生成查询新增一键生成、可支持input、select、时间</li>
<li>修改代码生成数据库连接字符串</li>
<li>优化数据仓储</li>
<li>优化代码生成模板</li>
<li>优化后端分页统一返回json</li>
<li>修改代码生成form表单显示</li>
<li>新增代码生成单选按钮动态绑定数据</li>
<li>代码生成查询新增一键生成、可支持input、select、时间</li>
<li>修改代码生成数据库连接字符串</li>
<li>优化数据仓储</li>
<li>其他功能优化</li>
</ol>
</el-collapse-item>
<el-collapse-item title="v3.6.0 - 2021-11-21">
@@ -178,7 +176,7 @@
</template>
<script>
const defaultSettings = require('@/settings.js')
const defaultSettings = require("@/settings.js");
export default {
name: "index",
data() {

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

@@ -101,7 +101,7 @@
</el-table>
</el-tab-pane>
<el-tab-pane label="生成信息" name="genInfo">
<gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus" />
<gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus" :columns="cloumns"/>
</el-tab-pane>
</el-tabs>
<el-form label-width="100px">
@@ -155,9 +155,9 @@ export default {
if (tableId) {
// 获取表详细信息
queryColumnInfo(tableId).then((res) => {
this.cloumns = res.data.result;
this.cloumns = res.data.cloumns;
this.info = res.data.info;
this.tables = res.data.tables;
// this.tables = res.data.tables;/子表
});
/** 查询字典下拉列表 */
listType().then((response) => {

43
ZR.Vue/src/views/tool/gen/genInfoForm.vue
View File

@@ -68,7 +68,23 @@
<i class="el-icon-question"></i>
</el-tooltip>
</span>
<treeselect :append-to-body="true" v-model="info.parentMenuId" :options="menus" :normalizer="normalizer" :show-count="true" placeholder="请选择系统菜单" />
<treeselect :append-to-body="true" v-model="info.parentMenuId" :options="menus" :normalizer="normalizer" :show-count="true"
placeholder="请选择系统菜单" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span slot="label">
排序字段
</span>
<el-select v-model="info.sortField" placeholder="请选择字段" class="mr10">
<el-option v-for="item in columns" :key="item.columnId" :label="item.csharpField" :value="item.csharpField">
</el-option>
</el-select>
<el-radio v-model="info.sortType" label="asc">正序</el-radio>
<el-radio v-model="info.sortType" label="desc">倒序</el-radio>
</el-form-item>
</el-col>
@@ -119,7 +135,8 @@
</el-tooltip>
</span>
<el-select v-model="info.treeCode" placeholder="请选择">
<el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment" :value="column.columnName"></el-option>
<el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment"
:value="column.columnName"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -132,7 +149,8 @@
</el-tooltip>
</span>
<el-select v-model="info.treeParentCode" placeholder="请选择">
<el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment" :value="column.columnName"></el-option>
<el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment"
:value="column.columnName"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -145,7 +163,8 @@
</el-tooltip>
</span>
<el-select v-model="info.treeName" placeholder="请选择">
<el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment" :value="column.columnName"></el-option>
<el-option v-for="(column, index) in info.columns" :key="index" :label="column.columnName + '：' + column.columnComment"
:value="column.columnName"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -161,7 +180,8 @@
</el-tooltip>
</span>
<el-select v-model="info.subTableName" placeholder="请选择" @change="subSelectChange">
<el-option v-for="(table, index) in tables" :key="index" :label="table.tableName + '：' + table.tableComment" :value="table.tableName"></el-option>
<el-option v-for="(table, index) in tables" :key="index" :label="table.tableName + '：' + table.tableComment" :value="table.tableName">
</el-option>
</el-select>
</el-form-item>
</el-col>
@@ -174,7 +194,8 @@
</el-tooltip>
</span>
<el-select v-model="info.subTableFkName" placeholder="请选择">
<el-option v-for="(column, index) in subColumns" :key="index" :label="column.columnName + '：' + column.columnComment" :value="column.columnName"></el-option>
<el-option v-for="(column, index) in subColumns" :key="index" :label="column.columnName + '：' + column.columnComment"
:value="column.columnName"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -193,6 +214,7 @@ export default {
type: Object,
default: null,
},
// 字表
tables: {
type: Array,
default: null,
@@ -201,6 +223,11 @@ export default {
type: Array,
default: [],
},
// 列
columns: {
type: Array,
default: [],
},
},
data() {
return {
@@ -221,7 +248,9 @@ export default {
},
};
},
created() {},
created() {
console.log(this.columns);
},
watch: {
"info.subTableName": function (val) {
this.setSubTableColumns(val);