From a986b0e75d16a6012380f7a5cbb0c0fa21e0da5c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 18 一月 2023 11:43:11 +0800
Subject: [PATCH] update 优化 修改 oss 配置页面开关说明 避免造成误解
---
ruoyi-ui/src/views/tool/gen/editTable.vue | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index 39a8c66..f34327d 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="瀛楁鍒楀悕"
@@ -33,6 +33,7 @@
<el-option label="Double" value="Double" />
<el-option label="BigDecimal" value="BigDecimal" />
<el-option label="Date" value="Date" />
+ <el-option label="Boolean" value="Boolean" />
</el-select>
</template>
</el-table-column>
@@ -44,22 +45,22 @@
<el-table-column label="鎻掑叆" min-width="5%">
<template slot-scope="scope">
- <el-checkbox true-label="1" v-model="scope.row.isInsert"></el-checkbox>
+ <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="缂栬緫" min-width="5%">
<template slot-scope="scope">
- <el-checkbox true-label="1" v-model="scope.row.isEdit"></el-checkbox>
+ <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鍒楄〃" min-width="5%">
<template slot-scope="scope">
- <el-checkbox true-label="1" v-model="scope.row.isList"></el-checkbox>
+ <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鏌ヨ" min-width="5%">
<template slot-scope="scope">
- <el-checkbox true-label="1" v-model="scope.row.isQuery"></el-checkbox>
+ <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鏌ヨ鏂瑰紡" min-width="10%">
@@ -68,9 +69,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>
@@ -78,7 +79,7 @@
</el-table-column>
<el-table-column label="蹇呭～" min-width="5%">
<template slot-scope="scope">
- <el-checkbox true-label="1" v-model="scope.row.isRequired"></el-checkbox>
+ <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鏄剧ず绫诲瀷" min-width="12%">
@@ -90,6 +91,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 +114,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">
@@ -121,12 +125,15 @@
</el-form>
</el-card>
</template>
+
<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,13 +143,17 @@
data() {
return {
// 閫変腑閫夐」鍗＄殑 name
- activeName: "cloum",
+ activeName: "columnInfo",
// 琛ㄦ牸鐨勯珮搴�
tableHeight: document.documentElement.scrollHeight - 245 + "px",
+ // 琛ㄤ俊鎭�
+ tables: [],
// 琛ㄥ垪淇℃伅
- cloumns: [],
+ columns: [],
// 瀛楀吀淇℃伅
dictOptions: [],
+ // 鑿滃崟淇℃伅
+ menus: [],
// 琛ㄨ缁嗕俊鎭�
info: {}
};
@@ -152,12 +163,17 @@
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 +186,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,8 +213,8 @@
},
/** 鍏抽棴鎸夐挳 */
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() {
@@ -205,10 +222,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