Merge remote-tracking branch 'origin/master'

src/components/steps/index.vue

@@ -39,7 +39,7 @@ const props = defineProps({
   // 当前显示步骤
   active: {
     type: Number,
-    default: 0
+    default: '0'
   },
   // 已完成的工作流步骤
   stepSuccess: {
@@ -168,18 +168,23 @@ const formatReProcedure = (data) => {
 const formatActive = (val) => {
   console.log(val, 'val');
   let active = ''
-  switch(val) {
-    case '0' || 0 : active = '00'
-      break
-    case '1' || 1 : active = '10'
-      break
-    case '2' || 2 : active = '20'
-      break
-    case '3' || 3 : active = '30'
-      break
-    case '4' || 4 : active = '40'
-      break
-  }
+  // switch(val) {
+  //   case '0' : active = '00'
+  //     break
+  //   case '1' : active = '10'
+  //     break
+  //   case '2' : active = '20'
+  //     break
+  //   case '3' : active = '30'
+  //     break
+  //   case '4' : active = '40'
+  //     break
+  // }
+  val == 0 && (active = '00')
+  val == 1 && (active = '10')
+  val == 2 && (active = '20')
+  val == 3 && (active = '30')
+  val == 4 && (active = '40')
   console.log(active, 'active--');
   return active
 }