Merge branch 'master' of gitee.com:openharmony/docs into apis_data

zh-cn/application-dev/reference/apis/js-apis-data-distributedobject.md

@@ -140,7 +140,6 @@ setSessionId(sessionId: string, callback: AsyncCallback<void>): void
 **示例：**
 
 ```js
-let g_object;
 // g_object加入分布式组网
 g_object.setSessionId(distributedObject.genSessionId(), ()=>{
     console.info("join session");
@@ -174,7 +173,6 @@ setSessionId(callback: AsyncCallback<void>): void
 **示例：**
 
 ```js
-let g_object;
 // g_object加入分布式组网
 g_object.setSessionId(distributedObject.genSessionId(), ()=>{
     console.info("join session");
@@ -217,13 +215,7 @@ setSessionId(sessionId?: string): Promise<void>
 
 **示例：**
 
-FA模型示例
-
 ```js
-import distributedObject from '@ohos.data.distributedDataObject';
-import featureAbility from '@ohos.ability.featureAbility';
-// 获取context
-let g_object;
 // g_object加入分布式组网
 g_object.setSessionId(distributedObject.genSessionId()).then (()=>{
     console.info("join session.");
@@ -256,7 +248,6 @@ on(type: 'change', callback: Callback<{ sessionId: string, fields: Array&lt;stri
 **示例：**
 
 ```js
-let g_object;
 globalThis.changeCallback = (sessionId, changeData) => {
     console.info("change" + sessionId);
     if (changeData != null && changeData != undefined) {
@@ -287,7 +278,6 @@ off(type: 'change', callback?: Callback<{ sessionId: string, fields: Array&lt;st
 **示例：**
 
 ```js
-let g_object;
 // 删除数据变更回调changeCallback
 g_object.off("change", globalThis.changeCallback);
 // 删除所有的数据变更回调
@@ -312,10 +302,6 @@ on(type: 'status', callback: Callback<{ sessionId: string, networkId: string, st
 **示例：**
 
 ```js
-import distributedObject from '@ohos.data.distributedDataObject';
-import featureAbility from '@ohos.ability.featureAbility';
-// 获取context
-let g_object;
 globalThis.statusCallback = (sessionId, networkId, status) => {
     globalThis.response += "status changed " + sessionId + " " + status + " " + networkId;
 }
@@ -341,7 +327,6 @@ off(type: 'status', callback?: Callback<{ sessionId: string, deviceId: string, s
 **示例：**
 
 ```js
-let g_object;
 globalThis.statusCallback = (sessionId, networkId, status) => {
     globalThis.response += "status changed " + sessionId + " " + status + " " + networkId;
 }
@@ -377,7 +362,6 @@ save(deviceId: string, callback: AsyncCallback&lt;SaveSuccessResponse&gt;): void
 **示例：**
 
 ```ts
-let g_object;
 g_object.setSessionId("123456");
 g_object.save("local", (result) => {
     console.info("save callback");
@@ -418,10 +402,6 @@ save(deviceId: string): Promise&lt;SaveSuccessResponse&gt;
 **示例：**
 
 ```js
-import distributedObject from '@ohos.data.distributedDataObject';
-import featureAbility from '@ohos.ability.featureAbility';
-// 获取context
-let g_object;
 g_object.setSessionId("123456");
 g_object.save("local").then((result) => {
     console.info("save callback");
@@ -453,7 +433,6 @@ revokeSave(callback: AsyncCallback&lt;RevokeSaveSuccessResponse&gt;): void
 **示例：**
 
 ```js
-let g_object;
 g_object.setSessionId("123456");
 // 持久化数据
 g_object.save("local", (result) => {
@@ -488,10 +467,7 @@ revokeSave(): Promise&lt;RevokeSaveSuccessResponse&gt;
 
 **示例：**
 
-FA模型示例
-
 ```ts
-let g_object;
 g_object.setSessionId("123456");
 // 持久化数据
 g_object.save("local").then((result) => {

zh-cn/application-dev/reference/apis/js-apis-data-preferences.md

@@ -58,6 +58,7 @@ try {
 	        console.info("Failed to get preferences. code =" + err.code + ", message =" + err.message);
 	        return;
 	    }
+	    preferences = val;
 	    console.info("Succeeded in getting preferences.");
 	})
 } catch (err) {
@@ -80,6 +81,7 @@ class EntryAbility extends UIAbility {
                     console.info("Failed to get preferences. code =" + err.code + ", message =" + err.message);
                     return;
                 }
+                preferences = val;
                 console.info("Succeeded in getting preferences.");
             })
         } catch (err) {

zh-cn/application-dev/reference/arkui-ts/ts-universal-attributes-opacity.md

@@ -12,7 +12,7 @@
 
 | 名称      | 参数类型                                     | 描述                                       |
 | ------- | ---------------------------------------- | ---------------------------------------- |
-| opacity | number&nbsp;\|&nbsp;[Resource](ts-types.md#resource) | 元素的不透明度，取值范围为0到1，1表示不透明，0表示完全透明, 达到隐藏组件效果，但是在布局中占位。<br>**说明：**<br/>子组件可以继承父组件的此属性。默认值：1 |
+| opacity | number&nbsp;\|&nbsp;[Resource](ts-types.md#resource) | 元素的不透明度，取值范围为0到1，1表示不透明，0表示完全透明, 达到隐藏组件效果，但是在布局中占位。 默认值：1 <br>**说明：**<br/> 子组件会继承父组件的透明度，并与自身的透明度属性叠加。如：父组件透明度为0.1，子组件设置透明度为0.8，则子组件实际透明度为0.1*0.8=0.08。|
 
 
 ## 示例