vxe-pc-ui 3.9.13 → 3.9.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. package/es/icon/style.css +1 -1
  2. package/es/radio/src/button.js +26 -13
  3. package/es/radio/src/group.js +3 -3
  4. package/es/radio/src/radio.js +26 -13
  5. package/es/style.css +1 -1
  6. package/es/style.min.css +1 -1
  7. package/es/ui/index.js +1 -1
  8. package/es/ui/src/log.js +1 -1
  9. package/lib/icon/style/style.css +1 -1
  10. package/lib/icon/style/style.min.css +1 -1
  11. package/lib/index.umd.js +70 -33
  12. package/lib/index.umd.min.js +1 -1
  13. package/lib/radio/src/button.js +32 -14
  14. package/lib/radio/src/button.min.js +1 -1
  15. package/lib/radio/src/group.js +4 -3
  16. package/lib/radio/src/group.min.js +1 -1
  17. package/lib/radio/src/radio.js +32 -14
  18. package/lib/radio/src/radio.min.js +1 -1
  19. package/lib/style.css +1 -1
  20. package/lib/style.min.css +1 -1
  21. package/lib/ui/index.js +1 -1
  22. package/lib/ui/index.min.js +1 -1
  23. package/lib/ui/src/log.js +1 -1
  24. package/lib/ui/src/log.min.js +1 -1
  25. package/package.json +1 -1
  26. package/packages/radio/src/button.ts +28 -14
  27. package/packages/radio/src/group.ts +4 -4
  28. package/packages/radio/src/radio.ts +28 -14
  29. package/types/components/radio-button.d.ts +12 -2
  30. package/types/components/radio-group.d.ts +9 -2
  31. package/types/components/radio.d.ts +7 -1
  32. /package/es/icon/{iconfont.1756803054725.ttf → iconfont.1756870578600.ttf} +0 -0
  33. /package/es/icon/{iconfont.1756803054725.woff → iconfont.1756870578600.woff} +0 -0
  34. /package/es/icon/{iconfont.1756803054725.woff2 → iconfont.1756870578600.woff2} +0 -0
  35. /package/es/{iconfont.1756803054725.ttf → iconfont.1756870578600.ttf} +0 -0
  36. /package/es/{iconfont.1756803054725.woff → iconfont.1756870578600.woff} +0 -0
  37. /package/es/{iconfont.1756803054725.woff2 → iconfont.1756870578600.woff2} +0 -0
  38. /package/lib/icon/style/{iconfont.1756803054725.ttf → iconfont.1756870578600.ttf} +0 -0
  39. /package/lib/icon/style/{iconfont.1756803054725.woff → iconfont.1756870578600.woff} +0 -0
  40. /package/lib/icon/style/{iconfont.1756803054725.woff2 → iconfont.1756870578600.woff2} +0 -0
  41. /package/lib/{iconfont.1756803054725.ttf → iconfont.1756870578600.ttf} +0 -0
  42. /package/lib/{iconfont.1756803054725.woff → iconfont.1756870578600.woff} +0 -0
  43. /package/lib/{iconfont.1756803054725.woff2 → iconfont.1756870578600.woff2} +0 -0
@@ -18,9 +18,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
18
18
  mixins: [_ui.globalMixins.sizeMixin, _ui.globalMixins.permissionMixin],
19
19
  props: {
20
20
  value: [String, Number, Boolean],
21
- label: {
21
+ checkedValue: {
22
22
  type: [String, Number, Boolean],
23
- default: null
23
+ default: undefined
24
24
  },
25
25
  title: [String, Number],
26
26
  content: [String, Number],
@@ -39,6 +39,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
39
39
  default: function _default() {
40
40
  return (0, _ui.getConfig)().radioButton.size || (0, _ui.getConfig)().size;
41
41
  }
42
+ },
43
+ /**
44
+ * 已废弃,被 checkedValue 替换
45
+ */
46
+ label: {
47
+ type: [String, Number, Boolean],
48
+ default: null
42
49
  }
43
50
  },
44
51
  inject: {
@@ -88,8 +95,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
88
95
  var $xeRadioButton = this;
89
96
  var props = $xeRadioButton;
90
97
  var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
91
- var label = props.label;
92
- return $xeRadioGroup ? $xeRadioGroup.value === label : props.value === label;
98
+ var label = props.label,
99
+ checkedValue = props.checkedValue;
100
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
101
+ return $xeRadioGroup ? $xeRadioGroup.value === radioValue : props.value === radioValue;
93
102
  }
