修复 table 组件checkbox 取消全选的bug

Author: 黄书伟

libs/v-table/src/checkbox-selection-mixin.js

@@ -17,18 +17,6 @@ exports.default = {
 
 
     computed: {
-        disabledChecked: function disabledChecked() {
-
-            var result = [];
-
-            this.internalTableData.filter(function (item, index) {
-
-                if (item._disabled && item._checked) {
-                    result.push(index);
-                }
-            });
-            return result;
-        },
         disabledUnChecked: function disabledUnChecked() {
 
             var result = [];
@@ -52,6 +40,18 @@ exports.default = {
     },
 
     methods: {
+        disabledChecked: function disabledChecked() {
+
+            var result = [];
+
+            this.internalTableData.filter(function (item, index) {
+
+                if (item._disabled && item._checked) {
+                    result.push(index);
+                }
+            });
+            return result;
+        },
         handleCheckAll: function handleCheckAll() {
 
             if (this.isAllChecked) {
@@ -74,7 +74,7 @@ exports.default = {
                 this.selectAll && this.selectAll(this.getCheckedTableRow);
             } else {
 
-                this.checkboxGroupModel = this.disabledChecked;
+                this.checkboxGroupModel = this.disabledChecked();
             }
 
             this.setCheckAllState();

packages/v-table/src/checkbox-selection-mixin.js

@@ -15,20 +15,6 @@ export default {
 
     computed: {
 
-        // 禁用已选中的复选框集合
-        disabledChecked(){
-
-            let result = [];
-
-            this.internalTableData.filter((item, index) => {
-
-                if (item._disabled && item._checked) {
-                    result.push(index);
-                }
-            })
-            return result;
-        },
-
         // 禁用未选中的复选框集合
         disabledUnChecked(){
 
@@ -55,6 +41,20 @@ export default {
 
     methods: {
 
+        // 禁用已选中的复选框集合
+        disabledChecked(){
+
+            let result = [];
+
+            this.internalTableData.filter((item, index) => {
+
+                if (item._disabled && item._checked) {
+                    result.push(index);
+                }
+            })
+            return result;
+        },
+
         // check all trigger event
         handleCheckAll(){
 
@@ -79,7 +79,7 @@ export default {
 
             } else {
 
-                this.checkboxGroupModel = this.disabledChecked;
+                this.checkboxGroupModel = this.disabledChecked();
             }
 
             this.setCheckAllState();
@@ -125,7 +125,7 @@ export default {
             }
         },
 
-        // 修改checkbox 选中状态
+        // 修改checkbox 选中状态(table.vue 中调用)
         updateCheckboxGroupModel(){
 
             this.checkboxGroupModel = [];