From b5db6fe186cc491650711d8cdbaf6652d0a4cac4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 十二月 2021 15:57:11 +0800
Subject: [PATCH] update 重构分页工具 使用分页实体类 过期方法标注过期 3.6.0 移除
---
ruoyi-ui/src/views/tool/gen/editTable.vue | 74 +++++++++++++++++++++++++-----------
1 files changed, 51 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index d91fb02..6ba7f5d 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -4,21 +4,20 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="basic">
<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-tab-pane label="瀛楁淇℃伅" name="columnInfo">
+ <el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
+ <el-table-column label="搴忓彿" type="index" min-width="5%" class-name="allowDrag" />
<el-table-column
label="瀛楁鍒楀悕"
prop="columnName"
min-width="10%"
:show-overflow-tooltip="true"
/>
- <el-table-column
- label="瀛楁鎻忚堪"
- prop="columnComment"
- min-width="10%"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="瀛楁鎻忚堪" min-width="10%">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.columnComment"></el-input>
+ </template>
+ </el-table-column>
<el-table-column
label="鐗╃悊绫诲瀷"
prop="columnType"
@@ -69,9 +68,9 @@
<el-option label="=" value="EQ" />
<el-option label="!=" value="NE" />
<el-option label=">" value="GT" />
- <el-option label=">=" value="GTE" />
+ <el-option label=">=" value="GE" />
<el-option label="<" value="LT" />
- <el-option label="<=" value="LTE" />
+ <el-option label="<=" value="LE" />
<el-option label="LIKE" value="LIKE" />
<el-option label="BETWEEN" value="BETWEEN" />
</el-select>
@@ -91,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>
@@ -111,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">
@@ -125,8 +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: {
@@ -136,28 +141,37 @@
data() {
return {
// 閫変腑閫夐」鍗＄殑 name
- activeName: "cloum",
+ activeName: "columnInfo",
// 琛ㄦ牸鐨勯珮搴�
tableHeight: document.documentElement.scrollHeight - 245 + "px",
+ // 琛ㄤ俊鎭�
+ tables: [],
// 琛ㄥ垪淇℃伅
- cloumns: [],
+ columns: [],
// 瀛楀吀淇℃伅
dictOptions: [],
+ // 鑿滃崟淇℃伅
+ menus: [],
// 琛ㄨ缁嗕俊鎭�
info: {}
};
},
- beforeCreate() {
- const { tableId } = this.$route.query;
+ created() {
+ const tableId = this.$route.query && this.$route.query.tableId;
if (tableId) {
// 鑾峰彇琛ㄨ缁嗕俊鎭�
getGenTable(tableId).then(res => {
- this.cloumns = res.data.rows;
+ this.columns = 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");
});
}
},
@@ -170,20 +184,21 @@
const validateResult = res.every(item => !!item);
if (validateResult) {
const genTable = Object.assign({}, basicForm.model, genForm.model);
- genTable.columns = this.cloumns;
+ genTable.columns = this.columns;
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);
+ this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.close();
}
});
} else {
- this.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
+ this.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
}
});
},
@@ -196,9 +211,22 @@
},
/** 鍏抽棴鎸夐挳 */
close() {
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.push({ path: "/tool/gen", query: { t: Date.now()}})
+ const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: this.$route.query.pageNum } };
+ this.$tab.closeOpenPage(obj);
}
+ },
+ 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.columns.splice(evt.oldIndex, 1)[0];
+ this.columns.splice(evt.newIndex, 0, targetRow);
+ for (let index in this.columns) {
+ this.columns[index].sort = parseInt(index) + 1;
+ }
+ }
+ });
}
};
</script>
--
Gitblit v1.9.3