Merge branch 'dev' of https://gitcode.net/dcloud/hello-uni-app-x into dev

components/boolean-data/boolean-data.vue

@@ -21,7 +21,7 @@
     },
     methods: {
       // @ts-ignore
-      _change(e : SwitchChangeEvent) {
+      _change(e : UniSwitchChangeEvent) {
         this._checked = e.detail.value;
         this.$emit('change', this._checked)
       }

components/enum-data/enum-data.vue

@@ -22,11 +22,10 @@
       // @ts-ignore
       _change(e : RadioGroupChangeEvent) {
         const selected = this.items.find((item : ItemType) : boolean => {
-          return item.name == e.detail.value
+          return item.value.toString() == e.detail.value
         })
         if (selected != null) {
-          this.current = selected.value
-          this.$emit('change', this.current)
+          this.$emit('change', selected.value)
           uni.showToast({
             icon: 'none',
             title: '当前选中:' + selected.name,
@@ -46,7 +45,7 @@
   <view class="uni-list uni-common-pl">
     <radio-group @change="_change">
       <radio class="uni-list-cell uni-list-cell-pd radio" v-for="(item, index) in items" :key="item.name"
-        :class="index < items.length - 1 ? 'uni-list-cell-line' : ''" :value="item.name" :checked="index === current">
+        :class="index < items.length - 1 ? 'uni-list-cell-line' : ''" :value="item.value">
         {{ item.name }}
       </radio>
     </radio-group>

pages/API/action-sheet/action-sheet.uvue

@@ -65,7 +65,7 @@
       })
     },
     methods: {
-      radioChange(e : RadioGroupChangeEvent) {
+      radioChange(e : UniRadioGroupChangeEvent) {
         for (let i = 0; i < this.items.length; i++) {
           if (this.items[i].value === e.detail.value) {
             this.current = i;
@@ -73,13 +73,13 @@
           }
         }
       },
-      itemContentLargeChange: function (e : SwitchChangeEvent) {
+      itemContentLargeChange: function (e : UniSwitchChangeEvent) {
         this.itemContentLarge = e.detail.value
       },
-      itemColorChange: function (e : SwitchChangeEvent) {
+      itemColorChange: function (e : UniSwitchChangeEvent) {
         this.itemColorCustom = e.detail.value
       },
-      itemNumLargeChange: function (e : SwitchChangeEvent) {
+      itemNumLargeChange: function (e : UniSwitchChangeEvent) {
         this.itemNumLargeSelect = e.detail.value
       },
       actionSheetTap() {

pages/API/choose-image/choose-image.uvue

@@ -171,10 +171,10 @@
           })
         }
       },
-      cropResizeChange(e : SwitchChangeEvent) {
+      cropResizeChange(e : UniSwitchChangeEvent) {
         this.cropResize = e.detail.value
       },
-      switchCrop(e : SwitchChangeEvent) {
+      switchCrop(e : UniSwitchChangeEvent) {
         this.isCrop = e.detail.value
       },
       removeImage(index : number) {

pages/API/get-location/get-location.uvue

@@ -63,16 +63,16 @@
       }
     },
     methods: {
-      altitudeChange: function (e : SwitchChangeEvent) {
+      altitudeChange: function (e : UniSwitchChangeEvent) {
         this.altitudeSelect = e.detail.value
       },
-      geocodeChange: function (e : SwitchChangeEvent) {
+      geocodeChange: function (e : UniSwitchChangeEvent) {
         this.geocodeSelect = e.detail.value
       },
-      highAccuracySelectChange: function (e : SwitchChangeEvent) {
+      highAccuracySelectChange: function (e : UniSwitchChangeEvent) {
         this.isHighAccuracySelect = e.detail.value
       },
-      radioChange(e : RadioGroupChangeEvent) {
+      radioChange(e : UniRadioGroupChangeEvent) {
         for (let i = 0; i < this.items.length; i++) {
           if (this.items[i].value === e.detail.value) {
             this.current = i;

pages/API/loading/loading.uvue

@@ -68,7 +68,7 @@
     },
     methods: {
 
-      radioChange(e : RadioGroupChangeEvent) {
+      radioChange(e : UniRadioGroupChangeEvent) {
         const selected = this.items.find((item) : boolean => {
           return item.value == e.detail.value
         })
@@ -76,7 +76,7 @@
           this.titleSelect = selected.value
         }
       },
-      maskChange: function (e : SwitchChangeEvent) {
+      maskChange: function (e : UniSwitchChangeEvent) {
         this.maskSelect = e.detail.value
       },
       showLoading: function () {

pages/API/modal/modal.uvue

@@ -87,22 +87,22 @@
       })
     },
     methods: {
-      showCancelChange: function (e : SwitchChangeEvent) {
+      showCancelChange: function (e : UniSwitchChangeEvent) {
         this.showCancelSelect = e.detail.value
       },
-      cancelTextChange: function (e : SwitchChangeEvent) {
+      cancelTextChange: function (e : UniSwitchChangeEvent) {
         this.cancelTextSelect = e.detail.value
       },
-      confirmTextChange: function (e : SwitchChangeEvent) {
+      confirmTextChange: function (e : UniSwitchChangeEvent) {
         this.confirmTextSelect = e.detail.value
       },
-      editableChange: function (e : SwitchChangeEvent) {
+      editableChange: function (e : UniSwitchChangeEvent) {
         this.editableSelect = e.detail.value
       },
-      placeholderTextChange: function (e : SwitchChangeEvent) {
+      placeholderTextChange: function (e : UniSwitchChangeEvent) {
         this.placeholderTextSelect = e.detail.value
       },
-      radioChange(e : RadioGroupChangeEvent) {
+      radioChange(e : UniRadioGroupChangeEvent) {
         for (let i = 0; i < this.items.length; i++) {
           if (this.items[i].value === e.detail.value) {
             this.current = i;

pages/API/preview-image/preview-image.uvue

@@ -79,10 +79,10 @@
           }
         })
       },
-      onIndicatorChanged(e : RadioGroupChangeEvent) {
+      onIndicatorChanged(e : UniRadioGroupChangeEvent) {
         this.currentIndicator = e.detail.value
       },
-      onCheckboxChange(_ : CheckboxGroupChangeEvent) {
+      onCheckboxChange(_ : UniCheckboxGroupChangeEvent) {
         this.isLoop = !this.isLoop
       }
     }

pages/component/checkbox/checkbox.uvue

@@ -58,7 +58,7 @@
       }
     },
     methods: {
-      checkboxChange: function (e : CheckboxGroupChangeEvent) {
+      checkboxChange: function (e : UniCheckboxGroupChangeEvent) {
         const selectedNames : string[] = []
         this.items.forEach((item) => {
           if (e.detail.value.includes(item.value)) {
@@ -70,7 +70,7 @@
           title: '当前选中:' + selectedNames.join(','),
         })
       },
-      testChange: function (e : CheckboxGroupChangeEvent) {
+      testChange: function (e : UniCheckboxGroupChangeEvent) {
         this.value = e.detail.value
       },
       checkbox_click() { console.log("组件被点击时触发") },

pages/component/form/form.uvue

@@ -71,10 +71,10 @@
       }
     },
     methods: {
-      onFormSubmit: function (e : FormSubmitEvent) {
+      onFormSubmit: function (e : UniFormSubmitEvent) {
         this.formData = e.detail.value
       },
-      onFormReset: function (_ : FormResetEvent) {
+      onFormReset: function (_ : UniFormResetEvent) {
         this.formData = {}
       }
     }

pages/component/general-event/transition-event.uvue

 <template>
   <!-- #ifdef APP -->
-  <scroll-view style="flex:1;padding: 10px;">
+  <scroll-view style="flex:1;">
   <!-- #endif -->
-    <button @click="switchBtn">{{buttonValue}}</button>
     <image class="transition-transform" id="transition-transform" @transitionend="onEnd" src="/static/uni.png"></image>
-    <text>对图片设置transform进行旋转，在旋转完成的transitionend事件后，继续旋转</text>
+    <text class="adjust">对图片设置transform进行旋转，在旋转完成的transitionend事件后，继续旋转</text>
+    <button class="adjust" @click="switchBtn">{{buttonValue}}</button>
   <!-- #ifdef APP -->
   </scroll-view>
   <!-- #endif -->
@@ -52,14 +52,17 @@
 </script>
 
 <style>
-  .transition-transform {
-    width: 200px;
-    height: 200px;
-    margin: 25px auto;
-    border-radius: 100px;
-    transition-duration: 2000ms;
-    transition-property: transform;
-    transition-timing-function: linear;
-    transform: rotate(0deg);
-  }
+.adjust {
+  margin: 10px;
+}
+.transition-transform {
+  width: 200px;
+  height: 200px;
+  margin: 25px auto;
+  border-radius: 100px;
+  transition-duration: 2000ms;
+  transition-property: transform;
+  transition-timing-function: linear;
+  transform: rotate(0deg);
+}
 </style>

pages/component/input/input.uvue

@@ -322,7 +322,7 @@
       test_check_input_value() : number {
         return this.onMaxLengthInputValue.length
       },
-      changeCursorColor(event : SwitchChangeEvent) {
+      changeCursorColor(event : UniSwitchChangeEvent) {
         const checked = event.detail.value;
         if (checked) {
           this.cursor_color = "red"
@@ -332,7 +332,7 @@
         const input = uni.getElementById<UniInputElement>("uni-input-cursor-color")
         input?.focus()
       },
-      changeHoldKeyboard(event : SwitchChangeEvent) {
+      changeHoldKeyboard(event : UniSwitchChangeEvent) {
         const checked = event.detail.value;
         this.holdKeyboard = checked
       }

pages/component/picker-view/picker-view.uvue

@@ -57,7 +57,7 @@
       }
     },
     methods: {
-      bindChange(e : PickerViewChangeEvent) {
+      bindChange(e : UniPickerViewChangeEvent) {
         const val = e.detail.value
         this.result = val
         this.year = this.years[val[0]]

pages/component/progress/progress.uvue

@@ -31,7 +31,7 @@
       clearProgress() {
         this.pgList = [0, 0, 0, 0] as number[]
       },
-      activeend(e : ProgressActiveendEvent) {
+      activeend(e : UniProgressActiveendEvent) {
         this.curPercent = e.detail.curPercent
       },
       progress_touchstart() { console.log("手指触摸动作开始") },

pages/component/radio/radio.uvue

@@ -53,7 +53,7 @@
       }
     },
     methods: {
-      radioChange(e : RadioGroupChangeEvent) {
+      radioChange(e : UniRadioGroupChangeEvent) {
         const selected = this.items.find((item) : boolean => {
           return item.value == e.detail.value
         })
@@ -62,7 +62,7 @@
           title: '当前选中:' + selected?.name,
         })
       },
-      testChange(e : RadioGroupChangeEvent) {
+      testChange(e : UniRadioGroupChangeEvent) {
         this.value = e.detail.value
       },
       radio_click() { console.log("组件被点击时触发") },

pages/component/scroll-view/scroll-view-props.uvue

@@ -111,10 +111,10 @@
       }
     },
     methods: {
-      handleChangeScrollLeft(e : SliderChangeEvent) {
+      handleChangeScrollLeft(e : UniSliderChangeEvent) {
         this.scrollLeft = e.detail.value;
       },
-      handleChangeScrollTop(e : SliderChangeEvent) {
+      handleChangeScrollTop(e : UniSliderChangeEvent) {
         this.scrollTop = e.detail.value;
       },
       changeDirectionX() {

pages/component/slider-100/slider-100.uvue

@@ -31,10 +31,10 @@
       }
     },
     methods: {
-      sliderChange(e : SliderChangeEvent) {
+      sliderChange(e : UniSliderChangeEvent) {
         this.updateSliderValue(e.detail.value)
       },
-      sliderChanging(e : SliderChangeEvent) {
+      sliderChanging(e : UniSliderChangeEvent) {
         this.updateSliderValue(e.detail.value)
       },
       updateSliderValue(value : number) {

pages/component/slider/slider.uvue

@@ -21,7 +21,7 @@
       };
     },
     methods: {
-      sliderChange(e : SliderChangeEvent) {
+      sliderChange(e : UniSliderChangeEvent) {
         console.log("value 发生变化：" + e.detail.value);
       },
       slider_click() {

pages/component/swiper/swiper.uvue

@@ -129,28 +129,28 @@
         }
       },
 
-      dotsChange: function (e : SwitchChangeEvent) {
+      dotsChange: function (e : UniSwitchChangeEvent) {
         this.dotsSelect = e.detail.value
       },
-      swiperTransitionChange: function (e : SwitchChangeEvent) {
+      swiperTransitionChange: function (e : UniSwitchChangeEvent) {
         this.swiperTransitionSelect = e.detail.value
       },
-      swiperChangeChange: function (e : SwitchChangeEvent) {
+      swiperChangeChange: function (e : UniSwitchChangeEvent) {
         this.swiperChangeSelect = e.detail.value
       },
-      swiperAnimationfinishChange: function (e : SwitchChangeEvent) {
+      swiperAnimationfinishChange: function (e : UniSwitchChangeEvent) {
         this.swiperAnimationfinishSelect = e.detail.value
       },
-      autoplayChange: function (e : SwitchChangeEvent) {
+      autoplayChange: function (e : UniSwitchChangeEvent) {
         this.autoplaySelect = e.detail.value
       },
-      verticalChange: function (e : SwitchChangeEvent) {
+      verticalChange: function (e : UniSwitchChangeEvent) {
         this.verticalSelect = e.detail.value
       },
-      disableTouchChange: function (e : SwitchChangeEvent) {
+      disableTouchChange: function (e : UniSwitchChangeEvent) {
         this.disableTouchSelect = e.detail.value
       },
-      currentItemIdChange: function (e : SwitchChangeEvent) {
+      currentItemIdChange: function (e : UniSwitchChangeEvent) {
         this.currentItemIdSelect = e.detail.value
         if (this.currentItemIdSelect) {
           this.currentItemIdVal = 'C'
@@ -158,7 +158,7 @@
           this.currentItemIdVal = 'A'
         }
       },
-      currentChange: function (e : SwitchChangeEvent) {
+      currentChange: function (e : UniSwitchChangeEvent) {
         this.currentSelect = e.detail.value
         if (this.currentSelect) {
           this.currentVal = 2
@@ -167,18 +167,18 @@
         }
 
       },
-      circularChange: function (e : SwitchChangeEvent) {
+      circularChange: function (e : UniSwitchChangeEvent) {
         this.circularSelect = e.detail.value
         console.log(this.circularSelect)
       },
-      reboundSelectChange: function (e : SwitchChangeEvent) {
+      reboundSelectChange: function (e : UniSwitchChangeEvent) {
         this.reboundSelect = e.detail.value
         console.log(this.reboundSelect)
       },
-      sliderChange(e : SliderChangeEvent) {
+      sliderChange(e : UniSliderChangeEvent) {
         this.intervalSelect = e.detail.value
       },
-      indicatorColorChange(e : SwitchChangeEvent) {
+      indicatorColorChange(e : UniSwitchChangeEvent) {
         this.indicatorColorSelect = e.detail.value
         if (this.indicatorColorSelect) {
           // 选择了定制指示器颜色

pages/component/switch/switch.uvue

@@ -43,11 +43,11 @@
       }
     },
     methods: {
-      switch1Change: function (e : SwitchChangeEvent) {
+      switch1Change: function (e : UniSwitchChangeEvent) {
         this.clickCheckedValue = e.detail.value
         console.log('switch1 发生 change 事件，携带值为', e.detail.value)
       },
-      switch2Change: function (e : SwitchChangeEvent) {
+      switch2Change: function (e : UniSwitchChangeEvent) {
         console.log('switch2 发生 change 事件，携带值为', e.detail.value)
       }
     }

pages/component/unicloud-db-contacts/add.uvue

@@ -47,7 +47,7 @@
       this.uniCloudElement = this.$refs['udb'] as UniCloudDBElement
     },
     methods: {
-      onFormSubmit: function (e : FormSubmitEvent) {
+      onFormSubmit: function (e : UniFormSubmitEvent) {
         const formData = e.detail.value
         const genderString = formData['gender'] as string
         formData['gender'] = (genderString.length > 0) ? parseInt(genderString) : -1

pages/component/unicloud-db-contacts/edit.uvue

@@ -62,7 +62,7 @@
       this.uniCloudElement = this.$refs['udb'] as UniCloudDBElement
     },
     methods: {
-      onFormSubmit: function (e : FormSubmitEvent) {
+      onFormSubmit: function (e : UniFormSubmitEvent) {
         const formData = e.detail.value
         const genderString = formData['gender'] as string
         formData['gender'] = (genderString.length > 0) ? parseInt(genderString) : -1