From 69c189a0c97cc6efedae19a4d7d89e18cfd4f4e6 Mon Sep 17 00:00:00 2001 From: RuoYi <yzz_ivy@163.com> Date: 星期五, 01 三月 2024 20:08:52 +0800 Subject: [PATCH] 代码生成新增创建表结构功能 --- src/views/tool/gen/index.vue | 81 +++++++++++++++++++++++----------------- 1 files changed, 46 insertions(+), 35 deletions(-) diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index a500b9b..77e8a80 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -1,11 +1,12 @@ <template> <div class="app-container"> - <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px"> + <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch"> <el-form-item label="琛ㄥ悕绉�" prop="tableName"> <el-input v-model="queryParams.tableName" placeholder="璇疯緭鍏ヨ〃鍚嶇О" clearable + style="width: 200px" @keyup.enter="handleQuery" /> </el-form-item> @@ -14,6 +15,7 @@ v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable + style="width: 200px" @keyup.enter="handleQuery" /> </el-form-item> @@ -39,9 +41,19 @@ type="primary" plain icon="Download" + :disabled="multiple" @click="handleGenTable" v-hasPermi="['tool:gen:code']" >鐢熸垚</el-button> + </el-col> + <el-col :span="1.5"> + <el-button + type="primary" + plain + icon="Plus" + @click="openCreateTable" + v-hasRole="['admin']" + >鍒涘缓</el-button> </el-col> <el-col :span="1.5"> <el-button @@ -105,44 +117,19 @@ <el-table-column label="鎿嶄綔" align="center" width="330" class-name="small-padding fixed-width"> <template #default="scope"> <el-tooltip content="棰勮" placement="top"> - <el-button - type="text" - icon="View" - @click="handlePreview(scope.row)" - v-hasPermi="['tool:gen:preview']" - ></el-button> + <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"></el-button> </el-tooltip> <el-tooltip content="缂栬緫" placement="top"> - <el-button - type="text" - icon="Edit" - @click="handleEditTable(scope.row)" - v-hasPermi="['tool:gen:edit']" - ></el-button> + <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button> </el-tooltip> <el-tooltip content="鍒犻櫎" placement="top"> - <el-button - type="text" - icon="Delete" - @click="handleDelete(scope.row)" - v-hasPermi="['tool:gen:remove']" - ></el-button> + <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']"></el-button> </el-tooltip> <el-tooltip content="鍚屾" placement="top"> - <el-button - type="text" - icon="Refresh" - @click="handleSynchDb(scope.row)" - v-hasPermi="['tool:gen:edit']" - ></el-button> + <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button> </el-tooltip> <el-tooltip content="鐢熸垚浠g爜" placement="top"> - <el-button - type="text" - icon="Download" - @click="handleGenTable(scope.row)" - v-hasPermi="['tool:gen:code']" - ></el-button> + <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button> </el-tooltip> </template> </el-table-column> @@ -155,19 +142,21 @@ @pagination="getList" /> <!-- 棰勮鐣岄潰 --> - <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body custom-class="scrollbar"> + <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body class="scrollbar"> <el-tabs v-model="preview.activeName"> <el-tab-pane v-for="(value, key) in preview.data" :label="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))" :name="key.substring(key.lastIndexOf('/')+1,key.indexOf('.vm'))" - :key="key" + :key="value" > + <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right"> 澶嶅埗</el-link> <pre>{{ value }}</pre> </el-tab-pane> </el-tabs> </el-dialog> <import-table ref="importRef" @ok="handleQuery" /> + <create-table ref="createRef" @ok="handleQuery" /> </div> </template> @@ -175,7 +164,9 @@ import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen"; import router from "@/router"; import importTable from "./importTable"; +import createTable from "./createTable"; +const route = useRoute(); const { proxy } = getCurrentInstance(); const tableList = ref([]); @@ -187,6 +178,7 @@ const total = ref(0); const tableNames = ref([]); const dateRange = ref([]); +const uniqueId = ref(""); const data = reactive({ queryParams: { @@ -204,6 +196,17 @@ }); const { queryParams, preview } = toRefs(data); + +onActivated(() => { + const time = route.query.t; + if (time != null && time != uniqueId.value) { + uniqueId.value = time; + queryParams.value.pageNum = Number(route.query.pageNum); + dateRange.value = []; + proxy.resetForm("queryForm"); + getList(); + } +}) /** 鏌ヨ琛ㄩ泦鍚� */ function getList() { @@ -231,7 +234,7 @@ proxy.$modal.msgSuccess("鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�" + row.genPath); }); } else { - proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi"); + proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi.zip"); } } /** 鍚屾鏁版嵁搴撴搷浣� */ @@ -247,6 +250,10 @@ function openImportTable() { proxy.$refs["importRef"].show(); } +/** 鎵撳紑鍒涘缓琛ㄥ脊绐� */ +function openCreateTable() { + proxy.$refs["createRef"].show(); +} /** 閲嶇疆鎸夐挳鎿嶄綔 */ function resetQuery() { dateRange.value = []; @@ -261,6 +268,10 @@ preview.value.activeName = "domain.java"; }); } +/** 澶嶅埗浠g爜鎴愬姛 */ +function copyTextSuccess() { + proxy.$modal.msgSuccess("澶嶅埗鎴愬姛"); +} // 澶氶�夋閫変腑鏁版嵁 function handleSelectionChange(selection) { ids.value = selection.map(item => item.tableId); @@ -271,7 +282,7 @@ /** 淇敼鎸夐挳鎿嶄綔 */ function handleEditTable(row) { const tableId = row.tableId || ids.value[0]; - router.push({ path: "/tool/gen-edit/index", query: { tableId: tableId, pageNum: queryParams.value.pageNum } }); + router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } }); } /** 鍒犻櫎鎸夐挳鎿嶄綔 */ function handleDelete(row) { -- Gitblit v1.9.3