diff --git a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets
index 55b4ab91431cb94fb2c186969a7e8e5b4829b8e4..1b4a677937b94b92f00f9634b914c58390b83da4 100644
--- a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets
+++ b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/global.ets
@@ -21,6 +21,7 @@ struct GlobalExample {
   private settings: RenderingContextSettings = new RenderingContextSettings (true)
   private context: CanvasRenderingContext2D = new CanvasRenderingContext2D(this.settings)
   private offContext: OffscreenCanvasRenderingContext2D  = new OffscreenCanvasRenderingContext2D(300, 300, this.settings);
+  private img: ImageBitmap = new ImageBitmap("/images/bg.jpg")
   
   onPageShow() {
     console.info("global page called")
@@ -35,50 +36,33 @@ struct GlobalExample {
       Canvas(this.context)
         .width('100%').height('40%').backgroundColor('#00ffff')
         .onReady(() => {
-          this.context.imageSmoothingEnabled = false
+          this.offContext.imageSmoothingEnabled = false
           this.testImageBitmapSize();
           this.testOffscreenCanvas();
           this.testImageData();
-          this.testImage();
         })
     }.width('100%').height('100%')
   }
 
   testImageBitmapSize() {
-    let img = new ImageBitmap("/images/bg.jpg");
-    let width = img.width;
-    let height = img.height;
-    this.context.imageSmoothingEnabled = false;
-    this.context.drawImage(img, 30, 950, 160, 100);
+    let width = this.img.width;
+    let height = this.img.height;
+    this.offContext.imageSmoothingEnabled = false;
+    this.offContext.drawImage(this.img, 30, 950, 160, 100);
     console.log("imagebitmap_width=" + width);
     console.log("imagebitmap_height=" + height);
   }
 
   testOffscreenCanvas() {
-    var offCanvas2 = this.offContext.getContext("2d");
-    var img = new Image();
-    img.src = "/images/bg.jpg";
-    offCanvas2.drawImage(img, 0, 0, 100, 100);
-
-    var bitmap = offscreen.transferToImageBitmap();
-    this.ctx.transferFromImageBitmap(bitmap);
+    this.offContext.drawImage(this.img, 0, 0, 100, 100);
+    var bitmap = this.offContext.transferToImageBitmap();
+    this.context.transferFromImageBitmap(bitmap);
   }
 
   testImageData() {
-    var offCanvas2 = this.offContext.getContext("2d");
-    var imageData = offCanvas2.createImageData(100, 100);
+    var imageData = this.offContext.createImageData(100, 100);
     var imgData = imageData.data;
     console.log("imageData_width=" + imageData.width);
     console.log("imageData_height=" + imageData.height);
   }
-
-  testImage() {
-    var img = new Image("/images/bg.jpg", 100, 100)
-      .onload(() => {
-      })
-      .onerror(() => {
-      });
-    console.log("img_width=" + img.width);
-    console.log("img_height=" + img.height);
-  }
 }
\ No newline at end of file
diff --git a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/visibility.ets b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/visibility.ets
index 3f75b0047c18065ed5ef7bf8ed4972ba783d1a87..3af4e73de7ff6705ba618ee732b62a9cc34f7da7 100644
--- a/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/visibility.ets
+++ b/arkui/ace_ets_component/entry/src/main/ets/MainAbility/pages/visibility.ets
@@ -38,7 +38,7 @@ struct VisibilityExample {
       eventId: 1116,
       priority: events_emitter.EventPriority.LOW
     }
-    events_emitter.on(stateChangeEvent2, this.stateChangCallBack);
+    events_emitter.on(stateChangeEvent2, this.hiddenChangCallBack);
   }
 
   private hiddenChangCallBack = (eventData) => {
diff --git a/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets b/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets
index bfc2c388e2c94f43f3ba1dc3806e9288c34b45f0..d143fe13227dd667dcec532ac2092a32e346734f 100644
--- a/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets
+++ b/arkui/ace_ets_component/entry/src/main/ets/test/ImageEffectsJsunit.test.ets
@@ -405,7 +405,7 @@ export default function imageEffectsJsunit() {
       let strJsonNew = getInspectorByKey('centerRow5');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testImageEffects015] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.brightness).assertEqual(0.0000019999999949504854);
+      expect(objNew.$attrs.brightness).assertEqual(0);
       done();
     });
 
