Ver código fonte

fix: 修改弹窗控制器的初始化方式

YuJing 1 mês atrás
pai
commit
12661be7b5

+ 4 - 6
commons/basic/src/main/ets/components/DiaLogComp/DiaLogComp.ets

@@ -3,16 +3,14 @@ import { DiaLogCompControl } from './DiaLogControl'
 
 @ComponentV2
 export struct DiaLogComp {
-  @Param controller?: DiaLogCompControl = undefined
+  @Param @Require @Once control: DiaLogCompControl
   @Param param: BasicType = {}
 
   @BuilderParam container: () => void
 
-  control: DiaLogCompControl = new DiaLogCompControl(this.getUIContext())
-
   aboutToAppear(): void {
-    if (this.controller) {
-      this.control = this.controller
+    if (this.control == undefined) {
+      this.control = new DiaLogCompControl(this.getUIContext())
     }
   }
 
@@ -104,5 +102,5 @@ export struct DiaLogComp {
 
 @Builder
 export function DiaLogCompBuilder(_: string, param: NavDiaLogModel){
-  DiaLogComp({ param: param.param, controller: param.control, container: param.builder })
+  DiaLogComp({ param: param.param, control: param.control, container: param.builder })
 }

+ 4 - 6
commons/basic/src/main/ets/components/DiaLogComp/DiaLogSheetComp.ets

@@ -3,16 +3,14 @@ import { DiaLogSheetControl } from "./DiaLogControl"
 
 @ComponentV2
 export struct DiaLogSheetComp {
-  @Param controller?: DiaLogSheetControl = undefined
+  @Param @Require @Once control: DiaLogSheetControl
   @Param params: Array<BasicType> = []
 
   @BuilderParam container: () => void
 
-  control: DiaLogSheetControl = new DiaLogSheetControl(this.getUIContext())
-
   aboutToAppear(): void {
-    if(this.controller) {
-      this.control = this.controller
+    if(this.control == undefined) {
+      this.control = new DiaLogSheetControl(this.getUIContext())
     }
   }
 
@@ -106,5 +104,5 @@ export struct DiaLogSheetComp {
 
 @Builder
 export function DiaLogSheetCompBuilder(_: string, params: NavDiaLogModel){
-  DiaLogSheetComp({ params: params.params, controller: params?.control as DiaLogSheetControl, container: params.builder })
+  DiaLogSheetComp({ params: params.params, control: params?.control as DiaLogSheetControl, container: params.builder })
 }

+ 1 - 1
features/feature/src/main/ets/pages/Order/OrderManagementPage.ets

@@ -74,7 +74,7 @@ struct OrderManagementPage {
 
                       ForEach(this.vm.dataSource, (item: string, index) => {
                         ListItem(){
-                          OrderItemComp({orderStatus: index})
+                          OrderItemComp({orderStatus: index+1})
                         }
                       })
                     }