Update docs (22898)

Signed-off-by: Nester.zhou <ester.zhou@huawei.com>

en/application-dev/faqs/full-sdk-compile-guide.md

 # Full SDK Compilation
 
-The full SDK provides a full set of APIs available in OpenHarmony, including system APIs required by system applications. Vendors can leverage this SDK to develop applications.
+The full SDK provides a full set of APIs available in OpenHarmony, including system APIs required by system applications. Vendors can use this SDK to develop applications.
 
-Since OpenHarmony 3.2 Beta5, the full SDK is not provided with the version. If necessary, you can compile the SDK using the full source code.
+Since OpenHarmony 3.2 Beta5, the full SDK is not provided with the version. You can obtain the full SDK by compiling the source code.
 
 ## Compiling the Full SDK
 
@@ -17,13 +17,20 @@ Since OpenHarmony 3.2 Beta5, the full SDK is not provided with the version. If n
 
 2. Download source code based on the downloaded manifest repository: **repo sync -c -d --force-sync**
 
-3. Perform precompilation: **yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev && rm -rf prebuilts/clang/ohos/darwin-x86_64/clang-480513 && rm -rf prebuilts/clang/ohos/windows-x86_64/clang-480513 && rm -rf prebuilts/clang/ohos/linux-x86_64/clang-480513 && bash build/prebuilts_download.sh -ndk && apt-get update -qqy && apt-get install doxygen -y --force-yes**
+3. Perform precompilation:
 
-4. Perform compilation: **./build.sh --product-name ohos-sdk**
+   yes y | apt install libxinerama-dev libxcursor-dev libxrandr-dev libxi-dev && rm -rf prebuilts/clang/ohos/darwin-x86_64/clang-480513 && rm -rf prebuilts/clang/ohos/windows-x86_64/clang-480513 && rm -rf prebuilts/clang/ohos/linux-x86_64/clang-480513 && apt-get update -qqy && apt-get install doxygen -y --force-yes
 
