From a796fdd28806b2654618d6cdf42fc97d51c87027 Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Wed, 5 Jul 2023 16:17:23 +0800
Subject: [PATCH] bug fix

---
 src/api/monitor/use_log.js          |  26 +--
 src/constant/dict.js                |  43 ++--
 src/views/monitor/use_log/index.vue |   2 +-
 src/views/tenant/initialize.vue     |   8 +-
 src/views/tool/gen/genInfoForm.vue  |  32 ++-
 src/views/tool/gen/importTable.vue  |   4 +-
 src/views/tool/gen/index.vue        | 341 +++++++++++++---------------
 7 files changed, 220 insertions(+), 236 deletions(-)

diff --git a/src/api/monitor/use_log.js b/src/api/monitor/use_log.js
index 3fefaaf..885a5c9 100644
--- a/src/api/monitor/use_log.js
+++ b/src/api/monitor/use_log.js
@@ -1,29 +1,29 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 查询操作日志列表
 export function list(query) {
   return request({
-    url: '/monitor/use-log/list',
-    method: 'get',
-    params: query
-  })
+    url: "/monitor/use-log/list",
+    method: "get",
+    params: query,
+  });
 }
 
 // 删除操作日志
 export function delOperlog(ids) {
   return request({
-    url: '/monitor/use-log',
-    method: 'delete',
+    url: "/monitor/use-log",
+    method: "delete",
     data: {
-      ids: ids
-    }
-  })
+      ids: ids,
+    },
+  });
 }
 
 // 清空操作日志
 export function cleanOperlog() {
   return request({
-    url: '/monitor/use-log/clean',
-    method: 'delete'
-  })
+    url: "/monitor/use-log/clean",
+    method: "delete",
+  });
 }
diff --git a/src/constant/dict.js b/src/constant/dict.js
index c987b81..214a279 100644
--- a/src/constant/dict.js
+++ b/src/constant/dict.js
@@ -190,28 +190,27 @@ export const init_status_dict = [
 ];
 
 export const doc_flag_dict = [
-    {
-        label: "关",
-        value: "0",
-        elTagType: "warning",
-    },
-    {
-        label: "开",
-        value: "1",
-        elTagType: "success",
-    }
+  {
+    label: "关",
+    value: "0",
+    elTagType: "warning",
+  },
+  {
+    label: "开",
+    value: "1",
+    elTagType: "success",
+  },
 ];
 
 export const excel_flag_dict = [
-    {
-        label: "关",
-        value: "0",
-        elTagType: "warning",
-    }
-    ,
-    {
-        label: "开",
-        value: "1",
-        elTagType: "success",
-    }
-];
\ No newline at end of file
+  {
+    label: "关",
+    value: "0",
+    elTagType: "warning",
+  },
+  {
+    label: "开",
+    value: "1",
+    elTagType: "success",
+  },
+];
diff --git a/src/views/monitor/use_log/index.vue b/src/views/monitor/use_log/index.vue
index c14ca21..925b5a5 100644
--- a/src/views/monitor/use_log/index.vue
+++ b/src/views/monitor/use_log/index.vue
@@ -248,7 +248,7 @@
 <script setup name="Operlog">
 import { list, delOperlog, cleanOperlog } from "@/api/monitor/use_log";
 
-import { sys_oper_type,sys_common_status } from "@/constant/dict";
+import { sys_oper_type, sys_common_status } from "@/constant/dict";
 
 const { proxy } = getCurrentInstance();
 
diff --git a/src/views/tenant/initialize.vue b/src/views/tenant/initialize.vue
index 468e2df..c3ff56d 100644
--- a/src/views/tenant/initialize.vue
+++ b/src/views/tenant/initialize.vue
@@ -72,10 +72,10 @@
             <div class="card-content-item">
               <span class="card-content-item-title">模式:</span>
               <span class="card-content-item-value">{{
-                  tenant_mode_dict.find(
-                      (item) => item.value === tenantInitCheckResult.mode
-                  )?.label
-                }}</span>
+                tenant_mode_dict.find(
+                  (item) => item.value === tenantInitCheckResult.mode
+                )?.label
+              }}</span>
             </div>
           </div>
         </div>
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 04f82f9..a9c67ad 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -64,18 +64,18 @@
       <el-col :span="12">
         <el-form-item label="文档">
           <el-switch
