From a209b39552d0a360bd5b29af6b6cb58265f9669b Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期四, 10 六月 2021 22:29:13 +0800 Subject: [PATCH] 分页组件新增pagerCount属性 --- ruoyi-ui/src/views/tool/gen/editTable.vue | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue index 5f88c1a..3907189 100644 --- a/ruoyi-ui/src/views/tool/gen/editTable.vue +++ b/ruoyi-ui/src/views/tool/gen/editTable.vue @@ -90,6 +90,9 @@ <el-option label="单选框" value="radio" /> <el-option label="复选框" value="checkbox" /> <el-option label="日期控件" value="datetime" /> + <el-option label="图片上传" value="imageUpload" /> + <el-option label="文件上传" value="fileUpload" /> + <el-option label="富文本控件" value="editor" /> </el-select> </template> </el-table-column> @@ -110,7 +113,7 @@ </el-table> </el-tab-pane> <el-tab-pane label="生成信息" name="genInfo"> - <gen-info-form ref="genInfo" :info="info" /> + <gen-info-form ref="genInfo" :info="info" :tables="tables" :menus="menus"/> </el-tab-pane> </el-tabs> <el-form label-width="100px"> @@ -124,9 +127,11 @@ <script> import { getGenTable, updateGenTable } from "@/api/tool/gen"; import { optionselect as getDictOptionselect } from "@/api/system/dict/type"; +import { listMenu as getMenuTreeselect } from "@/api/system/menu"; import basicInfoForm from "./basicInfoForm"; import genInfoForm from "./genInfoForm"; import Sortable from 'sortablejs' + export default { name: "GenEdit", components: { @@ -139,25 +144,34 @@ activeName: "cloum", // 表格的高度 tableHeight: document.documentElement.scrollHeight - 245 + "px", + // 表信息 + tables: [], // 表列信息 cloumns: [], // 字典信息 dictOptions: [], + // 菜单信息 + menus: [], // 表详细信息 info: {} }; }, - beforeCreate() { - const { tableId } = this.$route.query; + created() { + const tableId = this.$route.params && this.$route.params.tableId; if (tableId) { // 获取表详细信息 getGenTable(tableId).then(res => { this.cloumns = res.data.rows; this.info = res.data.info; + this.tables = res.data.tables; }); /** 查询字典下拉列表 */ getDictOptionselect().then(response => { this.dictOptions = response.data; + }); + /** 查询菜单下拉列表 */ + getMenuTreeselect().then(response => { + this.menus = this.handleTree(response.data, "menuId"); }); } }, @@ -174,7 +188,8 @@ genTable.params = { treeCode: genTable.treeCode, treeName: genTable.treeName, - treeParentCode: genTable.treeParentCode + treeParentCode: genTable.treeParentCode, + parentMenuId: genTable.parentMenuId }; updateGenTable(genTable).then(res => { this.msgSuccess(res.msg); -- Gitblit v1.9.2