Merge branch 'dev-sws' into dev-yxl

src/components/model-tabs-carousel/model-tabs-carousel-content.vue

@@ -20,6 +20,10 @@ const props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    tabsActive: {
+        type: String,
+        default: 'tabs',
+    },
 });
 
 const state = reactive({
@@ -28,7 +32,7 @@ const state = reactive({
 });
 const { form, styles } = toRefs(state);
 
-const tabs_name = ref('tabs');
+const tabs_name = ref(props.tabsActive);
 </script>
 <style lang="scss" scoped>
 :deep(.el-tabs.content-tabs) {

src/components/model-tabs-carousel/model-tabs-carousel-setting.vue

@@ -1,10 +1,11 @@
 <template>
     <div class="setting-content">
+        {{ tabs_active }}
         <template v-if="type == '1'">
-            <model-tabs-carousel-content :value="value.content" :tab-carousel-style="value.style"></model-tabs-carousel-content>
+            <model-tabs-carousel-content :value="value.content" :tabs-active="tabs_active" :tab-carousel-style="value.style"></model-tabs-carousel-content>
         </template>
         <template v-if="type == '2'">
-            <model-tabs-carousel-styles :value="value.style" :tabs-style="value.content.tabs_theme" :content="value.content"></model-tabs-carousel-styles>
+            <model-tabs-carousel-styles :value="value.style" :tabs-active="tabs_active" :tabs-style="value.content.tabs_theme" :content="value.content"></model-tabs-carousel-styles>
         </template>
     </div>
 </template>
@@ -19,5 +20,6 @@ const props = defineProps({
         default: () => ({}),
     },
 });
+const tabs_active = ref('tabs');
 </script>
 <style lang="scss" scoped></style>

src/components/model-tabs-carousel/model-tabs-carousel-styles.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="w">
+        {{ tabs_name }}
         <el-tabs v-model="tabs_name" class="content-tabs">
             <el-tab-pane label="选项卡" name="tabs">
                 <model-tabs-styles :value="form" :tabs-style="tabsStyle" :is-common="false"></model-tabs-styles>
@@ -36,6 +37,10 @@ const props = defineProps({
         type: String,
         default: () => {},
     },
+    tabsActive: {
+        type: String,
+        default: 'tabs',
+    },
 });
 
 const state = reactive({
@@ -43,7 +48,7 @@ const state = reactive({
     new_content: props.content,
 });
 
-const tabs_name = ref('tabs');
+const tabs_name = ref(props.tabsActive);
 // 如果需要解构，确保使用toRefs
 const { form, new_content } = toRefs(state);
 const common_styles_update = (val: Object) => {