From 709b215413c082bdf8545be795109fcc0e6505b8 Mon Sep 17 00:00:00 2001
From: chuzhixin <1204505056@qq.com>
Date: Thu, 1 Oct 2020 11:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9A=A1=EF=B8=8F=E7=B2=BE=E7=AE=80=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E7=BB=84=E4=BB=B6=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=BC=80=E6=BA=90=E7=89=88=E5=BD=BB=E5=BA=95?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=89=8B=E6=9C=BA=E3=80=81=E5=B9=B3=E6=9D=BF?=
 =?UTF-8?q?=E3=80=81=E7=94=B5=E8=84=91=E4=B8=89=E7=AB=AF=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menuManagement/index.vue                  | 51 ++++++++-----------
 .../roleManagement/index.vue                  | 15 ++----
 .../userManagement/index.vue                  | 15 ++----
 .../components/TableExhibitionBody.vue        |  2 +-
 .../codeGenerator/components/snippetTable.js  |  8 +--
 .../components/snippetTableColumn.js          |  2 +-
 src/views/vab/permissions/index.vue           | 26 +++++-----
 src/views/vab/table/index.vue                 | 29 ++++-------
 src/views/vab/table/inlineEditTable.vue       |  6 +--
 src/views/vab/tree/index.vue                  | 16 +++---
 10 files changed, 70 insertions(+), 100 deletions(-)

diff --git a/src/views/personnelManagement/menuManagement/index.vue b/src/views/personnelManagement/menuManagement/index.vue
index bfd75a4..695d641 100644
--- a/src/views/personnelManagement/menuManagement/index.vue
+++ b/src/views/personnelManagement/menuManagement/index.vue
@@ -41,16 +41,16 @@
             label="路径"
           ></el-table-column>
           <el-table-column show-overflow-tooltip label="是否隐藏">
-            <template slot-scope="scope">
+            <template #default="{ row }">
               <span>
-                {{ scope.row.hidden ? "是" : "否" }}
+                {{ row.hidden ? "是" : "否" }}
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="是否一直显示当前节点">
-            <template slot-scope="scope">
+            <template #default="{ row }">
               <span>
-                {{ scope.row.alwaysShow ? "是" : "否" }}
+                {{ row.alwaysShow ? "是" : "否" }}
               </span>
             </template>
           </el-table-column>
@@ -70,49 +70,40 @@
             label="标题"
           ></el-table-column>
           <el-table-column show-overflow-tooltip label="图标">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
+            <template #default="{ row }">
+              <span v-if="row.meta">
                 <vab-icon
