From 8f3fd3579baace06690af2ae5293ac2cc9414a1e Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Tue, 4 Jul 2023 09:30:46 +0800
Subject: [PATCH] fix

---
 src/api/system/dict/type.js          |   7 +-
 src/api/tool/gen.js                  |  64 ++--
 src/router/index.js                  |  18 +-
 src/views/tenant/index.vue           | 513 ++++++++++++++-------------
 src/views/tool/gen/basicInfoForm.vue |   6 +-
 src/views/tool/gen/editTable.vue     |  82 +++--
 src/views/tool/gen/genInfoForm.vue   |  69 ++--
 src/views/tool/gen/importTable.vue   |  42 ++-
 src/views/tool/gen/index.vue         | 181 +++++++---
 vite.config.js                       |   4 +-
 10 files changed, 585 insertions(+), 401 deletions(-)

diff --git a/src/api/system/dict/type.js b/src/api/system/dict/type.js
index 3716e16..c3b3834 100644
--- a/src/api/system/dict/type.js
+++ b/src/api/system/dict/type.js
@@ -54,8 +54,7 @@ export function refreshCache() {
 // 获取字典选择框列表
 export function optionselect() {
   return request({
-    url: '/system/dict/type/option-select',
-    method: 'get'
-  })
+    url: "/system/dict/type/option-select",
+    method: "get",
+  });
 }
-
diff --git a/src/api/tool/gen.js b/src/api/tool/gen.js
index 4506927..e3461ab 100644
--- a/src/api/tool/gen.js
+++ b/src/api/tool/gen.js
@@ -1,76 +1,76 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询生成表数据
 export function listTable(query) {
   return request({
-    url: '/tool/gen/list',
-    method: 'get',
-    params: query
-  })
+    url: "/tool/gen/list",
+    method: "get",
+    params: query,
+  });
 }
 // 查询db数据库列表
 export function listDbTable(query) {
   return request({
-    url: '/tool/gen/db/list',
-    method: 'get',
-    params: query
-  })
+    url: "/tool/gen/db/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 查询表详细信息
 export function getGenTable(tableId) {
   return request({
-    url: '/tool/gen/' + tableId,
-    method: 'get'
-  })
+    url: "/tool/gen/" + tableId,
+    method: "get",
+  });
 }
 
 // 修改代码生成信息
 export function updateGenTable(data) {
   return request({
-    url: '/tool/gen',
-    method: 'put',
-    data: data
-  })
+    url: "/tool/gen",
+    method: "put",
+    data: data,
+  });
 }
 
 // 导入表
 export function importTable(data) {
   return request({
-    url: '/tool/gen/importTable',
-    method: 'post',
-    params: data
-  })
+    url: "/tool/gen/importTable",
+    method: "post",
+    params: data,
+  });
 }
 
 // 预览生成代码
 export function previewTable(tableId) {
   return request({
-    url: '/tool/gen/preview/' + tableId,
-    method: 'get'
-  })
+    url: "/tool/gen/preview/" + tableId,
+    method: "get",
+  });
 }
 
 // 删除表数据
 export function delTable(tableId) {
   return request({
-    url: '/tool/gen/' + tableId,
-    method: 'delete'
-  })
+    url: "/tool/gen/" + tableId,
+    method: "delete",
+  });
 }
 
 // 生成代码（自定义路径）
 export function genCode(tableName) {
   return request({
-    url: '/tool/gen/genCode/' + tableName,
-    method: 'get'
-  })
+    url: "/tool/gen/genCode/" + tableName,
+    method: "get",
+  });
 }
 
 // 同步数据库
 export function synchDb(tableName) {
   return request({
-    url: '/tool/gen/synchDb/' + tableName,
-    method: 'get'
-  })
+    url: "/tool/gen/synchDb/" + tableName,
+    method: "get",
+  });
 }
