vxe-table 4.1.0 → 4.1.3

package/es/table/src/cell.js

@@ -309,17 +309,18 @@ export var Cell = {
         var selectRow = reactData.selectRow;
         var radioOpts = computeRadioOpts.value;
         var slots = column.slots;
-        var labelField = radioOpts.labelField, checkMethod = radioOpts.checkMethod;
+        var labelField = radioOpts.labelField, checkMethod = radioOpts.checkMethod, visibleMethod = radioOpts.visibleMethod;
         var row = params.row;
         var defaultSlot = slots ? slots.default : null;
         var radioSlot = slots ? slots.radio : null;
         var isChecked = row === selectRow;
+        var isVisible = !visibleMethod || visibleMethod({ row: row });
         var isDisabled = !!checkMethod;
         var ons;
         if (!isHidden) {
             ons = {
                 onClick: function (evnt) {
-                    if (!isDisabled) {
+                    if (!isDisabled && isVisible) {
                         $table.triggerRadioRowEvent(evnt, params);
                     }
                 }
@@ -328,23 +329,28 @@ export var Cell = {
                 isDisabled = !checkMethod({ row: row });
             }
         }
-        var radioParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled });
-        return radioSlot ? $table.callSlot(radioSlot, radioParams) : [
+        var radioParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible });
+        if (radioSlot) {
+            return $table.callSlot(radioSlot, radioParams);
+        }
+        var radioVNs = [];
+        if (isVisible) {
+            radioVNs.push(h('span', {
+                class: 'vxe-radio--icon vxe-radio--checked-icon'
+            }), h('span', {
+                class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+            }));
+        }
+        if (defaultSlot || labelField) {
+            radioVNs.push(h('span', {
+                class: 'vxe-radio--label'
+            }, defaultSlot ? $table.callSlot(defaultSlot, radioParams) : XEUtils.get(row, labelField)));
+        }
+        return [
             h('span', __assign({ class: ['vxe-cell--radio', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled
-                    }] }, ons), [
-                h('span', {
-                    class: 'vxe-radio--icon vxe-radio--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-radio--icon vxe-radio--unchecked-icon'
-                })
-            ].concat(defaultSlot || labelField ? [
-                h('span', {
-                    class: 'vxe-radio--label'
-                }, defaultSlot ? $table.callSlot(defaultSlot, radioParams) : XEUtils.get(row, labelField))
-            ] : []))
+                    }] }, ons), radioVNs)
         ];
     },
     renderTreeRadioCell: function (params) {
@@ -416,19 +422,20 @@ export var Cell = {
         var selection = reactData.selection, treeIndeterminates = reactData.treeIndeterminates;
         var computeCheckboxOpts = $table.getComputeMaps().computeCheckboxOpts;
         var checkboxOpts = computeCheckboxOpts.value;
-        var labelField = checkboxOpts.labelField, checkMethod = checkboxOpts.checkMethod;
+        var labelField = checkboxOpts.labelField, checkMethod = checkboxOpts.checkMethod, visibleMethod = checkboxOpts.visibleMethod;
         var slots = column.slots;
         var defaultSlot = slots ? slots.default : null;
         var checkboxSlot = slots ? slots.checkbox : null;
         var indeterminate = false;
         var isChecked = false;
+        var isVisible = !visibleMethod || visibleMethod({ row: row });
         var isDisabled = !!checkMethod;
         var ons;
         if (!isHidden) {
             isChecked = $table.findRowIndexOf(selection, row) > -1;
             ons = {
                 onClick: function (evnt) {
-                    if (!isDisabled) {
+                    if (!isDisabled && isVisible) {
                         $table.triggerCheckRowEvent(evnt, params, !isChecked);
                     }
                 }
@@ -440,27 +447,31 @@ export var Cell = {
                 indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
             }
         }
-        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, indeterminate: indeterminate });
-        return checkboxSlot ? $table.callSlot(checkboxSlot, checkboxParams) : [
+        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: indeterminate });
+        if (checkboxSlot) {
+            return $table.callSlot(checkboxSlot, checkboxParams);
+        }
+        var checkVNs = [];
+        if (isVisible) {
+            checkVNs.push(h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            }));
+        }
+        if (defaultSlot || labelField) {
+            checkVNs.push(h('span', {
+                class: 'vxe-checkbox--label'
+            }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField)));
+        }
+        return [
             h('span', __assign({ class: ['vxe-cell--checkbox', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled,
                         'is--indeterminate': indeterminate
-                    }] }, ons), [
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
-                })
-            ].concat(defaultSlot || labelField ? [
-                h('span', {
-                    class: 'vxe-checkbox--label'
-                }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField))
-            ] : []))
+                    }] }, ons), checkVNs)
         ];
     },
     renderTreeSelectionCell: function (params) {
@@ -473,19 +484,20 @@ export var Cell = {
         var treeIndeterminates = reactData.treeIndeterminates;
         var computeCheckboxOpts = $table.getComputeMaps().computeCheckboxOpts;
         var checkboxOpts = computeCheckboxOpts.value;
-        var labelField = checkboxOpts.labelField, property = checkboxOpts.checkField, halfField = checkboxOpts.halfField, checkMethod = checkboxOpts.checkMethod;
+        var labelField = checkboxOpts.labelField, property = checkboxOpts.checkField, halfField = checkboxOpts.halfField, checkMethod = checkboxOpts.checkMethod, visibleMethod = checkboxOpts.visibleMethod;
         var slots = column.slots;
         var defaultSlot = slots ? slots.default : null;
         var checkboxSlot = slots ? slots.checkbox : null;
         var indeterminate = false;
         var isChecked = false;
+        var isVisible = !visibleMethod || visibleMethod({ row: row });
         var isDisabled = !!checkMethod;
         var ons;
         if (!isHidden) {
             isChecked = XEUtils.get(row, property);
             ons = {
                 onClick: function (evnt) {
-                    if (!isDisabled) {
+                    if (!isDisabled && isVisible) {
                         $table.triggerCheckRowEvent(evnt, params, !isChecked);
                     }
                 }
@@ -497,27 +509,31 @@ export var Cell = {
                 indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1;
             }
         }
-        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, indeterminate: indeterminate });
-        return checkboxSlot ? $table.callSlot(checkboxSlot, checkboxParams) : [
+        var checkboxParams = __assign(__assign({}, params), { checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: indeterminate });
+        if (checkboxSlot) {
+            return $table.callSlot(checkboxSlot, checkboxParams);
+        }
+        var checkVNs = [];
+        if (isVisible) {
+            checkVNs.push(h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
+            }), h('span', {
+                class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+            }));
+            if (defaultSlot || labelField) {
+                checkVNs.push(h('span', {
+                    class: 'vxe-checkbox--label'
+                }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField)));
+            }
+        }
+        return [
             h('span', __assign({ class: ['vxe-cell--checkbox', {
                         'is--checked': isChecked,
                         'is--disabled': isDisabled,
                         'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
-                    }] }, ons), [
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                }),
-                h('span', {
-                    class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
-                })
-            ].concat(defaultSlot || labelField ? [
-                h('span', {
-                    class: 'vxe-checkbox--label'
-                }, defaultSlot ? $table.callSlot(defaultSlot, checkboxParams) : XEUtils.get(row, labelField))
-            ] : []))
+                    }] }, ons), checkVNs)
         ];
     },
     renderTreeSelectionCellByProp: function (params) {

package/es/table/src/props.js

@@ -94,8 +94,11 @@ export default {
     autoResize: { type: Boolean, default: function () { return GlobalConfig.table.autoResize; } },
     // 是否自动根据状态属性去更新响应式表格宽高
     syncResize: [Boolean, String, Number],
-    // 设置列的默认参数，仅对部分支持的属性有效
+    // 列配置信息
     columnConfig: Object,
+    // 行配置信息
+    rowConfig: Object,
+    // 列调整配置项
     resizableConfig: Object,
     // 序号配置项
     seqConfig: Object,