vxe-table 3.6.0-beta.2 → 3.6.0-beta.3

package/lib/index.umd.js

@@ -8590,6 +8590,11 @@ var iconPrefix = 'vxe-icon-';
     TABLE_EXPAND_LOADED: iconPrefix + 'spinner roll',
     TABLE_EXPAND_OPEN: iconPrefix + 'arrow-right rotate90',
     TABLE_EXPAND_CLOSE: iconPrefix + 'arrow-right',
+    TABLE_CHECKBOX_CHECKED: iconPrefix + 'checkbox-checked',
+    TABLE_CHECKBOX_UNCHECKED: iconPrefix + 'checkbox-unchecked',
+    TABLE_CHECKBOX_INDETERMINATE: iconPrefix + 'checkbox-indeterminate',
+    TABLE_RADIO_CHECKED: iconPrefix + 'radio-checked',
+    TABLE_RADIO_UNCHECKED: iconPrefix + 'radio-unchecked',
     // button
     BUTTON_DROPDOWN: iconPrefix + 'arrow-down',
     BUTTON_LOADING: iconPrefix + 'spinner roll',
@@ -8807,7 +8812,7 @@ var es_array_concat = __webpack_require__("99af");
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.6.0-beta.1", "] ").concat(src_conf.i18n(message, params));
+  return "[vxe-table v".concat("3.6.0-beta.2", "] ").concat(src_conf.i18n(message, params));
 }
 
 function outLog(type) {
@@ -10088,7 +10093,7 @@ function _t(key, args) {
 var v = 'v3';
 var VXETable = {
   v: v,
-  version: "3.6.0-beta.1",
+  version: "3.6.0-beta.2",
   reg: reg,
   use: use,
   setup: setup,
@@ -12908,9 +12913,7 @@ var Cell = {
 
     if (isVisible) {
       radioVNs.push(h('span', {
-        class: 'vxe-radio--icon vxe-radio--checked-icon'
-      }), h('span', {
-        class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+        class: ['vxe-radio--icon', isChecked ? src_conf.icon.TABLE_RADIO_CHECKED : src_conf.icon.TABLE_RADIO_UNCHECKED]
       }));
     }
 
@@ -12986,11 +12989,7 @@ var Cell = {
       },
       on: on
     }, [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'
+      class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllCheckboxSelected ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
     })].concat(titleSlot || headerTitle ? [h('span', {
       class: 'vxe-checkbox--label'
     }, titleSlot ? $table.callSlot(titleSlot, checkboxParams, h) : headerTitle)] : []))]);
@@ -13054,11 +13053,7 @@ var Cell = {
 
     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'
+        class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
 
@@ -13140,11 +13135,7 @@ var Cell = {
 
     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'
+        class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }));
     }
 
@@ -21218,14 +21209,16 @@ var Table = Object.assign(table, {
         }, args)))];
       }
 
