From 5c3b2d619d12680ee89200c29a822e088ccdaecd Mon Sep 17 00:00:00 2001
From: ailanyin <ailanyin4j@163.com>
Date: Wed, 5 Jul 2023 15:08:01 +0800
Subject: [PATCH] update dep

---
 src/constant/dict.js               |  27 +++
 src/views/tool/gen/genInfoForm.vue |  43 +++-
 src/views/tool/gen/index.vue       | 337 ++++++++++++++++-------------
 3 files changed, 244 insertions(+), 163 deletions(-)

diff --git a/src/constant/dict.js b/src/constant/dict.js
index 331036e..493ef6d 100644
--- a/src/constant/dict.js
+++ b/src/constant/dict.js
@@ -188,3 +188,30 @@ export const initStatusDict = [
     elTagType: "success",
   },
 ];
+
+export const docFlagDict = [
+    {
+        label: "关",
+        value: "0",
+        elTagType: "warning",
+    },
+    {
+        label: "开",
+        value: "1",
+        elTagType: "success",
+    }
+];
+
+export const excelFlagDict = [
+    {
+        label: "关",
+        value: "0",
+        elTagType: "warning",
+    }
+    ,
+    {
+        label: "开",
+        value: "1",
+        elTagType: "success",
+    }
+];
\ No newline at end of file
diff --git a/src/views/tool/gen/genInfoForm.vue b/src/views/tool/gen/genInfoForm.vue
index 2225a69..04f82f9 100644
--- a/src/views/tool/gen/genInfoForm.vue
+++ b/src/views/tool/gen/genInfoForm.vue
@@ -59,14 +59,35 @@
           <el-input v-model="info.functionName" />
         </el-form-item>
       </el-col>
-
+    </el-row>
+    <el-row>
+      <el-col :span="12">
+        <el-form-item label="文档">
+          <el-switch
+              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"
+          />
+        </el-form-item>
+      </el-col>
+    </el-row>
+    <el-row>
       <el-col :span="12">
         <el-form-item>
           <template #label>
             上级菜单
             <el-tooltip
-              content="分配到指定菜单下，例如 系统管理"
-              placement="top"
+                content="分配到指定菜单下，例如 系统管理"
+                placement="top"
             >
               <el-icon>
                 <question-filled />
@@ -74,20 +95,24 @@
             </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/index.vue b/src/views/tool/gen/index.vue
index cb76eee..259ed48 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,194 +35,221 @@
     <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"
-        width="330"
-        class-name="small-padding fixed-width"
+          label="文档"
+          align="center"
+          prop="docFlag"
+      >
+        <template #default="{row}">
+          <dict-tag
+              :value="row.docFlag"
+              :options="docFlagDict"
+          ></dict-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="导出Excel"
+          align="center"
+          prop="excelFlag"
+      >
+        <template #default="{row}">
+          <dict-tag
+              :value="row.excelFlag"
+              :options="excelFlagDict"
+          ></dict-tag>
+        </template>
+      </el-table-column>
+      <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']"
+                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 {docFlagDict, excelFlagDict} from "@/constant/dict";
 
 const route = useRoute();
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const tableList = ref([]);
 const loading = ref(true);
@@ -249,7 +276,7 @@ const data = reactive({
   },
 });
 
-const { queryParams, preview } = toRefs(data);
+const {queryParams, preview} = toRefs(data);
 
 onActivated(() => {
   const time = route.query.t;
@@ -285,16 +312,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",
@@ -302,8 +329,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`
     );
   });
 }
@@ -312,14 +339,15 @@ 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(() => {
+      });
 }
 
 /** 打开导入表弹窗 */
@@ -340,8 +368,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")
     );
   });
 }
@@ -364,7 +392,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},
   });
 }
 
@@ -372,15 +400,16 @@ 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();