From e1feed4fb9f3a7722eb0cd646e73e6573bdfb6e1 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 16 四月 2024 20:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/flow/follow.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/flow/follow.vue b/Source/UBCS-WEB/src/views/flow/follow.vue
index 4e4f44d..bcf406a 100644
--- a/Source/UBCS-WEB/src/views/flow/follow.vue
+++ b/Source/UBCS-WEB/src/views/flow/follow.vue
@@ -65,7 +65,8 @@
deleteReason: '',
option: {
height: 'auto',
- calcHeight: 30,
+ calcHeight: 20,
+ columnBtn:false,
tip: false,
searchShow: true,
searchMenuSpan: 6,
@@ -122,7 +123,7 @@
...mapGetters(["permission"]),
permissionList() {
return {
- delBtn: this.vaildData(this.permission.flow_follow_delete, false),
+ delBtn: this.vaildData(this.permission.flow_follow.flow_follow_delete, false),
};
},
ids() {
--
Gitblit v1.9.3