!4286 PR3998已完成

Merge pull request !4286 from Annie_wang/PR3998

en/application-dev/database/database-distributedobject-guidelines.md

@@ -107,7 +107,7 @@ The following example shows how to implement a distributed data object synchroni
         });
         }
     } 
-
+   
     // To refresh the page in changeCallback, correctly bind (this) to the changeCallback.
     local_object.on("change", this.changeCallback.bind(this));
    ```
@@ -171,7 +171,7 @@ The following example shows how to implement a distributed data object synchroni
        ```js
        local_object.setSessionId("");
        ```
-## Development Example
+## Samples
 
 The following example is provided for you to better understand the development of distributed data objects:
 
@@ -179,4 +179,4 @@ The following example is provided for you to better understand the development o
 
 
 When an event of the Notepad app occurs on a device, such as a note is added, the tile or content of a note is changed, or the event list is cleared, the change will be synchronized to other devices in the trusted network.
- 
+

en/application-dev/database/database-mdds-guidelines.md

@@ -177,5 +177,5 @@ The following uses a single KV store as an example to describe the development p
    ```
 ## Samples
 The following samples are provided to help you better understand the distributed data development:
-- [`KvStore`: distributed database (eTS) (API8)](https://gitee.com/openharmony/app_samples/tree/master/data/Kvstore)
-- [Distributed Database](https://gitee.com/openharmony/codelabs/tree/master/Data/JsDistributedData)
+- [`KvStore`: Distributed Data Management (eTS) (API8)](https://gitee.com/openharmony/app_samples/tree/master/data/Kvstore)
+- [Distributed Data Service](https://gitee.com/openharmony/codelabs/tree/master/Data/JsDistributedData)

en/application-dev/database/database-relational-guidelines.md

@@ -116,8 +116,8 @@ The RDB provides **RdbPredicates** for you to set database operation conditions.
 
 A result set can be regarded as a row of data in the queried results. It allows you to traverse and access the data you have queried. The following table describes the external APIs of **ResultSet**.
 
-> ![icon-notice.gif](../public_sys-resources/icon-notice.gif) **NOTICE**<br/>
-> After a result set is used, you must call the **close()** method to close it explicitly.**
+> ![icon-notice.gif](public_sys-resources/icon-notice.gif) **NOTICE**<br>
+> After a result set is used, you must call the **close()** method to close it explicitly.
 
 **Table 7** APIs for using the result set
 
@@ -306,3 +306,8 @@ You can obtain the distributed table name for a remote device based on the local
     let tableName = rdbStore.obtainDistributedTableName(deviceId, "test");
     let resultSet = rdbStore.querySql("SELECT * FROM " + tableName)
     ```
+## Samples
+The following samples are provided for you to better understand the RDB development:
+- [`Rdb`: eTS RDB (API8)](https://gitee.com/openharmony/app_samples/tree/master/data/Rdb)
+- [`DistributedRdb`: eTS Distributed Relational Database (API8)](https://gitee.com/openharmony/app_samples/tree/master/data/DistributedRdb)
+- [Relational Database](https://gitee.com/openharmony/codelabs/tree/master/Data/JSRelationshipData)

en/application-dev/reference/apis/js-apis-data-ability.md

 # DataAbilityPredicates
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**<br/>
+> **NOTE**<br/>
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 
@@ -22,6 +22,7 @@ Creates an **RdbPredicates** object based on a **DataAabilityPredicates** object
 **System capability**: SystemCapability.DistributedDataManager.DataShare.Core
 
 **Parameters**
+
   | Name| Type| Mandatory| Description|
   | -------- | -------- | -------- | -------- |
   | name | string | Yes| Table name in the RDB store.|

en/application-dev/reference/apis/js-apis-data-distributedobject.md

 # Distributed Data Object
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**<br>
+> **NOTE**<br/>
 > The initial APIs of this module are supported since API version 8. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 
@@ -10,8 +10,6 @@
 import distributedObject from '@ohos.data.distributedDataObject';
 ```
 
-
-
 ## distributedDataObject.createDistributedObject
 
 createDistributedObject(source: object): DistributedObject

en/application-dev/reference/apis/js-apis-data-resultset.md

 # Result Set
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**<br/>
+> **NOTE**<br/>
 > The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 

en/application-dev/reference/apis/js-apis-data-storage.md

@@ -3,7 +3,7 @@
 Lightweight storage provides applications with data processing capability and allows applications to perform lightweight data storage and query. Data is stored in key-value (KV) pairs. Keys are of the string type, and values can be of the number, string, or Boolean type.
 
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**<br/>
+> **NOTE**<br/>
 >
 > - The initial APIs of this module are supported since API version 6. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 >
@@ -30,7 +30,7 @@ import dataStorage from '@ohos.data.storage';
 
 getStorageSync(path: string): Storage
 
-Reads a file and loads the data to the **Storage** instance in synchronous mode.
+Reads the specified file and load its data to the **Storage** instance for data operations.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -67,7 +67,7 @@ Reads a file and loads the data to the **Storage** instance in synchronous mode.
 
 getStorage(path: string, callback: AsyncCallback&lt;Storage&gt;): void
 
-Reads a file and loads the data to the **Storage** instance. This API uses an asynchronous callback to return the execution result.
+Reads the specified file and loads its data to the **Storage** instance for data operations. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -105,7 +105,7 @@ Reads a file and loads the data to the **Storage** instance. This API uses an as
 
 getStorage(path: string): Promise&lt;Storage&gt;
 
-Reads a file and loads the data to the **Storage** instance. This API uses a promise to return the execution result.
+Reads the specified file and loads its data to the **Storage** instance for data operations. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -146,7 +146,7 @@ Reads a file and loads the data to the **Storage** instance. This API uses a pro
 
 deleteStorageSync(path: string): void
 
-Deletes the singleton **Storage** instance of a file from the memory, and deletes the specified file, its backup file, and damaged files. After the specified files are deleted, the **Storage** instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses a synchronous mode.
+Deletes the singleton **Storage** instance of a file from the memory, and deletes the specified file, its backup file, and damaged files. After the specified files are deleted, the **Storage** instance cannot be used for data operations. Otherwise, data inconsistency will occur.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -165,7 +165,7 @@ Deletes the singleton **Storage** instance of a file from the memory, and delete
 
 deleteStorage(path: string, callback: AsyncCallback&lt;void&gt;): void
 
-Deletes the singleton **Storage** instance of a file from the memory, and deletes the specified file, its backup file, and damaged files. After the specified files are deleted, the **Storage** instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses an asynchronous callback to return the execution result.
+Deletes the singleton **Storage** instance of a file from the memory, and deletes the specified file, its backup file, and damaged files. After the specified files are deleted, the **Storage** instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -191,7 +191,7 @@ Deletes the singleton **Storage** instance of a file from the memory, and delete
 
 deleteStorage(path: string): Promise&lt;void&gt;
 
-Deletes the singleton **Storage** instance of a file from the memory, and deletes the specified file, its backup file, and damaged files. After the specified files are deleted, the **Storage** instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses a promise to return the execution result.
+Deletes the singleton **Storage** instance of a file from the memory, and deletes the specified file, its backup file, and damaged files. After the specified files are deleted, the **Storage** instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -222,8 +222,6 @@ removeStorageFromCacheSync(path: string): void
 
 Removes the singleton **Storage** instance of a file from the cache. The removed instance cannot be used for data operations. Otherwise, data inconsistency will occur.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Parameters**
@@ -241,9 +239,7 @@ This API uses a synchronous mode.
 
 removeStorageFromCache(path: string, callback: AsyncCallback&lt;void&gt;): void
 
-Removes the singleton **Storage** instance of a file from the cache. The removed instance cannot be used for data operations. Otherwise, data inconsistency will occur.
-
-This API uses an asynchronous callback to return the result.
+Removes the singleton **Storage** instance of a file from the cache. The removed instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -269,9 +265,7 @@ This API uses an asynchronous callback to return the result.
 
 removeStorageFromCache(path: string): Promise&lt;void&gt;
 
-Removes the singleton **Storage** instance of a file from the cache. The removed instance cannot be used for data operations. Otherwise, data inconsistency will occur.
-
-This API uses a promise to return the result.
+Removes the singleton **Storage** instance of a file from the cache. The removed instance cannot be used for data operations. Otherwise, data inconsistency will occur. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -307,8 +301,6 @@ getSync(key: string, defValue: ValueType): ValueType
 
 Obtains the value corresponding to a key. If the value is null or not in the default value format, the default value is returned.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Parameters**
@@ -333,9 +325,7 @@ This API uses a synchronous mode.
 
 get(key: string, defValue: ValueType, callback: AsyncCallback&lt;ValueType&gt;): void
 
-Obtains the value corresponding to a key. If the value is null or not in the default value format, the default value is returned.
-
-This API uses an asynchronous callback to return the result.
+Obtains the value corresponding to a key. If the value is null or not in the default value format, the default value is returned. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -362,9 +352,7 @@ This API uses an asynchronous callback to return the result.
 
 get(key: string, defValue: ValueType): Promise&lt;ValueType&gt;
 
-Obtains the value corresponding to a key. If the value is null or not in the default value format, the default value is returned.
-
-This API uses a promise to return the result.
+Obtains the value corresponding to a key. If the value is null or not in the default value format, the default value is returned. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -397,8 +385,6 @@ putSync(key: string, value: ValueType): void
 
 Obtains the **Storage** instance corresponding to the specified file, writes data to the **Storage** instance using a **Storage** API, and saves the modification using **flush()** or **flushSync()**.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Parameters**
@@ -417,9 +403,7 @@ This API uses a synchronous mode.
 
 put(key: string, value: ValueType, callback: AsyncCallback&lt;void&gt;): void
 
-Obtains the **Storage** instance corresponding to the specified file, writes data to the **Storage** instance using a **Storage** API, and saves the modification using **flush()** or **flushSync()**.
-
-This API uses an asynchronous callback to return the result.
+Obtains the **Storage** instance corresponding to the specified file, writes data to the **Storage** instance using a **Storage** API, and saves the modification using **flush()** or **flushSync()**. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -446,9 +430,7 @@ This API uses an asynchronous callback to return the result.
 
 put(key: string, value: ValueType): Promise&lt;void&gt;
 
-Obtains the **Storage** instance corresponding to the specified file, writes data to the **Storage** instance using a **Storage** API, and saves the modification using **flush()** or **flushSync()**.
-
-This API uses a promise to return the result.
+Obtains the **Storage** instance corresponding to the specified file, writes data to the **Storage** instance using a **Storage** API, and saves the modification using **flush()** or **flushSync()**. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -480,8 +462,6 @@ hasSync(key: string): boolean
 
 Checks whether the storage object contains data with a given key.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Parameters**
@@ -507,9 +487,7 @@ This API uses a synchronous mode.
 
 has(key: string, callback: AsyncCallback&lt;boolean&gt;): boolean
 
-Checks whether the storage object contains data with a given key.
-
-This API uses an asynchronous callback to return the result.
+Checks whether the storage object contains data with a given key. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -542,9 +520,7 @@ This API uses an asynchronous callback to return the result.
 
 has(key: string): Promise&lt;boolean&gt;
 
-Checks whether the storage object contains data with a given key.
-
-This API uses a promise to return the result.
+Checks whether the storage object contains data with a given key. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -577,8 +553,6 @@ deleteSync(key: string): void
 
 Deletes data with the specified key from this storage object.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Parameters**
@@ -592,13 +566,11 @@ This API uses a synchronous mode.
   ```
 
 
-### deletej
+### delete
 
 delete(key: string, callback: AsyncCallback&lt;void&gt;): void
 
-Deletes data with the specified key from this storage object.
-
-This API uses an asynchronous callback to return the result.
+Deletes data with the specified key from this storage object. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -624,9 +596,7 @@ This API uses an asynchronous callback to return the result.
 
 delete(key: string): Promise&lt;void&gt;
 
-Deletes data with the specified key from this storage object.
-
-This API uses a promise to return the result.
+Deletes data with the specified key from this storage object. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -657,8 +627,6 @@ flushSync(): void
 
 Saves the modification of this object to the **Storage** instance and synchronizes the modification to the file.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Example**
@@ -671,9 +639,7 @@ This API uses a synchronous mode.
 
 flush(callback: AsyncCallback&lt;void&gt;): void
 
-Saves the modification of this object to the **Storage** instance and synchronizes the modification to the file.
-
-This API uses an asynchronous callback to return the result.
+Saves the modification of this object to the **Storage** instance and synchronizes the modification to the file. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -698,9 +664,7 @@ This API uses an asynchronous callback to return the result.
 
 flush(): Promise&lt;void&gt;
 
-Saves the modification of this object to the **Storage** instance and synchronizes the modification to the file.
-
-This API uses a promise to return the result.
+Saves the modification of this object to the **Storage** instance and synchronizes the modification to the file. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -726,8 +690,6 @@ clearSync(): void
 
 Clears this **Storage** object.
 
-This API uses a synchronous mode.
-
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
 **Example**
@@ -740,9 +702,7 @@ This API uses a synchronous mode.
 
 clear(callback: AsyncCallback&lt;void&gt;): void
 
-Clears this **Storage** object.
-
-This API uses an asynchronous callback to return the result.
+Clears this **Storage** object. This API uses an asynchronous callback to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 
@@ -767,9 +727,7 @@ This API uses an asynchronous callback to return the result.
 
 clear(): Promise&lt;void&gt;
 
-Clears this **Storage** object.
-
-This API uses a promise to return the result.
+Clears this **Storage** object. This API uses a promise to return the result.
 
 **System capability**: SystemCapability.DistributedDataManager.Preferences.Core
 

en/application-dev/reference/apis/js-apis-distributed-data.md

@@ -2,7 +2,7 @@
 
 Distributed data management provides collaboration between databases of different devices for applications. The APIs provided by distributed data management can be used to save data to the distributed database and perform operations such as adding, deleting, modifying, and querying data in the distributed database.
 
->![](../../public_sys-resources/icon-note.gif) **NOTE**<br/>
+>**NOTE**<br/>
 >The initial APIs of this module are supported since API version 7. Newly added APIs will be marked with a superscript to indicate their earliest API version.
 
 
@@ -2922,6 +2922,7 @@ These value types can be used only by internal applications.
 | BOOLEAN   |4 |Boolean. |
 | DOUBLE   |5 |Double (double-precision floating point). |
 
+
 ## SingleKVStore
 
 Provides methods to query and synchronize data in a single KV store. This class inherits from **KVStore**. Before calling any method in **SingleKVStore**, you must use [getKVStore](#getkvstore) to obtain a **SingleKVStore** object.
@@ -3447,7 +3448,7 @@ Closes the **KvStoreResultSet** object obtained by **getResultSet**. This API us
 | Name | Type| Mandatory | Description                   |
 | -----  | ------   | ----  | ----------------------- |
 | resultSet  |[KvStoreResultSet](#kvstoreresultset8)   | Yes   |**KvStoreResultSet** object to close.            |
-| callback  |AsyncCallback&lt;void&gt;   | Yes   |Callback used to return the execution result.            |
+| callback  |AsyncCallback&lt;void&gt;   | Yes   |Callback used to return the result.            |
 
 **Example**
 

en/application-dev/reference/apis/js-apis-system-storage.md

 # Data Storage
 
-> ![icon-note.gif](public_sys-resources/icon-note.gif) **NOTE**<br/>
+>  **NOTE**<br/>
 >
 > - The APIs of this module are no longer maintained since API Version 6, and you are advised to use [`@ohos.data.storage`](js-apis-data-storage.md). From API Version 9, you are advised to use [`@ohos.data.preferences`](js-apis-data-preferences.md).
 >
@@ -67,7 +67,7 @@ Sets the value in the cache based on the specified key.
 
 | Name| Type| Mandatory| Description|
 | -------- | -------- | -------- | -------- |
-| key | string | Yes| Key of the value to set.|
+| key | string | Yes| Key of the data to set.|
 | value | string | Yes| New value to set. The maximum length is 128 bytes.|
 | success | Function | No| Called when **storage.set()** is successful.|
 | fail | Function | No| Called when **storage.set()** fails. In the callback, **data** indicates the error information, and **code** indicates the error code.|