From 57f543792088f13a726e63cc7340e08f91720203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 13 Dec 2021 21:52:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=96=B0=E5=A2=9E=E5=A4=8D=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Vue/src/directive/permission/index.js |  2 ++
 ZR.Vue/src/views/tool/gen/index.vue      | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ZR.Vue/src/directive/permission/index.js b/ZR.Vue/src/directive/permission/index.js
index e3d76d3..9ef3379 100644
--- a/ZR.Vue/src/directive/permission/index.js
+++ b/ZR.Vue/src/directive/permission/index.js
@@ -1,9 +1,11 @@
 import hasRole from './hasRole'
 import hasPermi from './hasPermi'
+import clipboard from '../module/clipboard'
 
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
   Vue.directive('hasPermi', hasPermi)
+	Vue.directive('clipboard', clipboard)
 }
 
 if (window.Vue) {
diff --git a/ZR.Vue/src/views/tool/gen/index.vue b/ZR.Vue/src/views/tool/gen/index.vue
index 9ac9f6f..d1370eb 100644
--- a/ZR.Vue/src/views/tool/gen/index.vue
+++ b/ZR.Vue/src/views/tool/gen/index.vue
@@ -7,7 +7,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="handleSearch()">查询</el-button>
-        <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button>
+        <!-- <el-button type="default" icon="el-icon-refresh" size="small" @click="loadTableData()">刷新</el-button> -->
       </el-form-item>
     </el-form>
 
@@ -28,6 +28,7 @@
           <span>{{(queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1}}</span>
         </template>
       </el-table-column>
+			<el-table-column prop="tableId" label="表id" width="80"/>
       <el-table-column prop="tableName" label="表名" sortable="custom" width="180" />
       <el-table-column prop="tableComment" label="表描述" :show-overflow-tooltip="true" />
       <el-table-column prop="className" label="实体" />
@@ -50,8 +51,8 @@
     <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body>
       <el-tabs v-model="preview.activeName">
         <el-tab-pane v-for="(item, key) in preview.data" :label="item.title" :name="key.toString()" :key="key">
-          <pre v-html="highlightedCode(item.content)">
-          </pre>
+					<el-link :underline="false" icon="el-icon-document-copy" v-clipboard:copy="item.content" v-clipboard:success="clipboardSuccess" style="float:right">复制</el-link>
+          <pre><code class="hljs" v-html="highlightedCode(item.content, item.title)"></code></pre>
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
@@ -91,7 +92,7 @@
 <script>
 import {
   codeGenerator,
-  getGenTable,
+  listTable,
   delTable,
   previewTable,
 } from "@/api/tool/gen";
@@ -150,7 +151,7 @@ export default {
     handleSearch() {
       this.tableloading = true;
 
-      getGenTable(this.queryParams).then((res) => {
+      listTable(this.queryParams).then((res) => {
         this.tableData = res.data.result;
         this.total = res.data.totalNum;
         this.tableloading = false;
@@ -274,6 +275,11 @@ export default {
           });
         });
     },
+		 /** 复制代码成功 */
+    clipboardSuccess(){
+      this.msgSuccess("复制成功");
+    },
+		// 多选框选中数据
     handleSelectionChange(section) {
       this.tableIds = section.map((item) => item.tableId);
       this.multiple = !section.length;
@@ -281,7 +287,7 @@ export default {
     },
     /** 高亮显示 */
     highlightedCode(code, key) {
-      // var language = vmName.substring(vmName.indexOf(".") + 1, vmName.length);
+			// var language = key.substring(key.lastIndexOf(".") , key.length)
       const result = hljs.highlightAuto(code || "");
       return result.value || "&nbsp;";
     },