From e2bc12d1867a5aae638c6be7e501e5c044543634 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail>
Date: 星期一, 17 四月 2023 22:23:18 +0800
Subject: [PATCH] update 修改 el-card shadow='hover'

---
 src/views/tool/gen/index.vue |  414 +++++++++++++++++++++++++---------------------------------
 1 files changed, 181 insertions(+), 233 deletions(-)

diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index fb2fc9e..f78bb0d 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -1,155 +1,103 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item label="鏁版嵁婧�" prop="dataName">
-        <el-input
-            v-model="queryParams.dataName"
-            placeholder="璇疯緭鍏ユ暟鎹簮鍚嶇О"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="琛ㄥ悕绉�" prop="tableName">
-        <el-input
-          v-model="queryParams.tableName"
-          placeholder="璇疯緭鍏ヨ〃鍚嶇О"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="琛ㄦ弿杩�" prop="tableComment">
-        <el-input
-          v-model="queryParams.tableComment"
-          placeholder="璇疯緭鍏ヨ〃鎻忚堪"
-          clearable
-          style="width: 200px"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
-        <el-date-picker
-          v-model="dateRange"
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="寮�濮嬫棩鏈�"
-          end-placeholder="缁撴潫鏃ユ湡"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
-        <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
-      </el-form-item>
-    </el-form>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div class="search" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+          <el-form-item label="鏁版嵁婧�" prop="dataName">
+            <el-input v-model="queryParams.dataName" placeholder="璇疯緭鍏ユ暟鎹簮鍚嶇О" clearable style="width: 200px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="琛ㄥ悕绉�" prop="tableName">
+            <el-input v-model="queryParams.tableName" placeholder="璇疯緭鍏ヨ〃鍚嶇О" clearable style="width: 200px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="琛ㄦ弿杩�" prop="tableComment">
+            <el-input v-model="queryParams.tableComment" placeholder="璇疯緭鍏ヨ〃鎻忚堪" clearable style="width: 200px" @keyup.enter="handleQuery" />
+          </el-form-item>
+          <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
+            <el-date-picker
+              v-model="dateRange"
+              value-format="YYYY-MM-DD"
+              type="daterange"
+              range-separator="-"
+              start-placeholder="寮�濮嬫棩鏈�"
+              end-placeholder="缁撴潫鏃ユ湡"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+            <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+    </transition>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Download"
-          @click="handleGenTable"
-          v-hasPermi="['tool:gen:code']"
-        >鐢熸垚</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          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']"
-        >淇敼</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['tool:gen:remove']"
-        >鍒犻櫎</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Download" @click="handleGenTable()" v-hasPermi="['tool:gen:code']">鐢熸垚</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button 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']">淇敼</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['tool:gen:remove']">
+              鍒犻櫎
+            </el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
 
-    <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>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="琛ㄥ悕绉�"
-        align="center"
-        prop="tableName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="琛ㄦ弿杩�"
-        align="center"
-        prop="tableComment"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        label="瀹炰綋"
-        align="center"
-        prop="className"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160" />
-      <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="160" />
-      <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-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-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-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-tooltip>
-          <el-tooltip content="鐢熸垚浠g爜" placement="top">
-            <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button>
-          </el-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"
-    />
+      <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>
+          </template>
+        </el-table-column>
+        <el-table-column label="琛ㄥ悕绉�" align="center" prop="tableName" :show-overflow-tooltip="true" />
+        <el-table-column label="琛ㄦ弿杩�" align="center" prop="tableComment" :show-overflow-tooltip="true" />
+        <el-table-column label="瀹炰綋" align="center" prop="className" :show-overflow-tooltip="true" />
+        <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="160" />
+        <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="160" />
+        <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-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-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-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-tooltip>
+            <el-tooltip content="鐢熸垚浠g爜" placement="top">
+              <el-button link type="primary" icon="Download" @click="handleGenTable(scope.row)" v-hasPermi="['tool:gen:code']"></el-button>
+            </el-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" />
+    </el-card>
+
     <!-- 棰勮鐣岄潰 -->
-    <el-dialog :title="preview.title" v-model="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+    <el-dialog :title="dialog.title" v-model="dialog.visible" 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 as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
+          :name="(key as any).substring((key as any).lastIndexOf('/') + 1, (key as any).indexOf('.vm'))"
           :key="value"
         >
-          <el-link :underline="false" icon="DocumentCopy" v-copyText="value" v-copyText:callback="copyTextSuccess" style="float:right">&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>
@@ -158,139 +106,139 @@
   </div>
 </template>
 
-<script setup name="Gen">
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
-import router from "@/router";
-import importTable from "./importTable";
+<script setup name="Gen" lang="ts">
+import { listTable, previewTable, delTable, genCode, synchDb } from '@/api/tool/gen';
+import { TableQuery, TableVO } from '@/api/tool/gen/types';
+import router from '@/router';
+import importTable from './importTable.vue';
+import { ComponentInternalInstance } from 'vue';
+import { ElForm, DateModelType } from 'element-plus';
 
 const route = useRoute();
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
-const tableList = ref([]);
+const tableList = ref<TableVO[]>([]);
 const loading = ref(true);
 const showSearch = ref(true);
-const ids = ref([]);
+const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const tableNames = ref([]);
-const dateRange = ref([]);
+const tableNames = ref<Array<string>>([]);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
 const uniqueId = ref("");
 
