Merge branch '2.x' of https://github.com/zclzone/vue-naive-admin into 2.x

src/components/me/crud/index.vue

@@ -9,10 +9,12 @@
 <template>
   <AppCard v-if="$slots.default" bordered bg="#fafafc dark:black" class="mb-30 min-h-60 rounded-4">
     <form class="flex justify-between p-16" @submit.prevent="handleSearch()">
-      <n-space wrap :size="[32, 16]">
+      <n-scrollbar x-scrollable>
-        <slot />
+        <n-space :wrap="!expand || isExpanded" :size="[32, 16]" class="p-10">
-      </n-space>
+          <slot />
-      <div class="flex-shrink-0">
+        </n-space>
+      </n-scrollbar>
+      <div class="flex-shrink-0 p-10">
         <n-button ghost type="primary" @click="handleReset">
           <i class="i-fe:rotate-ccw mr-4" />
           重置
@@ -21,6 +23,17 @@
           <i class="i-fe:search mr-4" />
           搜索
         </n-button>
+
+        <template v-if="expand">
+          <n-button v-if="!isExpanded" type="primary" text @click="toggleExpand">
+            <i class="i-fe:chevrons-down ml-4" />
+            展开
+          </n-button>
+          <n-button v-else text type="primary" @click="toggleExpand">
+            <i class="i-fe:chevrons-up ml-4" />
+            收起
+          </n-button>
+        </template>
       </div>
     </form>
   </AppCard>
@@ -89,6 +102,8 @@ const props = defineProps({
     type: Function,
     required: true,
   },
+  /** 是否支持展开 */
+  expand: Boolean,
 })
 
 const emit = defineEmits(['update:queryItems', 'onChecked', 'onDataChange'])
@@ -103,6 +118,13 @@ const pagination = reactive({
   },
 })
 
+// 是否展开
+const isExpanded = ref(false)
+
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
 async function handleQuery() {
   try {
     loading.value = true