From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 20 一月 2025 11:36:18 +0800 Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev --- src/views/tool/gen/index.vue | 107 ++++++++++++++++++++++++++--------------------------- 1 files changed, 53 insertions(+), 54 deletions(-) diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index cb684f8..b4df31b 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -1,20 +1,20 @@ <template> <div class="p-2"> <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave"> - <div class="mb-[10px]" v-show="showSearch"> + <div v-show="showSearch" class="mb-[10px]"> <el-card shadow="hover"> - <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px"> + <el-form ref="queryFormRef" :model="queryParams" :inline="true"> <el-form-item label="鏁版嵁婧�" prop="dataName"> - <el-select v-model="queryParams.dataName" filterable clearable placeholder="璇烽�夋嫨/杈撳叆鏁版嵁婧愬悕绉�" style="width: 200px"> + <el-select v-model="queryParams.dataName" filterable clearable placeholder="璇烽�夋嫨/杈撳叆鏁版嵁婧愬悕绉�"> <el-option key="" label="鍏ㄩ儴" value="" /> <el-option v-for="item in dataNameList" :key="item" :label="item" :value="item"> </el-option> </el-select> </el-form-item> <el-form-item label="琛ㄥ悕绉�" prop="tableName"> - <el-input v-model="queryParams.tableName" placeholder="璇疯緭鍏ヨ〃鍚嶇О" clearable style="width: 200px" @keyup.enter="handleQuery" /> + <el-input v-model="queryParams.tableName" placeholder="璇疯緭鍏ヨ〃鍚嶇О" clearable @keyup.enter="handleQuery" /> </el-form-item> <el-form-item label="琛ㄦ弿杩�" prop="tableComment"> - <el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable style="width: 200px" @keyup.enter="handleQuery" /> + <el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable @keyup.enter="handleQuery" /> </el-form-item> <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px"> <el-date-picker @@ -39,20 +39,20 @@ <template #header> <el-row :gutter="10" class="mb8"> <el-col :span="1.5"> - <el-button type="primary" plain icon="Download" @click="handleGenTable()" v-hasPermi="['tool:gen:code']">鐢熸垚</el-button> + <el-button v-hasPermi="['tool:gen:code']" type="primary" plain icon="Download" @click="handleGenTable()">鐢熸垚</el-button> </el-col> <el-col :span="1.5"> - <el-button type="info" plain icon="Upload" @click="openImportTable" v-hasPermi="['tool:gen:import']">瀵煎叆</el-button> + <el-button v-hasPermi="['tool:gen:import']" type="info" plain icon="Upload" @click="openImportTable">瀵煎叆</el-button> </el-col> <el-col :span="1.5"> - <el-button type="success" plain icon="Edit" :disabled="single" @click="handleEditTable()" v-hasPermi="['tool:gen:edit']">淇敼</el-button> + <el-button v-hasPermi="['tool:gen:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleEditTable()">淇敼</el-button> </el-col> <el-col :span="1.5"> - <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['tool:gen:remove']"> + <el-button v-hasPermi="['tool:gen:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"> 鍒犻櫎 </el-button> </el-col> - <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> + <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar> </el-row> </template> @@ -72,36 +72,36 @@ <el-table-column label="鎿嶄綔" align="center" width="330" class-name="small-padding fixed-width"> <template #default="scope"> <el-tooltip content="棰勮" placement="top"> - <el-button link type="primary" icon="View" @click="handlePreview(scope.row)" v-hasPermi="['tool:gen:preview']"></el-button> + <el-button v-hasPermi="['tool:gen:preview']" link type="primary" icon="View" @click="handlePreview(scope.row)"></el-button> </el-tooltip> <el-tooltip content="缂栬緫" placement="top"> - <el-button link type="primary" icon="Edit" @click="handleEditTable(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button> + <el-button v-hasPermi="['tool:gen:edit']" link type="primary" icon="Edit" @click="handleEditTable(scope.row)"></el-button> </el-tooltip> <el-tooltip content="鍒犻櫎" placement="top"> - <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['tool:gen:remove']"></el-button> + <el-button v-hasPermi="['tool:gen:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button> </el-tooltip> <el-tooltip content="鍚屾" placement="top"> - <el-button link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)" v-hasPermi="['tool:gen:edit']"></el-button> + <el-button v-hasPermi="['tool:gen:edit']" link type="primary" icon="Refresh" @click="handleSynchDb(scope.row)"></el-button> </el-tooltip> <el-tooltip content="鐢熸垚浠g爜" placement="top"> - <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button> + <el-button v-hasPermi="['tool:gen:code']" link type="primary" icon="Download" @click="handleGenTable(scope.row)"></el-button> </el-tooltip> </template> </el-table-column> </el-table> - <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> + <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" /> </el-card> <!-- 棰勮鐣岄潰 --> - <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" top="5vh" append-to-body class="scrollbar"> + <el-dialog v-model="dialog.visible" :title="dialog.title" 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" + :key="value" :label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))" :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.vm'))" - :key="value" > - <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right"> + <el-link v-copyText="value" v-copyText:callback="copyTextSuccess" :underline="false" icon="DocumentCopy" style="float: right"> 澶嶅埗 </el-link> <pre>{{ value }}</pre> @@ -113,8 +113,8 @@ </template> <script setup name="Gen" lang="ts"> -import { listTable, previewTable, delTable, genCode, synchDb, getDataNames } from '@/api/tool/gen'; -import { TableQuery, TableVO } from '@/api/tool/gen/types'; +import {delTable, genCode, getDataNames, listTable, previewTable, synchDb} from '@/api/tool/gen'; +import {TableQuery, TableVO} from '@/api/tool/gen/types'; import router from '@/router'; import ImportTable from './importTable.vue'; @@ -129,7 +129,7 @@ const multiple = ref(true); const total = ref(0); const dateRange = ref<[DateModelType, DateModelType]>(['', '']); -const uniqueId = ref(""); +const uniqueId = ref(''); const dataNameList = ref<Array<string>>([]); const queryFormRef = ref<ElFormInstance>(); @@ -140,34 +140,26 @@ pageSize: 10, tableName: '', tableComment: '', - dataName: "" -}) + dataName: '' +}); -const preview = ref<any>({ +const preview = ref<{ + data: Record<string, string>; + activeName: string; +}>({ data: {}, activeName: 'domain.java' -}) +}); const dialog = reactive<DialogOption>({ visible: false, title: '浠g爜棰勮' }); -onActivated(() => { - const time = route.query.t; - if (time != null && time != uniqueId.value) { - uniqueId.value = time as string; - queryParams.value.pageNum = Number(route.query.pageNum); - dateRange.value = ['', '']; - queryFormRef.value?.resetFields(); - getList(); - } -}) - /** 鏌ヨ澶氭暟鎹簮鍚嶇О */ const getDataNameList = async () => { - const res = await getDataNames() + const res = await getDataNames(); dataNameList.value = res.data; -} +}; /** 鏌ヨ琛ㄩ泦鍚� */ const getList = async () => { @@ -176,65 +168,65 @@ tableList.value = res.rows; total.value = res.total; loading.value = false; -} +}; /** 鎼滅储鎸夐挳鎿嶄綔 */ const handleQuery = () => { queryParams.value.pageNum = 1; getList(); -} +}; /** 鐢熸垚浠g爜鎿嶄綔 */ const handleGenTable = async (row?: TableVO) => { const tbIds = row?.tableId || ids.value; - if (tbIds == "") { + if (tbIds == '') { proxy?.$modal.msgError('璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁'); return; } - if (row?.genType === "1") { + if (row?.genType === '1') { await genCode(row.tableId); proxy?.$modal.msgSuccess('鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�' + row.genPath); } else { proxy?.$download.zip('/tool/gen/batchGenCode?tableIdStr=' + tbIds, 'ruoyi.zip'); } -} +}; /** 鍚屾鏁版嵁搴撴搷浣� */ const handleSynchDb = async (row: TableVO) => { const tableId = row.tableId; await proxy?.$modal.confirm('纭瑕佸己鍒跺悓姝�"' + row.tableName + '"琛ㄧ粨鏋勫悧锛�'); await synchDb(tableId); proxy?.$modal.msgSuccess('鍚屾鎴愬姛'); -} +}; /** 鎵撳紑瀵煎叆琛ㄥ脊绐� */ const openImportTable = () => { importRef.value?.show(queryParams.value.dataName); -} +}; /** 閲嶇疆鎸夐挳鎿嶄綔 */ const resetQuery = () => { dateRange.value = ['', '']; queryFormRef.value?.resetFields(); handleQuery(); -} +}; /** 棰勮鎸夐挳 */ const handlePreview = async (row: TableVO) => { const res = await previewTable(row.tableId); preview.value.data = res.data; dialog.visible = true; preview.value.activeName = 'domain.java'; -} +}; /** 澶嶅埗浠g爜鎴愬姛 */ const copyTextSuccess = () => { proxy?.$modal.msgSuccess('澶嶅埗鎴愬姛'); -} +}; // 澶氶�夋閫変腑鏁版嵁 const handleSelectionChange = (selection: TableVO[]) => { - ids.value = selection.map(item => item.tableId); + ids.value = selection.map((item) => item.tableId); single.value = selection.length != 1; multiple.value = !selection.length; -} +}; /** 淇敼鎸夐挳鎿嶄綔 */ const handleEditTable = (row?: TableVO) => { const tableId = row?.tableId || ids.value[0]; router.push({ path: '/tool/gen-edit/index/' + tableId, query: { pageNum: queryParams.value.pageNum } }); -} +}; /** 鍒犻櫎鎸夐挳鎿嶄綔 */ const handleDelete = async (row?: TableVO) => { const tableIds = row?.tableId || ids.value; @@ -242,10 +234,17 @@ await delTable(tableIds); await getList(); proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛'); -} +}; onMounted(() => { + const time = route.query.t; + if (time != null && time != uniqueId.value) { + uniqueId.value = time as string; + queryParams.value.pageNum = Number(route.query.pageNum); + dateRange.value = ['', '']; + queryFormRef.value?.resetFields(); + } getList(); getDataNameList(); -}) +}); </script> -- Gitblit v1.9.3