@tarojs/runtime-rn 3.7.0-alpha.2 → 3.7.0-alpha.20

package/src/app.tsx

@@ -1,21 +1,28 @@
 import { Provider as TCNProvider } from '@tarojs/components-rn'
-import { createRouter, RouterConfig } from '@tarojs/router-rn'
-import React, { Component, ComponentClass,ComponentProps, createRef } from 'react'
+import React, { Component, ComponentProps, createElement, createRef, forwardRef } from 'react'
 import { RootSiblingParent } from 'react-native-root-siblings'
 
 import { Current } from './current'
-import { AppInstance } from './instance'
+import EventChannel from './EventChannel'
+import { AppInstance, PageLifeCycle } from './instance'
+import { getPageInstance } from './page'
+import { createRouter, getInitOptions, getRouteEventChannel } from './router'
 import { RNAppConfig } from './types/index'
-import { isFunction } from './utils'
+import { HOOKS_APP_ID, isFunction } from './utils'
 
 export function isClassComponent (component): boolean {
-  return isFunction(component.render) ||
-    !!component.prototype?.isReactComponent ||
-    component.prototype instanceof Component
+  return (
+    isFunction(component?.render) || !!component.prototype?.isReactComponent || component.prototype instanceof Component
+  )
 }
 
-export function createReactNativeApp (component: ComponentClass, config: RNAppConfig) {
-  const routerConfig: RouterConfig = {
+export function createReactNativeApp (AppEntry: any, config: RNAppConfig, FirstPage: any) {
+  const singleMode = config?.appConfig?.rn?.singleMode ?? false
+  const needNavigate = config.pageList.length !== 1 || !singleMode
+  if (needNavigate) {
+    getRouteEventChannel(EventChannel.routeChannel)
+  }
+  const routerConfig: any = {
     tabBar: config.appConfig.tabBar,
     pages: config.pageList,
     entryPagePath: config.appConfig.entryPagePath,
@@ -24,77 +31,132 @@ export function createReactNativeApp (component: ComponentClass, config: RNAppCo
     rnConfig: config.appConfig.rn || {}
   }
 
-  const ref = createRef<AppInstance>()
+  const appRef = createRef<AppInstance>()
+  const isReactComponent = isClassComponent(AppEntry)
+  let entryComponent: any = AppEntry
+  if (!isReactComponent) {
+    // eslint-disable-next-line react/display-name
+    entryComponent = forwardRef((props, ref) => {
+      return <AppEntry forwardRef={ref} {...props} />
+    })
+  }
 
-  const isReactComponent = isClassComponent(component)
+  const NewAppComponent = (AppComponent) => {
+    return class Entry extends Component<any, any> {
+      constructor (props) {
+        super(props)
+        const { initPath = '', initParams = {} } = this.props
+        routerConfig.initPath = initPath
+        routerConfig.initParams = initParams
+      }
+
+      componentDidMount () {
+        let options: any = {}
+        if (needNavigate) {
+          options = getInitOptions(routerConfig)
+        }
+        triggerAppLifecycle('onLaunch', options)
+        triggerAppLifecycle('componentDidShow', options)
+      }
+
+      // 导航onUnhandledAction
+      onUnhandledAction (options) {
+        triggerAppLifecycle('onPageNotFound', options)
+      }
 
-  const NewAppComponent = (AppCompoent) => {
-    return class Entry extends Component <any, any> {
       render () {
-        let props: ComponentProps<any> | null = null
+        const props: ComponentProps<any> | null = null
 
-        if (isReactComponent) {
-          props = { ref }
-        }
-        const { initPath = '', initParams = {} } = this.props
         const appProps = {
           ...props,
           ...this.props
         }
-        routerConfig.initPath = initPath
-        routerConfig.initParams = initParams
-        return <RootSiblingParent>
-          <TCNProvider {...this.props}>
-            <AppCompoent {...appProps}>
-              {createRouter(routerConfig)}
-            </AppCompoent>
-          </TCNProvider>
-        </RootSiblingParent>
+
+        let routerOptions: any = {}
+        if (needNavigate) {
+          routerOptions = {
+            onUnhandledAction: this.onUnhandledAction
+          }
+        }
+
+        const child = needNavigate
+          ? createRouter(routerConfig, routerOptions)
+          : createElement(FirstPage, { ...this.props }, [])
+
+        return createElement(
+          RootSiblingParent,
+          null,
+          createElement(
+            TCNProvider,
+            { ...this.props },
+            createElement(AppComponent, { ...appProps, ref: appRef }, child)
+          )
+        )
       }
     }
   }
 
-  const App = NewAppComponent(component)
+  const App = NewAppComponent(entryComponent)
 
   // 与小程序端实例保持一致
-  const appInst = Object.create({}, {
-    config: {
-      writable: true,
-      enumerable: true,
-      configurable: true,
-      value: config.appConfig
-    },
-    onLaunch: {
-      enumerable: true,
-      writable: true,
-      value (options) {
-        const app = ref.current
-        if (app != null && isFunction(app.onLaunch)) {
-          app.onLaunch && app.onLaunch(options)
+  const appInst = Object.create(
+    {},
+    {
+      config: {
+        writable: true,
+        enumerable: true,
+        configurable: true,
+        value: config.appConfig
+      },
+      onLaunch: {
+        enumerable: true,
+        writable: true,
+        value (options) {
+          triggerAppLifecycle('onLaunch', options)
         }
-      }
-    },
-    onShow: {
-      enumerable: true,
-      writable: true,
-      value (options) {
-        const app = ref.current
-        if (app != null && isFunction(app.componentDidShow)) {
-          app.componentDidShow && app.componentDidShow(options)
+      },
+      onShow: {
+        enumerable: true,
+        writable: true,
+        value (options) {
+          triggerAppLifecycle('componentDidShow', options)
+        }
+      },
+      onHide: {
+        enumerable: true,
+        writable: true,
+        value (options: unknown) {
+          triggerAppLifecycle('componentDidHide', options)
+        }
+      },
+      onPageNotFound: {
+        enumerable: true,
+        writable: true,
+        value (options) {
+          triggerAppLifecycle('onPageNotFound', options)
         }
       }
-    },
-    onHide: {
-      enumerable: true,
-      writable: true,
-      value (options: unknown) {
-        const app = ref.current
-        if (app != null && isFunction(app.componentDidHide)) {
-          app.componentDidHide && app.componentDidHide(options)
+    }
+  )
+
+  function triggerAppLifecycle (lifecycle: keyof PageLifeCycle | keyof AppInstance, ...args) {
+    try {
+      const app = appRef.current
+      if (isReactComponent) {
+        app?.[lifecycle] && app?.[lifecycle](...args)
+      } else {
+        const instance = getPageInstance(HOOKS_APP_ID)
+        if (instance) {
+          const func = instance[lifecycle]
+          if (Array.isArray(func)) {
+            func.forEach((cb) => cb.apply(app, args))
+          }
         }
       }
+    } catch (err) {
+      throw new Error(err)
     }
-  })
+  }
 
   Current.app = appInst
   return App

package/src/current.ts

@@ -1,7 +1,7 @@
-import { navigationRef as rnNavigationRef } from '@tarojs/router-rn'
 import * as React from 'react'
 
 import { AppInstance, PageInstance } from './instance'
+import { rnNavigationRef } from './router'
 
 interface Router {
   params: Record<string, unknown>

package/src/hooks.ts

@@ -1,14 +1,14 @@
 import * as React from 'react'
 
 import { Current } from './current'
-import { PageLifeCycle } from './instance'
+import { AppInstance, PageLifeCycle } from './instance'
 import { getPageInstance, injectPageInstance, PageContext } from './page'
-import { isArray, isFunction } from './utils'
+import { HOOKS_APP_ID, isArray, isFunction } from './utils'
 
-const taroHooks = (lifecycle: keyof PageLifeCycle) => {
+const taroHooks = (lifecycle: keyof PageLifeCycle | keyof AppInstance) => {
   // eslint-disable-next-line @typescript-eslint/ban-types
   return (fn: Function) => {
-    const id = React.useContext(PageContext)
+    const id = React.useContext(PageContext) || HOOKS_APP_ID
 
     const fnRef = React.useRef(fn)
     if (fnRef.current !== fn) fnRef.current = fn
@@ -70,6 +70,10 @@ export const useResize = taroHooks('onResize')
 
 export const useTabItemTap = taroHooks('onTabItemTap')
 
+export const useLaunch = taroHooks('onLaunch')
+
+export const usePageNotFound= taroHooks('onPageNotFound')
+
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 export const useRouter = (dynamic = false) => {
   return dynamic ? Current.router : React.useMemo(() => Current.router, [])

package/src/index.ts

@@ -20,10 +20,6 @@ export {
   startPullDownRefresh,
   stopPullDownRefresh
 } from './page'
-export {
-  scalePx2dp,
-  scaleVu2dp
-} from './scale2dp'
 export {
   hideNavigationBarLoading,
   hideTabBar,
@@ -42,4 +38,8 @@ export {
   showTabBar,
   showTabBarRedDot,
   switchTab
-} from '@tarojs/router-rn'
+} from './router'
+export {
+  scalePx2dp,
+  scaleVu2dp
+} from './scale2dp'

package/src/instance.ts

@@ -35,4 +35,5 @@ export interface PageInstance extends PageLifeCycle {
 
 export interface AppInstance extends Show {
   onLaunch?(options?: string): void
+  onPageNotFound?(options?: string): void
 }

package/src/page.ts

@@ -1,13 +1,21 @@
-import { getCurrentRoute, isTabPage, PageProvider } from '@tarojs/router-rn'
 import { Component, Context, createContext, createElement, createRef, forwardRef, RefObject } from 'react'
-import { AppState, Dimensions, EmitterSubscription, NativeEventSubscription, RefreshControl, ScrollView } from 'react-native'
+import { AppState, Dimensions, EmitterSubscription, RefreshControl, ScrollView } from 'react-native'
 
 import { isClassComponent } from './app'
 import { Current } from './current'
 import { eventCenter } from './emmiter'
 import EventChannel from './EventChannel'
 import { Instance, PageInstance } from './instance'
-import { BackgroundOption, BaseOption, CallbackResult, HooksMethods, PageConfig, ScrollOption, TextStyleOption } from './types/index'
+import { getCurrentRoute, isTabPage, PageProvider } from './router'
+import {
+  BackgroundOption,
+  BaseOption,
+  CallbackResult,
+  HooksMethods,
+  PageConfig,
+  ScrollOption,
+  TextStyleOption
+} from './types/index'
 import { EMPTY_OBJ, errorHandler, getPageStr, incrementId, isArray, isFunction, successHandler } from './utils'
 
 const compId = incrementId()
@@ -46,7 +54,7 @@ function safeExecute (path: string, lifecycle: keyof Instance, ...args: unknown[
   const func = getLifecyle(instance, lifecycle)
 
   if (isArray(func)) {
-    const res = func.map(fn => fn.apply(instance, args))
+    const res = func.map((fn) => fn.apply(instance, args))
     return res[0]
   }
   if (!isFunction(func)) {
@@ -64,9 +72,14 @@ export let PageContext: Context<string> = EMPTY_OBJ
 let appState = AppState.currentState
 
 AppState.addEventListener('change', (nextAppState) => {
-  const { page } = Current
+  const { page, app, router } = Current
   if (!page) return
   if (appState.match(/inactive|background/) && nextAppState === 'active') {
+    app?.onShow &&
+      app.onShow({
+        path: router?.path,
+        query: router?.params
+      })
     if (!page.__isReactComponent && page.__safeExecute) {
       page.__safeExecute('componentDidShow')
     } else if (page.onShow) {
@@ -79,6 +92,7 @@ AppState.addEventListener('change', (nextAppState) => {
     } else if (page.onHide) {
       page.onHide()
     }
+    app?.onHide && app.onHide()
   }
   appState = nextAppState
 })
@@ -121,20 +135,20 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       unSubscribleFocus: any
       unSubscribleTabPress: any
       pageId: string
-      appStateSubscription: NativeEventSubscription | undefined
       dimensionsSubscription: EmitterSubscription | undefined
       isPageReady: boolean
 
       constructor (props: any) {
         super(props)
         const refreshStyle = globalAny?.__taroRefreshStyle ?? {}
-        const backgroundTextStyle = pageConfig.backgroundTextStyle || globalAny.__taroAppConfig?.appConfig?.window?.backgroundTextStyle || 'dark'
+        const backgroundTextStyle =
+          pageConfig.backgroundTextStyle || globalAny.__taroAppConfig?.appConfig?.window?.backgroundTextStyle || 'dark'
         this.state = {
           refreshing: false, // 刷新指示器
-          appState: AppState.currentState,
           textColor: refreshStyle.textColor || (backgroundTextStyle === 'dark' ? '#000000' : '#ffffff'),
           backgroundColor: refreshStyle.backgroundColor || '#ffffff'
         }
+        appState = AppState.currentState
         this.screenRef = createRef<Instance>()
         this.pageScrollView = createRef()
         this.setPageInstance()
@@ -150,16 +164,15 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
           this.unSubscribleTabPress = navigation.addListener('tabPress', () => this.onTabItemTap())
           this.unSubscribleFocus = navigation.addListener('focus', () => this.onFocusChange())
           this.unSubscribleBlur = navigation.addListener('blur', () => this.onBlurChange())
+          // 如果是tabbar页面，因为tabbar是懒加载的，第一次点击事件还未监听，不会触发，初始化触发一下
+          const lazy = globalAny.__taroAppConfig?.appConfig?.rn?.tabOptions?.lazy ?? true
+          if (isTabPage() && lazy) {
+            this.onTabItemTap()
+          }
         }
         eventCenter.on('__taroPullDownRefresh', this.pullDownRefresh, this)
         eventCenter.on('__taroPageScrollTo', this.pageToScroll, this)
         eventCenter.on('__taroSetRefreshStyle', this.setRefreshStyle, this)
-        
-        // 如果是tabbar页面，因为tabbar是懒加载的，第一次点击事件还未监听，不会触发，初始化触发一下
-        const lazy = globalAny.__taroAppConfig?.appConfig?.rn?.tabOptions?.lazy ?? true
-        if(isTabPage() && lazy){
-          this.onTabItemTap()
-        }
       }
 
       componentWillUnmount () {
@@ -182,7 +195,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       setPageInstance () {
         const pageRef = this.screenRef
         const pageId = this.pageId
-        const { params = {}, key = '' } = this.props.route
+        const { params = {}, key = '' } = this.props.route ?? {}
         // 和小程序的page实例保持一致
         const inst: PageInstance = {
           config: pageConfig,
@@ -304,7 +317,7 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
         try {
           this.handleHooksEvent('componentDidShow')
           // 实现 useReady hook，遵循小程序事件机制，在useDidShow之后触发
-          if(!this.isPageReady){
+          if (!this.isPageReady) {
             this.handleHooksEvent('onReady')
             this.isPageReady = true
           }
@@ -317,20 +330,24 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
       onBlurChange () {
         try {
           this.handleHooksEvent('componentDidHide')
-          if (this.screenRef?.current?.componentDidHide) { this.screenRef?.current?.componentDidHide() }
+          if (this.screenRef?.current?.componentDidHide) {
+            this.screenRef?.current?.componentDidHide()
+          }
         } catch (err) {
           throw new Error(err)
         }
       }
 
       onPageScroll (e) {
-        if(!e?.nativeEvent) return
+        if (!e?.nativeEvent) return
         const { contentOffset } = e.nativeEvent
         const scrollTop = contentOffset.y
         if (scrollTop < 0) return
         try {
           this.handleHooksEvent('onPageScroll', { scrollTop })
-          if (this.screenRef?.current?.onPageScroll) { this.screenRef?.current?.onPageScroll({ scrollTop }) }
+          if (this.screenRef?.current?.onPageScroll) {
+            this.screenRef?.current?.onPageScroll({ scrollTop })
+          }
         } catch (err) {
           throw new Error(err)
         }
@@ -338,13 +355,15 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
 
       // 监听的onMomentumScrollEnd
       onReachBottom (e) {
-        if(!e?.nativeEvent) return
+        if (!e?.nativeEvent) return
         const { onReachBottomDistance = 50 } = pageConfig
         const { layoutMeasurement, contentSize, contentOffset } = e.nativeEvent
         if (contentOffset?.y + layoutMeasurement?.height + onReachBottomDistance >= contentSize.height) {
           try {
             this.handleHooksEvent('onReachBottom')
-            if (this.screenRef?.current?.onReachBottom) { this.screenRef?.current?.onReachBottom() }
+            if (this.screenRef?.current?.onReachBottom) {
+              this.screenRef?.current?.onReachBottom()
+            }
           } catch (err) {
             throw new Error(err)
           }
@@ -356,7 +375,9 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
         this.setState({ refreshing: true })
         try {
           this.handleHooksEvent('onPullDownRefresh')
-          if (this.screenRef?.current?.onPullDownRefresh) { this.screenRef?.current?.onPullDownRefresh() }
+          if (this.screenRef?.current?.onPullDownRefresh) {
+            this.screenRef?.current?.onPullDownRefresh()
+          }
         } catch (e) {
           throw new Error(e)
         } finally {
@@ -368,16 +389,16 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
         try {
           const item = this.getTabItem(pagePath)
           this.handleHooksEvent('onTabItemTap', { ...item })
-          if (this.screenRef?.current?.onTabItemTap) { this.screenRef?.current?.onTabItemTap(item) }
+          if (this.screenRef?.current?.onTabItemTap) {
+            this.screenRef?.current?.onTabItemTap(item)
+          }
         } catch (error) {
           throw new Error(error)
         }
       }
 
       handleHooksEvent (method: HooksMethods, options: Record<string, unknown> = {}) {
-        if (!isReactComponent) {
-          return safeExecute(this.pageId, method, options)
-        }
+        return safeExecute(this.pageId, method, options)
       }
 
       getTabItem (itemPath: string) {
@@ -406,46 +427,58 @@ export function createPageConfig (Page: any, pageConfig: PageConfig): any {
 
       refreshPullDown () {
         const { refreshing, textColor, backgroundColor } = this.state
-        return createElement(RefreshControl, {
-          refreshing: refreshing,
-          enabled: true,
-          titleColor: textColor,
-          tintColor: textColor,
-          colors: [backgroundColor],
-          onRefresh: () => this.onPullDownRefresh()
-        }, null)
+        return createElement(
+          RefreshControl,
+          {
+            refreshing: refreshing,
+            enabled: true,
+            titleColor: textColor,
+            tintColor: textColor,
+            colors: [backgroundColor],
+            onRefresh: () => this.onPullDownRefresh()
+          },
+          null
+        )
       }
 
       createPage () {
-        return h(PageProvider, { currentPath: pagePath, pageConfig, ...this.props },
-          h(PageContext.Provider, { value: this.pageId }, h(Screen,
-            { ...this.props, ref: this.screenRef })
+        if (PageProvider) {
+          return h(
+            PageProvider,
+            { currentPath: pagePath, pageConfig, ...this.props },
+            h(PageContext.Provider, { value: this.pageId }, h(Screen, { ...this.props, ref: this.screenRef }))
           )
-        )
+        }
+        return h(PageContext.Provider, { value: this.pageId }, h(Screen, { ...this.props, ref: this.screenRef }))
       }
 
       createScrollPage () {
         let bgColor = pageConfig.backgroundColor ? pageConfig.backgroundColor : ''
         const windowOptions = globalAny.__taroAppConfig?.appConfig?.window || {}
-        const useNativeStack =  globalAny.__taroAppConfig?.appConfig?.rn?.useNativeStack
+        const useNativeStack = globalAny.__taroAppConfig?.appConfig?.rn?.useNativeStack
         if (!bgColor && windowOptions?.backgroundColor) {
           bgColor = windowOptions?.backgroundColor
         }
         const refresh = this.isEnablePullDown() ? { refreshControl: this.refreshPullDown() } : {}
-        return h(ScrollView, {
-          style: [{ flex: 1 }, (bgColor ? { backgroundColor: bgColor } : {})],
-          contentContainerStyle: useNativeStack ? {} : { minHeight: '100%' },
-          ref: this.pageScrollView,
-          scrollEventThrottle: 8,
-          ...refresh,
-          onScroll: (e) => this.onPageScroll(e),
-          onMomentumScrollEnd: (e) => this.onReachBottom(e)
-        }, this.createPage())
+        return h(
+          ScrollView,
+          {
+            style: [{ flex: 1 }, bgColor ? { backgroundColor: bgColor } : {}],
+            contentContainerStyle: useNativeStack ? {} : { minHeight: '100%' },
+            ref: this.pageScrollView,
+            scrollEventThrottle: 8,
+            ...refresh,
+            onScroll: (e) => this.onPageScroll(e),
+            onMomentumScrollEnd: (e) => this.onReachBottom(e),
+            nestedScrollEnabled: true
+          },
+          this.createPage()
+        )
       }
 
       render () {
         const { disableScroll = false } = pageConfig
-        return (!disableScroll ? this.createScrollPage() : this.createPage())
+        return !disableScroll ? this.createScrollPage() : this.createPage()
       }
     }
   }
@@ -546,11 +579,12 @@ export function getCurrentPages () {
   const pages: PageInstance[] = []
   const routes = getCurrentRoute()
   if (routes && routes.length > 0) {
-    routes.forEach(item => {
+    routes.forEach((item) => {
       const inst = getPageObject(item)
       inst && pages.push(inst)
     })
-  } else { // 第一次初始化时，getCurrentRoute会为空
+  } else {
+    // 第一次初始化时，getCurrentRoute会为空
     const inst = Current.page
     inst && pages.push(inst)
   }

package/src/router.ts

@@ -0,0 +1,51 @@
+/**
+ * router-rn 接口都改为require 引入， 单页不引用的router
+ * 
+ */
+let routerObj: any = {}
+try {
+  routerObj = require('@tarojs/router-rn')
+  // eslint-disable-next-line
+} catch (e) {}
+
+function getApi (key){
+  if (!routerObj?.[key]) {
+    return () => {
+      console.error(`Single page can not support ${key}, if you have multiple pages configured, you can try restart and reset cache`)
+    }
+  }
+  return routerObj?.[key]
+}
+
+export const rnNavigationRef = routerObj?.navigationRef ?? null
+export const PageProvider = routerObj?.PageProvider ?? null
+
+export const getRouteEventChannel = getApi('getRouteEventChannel')
+export const getCurrentRoute = getApi('getCurrentRoute')
+export const isTabPage = getApi('isTabPage')
+
+export const createRouter = getApi('createRouter')
+export const getInitOptions = getApi('getInitOptions')
+
+export const hideNavigationBarLoading = getApi('hideNavigationBarLoading')
+export const hideTabBar = getApi('hideTabBar')
+export const hideTabBarRedDot = getApi('hideTabBarRedDot')
+export const navigateBack = getApi('navigateBack')
+export const navigateTo = getApi('navigateTo')
+export const redirectTo = getApi('redirectTo') 
+export const reLaunch = getApi('reLaunch')
+export const switchTab = getApi('switchTab')
+export const removeTabBarBadge = getApi('removeTabBarBadge') 
+export const setNavigationBarColor = getApi('setNavigationBarColor')
+export const setNavigationBarTitle = getApi('setNavigationBarTitle')
+export const setTabBarBadge = getApi('setTabBarBadge')
+export const setTabBarItem = getApi('setTabBarItem')
+export const setTabBarStyle = getApi('setTabBarStyle')
+export const showNavigationBarLoading = getApi('showNavigationBarLoading')
+export const showTabBar = getApi('showTabBar')
+export const showTabBarRedDot = getApi('showTabBarRedDot')
+
+
+
+
+

package/src/types/index.d.ts

@@ -159,7 +159,7 @@ export interface AppConfig {
   tabBar?: TabBar
   subPackages?: SubPackage[]
   subpackages?: SubPackage[]
-  designWidth: number | ((size: number) => number)
+  designWidth: number | ((size?: string | number) => number)
   deviceRatio: Record<string, number>
   linkPrefix: string[]
   rn?: any

package/src/utils.ts

@@ -41,6 +41,8 @@ export function isFunction (o: unknown): o is (...args: any[]) => any {
 
 export const EMPTY_OBJ: any = {}
 
+export const HOOKS_APP_ID = 'taro-app'
+
 export const isArray = Array.isArray
 
 export function successHandler (success: OptionsFunc | undefined, complete: OptionsFunc | undefined): any {
@@ -60,5 +62,5 @@ export function errorHandler (fail: OptionsFunc | undefined, complete: OptionsFu
 }
 
 export function getPageStr (path: string):string{
-  return path.replace(/\//g,'')
+  return path.replace(/\//g, '')
 }