From d84fee9319f3377fb9bc6cd394bb211fc7b06767 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 16 十一月 2023 12:24:52 +0800
Subject: [PATCH] !58 修复vite环境变量类型原因导致websocket关闭失效问题 Merge pull request !58 from Lau/N/A
---
src/views/tool/gen/index.vue | 198 ++++++++++++++++++++++++------------------------
1 files changed, 99 insertions(+), 99 deletions(-)
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 5775e6a..82d5228 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -1,39 +1,41 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
- <div class="search" v-show="showSearch">
- <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
- <el-form-item label="鏁版嵁婧�" prop="dataName">
- <el-select v-model="queryParams.dataName" filterable clearable placeholder="璇烽�夋嫨/杈撳叆鏁版嵁婧愬悕绉�" style="width: 200px">
- <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-form-item>
- <el-form-item label="琛ㄦ弿杩�" prop="tableComment">
- <el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable style="width: 200px" @keyup.enter="handleQuery" />
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
- <el-date-picker
- v-model="dateRange"
- value-format="YYYY-MM-DD"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- ></el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div class="mb-[10px]" v-show="showSearch">
+ <el-card shadow="hover">
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <el-form-item label="鏁版嵁婧�" prop="dataName">
+ <el-select v-model="queryParams.dataName" filterable clearable placeholder="璇烽�夋嫨/杈撳叆鏁版嵁婧愬悕绉�" style="width: 200px">
+ <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-form-item>
+ <el-form-item label="琛ㄦ弿杩�" prop="tableComment">
+ <el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable style="width: 200px" @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
+ <el-date-picker
+ v-model="dateRange"
+ value-format="YYYY-MM-DD"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ ></el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
</div>
</transition>
- <el-card shadow="never">
+ <el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -99,9 +101,9 @@
:name="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
:key="value"
>
- <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right"
- > 澶嶅埗</el-link
- >
+ <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>
@@ -114,9 +116,7 @@
import { listTable, previewTable, delTable, genCode, synchDb, getDataNames } from '@/api/tool/gen';
import { TableQuery, TableVO } from '@/api/tool/gen/types';
import router from '@/router';
-import importTable from './importTable.vue';
-import { ComponentInternalInstance } from 'vue';
-import { ElForm, DateModelType } from 'element-plus';
+import ImportTable from './importTable.vue';
const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -132,35 +132,35 @@
const uniqueId = ref("");
const dataNameList = ref<Array<string>>([]);
-const queryFormRef = ref(ElForm);
-const importRef = ref(importTable);
+const queryFormRef = ref<ElFormInstance>();
+const importRef = ref<InstanceType<typeof ImportTable>>();
const queryParams = ref<TableQuery>({
- pageNum: 1,
- pageSize: 10,
- tableName: '',
- tableComment: '',
- dataName: ""
+ pageNum: 1,
+ pageSize: 10,
+ tableName: '',
+ tableComment: '',
+ dataName: ""
})
-const preview = ref <any>({
- data: {},
- activeName: 'domain.java'
+const preview = ref<any>({
+ data: {},
+ activeName: 'domain.java'
})
const dialog = reactive<DialogOption>({
- visible: false,
- title: '浠ｇ爜棰勮'
+ visible: false,
+ title: '浠ｇ爜棰勮'
});
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 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();
+ }
})
/** 鏌ヨ澶氭暟鎹簮鍚嶇О */
@@ -171,81 +171,81 @@
/** 鏌ヨ琛ㄩ泦鍚� */
const getList = async () => {
- loading.value = true;
- const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
- tableList.value = res.rows;
- total.value = res.total;
- loading.value = false;
+ loading.value = true;
+ const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
+ tableList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
const handleQuery = () => {
- queryParams.value.pageNum = 1;
- getList();
+ queryParams.value.pageNum = 1;
+ getList();
}
/** 鐢熸垚浠ｇ爜鎿嶄綔 */
const handleGenTable = async (row?: TableVO) => {
- const tbIds = row?.tableId || ids.value;
- if (tbIds == "") {
- proxy?.$modal.msgError('璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁');
- return;
- }
- 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 tbIds = row?.tableId || ids.value;
+ if (tbIds == "") {
+ proxy?.$modal.msgError('璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁');
+ return;
+ }
+ 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 tableId = row.tableId;
+ await proxy?.$modal.confirm('纭瑕佸己鍒跺悓姝�"' + row.tableName + '"琛ㄧ粨鏋勫悧锛�');
+ await synchDb(tableId);
+ proxy?.$modal.msgSuccess('鍚屾鎴愬姛');
}
/** 鎵撳紑瀵煎叆琛ㄥ脊绐� */
const openImportTable = () => {
- importRef.value.show(queryParams.value.dataName);
+ importRef.value?.show(queryParams.value.dataName);
}
/** 閲嶇疆鎸夐挳鎿嶄綔 */
const resetQuery = () => {
- dateRange.value = ['', ''];
- queryFormRef.value.resetFields();
- handleQuery();
+ 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';
+ const res = await previewTable(row.tableId);
+ preview.value.data = res.data;
+ dialog.visible = true;
+ preview.value.activeName = 'domain.java';
}
/** 澶嶅埗浠ｇ爜鎴愬姛 */
const copyTextSuccess = () => {
- proxy?.$modal.msgSuccess('澶嶅埗鎴愬姛');
+ proxy?.$modal.msgSuccess('澶嶅埗鎴愬姛');
}
// 澶氶�夋閫変腑鏁版嵁
const handleSelectionChange = (selection: TableVO[]) => {
- ids.value = selection.map(item => item.tableId);
- single.value = selection.length != 1;
- multiple.value = !selection.length;
+ 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 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;
- await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�');
- await delTable(tableIds);
- getList();
- proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+ const tableIds = row?.tableId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�');
+ await delTable(tableIds);
+ await getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
}
onMounted(() => {
- getList();
- getDataNameList();
+ getList();
+ getDataNameList();
})
</script>
--
Gitblit v1.9.3