-                  v-if="scope.row.meta.icon"
-                  :icon="['fas', scope.row.meta.icon]"
+                  v-if="row.meta.icon"
+                  :icon="['fas', row.meta.icon]"
                 ></vab-icon>
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="是否固定">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
-                {{ scope.row.meta.affix ? "是" : "否" }}
+            <template #default="{ row }">
+              <span v-if="row.meta">
+                {{ row.meta.affix ? "是" : "否" }}
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="是否无缓存">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
-                {{ scope.row.meta.noKeepAlive ? "是" : "否" }}
+            <template #default="{ row }">
+              <span v-if="row.meta">
+                {{ row.meta.noKeepAlive ? "是" : "否" }}
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="badge">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
-                {{ scope.row.meta.badge }}
+            <template #default="{ row }">
+              <span v-if="row.meta">
+                {{ row.meta.badge }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
-            show-overflow-tooltip
-            fixed="right"
-            label="操作"
-            width="200"
-          >
-            <template #default="scope">
-              <el-button type="text" @click="handleEdit(scope.row)">
-                编辑
-              </el-button>
-              <el-button type="text" @click="handleDelete(scope.row)">
-                删除
-              </el-button>
+          <el-table-column show-overflow-tooltip label="操作" width="200">
+            <template #default="{ row }">
+              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
diff --git a/src/views/personnelManagement/roleManagement/index.vue b/src/views/personnelManagement/roleManagement/index.vue
index 6a41b13..8ab11df 100644
--- a/src/views/personnelManagement/roleManagement/index.vue
+++ b/src/views/personnelManagement/roleManagement/index.vue
@@ -47,17 +47,10 @@
         prop="permission"
         label="权限码"
       ></el-table-column>
-      <el-table-column
-        show-overflow-tooltip
-        fixed="right"
-        label="操作"
-        width="200"
-      >
-        <template #default="scope">
-          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">
-            删除
-          </el-button>
+      <el-table-column show-overflow-tooltip label="操作" width="200">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/personnelManagement/userManagement/index.vue b/src/views/personnelManagement/userManagement/index.vue
index c04f9bb..6fc21da 100644
--- a/src/views/personnelManagement/userManagement/index.vue
+++ b/src/views/personnelManagement/userManagement/index.vue
@@ -63,17 +63,10 @@
         prop="datatime"
         label="修改时间"
       ></el-table-column>
-      <el-table-column
-        show-overflow-tooltip
-        fixed="right"
-        label="操作"
-        width="200"
-      >
-        <template #default="scope">
-          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">
-            删除
-          </el-button>
+      <el-table-column show-overflow-tooltip label="操作" width="200">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/vab/codeGenerator/components/TableExhibitionBody.vue b/src/views/vab/codeGenerator/components/TableExhibitionBody.vue
index a800aac..66ac3be 100644
--- a/src/views/vab/codeGenerator/components/TableExhibitionBody.vue
+++ b/src/views/vab/codeGenerator/components/TableExhibitionBody.vue
@@ -9,7 +9,7 @@
           :label="header.label"
           align="center"
         >
-          <template slot-scope="{ row }">
+          <template #default="{ row }">
             {{ row[header.key] }}
           </template>
         </el-table-column>
diff --git a/src/views/vab/codeGenerator/components/snippetTable.js b/src/views/vab/codeGenerator/components/snippetTable.js
index 0ce4ba5..4bf8071 100644
--- a/src/views/vab/codeGenerator/components/snippetTable.js
+++ b/src/views/vab/codeGenerator/components/snippetTable.js
@@ -46,13 +46,13 @@ export const genTableSnippet = (headers = "getList") => {
     >
       <el-table-column show-overflow-tooltip type="selection"></el-table-column>
       ${genTableColumnSnippet(headers)}
-      <el-table-column show-overflow-tooltip fixed="right" label="操作" width="200">
-        <template v-slot="scope">
-          <el-button type="text" @click="editList(scope.row)"
+      <el-table-column show-overflow-tooltip label="操作" width="200">
+        <template #default="{row}">
+          <el-button type="text" @click="editList(row)"
           >编辑
           </el-button
           >
-          <el-button type="text" @click="tableDelete(scope.row)"
+          <el-button type="text" @click="tableDelete(row)"
           >删除
           </el-button
           >
diff --git a/src/views/vab/codeGenerator/components/snippetTableColumn.js b/src/views/vab/codeGenerator/components/snippetTableColumn.js
index 6b39700..5f6a7f4 100644
--- a/src/views/vab/codeGenerator/components/snippetTableColumn.js
+++ b/src/views/vab/codeGenerator/components/snippetTableColumn.js
@@ -18,7 +18,7 @@ const genTabeleColumnSinppetTemplate = (key, label) => {
     val = `row.${key}`;
   }
   return `<el-table-column show-overflow-tooltip label="${label}">
-          <template v-slot={row}>
+          <template #default={row}>
             {{ ${val} }}
           </template>
         </el-table-column>`;
diff --git a/src/views/vab/permissions/index.vue b/src/views/vab/permissions/index.vue
index 5fb8548..bdda734 100644
--- a/src/views/vab/permissions/index.vue
+++ b/src/views/vab/permissions/index.vue
@@ -77,33 +77,33 @@
             label="标题"
           ></el-table-column>
           <el-table-column show-overflow-tooltip label="图标">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
+            <template #default="{ row }">
+              <span v-if="row.meta">
                 <vab-icon
-                  v-if="scope.row.meta.icon"
-                  :icon="['fas', scope.row.meta.icon]"
+                  v-if="row.meta.icon"
+                  :icon="['fas', row.meta.icon]"
                 ></vab-icon>
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="是否固定">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
-                {{ scope.row.meta.affix }}
+            <template #default="{ row }">
+              <span v-if="row.meta">
+                {{ row.meta.affix }}
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="是否无缓存">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
-                {{ scope.row.meta.noKeepAlive }}
+            <template #default="{ row }">
+              <span v-if="row.meta">
+                {{ row.meta.noKeepAlive }}
               </span>
             </template>
           </el-table-column>
           <el-table-column show-overflow-tooltip label="badge">
-            <template slot-scope="scope">
-              <span v-if="scope.row.meta">
-                {{ scope.row.meta.badge }}
+            <template #default="{ row }">
+              <span v-if="row.meta">
+                {{ row.meta.badge }}
               </span>
             </template>
           </el-table-column>
diff --git a/src/views/vab/table/index.vue b/src/views/vab/table/index.vue
index 579c70d..58c4577 100644
--- a/src/views/vab/table/index.vue
+++ b/src/views/vab/table/index.vue
@@ -51,7 +51,7 @@
         width="55"
       ></el-table-column>
       <el-table-column show-overflow-tooltip label="序号" width="95">
-        <template slot-scope="scope">
+        <template #default="scope">
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
@@ -66,11 +66,11 @@
         prop="author"
       ></el-table-column>
       <el-table-column show-overflow-tooltip label="头像">
-        <template slot-scope="scope">
+        <template #default="{ row }">
           <el-image
             v-if="imgShow"
             :preview-src-list="imageList"
-            :src="scope.row.img"
+            :src="row.img"
           ></el-image>
         </template>
       </el-table-column>
@@ -81,15 +81,15 @@
         sortable
       ></el-table-column>
       <el-table-column show-overflow-tooltip label="状态">
-        <template slot-scope="scope">
+        <template #default="{ row }">
           <el-tooltip
-            :content="scope.row.status"
+            :content="row.status"
             class="item"
             effect="dark"
             placement="top-start"
           >
-            <el-tag :type="scope.row.status | statusFilter">
-              {{ scope.row.status }}
+            <el-tag :type="row.status | statusFilter">
+              {{ row.status }}
             </el-tag>
           </el-tooltip>
         </template>
@@ -100,17 +100,10 @@
         prop="datetime"
         width="200"
       ></el-table-column>
-      <el-table-column
-        show-overflow-tooltip
-        label="操作"
-        width="180px"
-        fixed="right"
-      >
-        <template slot-scope="scope">
-          <el-button type="text" @click="handleEdit(scope.row)">编辑</el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">
-            删除
-          </el-button>
+      <el-table-column show-overflow-tooltip label="操作" width="180px">
+        <template #default="{ row }">
+          <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/vab/table/inlineEditTable.vue b/src/views/vab/table/inlineEditTable.vue
index b0e7939..8a1b683 100644
--- a/src/views/vab/table/inlineEditTable.vue
+++ b/src/views/vab/table/inlineEditTable.vue
@@ -11,12 +11,12 @@
         width="55"
       ></el-table-column>
       <el-table-column show-overflow-tooltip label="序号" width="95">
-        <template slot-scope="scope">
+        <template #default="scope">
           {{ scope.$index + 1 }}
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip min-width="300px" label="标题">
-        <template slot-scope="{ row }">
+        <template #default="{ row }">
           <template v-if="row.edit">
             <el-input v-model="row.title" style="width: 300px" />
             <el-button
@@ -41,7 +41,7 @@
         label="操作"
         width="200"
       >
-        <template slot-scope="{ row }">
+        <template #default="{ row }">
           <el-button
             v-if="row.edit"
             type="success"
diff --git a/src/views/vab/tree/index.vue b/src/views/vab/tree/index.vue
index 67b4757..f8fcc5f 100644
--- a/src/views/vab/tree/index.vue
+++ b/src/views/vab/tree/index.vue
@@ -21,7 +21,7 @@
           @node-collapse="nodeCollapse"
           @node-expand="nodeExpand"
         >
-          <span slot-scope="{ node, data }" class="vab-custom-tree-node">
+          <template #defalut="{ node, data }" class="vab-custom-tree-node">
             <span class="vab-tree-item">
               <i v-if="node.data.rank == 4" class="el-icon-s-custom"></i>
               {{ node.label }}
@@ -51,7 +51,7 @@
                 <i class="el-icon-delete"></i>
               </a>
             </span>
-          </span>
+          </template>
         </el-tree>
       </el-col>
       <el-col :xs="24" :sm="24" :md="24" :lg="6" :xl="6">
@@ -75,7 +75,7 @@
             node-key="indexCode"
             @node-click="nodeClick"
           >
-            <span slot-scope="{ node }" class="vab-custom-tree-node">
+            <template #defalut="{ node }" class="vab-custom-tree-node">
               <span class="vab-tree-item">
                 <i v-if="node.data.rank == 4" class="el-icon-s-custom"></i>
                 {{ node.label }}
@@ -99,7 +99,7 @@
                   <i class="el-icon-delete"></i>
                 </a>
               </span>
-            </span>
+            </template>
           </el-tree>
         </div>
         <div v-show="!isShow" class="el-tree-wrap">
@@ -115,7 +115,7 @@
             node-key="indexCode"
             @node-click="nodeClick"
           >
-            <span slot-scope="{ node }" class="vab-custom-tree-node">
+            <template #defalut="{ node }" class="vab-custom-tree-node">
               <span class="vab-tree-item">
                 <i v-if="node.data.rank == 4" class="el-icon-s-custom"></i>
                 {{ node.label }}
@@ -133,7 +133,7 @@
                   <i class="el-icon-delete"></i>
                 </a>
               </span>
-            </span>
+            </template>
           </el-tree>
         </div>
       </el-col>
@@ -160,9 +160,9 @@
               node-key="id"
               @node-click="selectTreeNodeClick"
             >
-              <span slot-scope="{ node }" class="vab-custom-tree-node">
+              <template #defalut="{ node }" class="vab-custom-tree-node">
                 <span class="vab-tree-item">{{ node.label }}</span>
-              </span>
+              </template>
             </el-tree>
           </el-option>
         </el-select>