94
103
  }),
95
104
  methods: {
@@ -112,24 +121,25 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
112
121
  $xeRadioButton.$emit('model-value', value);
113
122
  }
114
123
  },
115
- handleValue: function handleValue(label, evnt) {
124
+ handleValue: function handleValue(checkedValue, evnt) {
116
125
  var $xeRadioButton = this;
117
126
  var $xeForm = $xeRadioButton.$xeForm;
118
127
  var $xeRadioGroup = $xeRadioButton.$xeRadioGroup;
119
128
  var formItemInfo = $xeRadioButton.formItemInfo;
120
129
  if ($xeRadioGroup) {
121
130
  $xeRadioGroup.handleChecked({
122
- label: label
131
+ label: checkedValue,
132
+ checkedValue: checkedValue
123
133
  }, evnt);
124
134
  } else {
125
- $xeRadioButton.emitModel(label);
135
+ $xeRadioButton.emitModel(checkedValue);
126
136
  $xeRadioButton.dispatchEvent('change', {
127
- value: label,
128
- label: label
137
+ value: checkedValue,
138
+ label: checkedValue
129
139
  }, evnt);
130
140
  // 自动更新校验状态
131
141
  if ($xeForm && formItemInfo) {
132
- $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, label);
142
+ $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, checkedValue);
133
143
  }
134
144
  }
135
145
  },
@@ -138,7 +148,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
138
148
  var props = $xeRadioButton;
139
149
  var isDisabled = $xeRadioButton.computeIsDisabled;
140
150
  if (!isDisabled) {
141
- $xeRadioButton.handleValue(props.label, evnt);
151
+ var label = props.label,
152
+ checkedValue = props.checkedValue;
153
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
154
+ $xeRadioButton.handleValue(radioValue, evnt);
142
155
  }
143
156
  },