+4. Perform compilation on Windows:
+
+   ./build.sh --product-name ohos-sdk
+
+5. Perform compilation on macOS:
+
+   ./build.sh --product-name ohos-sdk --gn-args full_mini_debug=false --keep-ninja-going --gn-args=is_use_check_deps=false
 
 If the compilation is successful, export the files in the **out/sdk/packages/ohos-sdk/** directory.
 
 ## Replacing the SDK
 
-After the full SDK is compiled, switch to it in DevEco Studio. For details, see [Guide to Switching to Full SDK](full-sdk-switch-guide.md).
+After the full SDK is compiled, switch to it in DevEco Studio. For details, see [Switching to Full SDK](full-sdk-switch-guide.md).

en/application-dev/reference/apis/js-apis-arkui-UIContext.md

 # @ohos.arkui.UIContext (UIContext)
 
-In the stage model, a window stage or window can use the **loadContent** API to load pages, create a UI instance, and render page content to the associated window. Naturally, UI instances and windows are associated on a one-by-one basis. Some global UI APIs are executed in the context of certain UI instances. When calling these APIs, you must identify the UI context, and consequently UI instance, by tracing the call chain. If these APIs are called on a non-UI page or in some asynchronous callback, the current UI context may fail to be identified, resulting in failure in API execution.
+In the stage model, a window stage or window can use the **loadContent** API to load pages, create a UI instance, and render page content to the associated window. Naturally, UI instances and windows are associated on a one-by-one basis. Some global UI APIs are executed in the context of certain UI instances. When calling these APIs, you must identify the UI context, and consequently UI instance, by tracing the call chain. If these APIs are called on a non-UI page or in some asynchronous callback, the current UI context may fail to be identified, resulting in API execution errors.
 
 **@ohos.window** adds the [getUIContext](./js-apis-window.md#getuicontext10) API in API version 10 for obtaining the **UIContext** object of a UI instance. The API provided by the **UIContext** object can be directly applied to the corresponding UI instance.
 
@@ -214,7 +214,7 @@ struct AnimateToExample {
 
 ### showAlertDialog
 
-showAlertDialog(options: AlertDialogParamWithConfirm | AlertDialogParamWithButtons): void
+showAlertDialog(options: AlertDialogParamWithConfirm | AlertDialogParamWithButtons | AlertDialogParamWithOptions): void
 
 Shows an alert dialog box.
 
@@ -224,7 +224,8 @@ Shows an alert dialog box.
 
 | Name   | Type | Mandatory| Description|
 | ---- | --------------- | -------- | -------- |
-| options | [AlertDialogParamWithConfirm](../arkui-ts/ts-methods-alert-dialog-box.md#alertdialogparamwithconfirm) \| [AlertDialogParamWithButtons](../arkui-ts/ts-methods-alert-dialog-box.md#alertdialogparamwithbuttons)  | Yes| Defines and displays the **\<AlertDialog>** component.|
+| options | [AlertDialogParamWithConfirm](../arkui-ts/ts-methods-alert-dialog-box.md#alertdialogparamwithconfirm) \| [AlertDialogParamWithButtons](../arkui-ts/ts-methods-alert-dialog-box.md#alertdialogparamwithbuttons) \| [AlertDialogParamWithOptions](../arkui-ts/ts-methods-alert-dialog-box.md#alertdialogparamwithoptions10)  | Yes| Defines and displays the **\<AlertDialog>** component.|
+
 
 **Example**
 
@@ -579,7 +580,7 @@ Obtains information about a system font based on the font name.
 
 | Type                                | Description          |
 | ------------------------------------ | -------------- |
-| [FontInfo](js-apis-font.md#fontinfo) | Information about the system font.|
+| [FontInfo](js-apis-font.md#fontinfo10) | Information about the system font.|
 
 **Example**
 
@@ -721,19 +722,21 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.pushUrl({
-    url: 'pages/routerpage2',
-    params: {
-      data1: 'message',
-      data2: {
-        data3: [123, 456, 789]
-      }
+router.pushUrl({
+  url: 'pages/routerpage2',
+  params: {
+    data1: 'message',
+    data2: {
+      data3: [123, 456, 789]
     }
+  }
+})
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`pushUrl failed, code is ${err.code}, message is ${err.message}`);
   })
-} catch (err) {
-  console.error(`pushUrl failed, code is ${err.code}, message is ${err.message}`);
-}
 ```
 
 ### pushUrl
@@ -817,19 +820,21 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.pushUrl({
-    url: 'pages/routerpage2',
-    params: {
-      data1: 'message',
-      data2: {
-        data3: [123, 456, 789]
-      }
+router.pushUrl({
+  url: 'pages/routerpage2',
+  params: {
+    data1: 'message',
+    data2: {
+      data3: [123, 456, 789]
     }
-  }, router.RouterMode.Standard)
-} catch (err) {
-  console.error(`pushUrl failed, code is ${err.code}, message is ${err.message}`);
-}
+  }
+}, router.RouterMode.Standard)
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`pushUrl failed, code is ${err.code}, message is ${err.message}`);
+  })
 ```
 
 ### pushUrl
@@ -912,16 +917,18 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.replaceUrl({
-    url: 'pages/detail',
-    params: {
-      data1: 'message'
-    }
+router.replaceUrl({
+  url: 'pages/detail',
+  params: {
+    data1: 'message'
+  }
+})
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`replaceUrl failed, code is ${err.code}, message is ${err.message}`);
   })
-} catch (err) {
-  console.error(`replaceUrl failed, code is ${err.code}, message is ${err.message}`);
-}
 ```
 
 ### replaceUrl
@@ -1089,19 +1096,21 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.pushNamedRoute({
-    name: 'myPage',
-    params: {
-      data1: 'message',
-      data2: {
-        data3: [123, 456, 789]
-      }
+router.pushNamedRoute({
+  name: 'myPage',
+  params: {
+    data1: 'message',
+    data2: {
+      data3: [123, 456, 789]
     }
+  }
+})
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`pushNamedRoute failed, code is ${err.code}, message is ${err.message}`);
   })
-} catch (err) {
-  console.error(`pushNamedRoute failed, code is ${err.code}, message is ${err.message}`);
-}
 ```
 
 ### pushNamedRoute
@@ -1184,24 +1193,26 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.pushNamedRoute({
-    name: 'myPage',
-    params: {
-      data1: 'message',
-      data2: {
-        data3: [123, 456, 789]
-      }
+router.pushNamedRoute({
+  name: 'myPage',
+  params: {
+    data1: 'message',
+    data2: {
+      data3: [123, 456, 789]
     }
-  }, router.RouterMode.Standard)
-} catch (err) {
-  console.error(`pushNamedRoute failed, code is ${err.code}, message is ${err.message}`);
-}
+  }
+}, router.RouterMode.Standard)
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`pushNamedRoute failed, code is ${err.code}, message is ${err.message}`);
+  })
 ```
 
 ### pushNamedRoute
 
-pushNamedRoute(options: router.NamedRouterOptions, mode: RouterMode, callback: AsyncCallback&lt;void&gt;): void
+pushNamedRoute(options: router.NamedRouterOptions, mode: router.RouterMode, callback: AsyncCallback&lt;void&gt;): void
 
 Navigates to a page using the named route. This API uses a promise to return the result.
 
@@ -1279,16 +1290,18 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.replaceNamedRoute({
-    name: 'myPage',
-    params: {
-      data1: 'message'
-    }
+router.replaceNamedRoute({
+  name: 'myPage',
+  params: {
+    data1: 'message'
+  }
+})
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`replaceNamedRoute failed, code is ${err.code}, message is ${err.message}`);
   })
-} catch (err) {
-  console.error(`replaceNamedRoute failed, code is ${err.code}, message is ${err.message}`);
-}
 ```
 
 ### replaceNamedRoute
@@ -1361,23 +1374,25 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 | ID  | Error Message|
 | --------- | ------- |
-| 100001    | if UI execution context not found, only throw in standard system. |
+| 100001    | if can not get the delegate, only throw in standard system. |
 | 100004    | if the named route is not exist. |
 
 **Example**
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.replaceNamedRoute({
-    name: 'myPage',
-    params: {
-      data1: 'message'
-    }
-  }, router.RouterMode.Standard)
-} catch (err) {
-  console.error(`replaceNamedRoute failed, code is ${err.code}, message is ${err.message}`);
-}
+router.replaceNamedRoute({
+  name: 'myPage',
+  params: {
+    data1: 'message'
+  }
+}, router.RouterMode.Standard)
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`replaceNamedRoute failed, code is ${err.code}, message is ${err.message}`);
+  })
 ```
 
 ### replaceNamedRoute
@@ -1425,7 +1440,7 @@ router.replaceNamedRoute({
 
 ### back
 
-back(options: router.RouterOptions ): void
+back(options?: router.RouterOptions ): void
 
 Returns to the previous page or a specified page.
 
@@ -1435,7 +1450,7 @@ Returns to the previous page or a specified page.
 
 | Name | Type                                                   | Mandatory| Description                                                        |
 | ------- | ------------------------------------------------------- | ---- | ------------------------------------------------------------ |
-| options | [router.RouterOptions](js-apis-router.md#routeroptions) | Yes  | Description of the page. The **url** parameter indicates the URL of the page to return to. If the specified page does not exist in the page stack, the application does not respond. If no URL is set, the application returns to the previous page, and the page is not rebuilt. The page in the page stack is not reclaimed. It will be reclaimed after being popped up.|
+| options | [router.RouterOptions](js-apis-router.md#routeroptions) | No  | Description of the page. The **url** parameter indicates the URL of the page to return to. If the specified page does not exist in the page stack, the application does not respond. If no URL is set, the application returns to the previous page, and the page is not rebuilt. The page in the page stack is not reclaimed. It will be reclaimed after being popped up.|
 
 **Example**
 
@@ -1531,13 +1546,15 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 ```ts
 let router = uiContext.getRouter();
-try {
-  router.showAlertBeforeBackPage({            
-    message: 'Message Info'        
-  });
-} catch(error) {
-  console.error(`showAlertBeforeBackPage failed, code is ${error.code}, message is ${error.message}`);
-}
+router.showAlertBeforeBackPage({
+  message: 'Message Info'
+});
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`showAlertBeforeBackPage failed, code is ${error.code}, message is ${error.message}`);
+  })
 ```
 
 ### hideAlertBeforeBackPage
@@ -1618,7 +1635,7 @@ try {
 
 ### showDialog
 
-showDialog(options: promptAction.ShowDialogOptions, callback: AsyncCallback&lt;promptAction.ShowDialogSuccessResponse&lt;): void
+showDialog(options: promptAction.ShowDialogOptions, callback: AsyncCallback&lt;promptAction.ShowDialogSuccessResponse&gt;): void
 
 Shows a dialog box. This API uses an asynchronous callback to return the result.
 

en/application-dev/reference/apis/js-apis-arkui-dragController.md

@@ -11,7 +11,7 @@ The **dragController** module provides APIs for initiating drag actions. When re
 
 ## Modules to Import
 
-```js
+```ts
 import dragController from "@ohos.arkui.dragController";
 ```
 
@@ -35,7 +35,7 @@ Initiates a drag action, with the object to be dragged and the drag information
 
 ```ts
 import dragController from "@ohos.arkui.dragController"
-import UDMF from '@ohos.data.UDMF'
+import UDC from '@ohos.data.unifiedDataChannel';
 
 @Entry
 @Component
@@ -54,8 +54,8 @@ struct DragControllerPage {
       Button('touch to execute drag')
         .onTouch((event) => {
           if (event.type == TouchType.Down) {
-            let text = new UDMF.Text()
-            let unifiedData = new UDMF.UnifiedData(text)
+            let text = new UDC.Text()
+            let unifiedData = new UDC.UnifiedData(text)
 
             let dragInfo: dragController.DragInfo = {
               pointerId: 0,
@@ -63,9 +63,9 @@ struct DragControllerPage {
               extraParams: ''
             }
             dragController.executeDrag(this.DraggingBuilder.bind(this), dragInfo, (err, {event, extraParams}) => {
-              if (event.getResult() == DragRet.DRAG_SUCCESS) {
+              if (event.getResult() == DragResult.DRAG_SUCCESSFUL) {
                 // ...
-              } else if (event.getResult() == DragRet.DRAG_FAILED) {
+              } else if (event.getResult() == DragResult.DRAG_FAILED) {
                 // ...
               }
             })
@@ -101,7 +101,7 @@ Initiates a drag action, with the object to be dragged and the drag information
 
 ```ts
 import dragController from "@ohos.arkui.dragController"
-import UDMF from '@ohos.data.UDMF';
+import UDC from '@ohos.data.unifiedDataChannel';
 import componentSnapshot from '@ohos.arkui.componentSnapshot';
 import image from '@ohos.multimedia.image';
 
@@ -133,8 +133,8 @@ struct DragControllerPage {
       Button('touch to execute drag')
         .onTouch((event) => {
           if (event.type == TouchType.Down) {
-            let text = new UDMF.Text()
-            let unifiedData = new UDMF.UnifiedData(text)
+            let text = new UDC.Text()
+            let unifiedData = new UDC.UnifiedData(text)
 
             let dragInfo: dragController.DragInfo = {
               pointerId: 0,
@@ -151,9 +151,9 @@ struct DragControllerPage {
 
               dragController.executeDrag(dragItemInfo, dragInfo)
                 .then(({event, extraParams}) => {
-                  if (event.getResult() == DragRet.DRAG_SUCCESS) {
+                  if (event.getResult() == DragResult.DRAG_SUCCESSFUL) {
                     // ...
-                  } else if (event.getResult() == DragRet.DRAG_FAILED) {
+                  } else if (event.getResult() == DragResult.DRAG_FAILED) {
                     // ...
                   }
                 })
@@ -178,5 +178,5 @@ Defines the attributes required for initiating a drag action and information car
 | Name       | Type                                                  | Mandatory| Description                                    |
 | ----------- | ------------------------------------------------------ | ---- | ---------------------------------------- |
 | pointerId   | number                                                 | Yes  | ID of the touch point on the screen when dragging is started.        |
-| data        | [UDMF.UnifiedData](./js-apis-data-udmf.md#unifieddata) | No  | Data carried in the dragging process.              |
+| data        | [unifiedDataChannel.UnifiedData](js-apis-data-unifiedDataChannel.md#unifieddata) | No  | Data carried in the dragging process.              |
 | extraParams | string                                                 | No  | Additional information about the drag action. Not supported currently.|

en/application-dev/reference/apis/js-apis-arkui-drawableDescriptor.md

@@ -141,7 +141,7 @@ Obtains the **DrawableDescriptor** object of the background.
 **Example**
   ```ts
 let resManager = getContext().resourceManager
-drawable: DrawableDescriptor = (<LayeredDrawableDescriptor> (resManager.getDrawableDescriptor($r('app.media.icon')
+let drawable: DrawableDescriptor = (<LayeredDrawableDescriptor> (resManager.getDrawableDescriptor($r('app.media.icon')
     .id))).getBackground();
   ```
 

en/application-dev/reference/apis/js-apis-base.md

@@ -40,7 +40,7 @@ ErrorCallback\<T extends Error = BusinessError> {
 
 Defines a common callback that carries an error parameter.
 
-The error parameter is of the [BusinessError](#businesserror) type.
+The information returned by the callback is of the [BusinessError](#businesserror) type.
 
 **System capability**: SystemCapability.Base
 
@@ -68,7 +68,7 @@ The type of the asynchronous return value is defined by the developer.
 
 | Name| Type                                                        | Mandatory| Description                        |
 | ---- | ------------------------------------------------------------ | ---- | ---------------------------- |
-| err  | [BusinessError](https://gitee.com/openharmony/docs/pulls/20172/files#businesserror) | Yes  | Common error information about the API invoking failure.|
+| err  | [BusinessError](#businesserror) | Yes  | Common error information about the API invoking failure.|
 | data | T                                                            | Yes  | Common callback information.  |
 
 ## BusinessError

en/application-dev/reference/apis/js-apis-curve.md

@@ -316,7 +316,7 @@ Since API version 9, this API is supported in ArkTS widgets.
 
 ```ts
 import Curves from '@ohos.curves'
-let curve = Curves.initCurve(Curve.EaseIn) // Create an ease-in curve.
+let curveValue = Curves.initCurve(Curve.EaseIn) // Create an ease-in curve.
 let value: number = curve.interpolate(0.5) // Calculate the interpolation for half of the time.
 ```
 

en/application-dev/reference/apis/js-apis-promptAction.md

@@ -191,7 +191,10 @@ Describes the options for showing the dialog box.
 | ------- | ------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
 | title   | string\| [Resource](../arkui-ts/ts-types.md#resource)<sup>9+</sup>| No  | Title of the dialog box.                                                  |
 | message | string\| [Resource](../arkui-ts/ts-types.md#resource)<sup>9+</sup>| No  | Text body.                                                  |
-| buttons | [[Button](#button),[Button](#button)?,[Button](#button)?]    | No  | Array of buttons in the dialog box. The array structure is **{text:'button', color: '\#666666'}**. Up to three buttons are supported. The first button is of the **positiveButton** type, the second is of the **negativeButton** type, and the third is of the **neutralButton** type.|
+| buttons  | Array&lt;[Button](#button)&gt;    | No  | Array of buttons in the dialog box. The array structure is {text:'button', color: '\#666666'}. More than one button is supported.
+| alignment<sup>10+</sup>  | [DialogAlignment](../arkui-ts/ts-methods-alert-dialog-box.md#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
+| offset<sup>10+</sup>     | [Offset](../arkui-ts/ts-types.md#offset) | No    | Offset of the dialog box based on the **alignment** settings.<br>Default value: **{ dx: 0 , dy: 0 }**|
+| maskRect<sup>10+</sup>| [Rectangle](../arkui-ts/ts-methods-alert-dialog-box.md#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
 
 ## ShowDialogSuccessResponse 
 

en/application-dev/reference/apis/js-apis-router.md

@@ -11,6 +11,8 @@ The **Router** module provides APIs to access pages through URLs. You can use th
 > - The functionality of this module depends on UI context. This means that the APIs of this module cannot be used where the UI context is unclear. For details, see [UIContext](./js-apis-arkui-UIContext.md#uicontext).
 >
 > - Since API version 10, you can use the [getRouter](./js-apis-arkui-UIContext.md#getrouter) API in [UIContext](./js-apis-arkui-UIContext.md#uicontext) to obtain the [Router](./js-apis-arkui-UIContext.md#router) object associated with the current UI context.
+>
+> - To achieve a better transition effect, you are advised to use the [\<Navigation>](../../ui/arkts-navigation-navigation.md) component and [modal transition](../../ui/arkts-modal-transition.md).
 
 ## Modules to Import
 
@@ -437,6 +439,8 @@ router.pushNamedRoute({
   })
 ```
 
+For details, see [UI Development-Named Route](../../ui/arkts-routing.md#named-route).
+
 ## router.pushNamedRoute<sup>10+</sup>
 
 pushNamedRoute(options: NamedRouterOptions, callback: AsyncCallback&lt;void&gt;): void
@@ -693,7 +697,7 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 
 | ID  | Error Message|
 | --------- | ------- |
-| 100001    | if UI execution context not found, only throw in standard system. |
+| 100001    | if can not get the delegate, only throw in standard system. |
 | 100004    | if the named route is not exist. |
 
 **Example**
@@ -871,13 +875,15 @@ For details about the error codes, see [Router Error Codes](../errorcodes/errorc
 **Example**
 
 ```ts
-try {
-  router.showAlertBeforeBackPage({
-    message: 'Message Info'
-  });
-} catch(error) {
-  console.error(`showAlertBeforeBackPage failed, code is ${error.code}, message is ${error.message}`);
-}
+router.showAlertBeforeBackPage({
+  message: 'Message Info'
+})
+  .then(() => {
+    // success
+  })
+  .catch(err => {
+    console.error(`showAlertBeforeBackPage failed, code is ${error.code}, message is ${error.message}`);
+  })
 ```
 ## EnableAlertOptions
 
@@ -932,7 +938,7 @@ Describes the page routing options.
 | Name  | Type  | Mandatory| Description                                                        |
 | ------ | ------ | ---- | ------------------------------------------------------------ |
 | url    | string | Yes  | URL of the target page, in either of the following formats:<br>- Absolute path of the page. The value is available in the pages list in the **config.json** file, for example:<br>- pages/index/index<br>- pages/detail/detail<br>- Particular path. If the URL is a slash (/), the home page is displayed.|
-| params | object | No  | Data that needs to be passed to the target page during redirection. The target page can use **router.getParams()** to obtain the passed parameters, for example, **this.keyValue** (**keyValue** is the value of a key in **params**). In the web-like paradigm, these parameters can be directly used on the target page. If the field specified by **key** already exists on the target page, the passed value of the key will be displayed.|
+| params | object | No  | Data that needs to be passed to the target page during redirection. The received data becomes invalid when the page is switched to another page. The target page can use **router.getParams()** to obtain the passed parameters, for example, **this.keyValue** (**keyValue** is the value of a key in **params**). In the web-like paradigm, these parameters can be directly used on the target page. If the field specified by **key** already exists on the target page, the passed value of the key will be displayed.<br>**NOTE**<br>The **params** parameter cannot pass objects returned by methods and system APIs, for example, **PixelMap** objects defined and returned by media APIs. To pass such objects, extract from them the basic type attributes to be passed, and then construct objects of the object type.|
 
 
   > **NOTE**

en/application-dev/reference/apis/js-apis-syscap.md

@@ -29,12 +29,17 @@ Checks whether a SysCap is supported.
 **Example**
 
   ```js
-import geolocation from '@ohos.geolocation'
+import geoLocationManager from '@ohos.geoLocationManager'
 
-const isLocationAvailable = canIUse('SystemCapability.Location.Location');
+const isLocationAvailable = canIUse('SystemCapability.Location.Location.Core');
 if (isLocationAvailable) {
-    geolocation.getCurrentLocation((location) => {
-        console.log(location.latitude, location.longitue);
+    geoLocationManager.getCurrentLocation((err, location) => {
+        if (err) {
+            console.log('err=' + JSON.stringify(err));
+        }
+        if (location) {
+            console.log('location=' + JSON.stringify(location));
+        }
     });
 } else {
     console.log('Location not by this device.');

en/application-dev/reference/arkui-ts/ts-basic-components-menu.md

@@ -27,6 +27,7 @@ In addition to the [universal attributes](ts-universal-attributes-size.md), the
 | fontSize<sup>(deprecated)</sup> | [Length](ts-types.md#length) | Font size of the menu text. When **Length** is of the number type, the unit is fp.<br>This API is deprecated since API version 10. You are advised to use **font** instead.|
 | font<sup>10+</sup> | [Font](ts-types.md#font) | Font style of the menu text.|
 | fontColor<sup>10+</sup> | [ResourceColor](ts-types.md#resourcecolor) | Font color of the menu text.|
+| radius<sup>10+</sup> | [Dimension](ts-types.md#dimension10) \| [BorderRadiuses](#borderradiuses9) | Radius of the menu border corners.<br> The default value follows the theme.|
 
 ## Example
 

en/application-dev/reference/arkui-ts/ts-basic-components-progress.md

@@ -70,6 +70,7 @@ In addition to the [universal attributes](ts-universal-attributes-size.md), the
 | strokeWidth  | [Length](ts-types.md#length) | No  | Stroke width of the progress indicator. It cannot be set in percentage.<br>Default value: **4.0vp**                                           |
 | scaleCount   | number                       | No  | Number of divisions on the ring-style process indicator.<br>Default value: **120**                                                       |
 | scaleWidth   | [Length](ts-types.md#length) | No  | Scale width of the ring-style progress bar. It cannot be set in percentage. If it is greater than the value of **strokeWidth**, the default scale width is used.<br>Default value: **2.0vp**|
+| enableSmoothEffect<sup>10+</sup> | boolean | No| Whether to enable the smooth effect. When this effect is enabled, the progress change to the set value takes place gradually. Otherwise, it takes place immediately.<br>Default value: **true**|
 
 ## CapsuleStyleOptions<sup>10+</sup>
 | Name         | Type| Mandatory| Description|
@@ -81,6 +82,7 @@ In addition to the [universal attributes](ts-universal-attributes-size.md), the
 | fontColor | [ResourceColor](ts-types.md#resourcecolor) | No| Font color.<br>Default value: **'\#ff182431'**|
 | enableScanEffect | boolean | No| Whether to enable the scan effect.<br>Default value: **false**|
 | showDefaultPercentage | boolean | No| Whether to show the percentage of the current progress. This attribute does not take effect when the **content** attribute is set.<br>Default value: **false**|
+| enableSmoothEffect | boolean | No| Whether to enable the smooth effect. When this effect is enabled, the progress change to the set value takes place gradually. Otherwise, it takes place immediately.<br>Default value: **true**|
 
 ## RingStyleOptions<sup>10+</sup>
 | Name          | Type                     | Mandatory| Description                                                                                       |
@@ -89,12 +91,15 @@ In addition to the [universal attributes](ts-universal-attributes-size.md), the
 | shadow        | boolean                      | No  | Whether to enable the shadow effect.<br>Default value: **false**                                                            |
 | status        | [ProgressStatus<sup>10+</sup>](#progressstatus10) | No| Status of the progress indicator. When this parameter is set to **LOADING**, the check update animation is played, and the **value** settings do not take effect. When the value changes from **LOADING** to **PROGRESSING**, the check update animation stops when it has reached the end state.<br>Default value: **ProgressStatus.PROGRESSING**|
 | enableScanEffect | boolean | No| Whether to enable the scan effect.<br>Default value: **false**|
+| enableSmoothEffect | boolean | No| Whether to enable the smooth effect. When this effect is enabled, the progress change to the set value takes place gradually. Otherwise, it takes place immediately.<br>Default value: **true**|
 
 ## LinearStyleOptions<sup>10+</sup>
 | Name          | Type                     | Mandatory| Description                                                                                       |
 | ------------- | ---------------------------- | ---- | ------------------------------------------------------------------------------------------ |
 | strokeWidth   | [Length](ts-types.md#length) | No  | Stroke width of the progress indicator. It cannot be set in percentage.<br>Default value: **4.0vp**|
+| strokeRadius   | [PX](ts-types.md#px10)    \| [VP](ts-types.md#vp10)    \| [LPX](ts-types.md#lpx10)    \| [Resource](ts-types.md#resource)| No  | Rounded corner radius of the progress indicator.<br>Value range: [0, strokeWidth/2] Default value: **strokeWidth/2**|
 | enableScanEffect | boolean | No| Whether to enable the scan effect.<br>Default value: **false**|
+| enableSmoothEffect | boolean | No| Whether to enable the smooth effect. When this effect is enabled, the progress change to the set value takes place gradually. Otherwise, it takes place immediately.<br>Default value: **true**|
 
 ## ScaleRingStyleOptions<sup>10+</sup>
 | Name         | Type                     | Mandatory| Description                                                                                       |
@@ -102,15 +107,18 @@ In addition to the [universal attributes](ts-universal-attributes-size.md), the
 | strokeWidth  | [Length](ts-types.md#length) | No  | Stroke width of the progress indicator. It cannot be set in percentage.<br>Default value: **4.0vp**                                           |
 | scaleCount   | number                       | No  | Number of divisions on the ring-style process indicator.<br>Default value: **120**                                                       |
 | scaleWidth   | [Length](ts-types.md#length) | No  | Scale width of the ring-style progress bar. It cannot be set in percentage. If it is greater than the value of **strokeWidth**, the default scale width is used.<br>Default value: **2.0vp**|
+| enableSmoothEffect | boolean | No| Whether to enable the smooth effect. When this effect is enabled, the progress change to the set value takes place gradually. Otherwise, it takes place immediately.<br>Default value: **true**|
 
 ## EclipseStyleOptions<sup>10+</sup>
-No parameter available.
+| Name         | Type                     | Mandatory| Description                                                                                       |
+| ------------ | ---------------------------- | ---- | ------------------------------------------------------------------------------------------ |
+| enableSmoothEffect | boolean | No| Whether to enable the smooth effect. When this effect is enabled, the progress change to the set value takes place gradually. Otherwise, it takes place immediately.<br>Default value: **true**|
 
 ## ProgressStatus<sup>10+</sup>
 | Name                   | Description            |
 | ----------------------- | ---------------- |
-| LOADING<sup>10+</sup>  | Loading.|
-| PROGRESSING<sup>10+</sup>  | The progress is being updated.|
+| LOADING  | Loading.|
+| PROGRESSING | The progress is being updated.|
 
 ## Events
 
@@ -249,3 +257,38 @@ struct ProgressExample {
 }
 ```
 ![capsuleProgressStyleEffect](figures/arkts-capsuleProgressStyleEffect.png)
+
+### Example 5
+This example shows the smooth effect.
+```ts
+@Entry
+@Component
+struct Index {
+  @State value: number = 0
+
+  build() {
+    Column({space: 10}) {
+      Text('enableSmoothEffect: true').fontSize(9).fontColor(0xCCCCCC).width('90%').margin(5)
+        .margin({top: 20})
+      Progress({value: this.value, total: 100, type:ProgressType.Linear})
+        .style({strokeWidth: 10, enableSmoothEffect: true})
+
+      Text('enableSmoothEffect: false').fontSize(9).fontColor(0xCCCCCC).width('90%').margin(5)
+      Progress({value: this.value, total: 100, type:ProgressType.Linear})
+        .style({strokeWidth: 10, enableSmoothEffect: false})
+
+      Button('value +10').onClick(() => {
+        this.value += 10
+      })
+        .width(75)
+        .height(15)
+        .fontSize(9)
+    }
+    .width('50%')
+    .height('100%')
+    .margin({left:20})
+  }
+}
+
+```
+![progressSmoothEffect](figures/arkts-progressSmoothEffect.gif)

en/application-dev/reference/arkui-ts/ts-basic-components-richeditor.md

@@ -309,7 +309,7 @@ Provides the text style information.
 | fontSize | [Length](ts-types.md#length) \| number   | No| Font size.<br>Default value: **16fp**|
 | fontStyle | [FontStyle](ts-appendix-enums.md#fontstyle) | No| Font style.<br>Default value: **FontStyle.Normal**|
 | fontWeight | [FontWeight](ts-appendix-enums.md#fontweight) \| number \| string | No| Font weight.<br>For the number type, the value ranges from 100 to 900, at an interval of 100. A larger value indicates a heavier font weight. The default value is **400**.<br>For the string type, only strings of the number type are supported, for example, **"400"**, **"bold"**, **"bolder"**, **"lighter"**, **"regular"**, and **"medium"**, which correspond to the enumerated values in **FontWeight**.<br>Default value: **FontWeight.Normal**|
-| fontFamily  | [ResourceStr](ts-types.md#resourcestr) \| number \| string | No| Font family. Default value: **'HarmonyOS Sans'**.<br>Currently, only the default font is supported.<br>Default font: **'HarmonyOS Sans'**|
+| fontFamily  | [ResourceStr](ts-types.md#resourcestr) \| number \| string | No| Font family. The HarmonyOS Sans font and [register custom fonts](../apis/js-apis-font.md) are supported.<br>Default font: **'HarmonyOS Sans'**|
 | decoration  | {<br>type: [TextDecorationType](ts-appendix-enums.md#textdecorationtype),<br>color?: [ResourceColor](ts-types.md#resourcecolor)<br>} | No| Style and color of the text decorative line.<br>Default value: {<br>type: TextDecorationType.None,<br>color: Color.Black<br>}|
 
 

en/application-dev/reference/arkui-ts/ts-basic-components-span.md

@@ -58,6 +58,12 @@ struct SpanExample {
   build() {
     Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Start, justifyContent: FlexAlign.SpaceBetween }) {
       Text('Basic Usage').fontSize(9).fontColor(0xCCCCCC)
+      Text() {
+        Span('In Line')
+        Span(' Component')
+        Span(' !')
+      }
+
       Text() {
         Span('This is the Span component').fontSize(12).textCase(TextCase.Normal)
           .decoration({ type: TextDecorationType.None, color: Color.Red })
@@ -118,4 +124,4 @@ struct SpanExample {
 }
 ```
 
-![span](figures/span.png)
+![Span](figures/span.png)

en/application-dev/reference/arkui-ts/ts-basic-components-textinput.md

@@ -46,7 +46,7 @@ Among the [universal attributes](ts-universal-attributes-size.md) and [universal
 | caretStyle<sup>10+</sup> | {<br>width: [Length](ts-types.md#length)<br>} | Caret style.                                       |
 | caretPosition<sup>10+</sup> | number | Caret position.|
 | showUnit<sup>10+</sup>                | [CustomBuilder](ts-types.md#CustomBuilder8)         | Unit for content in the component.<br>By default, there is no unit.|
-| showError<sup>10+</sup> | string \| undefined | Error text displayed when an error occurs.<br>By default, no error text is displayed.|
+| showError<sup>10+</sup> | string \| undefined | Error message displayed when an error occurs.<br>By default, no error message is displayed.<br>**NOTE**<br>If the parameter type is string and the input content does not comply with specifications, the error message is displayed. If the parameter type is undefined, no error message is displayed. See [Example 2](#example-2).|
 | showUnderline<sup>10+</sup> | boolean | Whether to show an underline.<br>Default value: **false**|
 | passwordIcon<sup>10+</sup> | [PasswordIcon](#passwordicon10) | Password icon to display at the end of the password text box.<br>By default, the system-provided icon is used.|
 | enableKeyboardOnFocus<sup>10+</sup> | boolean | Whether to enable the input method when the component obtains focus.<br>Default value: **true**  |
@@ -249,17 +249,20 @@ struct TextInputExample {
 ### Example 2
 
 ```ts
-// xxx.ets
 @Entry
 @Component
 struct TextInputExample {
-  @State PassWordSrc1:Resource=$r('app.media.icon')
-  @State PassWordSrc2:Resource=$r('app.media.icon')
+  @State PassWordSrc1: Resource = $r('app.media.onIcon')
+  @State PassWordSrc2: Resource = $r('app.media.offIcon')
+  @State TextError: string = undefined
+  @State Text: string = ''
+  @State NameText: string = 'test'
+
   @Builder itemEnd() {
     Select([{ value: 'KB' },
       { value: 'MB' },
-      { value: 'GB'},
-      { value: 'TB',}])
+      { value: 'GB' },
+      { value: 'TB', }])
       .height("48vp")
       .borderRadius(0)
       .selected(2)
@@ -270,33 +273,52 @@ struct TextInputExample {
       .selectedOptionFont({ size: 20, weight: 400 })
       .optionFont({ size: 20, weight: 400 })
       .backgroundColor(Color.Transparent)
-      .responseRegion({height:"40vp",width:"80%",x:'10%',y:'6vp'})
+      .responseRegion({ height: "40vp", width: "80%", x: '10%', y: '6vp' })
       .onSelect((index: number) => {
         console.info('Select:' + index)
       })
   }
 
   build() {
-    Column() {
+    Column({ space: 20 }) {
       // Customize the password icon.
-      TextInput({ placeholder: 'user define password icon' })
+      TextInput({ placeholder: 'Custom password icon' })
         .type(InputType.Password)
-        .width(400)
+        .width(380)
         .height(60)
-        .passwordIcon({onIconSrc:this.PassWordSrc1,offIconSrc : this.PassWordSrc2})
+        .passwordIcon({ onIconSrc: this.PassWordSrc1, offIconSrc: this.PassWordSrc2 })
       // Show an underline.
-      TextInput({ placeholder: 'underline style' })
+      TextInput({ placeholder: 'Underline style' })
         .showUnderline(true)
-        .width(400)
+        .width(380)
         .height(60)
         .showError('Error')
         .showUnit(this.itemEnd.bind(this))
+
+      Text (`User name: ${this.Text}`)
+        .width('95%')
+      TextInput({ placeholder: 'Enter user name', text: this.Text })
+        .showUnderline(true)
+        .width(380)
+        .showError(this.TextError)
+        .onChange((value: string) => {
+          this.Text = value
+        })
+        .onSubmit(() => {// If the entered user name is incorrect, the text box will be cleared and the error message will be displayed.
+          if (this.Text == this.NameText) {
+            this.TextError = undefined
+          } else {
+            this.TextError ='Incorrect user name.'
+            this.Text = ''
+          }
+        })
+
     }.width('100%')
   }
 }
 ```
 
-![showUnit](figures/showUnit.png)
+![TextInputError](figures/TextInputError.png)
 
 ### Example 3
 

en/application-dev/reference/arkui-ts/ts-basic-components-timepicker.md

@@ -45,10 +45,12 @@ In addition to the [universal events](ts-universal-events-click.md), the followi
 
 ## TimePickerResult
 
-| Name    | Type  | Description     |
-| ------ | ------ | ------- |
-| hour   | number | Hour portion of the selected time.|
-| minute | number | Minute portion of the selected time.|
+Describes a time in 24-hour format.
+
+| Name  | Type| Description                               |
+| ------ | -------- | ----------------------------------- |
+| hour   | number   | Hour portion of the selected time.<br>Value range: [0-23]|
+| minute | number   | Minute portion of the selected time.<br>Value range: [0-59]|
 
 
 ## Example

en/application-dev/reference/arkui-ts/ts-components-canvas-imagebitmap.md

@@ -24,8 +24,8 @@ Since API version 9, this API is supported in ArkTS widgets.
 
 | Name| Type| Description|
 | -------- | -------- | -------- |
-| width | number | Pixel width of the **ImageBitmap** object.<br>Since API version 9, this API is supported in ArkTS widgets.|
-| height | number | Pixel height of the **ImageBitmap** object.<br>Since API version 9, this API is supported in ArkTS widgets.|
+| width | number | Pixel width of the **ImageBitmap** object. The current value is **0**.<br>Since API version 9, this API is supported in ArkTS widgets.|
+| height | number | Pixel height of the **ImageBitmap** object. The current value is **0**.<br>Since API version 9, this API is supported in ArkTS widgets.|
 
 **Example**
 

en/application-dev/reference/arkui-ts/ts-container-swiper.md

@@ -18,6 +18,8 @@ This component can contain child components.
 >  When the **\<Swiper>** component's **displayMode** attribute is set to **SwiperDisplayMode.AutoLinear** or its **displayCount** attribute is set to **'auto'**, the child component whose **visibility** attribute is set to **None** does not take up space in the viewport, but this does not affect the number of navigation dots.
 >
 >  If the **visibility** attribute of a child component is set to **None** or **Hidden**, it takes up space in the viewport, but is not displayed.
+>
+>  When the number of child components is less than or equal to the total number of allowed nodes (totalDisplayCount = DisplayCount + prevMargin? (1: 0 ) + nextMargin? (1: 0 )) in the content area, the **\<Swiper>** component uses the non-looping mode for layout. In this case, the child components specified by **nextMargin** and **prevMargin** take up space in the viewport, but are not displayed. The specifications of the **\<Swiper>** component are calculated based on the value of **totalDisplayCount**.
 
 
 ## APIs

en/application-dev/reference/arkui-ts/ts-methods-action-sheet.md

@@ -12,7 +12,7 @@ An action sheet is a dialog box that displays actions a user can take.
 
 ## ActionSheet.show
 
-show(value: { title: string | Resource, message: string | Resource, confirm?: {value: string | Resource, action:() => void}, cancel?:()=>void, sheets: Array<SheetInfo>, autoCancel?:boolean, alignment?: DialogAlignment, offset?: { dx: number | string | Resource; dy: number | string | Resource } })
+show(value: { title: string | Resource, subtitle: Resource, message: string | Resource, confirm?: {enabled?: boolean, defaultFocus?: boolean, style?: DialogButtonStyle, value: string | Resource, action:() => void}, cancel?:()=>void, sheets: Array<SheetInfo>, autoCancel?:boolean, alignment?: DialogAlignment, offset?: { dx: number | string | Resource; dy: number | string | Resource } })
 
 Defines and shows the action sheet.
 
@@ -21,13 +21,15 @@ Defines and shows the action sheet.
 | Name       | Type                   | Mandatory | Description                         |
 | ---------- | -------------------------- | ------- | ----------------------------- |
 | title      | [Resource](ts-types.md#resource) \| string | Yes    |  Title of the dialog box.|
+| subtitle<sup>10+</sup> | [ResourceStr](ts-types.md#resourcestr) | No| Subtitle of the dialog box.|
 | message    | [Resource](ts-types.md#resource) \| string | Yes    | Content of the dialog box. |
 | autoCancel | boolean                           | No    | Whether to close the dialog box when the overlay is clicked.<br>Default value: **true**<br>The value **true** means to close the dialog box when the overlay is clicked, and **false** means the opposite.|
-| confirm    | {<br>value: [ResourceStr](ts-types.md#resourcestr),<br>action: () =&gt; void<br>} | No | Text content of the confirm button and callback upon button clicking.<br>Default value:<br>**value**: button text.<br>**action**: callback upon button clicking.|
+| confirm    | {<br>enabled<sup>10+</sup>?: boolean,<br>defaultFocus<sup>10+</sup>?: boolean,<br>style<sup>10+</sup>?: [DialogButtonStyle](#dialogbuttonstyle10),<br>value: [ResourceStr](ts-types.md#resourcestr),<br>action: () =&gt; void<br>} | No | Information about the confirm button.<br>**enabled**: whether to respond when the button is clicked.<br>Default value: **true**<br>**defaultFocus**: whether the button is the default focus.<br>Default value: **false**<br>**style**: button style.<br>Default value: **DialogButtonStyle.DEFAULT**<br>**value**: button text.<br>**action**: callback upon button clicking.|
 | cancel     | () =&gt; void           | No    | Callback invoked when the dialog box is closed after the overlay is clicked.  |
 | alignment  | [DialogAlignment](ts-methods-alert-dialog-box.md#dialogalignment) | No    |  Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Bottom**|
-| offset     | {<br>dx: Length,<br>dy: Length<br>} | No     | Offset of the dialog box relative to the alignment position.<br>Default value: {<br>dx: 0,<br>dy: 0<br>} |
+| offset     | {<br>dx: Length,<br>dy: Length<br>} | No     | Offset of the dialog box relative to the alignment position.{<br>dx: 0,<br>dy: 0<br>} |
 | sheets     | Array&lt;SheetInfo&gt; | Yes      | Options in the dialog box. Each option supports the image, text, and callback.|
+| maskRect<sup>10+</sup> | [Rectangle](ts-methods-alert-dialog-box.md#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
 
 ## SheetInfo
 
@@ -37,6 +39,13 @@ Defines and shows the action sheet.
 | icon   | [ResourceStr](ts-types.md#resourcestr) | No  | Sheet icon. By default, no icon is displayed.    |
 | action | ()=&gt;void                                          | Yes  | Callback when the sheet is selected.|
 
+## DialogButtonStyle<sup>10+</sup>
+
+| Name     | Description.                             |
+| --------- | --------------------------------- |
+| DEFAULT   | Blue text on white background (black background under the dark theme).|
+| HIGHLIGHT | White text on blue background.                       |
+
 
 ## Example
 
@@ -51,9 +60,11 @@ struct ActionSheetExample {
         .onClick(() => {
           ActionSheet.show({
             title: 'ActionSheet title',
+            subtitle: 'ActionSheet subtitle',
             message: 'message',
             autoCancel: true,
             confirm: {
+              defaultFocus: true,
               value: 'Confirm button',
               action: () => {
                 console.log('Get Alert Dialog handled')
@@ -92,4 +103,4 @@ struct ActionSheetExample {
 }
 ```
 
-![en-us_image_0000001241668363](figures/en-us_image_0000001241668363.gif)
+![en-us_image_action](figures/en-us_image_action.gif)

en/application-dev/reference/arkui-ts/ts-methods-alert-dialog-box.md

@@ -14,32 +14,105 @@ You can set the text content and response callback for an alert dialog box.
 
 | Name   | Type | Description|
 | ---- | --------------- | -------- |
-| show | [AlertDialogParamWithConfirm](#alertdialogparamwithconfirm) \| [AlertDialogParamWithButtons](#alertdialogparamwithbuttons)  | Defines and displays the **\<AlertDialog>** component. |
+| show | [AlertDialogParamWithConfirm](#alertdialogparamwithconfirm) \| [AlertDialogParamWithButtons](#alertdialogparamwithbuttons) \| [AlertDialogParamWithOptions](#alertdialogparamwithoptions10) | Defines and displays the **\<AlertDialog>** component.|
 
 ## AlertDialogParamWithConfirm
 | Name      | Type    | Mandatory    | Description        |
 | ---------- | ---------------- | ---------- | ------------------------------- |
 | title      | [ResourceStr](ts-types.md#resourcestr) | No   | Title of the dialog box.|
+| subtitle<sup>10+</sup> | [ResourceStr](ts-types.md#resourcestr) | No| Subtitle of the dialog box.|
 | message    | [ResourceStr](ts-types.md#resourcestr) | Yes   | Content of the dialog box.|
 | autoCancel | boolean | No  | Whether to close the dialog box when the overlay is clicked.<br>Default value: **true**|
-| confirm    | {<br>value: [ResourceStr](ts-types.md#resourcestr),<br>fontColor?: [ResourceColor](ts-types.md#resourcecolor),<br>backgroundColor?:  [ResourceColor](ts-types.md#resourcecolor),<br>action: () =&gt; void<br>} | No  | Text content, text color, background color, and click callback of the confirm button.|
+| confirm    | {<br>enabled<sup>10+</sup>?: boolean,<br>defaultFocus<sup>10+</sup>?: boolean,<br>style<sup>10+</sup>?: [DialogButtonStyle](#dialogbuttonstyle10),<br>value: [ResourceStr](ts-types.md#resourcestr),<br>fontColor?: [ResourceColor](ts-types.md#resourcecolor),<br>backgroundColor?:  [ResourceColor](ts-types.md#resourcecolor),<br>action: () =&gt; void<br>} | No  | Information about the confirm button.<br>**enabled**: whether to respond when the button is clicked.<br>Default value: **true**<br>**defaultFocus**: whether the button is the default focus.<br>Default value: **false**<br>**style**: button style.<br>Default value: **DialogButtonStyle.DEFAULT**<br>**value**: text of the button.<br>**fontColor**: font color of the button.<br>**backgroundColor**: background color of the button.<br>**action**: callback when the button is selected.|
 | cancel     | () =&gt; void      | No    | Callback invoked when the dialog box is closed after the overlay is clicked.|
 | alignment  | [DialogAlignment](#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
 | offset     | [Offset](ts-types.md#offset) | No    | Offset of the dialog box relative to the alignment position.<br>Default value: **{ dx: 0 , dy: 0 }**|
 | gridCount  | number                       | No    | Number of grid columns occupied by the width of the dialog box.<br>Default value: **4**|
+| maskRect<sup>10+</sup>| [Rectangle](#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
+
+Priorities of the **confirm** parameters: **fontColor** and **backgroundColor** > **style** > **defaultFocus**
+
+| backgroundColor | fontColor | style                       | defaultFocus | Effect    |
+| --------------- | --------- | --------------------------- | ------------ | -------- |
+| Green           | Red     | -                           | -            | Red text on green background|
+| Green           | -         | DialogButtonStyle.HIGHLIGHT | -            | White text on green background|
+| Green           | -         | DialogButtonStyle.DEFAULT   | -            | Blue text on green background|
+| Green           | -         | -                           | TRUE         | White text on green background|
+| Green           | -         | -                           | FALSE/-      | Blue text on green background|
+| -               | Red     | DialogButtonStyle.HIGHLIGHT | -            | Red text on blue background|
+| -               | Red     | DialogButtonStyle.DEFAULT   | -            | Red text on white background|
+| -               | Red     | -                           | TRUE         | Red text on blue background|
+| -               | Red     | -                           | FALSE/-      | Red text on white background|
+| -               | -         | DialogButtonStyle.HIGHLIGHT | -            | White text on blue background|
+| -               | -         | DialogButtonStyle.DEFAULT   | -            | Blue text on white background|
+| -               | -         | -                           | TRUE         | White text on blue background|
+| -               | -         | -                           | FALSE/-      | Blue text on white background|
 
 ## AlertDialogParamWithButtons
 | Name            | Type               | Mandatory    | Description                    |
 | --------------- | ---------------------- | ------------ | --------------------- |
 | title           | [ResourceStr](ts-types.md#resourcestr) | No    | Title of the dialog box.             |
+| subtitle<sup>10+</sup> | [ResourceStr](ts-types.md#resourcestr) | No| Subtitle of the dialog box.|
+| message         | [ResourceStr](ts-types.md#resourcestr) | Yes    | Content of the dialog box.             |
+| autoCancel      | boolean           | No  | Whether to close the dialog box when the overlay is clicked.<br>Default value: **true**     |
+| primaryButton   | {<br>enabled<sup>10+</sup>?: boolean,<br>defaultFocus<sup>10+</sup>?: boolean,<br>style<sup>10+</sup>?: [DialogButtonStyle](#dialogbuttonstyle10),<br>value: [ResourceStr](ts-types.md#resourcestr),<br>fontColor?: [ResourceColor](ts-types.md#resourcecolor),<br>backgroundColor?: [ResourceColor](ts-types.md#resourcecolor),<br>action: () =&gt; void;<br>} | No| Information about the confirm button.<br>**enabled**: whether to respond when the button is clicked.<br>Default value: **true**<br>**defaultFocus**: whether the button is the default focus.<br>Default value: **false**<br>**style**: button style.<br>Default value: **DialogButtonStyle.DEFAULT**<br>**value**: text of the button.<br>**fontColor**: font color of the button.<br>**backgroundColor**: background color of the button.<br>**action**: callback when the button is selected.|
+| secondaryButton | {<br>enabled<sup>10+</sup>?: boolean,<br>defaultFocus<sup>10+</sup>?: boolean,<br>style<sup>10+</sup>?: [DialogButtonStyle](#dialogbuttonstyle10),<br>value: [ResourceStr](ts-types.md#resourcestr),<br>fontColor?: [ResourceColor](ts-types.md#resourcecolor),<br>backgroundColor?: [ResourceColor](ts-types.md#resourcecolor),<br>action: () =&gt; void;<br>} | No | Information about the confirm button.<br>**enabled**: whether to respond when the button is clicked.<br>Default value: **true**<br>**defaultFocus**: whether the button is the default focus.<br>Default value: **false**<br>**style**: button style.<br>Default value: **DialogButtonStyle.DEFAULT**<br>**value**: text of the button.<br>**fontColor**: font color of the button.<br>**backgroundColor**: background color of the button.<br>**action**: callback when the button is selected.|
+| cancel          | () =&gt; void      | No | Callback invoked when the dialog box is closed after the overlay is clicked.        |
+| alignment       | [DialogAlignment](#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
+| offset          | [Offset](ts-types.md#offset) | No | Offset of the dialog box relative to the alignment position.|
+| gridCount       | number                       | No | Number of grid columns occupied by the width of the dialog box.|
+| maskRect<sup>10+</sup> | [Rectangle](#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
+
+## AlertDialogParamWithOptions<sup>10+</sup>
+| Name            | Type               | Mandatory    | Description                    |
+| --------------- | ---------------------- | ------------ | --------------------- |
+| title           | [ResourceStr](ts-types.md#resourcestr) | No    | Title of the dialog box.             |
+| subtitle<sup>10+</sup>           | [ResourceStr](ts-types.md#resourcestr) | No    | Subtitle of the dialog box.             |
 | message         | [ResourceStr](ts-types.md#resourcestr) | Yes    | Content of the dialog box.             |
 | autoCancel      | boolean           | No  | Whether to close the dialog box when the overlay is clicked.<br>Default value: **true**     |
-| primaryButton   | {<br>value: [ResourceStr](ts-types.md#resourcestr),<br>fontColor?: [ResourceColor](ts-types.md#resourcecolor),<br>backgroundColor?: [ResourceColor](ts-types.md#resourcecolor),<br>action: () =&gt; void;<br>} | No| Text content, text color, background color, and click callback of the primary button.|
-| secondaryButton | {<br>value: [ResourceStr](ts-types.md#resourcestr),<br>fontColor?: [ResourceColor](ts-types.md#resourcecolor),<br>backgroundColor?: [ResourceColor](ts-types.md#resourcecolor),<br>action: () =&gt; void;<br>} | No | Text content, text color, background color, and click callback of the secondary button.|
 | cancel          | () =&gt; void      | No | Callback invoked when the dialog box is closed after the overlay is clicked.        |
 | alignment       | [DialogAlignment](#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
 | offset          | [Offset](ts-types.md#offset) | No | Offset of the dialog box relative to the alignment position.|
 | gridCount       | number                       | No | Number of grid columns occupied by the width of the dialog box.|
+| maskRect<sup>10+</sup>| [Rectangle](#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
+| buttons<sup>10+</sup>       | Array&lt;[AlertDialogButtonOptions](#alertdialogbuttonoptions10)&gt;                 | No | Buttons in the dialog box.|
+|buttonDirection<sup>10+</sup>      | [DialogButtonDirection](#dialogbuttondirection10)| No | Direction in which buttons are laid out.<br>Default value: **DialogButtonDirection.AUTO**<br>When there are more than three buttons, the Auto mode (which automatically switches to the vertical layout when there are more than two buttons) is recommended. In non-Auto mode, buttons that extend beyond the display area are clipped.|
+
+## AlertDialogButtonOptions<sup>10+</sup>
+| Name            | Type               | Mandatory    | Description                    |
+| ------------------| ---------------------- | ------------ | --------------------- |
+| enabled           | boolean | No    | Whether to respond when the button is clicked.<br>Default value: **true**             |
+| defaultFocus           | boolean | No    | Whether the button is the default focus.<br>Default value: **false**             |
+| style           | [DialogButtonStyle](#dialogbuttonstyle10) | No    | Style of the button.<br>Default value: **DialogButtonStyle.DEFAULT**             |
+| value           | [ResourceStr](ts-types.md#resourcestr) | Yes    | Text of the button. If the value is null, the button is not displayed.             |
+| fontColor           | [ResourceColor](ts-types.md#resourcecolor) | No    | Font color of the button.             |
+| backgroundColor           | [ResourceColor](ts-types.md#resourcecolor) | No    | Background color of the button.             |
+| action           | 	() => void | Yes    | Callback when the button is selected.             |
+
+## DialogButtonDirection<sup>10+</sup>
+| Name                      | Description     |
+| -------------------------- | --------- |
+| AUTO                      | Buttons are laid out horizontally when there are two or fewer buttons and vertically otherwise.|
+| HORIZONTAL                      | Buttons are laid out horizontally.|
+| VERTICAL                      | Buttons are laid out vertically.|
+
+Priorities of the **confirm** parameters: **fontColor** and **backgroundColor** > **style** > **defaultFocus**
+
+| backgroundColor | fontColor | style                       | defaultFocus | Effect    |
+| --------------- | --------- | --------------------------- | ------------ | -------- |
+| Green           | Red     | -                           | -            | Red text on green background|
+| Green           | -         | DialogButtonStyle.HIGHLIGHT | -            | White text on green background|
+| Green           | -         | DialogButtonStyle.DEFAULT   | -            | Blue text on green background|
+| Green           | -         | -                           | TRUE         | White text on green background|
+| Green           | -         | -                           | FALSE/-      | Blue text on green background|
+| -               | Red     | DialogButtonStyle.HIGHLIGHT | -            | Red text on blue background|
+| -               | Red     | DialogButtonStyle.DEFAULT   | -            | Red text on white background|
+| -               | Red     | -                           | TRUE         | Red text on blue background|
+| -               | Red     | -                           | FALSE/-      | Red text on white background|
+| -               | -         | DialogButtonStyle.HIGHLIGHT | -            | White text on blue background|
+| -               | -         | DialogButtonStyle.DEFAULT   | -            | Blue text on white background|
+| -               | -         | -                           | TRUE         | White text on blue background|
+| -               | -         | -                           | FALSE/-      | Blue text on white background|
 
 ## DialogAlignment
 
@@ -56,6 +129,32 @@ You can set the text content and response callback for an alert dialog box.
 | BottomStart<sup>8+</sup> | Bottom left alignment.  |
 | BottomEnd<sup>8+</sup>   | Bottom right alignment.  |
 
+## Rectangle<sup>10+</sup>
+
+The **Rectangle** type is used to represent a mask area of a dialog box.
+
+| Name    | Type                          | Mandatory| Description                               |
+|--------|------------------------------|----|-----------------------------------|
+| x      | [Length](ts-types.md#length) | No | X coordinate of the mask area of the dialog box relative to the upper left corner of the window.<br>Default value: **0vp**|
+| y      | [Length](ts-types.md#length) | No | Y coordinate of the mask area of the dialog box relative to the upper left corner of the window.<br>Default value: **0vp**|
+| width  | [Length](ts-types.md#length) | No | Width of the mask area of the dialog box.<br>Default value: **'100%'**       |
+| height | [Length](ts-types.md#length) | No | Height of the mask area of the dialog box.<br>Default value: **'100%'**       |
+
+>  **NOTE**
+>
+>  **x** and **y** can be set to a positive or negative percentage value. When **x** is set to **'100%'**, the mask area is moved rightward by the window width. When **x** is set to **'-100%'**, the mask area is moved leftward by the window width. When **y** is set to **'100%'**, the mask area is moved downward by the window height. When **y** is set to **'-100%'**, the mask area is moved upward by the window height.
+>
+>  **width** and **height** can be set in percentage and can only be set to positive values. If they are set to negative values, the default values are used instead.
+>
+>  The percentage is calculated based on the width and height of the window.
+
+## DialogButtonStyle<sup>10+</sup>
+
+| Name     | Description                             |
+| --------- | --------------------------------- |
+| DEFAULT   | Blue text on white background (black background under the dark theme).|
+| HIGHLIGHT | White text on blue background.                       |
+
 ## Example
 
 ```ts
@@ -93,6 +192,7 @@ struct AlertDialogExample {
           AlertDialog.show(
             {
               title: 'title',
+              subtitle: 'subtitle',
               message: 'text',
               autoCancel: true,
               alignment: DialogAlignment.Bottom,
@@ -105,6 +205,9 @@ struct AlertDialogExample {
                 }
               },
               secondaryButton: {
+                enabled: true,
+                defaultFocus: true,
+                style: DialogButtonStyle.HIGHLIGHT,
                 value: 'ok',
                 action: () => {
                   console.info('Callback when the second button is clicked')
@@ -116,9 +219,50 @@ struct AlertDialogExample {
             }
           )
         }).backgroundColor(0x317aff)
+        Button('three button dialog')
+        .onClick(() => {
+          AlertDialog.show(
+            {
+              title: 'title',
+              subtitle: 'subtitle',
+              message: 'text',
+              autoCancel: true,
+              alignment: DialogAlignment.Bottom,
+              gridCount: 4,
+              offset: { dx: 0, dy: -20 },
+              buttonDirection: DialogButtonDirection.HORIZONTAL,
+              buttons: [
+                {
+                  value: 'Button',
+                  action: () => {
+                    console.info('Callback when button1 is clicked')
+                  }
+                },
+                {
+                  value: 'Button',
+                  action: () => {
+                    console.info('Callback when button2 is clicked')
+                  }
+                },
+                {
+                  value: 'Button',
+                  enabled: true,
+                  defaultFocus: true,
+                  style: DialogButtonStyle.HIGHLIGHT,
+                  action: () => {
+                    console.info('Callback when button3 is clicked')
+                  }
+                },
+              ],
+              cancel: () => {
+                console.info('Closed callbacks')
+              }
+            }
+          )
+        }).backgroundColor(0x317aff)
     }.width('100%').margin({ top: 5 })
   }
 }
 ```
 
-![en-us_image_0000001174582844](figures/en-us_image_0000001174582844.gif)
+![en-us_image_alert](figures/en-us_image_alert.gif)

en/application-dev/reference/arkui-ts/ts-methods-custom-dialog-box.md

@@ -11,8 +11,7 @@ A custom dialog box is a dialog box you customize by using APIs of the **CustomD
 
 ## APIs
 
-CustomDialogController(value:{builder: CustomDialog, cancel?: () => void, autoCancel?: boolean, alignment?: DialogAlignment, offset?: Offset, customStyle?: boolean, gridCount?: number, maskColor?: ResourceColor, openAnimation?: AnimateParam, closeAniamtion?: AnimateParam, showInSubWindow?: boolean})
-
+CustomDialogController(value:{builder: CustomDialog, cancel?: () => void, autoCancel?: boolean, alignment?: DialogAlignment, offset?: Offset, customStyle?: boolean, gridCount?: number, maskColor?: ResourceColor, maskRect?: Rectangle, openAnimation?: AnimateParam, closeAniamtion?: AnimateParam, showInSubWindow?: boolean, backgroundColor?:ResourceColor, cornerRadius?:Dimension \| BorderRadiuses})
 
 **Parameters**
 
@@ -26,9 +25,12 @@ CustomDialogController(value:{builder: CustomDialog, cancel?: () => void, aut
 | customStyle                   | boolean                                  | No   | Whether to use a custom style for the dialog box.<br>Default value: **false**, which means that the dialog box automatically adapts its width to the grid system and its height to the child components; the maximum height is 90% of the container height; the rounded corner is 24 vp.|
 | gridCount<sup>8+</sup>        | number                                   | No   | Number of [grid columns](../../ui/arkts-layout-development-grid-layout.md) occupied by the dialog box.<br>The default value is subject to the window size, and the maximum value is the maximum number of columns supported by the system. If this parameter is set to an invalid value, the default value is used.|
 | maskColor<sup>10+</sup>       | [ResourceColor](ts-types.md#resourcecolor) | No   | Custom mask color.<br>Default value: **0x33000000**             |
+| maskRect<sup>10+</sup>        | [Rectangle](ts-methods-alert-dialog-box.md#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
 | openAnimation<sup>10+</sup>   | [AnimateParam](ts-explicit-animation.md#animateparam) | No   | Parameters for defining the open animation of the dialog box.<br>**NOTE**<br>**iterations**: The default value is **1**, indicating that the animation is played once; any other value evaluates to the default value.<br>**playMode**: The default value is **PlayMode.Normal**; any other value evaluates to the default value.|
 | closeAniamtion<sup>10+</sup>  | [AnimateParam](ts-explicit-animation.md#animateparam) | No   | Parameters for defining the close animation of the dialog box.<br>**NOTE**<br>**iterations**: The default value is **1**, indicating that the animation is played once; any other value evaluates to the default value.<br>**playMode**: The default value is **PlayMode.Normal**; any other value evaluates to the default value.                   |
 | showInSubWindow<sup>10+</sup> | boolean                                  | No   | Whether to display a dialog box in a subwindow.<br>Default value: **false**, indicating that the dialog box is not displayed in the subwindow<br>**NOTE**<br>A dialog box whose **showInSubWindow** attribute is **true** cannot trigger the display of another dialog box whose **showInSubWindow** attribute is also **true**.|
+| backgroundColor<sup>10+</sup> | [ResourceColor](ts-types.md#resourcecolor)      | No  | Background color of the dialog box.                                          |
+| cornerRadius<sup>10+</sup>    | [BorderRadiuses](ts-types.md#borderradiuses9) \| [Dimension](ts-types.md#dimension10) | No  | Radius of the rounded corners of the background.<br>You can set separate radiuses for the four rounded corners.<br>Default value: **{ topLeft: '24vp', topRight: '24vp', bottomLeft: '24vp', bottomRight: '24vp' }**<br>**NOTE**<br>This attribute must be used together with the [borderRadius](ts-universal-attributes-border.md) attribute.|
 
 ## CustomDialogController
 
@@ -89,8 +91,8 @@ struct CustomDialogExample {
             this.confirm()
           }).backgroundColor(0xffffff).fontColor(Color.Red)
       }.margin({ bottom: 10 })
-    }
-    // The default value of borderRadius is 24vp. The border attribute must be used together with the borderRadius attribute.
+    }.borderRadius(10)
+    // When using the border or cornerRadius attribute, use it together with the borderRadius attribute.
   }
 }
 
@@ -111,13 +113,15 @@ struct CustomDialogUser {
     alignment: DialogAlignment.Default,
     offset: { dx: 0, dy: -20 },
     gridCount: 4,
-    customStyle: false
+    customStyle: false,
+    backgroundColor: 0xd9ffffff,
+    cornerRadius: 10,
   })
 
   // Delete the dialogController instance and set it to undefined when the custom component is about to be destroyed.
   aboutToDisappear() {
     delete this.dialogController, // Delete the dialogController instance.
-    this.dialogController = undefined // Set dialogController to undefined.
+    this.dialogController = undefined //Set dialogController to undefined.
   }
 
   onCancel() {
@@ -145,4 +149,4 @@ struct CustomDialogUser {
 }
 ```
 
-![en-us_image_0000001212058470](figures/en-us_image_0000001212058470.gif)
+![en-us_image_custom](figures/en-us_image_custom.gif)

en/application-dev/reference/arkui-ts/ts-methods-datepicker-dialog.md

@@ -29,6 +29,9 @@ Shows a date picker dialog box.
 | disappearTextStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width for the top and bottom items.<br>Default value:<br>{<br>color: '#ff182431',<br>font: {<br>size: '14fp', <br>weight: FontWeight.Regular<br>}<br>} |
 | textStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width of all items except the top, bottom, and selected items.<br>Default value:<br>{<br>color: '#ff182431',<br>font: {<br>size: '16fp', <br>weight: FontWeight.Regular<br>}<br>} |
 | selectedTextStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width of the selected item.<br>Default value:<br>{<br>color: '#ff007dff',<br>font: {<br>size: '20vp', <br>weight: FontWeight.Medium<br>}<br>} |
+| alignment<sup>10+</sup>  | [DialogAlignment](ts-methods-alert-dialog-box.md#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
+| offset<sup>10+</sup>     | [Offset](ts-types.md#offset) | No    | Offset of the dialog box based on the **alignment** settings.<br>Default value: **{ dx: 0 , dy: 0 }**|
+| maskRect<sup>10+</sup>| [Rectangle](ts-methods-alert-dialog-box.md#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
 | onAccept<sup>(deprecated)</sup> | (value: [DatePickerResult](ts-basic-components-datepicker.md#DatePickerResult)) => void | No| Callback invoked when the OK button in the dialog box is clicked.<br>**NOTE**<br>This API is supported since API version 8 and deprecated since API version 10. You are advised to use **onDateAccept** instead.|
 | onCancel | () => void | No| Callback invoked when the Cancel button in the dialog box is clicked.|
 | onChange<sup>(deprecated)</sup> | (value: [DatePickerResult](ts-basic-components-datepicker.md#DatePickerResult)) => void | No| Callback invoked when the selected item in the picker changes.<br>**NOTE**<br>This API is supported since API version 8 and deprecated since API version 10. You are advised to use **onDateChange** instead.|

en/application-dev/reference/arkui-ts/ts-methods-textpicker-dialog.md

@@ -28,6 +28,9 @@ Shows a text picker in the given settings.
 | textStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width of all items except the top, bottom, and selected items.<br>Default value:<br>{<br>color: '#ff182431',<br>font: {<br>size: '16fp', <br>weight: FontWeight.Regular<br>}<br>} |
 | selectedTextStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width of the selected item.<br>Default value:<br>{<br>color: '#ff007dff',<br>font: {<br>size: '20vp', <br>weight: FontWeight.Medium<br>}<br>} |
 | canLoop<sup>10+</sup> | boolean | No| Whether to support scroll looping. The value **true** means to support scroll looping, and **false** means the opposite.<br>Default value: **true**|
+| alignment<sup>10+</sup>  | [DialogAlignment](ts-methods-alert-dialog-box.md#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
+| offset<sup>10+</sup>     | [Offset](ts-types.md#offset) | No    | Offset of the dialog box based on the **alignment** settings.<br>Default value: **{ dx: 0 , dy: 0 }**|
+| maskRect<sup>10+</sup>| [Rectangle](ts-methods-alert-dialog-box.md#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
 | onAccept | (value: [TextPickerResult](#textpickerresult)) => void | No|  Callback invoked when the OK button in the dialog box is clicked.|
 | onCancel | () => void | No| Callback invoked when the Cancel button in the dialog box is clicked.|
 | onChange | (value: [TextPickerResult](#textpickerresult)) => void | No|  Callback invoked when the selected item changes.|

en/application-dev/reference/arkui-ts/ts-methods-timepicker-dialog.md

@@ -26,6 +26,9 @@ Shows a time picker dialog box.
 | disappearTextStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width for the top and bottom items.<br>Default value:<br>{<br>color: '#ff182431',<br>font: {<br>size: '14fp', <br>weight: FontWeight.Regular<br>}<br>} |
 | textStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width of all items except the top, bottom, and selected items.<br>Default value:<br>{<br>color: '#ff182431',<br>font: {<br>size: '16fp', <br>weight: FontWeight.Regular<br>}<br>} |
 | selectedTextStyle<sup>10+</sup> | [PickerTextStyle](ts-basic-components-datepicker.md#pickertextstyle10) | No| Font color, font size, and font width of the selected item.<br>Default value:<br>{<br>color: '#ff007dff',<br>font: {<br>size: '20vp', <br>weight: FontWeight.Medium<br>}<br>} |
+| alignment<sup>10+</sup>  | [DialogAlignment](ts-methods-alert-dialog-box.md#dialogalignment) | No  | Alignment mode of the dialog box in the vertical direction.<br>Default value: **DialogAlignment.Default**|
+| offset<sup>10+</sup>     | [Offset](ts-types.md#offset) | No    | Offset of the dialog box based on the **alignment** settings.<br>Default value: **{ dx: 0 , dy: 0 }**|
+| maskRect<sup>10+</sup>| [Rectangle](ts-methods-alert-dialog-box.md#rectangle10) | No    | Mask area of the dialog box. Events outside the mask area are transparently transmitted, and events within the mask area are not.<br>Default value: **{ x: 0, y: 0, width: '100%', height: '100%' }**|
 | onAccept | (value: [TimePickerResult](ts-basic-components-timepicker.md#TimePickerResult)) => void | No| Callback invoked when the OK button in the dialog box is clicked.|
 | onCancel | () => void | No| Callback invoked when the Cancel button in the dialog box is clicked.|
 | onChange | (value: [TimePickerResult](ts-basic-components-timepicker.md#TimePickerResult)) => void | No| Callback invoked when the selected time changes.|

en/application-dev/reference/arkui-ts/ts-page-transition-animation.md

 # Page Transition
 
-You can customize the page entrance and exit animations in the **pageTransition** API for transition between pages.
+You can customize the page entrance and exit animations in the **pageTransition** API for transition between pages. For details, see [Page Transition Animation](../../ui/arkts-page-transition-animation.md).
 
 > **NOTE**
 >
 > This event is supported since API version 7. Updates will be marked with a superscript to indicate their earliest API version.
 >
+> To achieve a better transition effect, you are advised to use the [\<Navigation>](../../ui/arkts-navigation-navigation.md) component and [modal transition](../../ui/arkts-modal-transition.md).
 
 
 | Name               | Parameter                                                        | Mandatory| Description                                                    |
 | ------------------- | ------------------------------------------------------------ | ---- | ------------------------------------------------------------ |
-| PageTransitionEnter | {<br>type?: RouteType,<br>duration?: number,<br>curve?: [Curve](ts-appendix-enums.md#curve) \| string \| [ICurve](../apis/js-apis-curve.md#icurve)<sup>10+</sup>,<br>delay?: number<br>} | No  | Page entrance animation.<br>- **type**: route type for the page transition effect to take effect.<br>Default value: **RouteType.None**<br>- **duration**: animation duration.<br>Unit: ms<br>Default value: **1000**<br>- **curve**: animation curve. The value of the string type can be any of the following: "ease", "ease-in", "ease-out", "ease-in-out", "extreme-deceleration", "fast-out-linear-in", "fast-out-slow-in", "friction", "linear", "linear-out-slow-in", "rhythm", "sharp", "smooth".<br>Default value: **Curve.Linear**<br>- **delay**: animation delay.<br>Unit: ms<br>Default value: **0**<br>**NOTE**<br>If no match is found, the default page transition effect is used (which may vary according to the device). To disable the default page transition effect, set **duration** to **0**.|
-| PageTransitionExit  | {<br>type?: RouteType,<br>duration?: number,<br>curve?: [Curve](ts-appendix-enums.md#curve) \| string \| [ICurve](../apis/js-apis-curve.md#icurve)<sup>10+</sup>,<br>delay?: number<br>} | No  | Page exit animation.<br>- **type**: route type for the page transition effect to take effect.<br>Default value: **RouteType.None**<br>- **duration**: animation duration.<br>Unit: ms<br>Default value: **1000**<br>- **curve**: animation curve. The value range of the string type is the same as that of **PageTransitionEnter**.<br>Default value: **Curve.Linear**<br>- **delay**: animation delay.<br>Unit: ms<br>Default value: **0**<br>**NOTE**<br>If no match is found, the default page transition effect is used (which may vary according to the device). To disable the default page transition effect, set **duration** to **0**.|
+| PageTransitionEnter | {<br>type?: [RouteType](#routetype),<br>duration?: number,<br>curve?: [Curve](ts-appendix-enums.md#curve) \| string \| [ICurve](../apis/js-apis-curve.md#icurve)<sup>10+</sup>,<br>delay?: number<br>} | No  | Page entrance animation.<br>- **type**: route type for the page transition effect to take effect.<br>Default value: **RouteType.None**<br>- **duration**: animation duration.<br>Unit: ms<br>Default value: **1000**<br>- **curve**: animation curve. The value of the string type can be any of the following: "ease", "ease-in", "ease-out", "ease-in-out", "extreme-deceleration", "fast-out-linear-in", "fast-out-slow-in", "friction", "linear", "linear-out-slow-in", "rhythm", "sharp", "smooth".<br>Default value: **Curve.Linear**<br>- **delay**: animation delay.<br>Unit: ms<br>Default value: **0**<br>**NOTE**<br>If no match is found, the default page transition effect is used (which may vary according to the device). To disable the default page transition effect, set **duration** to **0**.|
+| PageTransitionExit  | {<br>type?: [RouteType](#routetype),<br>duration?: number,<br>curve?: [Curve](ts-appendix-enums.md#curve) \| string \| [ICurve](../apis/js-apis-curve.md#icurve)<sup>10+</sup>,<br>delay?: number<br>} | No  | Page exit animation.<br>- **type**: route type for the page transition effect to take effect.<br>Default value: **RouteType.None**<br>- **duration**: animation duration.<br>Unit: ms<br>Default value: **1000**<br>- **curve**: animation curve. The value range of the string type is the same as that of **PageTransitionEnter**.<br>Default value: **Curve.Linear**<br>- **delay**: animation delay.<br>Unit: ms<br>Default value: **0**<br>**NOTE**<br>If no match is found, the default page transition effect is used (which may vary according to the device). To disable the default page transition effect, set **duration** to **0**.|
 
 ## RouteType
 

en/application-dev/reference/arkui-ts/ts-types.md

@@ -158,7 +158,7 @@ The **Font** type is used to set the text style.
 | ------ | ---------------------------------------- | ---- | ---------------------------------------- |
 | size   | [Length](#length)                        | No   | Font size. If the value is of the number type, the unit fp is used. The value cannot be a percentage.<br>Default value: **16.0** |
 | weight | [FontWeight](ts-appendix-enums.md#fontweight) \| number \| string | No   | Font weight. For the number type, the value ranges from 100 to 900, at an interval of 100. A larger value indicates a thicker font.<br>Default value: **400** \| **FontWeight.Normal** |
-| family | string \| [Resource](#resource)          | No   | Font family of the text. Use commas (,) to separate multiple fonts. The priority of the fonts is the sequence in which they are placed. An example value is **'Arial, HarmonyOS Sans'**. Currently, only the **'HarmonyOS Sans'** font is supported.|
+| family | string \| [Resource](#resource)          | No   | Font family of the text. Use commas (,) to separate multiple fonts. The priority of the fonts is the sequence in which they are placed. An example value is **'Arial, HarmonyOS Sans'**. The HarmonyOS Sans font and [register custom fonts](../apis/js-apis-font.md) are supported.|
 | style  | [FontStyle](ts-appendix-enums.md#fontstyle) | No   | Font style.<br>Default value: **FontStyle.Normal**                              |
 
 ## Area<sup>8+</sup>

en/application-dev/reference/arkui-ts/ts-universal-attributes-border-image.md

@@ -16,14 +16,14 @@ You can draw an image around a component.
 
 This API is supported in ArkTS widgets.
 
-| Name    | Type                                      | Description                                      |
-| ------ | ---------------------------------------- | ---------------------------------------- |
+| Name  | Type                                                        | Description                                                        |
+| ------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | source | string \| [Resource](ts-types.md#resource) \| [linearGradient](ts-universal-attributes-gradient-color.md) | Source or gradient color of the border image.<br>**NOTE**<br>The border image source applies only to container components, such as **\<Row>**, **\<Column>**, and **\<Flex>**.|
-| slice  | [Length](ts-types.md#length) \| [EdgeWidths](ts-types.md#edgewidths9) | Slice width of the border image.<br>Default value: **0**                   |
-| width  | [Length](ts-types.md#length) \| [EdgeWidths](ts-types.md#edgewidths9) | Width of the border image.<br>Default value: **0**                     |
-| outset | [Length](ts-types.md#length) \| [EdgeWidths](ts-types.md#edgewidths9) | Amount by which the border image is extended beyond the border box.<br>Default value: **0**                 |
-| repeat | [RepeatMode](#repeatmode)            | Repeat mode of the border image.<br>Default value: **RepeatMode.Stretch** |
-| fill   | boolean                                  | Whether to fill the center of the border image.<br>Default value: **false**               |
+| slice  | [Length](ts-types.md#length) \| [EdgeWidths](ts-types.md#edgewidths9) | Slice width of the upper left corner, upper right corner, lower left corner, and lower right corner of the border image.<br>Default value: **0**<br>**NOTE**<br>If this parameter is set to a negative value, the default value is used.<br>When this parameter is set to a value of the [Length](ts-types.md#length) type, the value applies to the four corners in a unified manner.<br>When this parameter is set to a value of the [EdgeWidths](ts-types.md#edgewidths9) type:<br>- **Top**: slice height of the upper left or upper right corner of the image.<br>- **Bottom**: slice height of the lower left or lower right corner of the image.<br>- **Left**: slice width of the upper left or lower left corner of the image.<br>- **Right**: slice width of the upper right or lower right corner of the image.|
+| width  | [Length](ts-types.md#length) \| [EdgeWidths](ts-types.md#edgewidths9) | Width of the border image.<br>Default value: **0**<br>**NOTE**<br>If this parameter is set to a negative value, the default value is used.<br>When this parameter is set to a value of the [Length](ts-types.md#length) type, the value applies to the four corners in a unified manner.<br>When this parameter is set to a value of the [EdgeWidths](ts-types.md#edgewidths9) type:<br>- **Top**: width of the top edge of the border image.<br>- **Bottom**: width of the bottom edge of the border image.<br>- **Left**: width of the left edge of the border image.<br>- **Right**: width of the right edge of the border image.<br>If this parameter is set to a negative value, the value **1** is used.|
+| outset | [Length](ts-types.md#length) \| [EdgeWidths](ts-types.md#edgewidths9) | Amount by which the border image is extended beyond the border box.<br>Default value: **0**<br>**NOTE**<br>If this parameter is set to a negative value, the default value is used.<br>When this parameter is set to a value of the [Length](ts-types.md#length) type, the value applies to the four corners in a unified manner.<br>When this parameter is set to a value of the [EdgeWidths](ts-types.md#edgewidths9) type:<br>- **Top**: amount by which the top edge of the border image is extended beyond the border box.<br>- **Bottom**: amount by which the bottom edge of the border image is extended beyond the border box.<br>- **Left**: amount by which the left edge of the border image is extended beyond the border box.<br>- **Right**: amount by which the right edge of the border image is extended beyond the border box.|
+| repeat | [RepeatMode](#repeatmode)                            | Repeat mode of the source image's slices on the border.<br>Default value: **RepeatMode.Stretch**|
+| fill   | boolean                                                      | Whether to fill the center of the border image.<br>Default value: **false**                    |
 
 ## RepeatMode
 
@@ -32,9 +32,9 @@ This API is supported in ArkTS widgets.
 | Name     | Description                                 |
 | ------- | ----------------------------------- |
 | Repeat  | The source image's slices are tiled. Tiles beyond the border box will be clipped.         |
-| Stretch | The source image's slices stretched to fill the border box.               |
+| Stretch | The source image's slices are stretched to fill the border box.               |
 | Round   | The source image's slices are tiled to fill the border box. Tiles may be compressed when needed.|
-| Space   | The source image's slices are tiled to fill the border box. Extra space will be filled in between tiles.  |
+| Space   | The source image's slices are tiled to fill the border box. Extra space will be distributed in between tiles.  |
 
 ## Example
 
@@ -77,35 +77,88 @@ struct Index {
 // xxx.ets
 @Entry
 @Component
-struct Index {
-  @State outSetValue: number = 40
+struct BorderImage {
+  @State WidthValue: number = 0
+  @State SliceValue: number = 0
+  @State OutSetValue: number = 0
+  @State RepeatValue: RepeatMode[] = [RepeatMode.Repeat, RepeatMode.Stretch, RepeatMode.Round, RepeatMode.Space]
+  @State SelectIndex: number = 0
+  @State SelectText: string = 'Repeat'
+  @State FillValue: boolean = false
 
   build() {
     Row() {
-      Column() {
+      Column({ space: 20 }) {
         Row() {
           Text('This is borderImage.').textAlign(TextAlign.Center).fontSize(50)
         }
         .borderImage({
           source: $r('app.media.icon'),
-          slice: `${this.outSetValue}%`,
-          width: `${this.outSetValue}px`,
-          outset: '5px',
-          repeat: RepeatMode.Repeat,
-          fill: false
+          slice: this.SliceValue,
+          width: this.WidthValue,
+          outset: this.OutSetValue,
+          repeat: this.RepeatValue[this.SelectIndex],
+          fill: this.FillValue
         })
 
-        Slider({
-          value: this.outSetValue,
-          min: 0,
-          max: 100,
-          style: SliderStyle.OutSet
-        })
-          .margin({ top: 30 })
-          .onChange((value: number, mode: SliderChangeMode) => {
-            this.outSetValue = value
-            console.info('value:' + value + 'mode:' + mode.toString())
+        Column() {
+          Text(`borderImageSlice = ${this.SliceValue}px`)
+          Slider({
+            value: this.SliceValue,
+            min: 0,
+            max: 100,
+            style: SliderStyle.OutSet
+          })
+            .onChange((value: number, mode: SliderChangeMode) => {
+              this.SliceValue = value
+            })
+        }
+
+        Column() {
+          Text(`borderImageWidth = ${this.WidthValue}px`)
+          Slider({
+            value: this.WidthValue,
+            min: 0,
+            max: 100,
+            style: SliderStyle.OutSet
+          })
+            .onChange((value: number, mode: SliderChangeMode) => {
+              this.WidthValue = value
+            })
+        }
+
+        Column() {
+          Text(`borderImageOutSet = ${this.OutSetValue}px`)
+          Slider({
+            value: this.OutSetValue,
+            min: 0,
+            max: 100,
+            style: SliderStyle.OutSet
           })
+            .onChange((value: number, mode: SliderChangeMode) => {
+              this.OutSetValue = value
+            })
+        }
+
+        Row() {
+          Text('borderImageRepeat: ')
+          Select([{ value: 'Repeat' }, { value: 'Stretch' }, { value: 'Round' }, { value: 'Space' }])
+            .value(this.SelectText)
+            .selected(this.SelectIndex)
+            .onSelect((index: number, text: string) => {
+              this.SelectIndex = index
+              this.SelectText = text
+            })
+        }
+
+        Row() {
+          Text(`borderImageFill: ${this.FillValue} `)
+          Toggle({ type: ToggleType.Switch, isOn: this.FillValue })
+            .onChange((isOn: boolean) => {
+              this.FillValue = isOn
+            })
+        }
+
       }
       .width('100%')
     }
@@ -114,4 +167,4 @@ struct Index {
 }
 ```
 
-![zh-cn_image_borderImage](figures/borderImage.gif)
+![borderImage](figures/borderImage.gif)

en/application-dev/reference/arkui-ts/ts-universal-attributes-text-style.md

@@ -17,8 +17,8 @@ Universal text attributes include text style attributes applicable to text conta
 | fontSize   | [Length](ts-types.md#length)             | Font size. If the value is of the number type, the unit fp is used. The default font size is 16. This attribute cannot be set in percentage.<br>Since API version 9, this API is supported in ArkTS widgets.|
 | fontStyle  | [FontStyle](ts-appendix-enums.md#fontstyle) | Font style.<br>Default value: **FontStyle.Normal**<br>Since API version 9, this API is supported in ArkTS widgets.|
 | fontWeight | number \| [FontWeight](ts-appendix-enums.md#fontweight) \| string | Font weight. For the number type, the value ranges from 100 to 900, at an interval of 100. The default value is **400**. A larger value indicates a larger font weight. The string type supports only the string of the number type, for example, **400**, **"bold"**, **"bolder"**, **"lighter"**, **"regular"**, and **"medium"**, which correspond to the enumerated values in **FontWeight**.<br>Default value: **FontWeight.Normal**<br>Since API version 9, this API is supported in ArkTS widgets.|
-| fontFamily | string \| [Resource](ts-types.md#resource) | Font family.<br> Default value: **'HarmonyOS Sans'**. Currently, only the default font is supported.<br>Since API version 9, this API is supported in ArkTS widgets.|
-| lineHeight | string \| number \| [Resource](ts-types.md#resource) | Text line height. If the value is less than or equal to **0**, the line height is not limited and the font size is adaptive. If the value of the number type, the unit fp is used.<br>Since API version 9, this API is supported in ArkTS widgets.|
+| fontFamily | string \| [Resource](ts-types.md#resource) | Font family.<br>The HarmonyOS Sans font and [register custom fonts](../apis/js-apis-font.md) are supported.<br>Since API version 9, this API is supported in ArkTS widgets.|
+| lineHeight | string \| number \| [Resource](ts-types.md#resource) | Text line height. If the value is less than or equal to **0**, the line height is not limited and the font size is adaptive. If the value is of the number type, the unit fp is used.<br>Since API version 9, this API is supported in ArkTS widgets.|
 | decoration | {<br>type: [TextDecorationType](ts-appendix-enums.md#textdecorationtype),<br>color?: [ResourceColor](ts-types.md#resourcecolor)<br>} | Style and color of the text decorative line.<br>Default value: {<br>type: TextDecorationType.None,<br>color: Color.Black<br>}<br>Since API version 9, this API is supported in ArkTS widgets.|
 
 

en/application-dev/ui/arkts-layout-development-flex-layout.md

@@ -532,7 +532,7 @@ When the size of the container in the flex layout is not large enough, the follo
 
     Text('flexBasis(100)')
       .flexBasis(100)
-      .width(200) // When width is set to 200 and flexBasis 100, the width is 100 vp, which means that the settings of flexBasis take precedence.
+      .width(200) // When both width and flexBasis are set, flexBasis take precedence, and the width is 100 vp.
       .height(100)
       .backgroundColor(0xD2B48C)
   }.width('90%').height(120).padding(10).backgroundColor(0xAFEEEE)
@@ -546,7 +546,7 @@ When the size of the container in the flex layout is not large enough, the follo
   ```ts
   Flex() {
     Text('flexGrow(1)')
-      .flexGrow(2) 
+      .flexGrow(1) 
       .width(100)
       .height(100)
       .backgroundColor(0xF5DEB3)

en/application-dev/ui/arkts-page-transition-animation.md

+# Page Transition Animation (Not Recommended)
+
+To achieve a better transition effect, you are advised to use the [\<Navigation>](arkts-navigation-navigation.md) component and [modal transition](arkts-modal-transition.md).
+
+
+During page redirection, one page disappears and the other page appears. You can customize the [page transition effects](../reference/arkui-ts/ts-page-transition-animation.md) for these pages through the **pageTransition** API. Specifically, **PageTransitionEnter** defines the page entrance animation, while **PageTransitionExit** defines the page exit animation.
+
+
+API of **PageTransitionEnter**:
+
+
+
+```ts
+PageTransitionEnter({type?: RouteType,duration?: number,curve?: Curve | string,delay?: number})
+```
+
+
+API of **PageTransitionExit**:
+
+
+
+```ts
+PageTransitionExit({type?: RouteType,duration?: number,curve?: Curve | string,delay?: number})
+```
+
+
+Both **PageTransitionEnter** and **PageTransitionExit** contain the **slide**, **translate**, **scale**, and **opacity** attributes. For **PageTransitionEnter**, these attributes indicate the start values for page entrance. For **PageTransitionExit**, these attributes indicate the end values for page exit. In this sense, configuration of page transition is similar to that of component transition. **PageTransitionEnter** provides the **onEnter** callback, and **PageTransitionExit** provides the **onExit** callback.
+
+
+In the preceding APIs, the **type** parameter indicates the route type used in page navigation. Each page transition involves exit of one page and entrance of the other. If you switch from page A to page B through the **router.pushUrl** operation, page A exits, with the exit animation applied; and page B enters, with the entrance animation applied. If you switch from page B back to page A through the **router.back** operation, page B exits, , with the exit animation applied; and page A enters, with the entrance animation applied. That is, **PageTransitionEnter** of a page may be an entrance animation of a new page (pushed to the stack) or of an existing page (popped from the stack). To distinguish these two types of entrance animations, the **type** parameter is provided.
+
+
+## Setting type to RouteType.None
+
+When **type** is set to **RouteType.None** (default value), the page transition animations work for both the push and pop operations in the page stack.
+
+
+```ts
+// page A
+pageTransition() {
+  // Configure the page entrance animation to sliding in from the left, with the duration of 1200 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+  PageTransitionEnter({ type: RouteType.None, duration: 1200 })
+    .slide(SlideEffect.Left)
+  // Configure the page exit animation to sliding out from the left, with the duration of 1000 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+  PageTransitionExit({ type: RouteType.None, duration: 1000 })
+    .slide(SlideEffect.Left)
+}
+```
+
+
+
+```ts
+// page B
+pageTransition() {
+  // Configure the page entrance animation to sliding in from the right, with the duration of 1000 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+  PageTransitionEnter({ type: RouteType.None, duration: 1000 })
+    .slide(SlideEffect.Right)
+  // Configure the page exit animation to sliding out from the right, with the duration of 1200 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+  PageTransitionExit({ type: RouteType.None, duration: 1200 })
+    .slide(SlideEffect.Right)
+}
+```
+
+
+Assume that the page stack is in the multi-instance mode, that is, duplicate pages are allowed in the page stack. There may be four scenarios. The following table lists the page transition effects.
+
+
+| Route Operation                        | Page A Transition Effect                           | Page B Transition Effect                           |
+| ---------------------------- | ---------------------------------- | ---------------------------------- |
+| **router.pushUrl** – redirection from page A to new page B.| The page exits. The animation defined by **PageTransitionExit** is applied. In the example, the page slides out from the left of the screen. | The page enters. The animation defined by **PageTransitionEnter** is applied. In the example, the page slides in from the right of the screen.|
+| **router.back** – redirection from page B back to page A.      | The page enters. The animation defined by **PageTransitionEnter** is applied. In the example, the page slides in from the left of the screen.| The page exits. The animation defined by **PageTransitionExit** is applied. In the example, the page slides out from the right of the screen. |
+| **router.pushUrl** – redirection from page B to new page A.| The page enters. The animation defined by **PageTransitionEnter** is applied. In the example, the page slides in from the left of the screen.| The page exits. The animation defined by **PageTransitionExit** is applied. In the example, the page slides out from the right of the screen. |
+| **router.back** – redirection from page A back to page B.      | The page exits. The animation defined by **PageTransitionExit** is applied. In the example, the page slides out from the left of the screen. | The page enters. The animation defined by **PageTransitionEnter** is applied. In the example, the page slides in from the right of the screen.|
+
+
+If you want the page accessed by **router.pushUrl** to always slide in from the right and the page exited by **router.back** to always slide out from the right, the third and fourth cases in the preceding table do not meet the requirements. In this case, you need to define four page transition effects.
+
+
+## Setting type to RouteType.Push or RouteType.Pop
+
+When **type** is set to **RouteType.Push**, the page transition animations work for only both the push operations in the page stack. When **type** is set to **RouteType.Pop**, the page transition animations work for only both the pop operations in the page stack.
+
+
+```ts
+// page A
+pageTransition() {
+  // Configure the page entrance animation to sliding in from the right, with the duration of 1200 ms. The settings take effect only when the push operation is performed on the page stack.
+  PageTransitionEnter({ type: RouteType.Push, duration: 1200 })
+    .slide(SlideEffect.Right)
+  // Configure the page entrance animation to sliding in from the left, with the duration of 1200 ms. The settings take effect only when the pop operation is performed on the page stack.
+  PageTransitionEnter({ type: RouteType.Pop, duration: 1200 })
+    .slide(SlideEffect.Left)
+  // Configure the page exit animation to sliding out from the left, with the duration of 1000 ms. The settings take effect only when the push operation is performed on the page stack.
+  PageTransitionExit({ type: RouteType.Push, duration: 1000 })
+    .slide(SlideEffect.Left)
+  // Configure the page exit animation to sliding out from the right, with the duration of 1000 ms. The settings take effect only when the pop operation is performed on the page stack.
+  PageTransitionExit({ type: RouteType.Pop, duration: 1000 })
+    .slide(SlideEffect.Right)
+}
+```
+
+
+
+```ts
+// page B
+pageTransition() {
+  // Configure the page entrance animation to sliding in from the right, with the duration of 1000 ms. The settings take effect only when the push operation is performed on the page stack.
+  PageTransitionEnter({ type: RouteType.Push, duration: 1000 })
+    .slide(SlideEffect.Right)
+  // Configure the page entrance animation to sliding in from the left, with the duration of 1000 ms. The settings take effect only when the pop operation is performed on the page stack.
+  PageTransitionEnter({ type: RouteType.Pop, duration: 1000 })
+    .slide(SlideEffect.Left)
+  // Configure the page exit animation to sliding out from the left, with the duration of 1200 ms. The settings take effect only when the push operation is performed on the page stack.
+  PageTransitionExit({ type: RouteType.Push, duration: 1200 })
+    .slide(SlideEffect.Left)
+  // Configure the page exit animation to sliding out from the right, with the duration of 1200 ms. The settings take effect only when the pop operation is performed on the page stack.
+  PageTransitionExit({ type: RouteType.Pop, duration: 1200 })
+    .slide(SlideEffect.Right)
+}
+```
+
+
+The preceding code defines page transition effects for all possibles scenarios. Assume that the page stack is in the multi-instance mode, that is, duplicate pages are allowed in the page stack. There may be four scenarios. The following table lists the page transition effects.
+
+
+| Route Operation                        | Page A Transition Effect                                 | Page B Transition Effect                                 |
+| ---------------------------- | ---------------------------------------- | ---------------------------------------- |
+| **router.pushUrl** – redirection from page A to new page B| The page exits. The transition style of **PageTransitionExit** whose **type** is **RouteType.Push** takes effect. The page slides out from the left of the screen.| The page enters. The transition style of **PageTransitionEnter** whose **type** is **RouteType.Push** takes effect. The page slides in from the right of the screen.|
+| **router.back** – redirection from page B back to page A      | The page enters. The transition style of **PageTransitionEnter** whose **type** is **RouteType.Pop** takes effect. The page slides in from the left of the screen.| The page exits. The transition style of **PageTransitionExit** whose **type** is **RouteType.Pop** takes effect. The page slides out from the right of the screen.|
+| **router.pushUrl** – redirection from page B to new page A| The page enters. The transition style of **PageTransitionEnter** whose **type** is **RouteType.Push** takes effect. The page slides in from the right of the screen.| The page exits. The transition style of **PageTransitionExit** whose **type** is **RouteType.Push** takes effect. The page slides out from the left of the screen.|
+| **router.back** – redirection from page A back to page B      | The page exits. The transition style of **PageTransitionExit** whose **type** is **RouteType.Pop** takes effect. The page slides out from the right of the screen.| The page enters. The transition style of **PageTransitionEnter** whose **type** is **RouteType.Pop** takes effect. The page slides in from the left of the screen.|
+
+
+>**NOTE**
+>
+>    1. The transition style of each page can be independently configured. However, as each transition involves two pages, take into account the smoothness between page transitions, for example, the transition duration.
+>
+>    2. If no page transition style is defined, a page uses the default page transition style.
+
+
+## Disabling Page Transition
+
+
+```ts
+pageTransition() {
+  PageTransitionEnter({ type: RouteType.None, duration: 0 })
+  PageTransitionExit({ type: RouteType.None, duration: 0 })
+}
+```
+
+
+You can disable the transition animation of a page by setting the page transition duration to 0.
+
+
+## Example
+
+In the following example, page transition animations are defined for all four page transition scenarios.
+
+
+
+```ts
+// PageTransitionSrc1
+import router from '@ohos.router';
+@Entry
+@Component
+struct PageTransitionSrc1 {
+  build() {
+    Column() {
+      Image($r('app.media.mountain'))
+        .width('90%')
+        .height('80%')
+        .objectFit(ImageFit.Fill)
+        .syncLoad(true) // Load the image synchronously so that the image has been loaded when the page is displayed.
+        .margin(30)
+
+      Row({ space: 10 }) {
+        Button("pushUrl")
+          .onClick(() => {
+            // Navigate to the next page, which is a push operation.
+            router.pushUrl({ url: 'pages/myTest/pageTransitionDst1' });
+          })
+        Button("back")
+          .onClick(() => {
+            // Return to the previous page, which is equivalent to the pop operation.
+            router.back();
+          })
+      }.justifyContent(FlexAlign.Center)
+    }
+    .width("100%").height("100%")
+    .alignItems(HorizontalAlign.Center)
+  }
+
+  pageTransition() {
+    // Configure the page entrance animation to sliding in from the right, with the duration of 1000 ms. The settings take effect only when the push operation is performed on the page stack.
+    PageTransitionEnter({ type: RouteType.Push, duration: 1000 })
+      .slide(SlideEffect.Right)
+    // Configure the page entrance animation to sliding in from the left, with the duration of 1000 ms. The settings take effect only when the pop operation is performed on the page stack.
+    PageTransitionEnter({ type: RouteType.Pop, duration: 1000 })
+      .slide(SlideEffect.Left)
+    // Configure the page exit animation to sliding out from the left, with the duration of 1000 ms. The settings take effect only when the push operation is performed on the page stack.
+    PageTransitionExit({ type: RouteType.Push, duration: 1000 })
+      .slide(SlideEffect.Left)
+    // Configure the page exit animation to sliding out from the right, with the duration of 1000 ms. The settings take effect only when the pop operation is performed on the page stack.
+    PageTransitionExit({ type: RouteType.Pop, duration: 1000 })
+      .slide(SlideEffect.Right)
+  }
+}
+```
+
+
+
+
+```ts
+// PageTransitionDst1
+import router from '@ohos.router';
+@Entry
+@Component
+struct PageTransitionDst1 {
+  build() {
+    Column() {
+      Image($r('app.media.forest'))
+        .width('90%')
+        .height('80%')
+        .objectFit(ImageFit.Fill)
+        .syncLoad(true) // Load the image synchronously so that the image has been loaded when the page is displayed.
+        .margin(30)
+
+      Row({ space: 10 }) {
+        Button("pushUrl")
+          .onClick(() => {
+            // Navigate to the next page, which is a push operation.
+            router.pushUrl({ url: 'pages/myTest/pageTransitionSrc1' });
+          })
+        Button("back")
+          .onClick(() => {
+            // Return to the previous page, which is equivalent to the pop operation.
+            router.back();
+          })
+      }.justifyContent(FlexAlign.Center)
+    }
+    .width("100%").height("100%")
+    .alignItems(HorizontalAlign.Center)
+  }
+
+  pageTransition() {
+    // Configure the page entrance animation to sliding in from the right, with the duration of 1000 ms. The settings take effect only when the push operation is performed on the page stack.
+    PageTransitionEnter({ type: RouteType.Push, duration: 1000 })
+      .slide(SlideEffect.Right)
+    // Configure the page entrance animation to sliding in from the left, with the duration of 1000 ms. The settings take effect only when the pop operation is performed on the page stack.
+    PageTransitionEnter({ type: RouteType.Pop, duration: 1000 })
+      .slide(SlideEffect.Left)
+    // Configure the page exit animation to sliding out from the left, with the duration of 1000 ms. The settings take effect only when the push operation is performed on the page stack.
+    PageTransitionExit({ type: RouteType.Push, duration: 1000 })
+      .slide(SlideEffect.Left)
+    // Configure the page exit animation to sliding out from the right, with the duration of 1000 ms. The settings take effect only when the pop operation is performed on the page stack.
+    PageTransitionExit({ type: RouteType.Pop, duration: 1000 })
+      .slide(SlideEffect.Right)
+  }
+}
+```
+
+
+
+![pageTransition_PushPop](figures/pageTransition_PushPop.gif)
+
+
+In the following example, **type** is set to **RouteType.None**.
+
+
+
+```ts
+// PageTransitionSrc2
+import router from '@ohos.router';
+@Entry
+@Component
+struct PageTransitionSrc2 {
+  build() {
+    Column() {
+      Image($r('app.media.mountain'))
+        .width('90%')
+        .height('80%')
+        .objectFit(ImageFit.Fill)
+        .syncLoad(true) // Load the image synchronously so that the image has been loaded when the page is displayed.
+        .margin(30)
+
+      Row({ space: 10 }) {
+        Button("pushUrl")
+          .onClick(() => {
+            // Navigate to the next page, which is a push operation.
+            router.pushUrl({ url: 'pages/myTest/pageTransitionDst2' });
+          })
+        Button("back")
+          .onClick(() => {
+            // Return to the previous page, which is equivalent to the pop operation.
+            router.back();
+          })
+      }.justifyContent(FlexAlign.Center)
+    }
+    .width("100%").height("100%")
+    .alignItems(HorizontalAlign.Center)
+  }
+
+  pageTransition() {
+    // Configure the page entrance animation to sliding in from the left, with the duration of 1000 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+    PageTransitionEnter({ duration: 1000 })
+      .slide(SlideEffect.Left)
+    // Configure the page exit animation to translating by 100 vp along the x- and y-axes and changing the opacity to 0, with the duration of 1200 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+    PageTransitionExit({ duration: 1200 })
+      .translate({ x: 100.0, y: 100.0 })
+      .opacity(0)
+  }
+}
+```
+
+
+
+```ts
+// PageTransitionDst2
+import router from '@ohos.router';
+@Entry
+@Component
+struct PageTransitionDst2 {
+  build() {
+    Column() {
+      Image($r('app.media.forest'))
+        .width('90%')
+        .height('80%')
+        .objectFit(ImageFit.Fill)
+        .syncLoad(true) // Load the image synchronously so that the image has been loaded when the page is displayed.
+        .margin(30)
+
+      Row({ space: 10 }) {
+        Button("pushUrl")
+          .onClick(() => {
+            // Navigate to the next page, which is a push operation.
+            router.pushUrl({ url: 'pages/myTest/pageTransitionSrc2' });
+          })
+        Button("back")
+          .onClick(() => {
+            // Return to the previous page, which is equivalent to the pop operation.
+            router.back();
+          })
+      }.justifyContent(FlexAlign.Center)
+    }
+    .width("100%").height("100%")
+    .alignItems(HorizontalAlign.Center)
+  }
+
+  pageTransition() {
+    // Configure the page entrance animation to sliding in from the left, with the duration of 1200 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+    PageTransitionEnter({ duration: 1200 })
+      .slide(SlideEffect.Left)
+    // Configure the page exit animation to translating by 100 vp along the x- and y-axes and changing the opacity to 0, with the duration of 1000 ms. The settings take effect no matter whether the push or pop operation is performed on the page stack.
+    PageTransitionExit({ duration: 1000 })
+      .translate({ x: 100.0, y: 100.0 })
+      .opacity(0)
+  }
+}
+```
+
+
+
+![pageTransition_None](figures/pageTransition_None.gif)