diff --git a/packages/uni-api/src/index.ts b/packages/uni-api/src/index.ts index bdc830af1db106afdefca1a1c051fa3f3da0d789..580a097877e0c63c089398f26b040f602ebcb03c 100644 --- a/packages/uni-api/src/index.ts +++ b/packages/uni-api/src/index.ts @@ -49,6 +49,8 @@ export * from './protocols/ui/loadFontFace' export * from './protocols/ui/pageScrollTo' export * from './protocols/ui/navigationBar' export * from './protocols/ui/popup' +export * from './protocols/ui/startPullDownRefresh' +export * from './protocols/ui/stopPullDownRefresh' export * from './protocols/ui/tabBar' // helpers export { diff --git a/packages/uni-api/src/protocols/ui/startPullDownRefresh.ts b/packages/uni-api/src/protocols/ui/startPullDownRefresh.ts new file mode 100644 index 0000000000000000000000000000000000000000..6f490c8400677157f660d24ad7cd310d83feb618 --- /dev/null +++ b/packages/uni-api/src/protocols/ui/startPullDownRefresh.ts @@ -0,0 +1,2 @@ +export const API_START_PULL_DOWN_REFRESH = 'startPullDownRefresh' +export type API_TYPE_START_PULL_DOWN_REFRESH = typeof uni.startPullDownRefresh diff --git a/packages/uni-api/src/protocols/ui/stopPullDownRefresh.ts b/packages/uni-api/src/protocols/ui/stopPullDownRefresh.ts new file mode 100644 index 0000000000000000000000000000000000000000..e09ae199baf712342b816ad3a69cb432c8419179 --- /dev/null +++ b/packages/uni-api/src/protocols/ui/stopPullDownRefresh.ts @@ -0,0 +1,2 @@ +export const API_STOP_PULL_DOWN_REFRESH = 'stopPullDownRefresh' +export type API_TYPE_STOP_PULL_DOWN_REFRESH = typeof uni.stopPullDownRefresh diff --git a/packages/uni-core/src/service/plugin/appConfig.ts b/packages/uni-core/src/service/plugin/appConfig.ts index 90f4935b5433f734973b4e4880365077a2fb84b7..e7d24fa67d6367b934fa69c88b55584768962fee 100644 --- a/packages/uni-core/src/service/plugin/appConfig.ts +++ b/packages/uni-core/src/service/plugin/appConfig.ts @@ -4,8 +4,8 @@ import { extend } from '@vue/shared' import * as wxInstance from './componentWx' export function initAppConfig(appConfig: AppConfig) { - const globalProperties = appConfig.globalProperties if (__UNI_FEATURE_WX__) { + const globalProperties = appConfig.globalProperties extend(globalProperties, wxInstance) } } diff --git a/packages/uni-core/src/service/plugin/index.ts b/packages/uni-core/src/service/plugin/index.ts index b1fb81600f98ed2b53084629bf8ffabdca1900a3..14d11c1704789c83329e08befc6f7998e7b66464 100644 --- a/packages/uni-core/src/service/plugin/index.ts +++ b/packages/uni-core/src/service/plugin/index.ts @@ -22,6 +22,14 @@ export function getCurrentPageMeta() { } } +export function getCurrentPageId() { + const meta = getCurrentPageMeta() + if (meta) { + return meta.id + } + return -1 +} + export function getCurrentPageVm() { const page = getCurrentPage() if (page) { @@ -30,13 +38,14 @@ export function getCurrentPageVm() { } export function invokeHook(name: string, args?: unknown): unknown +export function invokeHook(id: number, name: string, args?: unknown): unknown export function invokeHook( vm: ComponentPublicInstance, name: string, args?: unknown ): unknown export function invokeHook( - vm: ComponentPublicInstance | string, + vm: ComponentPublicInstance | string | number, name?: string | unknown, args?: unknown ) { @@ -44,6 +53,13 @@ export function invokeHook( args = name name = vm vm = getCurrentPageVm()! + } else if (typeof vm === 'number') { + const page = getCurrentPages().find((page) => page.$page.id === vm) + if (page) { + vm = (page as any).$vm as ComponentPublicInstance + } else { + vm = getCurrentPageVm() as ComponentPublicInstance + } } if (!vm) { return diff --git a/packages/uni-core/src/service/plugin/subscribe.ts b/packages/uni-core/src/service/plugin/subscribe.ts new file mode 100644 index 0000000000000000000000000000000000000000..5ce3bb81eb338b09faa4a0a5671f222c510bf4c6 --- /dev/null +++ b/packages/uni-core/src/service/plugin/subscribe.ts @@ -0,0 +1,4 @@ +export function initSubscribe() { + UniServiceJSBridge.on('onAppEnterForeground', () => {}) + UniServiceJSBridge.on('onAppEnterBackground', () => {}) +} diff --git a/packages/uni-core/src/view/plugin/componentInstance.ts b/packages/uni-core/src/view/plugin/componentInstance.ts index bd6dff65ba21723b85e507ed54ce3fd6dbd36a21..6cf6555a074cbcb073e148f6012c05dfc07bdc9e 100644 --- a/packages/uni-core/src/view/plugin/componentInstance.ts +++ b/packages/uni-core/src/view/plugin/componentInstance.ts @@ -10,12 +10,14 @@ export function $normalizeNativeEvent( this: ComponentPublicInstance, evt: Event ) { - // TODO 目前内置组件，也会进入以下处理逻辑，是否有影响？ + // TODO 目前内置组件底层实现，也会进入以下处理逻辑，可能会有影响 const { currentTarget } = evt if (!(evt instanceof Event) || !(currentTarget instanceof HTMLElement)) { return evt } - if (currentTarget.tagName.indexOf('UNI-') !== 0) { + const { tagName } = currentTarget + if (tagName.indexOf('UNI-') !== 0 || tagName === 'UNI-PAGE-WRAPPER') { + // TODO 下拉刷新事件返回原始event，目前硬编码，后续换其他方案解决 return evt } diff --git a/packages/uni-h5/dist/uni-h5.esm.js b/packages/uni-h5/dist/uni-h5.esm.js index 7ce70a1eff62e19cbe8639433105d692c2447824..2f0b596d852e6f3ec97078fb16e03eb20e603326 100644 --- a/packages/uni-h5/dist/uni-h5.esm.js +++ b/packages/uni-h5/dist/uni-h5.esm.js @@ -625,7 +625,8 @@ function $normalizeNativeEvent(evt) { if (!(evt instanceof Event) || !(currentTarget instanceof HTMLElement)) { return evt; } - if (currentTarget.tagName.indexOf("UNI-") !== 0) { + const {tagName} = currentTarget; + if (tagName.indexOf("UNI-") !== 0 || tagName === "UNI-PAGE-WRAPPER") { return evt; } const res = createNativeEvent(evt); @@ -914,8 +915,8 @@ var wxInstance = /* @__PURE__ */ Object.freeze({ selectAllComponents }); function initAppConfig(appConfig) { - const globalProperties = appConfig.globalProperties; if (__UNI_FEATURE_WX__) { + const globalProperties = appConfig.globalProperties; extend(globalProperties, wxInstance); } } @@ -935,6 +936,13 @@ function getCurrentPageMeta() { return page.$page.meta; } } +function getCurrentPageId() { + const meta = getCurrentPageMeta(); + if (meta) { + return meta.id; + } + return -1; +} function getCurrentPageVm() { const page = getCurrentPage(); if (page) { @@ -946,6 +954,13 @@ function invokeHook(vm, name, args) { args = name; name = vm; vm = getCurrentPageVm(); + } else if (typeof vm === "number") { + const page = getCurrentPages().find((page2) => page2.$page.id === vm); + if (page) { + vm = page.$vm; + } else { + vm = getCurrentPageVm(); + } } if (!vm) { return; @@ -1045,23 +1060,23 @@ const pageMetaKey = PolySymbol(process.env.NODE_ENV !== "production" ? "UniPageM function usePageMeta() { return inject(pageMetaKey); } -function providePageMeta() { - const pageMeta = initPageMeta(); +function providePageMeta(id2) { + const pageMeta = initPageMeta(id2); provide(pageMetaKey, pageMeta); return pageMeta; } -function initPageMeta() { +function initPageMeta(id2) { if (__UNI_FEATURE_PAGES__) { - return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(useRoute().meta))))); + return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(id2, useRoute().meta))))); } - return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(__uniRoutes[0].meta))))); + return reactive(normalizePageMeta(JSON.parse(JSON.stringify(mergePageMeta(id2, __uniRoutes[0].meta))))); } const PAGE_META_KEYS = [ "navigationBar", "refreshOptions" ]; -function mergePageMeta(pageMeta) { - const res = Object.assign({}, __uniConfig.globalStyle, pageMeta); +function mergePageMeta(id2, pageMeta) { + const res = Object.assign({id: id2}, __uniConfig.globalStyle, pageMeta); PAGE_META_KEYS.forEach((name) => { res[name] = Object.assign({}, __uniConfig.globalStyle[name] || {}, pageMeta[name] || {}); }); @@ -1084,6 +1099,7 @@ function normalizePageMeta(pageMeta) { if (type !== "transparent" && type !== "none") { offset += NAVBAR_HEIGHT + out.top; } + refreshOptions.offset = offset; refreshOptions.height = rpx2px(refreshOptions.height); refreshOptions.range = rpx2px(refreshOptions.range); pageMeta.refreshOptions = refreshOptions; @@ -1190,25 +1206,26 @@ function createPageState(type, __id__) { }; } function initPublicPage(route) { + const meta = usePageMeta(); if (!__UNI_FEATURE_PAGES__) { const {path: path2, alias} = __uniRoutes[0]; return { - id, + id: meta.id, path: path2, route: alias.substr(1), fullPath: path2, options: {}, - meta: usePageMeta() + meta }; } const {path} = route; return { - id, + id: meta.id, path, route: route.meta.route, fullPath: route.meta.isEntry ? route.meta.pagePath : route.fullPath, options: {}, - meta: usePageMeta() + meta }; } function initPage(vm) { @@ -5096,6 +5113,8 @@ const ShowActionSheetOptions = { }; const API_HIDE_TOAST = "hideToast"; const API_HIDE_LOADING = "hideLoading"; +const API_START_PULL_DOWN_REFRESH = "startPullDownRefresh"; +const API_STOP_PULL_DOWN_REFRESH = "stopPullDownRefresh"; const IndexProtocol = { index: { type: Number, @@ -12350,6 +12369,14 @@ const hideLoading = defineAsyncApi(API_HIDE_LOADING, () => { }); const showActionSheet = defineAsyncApi(API_SHOW_ACTION_SHEET, () => { }, ShowActionSheetProtocol, ShowActionSheetOptions); +const startPullDownRefresh = defineAsyncApi(API_START_PULL_DOWN_REFRESH, (_args, {resolve}) => { + UniServiceJSBridge.publishHandler("startPullDownRefresh", {}, getCurrentPageId()); + resolve(); +}); +const stopPullDownRefresh = defineAsyncApi(API_STOP_PULL_DOWN_REFRESH, (_args, {resolve}) => { + UniServiceJSBridge.publishHandler("stopPullDownRefresh", {}, getCurrentPageId()); + resolve(); +}); let tabBar; function useTabBar() { if (!tabBar) { @@ -12535,6 +12562,8 @@ var api = /* @__PURE__ */ Object.freeze({ showLoading, hideLoading, showActionSheet, + startPullDownRefresh, + stopPullDownRefresh, setTabBarItem, setTabBarStyle, hideTabBar, @@ -12547,7 +12576,7 @@ var api = /* @__PURE__ */ Object.freeze({ const uni$1 = api; const UniServiceJSBridge$1 = /* @__PURE__ */ extend(ServiceJSBridge, { publishHandler(event2, args, pageId) { - window.UniViewJSBridge.subscribeHandler(event2, args, pageId); + UniViewJSBridge.subscribeHandler(pageId + "." + event2, args, pageId); } }); var TabBar = /* @__PURE__ */ defineComponent({ @@ -13333,7 +13362,7 @@ function usePageRefresh(refreshRef) { refreshControllerElem = refreshContainerElem.querySelector(".uni-page-refresh"); refreshControllerElemStyle = refreshControllerElem.style; refreshInnerElemStyle = refreshControllerElem.querySelector(".uni-page-refresh-inner").style; - UniServiceJSBridge.on(id2 + ".startPullDownRefresh", () => { + UniViewJSBridge.subscribe(id2 + ".startPullDownRefresh", () => { if (!state) { state = REFRESHING; addClass(); @@ -13342,7 +13371,7 @@ function usePageRefresh(refreshRef) { }, 50); } }); - UniServiceJSBridge.on(id2 + ".stopPullDownRefresh", () => { + UniViewJSBridge.subscribe(id2 + ".stopPullDownRefresh", () => { if (state === REFRESHING) { removeClass(); state = RESTORING; @@ -13358,8 +13387,8 @@ function usePageRefresh(refreshRef) { let startY; let canRefresh; let state; - let distance; - let offset; + let distance = null; + let offset = null; function toggleClass(type) { if (!state) { return; @@ -13399,7 +13428,7 @@ function usePageRefresh(refreshRef) { canRefresh = true; } } - function onTouchmovePassive(ev) { + function onTouchmove(ev) { if (!canRefresh) { return; } @@ -13414,9 +13443,7 @@ function usePageRefresh(refreshRef) { if (deltaY < 0 && !state) { return; } - if (ev.cancelable) { - ev.preventDefault(); - } + ev.preventDefault(); if (distance === null) { offset = deltaY; state = PULLING; @@ -13478,12 +13505,12 @@ function usePageRefresh(refreshRef) { } } function refreshing() { - if (refreshControllerElem) { + if (!refreshControllerElem) { return; } refreshControllerElemStyle.transition = "-webkit-transform 0.2s"; refreshControllerElemStyle.transform = "translate3d(-50%, " + height + "px, 0)"; - UniServiceJSBridge.emit("onPullDownRefresh", {}, id2); + invokeHook(id2, "onPullDownRefresh"); } function restoring(callback) { if (!refreshControllerElem) { @@ -13503,7 +13530,7 @@ function usePageRefresh(refreshRef) { } return { onTouchstartPassive, - onTouchmovePassive, + onTouchmove, onTouchend, onTouchcancel: onTouchend }; @@ -13531,7 +13558,7 @@ function createPageRefreshTsx(refreshRef, pageMeta) { var index = defineComponent({ name: "Page", setup(_props, ctx) { - const {navigationBar} = providePageMeta(); + const {navigationBar} = providePageMeta(history.state && history.state.__id__ || 1); return () => createVNode("uni-page", null, __UNI_FEATURE_NAVIGATIONBAR__ && navigationBar.style !== "custom" ? [createVNode(PageHead), createPageBodyVNode(ctx)] : [createPageBodyVNode(ctx)]); } }); @@ -13574,4 +13601,4 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ]); } _sfc_main.render = _sfc_render; -export {_sfc_main$1 as AsyncErrorComponent, _sfc_main as AsyncLoadingComponent, _sfc_main$l as Audio, index$5 as Button, _sfc_main$k as Canvas, _sfc_main$j as Checkbox, _sfc_main$i as CheckboxGroup, _sfc_main$h as Editor, index$6 as Form, index$4 as Icon, index$3 as Image, _sfc_main$g as Input, _sfc_main$f as Label, LayoutComponent, _sfc_main$e as MovableView, _sfc_main$d as Navigator, index as PageComponent, _sfc_main$c as Progress, _sfc_main$b as Radio, _sfc_main$a as RadioGroup, ResizeSensor, _sfc_main$9 as RichText, _sfc_main$8 as ScrollView, _sfc_main$7 as Slider, _sfc_main$6 as SwiperItem, _sfc_main$5 as Switch, index$2 as Text, _sfc_main$4 as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, _sfc_main$3 as Video, index$1 as View, addInterceptor, arrayBufferToBase64, base64ToArrayBuffer, canIUse, chooseFile, chooseImage, chooseVideo, clearStorage, clearStorageSync, closeSocket, connectSocket, createInnerAudioContext, createIntersectionObserver, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, downloadFile, getApp$1 as getApp, getCurrentPages$1 as getCurrentPages, getFileInfo, getImageInfo, getLocation, getNetworkType, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getVideoInfo, hideKeyboard, hideLoading, hideNavigationBarLoading, hideTabBar, hideTabBarRedDot, hideToast, loadFontFace, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offCompassChange, offNetworkStatusChange, onAccelerometerChange, onCompassChange, onNetworkStatusChange, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, openDocument, pageScrollTo, index$7 as plugin, promiseInterceptor, reLaunch, redirectTo, removeInterceptor, removeStorage, removeStorageSync, removeTabBarBadge, request, sendSocketMessage, setNavigationBarColor, setNavigationBarTitle, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setupApp, setupPage, showActionSheet, showLoading, showModal, showNavigationBarLoading, showTabBar, showTabBarRedDot, showToast, startAccelerometer, startCompass, stopAccelerometer, stopCompass, switchTab, uni$1 as uni, uploadFile, upx2px, useCustomEvent, usePageRoute, useSubscribe, vibrateLong, vibrateShort}; +export {_sfc_main$1 as AsyncErrorComponent, _sfc_main as AsyncLoadingComponent, _sfc_main$l as Audio, index$5 as Button, _sfc_main$k as Canvas, _sfc_main$j as Checkbox, _sfc_main$i as CheckboxGroup, _sfc_main$h as Editor, index$6 as Form, index$4 as Icon, index$3 as Image, _sfc_main$g as Input, _sfc_main$f as Label, LayoutComponent, _sfc_main$e as MovableView, _sfc_main$d as Navigator, index as PageComponent, _sfc_main$c as Progress, _sfc_main$b as Radio, _sfc_main$a as RadioGroup, ResizeSensor, _sfc_main$9 as RichText, _sfc_main$8 as ScrollView, _sfc_main$7 as Slider, _sfc_main$6 as SwiperItem, _sfc_main$5 as Switch, index$2 as Text, _sfc_main$4 as Textarea, UniServiceJSBridge$1 as UniServiceJSBridge, UniViewJSBridge$1 as UniViewJSBridge, _sfc_main$3 as Video, index$1 as View, addInterceptor, arrayBufferToBase64, base64ToArrayBuffer, canIUse, chooseFile, chooseImage, chooseVideo, clearStorage, clearStorageSync, closeSocket, connectSocket, createInnerAudioContext, createIntersectionObserver, createSelectorQuery, createVideoContext, cssBackdropFilter, cssConstant, cssEnv, cssVar, downloadFile, getApp$1 as getApp, getCurrentPages$1 as getCurrentPages, getFileInfo, getImageInfo, getLocation, getNetworkType, getStorage, getStorageInfo, getStorageInfoSync, getStorageSync, getSystemInfo, getSystemInfoSync, getVideoInfo, hideKeyboard, hideLoading, hideNavigationBarLoading, hideTabBar, hideTabBarRedDot, hideToast, loadFontFace, makePhoneCall, navigateBack, navigateTo, offAccelerometerChange, offCompassChange, offNetworkStatusChange, onAccelerometerChange, onCompassChange, onNetworkStatusChange, onSocketClose, onSocketError, onSocketMessage, onSocketOpen, onTabBarMidButtonTap, openDocument, pageScrollTo, index$7 as plugin, promiseInterceptor, reLaunch, redirectTo, removeInterceptor, removeStorage, removeStorageSync, removeTabBarBadge, request, sendSocketMessage, setNavigationBarColor, setNavigationBarTitle, setStorage, setStorageSync, setTabBarBadge, setTabBarItem, setTabBarStyle, setupApp, setupPage, showActionSheet, showLoading, showModal, showNavigationBarLoading, showTabBar, showTabBarRedDot, showToast, startAccelerometer, startCompass, startPullDownRefresh, stopAccelerometer, stopCompass, stopPullDownRefresh, switchTab, uni$1 as uni, uploadFile, upx2px, useCustomEvent, usePageRoute, useSubscribe, vibrateLong, vibrateShort}; diff --git a/packages/uni-h5/src/framework/components/page/index.ts b/packages/uni-h5/src/framework/components/page/index.ts index d67c1652220e8fa5f22a9dce3ded62086d246856..d17c150e37eceab1b97695bb6446b7f324b9cfbc 100644 --- a/packages/uni-h5/src/framework/components/page/index.ts +++ b/packages/uni-h5/src/framework/components/page/index.ts @@ -15,7 +15,9 @@ import { providePageMeta } from '../../plugin/provide' export default defineComponent({ name: 'Page', setup(_props, ctx) { - const { navigationBar } = providePageMeta() + const { navigationBar } = providePageMeta( + (history.state && history.state.__id__) || 1 + ) return () => createVNode( 'uni-page', diff --git a/packages/uni-h5/src/framework/components/page/page-refresh/index.ts b/packages/uni-h5/src/framework/components/page/page-refresh/index.ts index 358d809c1359637c217efe08ca1273514dd32e6e..808fb3f4cef2075ba23a86852ecd64fdc7279a9f 100644 --- a/packages/uni-h5/src/framework/components/page/page-refresh/index.ts +++ b/packages/uni-h5/src/framework/components/page/page-refresh/index.ts @@ -1,4 +1,5 @@ import { onMounted, Ref } from 'vue' +import { invokeHook } from '@dcloudio/uni-core' import { usePageMeta } from '../../../plugin/provide' function processDeltaY( @@ -41,8 +42,8 @@ export function usePageRefresh(refreshRef: Ref) { refreshInnerElemStyle = (refreshControllerElem.querySelector( '.uni-page-refresh-inner' ) as HTMLDivElement).style - - UniServiceJSBridge.on(id + '.startPullDownRefresh', () => { + // uni.startPullDownRefresh + UniViewJSBridge.subscribe(id + '.startPullDownRefresh', () => { if (!state) { state = REFRESHING addClass() @@ -51,8 +52,8 @@ export function usePageRefresh(refreshRef: Ref) { }, 50) } }) - - UniServiceJSBridge.on(id + '.stopPullDownRefresh', () => { + // uni.stopPullDownRefresh + UniViewJSBridge.subscribe(id + '.stopPullDownRefresh', () => { if (state === REFRESHING) { removeClass() state = RESTORING @@ -76,8 +77,8 @@ export function usePageRefresh(refreshRef: Ref) { | typeof RESTORING | null - let distance: number | null - let offset: number | null + let distance: number | null = null + let offset: number | null = null function toggleClass(type: 'add' | 'remove') { if (!state) { @@ -124,7 +125,7 @@ export function usePageRefresh(refreshRef: Ref) { } } - function onTouchmovePassive(ev: TouchEvent) { + function onTouchmove(ev: TouchEvent) { if (!canRefresh) { return } @@ -141,9 +142,7 @@ export function usePageRefresh(refreshRef: Ref) { return } - if (ev.cancelable) { - ev.preventDefault() - } + ev.preventDefault() if (distance === null) { offset = deltaY @@ -222,14 +221,13 @@ export function usePageRefresh(refreshRef: Ref) { } function refreshing() { - if (refreshControllerElem) { + if (!refreshControllerElem) { return } refreshControllerElemStyle.transition = '-webkit-transform 0.2s' refreshControllerElemStyle.transform = 'translate3d(-50%, ' + height + 'px, 0)' - // Service 执行 refresh - UniServiceJSBridge.emit('onPullDownRefresh', {}, id) + invokeHook(id, 'onPullDownRefresh') } function restoring(callback: Function) { @@ -259,7 +257,7 @@ export function usePageRefresh(refreshRef: Ref) { return { onTouchstartPassive, - onTouchmovePassive, + onTouchmove, onTouchend, onTouchcancel: onTouchend, } diff --git a/packages/uni-h5/src/framework/plugin/page.ts b/packages/uni-h5/src/framework/plugin/page.ts index 0304adfa524b868c39b5f1934ebbcfd93a999db2..e0cbc7c6a64ca7a777d620bbb3dc27280abfe8ed 100644 --- a/packages/uni-h5/src/framework/plugin/page.ts +++ b/packages/uni-h5/src/framework/plugin/page.ts @@ -4,7 +4,6 @@ import { computed, ConcreteComponent, ComponentPublicInstance, - ComponentInternalInstance, } from 'vue' import { useRoute, RouteLocationNormalizedLoaded } from 'vue-router' import { invokeHook } from '@dcloudio/uni-core' @@ -68,25 +67,26 @@ export function createPageState(type: NavigateType, __id__?: number) { } function initPublicPage(route: RouteLocationNormalizedLoaded) { + const meta = usePageMeta() if (!__UNI_FEATURE_PAGES__) { const { path, alias } = __uniRoutes[0] return { - id, + id: meta.id, path, route: alias!.substr(1), fullPath: path, options: {}, - meta: usePageMeta(), + meta, } } const { path } = route return { - id, + id: meta.id, path: path, route: route.meta.route, fullPath: route.meta.isEntry ? route.meta.pagePath : route.fullPath, options: {}, // $route.query - meta: usePageMeta(), + meta, } } diff --git a/packages/uni-h5/src/framework/plugin/provide/page.ts b/packages/uni-h5/src/framework/plugin/provide/page.ts index 9ca7d6a057fcbe851935a1bd7c846968fbe577e8..e6e44565c4da75d05e8290325deb2d85d97a12b3 100644 --- a/packages/uni-h5/src/framework/plugin/provide/page.ts +++ b/packages/uni-h5/src/framework/plugin/provide/page.ts @@ -12,19 +12,22 @@ export function usePageMeta() { return inject(pageMetaKey)! } -export function providePageMeta() { - const pageMeta = initPageMeta() +export function providePageMeta(id: number) { + const pageMeta = initPageMeta(id) provide(pageMetaKey, pageMeta) return pageMeta } -function initPageMeta() { +function initPageMeta(id: number) { if (__UNI_FEATURE_PAGES__) { return reactive( normalizePageMeta( JSON.parse( JSON.stringify( - mergePageMeta((useRoute().meta as unknown) as UniApp.PageRouteMeta) + mergePageMeta( + id, + (useRoute().meta as unknown) as UniApp.PageRouteMeta + ) ) ) ) @@ -32,7 +35,7 @@ function initPageMeta() { } return reactive( normalizePageMeta( - JSON.parse(JSON.stringify(mergePageMeta(__uniRoutes[0].meta))) + JSON.parse(JSON.stringify(mergePageMeta(id, __uniRoutes[0].meta))) ) ) } @@ -42,8 +45,8 @@ const PAGE_META_KEYS: ['navigationBar', 'refreshOptions'] = [ 'refreshOptions', ] -function mergePageMeta(pageMeta: UniApp.PageRouteMeta) { - const res = Object.assign({}, __uniConfig.globalStyle, pageMeta) +function mergePageMeta(id: number, pageMeta: UniApp.PageRouteMeta) { + const res = Object.assign({ id }, __uniConfig.globalStyle, pageMeta) PAGE_META_KEYS.forEach((name) => { ;(res as any)[name] = Object.assign( {}, @@ -74,6 +77,7 @@ function normalizePageMeta(pageMeta: UniApp.PageRouteMeta) { if (type !== 'transparent' && type !== 'none') { offset += NAVBAR_HEIGHT + safeAreaInsets.top } + refreshOptions.offset = offset refreshOptions.height = rpx2px(refreshOptions.height) refreshOptions.range = rpx2px(refreshOptions.range) pageMeta.refreshOptions = refreshOptions diff --git a/packages/uni-h5/src/service/api/index.ts b/packages/uni-h5/src/service/api/index.ts index c885ce8b0eb2c940fdbae6e972477159cdb470f2..0d13348beed4377052f2831a4ef417a83e2b613a 100644 --- a/packages/uni-h5/src/service/api/index.ts +++ b/packages/uni-h5/src/service/api/index.ts @@ -40,6 +40,8 @@ export * from './ui/loadFontFace' export * from './ui/navigationBar' export * from './ui/pageScrollTo' export * from './ui/popup' +export * from './ui/startPullDownRefresh' +export * from './ui/stopPullDownRefresh' export * from './ui/tabBar' export { diff --git a/packages/uni-h5/src/service/api/ui/startPullDownRefresh.ts b/packages/uni-h5/src/service/api/ui/startPullDownRefresh.ts new file mode 100644 index 0000000000000000000000000000000000000000..1ae13468764494d7b262828cda70683a0fe37456 --- /dev/null +++ b/packages/uni-h5/src/service/api/ui/startPullDownRefresh.ts @@ -0,0 +1,18 @@ +import { + API_START_PULL_DOWN_REFRESH, + API_TYPE_START_PULL_DOWN_REFRESH, + defineAsyncApi, +} from '@dcloudio/uni-api' +import { getCurrentPageId } from '@dcloudio/uni-core' + +export const startPullDownRefresh = defineAsyncApi( + API_START_PULL_DOWN_REFRESH, + (_args, { resolve }) => { + UniServiceJSBridge.publishHandler( + 'startPullDownRefresh', + {}, + getCurrentPageId() + ) + resolve() + } +) diff --git a/packages/uni-h5/src/service/api/ui/stopPullDownRefresh.ts b/packages/uni-h5/src/service/api/ui/stopPullDownRefresh.ts new file mode 100644 index 0000000000000000000000000000000000000000..4d4b6eed2d11a061bc1448329c6eaae31960b039 --- /dev/null +++ b/packages/uni-h5/src/service/api/ui/stopPullDownRefresh.ts @@ -0,0 +1,18 @@ +import { + API_STOP_PULL_DOWN_REFRESH, + API_TYPE_STOP_PULL_DOWN_REFRESH, + defineAsyncApi, +} from '@dcloudio/uni-api' +import { getCurrentPageId } from '@dcloudio/uni-core' + +export const stopPullDownRefresh = defineAsyncApi( + API_STOP_PULL_DOWN_REFRESH, + (_args, { resolve }) => { + UniServiceJSBridge.publishHandler( + 'stopPullDownRefresh', + {}, + getCurrentPageId() + ) + resolve() + } +) diff --git a/packages/uni-h5/src/service/bridge/index.ts b/packages/uni-h5/src/service/bridge/index.ts index a90dc09448fc6f229934bcaf0820abc757437afd..aac2dbbe9d217eea15ddd6b2d6a4d2a892cdd317 100644 --- a/packages/uni-h5/src/service/bridge/index.ts +++ b/packages/uni-h5/src/service/bridge/index.ts @@ -4,6 +4,6 @@ import { ServiceJSBridge } from '@dcloudio/uni-core' export const UniServiceJSBridge = /*#__PURE__*/ extend(ServiceJSBridge, { publishHandler(event: string, args: any, pageId: number) { - window.UniViewJSBridge.subscribeHandler(event, args, pageId) + UniViewJSBridge.subscribeHandler(pageId + '.' + event, args, pageId) }, }) diff --git a/packages/uni-mp-vue/dist/vue.runtime.esm.js b/packages/uni-mp-vue/dist/vue.runtime.esm.js index 640b30a0eb6e29d7827fcd9080f611813cdc4541..561e2f9ccf83a1492c1101be15a5c3dcbe19b188 100644 --- a/packages/uni-mp-vue/dist/vue.runtime.esm.js +++ b/packages/uni-mp-vue/dist/vue.runtime.esm.js @@ -55,6 +55,15 @@ function invokeHook(vm, name, args) { name = vm; vm = getCurrentPageVm(); } + else if (typeof vm === 'number') { + const page = getCurrentPages().find((page) => page.$page.id === vm); + if (page) { + vm = page.$vm; + } + else { + vm = getCurrentPageVm(); + } + } if (!vm) { return; }