vxe-table 4.1.16 → 4.1.17-beta.0

package/es/radio/src/button.js

@@ -11,7 +11,8 @@ export default defineComponent({
         title: [String, Number],
         content: [String, Number],
         disabled: Boolean,
-        size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
+        strict: { type: Boolean, default: function () { return GlobalConfig.radioButton.strict; } },
+        size: { type: String, default: function () { return GlobalConfig.radioButton.size || GlobalConfig.size; } }
     },
     emits: [
         'update:modelValue',
@@ -34,6 +35,9 @@ export default defineComponent({
         var computeName = computed(function () {
             return $xeradiogroup ? $xeradiogroup.name : null;
         });
+        var computeStrict = computed(function () {
+            return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+        });
         var computeChecked = computed(function () {
             var modelValue = props.modelValue, label = props.label;
             return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
@@ -44,16 +48,27 @@ export default defineComponent({
             }
         };
         Object.assign($xeradiobutton, radioButtonMethods);
+        var handleValue = function (label, evnt) {
+            if ($xeradiogroup) {
+                $xeradiogroup.handleChecked({ label: label }, evnt);
+            }
+            else {
+                emit('update:modelValue', label);
+                radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+            }
+        };
         var changeEvent = function (evnt) {
-            var label = props.label;
             var isDisabled = computeDisabled.value;
             if (!isDisabled) {
-                if ($xeradiogroup) {
-                    $xeradiogroup.handleChecked({ label: label }, evnt);
-                }
-                else {
-                    emit('update:modelValue', label);
-                    radioButtonMethods.dispatchEvent('change', { label: label }, evnt);
+                handleValue(props.label, evnt);
+            }
+        };
+        var clickEvent = function (evnt) {
+            var isDisabled = computeDisabled.value;
+            var isStrict = computeStrict.value;
+            if (!isDisabled && !isStrict) {
+                if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+                    handleValue(null, evnt);
                 }
             }
         };
@@ -76,7 +91,8 @@ export default defineComponent({
                     name: name,
                     checked: checked,
                     disabled: isDisabled,
-                    onChange: changeEvent
+                    onChange: changeEvent,
+                    onClick: clickEvent
                 }),
                 h('span', {
                     class: 'vxe-radio--label'

package/es/radio/src/group.js

@@ -7,6 +7,7 @@ export default defineComponent({
     props: {
         modelValue: [String, Number, Boolean],
         disabled: Boolean,
+        strict: { type: Boolean, default: function () { return GlobalConfig.radio.strict; } },
         size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
     },
     emits: [

package/es/radio/src/radio.js

@@ -12,6 +12,7 @@ export default defineComponent({
         content: [String, Number],
         disabled: Boolean,
         name: String,
+        strict: { type: Boolean, default: function () { return GlobalConfig.radio.strict; } },
         size: { type: String, default: function () { return GlobalConfig.radio.size || GlobalConfig.size; } }
     },
     emits: [
@@ -35,20 +36,34 @@ export default defineComponent({
         var computeName = computed(function () {
             return $xeradiogroup ? $xeradiogroup.name : props.name;
         });
+        var computeStrict = computed(function () {
+            return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+        });
         var computeChecked = computed(function () {
             var modelValue = props.modelValue, label = props.label;
             return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
         });
+        var handleValue = function (label, evnt) {
+            if ($xeradiogroup) {
+                $xeradiogroup.handleChecked({ label: label }, evnt);
+            }
+            else {
+                emit('update:modelValue', label);
+                radioMethods.dispatchEvent('change', { label: label }, evnt);
+            }
+        };
         var changeEvent = function (evnt) {
-            var label = props.label;
             var isDisabled = computeDisabled.value;
             if (!isDisabled) {
-                if ($xeradiogroup) {
-                    $xeradiogroup.handleChecked({ label: label }, evnt);
-                }
-                else {
-                    emit('update:modelValue', label);
-                    radioMethods.dispatchEvent('change', { label: label }, evnt);
+                handleValue(props.label, evnt);
+            }
+        };
+        var clickEvent = function (evnt) {
+            var isDisabled = computeDisabled.value;
+            var isStrict = computeStrict.value;
+            if (!isDisabled && !isStrict) {
+                if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+                    handleValue(null, evnt);
                 }
             }
         };
@@ -77,7 +92,8 @@ export default defineComponent({
                     name: name,
                     checked: checked,
                     disabled: isDisabled,
-                    onChange: changeEvent
+                    onChange: changeEvent,
+                    onClick: clickEvent
                 }),
                 h('span', {
                     class: 'vxe-radio--icon'

package/es/v-x-e-table/src/conf.js

@@ -284,7 +284,16 @@ var GlobalConfig = {
     // transfer: false
     },
     radio: {
-    // size: null
+        // size: null,
+        strict: true
+    },
+    radioButton: {
+        // size: null,
+        strict: true
+    },
+    radioGroup: {
+        // size: null,
+        strict: true
     },
     checkbox: {
     // size: null

package/lib/index.umd.js

@@ -8689,7 +8689,17 @@ var GlobalConfig = {
   button: {// size: null,
     // transfer: false
   },
-  radio: {// size: null
+  radio: {
+    // size: null,
+    strict: true
+  },
+  radioButton: {
+    // size: null,
+    strict: true
+  },
+  radioGroup: {
+    // size: null,
+    strict: true
   },
   checkbox: {// size: null
   },
@@ -18707,6 +18717,12 @@ function getOptUniqueId() {
   props: {
     modelValue: [String, Number, Boolean],
     disabled: Boolean,
+    strict: {
+      type: Boolean,
+      default: function _default() {
+        return conf.radio.strict;
+      }
+    },
     size: {
       type: String,
       default: function _default() {
@@ -18778,6 +18794,12 @@ function getOptUniqueId() {
     content: [String, Number],
     disabled: Boolean,
     name: String,
+    strict: {
+      type: Boolean,
+      default: function _default() {
+        return conf.radio.strict;
+      }
+    },
     size: {
       type: String,
       default: function _default() {
@@ -18804,26 +18826,43 @@ function getOptUniqueId() {
     var computeName = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return $xeradiogroup ? $xeradiogroup.name : props.name;
     });
+    var computeStrict = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+    });
     var computeChecked = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var modelValue = props.modelValue,
           label = props.label;
       return $xeradiogroup ? $xeradiogroup.props.modelValue === label : modelValue === label;
     });
 
+    var handleValue = function handleValue(label, evnt) {
+      if ($xeradiogroup) {
+        $xeradiogroup.handleChecked({
+          label: label
+        }, evnt);
+      } else {
+        emit('update:modelValue', label);
+        radioMethods.dispatchEvent('change', {
+          label: label
+        }, evnt);
+      }
+    };
+
     var changeEvent = function changeEvent(evnt) {
-      var label = props.label;
       var isDisabled = computeDisabled.value;
 
       if (!isDisabled) {
-        if ($xeradiogroup) {
-          $xeradiogroup.handleChecked({
-            label: label
-          }, evnt);
-        } else {
-          emit('update:modelValue', label);
-          radioMethods.dispatchEvent('change', {
-            label: label
-          }, evnt);
+        handleValue(props.label, evnt);
+      }
+    };
+
+    var clickEvent = function clickEvent(evnt) {
+      var isDisabled = computeDisabled.value;
+      var isStrict = computeStrict.value;
+
+      if (!isDisabled && !isStrict) {
+        if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+          handleValue(null, evnt);
         }
       }
     };
@@ -18854,7 +18893,8 @@ function getOptUniqueId() {
         name: name,
         checked: checked,
         disabled: isDisabled,
-        onChange: changeEvent
+        onChange: changeEvent,
+        onClick: clickEvent
       }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
         class: 'vxe-radio--icon'
       }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
@@ -27283,10 +27323,16 @@ var RadioGroup = Object.assign(src_group, {
     title: [String, Number],
     content: [String, Number],
     disabled: Boolean,
+    strict: {
+      type: Boolean,
+      default: function _default() {
+        return conf.radioButton.strict;
+      }
+    },
     size: {
       type: String,
       default: function _default() {
-        return conf.radio.size || conf.size;
+        return conf.radioButton.size || conf.size;
       }
     }
   },
@@ -27309,6 +27355,9 @@ var RadioGroup = Object.assign(src_group, {
     var computeName = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       return $xeradiogroup ? $xeradiogroup.name : null;
     });
+    var computeStrict = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
+      return $xeradiogroup ? $xeradiogroup.props.strict : props.strict;
+    });
     var computeChecked = Object(external_commonjs_vue_commonjs2_vue_root_Vue_["computed"])(function () {
       var modelValue = props.modelValue,
           label = props.label;
@@ -27324,20 +27373,34 @@ var RadioGroup = Object.assign(src_group, {
     };
     Object.assign($xeradiobutton, radioButtonMethods);
 
+    var handleValue = function handleValue(label, evnt) {
+      if ($xeradiogroup) {
+        $xeradiogroup.handleChecked({
+          label: label
+        }, evnt);
+      } else {
+        emit('update:modelValue', label);
+        radioButtonMethods.dispatchEvent('change', {
+          label: label
+        }, evnt);
+      }
+    };
+
     var changeEvent = function changeEvent(evnt) {
-      var label = props.label;
       var isDisabled = computeDisabled.value;
 
       if (!isDisabled) {
-        if ($xeradiogroup) {
-          $xeradiogroup.handleChecked({
-            label: label
-          }, evnt);
-        } else {
-          emit('update:modelValue', label);
-          radioButtonMethods.dispatchEvent('change', {
-            label: label
-          }, evnt);
+        handleValue(props.label, evnt);
+      }
+    };
+
+    var clickEvent = function clickEvent(evnt) {
+      var isDisabled = computeDisabled.value;
+      var isStrict = computeStrict.value;
+
+      if (!isDisabled && !isStrict) {
+        if (props.label === ($xeradiogroup ? $xeradiogroup.props.modelValue : props.modelValue)) {
+          handleValue(null, evnt);
         }
       }
     };
@@ -27358,7 +27421,8 @@ var RadioGroup = Object.assign(src_group, {
         name: name,
         checked: checked,
         disabled: isDisabled,
-        onChange: changeEvent
+        onChange: changeEvent,
+        onClick: clickEvent
       }), Object(external_commonjs_vue_commonjs2_vue_root_Vue_["h"])('span', {
         class: 'vxe-radio--label'
       }, slots.default ? slots.default({}) : getFuncText(props.content))]);