From c90e4f983aa4b92d5072f50fca58611fdde1b800 Mon Sep 17 00:00:00 2001
From: chuanstudy <xule37@h-partners.com>
Date: Tue, 2 Sep 2025 12:33:30 +0000
Subject: [PATCH 1/3] update api/@ohos.window.d.ts.

Signed-off-by: chuanstudy <xule37@h-partners.com>
---
 api/@ohos.window.d.ts | 51 ++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 17 deletions(-)

diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts
index 81b0989bd9..603d1c189a 100644
--- a/api/@ohos.window.d.ts
+++ b/api/@ohos.window.d.ts
@@ -8171,7 +8171,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setTopmost(isTopmost: boolean): Promise<void>;
 
@@ -8190,7 +8191,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setWindowTopmost(isWindowTopmost: boolean): Promise<void>;
 
@@ -8391,7 +8393,8 @@ declare namespace window {
      * @throws { BusinessError } 1300003 - This window manager service works abnormally.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi
-     * @since 13
+     * @since arkts {'1.1':'13', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     requestFocus(isFocused: boolean): Promise<void>;
 
@@ -8411,7 +8414,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 15
+     * @since arkts {'1.1':'15', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setExclusivelyHighlighted(exclusivelyHighlighted: boolean): Promise<void>;
 
@@ -8423,7 +8427,8 @@ declare namespace window {
      * @throws { BusinessError } 1300002 - This window state is abnormal.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     isWindowHighlighted(): boolean;
 
@@ -9279,7 +9284,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseToAppTop(callback: AsyncCallback<void>): void;
 
@@ -9292,7 +9298,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseToAppTop(): Promise<void>;
 
@@ -9474,7 +9481,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseAboveTarget(windowId: int, callback: AsyncCallback<void>): void;
 
@@ -9492,7 +9500,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseAboveTarget(windowId: int): Promise<void>;
 
@@ -9511,7 +9520,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setRaiseByClickEnabled(enable: boolean, callback: AsyncCallback<void>): void;
 
@@ -9528,7 +9538,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setRaiseByClickEnabled(enable: boolean): Promise<void>;
 
@@ -9953,7 +9964,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setSubWindowModal(isModal: boolean): Promise<void>;
 
@@ -9988,7 +10000,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setSubWindowModal(isModal: boolean, modalityType: ModalityType): Promise<void>;
 
@@ -10650,7 +10663,8 @@ declare namespace window {
      * @throws { BusinessError } 1300002 - This window state is abnormal.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @atomicservice
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     isFocused(): boolean;
 
@@ -10797,7 +10811,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setSubWindowZLevel(zLevel: int): Promise<void>;
 
@@ -10810,7 +10825,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     getSubWindowZLevel(): int;
 
@@ -12012,7 +12028,8 @@ declare namespace window {
      * @syscap SystemCapability.Window.SessionManager
      * @StageModelOnly
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setWindowModal(isModal: boolean): Promise<void>;
 
-- 
Gitee


From ef4b25e82f5cb764ca10167ab105c92c32f4f69a Mon Sep 17 00:00:00 2001
From: chuanstudy <xule37@h-partners.com>
Date: Thu, 4 Sep 2025 08:30:08 +0000
Subject: [PATCH 2/3] update api/@ohos.window.d.ts.

Signed-off-by: chuanstudy <xule37@h-partners.com>
---
 api/@ohos.window.d.ts | 216 ++++++++++++++++++++----------------------
 1 file changed, 103 insertions(+), 113 deletions(-)

diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts
index 603d1c189a..e6ef11b7ce 100644
--- a/api/@ohos.window.d.ts
+++ b/api/@ohos.window.d.ts
@@ -120,7 +120,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum WindowType {
+  export enum WindowType {
     /**
      * App.
      *
@@ -436,7 +436,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum AvoidAreaType {
+  export enum AvoidAreaType {
     /**
      * Default area of the system
      *
@@ -560,7 +560,7 @@ declare namespace window {
    * @since arkts {'1.1':'7', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum WindowMode {
+  export enum WindowMode {
     /**
      * Undefined mode of the window
      *
@@ -612,7 +612,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 9
    */
-  enum WindowLayoutMode {
+  export enum WindowLayoutMode {
     /**
      * CASCADE
      *
@@ -656,7 +656,7 @@ declare namespace window {
    * @since arkts {'1.1':'20', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum WindowStatusType {
+  export enum WindowStatusType {
     /**
      * Undefined status of the window
      *
@@ -814,7 +814,7 @@ declare namespace window {
    * @since arkts {'1.1':'20', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface SystemBarProperties {
+  export interface SystemBarProperties {
     /**
      * The color of the status bar.
      *
@@ -1015,7 +1015,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface SystemBarStyle {
+  export interface SystemBarStyle {
     /**
      * The content color of the status bar
      *
@@ -1037,7 +1037,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface SystemBarRegionTint {
+  export interface SystemBarRegionTint {
     /**
      * System bar type
      *
@@ -1103,7 +1103,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface SystemBarTintState {
+  export interface SystemBarTintState {
     /**
      * Id of display
      *
@@ -1151,7 +1151,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface Rect {
+  export interface Rect {
 
     /**
      * The left of the Rect.
@@ -1390,7 +1390,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface AvoidArea {
+  export interface AvoidArea {
     /**
      * Whether avoidArea is visible on screen
      *
@@ -1543,7 +1543,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface Size {
+  export interface Size {
     /**
      * The width of the window.
      *
@@ -1613,7 +1613,7 @@ declare namespace window {
    * @syscap SystemCapability.Window.SessionManager
    * @since 18
    */
-  interface WindowInfo {
+  export interface WindowInfo {
     /**
      * The position and size of the window
      *
@@ -1744,7 +1744,7 @@ declare namespace window {
    * @since arkts {'1.1':'15', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface WindowDensityInfo {
+  export interface WindowDensityInfo {
     /**
      * System density
      *
@@ -1804,7 +1804,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface WindowProperties {
+  export interface WindowProperties {
     /**
      * The position and size of the window
      *
@@ -2198,7 +2198,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum ColorSpace {
+  export enum ColorSpace {
     /**
      * Default color space.
      *
@@ -2255,7 +2255,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface ScaleOptions {
+  export interface ScaleOptions {
     /**
      * The scale param of x direction. Default is 1.f
      *
@@ -2310,7 +2310,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface RotateOptions {
+  export interface RotateOptions {
     /**
      * The rotate degree of x direction. Default value is 0.f
      *
@@ -2376,7 +2376,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface TranslateOptions {
+  export interface TranslateOptions {
     /**
      * The translate pixel param of x direction. Default is 0.f
      *
@@ -2420,7 +2420,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface TransitionContext {
+  export interface TransitionContext {
     /**
      * The target window with animation
      *
@@ -2466,7 +2466,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface TransitionController {
+  export interface TransitionController {
     /**
      * Animation configuration when showing window
      *
@@ -2680,7 +2680,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface WindowLimits {
+  export interface WindowLimits {
     
     /**
      * The maximum width of the window.
@@ -2771,7 +2771,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface TitleButtonRect {
+  export interface TitleButtonRect {
 
     /**
      * The right of the Rect.
@@ -2852,7 +2852,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface RectChangeOptions {
+  export interface RectChangeOptions {
     /**
      * Rect
      *
@@ -2894,7 +2894,7 @@ declare namespace window {
    * @since arkts {'1.1':'20', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface AvoidAreaOptions {
+  export interface AvoidAreaOptions {
     /**
      * Avoid area type
      *
@@ -2945,7 +2945,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum RectChangeReason {
+  export enum RectChangeReason {
     /**
      * Default RectChangeReason.
      *
@@ -3147,7 +3147,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  function create(id: string, type: WindowType, callback: AsyncCallback<Window>): void;
+  export function create(id: string, type: WindowType, callback: AsyncCallback<Window>): void;
 
   /**
    * Create a sub window with a specific id and type, only support 7.
@@ -3161,7 +3161,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  function create(id: string, type: WindowType): Promise<Window>;
+  export function create(id: string, type: WindowType): Promise<Window>;
 
   /**
    * Create a system or float window with a specific id and type.
@@ -3175,7 +3175,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  function create(ctx: BaseContext, id: string, type: WindowType): Promise<Window>;
+  export function create(ctx: BaseContext, id: string, type: WindowType): Promise<Window>;
 
   /**
    * Create a system or float window with a specific id and type.
@@ -3189,7 +3189,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  function create(ctx: BaseContext, id: string, type: WindowType, callback: AsyncCallback<Window>): void;
+  export function create(ctx: BaseContext, id: string, type: WindowType, callback: AsyncCallback<Window>): void;
 
   /**
    * Find the window by id.
@@ -3201,7 +3201,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#findWindow
    */
-  function find(id: string, callback: AsyncCallback<Window>): void;
+  export function find(id: string, callback: AsyncCallback<Window>): void;
 
   /**
    * Find the window by id.
@@ -3213,7 +3213,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#findWindow
    */
-  function find(id: string): Promise<Window>;
+  export function find(id: string): Promise<Window>;
 
   /**
    * Find the window by name.
@@ -3252,7 +3252,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function findWindow(name: string): Window;
+  export function findWindow(name: string): Window;
 
   /**
    * Get the final show window.
@@ -3264,7 +3264,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  function getTopWindow(callback: AsyncCallback<Window>): void;
+  export function getTopWindow(callback: AsyncCallback<Window>): void;
 
   /**
    * Get the final show window.
@@ -3276,7 +3276,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  function getTopWindow(): Promise<Window>;
+  export function getTopWindow(): Promise<Window>;
 
   /**
    * Get the final show window.
@@ -3288,7 +3288,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  function getTopWindow(ctx: BaseContext): Promise<Window>;
+  export function getTopWindow(ctx: BaseContext): Promise<Window>;
 
   /**
    * Get the final show window.
@@ -3300,7 +3300,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  function getTopWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
+  export function getTopWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
 
   /**
    * Get the final show window.
@@ -3343,7 +3343,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function getLastWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
+  export function getLastWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
 
   /**
    * Get the final show window.
@@ -3386,7 +3386,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function getLastWindow(ctx: BaseContext): Promise<Window>;
+  export function getLastWindow(ctx: BaseContext): Promise<Window>;
 
   /**
    * Minimize all app windows.
@@ -3470,7 +3470,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  function toggleShownStateForAllAppWindows(callback: AsyncCallback<void>): void;
+  export function toggleShownStateForAllAppWindows(callback: AsyncCallback<void>): void;
 
   /**
    * Toggle shown state for all app windows. Minimize or restore all app windows.
@@ -3492,7 +3492,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  function toggleShownStateForAllAppWindows(): Promise<void>;
+  export function toggleShownStateForAllAppWindows(): Promise<void>;
 
   /**
    * Set the layout mode of a window.
@@ -3521,7 +3521,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  function setWindowLayoutMode(mode: WindowLayoutMode, callback: AsyncCallback<void>): void;
+  export function setWindowLayoutMode(mode: WindowLayoutMode, callback: AsyncCallback<void>): void;
 
   /**
    * Set the layout mode of a window.
@@ -3550,7 +3550,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  function setWindowLayoutMode(mode: WindowLayoutMode): Promise<void>;
+  export function setWindowLayoutMode(mode: WindowLayoutMode): Promise<void>;
 
   /**
    * Sets whether to enable gesture navigation.
@@ -3566,7 +3566,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  function setGestureNavigationEnabled(enable: boolean, callback: AsyncCallback<void>): void;
+  export function setGestureNavigationEnabled(enable: boolean, callback: AsyncCallback<void>): void;
 
   /**
    * Sets whether to enable gesture navigation.
@@ -3582,7 +3582,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  function setGestureNavigationEnabled(enable: boolean): Promise<void>;
+  export function setGestureNavigationEnabled(enable: boolean): Promise<void>;
 
   /**
    * Set watermark image.
@@ -3598,7 +3598,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean): Promise<void>;
+  export function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean): Promise<void>;
 
   /**
    * Set watermark image.
@@ -3614,7 +3614,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean, callback: AsyncCallback<void>): void;
+  export function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean, callback: AsyncCallback<void>): void;
 
   /**
    * Shift window focus within the same application. And the window type contains only main window and subwindow.
@@ -3709,7 +3709,7 @@ declare namespace window {
    * @syscap SystemCapability.Window.SessionManager
    * @since 18
    */
-  function getVisibleWindowInfo(): Promise<Array<WindowInfo>>;
+  export function getVisibleWindowInfo(): Promise<Array<WindowInfo>>;
 
   /**
    * gets snapshot of window
@@ -3743,7 +3743,7 @@ declare namespace window {
    * @atomicservice
    * @since 14
    */
-  function getWindowsByCoordinate(displayId: number, windowNumber?: number, x?: number, y?: number):
+  export function getWindowsByCoordinate(displayId: number, windowNumber?: number, x?: number, y?: number):
       Promise<Array<Window>>;
 
   /**
@@ -3821,7 +3821,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function on(type: 'systemBarTintChange', callback: Callback<SystemBarTintState>): void;
+  export function on(type: 'systemBarTintChange', callback: Callback<SystemBarTintState>): void;
 
   /**
    * Unregister the callback of systemBarTintChange
@@ -3836,7 +3836,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function off(type: 'systemBarTintChange', callback?: Callback<SystemBarTintState>): void;
+  export function off(type: 'systemBarTintChange', callback?: Callback<SystemBarTintState>): void;
 
   /**
    * Register the callback for gesture navigation enabled changes.
@@ -3854,7 +3854,7 @@ declare namespace window {
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function on(type: 'gestureNavigationEnabledChange', callback: Callback<boolean>): void;
+  export function on(type: 'gestureNavigationEnabledChange', callback: Callback<boolean>): void;
 
   /**
    * Unregister the callback for gesture navigation enabled changes.
@@ -3871,7 +3871,7 @@ declare namespace window {
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function off(type: 'gestureNavigationEnabledChange', callback?: Callback<boolean>): void;
+  export function off(type: 'gestureNavigationEnabledChange', callback?: Callback<boolean>): void;
 
   /**
    * Register the callback for watermark flag change.
@@ -3881,14 +3881,13 @@ declare namespace window {
    * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API.
    * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified.
    * <br>2. Incorrect parameter types. 3.Parameter verification failed.
-   * @throws { BusinessError } 1300002 - This window state is abnormal.
    * @throws { BusinessError } 1300003 - This window manager service works abnormally.
    * @syscap SystemCapability.WindowManager.WindowManager.Core
    * @systemapi Hide this for inner system use.
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function on(type: 'waterMarkFlagChange', callback: Callback<boolean>): void;
+  export function on(type: 'waterMarkFlagChange', callback: Callback<boolean>): void;
 
   /**
    * Unregister the callback for watermark flag change.
@@ -3898,14 +3897,13 @@ declare namespace window {
    * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API.
    * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Incorrect parameter types; 
    * <br>2. Parameter verification failed.
-   * @throws { BusinessError } 1300002 - This window state is abnormal.
    * @throws { BusinessError } 1300003 - This window manager service works abnormally.
    * @syscap SystemCapability.WindowManager.WindowManager.Core
    * @systemapi Hide this for inner system use.
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  function off(type: 'waterMarkFlagChange', callback?: Callback<boolean>): void;
+  export function off(type: 'waterMarkFlagChange', callback?: Callback<boolean>): void;
 
   /**
    * Sets starting window background color
@@ -3962,7 +3960,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum Orientation {
+  export enum Orientation {
     /**
      * Default value. The direction mode is not clearly defined. It is determined by the system.
      *
@@ -4265,7 +4263,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum BlurStyle {
+  export enum BlurStyle {
     /**
      * Close blur.
      *
@@ -4321,7 +4319,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum WindowEventType {
+  export enum WindowEventType {
     /**
      * The value of window event is window show
      *
@@ -4406,7 +4404,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum MaximizePresentation {
+  export enum MaximizePresentation {
     /**
      * The value means follow immersive state which set by app
      *
@@ -4453,7 +4451,7 @@ declare namespace window {
    * @since arkts {'1.1':'15', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface MoveConfiguration {
+  export interface MoveConfiguration {
     /**
      * The display id of the screen
      *
@@ -4797,7 +4795,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface Window {
+  export interface Window {
     /**
      * Hide window.
      *
@@ -8171,8 +8169,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi
-     * @since arkts {'1.1':'12', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 12
      */
     setTopmost(isTopmost: boolean): Promise<void>;
 
@@ -8191,8 +8188,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'14', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 14
      */
     setWindowTopmost(isWindowTopmost: boolean): Promise<void>;
 
@@ -8393,8 +8389,7 @@ declare namespace window {
      * @throws { BusinessError } 1300003 - This window manager service works abnormally.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi
-     * @since arkts {'1.1':'13', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 13
      */
     requestFocus(isFocused: boolean): Promise<void>;
 
@@ -8414,8 +8409,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'15', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 15
      */
     setExclusivelyHighlighted(exclusivelyHighlighted: boolean): Promise<void>;
 
@@ -8427,8 +8421,7 @@ declare namespace window {
      * @throws { BusinessError } 1300002 - This window state is abnormal.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'18', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 18
      */
     isWindowHighlighted(): boolean;
 
@@ -9284,8 +9277,7 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @systemapi Hide this for inner system use.
-     * @since arkts {'1.1':'10', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 10
      */
     raiseToAppTop(callback: AsyncCallback<void>): void;
 
@@ -9298,8 +9290,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
-     * @since arkts {'1.1':'14', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 14
      */
     raiseToAppTop(): Promise<void>;
 
@@ -9481,8 +9472,7 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since arkts {'1.1':'10', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 10
      */
     raiseAboveTarget(windowId: int, callback: AsyncCallback<void>): void;
 
@@ -9500,8 +9490,7 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since arkts {'1.1':'10', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 10
      */
     raiseAboveTarget(windowId: int): Promise<void>;
 
@@ -9520,8 +9509,7 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since arkts {'1.1':'10', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 10
      */
     setRaiseByClickEnabled(enable: boolean, callback: AsyncCallback<void>): void;
 
@@ -9538,8 +9526,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
-     * @since arkts {'1.1':'14', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 14
      */
     setRaiseByClickEnabled(enable: boolean): Promise<void>;
 
@@ -9964,8 +9951,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'20', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 20
      */
     setSubWindowModal(isModal: boolean): Promise<void>;
 
@@ -10000,8 +9986,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'20', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 20
      */
     setSubWindowModal(isModal: boolean, modalityType: ModalityType): Promise<void>;
 
@@ -10663,8 +10648,7 @@ declare namespace window {
      * @throws { BusinessError } 1300002 - This window state is abnormal.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @atomicservice
-     * @since arkts {'1.1':'12', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 12
      */
     isFocused(): boolean;
 
@@ -10811,8 +10795,7 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'18', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 18
      */
     setSubWindowZLevel(zLevel: int): Promise<void>;
 
@@ -10825,8 +10808,7 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'18', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 18
      */
     getSubWindowZLevel(): int;
 
@@ -10874,7 +10856,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum WindowStageEventType {
+  export enum WindowStageEventType {
     /**
      * The window stage is running in the foreground.
      *
@@ -11055,7 +11037,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum ModalityType {
+  export enum ModalityType {
     /**
      * The value means window modality.
      *
@@ -11114,7 +11096,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface SubWindowOptions {
+  export interface SubWindowOptions {
     /**
      * Indicates subwindow title
      * 
@@ -11128,7 +11110,8 @@ declare namespace window {
      * @type { string }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     title: string;
     /**
@@ -11144,7 +11127,8 @@ declare namespace window {
      * @type { boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     decorEnabled: boolean;
     /**
@@ -11153,7 +11137,8 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     isModal?: boolean;
     /**
@@ -11162,7 +11147,8 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     isTopmost?: boolean;
     /**
@@ -11171,7 +11157,8 @@ declare namespace window {
      * @type { ?ModalityType }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     modalityType?: ModalityType;
     /**
@@ -11180,7 +11167,8 @@ declare namespace window {
      * @type { ?Rect }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     windowRect?: Rect;
     /**
@@ -11189,7 +11177,8 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 19
+     * @since arkts {'1.1':'19', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     maximizeSupported?: boolean;
     /**
@@ -11198,7 +11187,8 @@ declare namespace window {
      * @type { ?int }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     zLevel?: int;
     /**
@@ -11207,7 +11197,8 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     outlineEnabled?: boolean;
 
@@ -11237,7 +11228,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface WindowStage {
+  export interface WindowStage {
     /**
      * Get main window of the stage.
      *
@@ -12028,8 +12019,7 @@ declare namespace window {
      * @syscap SystemCapability.Window.SessionManager
      * @StageModelOnly
      * @atomicservice
-     * @since arkts {'1.1':'20', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 20
      */
     setWindowModal(isModal: boolean): Promise<void>;
 
@@ -12158,7 +12148,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  enum ExtensionWindowAttribute {
+  export enum ExtensionWindowAttribute {
     /**
      * System window.
      *
@@ -12192,7 +12182,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface SystemWindowOptions {
+  export interface SystemWindowOptions {
     /**
      * Indicates window type.
      *
@@ -12216,7 +12206,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  interface ExtensionWindowConfig {
+  export interface ExtensionWindowConfig {
     /**
      * Window name.
      *
-- 
Gitee


From 48b5065890d119f4d5155e309a06649933f188c4 Mon Sep 17 00:00:00 2001
From: chuanstudy <xule37@h-partners.com>
Date: Thu, 4 Sep 2025 08:38:49 +0000
Subject: [PATCH 3/3] Revert "update api/@ohos.window.d.ts."

This reverts commit ef4b25e82f5cb764ca10167ab105c92c32f4f69a.
---
 api/@ohos.window.d.ts | 216 ++++++++++++++++++++++--------------------
 1 file changed, 113 insertions(+), 103 deletions(-)

diff --git a/api/@ohos.window.d.ts b/api/@ohos.window.d.ts
index e6ef11b7ce..603d1c189a 100644
--- a/api/@ohos.window.d.ts
+++ b/api/@ohos.window.d.ts
@@ -120,7 +120,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum WindowType {
+  enum WindowType {
     /**
      * App.
      *
@@ -436,7 +436,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum AvoidAreaType {
+  enum AvoidAreaType {
     /**
      * Default area of the system
      *
@@ -560,7 +560,7 @@ declare namespace window {
    * @since arkts {'1.1':'7', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum WindowMode {
+  enum WindowMode {
     /**
      * Undefined mode of the window
      *
@@ -612,7 +612,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 9
    */
-  export enum WindowLayoutMode {
+  enum WindowLayoutMode {
     /**
      * CASCADE
      *
@@ -656,7 +656,7 @@ declare namespace window {
    * @since arkts {'1.1':'20', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum WindowStatusType {
+  enum WindowStatusType {
     /**
      * Undefined status of the window
      *
@@ -814,7 +814,7 @@ declare namespace window {
    * @since arkts {'1.1':'20', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface SystemBarProperties {
+  interface SystemBarProperties {
     /**
      * The color of the status bar.
      *
@@ -1015,7 +1015,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface SystemBarStyle {
+  interface SystemBarStyle {
     /**
      * The content color of the status bar
      *
@@ -1037,7 +1037,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface SystemBarRegionTint {
+  interface SystemBarRegionTint {
     /**
      * System bar type
      *
@@ -1103,7 +1103,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface SystemBarTintState {
+  interface SystemBarTintState {
     /**
      * Id of display
      *
@@ -1151,7 +1151,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface Rect {
+  interface Rect {
 
     /**
      * The left of the Rect.
@@ -1390,7 +1390,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface AvoidArea {
+  interface AvoidArea {
     /**
      * Whether avoidArea is visible on screen
      *
@@ -1543,7 +1543,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface Size {
+  interface Size {
     /**
      * The width of the window.
      *
@@ -1613,7 +1613,7 @@ declare namespace window {
    * @syscap SystemCapability.Window.SessionManager
    * @since 18
    */
-  export interface WindowInfo {
+  interface WindowInfo {
     /**
      * The position and size of the window
      *
@@ -1744,7 +1744,7 @@ declare namespace window {
    * @since arkts {'1.1':'15', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface WindowDensityInfo {
+  interface WindowDensityInfo {
     /**
      * System density
      *
@@ -1804,7 +1804,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface WindowProperties {
+  interface WindowProperties {
     /**
      * The position and size of the window
      *
@@ -2198,7 +2198,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum ColorSpace {
+  enum ColorSpace {
     /**
      * Default color space.
      *
@@ -2255,7 +2255,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface ScaleOptions {
+  interface ScaleOptions {
     /**
      * The scale param of x direction. Default is 1.f
      *
@@ -2310,7 +2310,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface RotateOptions {
+  interface RotateOptions {
     /**
      * The rotate degree of x direction. Default value is 0.f
      *
@@ -2376,7 +2376,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface TranslateOptions {
+  interface TranslateOptions {
     /**
      * The translate pixel param of x direction. Default is 0.f
      *
@@ -2420,7 +2420,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface TransitionContext {
+  interface TransitionContext {
     /**
      * The target window with animation
      *
@@ -2466,7 +2466,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface TransitionController {
+  interface TransitionController {
     /**
      * Animation configuration when showing window
      *
@@ -2680,7 +2680,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface WindowLimits {
+  interface WindowLimits {
     
     /**
      * The maximum width of the window.
@@ -2771,7 +2771,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface TitleButtonRect {
+  interface TitleButtonRect {
 
     /**
      * The right of the Rect.
@@ -2852,7 +2852,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface RectChangeOptions {
+  interface RectChangeOptions {
     /**
      * Rect
      *
@@ -2894,7 +2894,7 @@ declare namespace window {
    * @since arkts {'1.1':'20', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface AvoidAreaOptions {
+  interface AvoidAreaOptions {
     /**
      * Avoid area type
      *
@@ -2945,7 +2945,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum RectChangeReason {
+  enum RectChangeReason {
     /**
      * Default RectChangeReason.
      *
@@ -3147,7 +3147,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  export function create(id: string, type: WindowType, callback: AsyncCallback<Window>): void;
+  function create(id: string, type: WindowType, callback: AsyncCallback<Window>): void;
 
   /**
    * Create a sub window with a specific id and type, only support 7.
@@ -3161,7 +3161,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  export function create(id: string, type: WindowType): Promise<Window>;
+  function create(id: string, type: WindowType): Promise<Window>;
 
   /**
    * Create a system or float window with a specific id and type.
@@ -3175,7 +3175,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  export function create(ctx: BaseContext, id: string, type: WindowType): Promise<Window>;
+  function create(ctx: BaseContext, id: string, type: WindowType): Promise<Window>;
 
   /**
    * Create a system or float window with a specific id and type.
@@ -3189,7 +3189,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#createWindow
    */
-  export function create(ctx: BaseContext, id: string, type: WindowType, callback: AsyncCallback<Window>): void;
+  function create(ctx: BaseContext, id: string, type: WindowType, callback: AsyncCallback<Window>): void;
 
   /**
    * Find the window by id.
@@ -3201,7 +3201,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#findWindow
    */
-  export function find(id: string, callback: AsyncCallback<Window>): void;
+  function find(id: string, callback: AsyncCallback<Window>): void;
 
   /**
    * Find the window by id.
@@ -3213,7 +3213,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#findWindow
    */
-  export function find(id: string): Promise<Window>;
+  function find(id: string): Promise<Window>;
 
   /**
    * Find the window by name.
@@ -3252,7 +3252,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function findWindow(name: string): Window;
+  function findWindow(name: string): Window;
 
   /**
    * Get the final show window.
@@ -3264,7 +3264,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  export function getTopWindow(callback: AsyncCallback<Window>): void;
+  function getTopWindow(callback: AsyncCallback<Window>): void;
 
   /**
    * Get the final show window.
@@ -3276,7 +3276,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  export function getTopWindow(): Promise<Window>;
+  function getTopWindow(): Promise<Window>;
 
   /**
    * Get the final show window.
@@ -3288,7 +3288,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  export function getTopWindow(ctx: BaseContext): Promise<Window>;
+  function getTopWindow(ctx: BaseContext): Promise<Window>;
 
   /**
    * Get the final show window.
@@ -3300,7 +3300,7 @@ declare namespace window {
    * @deprecated since 9
    * @useinstead ohos.window#getLastWindow
    */
-  export function getTopWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
+  function getTopWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
 
   /**
    * Get the final show window.
@@ -3343,7 +3343,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function getLastWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
+  function getLastWindow(ctx: BaseContext, callback: AsyncCallback<Window>): void;
 
   /**
    * Get the final show window.
@@ -3386,7 +3386,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function getLastWindow(ctx: BaseContext): Promise<Window>;
+  function getLastWindow(ctx: BaseContext): Promise<Window>;
 
   /**
    * Minimize all app windows.
@@ -3470,7 +3470,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  export function toggleShownStateForAllAppWindows(callback: AsyncCallback<void>): void;
+  function toggleShownStateForAllAppWindows(callback: AsyncCallback<void>): void;
 
   /**
    * Toggle shown state for all app windows. Minimize or restore all app windows.
@@ -3492,7 +3492,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  export function toggleShownStateForAllAppWindows(): Promise<void>;
+  function toggleShownStateForAllAppWindows(): Promise<void>;
 
   /**
    * Set the layout mode of a window.
@@ -3521,7 +3521,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  export function setWindowLayoutMode(mode: WindowLayoutMode, callback: AsyncCallback<void>): void;
+  function setWindowLayoutMode(mode: WindowLayoutMode, callback: AsyncCallback<void>): void;
 
   /**
    * Set the layout mode of a window.
@@ -3550,7 +3550,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 12
    */
-  export function setWindowLayoutMode(mode: WindowLayoutMode): Promise<void>;
+  function setWindowLayoutMode(mode: WindowLayoutMode): Promise<void>;
 
   /**
    * Sets whether to enable gesture navigation.
@@ -3566,7 +3566,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  export function setGestureNavigationEnabled(enable: boolean, callback: AsyncCallback<void>): void;
+  function setGestureNavigationEnabled(enable: boolean, callback: AsyncCallback<void>): void;
 
   /**
    * Sets whether to enable gesture navigation.
@@ -3582,7 +3582,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  export function setGestureNavigationEnabled(enable: boolean): Promise<void>;
+  function setGestureNavigationEnabled(enable: boolean): Promise<void>;
 
   /**
    * Set watermark image.
@@ -3598,7 +3598,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  export function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean): Promise<void>;
+  function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean): Promise<void>;
 
   /**
    * Set watermark image.
@@ -3614,7 +3614,7 @@ declare namespace window {
    * @systemapi Hide this for inner system use.
    * @since 10
    */
-  export function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean, callback: AsyncCallback<void>): void;
+  function setWaterMarkImage(pixelMap: image.PixelMap, enable: boolean, callback: AsyncCallback<void>): void;
 
   /**
    * Shift window focus within the same application. And the window type contains only main window and subwindow.
@@ -3709,7 +3709,7 @@ declare namespace window {
    * @syscap SystemCapability.Window.SessionManager
    * @since 18
    */
-  export function getVisibleWindowInfo(): Promise<Array<WindowInfo>>;
+  function getVisibleWindowInfo(): Promise<Array<WindowInfo>>;
 
   /**
    * gets snapshot of window
@@ -3743,7 +3743,7 @@ declare namespace window {
    * @atomicservice
    * @since 14
    */
-  export function getWindowsByCoordinate(displayId: number, windowNumber?: number, x?: number, y?: number):
+  function getWindowsByCoordinate(displayId: number, windowNumber?: number, x?: number, y?: number):
       Promise<Array<Window>>;
 
   /**
@@ -3821,7 +3821,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function on(type: 'systemBarTintChange', callback: Callback<SystemBarTintState>): void;
+  function on(type: 'systemBarTintChange', callback: Callback<SystemBarTintState>): void;
 
   /**
    * Unregister the callback of systemBarTintChange
@@ -3836,7 +3836,7 @@ declare namespace window {
    * @since arkts {'1.1':'8', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function off(type: 'systemBarTintChange', callback?: Callback<SystemBarTintState>): void;
+  function off(type: 'systemBarTintChange', callback?: Callback<SystemBarTintState>): void;
 
   /**
    * Register the callback for gesture navigation enabled changes.
@@ -3854,7 +3854,7 @@ declare namespace window {
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function on(type: 'gestureNavigationEnabledChange', callback: Callback<boolean>): void;
+  function on(type: 'gestureNavigationEnabledChange', callback: Callback<boolean>): void;
 
   /**
    * Unregister the callback for gesture navigation enabled changes.
@@ -3871,7 +3871,7 @@ declare namespace window {
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function off(type: 'gestureNavigationEnabledChange', callback?: Callback<boolean>): void;
+  function off(type: 'gestureNavigationEnabledChange', callback?: Callback<boolean>): void;
 
   /**
    * Register the callback for watermark flag change.
@@ -3881,13 +3881,14 @@ declare namespace window {
    * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API.
    * @throws { BusinessError } 401 - Parameter error. Possible causes: 1. Mandatory parameters are left unspecified.
    * <br>2. Incorrect parameter types. 3.Parameter verification failed.
+   * @throws { BusinessError } 1300002 - This window state is abnormal.
    * @throws { BusinessError } 1300003 - This window manager service works abnormally.
    * @syscap SystemCapability.WindowManager.WindowManager.Core
    * @systemapi Hide this for inner system use.
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function on(type: 'waterMarkFlagChange', callback: Callback<boolean>): void;
+  function on(type: 'waterMarkFlagChange', callback: Callback<boolean>): void;
 
   /**
    * Unregister the callback for watermark flag change.
@@ -3897,13 +3898,14 @@ declare namespace window {
    * @throws { BusinessError } 202 - Permission verification failed. A non-system application calls a system API.
    * @throws { BusinessError } 401 - Parameter error. Possible cause: 1. Incorrect parameter types; 
    * <br>2. Parameter verification failed.
+   * @throws { BusinessError } 1300002 - This window state is abnormal.
    * @throws { BusinessError } 1300003 - This window manager service works abnormally.
    * @syscap SystemCapability.WindowManager.WindowManager.Core
    * @systemapi Hide this for inner system use.
    * @since arkts {'1.1':'10', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export function off(type: 'waterMarkFlagChange', callback?: Callback<boolean>): void;
+  function off(type: 'waterMarkFlagChange', callback?: Callback<boolean>): void;
 
   /**
    * Sets starting window background color
@@ -3960,7 +3962,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum Orientation {
+  enum Orientation {
     /**
      * Default value. The direction mode is not clearly defined. It is determined by the system.
      *
@@ -4263,7 +4265,7 @@ declare namespace window {
    * @since arkts {'1.1':'9', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum BlurStyle {
+  enum BlurStyle {
     /**
      * Close blur.
      *
@@ -4319,7 +4321,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum WindowEventType {
+  enum WindowEventType {
     /**
      * The value of window event is window show
      *
@@ -4404,7 +4406,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum MaximizePresentation {
+  enum MaximizePresentation {
     /**
      * The value means follow immersive state which set by app
      *
@@ -4451,7 +4453,7 @@ declare namespace window {
    * @since arkts {'1.1':'15', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface MoveConfiguration {
+  interface MoveConfiguration {
     /**
      * The display id of the screen
      *
@@ -4795,7 +4797,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface Window {
+  interface Window {
     /**
      * Hide window.
      *
@@ -8169,7 +8171,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setTopmost(isTopmost: boolean): Promise<void>;
 
@@ -8188,7 +8191,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setWindowTopmost(isWindowTopmost: boolean): Promise<void>;
 
@@ -8389,7 +8393,8 @@ declare namespace window {
      * @throws { BusinessError } 1300003 - This window manager service works abnormally.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi
-     * @since 13
+     * @since arkts {'1.1':'13', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     requestFocus(isFocused: boolean): Promise<void>;
 
@@ -8409,7 +8414,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 15
+     * @since arkts {'1.1':'15', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setExclusivelyHighlighted(exclusivelyHighlighted: boolean): Promise<void>;
 
@@ -8421,7 +8427,8 @@ declare namespace window {
      * @throws { BusinessError } 1300002 - This window state is abnormal.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     isWindowHighlighted(): boolean;
 
@@ -9277,7 +9284,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseToAppTop(callback: AsyncCallback<void>): void;
 
@@ -9290,7 +9298,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseToAppTop(): Promise<void>;
 
@@ -9472,7 +9481,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseAboveTarget(windowId: int, callback: AsyncCallback<void>): void;
 
@@ -9490,7 +9500,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     raiseAboveTarget(windowId: int): Promise<void>;
 
@@ -9509,7 +9520,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since 10
+     * @since arkts {'1.1':'10', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setRaiseByClickEnabled(enable: boolean, callback: AsyncCallback<void>): void;
 
@@ -9526,7 +9538,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
-     * @since 14
+     * @since arkts {'1.1':'14', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setRaiseByClickEnabled(enable: boolean): Promise<void>;
 
@@ -9951,7 +9964,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setSubWindowModal(isModal: boolean): Promise<void>;
 
@@ -9986,7 +10000,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setSubWindowModal(isModal: boolean, modalityType: ModalityType): Promise<void>;
 
@@ -10648,7 +10663,8 @@ declare namespace window {
      * @throws { BusinessError } 1300002 - This window state is abnormal.
      * @syscap SystemCapability.WindowManager.WindowManager.Core
      * @atomicservice
-     * @since 12
+     * @since arkts {'1.1':'12', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     isFocused(): boolean;
 
@@ -10795,7 +10811,8 @@ declare namespace window {
      * @throws { BusinessError } 1300009 - The parent window is invalid.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setSubWindowZLevel(zLevel: int): Promise<void>;
 
@@ -10808,7 +10825,8 @@ declare namespace window {
      * @throws { BusinessError } 1300004 - Unauthorized operation.
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since 18
+     * @since arkts {'1.1':'18', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     getSubWindowZLevel(): int;
 
@@ -10856,7 +10874,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum WindowStageEventType {
+  enum WindowStageEventType {
     /**
      * The window stage is running in the foreground.
      *
@@ -11037,7 +11055,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum ModalityType {
+  enum ModalityType {
     /**
      * The value means window modality.
      *
@@ -11096,7 +11114,7 @@ declare namespace window {
    * @since arkts {'1.1':'12', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface SubWindowOptions {
+  interface SubWindowOptions {
     /**
      * Indicates subwindow title
      * 
@@ -11110,8 +11128,7 @@ declare namespace window {
      * @type { string }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'12', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 12
      */
     title: string;
     /**
@@ -11127,8 +11144,7 @@ declare namespace window {
      * @type { boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'12', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 12
      */
     decorEnabled: boolean;
     /**
@@ -11137,8 +11153,7 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'12', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 12
      */
     isModal?: boolean;
     /**
@@ -11147,8 +11162,7 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @systemapi Hide this for inner system use.
-     * @since arkts {'1.1':'12', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 12
      */
     isTopmost?: boolean;
     /**
@@ -11157,8 +11171,7 @@ declare namespace window {
      * @type { ?ModalityType }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'14', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 14
      */
     modalityType?: ModalityType;
     /**
@@ -11167,8 +11180,7 @@ declare namespace window {
      * @type { ?Rect }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'18', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 18
      */
     windowRect?: Rect;
     /**
@@ -11177,8 +11189,7 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'19', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 19
      */
     maximizeSupported?: boolean;
     /**
@@ -11187,8 +11198,7 @@ declare namespace window {
      * @type { ?int }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'18', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 18
      */
     zLevel?: int;
     /**
@@ -11197,8 +11207,7 @@ declare namespace window {
      * @type { ?boolean }
      * @syscap SystemCapability.Window.SessionManager
      * @atomicservice
-     * @since arkts {'1.1':'20', '1.2':'20'}
-     * @arkts 1.1&1.2
+     * @since 20
      */
     outlineEnabled?: boolean;
 
@@ -11228,7 +11237,7 @@ declare namespace window {
    * @since arkts {'1.1':'11', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface WindowStage {
+  interface WindowStage {
     /**
      * Get main window of the stage.
      *
@@ -12019,7 +12028,8 @@ declare namespace window {
      * @syscap SystemCapability.Window.SessionManager
      * @StageModelOnly
      * @atomicservice
-     * @since 20
+     * @since arkts {'1.1':'20', '1.2':'20'}
+     * @arkts 1.1&1.2
      */
     setWindowModal(isModal: boolean): Promise<void>;
 
@@ -12148,7 +12158,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export enum ExtensionWindowAttribute {
+  enum ExtensionWindowAttribute {
     /**
      * System window.
      *
@@ -12182,7 +12192,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface SystemWindowOptions {
+  interface SystemWindowOptions {
     /**
      * Indicates window type.
      *
@@ -12206,7 +12216,7 @@ declare namespace window {
    * @since arkts {'1.1':'14', '1.2':'20'}
    * @arkts 1.1&1.2
    */
-  export interface ExtensionWindowConfig {
+  interface ExtensionWindowConfig {
     /**
      * Window name.
      *
-- 
Gitee