-const data = reactive({
-  queryParams: {
+const queryFormRef = ref(ElForm);
+const importRef = ref(importTable);
+
+const queryParams = ref<TableQuery>({
     pageNum: 1,
     pageSize: 10,
-    tableName: undefined,
-    tableComment: undefined,
+    tableName: '',
+    tableComment: '',
     dataName: "master"
-  },
-  preview: {
-    open: false,
-    title: "浠g爜棰勮",
+})
+
+const preview = ref <any>({
     data: {},
-    activeName: "domain.java"
-  }
+    activeName: 'domain.java'
+})
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: '浠g爜棰勮'
 });
 
-const { queryParams, preview } = toRefs(data);
-
-localStorage.setItem("dataName", queryParams.value.dataName);
+localStorage.setItem('dataName', queryParams.value.dataName);
 
 onActivated(() => {
-  const time = route.query.t;
-  if (time != null && time != uniqueId.value) {
-    uniqueId.value = time;
-    queryParams.value.pageNum = Number(route.query.pageNum);
-    dateRange.value = [];
-    proxy.resetForm("queryForm");
-    getList();
-  }
+    const time = route.query.t;
+    if (time != null && time != uniqueId.value) {
+        uniqueId.value = time as string;
+        queryParams.value.pageNum = Number(route.query.pageNum);
+        dateRange.value = ['', ''];
+        queryFormRef.value.resetFields();
+        getList();
+    }
 })
 
 /** 鏌ヨ琛ㄩ泦鍚� */
-function getList() {
-  loading.value = true;
-  listTable(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    tableList.value = response.rows;
-    total.value = response.total;
+const getList = async () => {
+    loading.value = true;
+    const res = await listTable(proxy?.addDateRange(queryParams.value, dateRange.value));
+    tableList.value = res.rows;
+    total.value = res.total;
     loading.value = false;
-  });
 }
 /** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
-  localStorage.setItem("dataName", queryParams.value.dataName);
-  queryParams.value.pageNum = 1;
-  getList();
+const handleQuery = () => {
+    localStorage.setItem('dataName', queryParams.value.dataName);
+    queryParams.value.pageNum = 1;
+    getList();
 }
 /** 鐢熸垚浠g爜鎿嶄綔 */
-function handleGenTable(row) {
-  const tbNames = row.tableName || tableNames.value;
-  if (tbNames == "") {
-    proxy.$modal.msgError("璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁");
-    return;
-  }
-  if (row.genType === "1") {
-    genCode(row.tableName).then(response => {
-      proxy.$modal.msgSuccess("鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�" + row.genPath);
-    });
-  } else {
-    proxy.$download.zip("/tool/gen/batchGenCode?tables=" + tbNames, "ruoyi.zip");
-  }
+const handleGenTable = async (row?: TableVO) => {
+    const tbNames = row?.tableName || tableNames.value;
+    if (tbNames == "") {
+        proxy?.$modal.msgError('璇烽�夋嫨瑕佺敓鎴愮殑鏁版嵁');
+        return;
+    }
+    if (row?.genType === "1") {
+        await genCode(row.tableName);
+        proxy?.$modal.msgSuccess('鎴愬姛鐢熸垚鍒拌嚜瀹氫箟璺緞锛�' + row.genPath);
+    } else {
+        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(() => {});
+const handleSynchDb = async (row: TableVO) => {
+    const tableName = row.tableName;
+    await proxy?.$modal.confirm('纭瑕佸己鍒跺悓姝�"' + tableName + '"琛ㄧ粨鏋勫悧锛�');
+    await synchDb(tableName);
+    proxy?.$modal.msgSuccess('鍚屾鎴愬姛');
 }
 /** 鎵撳紑瀵煎叆琛ㄥ脊绐� */
-function openImportTable() {
-  proxy.$refs["importRef"].show();
+const openImportTable = () => {
+    importRef.value.show();
 }
 /** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
-  dateRange.value = [];
-  proxy.resetForm("queryRef");
-  handleQuery();
+const resetQuery = () => {
+    dateRange.value = ['', ''];
+    queryFormRef.value.resetFields();
+    handleQuery();
 }
 /** 棰勮鎸夐挳 */
-function handlePreview(row) {
-  previewTable(row.tableId).then(response => {
-    preview.value.data = response.data;
-    preview.value.open = true;
-    preview.value.activeName = "domain.java";
-  });
+const handlePreview = async (row: TableVO) => {
+    const res = await previewTable(row.tableId);
+    preview.value.data = res.data;
+    dialog.visible = true;
+    preview.value.activeName = 'domain.java';
 }
 /** 澶嶅埗浠g爜鎴愬姛 */
-function copyTextSuccess() {
-  proxy.$modal.msgSuccess("澶嶅埗鎴愬姛");
+const copyTextSuccess = () => {
+    proxy?.$modal.msgSuccess('澶嶅埗鎴愬姛');
 }
 // 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.tableId);
-  tableNames.value = selection.map(item => item.tableName);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
+const handleSelectionChange = (selection: TableVO[]) => {
+    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 } });
+const handleEditTable = (row?: TableVO) => {
+    const tableId = row?.tableId || ids.value[0];
+    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(() => {
+const handleDelete = async (row?: TableVO) => {
+    const tableIds = row?.tableId || ids.value;
+    await proxy?.$modal.confirm('鏄惁纭鍒犻櫎琛ㄧ紪鍙蜂负"' + tableIds + '"鐨勬暟鎹」锛�');
+    await delTable(tableIds);
     getList();
-    proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
-  }).catch(() => {});
+    proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
 }
 
-getList();
+onMounted(() => {
+    getList();
+})
 </script>

--
Gitblit v1.9.3