@dcloudio/uni-app-x 0.7.26 → 0.7.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-app-x",
-  "version": "0.7.26",
+  "version": "0.7.28",
   "description": "uni-app x types",
   "typings": "index.d.ts",
   "author": "DCloud",

package/types/app.d.ts

@@ -720,7 +720,7 @@ type EditorCreateVueAppComponentX<D extends OptionsData = OptionsData, C extends
 type AppInstance<T extends EditorCreateVueAppComponentX> = ReturnType<T['create']>['$']
 
 declare global {
-  export interface AppCreateVueAppComponentDefault { }
+  export interface AppCreateVueAppComponentDefault {}
   /**
    * `getApp()` 函数用于获取当前应用实例，可通过应用实例调用 App.uvue methods 中定义的方法。
    * @tutorial https://uniapp.dcloud.net.cn/tutorial/page.html#getapp
@@ -1000,3 +1000,13 @@ declare module '@vue/runtime-core' {
   }
   export function defineApp<D extends OptionsData = OptionsData, C extends ComputedOptions = ComputedOptions, M extends MethodOptions = MethodOptions, I extends ComponentInjectOptions = {}, II extends string = string, G extends GlobalData = GlobalData>(options: DefineAppX<D, C, M, I, II, G>): EditorCreateVueAppComponentX<D, C, M, I, II, G>
 }
+
+export interface UniApp {
+  $vm: EditorCreateVueAppComponentX,
+  vm: EditorCreateVueAppComponentX,
+  globalData: GlobalData,
+  on(eventName: string, callback: Function): void
+  once(eventName: string, callback: Function): void
+  off(eventName: string, callback?: Function | null): void
+  emit(eventName: string, args: any | null): void
+}

package/types/page.d.ts

@@ -1604,193 +1604,19 @@ interface Page {
 
 type PageOrigin = Page
 
-interface UniDialogPage {
-  /**
-   * 页面的路由地址
-   * @uniPlatform {
-   *  "app": {
-   *    "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    },
-   *    "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    }
-   *  },
-   *  "web": {
-   *    "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
+export interface UniDialogPage {
+  $component: any | null
+  $disableEscBack: boolean
+  $vm: ComponentPublicInstance | null
   route: string
-  /**
-   * 获取 parentPage 实例
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   *  "app": {
-   *    "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    },
-   *    "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    }
-   *  },
-   *  "web": {
-   *    "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-  $getParentPage(): IPage | null;
-  /**
-   * 按键盘 esc 时是否关闭
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   *  "app": {
-   *    "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    },
-   *    "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    }
-   *  },
-   *  "web": {
-   *    "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-  $disableEscBack(): boolean;
-  /**
-   * DialogPage 对应的 Page 实例
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   *  "app": {
-   *    "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    },
-   *    "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *    }
-   *  },
-   *  "web": {
-   *    "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-  $vm: Page;
-  /**
-   * 监听自定义事件。事件可以由 uni.$emit 触发。回调函数会接收 uni.$emit 传递的参数。
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   * "app": {
-   *   "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   },
-   *   "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   }
-   *  },
-   *  "web": {
-   *     "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-  $on(eventName: string, callback: Function): void
-  /**
-   * 移除自定义事件监听器。如果提供了事件名和回调，则只移除这个回调的监听器。
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   * "app": {
-   *   "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   },
-   *   "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   }
-   *  },
-   *  "web": {
-   *     "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-  $off(eventName: string, callback?: Function | null): void
-  /**
-   * 监听一个自定义事件。事件只触发一次，在第一次触发之后移除事件监听器。
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   * "app": {
-   *   "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   },
-   *   "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   }
-   *  },
-   *  "web": {
-   *     "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-  $once(eventName: string, callback: Function): void
-  /**
-   * 触发自定义事件，附加的参数会传递给事件监听器。
-   * @tutorial https://doc.dcloud.net.cn/uni-app-x/api/get-current-pages.html#getPageStyle
-   * @uniPlatform {
-   * "app": {
-   *   "android": {
-   *      "osVer": "5.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   },
-   *   "ios": {
-   *      "osVer": "12.0",
-   *      "uniVer": "x",
-   *      "unixVer": "4.27"
-   *   }
-   *  },
-   *  "web": {
-   *     "uniVer": "x",
-   *    "unixVer": "4.27"
-   *  }
-   * }
-   */
-
-  $emit(eventName: string, args: any | null): void
+  options: Map<string, string | null>
+  getParentPage: () => ComponentPublicInstance | null
+  vm: ComponentPublicInstance | null
+  on(eventName: string, callback: Function): void
+  once(eventName: string, callback: Function): void
+  off(eventName: string, callback?: Function | null): void
+  emit(eventName: string, args: any | null): void
 }