@@ -520,7 +520,7 @@ export default function imageEffectsJsunit() {
       let strJsonNew = getInspectorByKey('centerRow6');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testImageEffects020] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.saturate).assertEqual(0.0000019999999949504854);
+      expect(objNew.$attrs.saturate).assertEqual(0);
       done();
     });
 
@@ -634,7 +634,7 @@ export default function imageEffectsJsunit() {
       let strJsonNew = getInspectorByKey('centerRow7');
       let objNew = JSON.parse(strJsonNew);
       console.info("[testImageEffects025] component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.contrast).assertEqual(0.0000019999999949504854);
+      expect(objNew.$attrs.contrast).assertEqual(0);
       done();
     });
 
diff --git a/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets b/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets
index 6ba651339cad3115a62fa2fb2ca4761803aaca2d..56dddeab51601ccfa74ccd4fe02343d5fca615d0 100644
--- a/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets
+++ b/arkui/ace_ets_component/entry/src/main/ets/test/SwiperJsunit.test.ets
@@ -450,7 +450,7 @@ export default function swiperJsunit() {
       try {
         let eventData = {
           data: {
-            "duration": "nan"
+            "duration": "0"
           }
         }
         let indexEvent = {
@@ -466,7 +466,7 @@ export default function swiperJsunit() {
       let strJsonNew = getInspectorByKey('swiper');
       let objNew = JSON.parse(strJsonNew);
       console.info("swiperTest_1900 component objNew is: " + JSON.stringify(objNew));
-      expect(objNew.$attrs.duration).assertEqual('nan');
+      expect(objNew.$attrs.duration).assertEqual('0.000000');
       console.info('swiperTest_1900 END');
       done();
     });
diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/PanGesture.ets b/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/PanGesture.ets
index fd9cf5e7a0c01c6497d814b02ec10b320101babf..9b90447d108899dbbdbab09bc2fa401f7ed669ab 100644
--- a/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/PanGesture.ets
+++ b/arkui/ace_ets_component_three/entry/src/main/ets/MainAbility/pages/PanGesture.ets
@@ -22,15 +22,6 @@ struct PanGestureExample {
   @State offsetY: number = 0
   @State touchable: boolean = true;
   @State isTouched: boolean = false;
-
-  onPageShow() {
-    let ChangeEvent = {
-      eventId: 23,
-      priority: events_emitter.EventPriority.LOW
-    }
-    events_emitter.on(ChangeEvent, this.ChangCallBack)
-  }
-
   private ChangCallBack = (eventData) => {
     console.info("[PanGesture] ChangCallBack stateChangCallBack");
     if (eventData != null) {
@@ -41,6 +32,14 @@ struct PanGestureExample {
     }
   }
 
+  onPageShow() {
+    var ChangeEvent = {
+      eventId: 23,
+      priority: events_emitter.EventPriority.LOW
+    }
+    events_emitter.on(ChangeEvent, this.ChangCallBack)
+  }
+
   build() {
     Flex({ direction: FlexDirection.Column, alignItems: ItemAlign.Center, justifyContent: FlexAlign.SpaceBetween }) {
       Text('PanGesture offset:\nX: ' + this.offsetX + '\n' + 'Y: ' + this.offsetY)
@@ -54,8 +53,8 @@ struct PanGestureExample {
     .translate({ x: this.offsetX, y: this.offsetY, z: 5 })
     .touchable(this.touchable)
     .gesture(
-    PanGesture({ fingers: 1, direction: PanDirection.All, distance: 1 })
-      .onActionStart((event: PanGestureEvent) => {
+      PanGesture({ fingers: 1, direction: PanDirection.All, distance: 1 })
+      .onActionStart((event: GestureEvent) => {
         console.info('Pan start')
         console.log('PanGesture globalX' + event.globalX);
         console.log('PanGesture globalY' + event.globalY);
@@ -67,14 +66,15 @@ struct PanGestureExample {
         console.log('PanGesture pinchCenterX' + event.pinchCenterX);
         console.log('PanGesture pinchCenterY' + event.pinchCenterY);
       })
-      .onActionUpdate((event: PanGestureEvent) => {
+      .onActionUpdate((event: GestureEvent) => {
         this.offsetX = event.offsetX
         this.offsetY = event.offsetY
       })
       .onActionEnd(() => {
         console.info('Pan end')
       })
-      .onTouch((event: TouchEvent) => {
+    )
+    .onTouch((event: TouchEvent) => {
         console.log('[PanGesture] TouchType start');
         this.isTouched = true
         if (event.type === TouchType.Down) {
@@ -104,7 +104,5 @@ struct PanGestureExample {
           console.info("[PanGesture] emit action state err: " + JSON.stringify(err.message))
         }
       })
-    )
   }
-}
-
+}
\ No newline at end of file
diff --git a/arkui/ace_ets_component_three/entry/src/main/ets/test/SpanJsunit.test.ets b/arkui/ace_ets_component_three/entry/src/main/ets/test/SpanJsunit.test.ets
index 0447b70f2cf15dcb0c8997e16036f922ebea6bfd..07b836bb7407c5f7058e5e4cf3cdc9ecb0b9c7d4 100644
--- a/arkui/ace_ets_component_three/entry/src/main/ets/test/SpanJsunit.test.ets
+++ b/arkui/ace_ets_component_three/entry/src/main/ets/test/SpanJsunit.test.ets
@@ -231,7 +231,7 @@ export default function spanJsunit() {
       console.info("[testSpan009] component strJson:" + strJson);
       let obj = JSON.parse(strJson);
       console.info("[testSpan009] fontColor:" + obj);
-      expect(obj.$attrs.fontColor).assertEqual('#FF000000');
+      expect(obj.$attrs.fontColor).assertEqual('#FFFFFFFF');
       done();
     });
   })
diff --git a/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js b/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js
index 9721f49d0616078cb0aae52a6c487a881bb4434a..80dbc8edf0939eeaecff704b164829696eb3bd89 100644
--- a/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js
+++ b/arkui/ace_standard/src/main/js/default/pages/swiper/router/index.js
@@ -101,13 +101,8 @@ export default {
     },
 
     onShow(){
-        // 通用属性
-        var prop1 =  this.$element('prop1');
-        var name1 = prop1.dataSet.name
-        var prop2 =  this.$refs.prop2;
-        var name2 = prop2.dataSet.name
         prompt.showToast({
-            message: 'prop1--' + name1 + '\nprop2--' + name2
+            message: 'onShow'
         });
     },
 
diff --git a/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js b/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js
index 03d0127c018446ceb82613ed79a9664236d2fc9d..86b2a90f042d7b76c829c0a2906964cac116e6bd 100644
--- a/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js
+++ b/arkui/ace_standard/src/main/js/default/test/pickerViewProps.test.js
@@ -91,7 +91,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('idProp')
          done();
      });
@@ -109,7 +109,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('classProp')
          expect(obj.$attrs.className).assertEqual('classProp')
          done();
@@ -128,7 +128,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('classPropNone')
          expect(obj.$attrs.className).assertEqual(undefined)
          console.info("[pickerViewProps] get className value is: " + JSON.stringify(obj.$attrs.className));
@@ -148,7 +148,7 @@
 //         console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
 //         console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
 //
-//         expect(obj.$type).assertEqual('picker-view')
+//         expect(obj.$type).assertEqual('picker-view-view')
 //         expect(obj.$attrs.id).assertEqual('styleProp')
 //         expect(obj.$attrs.style).assertEqual(undefined)
 //         console.info("[pickerViewProps] get style value is: " + JSON.stringify(obj.$attrs.style));
@@ -174,7 +174,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('refProp')
          expect(obj.$attrs.ref).assertEqual('refProp')
          done();
@@ -193,7 +193,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('refPropNone')
          expect(obj.$attrs.ref).assertEqual(undefined)
          console.info("[pickerViewProps] get ref value is: " + JSON.stringify(obj.$attrs.ref));
@@ -213,7 +213,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('disabledPropTrue')
          expect(obj.$attrs.disabled).assertEqual('true')
          done();
@@ -232,7 +232,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('disabledPropFalse')
          expect(obj.$attrs.disabled).assertEqual('false')
          done();
@@ -251,7 +251,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('disabledPropNone')
          expect(obj.$attrs.disabled).assertEqual('false')
          done();
@@ -270,7 +270,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('focusablePropTrue')
          expect(obj.$attrs.focusable).assertEqual('true')
          done();
@@ -289,7 +289,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('focusablePropFalse')
          expect(obj.$attrs.focusable).assertEqual('false')
          done();
@@ -308,7 +308,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('focusablePropNone')
          expect(obj.$attrs.focusable).assertEqual('false')
          done();
@@ -327,7 +327,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('dataProp')
          expect(obj.$attrs.datapickerView).assertEqual(undefined);
          console.info("[pickerViewProps] get datapickerView value is: " + JSON.stringify(obj.$attrs.datapickerView));
@@ -347,7 +347,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('dataPropNone')
          expect(obj.$attrs.datapickerView).assertEqual(undefined)
          console.info("[pickerViewProps] get datapickerView value is: " + JSON.stringify(obj.$attrs.datapickerView));
@@ -367,7 +367,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('clickEffectPropSmall')
          expect(obj.$attrs.clickEffect).assertEqual('spring-small')
          done();
@@ -386,7 +386,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('clickEffectPropMedium')
          expect(obj.$attrs.clickEffect).assertEqual('spring-medium')
          done();
@@ -405,7 +405,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('clickEffectPropLarge')
          expect(obj.$attrs.clickEffect).assertEqual('spring-large')
          done();
@@ -424,7 +424,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('clickEffectPropNone')
          expect(obj.$attrs.clickEffect).assertEqual(undefined)
          console.info("[pickerViewProps] get clickEffect value is: " + JSON.stringify(obj.$attrs.clickEffect));
@@ -444,7 +444,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('dirPropRtl')
          expect(obj.$attrs.dir).assertEqual('rtl')
          done();
@@ -463,7 +463,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('dirPropLtr')
          expect(obj.$attrs.dir).assertEqual('ltr')
          done();
@@ -482,7 +482,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('dirPropAuto')
          expect(obj.$attrs.dir).assertEqual('auto')
          done();
@@ -501,7 +501,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('dirPropNone')
          expect(obj.$attrs.dir).assertEqual('auto')
          done();
@@ -520,7 +520,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('forPropNull')
          expect(obj.$attrs.for).assertEqual(undefined)
          console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.for));
@@ -540,7 +540,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('forPropOne')
          expect(obj.$attrs.for).assertEqual(undefined)
          console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.for));
@@ -560,7 +560,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('forPropThree')
          expect(obj.$attrs.for).assertEqual(undefined)
          console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.for));
