From c864043c118422397b108c9237145f9801a4f191 Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Fri, 16 Apr 2021 17:09:51 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=AD=9B=E9=80=89=E5=88=97=E5=A4=B4=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=88=97=E4=B8=8D=E8=A7=81=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/jero/JTable.vue   | 15 +++++++++------
 jero-web/src/views/demo/list/RoleList.vue |  4 ----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/components/jero/JTable.vue b/jero-web/src/components/jero/JTable.vue
index 365c3532..bcd1181d 100644
--- a/jero-web/src/components/jero/JTable.vue
+++ b/jero-web/src/components/jero/JTable.vue
@@ -128,10 +128,9 @@ export default {
   },
   data() {
     return {
-      // 存储当前列表的用户存储信息
-      key: "customer_cloumns_" + this.$route.path,
-      // 内部使用的 slots ，不再处理
-      usedSlots: [],
+      key: "customer_cloumns_" + this.$route.path, // 存储当前列表的用户存储信息
+      defaultOperationKey: "action", // 操作列dataIndex=action不作相关处理，默认去除
+      usedSlots: [], // 内部使用的 slots ，不再处理
       needTotalList: [],
       selectedRows: [],
       selectedRowKeys: [],
@@ -217,7 +216,6 @@ export default {
   methods: {
     // 用户可自行筛选列头显示的字段
     onChange(e) {
-      debugger
       // 只剩一个时候,最后一个多选按钮禁用
       if (this.checkedList.length === 1) {
         this.plainOptions.forEach((item) => {
@@ -263,8 +261,13 @@ export default {
     },
     // 比较两个数组之间的不同,生成新数组
     getArrDifference(arr1, arr2) {
+      let that = this;
       return arr1.concat(arr2).filter(function (v, i, arr) {
-        return arr.indexOf(v) === arr.lastIndexOf(v)
+        if (v !== that.defaultOperationKey){
+          return arr.indexOf(v) === arr.lastIndexOf(v)
+        } else {
+          return false;
+        }
       })
     },
     fixedChange(e, dataIndex) {
diff --git a/jero-web/src/views/demo/list/RoleList.vue b/jero-web/src/views/demo/list/RoleList.vue
index ffc32518..7b208eb5 100644
--- a/jero-web/src/views/demo/list/RoleList.vue
+++ b/jero-web/src/views/demo/list/RoleList.vue
@@ -31,7 +31,6 @@
       ref="jTable"
       size="default"
       :columns="columns"
-      :isCheck="false"
       :dataSource="dataSource"
     >
       <div
@@ -134,9 +133,6 @@
             width: '150px',
             dataIndex: 'action',
             scopedSlots: { customRender: 'action' },
-            slots: {
-              fixedValue: 2,
-            }
           }
         ],
         dataSource:[],