-              v-model="info.docFlag"
-              active-value="1"
-              inactive-value="0"
+            v-model="info.docFlag"
+            active-value="1"
+            inactive-value="0"
           />
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <el-form-item label="Excel导出">
           <el-switch
-              v-model="info.excelFlag"
-              active-value="1"
-              inactive-value="0"
+            v-model="info.excelFlag"
+            active-value="1"
+            inactive-value="0"
           />
         </el-form-item>
       </el-col>
@@ -86,8 +86,8 @@
           <template #label>
             上级菜单
             <el-tooltip
-                content="分配到指定菜单下，例如 系统管理"
-                placement="top"
+              content="分配到指定菜单下，例如 系统管理"
+              placement="top"
             >
               <el-icon>
                 <question-filled />
@@ -95,24 +95,20 @@
             </el-tooltip>
           </template>
           <el-tree-select
-              v-model="info.parentMenuId"
-              :data="menuOptions"
-              check-strictly
-              :props="{
+            v-model="info.parentMenuId"
+            :data="menuOptions"
+            check-strictly
+            :props="{
               value: 'menuId',
               label: 'menuName',
               children: 'children',
             }"
-              placeholder="选择上级部门"
-              value-key="menuId"
+            placeholder="选择上级部门"
+            value-key="menuId"
           />
         </el-form-item>
-
       </el-col>
     </el-row>
-
-
-
   </el-form>
 </template>
 
diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue
index e0bed37..700ae30 100644
--- a/src/views/tool/gen/importTable.vue
+++ b/src/views/tool/gen/importTable.vue
@@ -3,7 +3,7 @@
   <el-dialog
     title="导入表"
     v-model="visible"
-    width="800px"
+    width="900px"
     top="5vh"
     append-to-body
   >
@@ -13,6 +13,7 @@
           v-model="queryParams.tableName"
           placeholder="请输入表名称"
           clearable
+          style="width: 200px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
@@ -21,6 +22,7 @@
           v-model="queryParams.tableComment"
           placeholder="请输入表描述"
           clearable
+          style="width: 200px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 16a791b..a0df960 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -1,32 +1,32 @@
 <template>
   <div class="app-container">
     <el-form
-        :model="queryParams"
-        ref="queryRef"
-        :inline="true"
-        v-show="showSearch"
+      :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"
+          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"
+          v-model="queryParams.tableComment"
+          placeholder="请输入表描述"
+          clearable
+          style="width: 200px"
+          @keyup.enter="handleQuery"
         />
       </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>
@@ -35,221 +35,210 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
-            type="info"
-            plain
-            icon="Upload"
-            @click="openImportTable"
-            v-hasPermi="['tool:gen:import']"
-        >导入
+          type="info"
+          plain
+          icon="Upload"
+          @click="openImportTable"
+          v-hasPermi="['tool:gen:import']"
+          >导入
         </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']"
-        >修改
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleEditTable"
+          v-hasPermi="['tool:gen:edit']"
+          >修改
         </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']"
-        >删除
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['tool:gen:remove']"
+          >删除
         </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="tableList"
-        @selection-change="handleSelectionChange"
+      v-loading="loading"
+      :data="tableList"
+      @selection-change="handleSelectionChange"
     >
       <el-table-column
