diff --git a/packages/uni-app/dist/uni-app.cjs.js b/packages/uni-app/dist/uni-app.cjs.js index a84a2ccead0fe08400de8a542f211a3a38ff99af..c74a51f0dd17d7c21cb822ea99f1492f0126b107 100644 --- a/packages/uni-app/dist/uni-app.cjs.js +++ b/packages/uni-app/dist/uni-app.cjs.js @@ -73,6 +73,11 @@ function getSsrGlobalData() { return uniShared.sanitise(globalData); } +function getCurrentSubNVue() { + // @ts-ignore + return uni.getSubNVueById(plus.webview.currentWebview().id); +} + function resolveEasycom(component, easycom) { return shared.isString(component) ? easycom : component; } @@ -120,6 +125,7 @@ const onNavigationBarSearchInputConfirmed = const onNavigationBarSearchInputFocusChanged = /*#__PURE__*/ createHook(uniShared.ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED); +exports.getCurrentSubNVue = getCurrentSubNVue; exports.getSsrGlobalData = getSsrGlobalData; exports.onAddToFavorites = onAddToFavorites; exports.onBackPress = onBackPress; diff --git a/packages/uni-app/dist/uni-app.d.ts b/packages/uni-app/dist/uni-app.d.ts index 6de5db42c7f7b3781c7abacc38cb3c08c9f53999..d0551d7c876c111ab52524a89922e4e4ba921b06 100644 --- a/packages/uni-app/dist/uni-app.d.ts +++ b/packages/uni-app/dist/uni-app.d.ts @@ -28,6 +28,8 @@ declare interface CustomShareTimeline { imageUrl?: string; } +export declare function getCurrentSubNVue(): any; + export declare function getSsrGlobalData(): any; declare type LaunchOption = LaunchShowOption; diff --git a/packages/uni-app/dist/uni-app.es.js b/packages/uni-app/dist/uni-app.es.js index 6900de30bf59a4d6e4e5ddb07d6683c737b5a763..1fac657b1caf304dbbc6c97a8d3e5bed963c7ecd 100644 --- a/packages/uni-app/dist/uni-app.es.js +++ b/packages/uni-app/dist/uni-app.es.js @@ -41,6 +41,11 @@ function getSsrGlobalData() { return sanitise(globalData); } +function getCurrentSubNVue() { + // @ts-ignore + return uni.getSubNVueById(plus.webview.currentWebview().id); +} + function resolveEasycom(component, easycom) { return isString(component) ? easycom : component; } @@ -88,4 +93,4 @@ const onNavigationBarSearchInputConfirmed = const onNavigationBarSearchInputFocusChanged = /*#__PURE__*/ createHook(ON_NAVIGATION_BAR_SEARCH_INPUT_FOCUS_CHANGED); -export { getSsrGlobalData, onAddToFavorites, onBackPress, onError, onHide, onLaunch, onLoad, onNavigationBarButtonTap, onNavigationBarSearchInputChanged, onNavigationBarSearchInputClicked, onNavigationBarSearchInputConfirmed, onNavigationBarSearchInputFocusChanged, onPageNotFound, onPageScroll, onPullDownRefresh, onReachBottom, onReady, onResize, onShareAppMessage, onShareTimeline, onShow, onTabItemTap, onThemeChange, onUnhandledRejection, onUnload, resolveEasycom, shallowSsrRef, ssrRef }; +export { getCurrentSubNVue, getSsrGlobalData, onAddToFavorites, onBackPress, onError, onHide, onLaunch, onLoad, onNavigationBarButtonTap, onNavigationBarSearchInputChanged, onNavigationBarSearchInputClicked, onNavigationBarSearchInputConfirmed, onNavigationBarSearchInputFocusChanged, onPageNotFound, onPageScroll, onPullDownRefresh, onReachBottom, onReady, onResize, onShareAppMessage, onShareTimeline, onShow, onTabItemTap, onThemeChange, onUnhandledRejection, onUnload, resolveEasycom, shallowSsrRef, ssrRef }; diff --git a/packages/uni-app/src/api.ts b/packages/uni-app/src/api.ts new file mode 100644 index 0000000000000000000000000000000000000000..66f7b10a12896dfa18cf569d836c86f20887b394 --- /dev/null +++ b/packages/uni-app/src/api.ts @@ -0,0 +1,4 @@ +export function getCurrentSubNVue() { + // @ts-ignore + return uni.getSubNVueById(plus.webview.currentWebview().id) +} diff --git a/packages/uni-app/src/index.ts b/packages/uni-app/src/index.ts index b10eef72b6c129f34e247f7b74ca33be62b236f5..df3157569cb8db71ad326971dea52a8f2be04385 100644 --- a/packages/uni-app/src/index.ts +++ b/packages/uni-app/src/index.ts @@ -1,3 +1,4 @@ export * from './ssr' +export * from './api' export * from './utils' export * from './apiLifecycle' diff --git a/packages/uni-components/dist/components.js b/packages/uni-components/dist/components.js index 1c22a437ac2daa5a469a7d02727c60c5594bf5ca..255ae316fff85fbd0261fe79a3872f0a8d1b93b5 100644 --- a/packages/uni-components/dist/components.js +++ b/packages/uni-components/dist/components.js @@ -2947,6 +2947,7 @@ var USlider = defineComponent({ const trigger = useCustomEvent(sliderRef, emit); const state = useSliderState(props2); const listeners = useSliderListeners(props2, state, trigger); + useSliderInject(props2, state); watch(() => props2.value, (val) => { state.sliderValue = Number(val); }); @@ -3005,7 +3006,7 @@ function useSliderState(props2) { const _getValueWidth = () => { const max = Number(props2.max); const min = Number(props2.min); - return ((sliderValue.value - min) / max - min) * sliderWidth.value; + return (sliderValue.value - min) / (max - min) * sliderWidth.value; }; const state = reactive({ sliderWidth, @@ -3081,6 +3082,28 @@ function useSliderListeners(props2, state, trigger) { }; return listeners; } +function useSliderInject(props2, state) { + const uniForm = inject(uniFormKey, false); + const formField = { + submit: () => { + const data = ["", null]; + if (props2.name) { + data[0] = props2.name; + data[1] = state.sliderValue; + } + return data; + }, + reset: () => { + state.sliderValue = Number(props2.value); + } + }; + if (!!uniForm) { + uniForm.addField(formField); + onUnmounted(() => { + uniForm.removeField(formField); + }); + } +} const switchProps = { name: { type: String,