144
157
  clickEvent: function clickEvent(evnt) {
@@ -148,7 +161,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
148
161
  var isDisabled = $xeRadioButton.computeIsDisabled;
149
162
  var isStrict = $xeRadioButton.computeStrict;
150
163
  if (!isDisabled && !isStrict) {
151
- if (props.label === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
164
+ var label = props.label,
165
+ checkedValue = props.checkedValue;
166
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
167
+ if (radioValue === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
152
168
  $xeRadioButton.handleValue(null, evnt);
153
169
  }
154
170
  }
@@ -160,13 +176,15 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
160
176
  var $xeRadioButton = this;
161
177
  var props = $xeRadioButton;
162
178
  var slots = $xeRadioButton.$scopedSlots;
163
- var label = props.label;
179
+ var label = props.label,
180
+ checkedValue = props.checkedValue;
181
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
164
182
  var vSize = $xeRadioButton.computeSize;
165
183
  var isDisabled = $xeRadioButton.computeIsDisabled;
166
184
  var name = $xeRadioButton.computeName;
167
185
  var isChecked = $xeRadioButton.computeChecked;
168
186
  return h('label', {
169
- key: label,
187
+ key: radioValue,
170
188
  class: ['vxe-radio vxe-radio--button', _defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--disabled', isDisabled)],
171
189
  attrs: {
172
190
  title: props.title
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_ui=require("../../ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioButton",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number,Boolean],label:{type:[String,Number,Boolean],default:null},title:[String,Number],content:[String,Number],disabled:{type:Boolean,default:null},strict:{type:Boolean,default:function(){return(0,_ui.getConfig)().radioButton.strict}},size:{type:String,default:function(){return(0,_ui.getConfig)().radioButton.size||(0,_ui.getConfig)().size}}},inject:{$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null},$xeRadioGroup:{default:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeIsDisabled:function(){var e=this.$xeRadioGroup,t=this.disabled;if(null===t&&e)return e.computeIsDisabled;return t},computeName:function(){var e=this.$xeRadioGroup;return e?e.name:null},computeStrict:function(){var e=this.$xeRadioGroup;return(e||this).strict},computeChecked:function(){var e=this.$xeRadioGroup,t=this.label;return e?e.value===t:this.value===t}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$radioButton:this},t))},emitModel:function(e){var t=this,i=t._events;t.$emit("input",e),i&&i.modelValue?t.$emit("modelValue",e):t.$emit("model-value",e)},handleValue:function(e,t){var i=this,o=i.$xeForm,n=i.$xeRadioGroup,r=i.formItemInfo;n?n.handleChecked({label:e},t):(i.emitModel(e),i.dispatchEvent("change",{value:e,label:e},t),o&&r&&o.triggerItemEvent(t,r.itemConfig.field,e))},changeEvent:function(e){var t=this;t.computeIsDisabled||t.handleValue(t.label,e)},clickEvent:function(e){var t=this,i=t.$xeRadioGroup;t.computeIsDisabled||t.computeStrict||t.label===(i||t).value&&t.handleValue(null,e)},renderVN:function(e){var t=this,i=t,o=t.$scopedSlots,n=i.label,r=t.computeSize,u=t.computeIsDisabled,l=t.computeName,a=t.computeChecked;return e("label",{key:n,class:["vxe-radio vxe-radio--button",_defineProperty(_defineProperty({},"size--".concat(r),r),"is--disabled",u)],attrs:{title:i.title}},[e("input",{class:"vxe-radio--input",domProps:{checked:a},attrs:{type:"radio",name:l,disabled:u},on:{change:t.changeEvent,click:t.clickEvent}}),e("span",{class:"vxe-radio--label"},o.default?o.default({}):(0,_utils.getFuncText)(i.content))])}},render:function(e){return this.renderVN(e)}});
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_ui=require("../../ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioButton",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number,Boolean],checkedValue:{type:[String,Number,Boolean],default:void 0},title:[String,Number],content:[String,Number],disabled:{type:Boolean,default:null},strict:{type:Boolean,default:function(){return(0,_ui.getConfig)().radioButton.strict}},size:{type:String,default:function(){return(0,_ui.getConfig)().radioButton.size||(0,_ui.getConfig)().size}},label:{type:[String,Number,Boolean],default:null}},inject:{$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null},$xeRadioGroup:{default:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeIsDisabled:function(){var e=this.$xeRadioGroup,t=this.disabled;if(null===t&&e)return e.computeIsDisabled;return t},computeName:function(){var e=this.$xeRadioGroup;return e?e.name:null},computeStrict:function(){var e=this.$xeRadioGroup;return(e||this).strict},computeChecked:function(){var e=this,t=this.$xeRadioGroup,i=e.label,n=e.checkedValue,i=_xeUtils.default.isUndefined(n)?i:n;return t?t.value===i:e.value===i}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$radioButton:this},t))},emitModel:function(e){var t=this,i=t._events;t.$emit("input",e),i&&i.modelValue?t.$emit("modelValue",e):t.$emit("model-value",e)},handleValue:function(e,t){var i=this,n=i.$xeForm,o=i.$xeRadioGroup,r=i.formItemInfo;o?o.handleChecked({label:e,checkedValue:e},t):(i.emitModel(e),i.dispatchEvent("change",{value:e,label:e},t),n&&r&&n.triggerItemEvent(t,r.itemConfig.field,e))},changeEvent:function(e){var t,i;this.computeIsDisabled||(i=this.label,t=this.checkedValue,i=_xeUtils.default.isUndefined(t)?i:t,this.handleValue(i,e))},clickEvent:function(e){var t,i,n=this,o=n,r=n.$xeRadioGroup;n.computeIsDisabled||n.computeStrict||(t=o.label,i=o.checkedValue,(_xeUtils.default.isUndefined(i)?t:i)===(r||o).value&&n.handleValue(null,e))},renderVN:function(e){var t=this,i=t,n=t.$scopedSlots,o=i.label,r=i.checkedValue,o=_xeUtils.default.isUndefined(r)?o:r,r=t.computeSize,u=t.computeIsDisabled,l=t.computeName,a=t.computeChecked;return e("label",{key:o,class:["vxe-radio vxe-radio--button",_defineProperty(_defineProperty({},"size--".concat(r),r),"is--disabled",u)],attrs:{title:i.title}},[e("input",{class:"vxe-radio--input",domProps:{checked:a},attrs:{type:"radio",name:l,disabled:u},on:{change:t.changeEvent,click:t.clickEvent}}),e("span",{class:"vxe-radio--label"},n.default?n.default({}):(0,_utils.getFuncText)(i.content))])}},render:function(e){return this.renderVN(e)}});
@@ -121,11 +121,12 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
121
121
  var $xeRadioGroup = this;