-
 type UniDialogPageOrigin = UniDialogPage
 
 declare global {

package/types/uni/uts-plugin-api/global.d.ts

@@ -11,9 +11,9 @@
 /// <reference path='./lib/uni-prompt/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-payment-wxpay/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-payment-alipay/utssdk/global.d.ts' />
+/// <reference path='./lib/uni-payment/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-pageScrollTo/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-openDocument/utssdk/global.d.ts' />
-/// <reference path='./lib/uni-payment/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-openAppAuthorizeSetting/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-oauth-huawei/utssdk/global.d.ts' />
 /// <reference path='./lib/uni-oauth/utssdk/global.d.ts' />

package/types/uni/uts-plugin-api/index.d.ts

@@ -11,9 +11,9 @@ export * from './lib/uni-pullDownRefresh/utssdk'
 export * from './lib/uni-prompt/utssdk'
 export * from './lib/uni-payment-wxpay/utssdk'
 export * from './lib/uni-payment-alipay/utssdk'
+export * from './lib/uni-payment/utssdk'
 export * from './lib/uni-pageScrollTo/utssdk'
 export * from './lib/uni-openDocument/utssdk'
-export * from './lib/uni-payment/utssdk'
 export * from './lib/uni-openAppAuthorizeSetting/utssdk'
 export * from './lib/uni-oauth-huawei/utssdk'
 export * from './lib/uni-oauth/utssdk'

package/types/uni/uts-plugin-api/lib/uni-dialogPage/utssdk/interface.d.ts

@@ -1,6 +1,5 @@
 import {
   Page,
-  UniDialogPage,
 } from '@dcloudio/uni-runtime'
 
 /**

package/types/uni/uts-plugin-api/lib/uni-event/utssdk/global.d.ts

@@ -4,7 +4,6 @@ import {
   $Once as $OnceOrigin,
   $Off as $OffOrigin,
   $Emit as $EmitOrigin,
-  IEventBus as IEventBusOrigin,
   Uni as UniOrigin
 } from './interface'
 
@@ -13,6 +12,5 @@ declare global {
   type $Once = $OnceOrigin
   type $Off = $OffOrigin
   type $Emit = $EmitOrigin
-  type IEventBus = IEventBusOrigin
   interface Uni extends UniOrigin { }
 }

package/types/uni/uts-plugin-api/lib/uni-event/utssdk/index.d.ts

@@ -4,5 +4,4 @@ export {
   $Once,
   $Off,
   $Emit,
-  IEventBus,
 } from './interface'

package/types/uni/uts-plugin-api/lib/uni-event/utssdk/interface.d.ts

@@ -9,13 +9,6 @@ export type $Off = (eventName: string, callback?: $OffCallback | null) => void
 
 export type $Emit = (eventName: string, args: any | null) => void
 
-export interface IEventBus {
-    on: $On
-    once: $Once
-    off: $Off
-    emit: $Emit
-}
-
 export interface Uni {
     /**
      * 监听自定义事件。事件可以由 uni.$emit 触发。回调函数会接收 uni.$emit 传递的参数。

package/types/uni/uts-plugin-api/lib/uni-getSystemInfo/utssdk/global.d.ts

@@ -5,6 +5,7 @@ import {
   GetWindowInfo as GetWindowInfoOrigin,
   SafeArea as SafeAreaOrigin,
   SafeAreaInsets as SafeAreaInsetsOrigin,
+  CutoutRect as CutoutRectOrigin,
   GetSystemInfoResult as GetSystemInfoResultOrigin,
   GetSystemInfoSuccessCallback as GetSystemInfoSuccessCallbackOrigin,
   GetSystemInfoComplete as GetSystemInfoCompleteOrigin,
@@ -20,6 +21,7 @@ declare global {
   type GetWindowInfo = GetWindowInfoOrigin
   type SafeArea = SafeAreaOrigin
   type SafeAreaInsets = SafeAreaInsetsOrigin
+  type CutoutRect = CutoutRectOrigin
   type GetSystemInfoResult = GetSystemInfoResultOrigin
   type GetSystemInfoSuccessCallback = GetSystemInfoSuccessCallbackOrigin
   type GetSystemInfoComplete = GetSystemInfoCompleteOrigin

package/types/uni/uts-plugin-api/lib/uni-getSystemInfo/utssdk/index.d.ts

@@ -5,6 +5,7 @@ export {
   GetWindowInfo,
   SafeArea,
   SafeAreaInsets,
+  CutoutRect,
   GetSystemInfoResult,
   GetSystemInfoSuccessCallback,
   GetSystemInfoComplete,

package/types/uni/uts-plugin-api/lib/uni-getSystemInfo/utssdk/interface.d.ts

@@ -414,6 +414,124 @@ export type SafeAreaInsets = {
    */
   bottom: number
 };
