From c334c2d76c1b51d0fbe1531bf524e1b90f921a7c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 20 五月 2025 15:16:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/tool/gen/editTable.vue | 96 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 47 deletions(-)
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index 66201ea..874fc94 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -45,22 +45,22 @@
<el-table-column label="鎻掑叆" min-width="5%">
<template #default="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 #default="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 #default="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 #default="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%">
@@ -79,7 +79,7 @@
</el-table-column>
<el-table-column label="蹇呭～" min-width="5%">
<template #default="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%">
@@ -118,81 +118,83 @@
</el-tab-pane>
</el-tabs>
<el-form label-width="100px">
- <el-form-item style="text-align: center;margin-left:-100px;margin-top:10px;">
+ <div style="text-align: center;margin-left:-100px;margin-top:10px;">
<el-button type="primary" @click="submitForm()">鎻愪氦</el-button>
<el-button @click="close()">杩斿洖</el-button>
- </el-form-item>
+ </div>
</el-form>
</el-card>
</template>
<script setup name="GenEdit">
-import { getGenTable, updateGenTable } from "@/api/tool/gen";
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
-import basicInfoForm from "./basicInfoForm";
-import genInfoForm from "./genInfoForm";
+import { getGenTable, updateGenTable } from "@/api/tool/gen"
+import { optionselect as getDictOptionselect } from "@/api/system/dict/type"
+import basicInfoForm from "./basicInfoForm"
+import genInfoForm from "./genInfoForm"
-const route = useRoute();
-const { proxy } = getCurrentInstance();
+const route = useRoute()
+const { proxy } = getCurrentInstance()
-const activeName = ref("columnInfo");
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + "px");
-const tables = ref([]);
-const columns = ref([]);
-const dictOptions = ref([]);
-const info = ref({});
+const activeName = ref("columnInfo")
+const tableHeight = ref(document.documentElement.scrollHeight - 245 + "px")
+const tables = ref([])
+const columns = ref([])
+const dictOptions = ref([])
+const info = ref({})
/** 鎻愪氦鎸夐挳 */
function submitForm() {
- const basicForm = proxy.$refs.basicInfo.$refs.basicInfoForm;
- const genForm = proxy.$refs.genInfo.$refs.genInfoForm;
+ const basicForm = proxy.$refs.basicInfo.$refs.basicInfoForm
+ const genForm = proxy.$refs.genInfo.$refs.genInfoForm
Promise.all([basicForm, genForm].map(getFormPromise)).then(res => {
- const validateResult = res.every(item => !!item);
+ const validateResult = res.every(item => !!item)
if (validateResult) {
- const genTable = Object.assign({}, basicForm.model, genForm.model);
- genTable.columns = columns.value;
+ const genTable = Object.assign({}, info.value)
+ genTable.columns = columns.value
genTable.params = {
- treeCode: genTable.treeCode,
- treeName: genTable.treeName,
- treeParentCode: genTable.treeParentCode,
- parentMenuId: genTable.parentMenuId
- };
+ treeCode: info.value.treeCode,
+ treeName: info.value.treeName,
+ treeParentCode: info.value.treeParentCode,
+ parentMenuId: info.value.parentMenuId
+ }
updateGenTable(genTable).then(res => {
- proxy.$modal.msgSuccess(res.msg);
+ proxy.$modal.msgSuccess(res.msg)
if (res.code === 200) {
- close();
+ close()
}
- });
+ })
} else {
- proxy.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
+ proxy.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�")
}
- });
+ })
}
+
function getFormPromise(form) {
return new Promise(resolve => {
form.validate(res => {
- resolve(res);
- });
- });
+ resolve(res)
+ })
+ })
}
+
function close() {
- const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
- proxy.$tab.closeOpenPage(obj);
+ const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } }
+ proxy.$tab.closeOpenPage(obj)
}
(() => {
- const tableId = route.query && route.query.tableId;
+ const tableId = route.params && route.params.tableId
if (tableId) {
// 鑾峰彇琛ㄨ缁嗕俊鎭�
getGenTable(tableId).then(res => {
- columns.value = res.data.rows;
- info.value = res.data.info;
- tables.value = res.data.tables;
- });
+ columns.value = res.data.rows
+ info.value = res.data.info
+ tables.value = res.data.tables
+ })
/** 鏌ヨ瀛楀吀涓嬫媺鍒楄〃 */
getDictOptionselect().then(response => {
- dictOptions.value = response.data;
- });
+ dictOptions.value = response.data
+ })
}
-})();
+})()
</script>
--
Gitblit v1.9.3