vxe-pc-ui 4.11.27 → 4.11.28

package/lib/radio/src/button.js

@@ -88,26 +88,33 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       const radioValue = _xeUtils.default.isUndefined(checkedValue) ? label : checkedValue;
       return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue;
     });
+    const dispatchEvent = (type, params, evnt) => {
+      emit(type, (0, _ui.createEvent)(evnt, {
+        $radioGroup: $xeRadioGroup
+      }, params));
+    };
     const radioButtonMethods = {
-      dispatchEvent(type, params, evnt) {
-        emit(type, (0, _ui.createEvent)(evnt, {
-          $radioButton: $xeRadioButton
-        }, params));
-      }
+      dispatchEvent
     };
     const radioButtonPrivateMethods = {};
     Object.assign($xeRadioButton, radioButtonMethods, radioButtonPrivateMethods);
     const handleValue = (checkedValue, evnt) => {
+      const {
+        content
+      } = props;
       if ($xeRadioGroup) {
         $xeRadioGroup.handleChecked({
           label: checkedValue,
-          checkedValue
+          checkedValue,
+          checkedLabel: content
         }, evnt);
       } else {
         emit('update:modelValue', checkedValue);
-        radioButtonMethods.dispatchEvent('change', {
+        dispatchEvent('change', {
           value: checkedValue,
-          label: checkedValue
+          label: checkedValue,
+          checkedValue,
+          checkedLabel: content
         }, evnt);
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {

package/lib/radio/src/button.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioButton",props:{modelValue:[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:()=>(0,_ui.getConfig)().radioButton.strict},size:{type:String,default:()=>(0,_ui.getConfig)().radioButton.size||(0,_ui.getConfig)().size},label:{type:[String,Number,Boolean],default:null}},emits:["update:modelValue","change"],setup(i,e){const{slots:n,emit:l}=e,u=(0,_vue.inject)("$xeForm",null),a=(0,_vue.inject)("xeFormItemInfo",null),r=(0,_vue.inject)("$xeRadioGroup",null);var t=_xeUtils.default.uniqueId(),o=(0,_vue.reactive)({});const d=(0,_ui.useSize)(i)["computeSize"],s={xID:t,props:i,context:e,reactData:o},c=(0,_vue.computed)(()=>{var e,t=i["disabled"];if(null===t&&r)return e=r.getComputeMaps()["computeIsDisabled"],e.value;return t}),p=(0,_vue.computed)(()=>r?r.name:null),v=(0,_vue.computed)(()=>(r?r.props:i).strict),_=(0,_vue.computed)(()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t;return r?r.props.modelValue===e:i.modelValue===e}),f={dispatchEvent(e,t,u){l(e,(0,_ui.createEvent)(u,{$radioButton:s},t))}};Object.assign(s,f,{});const m=(e,t)=>{r?r.handleChecked({label:e,checkedValue:e},t):(l("update:modelValue",e),f.dispatchEvent("change",{value:e,label:e},t),u&&a&&u.triggerItemEvent(t,a.itemConfig.field,e))},b=e=>{var t,u;c.value||({label:u,checkedValue:t}=i,u=_xeUtils.default.isUndefined(t)?u:t,m(u,e))},x=e=>{var t=c.value,u=v.value;t||u||({label:t,checkedValue:u}=i,(_xeUtils.default.isUndefined(u)?t:u)===(r?r.props:i).modelValue&&m(null,e))};t=()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t,t=d.value,u=c.value,l=p.value,a=_.value;return(0,_vue.h)("label",{key:e,class:["vxe-radio vxe-radio--button",{["size--"+t]:t,"is--disabled":u}],title:i.title},[(0,_vue.h)("input",{class:"vxe-radio--input",type:"radio",name:l,checked:a,disabled:u,onChange:b,onClick:x}),(0,_vue.h)("span",{class:"vxe-radio--label"},n.default?n.default({}):(0,_utils.getFuncText)(i.content))])};return s.renderVN=t}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioButton",props:{modelValue:[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:()=>(0,_ui.getConfig)().radioButton.strict},size:{type:String,default:()=>(0,_ui.getConfig)().radioButton.size||(0,_ui.getConfig)().size},label:{type:[String,Number,Boolean],default:null}},emits:["update:modelValue","change"],setup(i,e){const{slots:n,emit:l}=e,a=(0,_vue.inject)("$xeForm",null),r=(0,_vue.inject)("xeFormItemInfo",null),o=(0,_vue.inject)("$xeRadioGroup",null);var t=_xeUtils.default.uniqueId(),u=(0,_vue.reactive)({});const d=(0,_ui.useSize)(i)["computeSize"];t={xID:t,props:i,context:e,reactData:u};const s=(0,_vue.computed)(()=>{var e,t=i["disabled"];if(null===t&&o)return e=o.getComputeMaps()["computeIsDisabled"],e.value;return t}),c=(0,_vue.computed)(()=>o?o.name:null),p=(0,_vue.computed)(()=>(o?o.props:i).strict),v=(0,_vue.computed)(()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t;return o?o.props.modelValue===e:i.modelValue===e}),_=(e,t,u)=>{l(e,(0,_ui.createEvent)(u,{$radioGroup:o},t))};e={dispatchEvent:_};Object.assign(t,e,{});const f=(e,t)=>{var u=i["content"];o?o.handleChecked({label:e,checkedValue:e,checkedLabel:u},t):(l("update:modelValue",e),_("change",{value:e,label:e,checkedValue:e,checkedLabel:u},t),a&&r&&a.triggerItemEvent(t,r.itemConfig.field,e))},m=e=>{var t,u;s.value||({label:u,checkedValue:t}=i,u=_xeUtils.default.isUndefined(t)?u:t,f(u,e))},b=e=>{var t=s.value,u=p.value;t||u||({label:t,checkedValue:u}=i,(_xeUtils.default.isUndefined(u)?t:u)===(o?o.props:i).modelValue&&f(null,e))};u=()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t,t=d.value,u=s.value,l=c.value,a=v.value;return(0,_vue.h)("label",{key:e,class:["vxe-radio vxe-radio--button",{["size--"+t]:t,"is--disabled":u}],title:i.title},[(0,_vue.h)("input",{class:"vxe-radio--input",type:"radio",name:l,checked:a,disabled:u,onChange:m,onClick:b}),(0,_vue.h)("span",{class:"vxe-radio--label"},n.default?n.default({}):(0,_utils.getFuncText)(i.content))])};return t.renderVN=u}});

package/lib/radio/src/group.js

@@ -111,12 +111,17 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
     };
     const radioGroupPrivateMethods = {
       handleChecked(params, evnt) {
-        const value = params.checkedValue;
+        const {
+          checkedValue,
+          checkedLabel
+        } = params;
+        const value = checkedValue;
         emitModel(value);
         dispatchEvent('change', {
           value,
           label: value,
-          checkedValue: value
+          checkedValue,
+          checkedLabel
         }, evnt);
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {

package/lib/radio/src/group.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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 createInternalData(){return{}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioGroup",props:{modelValue:[String,Number,Boolean],disabled:{type:Boolean,default:null},type:String,options:Array,optionProps:Object,strict:{type:Boolean,default:()=>(0,_ui.getConfig)().radioGroup.strict},size:{type:String,default:()=>(0,_ui.getConfig)().radioGroup.size||(0,_ui.getConfig)().size},defaultConfig:Object},emits:["update:modelValue","change","default-change"],setup(n,e){const{slots:d,emit:a}=e,u=(0,_vue.inject)("$xeForm",null),r=(0,_vue.inject)("xeFormItemInfo",null);var t=_xeUtils.default.uniqueId();const s=(0,_ui.useSize)(n)["computeSize"];var o=(0,_vue.reactive)({});const i=createInternalData();var l=(0,_vue.computed)(()=>{var e=n["disabled"];return null===e?!!u&&(u.props.readonly||u.props.disabled):e});const c=(0,_vue.computed)(()=>Object.assign({},n.defaultConfig)),p={computeIsDisabled:l},v={xID:t,props:n,context:e,reactData:o,name:_xeUtils.default.uniqueId("xe_group_"),getComputeMaps:()=>p},_=(0,_vue.computed)(()=>Object.assign({},n.optionProps)),f=(0,_vue.computed)(()=>{return _.value.label||"label"}),m=(0,_vue.computed)(()=>{return _.value.value||"value"}),g=(0,_vue.computed)(()=>{return _.value.disabled||"disabled"}),x=e=>{a("update:modelValue",e)},b=(e,t,u)=>{a(e,(0,_ui.createEvent)(u,{$radioGroup:v},t))};l={dispatchEvent:b};const h=e=>{var t=i["isLoaded"],u=c.value;const a=m.value;if(!t){t=u["selectMode"];if(0<e.length&&_xeUtils.default.eqNull(n.modelValue)){if("first"===t||"last"===t){const r=_xeUtils.default[t](e);r&&(0,_vue.nextTick)(()=>{var e;_xeUtils.default.eqNull(n.modelValue)&&(e=r[a],x(e),b("default-change",{value:e},null))})}i.isLoaded=!0}}return(0,_vue.nextTick)()};Object.assign(v,l,{handleChecked(e,t){e=e.checkedValue;x(e),b("change",{value:e,label:e,checkedValue:e},t),u&&r&&u.triggerItemEvent(t,r.itemConfig.field,e)}});return(0,_vue.watch)(()=>n.options,e=>{h(e||[])}),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=n["options"];e&&h(e)})}),(0,_vue.onUnmounted)(()=>{_xeUtils.default.assign(i,createInternalData())}),(0,_vue.provide)("$xeRadioGroup",v),v.renderVN=()=>{var{options:e,type:t}=n,u=s.value,a=d.default;const r=m.value,o=f.value,i=g.value,l=("button"===t?_button:_radio).default;return(0,_vue.h)("div",{class:["vxe-radio-group",{["size--"+u]:u}]},a?a({}):e?e.map(e=>(0,_vue.h)(l,{key:e[r],checkedValue:e[r],content:e[o],disabled:e[i]})):[])},v},render(){return this.renderVN()}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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 createInternalData(){return{}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadioGroup",props:{modelValue:[String,Number,Boolean],disabled:{type:Boolean,default:null},type:String,options:Array,optionProps:Object,strict:{type:Boolean,default:()=>(0,_ui.getConfig)().radioGroup.strict},size:{type:String,default:()=>(0,_ui.getConfig)().radioGroup.size||(0,_ui.getConfig)().size},defaultConfig:Object},emits:["update:modelValue","change","default-change"],setup(n,e){const{slots:d,emit:a}=e,r=(0,_vue.inject)("$xeForm",null),o=(0,_vue.inject)("xeFormItemInfo",null);var t=_xeUtils.default.uniqueId();const s=(0,_ui.useSize)(n)["computeSize"];var u=(0,_vue.reactive)({});const l=createInternalData();var i=(0,_vue.computed)(()=>{var e=n["disabled"];return null===e?!!r&&(r.props.readonly||r.props.disabled):e});const c=(0,_vue.computed)(()=>Object.assign({},n.defaultConfig)),p={computeIsDisabled:i},v={xID:t,props:n,context:e,reactData:u,name:_xeUtils.default.uniqueId("xe_group_"),getComputeMaps:()=>p},_=(0,_vue.computed)(()=>Object.assign({},n.optionProps)),f=(0,_vue.computed)(()=>{return _.value.label||"label"}),m=(0,_vue.computed)(()=>{return _.value.value||"value"}),g=(0,_vue.computed)(()=>{return _.value.disabled||"disabled"}),b=e=>{a("update:modelValue",e)},x=(e,t,u)=>{a(e,(0,_ui.createEvent)(u,{$radioGroup:v},t))};i={dispatchEvent:x};const h=e=>{var t=l["isLoaded"],u=c.value;const a=m.value;if(!t){t=u["selectMode"];if(0<e.length&&_xeUtils.default.eqNull(n.modelValue)){if("first"===t||"last"===t){const r=_xeUtils.default[t](e);r&&(0,_vue.nextTick)(()=>{var e;_xeUtils.default.eqNull(n.modelValue)&&(e=r[a],b(e),x("default-change",{value:e},null))})}l.isLoaded=!0}}return(0,_vue.nextTick)()};Object.assign(v,i,{handleChecked(e,t){var{checkedValue:e,checkedLabel:u}=e,a=e;b(a),x("change",{value:a,label:a,checkedValue:e,checkedLabel:u},t),r&&o&&r.triggerItemEvent(t,o.itemConfig.field,a)}});return(0,_vue.watch)(()=>n.options,e=>{h(e||[])}),(0,_vue.onMounted)(()=>{(0,_vue.nextTick)(()=>{var e=n["options"];e&&h(e)})}),(0,_vue.onUnmounted)(()=>{_xeUtils.default.assign(l,createInternalData())}),(0,_vue.provide)("$xeRadioGroup",v),v.renderVN=()=>{var{options:e,type:t}=n,u=s.value,a=d.default;const r=m.value,o=f.value,l=g.value,i=("button"===t?_button:_radio).default;return(0,_vue.h)("div",{class:["vxe-radio-group",{["size--"+u]:u}]},a?a({}):e?e.map(e=>(0,_vue.h)(i,{key:e[r],checkedValue:e[r],content:e[o],disabled:e[l]})):[])},v},render(){return this.renderVN()}});

package/lib/radio/src/radio.js

@@ -90,17 +90,22 @@ var _default = exports.default = (0, _comp.defineVxeComponent)({
       return $xeRadioGroup ? $xeRadioGroup.props.modelValue === radioValue : props.modelValue === radioValue;
     });
     const handleValue = (checkedValue, evnt) => {
+      const {
+        content
+      } = props;
       if ($xeRadioGroup) {
         $xeRadioGroup.handleChecked({
           label: checkedValue,
-          checkedValue
+          checkedValue,
+          checkedLabel: content
         }, evnt);
       } else {
         emit('update:modelValue', checkedValue);
         dispatchEvent('change', {
           value: checkedValue,
           label: checkedValue,
-          checkedValue
+          checkedValue,
+          checkedLabel: content
         }, evnt);
         // 自动更新校验状态
         if ($xeForm && formItemInfo) {

package/lib/radio/src/radio.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadio",props:{modelValue:[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:()=>(0,_ui.getConfig)().radio.strict},size:{type:String,default:()=>(0,_ui.getConfig)().radio.size||(0,_ui.getConfig)().size},label:{type:[String,Number,Boolean],default:null}},emits:["update:modelValue","change"],setup(i,e){const{slots:r,emit:l}=e,u=(0,_vue.inject)("$xeForm",null),a=(0,_vue.inject)("xeFormItemInfo",null),n=(0,_vue.inject)("$xeRadioGroup",null);var t=_xeUtils.default.uniqueId(),d=(0,_vue.reactive)({});const o={xID:t,props:i,context:e,reactData:d},s=(0,_ui.useSize)(i)["computeSize"],c=(0,_vue.computed)(()=>{var e,t=i["disabled"];if(null===t&&n)return e=n.getComputeMaps()["computeIsDisabled"],e.value;return t}),p=(0,_vue.computed)(()=>(n||i).name),v=(0,_vue.computed)(()=>(n?n.props:i).strict),_=(0,_vue.computed)(()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t;return n?n.props.modelValue===e:i.modelValue===e}),f=(e,t)=>{n?n.handleChecked({label:e,checkedValue:e},t):(l("update:modelValue",e),x("change",{value:e,label:e,checkedValue:e},t),u&&a&&u.triggerItemEvent(t,a.itemConfig.field,e))},m=e=>{var t,u;c.value||({label:u,checkedValue:t}=i,u=_xeUtils.default.isUndefined(t)?u:t,f(u,e))},g=e=>{var t=c.value,u=v.value;t||u||({label:t,checkedValue:u}=i,(_xeUtils.default.isUndefined(u)?t:u)===(n?n.props:i).modelValue&&f(null,e))},x=(e,t,u)=>{l(e,(0,_ui.createEvent)(u,{$radio:o},t))};t={dispatchEvent:x};Object.assign(o,t,{});return o.renderVN=()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t,t=s.value,u=c.value,l=p.value,a=_.value;return(0,_vue.h)("label",{key:e,class:["vxe-radio vxe-radio--default",{["size--"+t]:t,"is--checked":a,"is--disabled":u}],title:i.title},[(0,_vue.h)("input",{class:"vxe-radio--input",type:"radio",name:l,checked:a,disabled:u,onChange:m,onClick:g}),(0,_vue.h)("span",{class:["vxe-radio--icon",a?(0,_ui.getIcon)().RADIO_CHECKED:u?(0,_ui.getIcon)().RADIO_DISABLED_UNCHECKED:(0,_ui.getIcon)().RADIO_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-radio--label"},r.default?r.default({}):(0,_utils.getFuncText)(i.content))])},o},render(){return this.renderVN()}});
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _vue=require("vue"),_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}}var _default=exports.default=(0,_comp.defineVxeComponent)({name:"VxeRadio",props:{modelValue:[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:()=>(0,_ui.getConfig)().radio.strict},size:{type:String,default:()=>(0,_ui.getConfig)().radio.size||(0,_ui.getConfig)().size},label:{type:[String,Number,Boolean],default:null}},emits:["update:modelValue","change"],setup(i,e){const{slots:r,emit:l}=e,a=(0,_vue.inject)("$xeForm",null),n=(0,_vue.inject)("xeFormItemInfo",null),d=(0,_vue.inject)("$xeRadioGroup",null);var t=_xeUtils.default.uniqueId(),u=(0,_vue.reactive)({});const o={xID:t,props:i,context:e,reactData:u},c=(0,_ui.useSize)(i)["computeSize"],s=(0,_vue.computed)(()=>{var e,t=i["disabled"];if(null===t&&d)return e=d.getComputeMaps()["computeIsDisabled"],e.value;return t}),v=(0,_vue.computed)(()=>(d||i).name),p=(0,_vue.computed)(()=>(d?d.props:i).strict),_=(0,_vue.computed)(()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t;return d?d.props.modelValue===e:i.modelValue===e}),f=(e,t)=>{var u=i["content"];d?d.handleChecked({label:e,checkedValue:e,checkedLabel:u},t):(l("update:modelValue",e),b("change",{value:e,label:e,checkedValue:e,checkedLabel:u},t),a&&n&&a.triggerItemEvent(t,n.itemConfig.field,e))},m=e=>{var t,u;s.value||({label:u,checkedValue:t}=i,u=_xeUtils.default.isUndefined(t)?u:t,f(u,e))},g=e=>{var t=s.value,u=p.value;t||u||({label:t,checkedValue:u}=i,(_xeUtils.default.isUndefined(u)?t:u)===(d?d.props:i).modelValue&&f(null,e))},b=(e,t,u)=>{l(e,(0,_ui.createEvent)(u,{$radio:o},t))};t={dispatchEvent:b};Object.assign(o,t,{});return o.renderVN=()=>{var{label:e,checkedValue:t}=i,e=_xeUtils.default.isUndefined(t)?e:t,t=c.value,u=s.value,l=v.value,a=_.value;return(0,_vue.h)("label",{key:e,class:["vxe-radio vxe-radio--default",{["size--"+t]:t,"is--checked":a,"is--disabled":u}],title:i.title},[(0,_vue.h)("input",{class:"vxe-radio--input",type:"radio",name:l,checked:a,disabled:u,onChange:m,onClick:g}),(0,_vue.h)("span",{class:["vxe-radio--icon",a?(0,_ui.getIcon)().RADIO_CHECKED:u?(0,_ui.getIcon)().RADIO_DISABLED_UNCHECKED:(0,_ui.getIcon)().RADIO_UNCHECKED]}),(0,_vue.h)("span",{class:"vxe-radio--label"},r.default?r.default({}):(0,_utils.getFuncText)(i.content))])},o},render(){return this.renderVN()}});