From 7de5358dcdafbf5ea4a08afc6434f1a0a3214d29 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 19 八月 2020 11:17:24 +0800
Subject: [PATCH] 升级fastjson到最新版1.2.73
---
ruoyi-ui/src/views/tool/gen/editTable.vue | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index cf76a27..38cbd55 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -5,8 +5,8 @@
<basic-info-form ref="basicInfo" :info="info" />
</el-tab-pane>
<el-tab-pane label="瀛楁淇℃伅" name="cloum">
- <el-table :data="cloumns" :max-height="tableHeight">
- <el-table-column label="搴忓彿" type="index" min-width="5%" />
+ <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
+ <el-table-column label="搴忓彿" type="index" min-width="5%" class-name="allowDrag" />
<el-table-column
label="瀛楁鍒楀悕"
prop="columnName"
@@ -110,7 +110,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,8 +124,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: {
@@ -142,12 +145,14 @@
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 => {
@@ -157,6 +162,10 @@
/** 鏌ヨ瀛楀吀涓嬫媺鍒楄〃 */
getDictOptionselect().then(response => {
this.dictOptions = response.data;
+ });
+ /** 鏌ヨ鑿滃崟涓嬫媺鍒楄〃 */
+ getMenuTreeselect().then(response => {
+ this.menus = this.handleTree(response.data, "menuId");
});
}
},
@@ -173,7 +182,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);
@@ -198,6 +208,19 @@
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
}
+ },
+ mounted() {
+ const el = this.$refs.dragTable.$el.querySelectorAll(".el-table__body-wrapper > table > tbody")[0];
+ const sortable = Sortable.create(el, {
+ handle: ".allowDrag",
+ onEnd: evt => {
+ const targetRow = this.cloumns.splice(evt.oldIndex, 1)[0];
+ this.cloumns.splice(evt.newIndex, 0, targetRow);
+ for (let index in this.cloumns) {
+ this.cloumns[index].sort = parseInt(index) + 1;
+ }
+ }
+ });
}
};
</script>
--
Gitblit v1.9.3