122
122
  var $xeForm = $xeRadioGroup.$xeForm;
123
123
  var formItemInfo = $xeRadioGroup.formItemInfo;
124
- var value = params.label;
124
+ var value = params.checkedValue;
125
125
  $xeRadioGroup.emitModel(value);
126
126
  $xeRadioGroup.dispatchEvent('change', {
127
127
  value: value,
128
- label: value
128
+ label: value,
129
+ checkedValue: value
129
130
  }, evnt);
130
131
  // 自动更新校验状态
131
132
  if ($xeForm && formItemInfo) {
@@ -153,7 +154,7 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
153
154
  return h(btnComp, {
154
155
  key: item[valueField],
155
156
  props: {
156
- label: item[valueField],
157
+ checkedValue: item[valueField],
157
158
  content: item[labelField],
158
159
  disabled: item[disabledField]
159
160
  }
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_radio=_interopRequireDefault(require("./radio")),_button=_interopRequireDefault(require("./button"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioGroup",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number,Boolean],disabled:{type:Boolean,default:null},type:String,options:Array,optionProps:Object,strict:{type:Boolean,default:function(){return(0,_ui.getConfig)().radioGroup.strict}},size:{type:String,default:function(){return(0,_ui.getConfig)().radioGroup.size||(0,_ui.getConfig)().size}}},inject:{$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null}},provide:function(){return{$xeRadioGroup:this}},data:function(){return{xID:_xeUtils.default.uniqueId(),name:_xeUtils.default.uniqueId("xe_group_"),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeIsDisabled:function(){var e=this.$xeForm,t=this.disabled;return null===t?!!e&&(e.readonly||e.disabled):t},computePropsOpts:function(){return Object.assign({},this.optionProps)},computeLabelField:function(){return this.computePropsOpts.label||"label"},computeValueField:function(){return this.computePropsOpts.value||"value"},computeDisabledField:function(){return this.computePropsOpts.disabled||"disabled"}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$radioGroup:this},t))},emitModel:function(e){var t=this,i=t._events;t.$emit("input",e),i&&i.modelValue?t.$emit("modelValue",e):t.$emit("model-value",e)},handleChecked:function(e,t){var i=this,o=i.$xeForm,r=i.formItemInfo,e=e.label;i.emitModel(e),i.dispatchEvent("change",{value:e,label:e},t),o&&r&&o.triggerItemEvent(t,r.itemConfig.field,e)},renderVN:function(t){var e=this,i=e.$scopedSlots,o=e.options,r=e.computeSize,i=i.default,n=e.computeValueField,u=e.computeLabelField,l=e.computeDisabledField,a=("button"===e.type?_button:_radio).default;return t("div",{class:["vxe-radio-group",_defineProperty({},"size--".concat(r),r)]},i?i({}):o?o.map(function(e){return t(a,{key:e[n],props:{label:e[n],content:e[u],disabled:e[l]}})}):[])}},render:function(e){return this.renderVN(e)}});
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_ui=require("../../ui"),_radio=_interopRequireDefault(require("./radio")),_button=_interopRequireDefault(require("./button"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioGroup",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number,Boolean],disabled:{type:Boolean,default:null},type:String,options:Array,optionProps:Object,strict:{type:Boolean,default:function(){return(0,_ui.getConfig)().radioGroup.strict}},size:{type:String,default:function(){return(0,_ui.getConfig)().radioGroup.size||(0,_ui.getConfig)().size}}},inject:{$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null}},provide:function(){return{$xeRadioGroup:this}},data:function(){return{xID:_xeUtils.default.uniqueId(),name:_xeUtils.default.uniqueId("xe_group_"),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeIsDisabled:function(){var e=this.$xeForm,t=this.disabled;return null===t?!!e&&(e.readonly||e.disabled):t},computePropsOpts:function(){return Object.assign({},this.optionProps)},computeLabelField:function(){return this.computePropsOpts.label||"label"},computeValueField:function(){return this.computePropsOpts.value||"value"},computeDisabledField:function(){return this.computePropsOpts.disabled||"disabled"}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$radioGroup:this},t))},emitModel:function(e){var t=this,i=t._events;t.$emit("input",e),i&&i.modelValue?t.$emit("modelValue",e):t.$emit("model-value",e)},handleChecked:function(e,t){var i=this,o=i.$xeForm,r=i.formItemInfo,e=e.checkedValue;i.emitModel(e),i.dispatchEvent("change",{value:e,label:e,checkedValue:e},t),o&&r&&o.triggerItemEvent(t,r.itemConfig.field,e)},renderVN:function(t){var e=this,i=e.$scopedSlots,o=e.options,r=e.computeSize,i=i.default,n=e.computeValueField,u=e.computeLabelField,l=e.computeDisabledField,a=("button"===e.type?_button:_radio).default;return t("div",{class:["vxe-radio-group",_defineProperty({},"size--".concat(r),r)]},i?i({}):o?o.map(function(e){return t(a,{key:e[n],props:{checkedValue:e[n],content:e[u],disabled:e[l]}})}):[])}},render:function(e){return this.renderVN(e)}});
@@ -18,9 +18,9 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
18
18
  mixins: [_ui.globalMixins.sizeMixin, _ui.globalMixins.permissionMixin],
19
19
  props: {
20
20
  value: [String, Number, Boolean],
21
- label: {
21
+ checkedValue: {
22
22
  type: [String, Number, Boolean],
23
- default: null
23
+ default: undefined
24
24
  },
25
25
  title: [String, Number],
26
26
  content: [String, Number],
@@ -40,6 +40,13 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
40
40
  default: function _default() {
41
41
  return (0, _ui.getConfig)().radio.size || (0, _ui.getConfig)().size;
42
42
  }
43
+ },
44
+ /**
45
+ * 已废弃,被 checkedValue 替换
46
+ */
47
+ label: {
48
+ type: [String, Number, Boolean],
49
+ default: null
43
50
  }
44
51
  },
45
52
  inject: {
@@ -90,8 +97,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
90
97
  var $xeRadio = this;
91
98
  var props = $xeRadio;
92
99
  var $xeRadioGroup = $xeRadio.$xeRadioGroup;
93
- var label = props.label;
94
- return $xeRadioGroup ? $xeRadioGroup.value === label : props.value === label;
100
+ var label = props.label,
101
+ checkedValue = props.checkedValue;
102
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
103
+ return $xeRadioGroup ? $xeRadioGroup.value === radioValue : props.value === radioValue;
95
104
  }
96
105
  }),
97
106
  methods: {
@@ -114,24 +123,25 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
114
123
  $xeRadio.$emit('model-value', value);
115
124
  }
116
125
  },
117
- handleValue: function handleValue(label, evnt) {
126
+ handleValue: function handleValue(checkedValue, evnt) {
118
127
  var $xeRadio = this;
119
128
  var formItemInfo = $xeRadio.formItemInfo;
120
129
  var $xeForm = $xeRadio.$xeForm;
121
130
  var $xeRadioGroup = $xeRadio.$xeRadioGroup;
122
131
  if ($xeRadioGroup) {
123
132
  $xeRadioGroup.handleChecked({
124
- label: label
133
+ label: checkedValue,
134
+ checkedValue: checkedValue
125
135
  }, evnt);
126
136
  } else {
127
- $xeRadio.emitModel(label);
137
+ $xeRadio.emitModel(checkedValue);
128
138
  $xeRadio.dispatchEvent('change', {
129
- value: label,
130
- label: label
139
+ value: checkedValue,
140
+ label: checkedValue
131
141
  }, evnt);
132
142
  // 自动更新校验状态
133
143
  if ($xeForm && formItemInfo) {
134
- $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, label);
144
+ $xeForm.triggerItemEvent(evnt, formItemInfo.itemConfig.field, checkedValue);
135
145
  }
136
146
  }
137
147
  },
@@ -140,7 +150,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
140
150
  var props = $xeRadio;
141
151
  var isDisabled = $xeRadio.computeIsDisabled;
142
152
  if (!isDisabled) {
143
- $xeRadio.handleValue(props.label, evnt);
153
+ var label = props.label,
154
+ checkedValue = props.checkedValue;
155
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
156
+ $xeRadio.handleValue(radioValue, evnt);
144
157
  }
145
158
  },
146
159
  clickEvent: function clickEvent(evnt) {
@@ -150,7 +163,10 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
150
163
  var isDisabled = $xeRadio.computeIsDisabled;
151
164
  var isStrict = $xeRadio.computeStrict;
152
165
  if (!isDisabled && !isStrict) {
153
- if (props.label === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
166
+ var label = props.label,
167
+ checkedValue = props.checkedValue;
168
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
169
+ if (radioValue === ($xeRadioGroup ? $xeRadioGroup.value : props.value)) {
154
170
  $xeRadio.handleValue(null, evnt);
155
171
  }
156
172
  }
@@ -162,14 +178,16 @@ var _default2 = exports.default = /* define-vxe-component start */(0, _comp.defi
162
178
  renderVN: function renderVN(h) {
163
179
  var $xeRadio = this;
164
180
  var props = $xeRadio;
165
- var label = props.label;
181
+ var label = props.label,
182
+ checkedValue = props.checkedValue;
183
+ var radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
166
184
  var slots = $xeRadio.$scopedSlots;
167
185
  var vSize = $xeRadio.computeSize;
168
186
  var isDisabled = $xeRadio.computeIsDisabled;
169
187
  var name = $xeRadio.computeName;
170
188
  var isChecked = $xeRadio.computeChecked;
171
189
  return h('label', {
172
- key: label,
190
+ key: radioValue,
173
191
  class: ['vxe-radio vxe-radio--default', _defineProperty(_defineProperty(_defineProperty({}, "size--".concat(vSize), vSize), 'is--checked', isChecked), 'is--disabled', isDisabled)],
174
192
  attrs: {
175
193
  title: props.title
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_ui=require("../../ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadio",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number,Boolean],label:{type:[String,Number,Boolean],default:null},title:[String,Number],content:[String,Number],disabled:{type:Boolean,default:null},name:String,strict:{type:Boolean,default:function(){return(0,_ui.getConfig)().radio.strict}},size:{type:String,default:function(){return(0,_ui.getConfig)().radio.size||(0,_ui.getConfig)().size}}},inject:{$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null},$xeRadioGroup:{default:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeIsDisabled:function(){var e=this.$xeRadioGroup,t=this.disabled;if(null===t&&e)return e.computeIsDisabled;return t},computeName:function(){var e=this.$xeRadioGroup;return(e||this).name},computeStrict:function(){var e=this.$xeRadioGroup;return(e||this).strict},computeChecked:function(){var e=this.$xeRadioGroup,t=this.label;return e?e.value===t:this.value===t}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$radio:this},t))},emitModel:function(e){var t=this,i=t._events;t.$emit("input",e),i&&i.modelValue?t.$emit("modelValue",e):t.$emit("model-value",e)},handleValue:function(e,t){var i=this,o=i.formItemInfo,n=i.$xeForm,r=i.$xeRadioGroup;r?r.handleChecked({label:e},t):(i.emitModel(e),i.dispatchEvent("change",{value:e,label:e},t),n&&o&&n.triggerItemEvent(t,o.itemConfig.field,e))},changeEvent:function(e){var t=this;t.computeIsDisabled||t.handleValue(t.label,e)},clickEvent:function(e){var t=this,i=t.$xeRadioGroup;t.computeIsDisabled||t.computeStrict||t.label===(i||t).value&&t.handleValue(null,e)},renderVN:function(e){var t=this,i=t,o=i.label,n=t.$scopedSlots,r=t.computeSize,u=t.computeIsDisabled,a=t.computeName,l=t.computeChecked;return e("label",{key:o,class:["vxe-radio vxe-radio--default",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(r),r),"is--checked",l),"is--disabled",u)],attrs:{title:i.title}},[e("input",{class:"vxe-radio--input",domProps:{checked:l},attrs:{type:"radio",name:a,disabled:u},on:{change:t.changeEvent,click:t.clickEvent}}),e("span",{class:["vxe-radio--icon",l?(0,_ui.getIcon)().RADIO_CHECKED:u?(0,_ui.getIcon)().RADIO_DISABLED_UNCHECKED:(0,_ui.getIcon)().RADIO_UNCHECKED]}),e("span",{class:"vxe-radio--label"},n.default?n.default({}):(0,_utils.getFuncText)(i.content))])}},render:function(e){return this.renderVN(e)}});
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _comp=require("../../ui/src/comp"),_xeUtils=_interopRequireDefault(require("xe-utils")),_utils=require("../../ui/src/utils"),_ui=require("../../ui");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _defineProperty(e,t,i){return(t=_toPropertyKey(t))in e?Object.defineProperty(e,t,{value:i,enumerable:!0,configurable:!0,writable:!0}):e[t]=i,e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var i=e[Symbol.toPrimitive];if(void 0===i)return("string"===t?String:Number)(e);i=i.call(e,t||"default");if("object"!=_typeof(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}var _default2=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadio",mixins:[_ui.globalMixins.sizeMixin,_ui.globalMixins.permissionMixin],props:{value:[String,Number,Boolean],checkedValue:{type:[String,Number,Boolean],default:void 0},title:[String,Number],content:[String,Number],disabled:{type:Boolean,default:null},name:String,strict:{type:Boolean,default:function(){return(0,_ui.getConfig)().radio.strict}},size:{type:String,default:function(){return(0,_ui.getConfig)().radio.size||(0,_ui.getConfig)().size}},label:{type:[String,Number,Boolean],default:null}},inject:{$xeForm:{default:null},formItemInfo:{from:"xeFormItemInfo",default:null},$xeRadioGroup:{default:null}},data:function(){return{xID:_xeUtils.default.uniqueId(),reactData:{}}},computed:Object.assign(Object.assign({},{}),{computeIsDisabled:function(){var e=this.$xeRadioGroup,t=this.disabled;if(null===t&&e)return e.computeIsDisabled;return t},computeName:function(){var e=this.$xeRadioGroup;return(e||this).name},computeStrict:function(){var e=this.$xeRadioGroup;return(e||this).strict},computeChecked:function(){var e=this,t=this.$xeRadioGroup,i=e.label,n=e.checkedValue,i=_xeUtils.default.isUndefined(n)?i:n;return t?t.value===i:e.value===i}}),methods:{dispatchEvent:function(e,t,i){this.$emit(e,(0,_ui.createEvent)(i,{$radio:this},t))},emitModel:function(e){var t=this,i=t._events;t.$emit("input",e),i&&i.modelValue?t.$emit("modelValue",e):t.$emit("model-value",e)},handleValue:function(e,t){var i=this,n=i.formItemInfo,o=i.$xeForm,r=i.$xeRadioGroup;r?r.handleChecked({label:e,checkedValue:e},t):(i.emitModel(e),i.dispatchEvent("change",{value:e,label:e},t),o&&n&&o.triggerItemEvent(t,n.itemConfig.field,e))},changeEvent:function(e){var t,i;this.computeIsDisabled||(i=this.label,t=this.checkedValue,i=_xeUtils.default.isUndefined(t)?i:t,this.handleValue(i,e))},clickEvent:function(e){var t,i,n=this,o=n,r=n.$xeRadioGroup;n.computeIsDisabled||n.computeStrict||(t=o.label,i=o.checkedValue,(_xeUtils.default.isUndefined(i)?t:i)===(r||o).value&&n.handleValue(null,e))},renderVN:function(e){var t=this,i=t,n=i.label,o=i.checkedValue,n=_xeUtils.default.isUndefined(o)?n:o,o=t.$scopedSlots,r=t.computeSize,u=t.computeIsDisabled,l=t.computeName,a=t.computeChecked;return e("label",{key:n,class:["vxe-radio vxe-radio--default",_defineProperty(_defineProperty(_defineProperty({},"size--".concat(r),r),"is--checked",a),"is--disabled",u)],attrs:{title:i.title}},[e("input",{class:"vxe-radio--input",domProps:{checked:a},attrs:{type:"radio",name:l,disabled:u},on:{change:t.changeEvent,click:t.clickEvent}}),e("span",{class:["vxe-radio--icon",a?(0,_ui.getIcon)().RADIO_CHECKED:u?(0,_ui.getIcon)().RADIO_DISABLED_UNCHECKED:(0,_ui.getIcon)().RADIO_UNCHECKED]}),e("span",{class:"vxe-radio--label"},o.default?o.default({}):(0,_utils.getFuncText)(i.content))])}},render:function(e){return this.renderVN(e)}});