From 4fe228fdcba3a9dc717d3c24f009859c54eefc83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=95=E9=87=91=E6=B3=BD?= <1098696801@qq.com>
Date: Sat, 6 Aug 2022 17:55:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dswitch=20=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/magic/data/mb-table-column.vue   | 10 ++++------
 .../src/components/magic/form/mb-switch.vue     | 17 +++++++++--------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/magic-boot-ui/src/components/magic/data/mb-table-column.vue b/magic-boot-ui/src/components/magic/data/mb-table-column.vue
index a0cc3f0..146bbdc 100644
--- a/magic-boot-ui/src/components/magic/data/mb-table-column.vue
+++ b/magic-boot-ui/src/components/magic/data/mb-table-column.vue
@@ -16,12 +16,10 @@
       </span>
       <slot v-else-if="col.type == 'dynamic'" :name="col.field" :row="scope.row" :index="scope.$index" />
       <div v-else-if="col.type == 'switch'">
-        <el-switch
-            v-if="col.if === undefined ? true : col.if(scope.row)"
-            v-model="scope.row[col.field]"
-            :active-value="(col.activeValue || 1) + ''"
-            :inactive-value="(col.inactiveValue || 0) + ''"
-            @change="col.change(scope.row)"
+        <mb-switch
+          v-if="col.if === undefined ? true : col.if(scope.row)"
+          v-model="scope.row[col.field]"
+          @change="col.change(scope.row)"
         />
       </div>
       <div v-else-if="col.type == 'btns'">
diff --git a/magic-boot-ui/src/components/magic/form/mb-switch.vue b/magic-boot-ui/src/components/magic/form/mb-switch.vue
index 8d28b10..fec4ab7 100644
--- a/magic-boot-ui/src/components/magic/form/mb-switch.vue
+++ b/magic-boot-ui/src/components/magic/form/mb-switch.vue
@@ -4,12 +4,13 @@
       :active-value="_activeValue"
       :inactive-value="_inactiveValue"
       v-bind="props.props"
+      @change="change"
   />
 </template>
 
 <script setup>
 import {ref, watch} from 'vue'
-const emit = defineEmits(['update:modelValue'])
+const emit = defineEmits(['update:modelValue', 'change'])
 const selectValue = ref('')
 const props = defineProps({
   modelValue: Boolean | String | Number,
@@ -20,15 +21,15 @@ const props = defineProps({
 const _activeValue = ref(true)
 const _inactiveValue = ref(false)
 
+function change(){
+  emit('update:modelValue', selectValue.value)
+  emit('change', selectValue.value)
+}
+
 function setActive(value){
   if(typeof(value) == 'boolean'){
-    if(props.activeValue == undefined && props.inactiveValue == undefined){
-      _activeValue.value = true
-      _inactiveValue.value = false
-    }else{
-      _activeValue.value = props.activeValue
-      _inactiveValue.value = props.inactiveValue
-    }
+    _activeValue.value = true
+    _inactiveValue.value = false
   }else{
     if(value || value == 0){
       if(props.activeValue == undefined && props.inactiveValue == undefined){