Merge remote-tracking branch 'origin/feature/feature-20250331-h5' into feature/feature-20250331-h5

# Conflicts:
#	src/views/Design/Index.vue
#	src/views/Survey/views/Create/Index.vue

src/views/Design/Index.vue

@@ -87,11 +87,7 @@
           <template #action="{ element: el }">
             <div class="flex slot-actions">
               <template v-for="(item, optionIndex) in actionOptions">
-                <div
-                  v-if="item.question_type.includes(el.question_type)"
-                  :key="optionIndex"
-                  class="flex"
-                >
+                <div v-if="item.question_type.includes(el.question_type)" :key="optionIndex" class="flex">
                   <template v-for="(act, actIndex) in item.actions" :key="actIndex">
                     <div class="flex align-center action-item" @click="actionEvent(act, el)">
                       <van-icon :name="act.icon"></van-icon>
@@ -106,13 +102,12 @@
 
         <!--        {{ element.question_type }}-->
         <!--        {{questionInfo.survey.pages.length}}-->
-        <paging
-          v-if="!element.question_type && questionInfo.survey.pages.length > 1"
-          :info="element"
-          :index="index"
-          :active="pageIsActive(activeIndex, questionInfo.questions, element.page)"
-          @click.stop=""
-        />
+        <div v-if="!filterGap">
+          <paging
+            v-if="!element.question_type && questionInfo.survey.pages.length > 1" :info="element" :index="index"
+            :active="pageIsActive(activeIndex, questionInfo.questions, element.page)" @click.stop=""
+          />
+        </div>
       </template>
     </draggable>
   </div>
@@ -180,6 +175,16 @@ function util() {
     copyStoreContent
   };
 }
+
+// 获取所有的 question 列表内容
+const { filterGap } = defineProps({
+  filterGap: {
+    type: Boolean,
+    required: false,
+    default: false
+  }
+});
+
 const { pageIsActive } = util();
 // 获取 Store 实例
 const counterStore = useCounterStore();