Merge branch 'master' of github.com:youlaitech/vue3-element-admin

src/components/PageContent/index.vue

@@ -57,6 +57,7 @@
       <!-- 右侧工具栏 -->
       <div>
         <template v-for="item in defaultToolbar" :key="item">
+          <template v-if="typeof item === 'string'">
             <!-- 刷新 -->
             <template v-if="item === 'refresh'">
               <el-button
@@ -104,6 +105,27 @@
               />
             </template>
           </template>
+          <!-- 其他 -->
+          <template v-else-if="typeof item === 'object'">
+            <template v-if="item.auth">
+              <el-button
+                :icon="item.icon"
+                circle
+                :title="item.text"
+                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                @click="handleToolbar(item.name)"
+              />
+            </template>
+            <template v-else>
+              <el-button
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
+            </template>
+          </template>
+        </template>
       </div>
     </div>
     <!-- 列表 -->
@@ -339,9 +361,9 @@
                 :disabled="selectionData.length <= 0"
               />
               <el-option
-                v-if="contentConfig.exportsAction"
                 label="全量数据 (包括所有分页的数据)"
                 :value="ExportsOriginEnum.REMOTE"
+                :disabled="contentConfig.exportsAction === undefined"
               />
             </el-select>
           </el-form-item>
@@ -447,7 +469,18 @@ export interface IContentConfig<T = any> {
       }
   >;
   // 表格工具栏右侧图标
-  defaultToolbar?: ("refresh" | "filter" | "exports" | "search")[];
+  defaultToolbar?: Array<
+    | "refresh"
+    | "filter"
+    | "exports"
+    | "search"
+    | {
+        name: string;
+        icon: string;
+        title?: string;
+        auth?: string;
+      }
+  >;
   // table组件列属性(额外的属性templet,operat,slotName)
   cols: Array<{
     type?: "default" | "selection" | "index" | "expand";

src/views/demo/curd/config/content.ts

@@ -26,6 +26,11 @@ const contentConfig: IContentConfig<UserQuery> = {
   },
   deleteAction: UserAPI.deleteByIds,
   exportAction: UserAPI.export,
+  exportsAction: async function (params) {
+    // 模拟获取全量数据
+    const res = await UserAPI.getPage(params);
+    return res.list;
+  },
   pk: "id",
   toolbar: [
     "add",