From 6f6a3566ac50bcb9bcae4ae68744c9f49b75933c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 26 九月 2021 17:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-ui/src/views/tool/gen/editTable.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index b9ad258..95b12cf 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -4,8 +4,8 @@
<el-tab-pane label="鍩烘湰淇℃伅" name="basic">
<basic-info-form ref="basicInfo" :info="info" />
</el-tab-pane>
- <el-tab-pane label="瀛楁淇℃伅" name="cloum">
- <el-table ref="dragTable" :data="cloumns" row-key="columnId" :max-height="tableHeight">
+ <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="瀛楁鍒楀悕"
@@ -141,13 +141,13 @@
data() {
return {
// 閫変腑閫夐」鍗＄殑 name
- activeName: "cloum",
+ activeName: "columnInfo",
// 琛ㄦ牸鐨勯珮搴�
tableHeight: document.documentElement.scrollHeight - 245 + "px",
// 琛ㄤ俊鎭�
tables: [],
// 琛ㄥ垪淇℃伅
- cloumns: [],
+ columns: [],
// 瀛楀吀淇℃伅
dictOptions: [],
// 鑿滃崟淇℃伅
@@ -161,7 +161,7 @@
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;
});
@@ -184,7 +184,7 @@
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,
@@ -220,10 +220,10 @@
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;
+ 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;
}
}
});
--
Gitblit v1.9.3