diff --git a/src/router/index.js b/src/router/index.js
index 2be50d6..dbc4948 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -131,19 +131,19 @@ export const dynamicRoutes = [
     ],
   },
   {
-    path: '/tool/gen-edit',
+    path: "/tool/gen-edit",
     component: Layout,
     hidden: true,
-    permissions: ['tool:gen:edit'],
+    permissions: ["tool:gen:edit"],
     children: [
       {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
-      }
-    ]
-  }
+        path: "index/:tableId(\\d+)",
+        component: () => import("@/views/tool/gen/editTable"),
+        name: "GenEdit",
+        meta: { title: "修改生成配置", activeMenu: "/tool/gen" },
+      },
+    ],
+  },
 ];
 
 const router = createRouter({
diff --git a/src/views/tenant/index.vue b/src/views/tenant/index.vue
index b24a1f1..2f845c0 100644
--- a/src/views/tenant/index.vue
+++ b/src/views/tenant/index.vue
@@ -1,31 +1,31 @@
 <template>
   <div class="app-container">
     <el-form
-        v-show="showSearch"
-        ref="queryRef"
-        :inline="true"
-        :model="queryParams"
-        label-width="68px"
+      v-show="showSearch"
+      ref="queryRef"
+      :inline="true"
+      :model="queryParams"
+      label-width="68px"
     >
       <el-form-item label="公司名称" prop="companyName">
         <el-input
-            v-model="queryParams.companyName"
-            clearable
-            placeholder="请输入公司名称"
-            @keyup.enter="handleQuery"
+          v-model="queryParams.companyName"
+          clearable
+          placeholder="请输入公司名称"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="联系人" prop="contactName">
         <el-input
-            v-model="queryParams.contactName"
-            clearable
-            placeholder="请输入联系人名称"
-            @keyup.enter="handleQuery"
+          v-model="queryParams.contactName"
+          clearable
+          placeholder="请输入联系人名称"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item>
         <el-button icon="Search" type="primary" @click="handleQuery"
-        >搜索
+          >搜索
         </el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
@@ -34,95 +34,95 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['tenant:add']"
-            icon="Plus"
-            plain
-            type="primary"
-            @click="handleAdd"
-        >新增
+          v-hasPermi="['tenant:add']"
+          icon="Plus"
+          plain
+          type="primary"
+          @click="handleAdd"
+          >新增
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['tenant:edit']"
-            :disabled="single"
-            icon="Edit"
-            plain
-            type="success"
-            @click="handleUpdate"
-        >修改
+          v-hasPermi="['tenant:edit']"
+          :disabled="single"
+          icon="Edit"
+          plain
+          type="success"
+          @click="handleUpdate"
+          >修改
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['tenant:remove']"
-            :disabled="multiple"
-            icon="Delete"
-            plain
-            type="danger"
-            @click="handleDelete"
-        >删除
+          v-hasPermi="['tenant:remove']"
+          :disabled="multiple"
+          icon="Delete"
+          plain
+          type="danger"
+          @click="handleDelete"
+          >删除
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['tenant:export']"
-            icon="Download"
-            plain
-            type="warning"
-            @click="handleExport"
-        >导出
+          v-hasPermi="['tenant:export']"
+          icon="Download"
+          plain
+          type="warning"
+          @click="handleExport"
+          >导出
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            v-hasPermi="['tenant:remove']"
-            icon="Refresh"
-            plain
-            type="danger"
-            @click="handleRefreshCache"
-        >刷新缓存
+          v-hasPermi="['tenant:remove']"
+          icon="Refresh"
+          plain
+          type="danger"
+          @click="handleRefreshCache"
+          >刷新缓存
         </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
-            :disabled="single || isInit(ids[0])"
-            icon="Refresh"
-            plain
-            type="primary"
-            @click="handleInitialize"
-        >初始化
+          :disabled="single || isInit(ids[0])"
+          icon="Refresh"
+          plain
+          type="primary"
+          @click="handleInitialize"
+          >初始化
         </el-button>
       </el-col>
       <right-toolbar
-          v-model:showSearch="showSearch"
-          @queryTable="getList"
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
       ></right-toolbar>
     </el-row>
 
     <el-table
-        v-loading="loading"
-        :data="tenantList"
-        @selection-change="handleSelectionChange"
+      v-loading="loading"
+      :data="tenantList"
+      @selection-change="handleSelectionChange"
     >
-      <el-table-column align="center" type="selection" width="55"/>
-      <el-table-column align="center" label="公司名称" prop="companyName"/>
-      <el-table-column align="center" label="联系人名称" prop="contactName"/>
-      <el-table-column align="center" label="联系人电话" prop="contactPhone"/>
+      <el-table-column align="center" type="selection" width="55" />
+      <el-table-column align="center" label="公司名称" prop="companyName" />
+      <el-table-column align="center" label="联系人名称" prop="contactName" />
+      <el-table-column align="center" label="联系人电话" prop="contactPhone" />
       <el-table-column
-          align="center"
-          label="过期时间"
-          prop="expireTime"
-          width="180"
+        align="center"
+        label="过期时间"
+        prop="expireTime"
+        width="180"
       >
         <template #default="scope">
           <span>{{ parseTime(scope.row.expireTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="用户数量" prop="accountCount"/>
+      <el-table-column align="center" label="用户数量" prop="accountCount" />
       <el-table-column align="center" label="状态">
         <template #default="{ row }">
-          <dict-tag :options="tenantStatusDict" :value="row.status"/>
+          <dict-tag :options="tenantStatusDict" :value="row.status" />
         </template>
       </el-table-column>
       <el-table-column align="center" label="初始化状态">
@@ -130,128 +130,128 @@
           <!--          <el-tag :type="row.initialized === '1' ? 'success' : 'warning'"-->
           <!--          >{{ row.initialized === "1" ? "是" : "否" }}-->
           <!--          </el-tag>-->
-          <dict-tag :options="initStatusDict" :value="row.initialized"/>
+          <dict-tag :options="initStatusDict" :value="row.initialized" />
         </template>
       </el-table-column>
       <el-table-column align="center" label="模式">
         <template #default="{ row }">
-          <dict-tag :options="tenantModeDict" :value="row.mode"/>
+          <dict-tag :options="tenantModeDict" :value="row.mode" />
         </template>
       </el-table-column>
       <el-table-column
-          align="center"
-          class-name="small-padding fixed-width"
-          label="操作"
-          width="290"
+        align="center"
+        class-name="small-padding fixed-width"
+        label="操作"
+        width="290"
       >
         <template #default="{ row }">
           <el-tooltip
-              :disabled="row.initialized !== '1'"
-              class="box-item"
-              content="初始化之后不可再更改"
-              effect="light"
-              placement="top"
+            :disabled="row.initialized !== '1'"
+            class="box-item"
+            content="初始化之后不可再更改"
+            effect="light"
+            placement="top"
           >
             <el-button
-                :disabled="row.initialized === '1'"
-                icon="Setting"
-                link
-                type="primary"
-                @click="handleSetting(row)"
-            >模式
+              :disabled="row.initialized === '1'"
+              icon="Setting"
+              link
+              type="primary"
+              @click="handleSetting(row)"
+              >模式
             </el-button>
           </el-tooltip>
           <el-button
-              v-if="row.mode === '3'"
-              icon="plus"
-              link
-              type="primary"
-              @click="handleOpenDataSource(row.tenantId)"
-          >数据源
+            v-if="row.mode === '3'"
+            icon="plus"
+            link
+            type="primary"
+            @click="handleOpenDataSource(row.tenantId)"
+            >数据源
           </el-button>
           <el-button
-              v-hasPermi="['tenant:edit']"
-              icon="Edit"
-              link
-              type="primary"
-              @click="handleUpdate(row)"
-          >修改
+            v-hasPermi="['tenant:edit']"
+            icon="Edit"
+            link
+            type="primary"
+            @click="handleUpdate(row)"
+            >修改
           </el-button>
           <el-button
-              v-hasPermi="['tenant:remove']"
-              icon="Delete"
-              link
-              type="primary"
-              @click="handleDelete(row)"
-          >删除
+            v-hasPermi="['tenant:remove']"
+            icon="Delete"
+            link
+            type="primary"
+            @click="handleDelete(row)"
+            >删除
           </el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-        v-show="total > 0"
-        v-model:limit="queryParams.pageSize"
-        v-model:page="queryParams.pageNum"
-        :total="total"
-        @pagination="getList"
+      v-show="total > 0"
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNum"
+      :total="total"
+      @pagination="getList"
     />
 
     <!-- 添加或修改租户对话框 -->
     <el-dialog
-        v-model="open"
-        :title="title"
-        append-to-body
-        draggable
-        width="500px"
+      v-model="open"
+      :title="title"
+      append-to-body
+      draggable
+      width="500px"
     >
       <el-form ref="tenantRef" :model="form" :rules="rules" label-width="130px">
         <el-form-item label="公司名称" prop="companyName">
-          <el-input v-model="form.companyName" placeholder="请输入公司名称"/>
+          <el-input v-model="form.companyName" placeholder="请输入公司名称" />
         </el-form-item>
         <el-form-item label="联系人名称" prop="contactName">
-          <el-input v-model="form.contactName" placeholder="请输入联系人名称"/>
+          <el-input v-model="form.contactName" placeholder="请输入联系人名称" />
         </el-form-item>
         <el-form-item label="联系人电话" prop="contactPhone">
           <el-input
-              v-model="form.contactPhone"
-              placeholder="请输入联系人电话"
+            v-model="form.contactPhone"
+            placeholder="请输入联系人电话"
           />
         </el-form-item>
         <el-form-item label="公司地址" prop="address">
-          <el-input v-model="form.address" placeholder="请输入公司地址"/>
+          <el-input v-model="form.address" placeholder="请输入公司地址" />
         </el-form-item>
         <el-form-item label="公司简介" prop="profile">
           <el-input
-              v-model="form.profile"
-              placeholder="请输入内容"
-              type="textarea"
+            v-model="form.profile"
+            placeholder="请输入内容"
+            type="textarea"
           />
         </el-form-item>
         <el-form-item label="统一社会信用代码" prop="licenseNumber">
           <el-input
-              v-model="form.licenseNumber"
-              placeholder="请输入统一社会信用代码"
+            v-model="form.licenseNumber"
+            placeholder="请输入统一社会信用代码"
           />
         </el-form-item>
         <el-form-item label="过期时间" prop="expireTime">
           <el-date-picker
-              v-model="form.expireTime"
-              clearable
-              placeholder="请选择过期时间"
-              type="datetime"
-              value-format="YYYY-MM-DD HH:mm:ss"
+            v-model="form.expireTime"
+            clearable
+            placeholder="请选择过期时间"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="用户数量" prop="accountCount">
-          <el-input v-model="form.accountCount" placeholder="请输入用户数量"/>
+          <el-input v-model="form.accountCount" placeholder="请输入用户数量" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input
-              v-model="form.remark"
-              placeholder="请输入内容"
-              type="textarea"
+            v-model="form.remark"
+            placeholder="请输入内容"
+            type="textarea"
           />
         </el-form-item>
       </el-form>
@@ -265,25 +265,25 @@
 
     <!-- 修改租户模式 -->
     <el-dialog
-        v-model="showTenantSetting"
-        append-to-body
-        draggable
-        title="模式设置"
-        width="500px"
+      v-model="showTenantSetting"
+      append-to-body
+      draggable
+      title="模式设置"
+      width="500px"
     >
       <el-form
-          ref="tenantSettingRef"
-          :model="tenantSettingForm"
-          :rules="tenantSettingRules"
-          label-width="0"
+        ref="tenantSettingRef"
+        :model="tenantSettingForm"
+        :rules="tenantSettingRules"
+        label-width="0"
       >
         <el-form-item class="mode-setting-radio">
           <el-radio-group v-model="tenantSettingForm.mode">
             <el-radio
-                v-for="option in tenantModeDict"
-                :key="option.value"
-                :label="option.value"
-            >{{ option.label }}
+              v-for="option in tenantModeDict"
+              :key="option.value"
+              :label="option.value"
+              >{{ option.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
@@ -291,7 +291,7 @@
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="submitTenantSetting"
-          >确 定
+            >确 定
           </el-button>
           <el-button @click="cancelSettingTenant">取 消</el-button>
         </div>
@@ -300,77 +300,77 @@
 
     <!--查看数据源列表-->
     <el-dialog
-        v-model="showDatasourceDialog"
-        append-to-body
-        draggable
-        title="数据源设置"
-        width="800px"
+      v-model="showDatasourceDialog"
+      append-to-body
+      draggable
+      title="数据源设置"
+      width="800px"
     >
       <!--添加或修改数据源-->
       <el-form
-          v-if="isEditDatasource"
-          ref="datasourceFormRef"
-          :model="dataSourceForm"
-          :rules="dataSourceRules"
-          label-position="left"
-          label-width="100px"
+        v-if="isEditDatasource"
+        ref="datasourceFormRef"
+        :model="dataSourceForm"
+        :rules="dataSourceRules"
+        label-position="left"
+        label-width="100px"
       >
         <el-form-item label="数据库类型" prop="type">
           <el-select v-model="dataSourceForm.type">
             <el-option
-                v-for="option in database_type_dict"
-                :key="option.value"
-                :label="option.label"
-                :value="option.value"
+              v-for="option in database_type_dict"
+              :key="option.value"
+              :label="option.label"
+              :value="option.value"
             />
           </el-select>
         </el-form-item>
         <el-form-item label="数据库IP" prop="ip">
-          <el-input v-model="dataSourceForm.ip"/>
+          <el-input v-model="dataSourceForm.ip" />
         </el-form-item>
         <el-form-item label="数据库端口" prop="port">
           <el-input-number
-              v-model="dataSourceForm.port"
-              :max="65535"
-              :min="1"
+            v-model="dataSourceForm.port"
+            :max="65535"
+            :min="1"
           />
         </el-form-item>
         <el-form-item label="数据库名称" prop="dbName">
-          <el-input v-model="dataSourceForm.dbName"/>
+          <el-input v-model="dataSourceForm.dbName" />
         </el-form-item>
         <!-- schemaName 模式名称 仅当数据库类型不是Mysql时显示   -->
         <el-form-item
-            v-if="dataSourceForm.type !== 'MySQL'"
-            label="模式名称"
-            prop="schemaName"
+          v-if="dataSourceForm.type !== 'MySQL'"
+          label="模式名称"
+          prop="schemaName"
         >
-          <el-input v-model="dataSourceForm.schemaName"/>
+          <el-input v-model="dataSourceForm.schemaName" />
         </el-form-item>
         <el-form-item label="数据库账号" prop="username">
-          <el-input v-model="dataSourceForm.username"/>
+          <el-input v-model="dataSourceForm.username" />
         </el-form-item>
         <el-form-item label="数据库密码" prop="password">
-          <el-input v-model="dataSourceForm.password"/>
+          <el-input v-model="dataSourceForm.password" />
         </el-form-item>
         <el-form-item label="使用" prop="isPrimary">
           <el-switch
-              v-model="dataSourceForm.isPrimary"
-              active-value="1"
-              inactive-value="0"
+            v-model="dataSourceForm.isPrimary"
+            active-value="1"
+            inactive-value="0"
           />
         </el-form-item>
         <!-- 折叠按钮, 切换折叠状态时有旋转动画效果 -->
         <el-divider content-position="left">
           <div
-              class="show-advanced"
-              @click="showDatasourceAdvanced = !showDatasourceAdvanced"
+            class="show-advanced"
+            @click="showDatasourceAdvanced = !showDatasourceAdvanced"
           >
             <el-icon
-                :style="`transform: rotate(${
+              :style="`transform: rotate(${
                 showDatasourceAdvanced ? 90 : 0
               }deg);transition: all 0.3s;`"
             >
-              <ArrowRight/>
+              <ArrowRight />
             </el-icon>
             <span>
               <!--       显示或隐藏高级选项       -->
@@ -382,13 +382,13 @@
           <div v-if="showDatasourceAdvanced">
             <!--   initCount minCount	maxCount -->
             <el-form-item label="初始化连接数" prop="initCount">
-              <el-input-number v-model="dataSourceForm.initCount" :min="0"/>
+              <el-input-number v-model="dataSourceForm.initCount" :min="0" />
             </el-form-item>
             <el-form-item label="最小连接数" prop="minCount">
-              <el-input-number v-model="dataSourceForm.minCount" :min="0"/>
+              <el-input-number v-model="dataSourceForm.minCount" :min="0" />
             </el-form-item>
             <el-form-item label="最大连接数" prop="maxCount">
-              <el-input-number v-model="dataSourceForm.maxCount" :min="0"/>
+              <el-input-number v-model="dataSourceForm.maxCount" :min="0" />
             </el-form-item>
           </div>
         </Transition>
@@ -397,63 +397,63 @@
         <el-row justify="end">
           <el-col :span="1.5">
             <el-button
-                icon="plus"
-                plain
-                type="primary"
-                @click="handleAddDataSource"
-            >新增
+              icon="plus"
+              plain
+              type="primary"
+              @click="handleAddDataSource"
+              >新增
             </el-button>
           </el-col>
         </el-row>
 
         <el-table :data="datasource" style="margin-top: 12px">
           <el-table-column
-              align="center"
-              label="类型"
-              prop="type"
+            align="center"
+            label="类型"
+            prop="type"
           ></el-table-column>
           <el-table-column
-              align="center"
-              label="IP"
-              prop="ip"
+            align="center"
+            label="IP"
+            prop="ip"
           ></el-table-column>
           <el-table-column
-              align="center"
-              label="端口"
-              prop="port"
+            align="center"
+            label="端口"
+            prop="port"
           ></el-table-column>
           <el-table-column
-              align="center"
-              label="名称"
-              prop="dbName"
+            align="center"
+            label="名称"
+            prop="dbName"
           ></el-table-column>
           <el-table-column
-              align="center"
-              label="账号"
-              prop="username"
+            align="center"
+            label="账号"
+            prop="username"
           ></el-table-column>
           <el-table-column
-              align="center"
-              label="密码"
-              prop="password"
+            align="center"
+            label="密码"
+            prop="password"
           ></el-table-column>
           <el-table-column align="center" label="操作" width="140">
             <template #default="{ row }">
               <el-button
-                  icon="edit"
-                  link
-                  size="small"
-                  type="warning"
-                  @click="handleUpdateDataSource(row)"
-              >修改
+                icon="edit"
+                link
+                size="small"
+                type="warning"
+                @click="handleUpdateDataSource(row)"
+                >修改
               </el-button>
               <el-button
-                  icon="delete"
-                  link
-                  size="small"
-                  type="danger"
-                  @click="handleDeleteDataSource(row)"
-              >删除
+                icon="delete"
+                link
+                size="small"
+                type="danger"
+                @click="handleDeleteDataSource(row)"
+                >删除
               </el-button>
             </template>
           </el-table-column>
@@ -464,12 +464,12 @@
         <div class="dialog-footer">
           <template v-if="isEditDatasource">
             <el-button type="primary" @click="submitDatasource"
-            >确 定
+              >确 定
             </el-button>
             <el-button @click="isEditDatasource = false">取 消</el-button>
           </template>
           <el-button v-else type="primary" @click="handleCloseDatasource"
-          >关闭
+            >关闭
           </el-button>
         </div>
       </template>
@@ -491,15 +491,20 @@ import {
   updateDatasource,
   updateTenant,
 } from "@/api/tenant/tenant";
-import {getCurrentInstance, reactive, ref, toRefs} from "vue";
-import {ElMessage, ElMessageBox} from "element-plus";
-import {database_type_dict, initStatusDict, tenantModeDict, tenantStatusDict,} from "@/constant/dict";
+import { getCurrentInstance, reactive, ref, toRefs } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import {
+  database_type_dict,
+  initStatusDict,
+  tenantModeDict,
+  tenantStatusDict,
+} from "@/constant/dict";
 import DictTag from "@/components/DictTag/index.vue";
-import {cloneDeep} from "lodash-es";
-import {ArrowRight} from "@element-plus/icons-vue";
-import {useRouter} from "vue-router";
+import { cloneDeep } from "lodash-es";
+import { ArrowRight } from "@element-plus/icons-vue";
+import { useRouter } from "vue-router";
 
-const {proxy} = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 
 const router = useRouter();
 const tenantList = ref([]);
@@ -538,7 +543,7 @@ const data = reactive({
   },
   rules: {
     companyName: [
-      {required: true, message: "公司名称不能为空", trigger: "blur"},
+      { required: true, message: "公司名称不能为空", trigger: "blur" },
     ],
   },
   tenantSettingForm: {},
@@ -611,11 +616,14 @@ const {
 const datasource = ref([]);
 
 const isInit = (tenantId) => {
-  console.log(tenantId)
-  console.log((tenantList.value.find(el => el.tenantId === tenantId)?.initialized === '1'))
-  return (tenantList.value.find(el => el.tenantId === tenantId)?.initialized === '1')
-}
-
+  console.log(tenantId);
+  console.log(
+    tenantList.value.find((el) => el.tenantId === tenantId)?.initialized === "1"
+  );
+  return (
+    tenantList.value.find((el) => el.tenantId === tenantId)?.initialized === "1"
+  );
+};
 
 /** 查询租户列表 */
 function getList() {
@@ -712,12 +720,12 @@ const handleAddDataSource = () => {
  */
 const handleDeleteDataSource = (row) => {
   ElMessageBox.confirm(`确认删除此数据源: ${row.ip}`, "删除数据源", {}).then(
-      async () => {
-        await deleteDatasource(row.datasourceId);
-        ElMessage.success("已删除数据源");
-        const resp = await datasourceList(tempTenantId.value);
-        datasource.value = resp.data;
-      }
+    async () => {
+      await deleteDatasource(row.datasourceId);
+      ElMessage.success("已删除数据源");
+      const resp = await datasourceList(tempTenantId.value);
+      datasource.value = resp.data;
+    }
   );
 };
 
@@ -828,7 +836,7 @@ const submitTenantSetting = async () => {
   const ori = tenantSettingForm.value.oriMode;
   const cur = tenantSettingForm.value.mode;
   const warningText = () => (
-      <span style="color:red">
+    <span style="color:red">
       切换到其他模式会清除已有的数据源配置, 是否继续?
     </span>
   );
@@ -848,26 +856,25 @@ const submitTenantSetting = async () => {
 function handleDelete(row) {
   const _tenantIds = row.tenantId || ids.value;
   proxy.$modal
-      .confirm('是否确认删除租户编号为"' + _tenantIds + '"的数据项？')
-      .then(function () {
-        return delTenant(_tenantIds);
-      })
-      .then(() => {
-        getList();
-        proxy.$modal.msgSuccess("删除成功");
-      })
-      .catch(() => {
-      });
+    .confirm('是否确认删除租户编号为"' + _tenantIds + '"的数据项？')
+    .then(function () {
+      return delTenant(_tenantIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download(
-      "tenant/tenant/export",
-      {
-        ...queryParams.value,
-      },
-      `tenant_${new Date().getTime()}.xlsx`
+    "tenant/tenant/export",
+    {
+      ...queryParams.value,
+    },
+    `tenant_${new Date().getTime()}.xlsx`
   );
 }
 
diff --git a/src/views/tool/gen/basicInfoForm.vue b/src/views/tool/gen/basicInfoForm.vue
index 4b1cae4..ce99e19 100644
--- a/src/views/tool/gen/basicInfoForm.vue
+++ b/src/views/tool/gen/basicInfoForm.vue
@@ -29,8 +29,8 @@
 defineProps({
   info: {
     type: Object,
-    default: null
-  }
+    default: null,
+  },
 });
 
 // 表单校验
@@ -38,6 +38,6 @@ const rules = ref({
   tableName: [{ required: true, message: "请输入表名称", trigger: "blur" }],
   tableComment: [{ required: true, message: "请输入表描述", trigger: "blur" }],
   className: [{ required: true, message: "请输入实体类名称", trigger: "blur" }],
-  author: [{ required: true, message: "请输入作者", trigger: "blur" }]
+  author: [{ required: true, message: "请输入作者", trigger: "blur" }],
 });
 </script>
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index ddcbfd5..a091072 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -3,10 +3,16 @@
     <el-tabs v-model="activeName">
       <el-tab-pane label="基本信息" name="basic">
         <basic-info-form ref="basicInfo" :info="info" />
+        <gen-info-form ref="genInfo" :info="info" :tables="tables" />
       </el-tab-pane>
       <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%"/>
+        <el-table
+          ref="dragTable"
+          :data="columns"
+          row-key="columnId"
+          :max-height="tableHeight"
+        >
+          <el-table-column label="序号" type="index" min-width="5%" />
           <el-table-column
             label="字段列名"
             prop="columnName"
@@ -45,22 +51,38 @@
 
           <el-table-column label="插入" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" 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" false-label="0" 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" false-label="0" 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" false-label="0" 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 +101,11 @@
           </el-table-column>
           <el-table-column label="必填" min-width="5%">
             <template #default="scope">
-              <el-checkbox true-label="1" false-label="0" 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%">
@@ -99,26 +125,31 @@
           </el-table-column>
           <el-table-column label="字典类型" min-width="12%">
             <template #default="scope">
-              <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
+              <el-select
+                v-model="scope.row.dictType"
+                clearable
+                filterable
+                placeholder="请选择"
+              >
                 <el-option
                   v-for="dict in dictOptions"
                   :key="dict.dictType"
                   :label="dict.dictName"
-                  :value="dict.dictType">
+                  :value="dict.dictType"
+                >
                   <span style="float: left">{{ dict.dictName }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
-              </el-option>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                    dict.dictType
+                  }}</span>
+                </el-option>
               </el-select>
             </template>
           </el-table-column>
         </el-table>
       </el-tab-pane>
-      <el-tab-pane label="生成信息" name="genInfo">
-        <gen-info-form ref="genInfo" :info="info" :tables="tables" />
-      </el-tab-pane>
     </el-tabs>
     <el-form label-width="100px">
-      <div 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>
       </div>
@@ -146,8 +177,8 @@ const info = ref({});
 function submitForm() {
   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);
+  Promise.all([basicForm, genForm].map(getFormPromise)).then((res) => {
+    const validateResult = res.every((item) => !!item);
     if (validateResult) {
       const genTable = Object.assign({}, info.value);
       genTable.columns = columns.value;
@@ -155,9 +186,9 @@ function submitForm() {
         treeCode: info.value.treeCode,
         treeName: info.value.treeName,
         treeParentCode: info.value.treeParentCode,
-        parentMenuId: info.value.parentMenuId
+        parentMenuId: info.value.parentMenuId,
       };
-      updateGenTable(genTable).then(res => {
+      updateGenTable(genTable).then((res) => {
         proxy.$modal.msgSuccess(res.msg);
         if (res.code === 200) {
           close();
@@ -169,14 +200,17 @@ function submitForm() {
   });
 }
 function getFormPromise(form) {
-  return new Promise(resolve => {
-    form.validate(res => {
+  return new Promise((resolve) => {
+    form.validate((res) => {
       resolve(res);
     });
   });
 }
 function close() {
-  const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
+  const obj = {
+    path: "/tool/gen",
+    query: { t: Date.now(), pageNum: route.query.pageNum },
+  };
   proxy.$tab.closeOpenPage(obj);
 }
 
@@ -184,13 +218,13 @@ function close() {
   const tableId = route.params && route.params.tableId;
   if (tableId) {
     // 获取表详细信息
-    getGenTable(tableId).then(res => {
+    getGenTable(tableId).then((res) => {
       columns.value = res.data.rows;
       info.value = res.data.info;
       tables.value = res.data.tables;
     });
     /** 查询字典下拉列表 */
-    getDictOptionselect().then(response => {
+    getDictOptionselect().then((response) => {
       dictOptions.value = response.data;
     });
   }
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 92cfb87..d22a3e3 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -5,8 +5,13 @@
         <el-form-item prop="packageName">
           <template #label>
             生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
-              <el-icon><question-filled /></el-icon>
+            <el-tooltip
+              content="生成在哪个java包下，例如 com.ruoyi.system"
+              placement="top"
+            >
+              <el-icon>
+                <question-filled />
+              </el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.packageName" />
@@ -18,7 +23,9 @@
           <template #label>
             生成模块名
             <el-tooltip content="可理解为子系统名，例如 system" placement="top">
-              <el-icon><question-filled /></el-icon>
+              <el-icon>
+                <question-filled />
+              </el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.moduleName" />
@@ -30,7 +37,9 @@
           <template #label>
             生成业务名
             <el-tooltip content="可理解为功能英文名，例如 user" placement="top">
-              <el-icon><question-filled /></el-icon>
+              <el-icon>
+                <question-filled />
+              </el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.businessName" />
@@ -42,7 +51,9 @@
           <template #label>
             生成功能名
             <el-tooltip content="用作类描述，例如 用户" placement="top">
-              <el-icon><question-filled /></el-icon>
+              <el-icon>
+                <question-filled />
+              </el-icon>
             </el-tooltip>
           </template>
           <el-input v-model="info.functionName" />
@@ -53,15 +64,25 @@
         <el-form-item>
           <template #label>
             上级菜单
-            <el-tooltip content="分配到指定菜单下，例如 系统管理" placement="top">
-              <el-icon><question-filled /></el-icon>
+            <el-tooltip
+              content="分配到指定菜单下，例如 系统管理"
+              placement="top"
+            >
+              <el-icon>
+                <question-filled />
+              </el-icon>
             </el-tooltip>
           </template>
-          <tree-select
-            v-model:value="info.parentMenuId"
-            :options="menuOptions"
-            :objMap="{ value: 'menuId', label: 'menuName', children: 'children' }"
-            placeholder="请选择系统菜单"
+          <el-tree-select
+            v-model="info.parentMenuId"
+            :data="menuOptions"
+            :props="{
+              value: 'menuId',
+              label: 'menuName',
+              children: 'children',
+            }"
+            placeholder="选择上级部门"
+            value-key="menuId"
           />
         </el-form-item>
       </el-col>
@@ -78,25 +99,33 @@ const { proxy } = getCurrentInstance();
 const props = defineProps({
   info: {
     type: Object,
-    default: null
+    default: null,
   },
   tables: {
     type: Array,
-    default: null
-  }
+    default: null,
+  },
 });
 
 // 表单校验
 const rules = ref({
-  packageName: [{ required: true, message: "请输入生成包路径", trigger: "blur" }],
-  moduleName: [{ required: true, message: "请输入生成模块名", trigger: "blur" }],
-  businessName: [{ required: true, message: "请输入生成业务名", trigger: "blur" }],
-  functionName: [{ required: true, message: "请输入生成功能名", trigger: "blur" }]
+  packageName: [
+    { required: true, message: "请输入生成包路径", trigger: "blur" },
+  ],
+  moduleName: [
+    { required: true, message: "请输入生成模块名", trigger: "blur" },
+  ],
+  businessName: [
+    { required: true, message: "请输入生成业务名", trigger: "blur" },
+  ],
+  functionName: [
+    { required: true, message: "请输入生成功能名", trigger: "blur" },
+  ],
 });
 
 /** 查询菜单下拉树结构 */
 function getMenuTreeselect() {
-  listMenu().then(response => {
+  listMenu().then((response) => {
     menuOptions.value = proxy.handleTree(response.data, "menuId");
   });
 }
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index 33b5633..ba8406f 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -1,6 +1,12 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" v-model="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog
+    title="导入表"
+    v-model="visible"
+    width="800px"
+    top="5vh"
+    append-to-body
+  >
     <el-form :model="queryParams" ref="queryRef" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input
@@ -19,20 +25,36 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
     <el-row>
-      <el-table @row-click="clickRow" ref="table" :data="dbTableList" @selection-change="handleSelectionChange" height="260px">
+      <el-table
+        @row-click="clickRow"
+        ref="table"
+        :data="dbTableList"
+        @selection-change="handleSelectionChange"
+        height="260px"
+      >
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column prop="tableName" label="表名称" :show-overflow-tooltip="true"></el-table-column>
-        <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column
+          prop="tableName"
+          label="表名称"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
+        <el-table-column
+          prop="tableComment"
+          label="表描述"
+          :show-overflow-tooltip="true"
+        ></el-table-column>
         <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column prop="updateTime" label="更新时间"></el-table-column>
       </el-table>
       <pagination
-        v-show="total>0"
+        v-show="total > 0"
         :total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
@@ -61,7 +83,7 @@ const queryParams = reactive({
   pageNum: 1,
   pageSize: 10,
   tableName: undefined,
-  tableComment: undefined
+  tableComment: undefined,
 });
 
 const emit = defineEmits(["ok"]);
@@ -77,11 +99,11 @@ function clickRow(row) {
 }
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  tables.value = selection.map(item => item.tableName);
+  tables.value = selection.map((item) => item.tableName);
 }
 /** 查询表数据 */
 function getList() {
-  listDbTable(queryParams).then(res => {
+  listDbTable(queryParams).then((res) => {
     dbTableList.value = res.rows;
     total.value = res.total;
   });
@@ -103,7 +125,7 @@ function handleImportTable() {
     proxy.$modal.msgError("请选择要导入的表");
     return;
   }
-  importTable({ tables: tableNames }).then(res => {
+  importTable({ tables: tableNames }).then((res) => {
     proxy.$modal.msgSuccess(res.msg);
     if (res.code === 200) {
       visible.value = false;
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 8bda6ad..8c52ddc 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+    <el-form
+      :model="queryParams"
+      ref="queryRef"
+      :inline="true"
+      v-show="showSearch"
+    >
       <el-form-item label="表名称" prop="tableName">
         <el-input
           v-model="queryParams.tableName"
@@ -20,7 +25,9 @@
         />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="handleQuery"
+          >搜索</el-button
+        >
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
@@ -33,7 +40,8 @@
           icon="Download"
           @click="handleGenTable"
           v-hasPermi="['tool:gen:code']"
-        >生成</el-button>
+          >生成</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -42,7 +50,8 @@
           icon="Upload"
           @click="openImportTable"
           v-hasPermi="['tool:gen:import']"
-        >导入</el-button>
+          >导入</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -52,7 +61,8 @@
           :disabled="single"
           @click="handleEditTable"
           v-hasPermi="['tool:gen:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -62,16 +72,30 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['tool:gen:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        v-model:showSearch="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" align="center" width="55"></el-table-column>
+    <el-table
+      v-loading="loading"
+      :data="tableList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        align="center"
+        width="55"
+      ></el-table-column>
       <el-table-column label="序号" type="index" width="50" align="center">
         <template #default="scope">
-          <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
+          <span>{{
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -104,43 +128,92 @@
         prop="packageName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="操作" align="center" width="330" class-name="small-padding fixed-width">
+      <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
+              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 link type="primary" 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 link type="primary" 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 link type="primary" 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="生成代码" placement="top">
-            <el-button link type="primary" 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>
     </el-table>
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize"
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body 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'))"
+          :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">&nbsp;复制</el-link>
+          <el-link
+            :underline="false"
+            icon="DocumentCopy"
+            v-copyText="value"
+            v-copyText:callback="copyTextSuccess"
+            style="float: right"
+            >&nbsp;复制</el-link
+          >
           <pre>{{ value }}</pre>
         </el-tab-pane>
       </el-tabs>
@@ -150,7 +223,13 @@
 </template>
 
 <script setup name="Gen">
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
+import {
+  listTable,
+  previewTable,
+  delTable,
+  genCode,
+  synchDb,
+} from "@/api/tool/gen";
 import router from "@/router";
 import importTable from "./importTable";
 
@@ -172,14 +251,14 @@ const data = reactive({
     pageNum: 1,
     pageSize: 10,
     tableName: undefined,
-    tableComment: undefined
+    tableComment: undefined,
   },
   preview: {
     open: false,
     title: "代码预览",
     data: {},
-    activeName: "domain.java"
-  }
+    activeName: "domain.java",
+  },
 });
 
 const { queryParams, preview } = toRefs(data);
@@ -192,12 +271,12 @@ onActivated(() => {
     proxy.resetForm("queryForm");
     getList();
   }
-})
+});
 
 /** 查询表集合 */
 function getList() {
   loading.value = true;
-  listTable(queryParams.value).then(response => {
+  listTable(queryParams.value).then((response) => {
     tableList.value = response.rows;
     total.value = response.total;
     loading.value = false;
@@ -216,21 +295,28 @@ function handleGenTable(row) {
     return;
   }
   if (row.genType === "1") {
-    genCode(row.tableName).then(response => {
+    genCode(row.tableName).then((response) => {
       proxy.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
     });
   } else {
-    proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi.zip");
+    proxy.$download.zip(
+      "/tool/gen/batchGenCode?tables=" + tbNames,
+      "ruoyi.zip"
+    );
   }
 }
 /** 同步数据库操作 */
 function handleSynchDb(row) {
   const tableName = row.tableName;
-  proxy.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function () {
-    return synchDb(tableName);
-  }).then(() => {
-    proxy.$modal.msgSuccess("同步成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('确认要强制同步"' + tableName + '"表结构吗？')
+    .then(function () {
+      return synchDb(tableName);
+    })
+    .then(() => {
+      proxy.$modal.msgSuccess("同步成功");
+    })
+    .catch(() => {});
 }
 /** 打开导入表弹窗 */
 function openImportTable() {
@@ -243,7 +329,7 @@ function resetQuery() {
 }
 /** 预览按钮 */
 function handlePreview(row) {
-  previewTable(row.tableId).then(response => {
+  previewTable(row.tableId).then((response) => {
     preview.value.data = response.data;
     preview.value.open = true;
     preview.value.activeName = "domain.java";
@@ -255,25 +341,32 @@ function copyTextSuccess() {
 }
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.tableId);
-  tableNames.value = selection.map(item => item.tableName);
+  ids.value = selection.map((item) => item.tableId);
+  tableNames.value = selection.map((item) => item.tableName);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 }
 /** 修改按钮操作 */
 function handleEditTable(row) {
   const tableId = row.tableId || ids.value[0];
-  router.push({ path: "/tool/gen-edit/index/" + tableId, query: { pageNum: queryParams.value.pageNum } });
+  router.push({
+    path: "/tool/gen-edit/index/" + tableId,
+    query: { pageNum: queryParams.value.pageNum },
+  });
 }
 /** 删除按钮操作 */
 function handleDelete(row) {
   const tableIds = row.tableId || ids.value;
-  proxy.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function () {
-    return delTable(tableIds);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  proxy.$modal
+    .confirm('是否确认删除表编号为"' + tableIds + '"的数据项？')
+    .then(function () {
+      return delTable(tableIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 getList();
diff --git a/vite.config.js b/vite.config.js
index 9275490..8892434 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -31,8 +31,8 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
-          //target: "http://192.168.0.201:8080",
-          target: "http://127.0.0.1:8080",
+          target: "http://192.168.0.201:8080",
+          // target: "http://127.0.0.1:8080",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },