fix(switch): props命名错误问题

Author: QiuShuiBai

packages/mpx-cube-ui/src/components/switch/rn-mixin.ts

@@ -22,10 +22,10 @@ if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
           'cube-switch-BGC': (animationOptions) => {
             const animation = this.bgAnimation || (this.bgAnimation = mpx.createAnimation({ ...animationOptions }))
             if (this.isOn) {
-              const onBGC = this.switchOnGBC || '#FF6435'
+              const onBGC = this.switchOnBGC || this.switchOnGBC || '#FF6435'
               animation.backgroundColor(onBGC).step({ duration: animationOptions.duration })
             } else {
-              const defaultBGC = this.switchDefaultGBC || '#EAEAEA'
+              const defaultBGC = this.switchDefaultBGC || this.switchDefaultGBC || '#EAEAEA'
               animation.backgroundColor(defaultBGC).step({ duration: animationOptions.duration })
             }
             this.switchAnimationData = animation.export()

packages/mpx-cube-ui/src/components/switch/switch.ts

@@ -12,10 +12,22 @@ createComponent({
       type: Boolean,
       value: false
     },
+    switchDefaultBGC: {
+      type: String,
+      value: ''
+    },
+    switchOnBGC: {
+      type: String,
+      value: ''
+    },
+    // @dosHide
+    // props 命名错误，没人用就删掉
     switchDefaultGBC: {
       type: String,
       value: ''
     },
+    // @dosHide
+    // props 命名错误，没人用就删掉
     switchOnGBC: {
       type: String,
       value: ''
@@ -27,6 +39,14 @@ createComponent({
     disabled: {
       type: Boolean,
       value: false
+    },
+    /**
+     * @description 点击后是否需要更改 value
+     * @optional true/false
+     */
+    changeOnClick: {
+      type: Boolean,
+      value: true
     }
   },
   data: {
@@ -41,16 +61,16 @@ createComponent({
       }
     },
     swithBGClass() {
-      if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android') {
+      if (__mpx_mode__ === 'ios' || __mpx_mode__ === 'android' || __mpx_mode__ === 'harmony') {
         return {}
       }
-      if (this.isOn && this.switchOnGBC) {
+      if (this.isOn && (this.switchOnBGC || this.switchOnGBC)) {
         return {
-          backgroundColor: this.switchOnGBC
+          backgroundColor: this.switchOnBGC || this.switchOnGBC
         }
-      } else if (!this.isOn && this.switchDefaultGBC) {
+      } else if (!this.isOn && (this.switchDefaultBGC || this.switchDefaultGBC)) {
         return {
-          backgroundColor: this.switchDefaultGBC
+          backgroundColor: this.switchDefaultBGC || this.switchDefaultGBC
         }
       } else {
         return {}
@@ -67,9 +87,20 @@ createComponent({
   },
   methods: {
     toggleSwitch() {
-      if (this.disabled) return
+      if (this.disabled) {
+        this.triggerEvent('click', { value: this.isOn })
+        return
+      }
+
+      if (!this.changeOnClick) {
+        this.triggerEvent('click', { value: this.isOn })
+        return
+      }
+
       const newValue = !this.isOn
       this.isOn = newValue
+      // 当开关有点击时触发
+      this.triggerEvent('click', { value: newValue })
       // 当开关状态变化时触发
       this.triggerEvent('change', { value: newValue })
       // 当开关状态变化时触发