From a941c1b488581e7a3e43e613d06d6c8af31f8edb Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 09 十二月 2020 10:27:34 +0800
Subject: [PATCH] !134 修改 代码生成 预览无法左右滑动 Merge pull request !134 from 〝走走停停/master
---
ruoyi-ui/src/views/tool/gen/editTable.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index fb1bba1..33d49cb 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -90,6 +90,8 @@
<el-option label="单选框" value="radio" />
<el-option label="复选框" value="checkbox" />
<el-option label="日期控件" value="datetime" />
+ <el-option label="上传控件" value="uploadImage" />
+ <el-option label="富文本控件" value="editor" />
</el-select>
</template>
</el-table-column>
@@ -110,7 +112,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" :menus="menus"/>
</el-tab-pane>
</el-tabs>
<el-form label-width="100px">
@@ -124,9 +126,12 @@
<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 Global from "@/layout/components/global.js";
import basicInfoForm from "./basicInfoForm";
import genInfoForm from "./genInfoForm";
import Sortable from 'sortablejs'
+
export default {
name: "GenEdit",
components: {
@@ -143,6 +148,8 @@
cloumns: [],
// 字典信息
dictOptions: [],
+ // 菜单信息
+ menus: [],
// 表详细信息
info: {}
};
@@ -159,6 +166,10 @@
getDictOptionselect().then(response => {
this.dictOptions = response.data;
});
+ /** 查询菜单下拉列表 */
+ getMenuTreeselect().then(response => {
+ this.menus = this.handleTree(response.data, "menuId");
+ });
}
},
methods: {
@@ -174,7 +185,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);
@@ -196,6 +208,7 @@
},
/** 关闭按钮 */
close() {
+ Global.$emit("removeCache", "closeSelectedTag", this.$route);
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
}
--
Gitblit v1.9.2