-          type="selection"
-          align="center"
-          width="55"
+        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>
+            (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
-          label="表名称"
-          align="center"
-          prop="tableName"
-          :show-overflow-tooltip="true"
+        label="表名称"
+        align="center"
+        prop="tableName"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
-          label="表描述"
-          align="center"
-          prop="tableComment"
-          :show-overflow-tooltip="true"
+        label="表描述"
+        align="center"
+        prop="tableComment"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
-          label="实体"
-          align="center"
-          prop="className"
-          :show-overflow-tooltip="true"
+        label="实体"
+        align="center"
+        prop="className"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
-          label="作者"
-          align="center"
-          prop="author"
-          :show-overflow-tooltip="true"
+        label="作者"
+        align="center"
+        prop="author"
+        :show-overflow-tooltip="true"
       />
       <el-table-column
-          label="包路径"
-          align="center"
-          prop="packageName"
-          :show-overflow-tooltip="true"
+        label="包路径"
+        align="center"
+        prop="packageName"
+        :show-overflow-tooltip="true"
       />
       <!--   docFlag   -->
-      <el-table-column
-          label="文档"
-          align="center"
-          prop="docFlag"
-      >
-        <template #default="{row}">
+      <el-table-column label="文档" align="center" prop="docFlag">
+        <template #default="{ row }">
+          <dict-tag :value="row.docFlag" :options="doc_flag_dict"></dict-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="导出Excel" align="center" prop="excelFlag">
+        <template #default="{ row }">
           <dict-tag
-              :value="row.docFlag"
-              :options="doc_flag_dict"
+            :value="row.excelFlag"
+            :options="excel_flag_dict"
           ></dict-tag>
         </template>
       </el-table-column>
       <el-table-column
-          label="导出Excel"
-          align="center"
-          prop="excelFlag"
-      >
-        <template #default="{row}">
-          <dict-tag
-              :value="row.excelFlag"
-              :options="excel_flag_dict"
-          ></dict-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-          label="操作"
-          align="center"
-          width="330"
-          class-name="small-padding fixed-width"
+        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']"
+              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']"
+              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']"
+              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="handlesyncTable(scope.row)"
-                v-hasPermi="['tool:gen:edit']"
+              link
+              type="primary"
+              icon="Refresh"
+              @click="handlesyncTable(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']"
+              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"
-        :total="total"
-        v-model:page="queryParams.pageNum"
-        v-model:limit="queryParams.pageSize"
-        @pagination="getList"
+      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"
-        destroy-on-close
-        append-to-body
-        class="scrollbar"
+      :title="preview.title"
+      v-model="preview.open"
+      width="80%"
+      top="5vh"
+      destroy-on-close
+      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('.qb'))"
-            :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))"
-            :key="value"
+          v-for="(value, key) in preview.data"
+          :label="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))"
+          :name="key.substring(key.lastIndexOf('/') + 1, key.indexOf('.qb'))"
+          :key="value"
         >
           <el-link
-              :underline="false"
-              icon="DocumentCopy"
-              v-copyText="value"
-              v-copyText:callback="copyTextSuccess"
-              style="float: right"
-          >&nbsp;复制
+            :underline="false"
+            icon="DocumentCopy"
+            v-copyText="value"
+            v-copyText:callback="copyTextSuccess"
+            style="float: right"
+            >&nbsp;复制
           </el-link>
           <highlightjs :code="value"></highlightjs>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
-    <import-table ref="importRef" @ok="handleQuery"/>
+    <import-table ref="importRef" @ok="handleQuery" />
   </div>
 </template>
 
 <script setup name="Gen" lang="jsx">
-import {delTable, listTable, previewTable, syncTable} from "@/api/tool/gen";
+import { delTable, listTable, previewTable, syncTable } from "@/api/tool/gen";
 import router from "@/router";
 import importTable from "./importTable";
-import {ElMessageBox} from "element-plus";
-import {ref} from "vue";
+import { ElMessageBox } from "element-plus";
+import { ref } from "vue";
 import useSettingsStore from "@/store/modules/settings";
 import DictTag from "@/components/DictTag/index.vue";
-import {doc_flag_dict, excel_flag_dict} from "@/constant/dict";
+import { doc_flag_dict, excel_flag_dict } from "@/constant/dict";
 
 const route = useRoute();
-const {proxy} = getCurrentInstance();
+const { proxy } = getCurrentInstance();
 
 const tableList = ref([]);
 const loading = ref(true);