+export type CutoutRect = {
+  /**
+   * 挖孔、刘海区域左上角横坐标，单位为px
+   *
+   * @uniPlatform
+   * {
+   * 	"app": {
+   * 		"android": {
+   * 			"osVer": "9.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "4.28"
+   * 		},
+   * 		"ios": {
+   * 			"osVer": "12.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		},
+   * 		"harmony": {
+   * 			"osVer": "3.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		}
+   * 	},
+   * 	"web": {
+   * 		"uniVer": "x",
+   * 		"unixVer": "x"
+   * 	}
+   * }
+   */
+  left: number,
+  /**
+   * 挖孔、刘海区域右下角横坐标，单位为px
+   *
+   * @uniPlatform
+   * {
+   * 	"app": {
+   * 		"android": {
+   * 			"osVer": "9.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "4.28"
+   * 		},
+   * 		"ios": {
+   * 			"osVer": "12.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		},
+   * 		"harmony": {
+   * 			"osVer": "3.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		}
+   * 	},
+   * 	"web": {
+   * 		"uniVer": "x",
+   * 		"unixVer": "x"
+   * 	}
+   * }
+   */
+  right: number,
+  /**
+   * 挖孔、刘海区域左上角纵坐标，单位为px
+   *
+   * @uniPlatform
+   * {
+   * 	"app": {
+   * 		"android": {
+   * 			"osVer": "9.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "4.28"
+   * 		},
+   * 		"ios": {
+   * 			"osVer": "12.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		},
+   * 		"harmony": {
+   * 			"osVer": "3.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		}
+   * 	},
+   * 	"web": {
+   * 		"uniVer": "x",
+   * 		"unixVer": "x"
+   * 	}
+   * }
+   */
+  top: number,
+  /**
+   * 挖孔、刘海区域右下角纵坐标，单位为px
+   *
+   * @uniPlatform
+   * {
+   * 	"app": {
+   * 		"android": {
+   * 			"osVer": "9.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "4.28"
+   * 		},
+   * 		"ios": {
+   * 			"osVer": "12.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		},
+   * 		"harmony": {
+   * 			"osVer": "3.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		}
+   * 	},
+   * 	"web": {
+   * 		"uniVer": "x",
+   * 		"unixVer": "x"
+   * 	}
+   * }
+   */
+  bottom: number
+};
 export type GetSystemInfoResult = {
   /**
    * 客户端基础库版本
@@ -2135,5 +2253,34 @@ export type GetWindowInfoResult = {
    *   }
    * }
    */
-  screenTop: number
+  screenTop: number,
+  /**
+   * 挖孔、刘海区域在屏幕中的位置信息
+   *
+   * @uniPlatform
+   * {
+   * 	"app": {
+   * 		"android": {
+   * 			"osVer": "9.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "4.28"
+   * 		},
+   * 		"ios": {
+   * 			"osVer": "12.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		},
+   * 		"harmony": {
+   * 			"osVer": "3.0",
+   * 			"uniVer": "x",
+   * 			"unixVer": "x"
+   * 		}
+   * 	},
+   * 	"web": {
+   * 		"uniVer": "x",
+   * 		"unixVer": "x"
+   * 	}
+   * }
+   */
+  cutoutArea: Array<CutoutRect>
 };