弹框内容-点击底部确定按钮可开启按钮动画
, + beforeSure: done => { + setTimeout(() => done(), 800); + } + }); +} @@ -534,6 +545,9 @@ function onBeforeSureClick() {
+
(isFullscreen.value = !isFullscreen.value)}
+ />
{slots.default({
From 37ab40f1887eeb35fca33f83c106a39a78ba9d5e Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Sat, 3 Aug 2024 15:13:20 +0800
Subject: [PATCH 05/46] =?UTF-8?q?feat:=20`VxeTableBar`=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=A8=E5=B1=8F=E5=92=8C=E9=80=80=E5=87=BA?=
=?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ReVxeTableBar/src/bar.tsx | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/components/ReVxeTableBar/src/bar.tsx b/src/components/ReVxeTableBar/src/bar.tsx
index f2c9ba13d..581c90121 100644
--- a/src/components/ReVxeTableBar/src/bar.tsx
+++ b/src/components/ReVxeTableBar/src/bar.tsx
@@ -12,6 +12,8 @@ import {
getCurrentInstance
} from "vue";
+import Fullscreen from "@iconify-icons/ri/fullscreen-fill";
+import ExitFullscreen from "@iconify-icons/ri/fullscreen-exit-fill";
import DragIcon from "@/assets/table-bar/drag.svg?component";
import ExpandIcon from "@/assets/table-bar/expand.svg?component";
import RefreshIcon from "@/assets/table-bar/refresh.svg?component";
@@ -55,6 +57,7 @@ export default defineComponent({
const size = ref("small");
const loading = ref(false);
const checkAll = ref(true);
+ const isFullscreen = ref(false);
const isIndeterminate = ref(false);
const instance = getCurrentInstance()!;
const isExpandAll = ref(props.isExpandAll);
@@ -237,7 +240,18 @@ export default defineComponent({
return () => (
<>
-
{slots?.title ? (
slots.title()
@@ -358,6 +372,14 @@ export default defineComponent({
+
+
(isFullscreen.value = !isFullscreen.value)}
+ />
{slots.default({
From 96152ed134ccec3bdb8cbb00b927b5bb840e4390 Mon Sep 17 00:00:00 2001
From: xiaoxian521 <1923740402@qq.com>
Date: Mon, 5 Aug 2024 13:15:10 +0800
Subject: [PATCH 06/46] =?UTF-8?q?feat:=20`ReDialog`=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E7=9A=84=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E6=8F=90=E4=BE=9B?=
=?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE=E5=8A=A8=E7=94=BB`closeLoa?=
=?UTF-8?q?ding`=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/ReDialog/index.vue | 7 +++++--
src/components/ReDialog/type.ts | 15 +++++++++------
src/views/components/dialog/index.vue | 4 +++-
3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/components/ReDialog/index.vue b/src/components/ReDialog/index.vue
index df86143cc..23a0106e3 100644
--- 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();
}
diff --git a/src/components/ReDialog/type.ts b/src/components/ReDialog/type.ts
index 7ea8f71fb..7efbe2018 100644
--- 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;
}
diff --git a/src/views/components/dialog/index.vue b/src/views/components/dialog/index.vue
index 8f46e04c0..8f045da78 100644
--- a/src/views/components/dialog/index.vue
+++ b/src/views/components/dialog/index.vue
@@ -456,7 +456,9 @@ function onSureBtnLoading() {
sureBtnLoading: true,
title: "点击底部确定按钮可开启按钮动画",
contentRenderer: () =>
{slots?.title ? (
slots.title()
@@ -349,6 +363,14 @@ export default defineComponent({
+ 弹框内容-点击底部确定按钮可开启按钮动画
, - beforeSure: done => { + beforeSure: (done, { closeLoading }) => { + // closeLoading() // 关闭确定按钮动画，不关闭弹框 + // done() // 关闭确定按钮动画并关闭弹框 setTimeout(() => done(), 800); } }); From 244ab7f9909701b76c1d366a4282853a99c0e614 Mon Sep 17 00:00:00 2001 From: xiaoming <1923740402@qq.com> Date: Mon, 12 Aug 2024 13:32:04 +0800 Subject: [PATCH 07/46] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E7=AC=AC?= =?UTF-8?q?=E4=BA=8C=E7=A7=8D=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E6=8C=87?= =?UTF-8?q?=E4=BB=A4=EF=BC=88=E6=A0=B9=E6=8D=AE=E7=99=BB=E5=BD=95=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=BF=94=E5=9B=9E=E7=9A=84`permissions`=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD=EF=BC=89=20(#1177?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 新增第二种按钮权限指令（根据登录接口返回的`permissions`字段进行判断） --- .vscode/settings.json | 1 + locales/en.yaml | 2 + locales/zh-CN.yaml | 2 + mock/asyncRoutes.ts | 35 +++++-- mock/login.ts | 3 + mock/system.ts | 128 +++++++++++++++++++++++++- src/api/user.ts | 2 + src/components/RePerms/index.ts | 5 + src/components/RePerms/src/perms.tsx | 20 ++++ src/directives/index.ts | 1 + src/directives/perms/index.ts | 15 +++ src/main.ts | 2 + src/router/utils.ts | 2 +- src/store/modules/user.ts | 8 ++ src/store/types.ts | 1 + src/utils/auth.ts | 33 +++++-- src/views/permission/button/index.vue | 2 +- src/views/permission/button/perms.vue | 116 +++++++++++++++++++++++ types/directives.d.ts | 4 +- types/global-components.d.ts | 1 + 20 files changed, 361 insertions(+), 22 deletions(-) create mode 100644 src/components/RePerms/index.ts create mode 100644 src/components/RePerms/src/perms.tsx create mode 100644 src/directives/perms/index.ts create mode 100644 src/views/permission/button/perms.vue diff --git a/.vscode/settings.json b/.vscode/settings.json index b5aefceb4..6f73d2027 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -57,6 +57,7 @@ "v-copy", "v-longpress", "v-optimize", + "v-perms", "v-ripple" ], "vscodeCustomCodeColor.highlightValueColor": "#b392f0", diff --git a/locales/en.yaml b/locales/en.yaml index d02f36f93..3793277b1 100644 --- a/locales/en.yaml +++ b/locales/en.yaml @@ -125,6 +125,8 @@ menus: purePermission: Permission Manage purePermissionPage: Page Permission purePermissionButton: Button Permission + purePermissionButtonRouter: Route return button permission + purePermissionButtonLogin: Login interface return button permission pureTabs: Tabs Operate pureGuide: Guide pureAble: Able diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml index 6ce420969..7be27a8ec 100644 --- a/locales/zh-CN.yaml +++ b/locales/zh-CN.yaml @@ -125,6 +125,8 @@ menus: purePermission: 权限管理 purePermissionPage: 页面权限 purePermissionButton: 按钮权限 + purePermissionButtonRouter: 路由返回按钮权限 + purePermissionButtonLogin: 登录接口返回按钮权限 pureTabs: 标签页操作 pureGuide: 引导页 pureAble: 功能 diff --git a/mock/asyncRoutes.ts b/mock/asyncRoutes.ts index 4f2fab739..5ca555977 100644 --- a/mock/asyncRoutes.ts +++ b/mock/asyncRoutes.ts @@ -123,17 +123,34 @@ const permissionRouter = { } }, { - path: "/permission/button/index", - name: "PermissionButton", + path: "/permission/button", meta: { title: "menus.purePermissionButton", - roles: ["admin", "common"], - auths: [ - "permission:btn:add", - "permission:btn:edit", - "permission:btn:delete" - ] - } + roles: ["admin", "common"] + }, + children: [ + { + path: "/permission/button/router", + component: "permission/button/index", + name: "PermissionButtonRouter", + meta: { + title: "menus.purePermissionButtonRouter", + auths: [ + "permission:btn:add", + "permission:btn:edit", + "permission:btn:delete" + ] + } + }, + { + path: "/permission/button/login", + component: "permission/button/perms", + name: "PermissionButtonLogin", + meta: { + title: "menus.purePermissionButtonLogin" + } + } + ] } ] }; diff --git a/mock/login.ts b/mock/login.ts index a9c71b15d..55897d8f4 100644 --- a/mock/login.ts +++ b/mock/login.ts @@ -15,6 +15,8 @@ export default defineFakeRoute([ nickname: "小铭", // 一个用户可能有多个角色 roles: ["admin"], + // 按钮级别权限 + permissions: ["*:*:*"], accessToken: "eyJhbGciOiJIUzUxMiJ9.admin", refreshToken: "eyJhbGciOiJIUzUxMiJ9.adminRefresh", expires: "2030/10/30 00:00:00" @@ -28,6 +30,7 @@ export default defineFakeRoute([ username: "common", nickname: "小林", roles: ["common"], + permissions: ["permission:btn:add", "permission:btn:edit"], accessToken: "eyJhbGciOiJIUzUxMiJ9.common", refreshToken: "eyJhbGciOiJIUzUxMiJ9.commonRefresh", expires: "2030/10/30 00:00:00" diff --git a/mock/system.ts b/mock/system.ts index a4e33f716..5c9172cd8 100644 --- a/mock/system.ts +++ b/mock/system.ts @@ -696,7 +696,7 @@ export default defineFakeRoute([ menuType: 0, title: "menus.purePermissionButton", name: "PermissionButton", - path: "/permission/button/index", + path: "/permission/button", component: "", rank: null, redirect: "", @@ -717,6 +717,30 @@ export default defineFakeRoute([ { parentId: 202, id: 203, + menuType: 0, + title: "menus.purePermissionButtonRouter", + name: "PermissionButtonRouter", + path: "/permission/button/router", + component: "permission/button/index", + rank: null, + redirect: "", + icon: "", + extraIcon: "", + enterTransition: "", + leaveTransition: "", + activePath: "", + auths: "", + frameSrc: "", + frameLoading: true, + keepAlive: false, + hiddenTag: false, + fixedTag: false, + showLink: true, + showParent: false + }, + { + parentId: 203, + id: 210, menuType: 3, title: "添加", name: "", @@ -739,8 +763,8 @@ export default defineFakeRoute([ showParent: false }, { - parentId: 202, - id: 204, + parentId: 203, + id: 211, menuType: 3, title: "修改", name: "", @@ -762,9 +786,105 @@ export default defineFakeRoute([ showLink: true, showParent: false }, + { + parentId: 203, + id: 212, + menuType: 3, + title: "删除", + name: "", + path: "", + component: "", + rank: null, + redirect: "", + icon: "", + extraIcon: "", + enterTransition: "", + leaveTransition: "", + activePath: "", + auths: "permission:btn:delete", + frameSrc: "", + frameLoading: true, + keepAlive: false, + hiddenTag: false, + fixedTag: false, + showLink: true, + showParent: false + }, { parentId: 202, - id: 205, + id: 204, + menuType: 0, + title: "menus.purePermissionButtonLogin", + name: "PermissionButtonLogin", + path: "/permission/button/login", + component: "permission/button/perms", + rank: null, + redirect: "", + icon: "", + extraIcon: "", + enterTransition: "", + leaveTransition: "", + activePath: "", + auths: "", + frameSrc: "", + frameLoading: true, + keepAlive: false, + hiddenTag: false, + fixedTag: false, + showLink: true, + showParent: false + }, + { + parentId: 204, + id: 220, + menuType: 3, + title: "添加", + name: "", + path: "", + component: "", + rank: null, + redirect: "", + icon: "", + extraIcon: "", + enterTransition: "", + leaveTransition: "", + activePath: "", + auths: "permission:btn:add", + frameSrc: "", + frameLoading: true, + keepAlive: false, + hiddenTag: false, + fixedTag: false, + showLink: true, + showParent: false + }, + { + parentId: 204, + id: 221, + menuType: 3, + title: "修改", + name: "", + path: "", + component: "", + rank: null, + redirect: "", + icon: "", + extraIcon: "", + enterTransition: "", + leaveTransition: "", + activePath: "", + auths: "permission:btn:edit", + frameSrc: "", + frameLoading: true, + keepAlive: false, + hiddenTag: false, + fixedTag: false, + showLink: true, + showParent: false + }, + { + parentId: 204, + id: 222, menuType: 3, title: "删除", name: "", diff --git a/src/api/user.ts b/src/api/user.ts index a0c43e00c..2404c008f 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -11,6 +11,8 @@ export type UserResult = { nickname: string; /** 当前登录用户的角色 */ roles: Array
+
+
+
+ 代码位置 src/views/permission/button/perms.vue
+
+
+
+
+
+ 拥有code：'permission:btn:add' 权限可见
+
+
+
+
+ 拥有code：['permission:btn:edit'] 权限可见
+
+
+
+
+ 拥有code：['permission:btn:add', 'permission:btn:edit',
+ 'permission:btn:delete'] 权限可见
+
+
+
+
+
+
+
+
+
+ 拥有code：'permission:btn:add' 权限可见
+
+
+ 拥有code：['permission:btn:edit'] 权限可见
+
+
+ 拥有code：['permission:btn:add', 'permission:btn:edit',
+ 'permission:btn:delete'] 权限可见
+
+
+
+
+
+
+
+
+ 拥有code：'permission:btn:add' 权限可见
+
+
+ 拥有code：['permission:btn:edit'] 权限可见
+
+
+ 拥有code：['permission:btn:add', 'permission:btn:edit',
+ 'permission:btn:delete'] 权限可见
+
+
+
+
+
diff --git a/types/directives.d.ts b/types/directives.d.ts
index 87256982f..458fd0972 100644
--- a/types/directives.d.ts
+++ b/types/directives.d.ts
@@ -5,7 +5,7 @@ declare module "vue" {
export interface ComponentCustomProperties {
/** `Loading` 动画加载指令，具体看：https://element-plus.org/zh-CN/component/loading.html#%E6%8C%87%E4%BB%A4 */
vLoading: Directive当前拥有的code列表：{{ permissions }}
++ *:*:* 代表拥有全部按钮级别权限 +
+ +组件方式判断权限
+ 函数方式判断权限
+
+
+ 指令方式判断权限（该方式不能动态修改权限）
+
+
+