Merge branch 'main' into pages

2025-11-21 14:13:36 +08:00 · 2024-08-13 10:28:40 +08:00
parent c0d683c9b1 5fbb664da7
commit 190c3c6123
38 changed files with 1561 additions and 1224 deletions
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -11,6 +11,8 @@ export type UserResult = {
    nickname: string;
    /** 当前登录用户的角色 */
    roles: Array<string>;
+    /** 按钮级别权限 */
+    permissions: Array<string>;
    /** `token` */
    accessToken: string;
    /** 用于调用刷新`accessToken`的接口时所需的`token` */
--- a/src/components/ReDialog/index.vue
+++ b/src/components/ReDialog/index.vue
@@ -53,14 +53,17 @@ const footerButtons = computed(() => {
                  }
                );
              }
-              const done = () => {
+              const closeLoading = () => {
                if (options?.sureBtnLoading) {
                  sureBtnMap.value[index].loading = false;
                }
+              };
+              const done = () => {
+                closeLoading();
                closeDialog(options, index, { command: "sure" });
              };
              if (options?.beforeSure && isFunction(options?.beforeSure)) {
-                options.beforeSure(done, { options, index });
+                options.beforeSure(done, { options, index, closeLoading });
              } else {
                done();
              }
--- a/src/components/ReDialog/type.ts
+++ b/src/components/ReDialog/type.ts
@@ -69,11 +69,11 @@ type DialogProps = {
 type Popconfirm = {
  /** 标题 */
  title?: string;
-  /** 确认按钮文字 */
+  /** 确定按钮文字 */
  confirmButtonText?: string;
  /** 取消按钮文字 */
  cancelButtonText?: string;
-  /** 确认按钮类型，默认 `primary` */
+  /** 确定按钮类型，默认 `primary` */
  confirmButtonType?: ButtonType;
  /** 取消按钮类型，默认 `text` */
  cancelButtonType?: ButtonType;
@@ -121,7 +121,7 @@ type ButtonProps = {
  round?: boolean;
  /** 是否为圆形按钮，默认 `false` */
  circle?: boolean;
-  /** 确认按钮的 `Popconfirm` 气泡确认框相关配置 */
+  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
  popconfirm?: Popconfirm;
  /** 是否为加载中状态，默认 `false` */
  loading?: boolean;
@@ -160,9 +160,9 @@ interface DialogOptions extends DialogProps {
  props?: any;
  /** 是否隐藏 `Dialog` 按钮操作区的内容 */
  hideFooter?: boolean;
-  /** 确认按钮的 `Popconfirm` 气泡确认框相关配置 */
+  /** 确定按钮的 `Popconfirm` 气泡确认框相关配置 */
  popconfirm?: Popconfirm;
-  /** 点击确认按钮后是否开启 `loading` 加载动画 */
+  /** 点击确定按钮后是否开启 `loading` 加载动画 */
  sureBtnLoading?: boolean;
  /**
   * @description 自定义对话框标题的内容渲染器
@@ -261,10 +261,13 @@ interface DialogOptions extends DialogProps {
    done: Function,
    {
      options,
-      index
+      index,
+      closeLoading
    }: {
      options: DialogOptions;
      index: number;
+      /** 关闭确定按钮的 `loading` 加载动画 */
+      closeLoading: Function;
    }
  ) => void;
 }
--- a/src/components/ReIcon/src/Select.vue
+++ b/src/components/ReIcon/src/Select.vue
@@ -194,7 +194,7 @@ watch(
              :pager-count="5"
              layout="pager"
              background
-              small
+              size="small"
              @current-change="onCurrentChange"
            />
            <el-button
--- a/src/components/RePerms/index.ts
+++ b/src/components/RePerms/index.ts
@@ -0,0 +1,5 @@
+import perms from "./src/perms";
+
+const Perms = perms;
+
+export { Perms };
--- a/src/components/RePerms/src/perms.tsx
+++ b/src/components/RePerms/src/perms.tsx
@@ -0,0 +1,20 @@
+import { defineComponent, Fragment } from "vue";
+import { hasPerms } from "@/utils/auth";
+
+export default defineComponent({
+  name: "Perms",
+  props: {
+    value: {
+      type: undefined,
+      default: []
+    }
+  },
+  setup(props, { slots }) {
+    return () => {
+      if (!slots) return null;
+      return hasPerms(props.value) ? (
+        <Fragment>{slots.default?.()}</Fragment>
+      ) : null;
+    };
+  }
+});
--- a/src/directives/index.ts
+++ b/src/directives/index.ts
@@ -2,4 +2,5 @@ export * from "./auth";
 export * from "./copy";
 export * from "./longpress";
 export * from "./optimize";
+export * from "./perms";
 export * from "./ripple";
--- a/src/directives/perms/index.ts
+++ b/src/directives/perms/index.ts
@@ -0,0 +1,15 @@
+import { hasPerms } from "@/utils/auth";
+import type { Directive, DirectiveBinding } from "vue";
+
+export const perms: Directive = {
+  mounted(el: HTMLElement, binding: DirectiveBinding<string | Array<string>>) {
+    const { value } = binding;
+    if (value) {
+      !hasPerms(value) && el.parentNode?.removeChild(el);
+    } else {
+      throw new Error(
+        "[Directive: perms]: need perms! Like v-perms=\"['btn.add','btn.edit']\""
+      );
+    }
+  }
+};
--- a/src/main.ts
+++ b/src/main.ts
@@ -44,7 +44,9 @@ app.component("FontIcon", FontIcon);

 // 全局注册按钮级别权限组件
 import { Auth } from "@/components/ReAuth";
+import { Perms } from "@/components/RePerms";
 app.component("Auth", Auth);
+app.component("Perms", Perms);

 // 全局注册vue-tippy
 import "tippy.js/dist/tippy.css";
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -355,7 +355,7 @@ function getAuths(): Array<string> {
  return router.currentRoute.value.meta.auths as Array<string>;
 }

-/** 是否有按钮级别的权限 */
+/** 是否有按钮级别的权限（根据路由`meta`中的`auths`字段进行判断）*/
 function hasAuth(value: string | Array<string>): boolean {
  if (!value) return false;
  /** 从当前路由的`meta`字段里获取按钮级别的所有自定义`code`值 */
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -27,6 +27,9 @@ export const useUserStore = defineStore({
    nickname: storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "",
    // 页面级别权限
    roles: storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [],
+    // 按钮级别权限
+    permissions:
+      storageLocal().getItem<DataInfo<number>>(userKey)?.permissions ?? [],
    // 前端生成的验证码（按实际需求替换）
    verifyCode: "",
    // 判断登录页面显示哪个组件（0：登录（默认）、1：手机登录、2：二维码登录、3：注册、4：忘记密码）
@@ -53,6 +56,10 @@ export const useUserStore = defineStore({
    SET_ROLES(roles: Array<string>) {
      this.roles = roles;
    },
+    /** 存储按钮级别权限 */
+    SET_PERMS(permissions: Array<string>) {
+      this.permissions = permissions;
+    },
    /** 存储前端生成的验证码 */
    SET_VERIFYCODE(verifyCode: string) {
      this.verifyCode = verifyCode;
@@ -86,6 +93,7 @@ export const useUserStore = defineStore({
    logOut() {
      this.username = "";
      this.roles = [];
+      this.permissions = [];
      removeToken();
      useMultiTagsStoreHook().handleTags("equal", [...routerArrays]);
      resetRouter();
--- a/src/store/types.ts
+++ b/src/store/types.ts
@@ -42,6 +42,7 @@ export type userType = {
  username?: string;
  nickname?: string;
  roles?: Array<string>;
+  permissions?: Array<string>;
  verifyCode?: string;
  currentPage?: number;
  isRemembered?: boolean;
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,6 +1,6 @@
 import Cookies from "js-cookie";
-import { storageLocal } from "@pureadmin/utils";
 import { useUserStoreHook } from "@/store/modules/user";
+import { storageLocal, isString, isIncludeAllChildren } from "@pureadmin/utils";

 export interface DataInfo<T> {
  /** token */
@@ -17,6 +17,8 @@ export interface DataInfo<T> {
  nickname?: string;
  /** 当前登录用户的角色 */
  roles?: Array<string>;
+  /** 当前登录用户的按钮级别权限 */
+  permissions?: Array<string>;
 }

 export const userKey = "user-info";
@@ -41,7 +43,7 @@ export function getToken(): DataInfo<number> {
 * @description 设置`token`以及一些必要信息并采用无感刷新`token`方案
 * 无感刷新：后端返回`accessToken`（访问接口使用的`token`）、`refreshToken`（用于调用刷新`accessToken`的接口时所需的`token`，`refreshToken`的过期时间（比如30天）应大于`accessToken`的过期时间（比如2小时））、`expires`（`accessToken`的过期时间）
 * 将`accessToken`、`expires`、`refreshToken`这三条信息放在key值为authorized-token的cookie里（过期自动销毁）
- * 将`avatar`、`username`、`nickname`、`roles`、`refreshToken`、`expires`这六条信息放在key值为`user-info`的localStorage里（利用`multipleTabsKey`当浏览器完全关闭后自动销毁）
+ * 将`avatar`、`username`、`nickname`、`roles`、`permissions`、`refreshToken`、`expires`这七条信息放在key值为`user-info`的localStorage里（利用`multipleTabsKey`当浏览器完全关闭后自动销毁）
 */
 export function setToken(data: DataInfo<Date>) {
  let expires = 0;
@@ -66,18 +68,20 @@ export function setToken(data: DataInfo<Date>) {
      : {}
  );

-  function setUserKey({ avatar, username, nickname, roles }) {
+  function setUserKey({ avatar, username, nickname, roles, permissions }) {
    useUserStoreHook().SET_AVATAR(avatar);
    useUserStoreHook().SET_USERNAME(username);
    useUserStoreHook().SET_NICKNAME(nickname);
    useUserStoreHook().SET_ROLES(roles);
+    useUserStoreHook().SET_PERMS(permissions);
    storageLocal().setItem(userKey, {
      refreshToken,
      expires,
      avatar,
      username,
      nickname,
-      roles
+      roles,
+      permissions
    });
  }

@@ -87,7 +91,8 @@ export function setToken(data: DataInfo<Date>) {
      avatar: data?.avatar ?? "",
      username,
      nickname: data?.nickname ?? "",
-      roles
+      roles,
+      permissions: data?.permissions ?? []
    });
  } else {
    const avatar =
@@ -98,11 +103,14 @@ export function setToken(data: DataInfo<Date>) {
      storageLocal().getItem<DataInfo<number>>(userKey)?.nickname ?? "";
    const roles =
      storageLocal().getItem<DataInfo<number>>(userKey)?.roles ?? [];
+    const permissions =
+      storageLocal().getItem<DataInfo<number>>(userKey)?.permissions ?? [];
    setUserKey({
      avatar,
      username,
      nickname,
-      roles
+      roles,
+      permissions
    });
  }
 }
@@ -118,3 +126,16 @@ export function removeToken() {
 export const formatToken = (token: string): string => {
  return "Bearer " + token;
 };
+
+/** 是否有按钮级别的权限（根据登录接口返回的`permissions`字段进行判断）*/
+export const hasPerms = (value: string | Array<string>): boolean => {
+  if (!value) return false;
+  const allPerms = "*:*:*";
+  const { permissions } = useUserStoreHook();
+  if (!permissions) return false;
+  if (permissions.length === 1 && permissions[0] === allPerms) return true;
+  const isAuths = isString(value)
+    ? permissions.includes(value)
+    : isIncludeAllChildren(value, permissions);
+  return isAuths ? true : false;
+};
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -456,7 +456,9 @@ function onSureBtnLoading() {
    sureBtnLoading: true,
    title: "点击底部确定按钮可开启按钮动画",
    contentRenderer: () => <p>弹框内容-点击底部确定按钮可开启按钮动画</p>,
-    beforeSure: done => {
+    beforeSure: (done, { closeLoading }) => {
+      // closeLoading() // 关闭确定按钮动画，不关闭弹框
+      // done() // 关闭确定按钮动画并关闭弹框
      setTimeout(() => done(), 800);
    }
  });
--- a/src/views/monitor/logs/login/index.vue
+++ b/src/views/monitor/logs/login/index.vue
@@ -133,8 +133,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/monitor/logs/operation/index.vue
+++ b/src/views/monitor/logs/operation/index.vue
@@ -133,8 +133,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/monitor/logs/system/index.vue
+++ b/src/views/monitor/logs/system/index.vue
@@ -125,8 +125,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -74,8 +74,7 @@ const {
          :adaptiveConfig="{ offsetBottom: 108 }"
          :data="dataList"
          :columns="dynamicColumns"
-          :pagination="pagination"
-          :paginationSmall="size === 'small' ? true : false"
+          :pagination="{ ...pagination, size }"
          :header-cell-style="{
            background: 'var(--el-fill-color-light)',
            color: 'var(--el-text-color-primary)'
--- a/src/views/permission/button/index.vue
+++ b/src/views/permission/button/index.vue
@@ -2,7 +2,7 @@
 import { hasAuth, getAuths } from "@/router/utils";

 defineOptions({
-  name: "PermissionButton"
+  name: "PermissionButtonRouter"
 });
 </script>

--- a/src/views/permission/button/perms.vue
+++ b/src/views/permission/button/perms.vue
@@ -0,0 +1,116 @@
+<script setup lang="ts">
+import { hasPerms } from "@/utils/auth";
+import { useUserStoreHook } from "@/store/modules/user";
+
+const { permissions } = useUserStoreHook();
+
+defineOptions({
+  name: "PermissionButtonLogin"
+});
+</script>
+
+<template>
+  <div>
+    <p class="mb-2">当前拥有的code列表：{{ permissions }}</p>
+    <p v-show="permissions?.[0] === '*:*:*'" class="mb-2">
+      *:*:* 代表拥有全部按钮级别权限
+    </p>
+
+    <el-card shadow="never" class="mb-2">
+      <template #header>
+        <div class="card-header">组件方式判断权限</div>
+        <el-link
+          class="mt-2"
+          href="https://github.com/pure-admin/vue-pure-admin/blob/main/src/views/permission/button/perms.vue"
+          target="_blank"
+        >
+          代码位置 src/views/permission/button/perms.vue
+        </el-link>
+      </template>
+      <el-space wrap>
+        <Perms value="permission:btn:add">
+          <el-button plain type="warning">
+            拥有code：'permission:btn:add' 权限可见
+          </el-button>
+        </Perms>
+        <Perms :value="['permission:btn:edit']">
+          <el-button plain type="primary">
+            拥有code：['permission:btn:edit'] 权限可见
+          </el-button>
+        </Perms>
+        <Perms
+          :value="[
+            'permission:btn:add',
+            'permission:btn:edit',
+            'permission:btn:delete'
+          ]"
+        >
+          <el-button plain type="danger">
+            拥有code：['permission:btn:add', 'permission:btn:edit',
+            'permission:btn:delete'] 权限可见
+          </el-button>
+        </Perms>
+      </el-space>
+    </el-card>
+
+    <el-card shadow="never" class="mb-2">
+      <template #header>
+        <div class="card-header">函数方式判断权限</div>
+      </template>
+      <el-space wrap>
+        <el-button v-if="hasPerms('permission:btn:add')" plain type="warning">
+          拥有code：'permission:btn:add' 权限可见
+        </el-button>
+        <el-button
+          v-if="hasPerms(['permission:btn:edit'])"
+          plain
+          type="primary"
+        >
+          拥有code：['permission:btn:edit'] 权限可见
+        </el-button>
+        <el-button
+          v-if="
+            hasPerms([
+              'permission:btn:add',
+              'permission:btn:edit',
+              'permission:btn:delete'
+            ])
+          "
+          plain
+          type="danger"
+        >
+          拥有code：['permission:btn:add', 'permission:btn:edit',
+          'permission:btn:delete'] 权限可见
+        </el-button>
+      </el-space>
+    </el-card>
+
+    <el-card shadow="never">
+      <template #header>
+        <div class="card-header">
+          指令方式判断权限（该方式不能动态修改权限）
+        </div>
+      </template>
+      <el-space wrap>
+        <el-button v-perms="'permission:btn:add'" plain type="warning">
+          拥有code：'permission:btn:add' 权限可见
+        </el-button>
+        <el-button v-perms="['permission:btn:edit']" plain type="primary">
+          拥有code：['permission:btn:edit'] 权限可见
+        </el-button>
+        <el-button
+          v-perms="[
+            'permission:btn:add',
+            'permission:btn:edit',
+            'permission:btn:delete'
+          ]"
+          plain
+          type="danger"
+        >
+          拥有code：['permission:btn:add', 'permission:btn:edit',
+          'permission:btn:delete'] 权限可见
+        </el-button>
+      </el-space>
+    </el-card>
+  </div>
+</template>
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -173,8 +173,7 @@ onMounted(() => {
            :adaptiveConfig="{ offsetBottom: 108 }"
            :data="dataList"
            :columns="dynamicColumns"
-            :pagination="pagination"
-            :paginationSmall="size === 'small' ? true : false"
+            :pagination="{ ...pagination, size }"
            :header-cell-style="{
              background: 'var(--el-fill-color-light)',
              color: 'var(--el-text-color-primary)'
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -160,8 +160,7 @@ const {
            :size="size"
            :data="dataList"
            :columns="dynamicColumns"
-            :pagination="pagination"
-            :paginationSmall="size === 'small' ? true : false"
+            :pagination="{ ...pagination, size }"
            :header-cell-style="{
              background: 'var(--el-fill-color-light)',
              color: 'var(--el-text-color-primary)'
--- a/src/views/table/base/tree.vue
+++ b/src/views/table/base/tree.vue
@@ -116,7 +116,11 @@ const columns: TableColumnList = [
      border
      lazy
      :load="load"
-      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      :tree-props="{
+        hasChildren: 'hasChildren',
+        children: 'children',
+        checkStrictly: false
+      }"
    />
  </div>
 </template>
--- a/src/views/table/high/adaptive/columns.tsx
+++ b/src/views/table/high/adaptive/columns.tsx
@@ -33,7 +33,7 @@ export function useColumns() {
    total: 0,
    align: "right",
    background: true,
-    small: false
+    size: "default"
  });

  /** 加载动画配置 */
--- a/src/views/table/high/page/columns.tsx
+++ b/src/views/table/high/page/columns.tsx
@@ -9,7 +9,6 @@ export function useColumns() {
  const select = ref("no");
  const hideVal = ref("nohide");
  const tableSize = ref("default");
-  const paginationSmall = ref(false);
  const paginationAlign = ref("right");
  const columns: TableColumnList = [
    {
@@ -43,7 +42,7 @@ export function useColumns() {
    total: 0,
    align: "right",
    background: true,
-    small: false
+    size: "default"
  });

  /** 加载动画配置 */
@@ -65,7 +64,7 @@ export function useColumns() {
  });

  function onChange(val) {
-    pagination.small = val;
+    pagination.size = val;
  }

  function onSizeChange(val) {
@@ -108,7 +107,6 @@ export function useColumns() {
    pagination,
    loadingConfig,
    paginationAlign,
-    paginationSmall,
    onChange,
    onSizeChange,
    onCurrentChange
--- a/src/views/table/high/page/index.vue
+++ b/src/views/table/high/page/index.vue
@@ -11,7 +11,6 @@ const {
  pagination,
  loadingConfig,
  paginationAlign,
-  paginationSmall,
  onChange,
  onSizeChange,
  onCurrentChange
@@ -43,9 +42,10 @@ const {
      </el-radio-group>
      <el-divider direction="vertical" />
      <p class="text-sm">分页大小：</p>
-      <el-radio-group v-model="paginationSmall" size="small" @change="onChange">
-        <el-radio-button :value="false">no small</el-radio-button>
-        <el-radio-button :value="true">small</el-radio-button>
+      <el-radio-group v-model="pagination.size" size="small" @change="onChange">
+        <el-radio-button value="large">large</el-radio-button>
+        <el-radio-button value="default">default</el-radio-button>
+        <el-radio-button value="small">small</el-radio-button>
      </el-radio-group>
      <el-divider direction="vertical" />
      <p class="text-sm">分页的对齐方式：</p>
--- a/src/views/table/high/table-select/multiple/columns.tsx
+++ b/src/views/table/high/table-select/multiple/columns.tsx
@@ -59,7 +59,7 @@ export function useColumns(selectRef: Ref, formRef: Ref, tableRef: Ref) {
    layout: "prev, pager, next",
    total: tableData.value.length,
    background: true,
-    small: true
+    size: "small"
  });

  const handleSelectionChange = val => {
--- a/src/views/table/high/table-select/radio/columns.tsx
+++ b/src/views/table/high/table-select/radio/columns.tsx
@@ -33,7 +33,7 @@ export function useColumns(selectRef: Ref) {
    layout: "prev, pager, next",
    total: tableDataEdit.length,
    background: true,
-    small: true
+    size: "small"
  });

  /** 高亮当前选中行 */