@@ -580,7 +580,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('ifPropTrue')
          expect(obj.$attrs.if).assertEqual(undefined)
          console.info("[pickerViewProps] get for value is: " + JSON.stringify(obj.$attrs.if));
@@ -600,7 +600,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
 
-         expect(obj.$type).assertEqual('picker-view')
+         expect(obj.$type).assertEqual('picker-view-view')
          expect(obj.$attrs.id).assertEqual('ifPropFalse')
          expect(obj.$attrs.if).assertEqual(false)
          done();
@@ -619,7 +619,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
 
-         expect(obj.$type).assertEqual('picker-view')
+         expect(obj.$type).assertEqual('picker-view-view')
          expect(obj.$attrs.id).assertEqual('ifPropNone')
          expect(obj.$attrs.if).assertEqual(false)
          done();
@@ -638,7 +638,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('showPropTrue')
          expect(obj.$attrs.show).assertEqual('true')
          console.info("[pickerViewProps] get show value is: " + JSON.stringify(obj.$attrs.show));
@@ -658,7 +658,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('showPropFalse')
          expect(obj.$attrs.show).assertEqual('false')
          console.info("[pickerViewProps] get show value is: " + JSON.stringify(obj.$attrs.show));
@@ -678,7 +678,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('showPropNone')
          expect(obj.$attrs.show).assertEqual('true')
          console.info("[pickerViewProps] get show value is: " + JSON.stringify(obj.$attrs.show));
@@ -698,7 +698,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('pickerViewText')
          expect(obj.$attrs.type).assertEqual('text')
          console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type));
@@ -718,7 +718,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('pickerViewTime')
          expect(obj.$attrs.type).assertEqual('time')
          console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type));
@@ -738,7 +738,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('pickerViewDate')
          expect(obj.$attrs.type).assertEqual('date')
          console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type));
@@ -758,7 +758,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('pickerViewDatetime')
          expect(obj.$attrs.type).assertEqual('datetime')
          console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type));
@@ -778,7 +778,7 @@
          console.info("[pickerViewProps] get inspector value is: " + JSON.stringify(obj));
          console.info("[pickerViewProps] get inspector attrs value is: " + JSON.stringify(obj.$attrs));
  
-         expect(obj.$type).assertEqual('picker')
+         expect(obj.$type).assertEqual('picker-view')
          expect(obj.$attrs.id).assertEqual('pickerViewMultiText')
          expect(obj.$attrs.type).assertEqual('multi-text')
          console.info("[pickerViewProps] get type value is: " + JSON.stringify(obj.$attrs.type));