@@ -276,7 +265,7 @@ const data = reactive({
   },
 });
 
-const {queryParams, preview} = toRefs(data);
+const { queryParams, preview } = toRefs(data);
 
 onActivated(() => {
   const time = route.query.t;
@@ -312,16 +301,16 @@ function handleGenTable(row) {
   downloadArg.value = useSettingsStore().downloadGenCodeType;
   // jsx vnode 单选:全部, Java, SQL
   const h = () => (
-      <el-form>
-        <el-form-item prop="downloadArg">
-          <el-radio-group v-model={downloadArg.value}>
-            <el-radio label="all">全部</el-radio>
-            <el-radio label="vue">vue</el-radio>
-            <el-radio label="java">Java</el-radio>
-            <el-radio label="sql">SQL</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
+    <el-form>
+      <el-form-item prop="downloadArg">
+        <el-radio-group v-model={downloadArg.value}>
+          <el-radio label="all">全部</el-radio>
+          <el-radio label="vue">vue</el-radio>
+          <el-radio label="java">Java</el-radio>
+          <el-radio label="sql">SQL</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
   );
   ElMessageBox.confirm(h, "下载类型", {
     "custom-class": "gen-download-type",
@@ -329,8 +318,8 @@ function handleGenTable(row) {
   }).then(() => {
     useSettingsStore().setDownloadGenCodeType(downloadArg.value);
     proxy.$download.zip(
-        `/tool/gen/download/${row.tableId}/${downloadArg.value}`,
-        `${row.tableName}_${downloadArg.value}.zip`
+      `/tool/gen/download/${row.tableId}/${downloadArg.value}`,
+      `${row.tableName}_${downloadArg.value}.zip`
     );
   });
 }
@@ -339,15 +328,14 @@ function handleGenTable(row) {
 function handlesyncTable(row) {
   const tableName = row.tableName;
   proxy.$modal
-      .confirm('确认要强制同步"' + tableName + '"表结构吗？')
-      .then(function () {
-        return syncTable(row.tableId);
-      })
-      .then(() => {
-        proxy.$modal.msgSuccess("同步成功");
-      })
-      .catch(() => {
-      });
+    .confirm('确认要强制同步"' + tableName + '"表结构吗？')
+    .then(function () {
+      return syncTable(row.tableId);
+    })
+    .then(() => {
+      proxy.$modal.msgSuccess("同步成功");
+    })
+    .catch(() => {});
 }
 
 /** 打开导入表弹窗 */
@@ -368,8 +356,8 @@ function handlePreview(row) {
     preview.value.open = true;
     const firstTab = Object.keys(response.data)[0];
     preview.value.activeName = firstTab.substring(
-        firstTab.lastIndexOf("/") + 1,
-        firstTab.indexOf(".qb")
+      firstTab.lastIndexOf("/") + 1,
+      firstTab.indexOf(".qb")
     );
   });
 }
@@ -392,7 +380,7 @@ function handleEditTable(row) {
   const tableId = row.tableId || ids.value[0];
   router.push({
     path: "/tool/gen-edit/index/" + tableId,
-    query: {pageNum: queryParams.value.pageNum},
+    query: { pageNum: queryParams.value.pageNum },
   });
 }
 
@@ -400,16 +388,15 @@ function handleEditTable(row) {
 function handleDelete(row) {
   const tableIds = row.tableId || ids.value;
   proxy.$modal
-      .confirm('是否确认删除表编号为"' + tableIds + '"的数据项？')
-      .then(function () {
-        return delTable(tableIds);
-      })
-      .then(() => {
-        getList();
-        proxy.$modal.msgSuccess("删除成功");
-      })
-      .catch(() => {
-      });
+    .confirm('是否确认删除表编号为"' + tableIds + '"的数据项？')
+    .then(function () {
+      return delTable(tableIds);
+    })
+    .then(() => {
+      getList();
+      proxy.$modal.msgSuccess("删除成功");
+    })
+    .catch(() => {});
 }
 
 getList();