Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/tenant/sub/index.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { reactive, ref, onMounted, toRaw } from 'vue';
 import { PageContainer } from 'antdv-pro-layout';
+import { ProModal } from 'antdv-pro-modal';
 import { message, Modal, Form, notification } from 'ant-design-vue/lib';
 import { SizeType } from 'ant-design-vue/lib/config-provider';
 import { MenuInfo } from 'ant-design-vue/lib/menu/src/interface';
@@ -1234,7 +1235,7 @@ onMounted(() => {
     <a-card :bordered="false" :body-style="{ padding: '0px' }">
       <!-- 插槽-卡片左侧侧 -->
       <template #title>
-        <div class="button-container">
+        <a-flex wrap="wrap" gap="small">
           <a-button
             type="primary"
             @click.prevent="fnModalVisibleByEdit()"
@@ -1356,8 +1357,8 @@ onMounted(() => {
               {{ t('views.neUser.sub.checkExport') }}
             </a-button>
           </a-popconfirm>
-        </div>
-      </template>
+        </a-flex>
+        </template>
 
       <!-- 插槽-卡片右侧 -->
       <template #extra>