diff --git a/packages/uni-components/src/components/progress.ts b/packages/uni-components/src/components/progress.ts index 9a2760df581f1ac688c8f86f20e827165227bca5..1352b89fb456982d9d5265abbe4a29c90d60b481 100644 --- a/packages/uni-components/src/components/progress.ts +++ b/packages/uni-components/src/components/progress.ts @@ -58,4 +58,8 @@ export const progressProps = { return !isNaN(parseFloat(value as string)) }, }, + borderRadius: { + type: [Number, String], + default: 0, + }, } diff --git a/packages/uni-components/src/nvue/checkbox/index.tsx b/packages/uni-components/src/nvue/checkbox/index.tsx index 1800bdb483ae6b5304b960aec6ae9f0ddd7ad9e2..acb92b24817f802633e0814ea30ceabfeeef5cc7 100644 --- a/packages/uni-components/src/nvue/checkbox/index.tsx +++ b/packages/uni-components/src/nvue/checkbox/index.tsx @@ -90,6 +90,7 @@ export default defineComponent({ } if (isLabelClick) { rootRef.value!.click() + return } checkboxChecked.value = !checkboxChecked.value uniCheckGroup && uniCheckGroup.checkboxChange($event) diff --git a/packages/uni-components/src/nvue/label/index.tsx b/packages/uni-components/src/nvue/label/index.tsx index 577ec0f0498a0d95e365d71ea94d27540275e28d..63d16bed4fb752b52fe3cd276de4653cb39453c7 100644 --- a/packages/uni-components/src/nvue/label/index.tsx +++ b/packages/uni-components/src/nvue/label/index.tsx @@ -4,9 +4,9 @@ import { labelProps, useProvideLabel } from '../../components/label' export { UniLabelCtx, uniLabelKey } from '../../components/label' -type LabelTarget = HTMLElement & { - attr: { dataUncType: string } -} +// type LabelTarget = HTMLElement & { +// attr: { dataUncType: string } +// } export default /*#__PURE__*/ defineComponent({ name: 'Label', @@ -17,15 +17,15 @@ export default /*#__PURE__*/ defineComponent({ const handlers = useProvideLabel() const _onClick = ($event: Event) => { - const EventTarget = $event.target as LabelTarget - const dataType = EventTarget.attr.dataUncType || '' - let stopPropagation = /^uni-(checkbox|radio|switch)-/.test(dataType) - if (!stopPropagation) { - stopPropagation = /^uni-(checkbox|radio|switch|button)$/i.test(dataType) - } - if (stopPropagation) { - return - } + // const EventTarget = $event.target as LabelTarget + // const dataType = EventTarget.attr.dataUncType || '' + // let stopPropagation = /^uni-(checkbox|radio|switch)-/.test(dataType) + // if (!stopPropagation) { + // stopPropagation = /^uni-(checkbox|radio|switch|button)$/i.test(dataType) + // } + // if (stopPropagation) { + // return + // } if (props.for) { UniViewJSBridge.emit( diff --git a/packages/uni-components/src/nvue/progress/index.tsx b/packages/uni-components/src/nvue/progress/index.tsx index e85ee1f40955c1c73366991873136ce0f27dd0f1..f7a09ddca6f99b110541bff0bd042c56a5c28956 100644 --- a/packages/uni-components/src/nvue/progress/index.tsx +++ b/packages/uni-components/src/nvue/progress/index.tsx @@ -108,6 +108,7 @@ function useProgressState(props: ProgressProps) { const outerBarStyle = computed(() => ({ backgroundColor: props.backgroundColor, + borderRadius: props.borderRadius, height: props.strokeWidth, })) const innerBarStyle = computed(() => { @@ -122,6 +123,7 @@ function useProgressState(props: ProgressProps) { width: (currentPercent.value * progressWidth.value) / 100, height: props.strokeWidth, backgroundColor: backgroundColor, + borderRadius: props.borderRadius, } }) const realPercent = computed(() => { diff --git a/packages/uni-components/src/nvue/radio/index.tsx b/packages/uni-components/src/nvue/radio/index.tsx index 57ac6426d7b4d7fdaef038c324c76a26938404f3..5a9d056a816c7d4aee0f2d92530df8701bccfd8b 100644 --- a/packages/uni-components/src/nvue/radio/index.tsx +++ b/packages/uni-components/src/nvue/radio/index.tsx @@ -102,6 +102,7 @@ export default defineComponent({ } if (isLabelClick) { rootRef.value!.click() + return } radioChecked.value = !radioChecked.value uniCheckGroup && uniCheckGroup.radioChange($event, field) diff --git a/packages/uni-components/src/nvue/slider/index.tsx b/packages/uni-components/src/nvue/slider/index.tsx index ba111bb7e034a4a4335009a25cc8bf3473cad2dc..fc4977d794c10e7b1741816cd2c8e5f4ed84d478 100644 --- a/packages/uni-components/src/nvue/slider/index.tsx +++ b/packages/uni-components/src/nvue/slider/index.tsx @@ -97,14 +97,13 @@ const slierStyles: NVueComponentStyles = [ width: 100, height: '2', background: 'transparent', - zIndex: 1, }, }, 'uni-slider-value': { '': { color: '#888888', fontSize: '14', - marginRight: '14', + marginLeft: '14', }, }, }, @@ -159,7 +158,7 @@ export default defineComponent({
{showValue - ? createNVueTextVNode(sliderValue as unknown as string, { + ? createNVueTextVNode(sliderValue + '', { class: 'uni-slider-value', }) : null} diff --git a/packages/uni-components/src/nvue/switch/index.tsx b/packages/uni-components/src/nvue/switch/index.tsx index 06e06b614ce1983c135f743807272e482d095230..0dbccfe2cf11b391e9a74f82ce408c6408c62dfc 100644 --- a/packages/uni-components/src/nvue/switch/index.tsx +++ b/packages/uni-components/src/nvue/switch/index.tsx @@ -52,10 +52,14 @@ export default defineComponent({ }, } - const _onClick = ($event: Event) => { + const _onClick = ($event: Event, isLabelClick?: boolean) => { if (props.disabled) { return } + if (isLabelClick) { + rootRef.value!.click() + return + } switchChecked.value = !switchChecked.value trigger('change', { value: switchChecked.value,