+      var isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
+        return item._checked;
+      });
+      var isAllIndeterminate = multiple && filterStore.isIndeterminate;
       return [h('ul', {
         class: 'vxe-table--filter-header'
       }, [h('li', {
         class: ['vxe-table--filter-option', {
-          'is--checked': multiple ? filterStore.isAllSelected : !filterStore.options.some(function (item) {
-            return item._checked;
-          }),
-          'is--indeterminate': multiple && filterStore.isIndeterminate
+          'is--checked': isAllChecked,
+          'is--indeterminate': isAllIndeterminate
         }],
         attrs: {
           title: src_conf.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter')
@@ -21236,11 +21229,7 @@ var Table = Object.assign(table, {
           }
         }
       }, (multiple ? [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'
+        class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       })] : []).concat([h('span', {
         class: 'vxe-checkbox--label'
       }, src_conf.i18n('vxe.table.allFilter'))]))]), h('ul', {
@@ -21249,9 +21238,11 @@ var Table = Object.assign(table, {
           maxHeight: "".concat(maxHeight, "px")
         } : {}
       }, filterStore.options.map(function (item) {
+        var isChecked = item._checked;
+        var isIndeterminate = false;
         return h('li', {
           class: ['vxe-table--filter-option', {
-            'is--checked': item._checked
+            'is--checked': isChecked
           }],
           attrs: {
             title: item.label
@@ -21262,11 +21253,7 @@ var Table = Object.assign(table, {
             }
           }
         }, (multiple ? [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'
+          class: ['vxe-checkbox--icon', isIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
         })] : []).concat([h('span', {
           class: 'vxe-checkbox--label'
         }, utils.formatText(item.label, 1))]));
@@ -27243,8 +27230,9 @@ function renderExtraSuffixIcon(h, _vm) {
       attrs.title = title;
     }
 
+    var isChecked = isGroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes($xecheckboxgroup.value, label) : value === checkedValue;
     return h('label', {
-      class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
+      class: ['vxe-checkbox', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--indeterminate', indeterminate), _defineProperty(_ref, 'is--disabled', isDisabled), _defineProperty(_ref, 'is--checked', isChecked), _ref)],
       attrs: attrs
     }, [h('input', {
       class: 'vxe-checkbox--input',
@@ -27253,13 +27241,13 @@ function renderExtraSuffixIcon(h, _vm) {
         disabled: isDisabled
       },
       domProps: {
-        checked: isGroup ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes($xecheckboxgroup.value, label) : value === checkedValue
+        checked: isChecked
       },
       on: {
         change: this.changeEvent
       }
     }), h('span', {
-      class: 'vxe-checkbox--icon'
+      class: ['vxe-checkbox--icon', indeterminate ? 'vxe-icon-checkbox-indeterminate' : isChecked ? 'vxe-icon-checkbox-checked' : 'vxe-icon-checkbox-unchecked']
     }), h('span', {
       class: 'vxe-checkbox--label'
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
@@ -28589,8 +28577,8 @@ Object.keys(option_props).forEach(function (name) {
 
     var _e = this._e,
         checkedAll = this.checkedAll,
-        isAll = this.isAll,
-        isIndeterminate = this.isIndeterminate,
+        isAllChecked = this.isAll,
+        isAllIndeterminate = this.isIndeterminate,
         showSheet = this.showSheet,
         supportMerge = this.supportMerge,
         supportStyle = this.supportStyle,
@@ -28605,11 +28593,13 @@ Object.keys(option_props).forEach(function (name) {
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(storeData.columns, function (column) {
       var colTitle = utils.formatText(column.getTitle(), 1);
       var isColGroup = column.children && column.children.length;
+      var isChecked = column.checked;
+      var indeterminate = column.halfChecked;
       cols.push(h('li', {
         class: ['vxe-export--panel-column-option', "level--".concat(column.level), {
           'is--group': isColGroup,
-          'is--checked': column.checked,
-          'is--indeterminate': column.halfChecked,
+          'is--checked': isChecked,
+          'is--indeterminate': indeterminate,
           'is--disabled': column.disabled
         }],
         attrs: {
@@ -28623,11 +28613,7 @@ Object.keys(option_props).forEach(function (name) {
           }
         }
       }, [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'
+        class: ['vxe-checkbox--icon', indeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         class: 'vxe-checkbox--label'
       }, colTitle)]));
@@ -28723,8 +28709,8 @@ Object.keys(option_props).forEach(function (name) {
       class: 'vxe-export--panel-column-header'
     }, [h('li', {
       class: ['vxe-export--panel-column-option', {
-        'is--checked': isAll,
-        'is--indeterminate': isIndeterminate
+        'is--checked': isAllChecked,
+        'is--indeterminate': isAllIndeterminate
       }],
       attrs: {
         title: src_conf.i18n('vxe.table.allTitle')
@@ -28733,11 +28719,7 @@ Object.keys(option_props).forEach(function (name) {
         click: this.allColumnEvent
       }
     }, [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'
+      class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
     }), h('span', {
       class: 'vxe-checkbox--label'
     }, src_conf.i18n('vxe.export.expCurrentColumn'))])]), h('ul', {
@@ -29007,6 +28989,9 @@ Object.keys(option_props).forEach(function (name) {
     isStrict: function isStrict() {
       var $xeradiogroup = this.$xeradiogroup;
       return $xeradiogroup ? $xeradiogroup.strict : this.strict;
+    },
+    isChecked: function isChecked() {
+      return this.$xeradiogroup ? this.$xeradiogroup.value === this.label : this.value === this.label;
     }
   },
   render: function render(h) {
@@ -29015,10 +29000,9 @@ Object.keys(option_props).forEach(function (name) {
     var $scopedSlots = this.$scopedSlots,
         $xeradiogroup = this.$xeradiogroup,
         isDisabled = this.isDisabled,
+        isChecked = this.isChecked,
         title = this.title,
         vSize = this.vSize,
-        value = this.value,
-        label = this.label,
         name = this.name,
         content = this.content;
     var attrs = {};
@@ -29028,7 +29012,7 @@ Object.keys(option_props).forEach(function (name) {
     }
 
     return h('label', {
-      class: ['vxe-radio', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
+      class: ['vxe-radio', (_ref = {}, _defineProperty(_ref, "size--".concat(vSize), vSize), _defineProperty(_ref, 'is--checked', isChecked), _defineProperty(_ref, 'is--disabled', isDisabled), _ref)],
       attrs: attrs
     }, [h('input', {
       class: 'vxe-radio--input',
@@ -29038,14 +29022,14 @@ Object.keys(option_props).forEach(function (name) {
         disabled: isDisabled
       },
       domProps: {
-        checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
+        checked: isChecked
       },
       on: {
         change: this.changeEvent,
         click: this.clickEvent
       }
     }), h('span', {
-      class: 'vxe-radio--icon'
+      class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
     }), h('span', {
       class: 'vxe-radio--label'
     }, $scopedSlots.default ? $scopedSlots.default.call(this, {}) : [getFuncText(content)])]);
@@ -34214,11 +34198,13 @@ function renderCustoms(h, _vm) {
     }) : false;
 
     if (isColGroup || colKey) {
+      var isChecked = column.visible;
+      var isIndeterminate = column.halfVisible;
       cols.push(h('li', {
         class: ['vxe-custom--option', "level--".concat(column.level), {
           'is--group': isColGroup,
-          'is--checked': column.visible,
-          'is--indeterminate': column.halfVisible,
+          'is--checked': isChecked,
+          'is--indeterminate': isIndeterminate,
           'is--disabled': isDisabled
         }],
         attrs: {
@@ -34232,16 +34218,14 @@ function renderCustoms(h, _vm) {
           }
         }
       }, [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'
+        class: ['vxe-checkbox--icon', isIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
       }), h('span', {
         class: 'vxe-checkbox--label'
       }, colTitle)]));
     }
   });
+  var isAllChecked = customStore.isAll;
+  var isAllIndeterminate = customStore.isIndeterminate;
   return h('div', {
     class: ['vxe-custom--wrapper', {
       'is--active': customStore.visible
@@ -34262,8 +34246,8 @@ function renderCustoms(h, _vm) {
     class: 'vxe-custom--header'
   }, [h('li', {
     class: ['vxe-custom--option', {
-      'is--checked': customStore.isAll,
-      'is--indeterminate': customStore.isIndeterminate
+      'is--checked': isAllChecked,
+      'is--indeterminate': isAllIndeterminate
     }],
     attrs: {
       title: src_conf.i18n('vxe.table.allTitle')
@@ -34272,11 +34256,7 @@ function renderCustoms(h, _vm) {
       click: _vm.allCustomEvent
     }
   }, [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'
+    class: ['vxe-checkbox--icon', isAllIndeterminate ? src_conf.icon.TABLE_CHECKBOX_INDETERMINATE : isAllChecked ? src_conf.icon.TABLE_CHECKBOX_CHECKED : src_conf.icon.TABLE_CHECKBOX_UNCHECKED]
   }), h('span', {
     class: 'vxe-checkbox--label'
   }, src_conf.i18n('vxe.toolbar.customAll'))])]), h('ul', {