From f6f3db1701d0f15da82a76e53fa92675b8ed635d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 十二月 2022 16:26:18 +0800
Subject: [PATCH] update hutool 5.8.10 => 5.8.11 update aws-s3 1.12.349 => 1.12.373 update aliyun-sms 2.0.22 => 2.0.23 update tencent-sms 3.1.635 => 3.1.660
---
ruoyi-ui/src/components/RightToolbar/index.vue | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
index c7ab139..776fcee 100644
--- a/ruoyi-ui/src/components/RightToolbar/index.vue
+++ b/ruoyi-ui/src/components/RightToolbar/index.vue
@@ -1,7 +1,7 @@
<template>
- <div class="top-right-btn">
+ <div class="top-right-btn" :style="style">
<el-row>
- <el-tooltip class="item" effect="dark" :content="showSearch ? '闅愯棌鎼滅储' : '鏄剧ず鎼滅储'" placement="top">
+ <el-tooltip class="item" effect="dark" :content="showSearch ? '闅愯棌鎼滅储' : '鏄剧ず鎼滅储'" placement="top" v-if="search">
<el-button size="mini" circle icon="el-icon-search" @click="toggleSearch()" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
@@ -42,6 +42,23 @@
columns: {
type: Array,
},
+ search: {
+ type: Boolean,
+ default: true,
+ },
+ gutter: {
+ type: Number,
+ default: 10,
+ },
+ },
+ computed: {
+ style() {
+ const ret = {};
+ if (this.gutter) {
+ ret.marginRight = `${this.gutter / 2}px`;
+ }
+ return ret;
+ }
},
created() {
// 鏄鹃殣鍒楀垵濮嬮粯璁ら殣钘忓垪
@@ -62,7 +79,7 @@
},
// 鍙充晶鍒楄〃鍏冪礌鍙樺寲
dataChange(data) {
- for (var item in this.columns) {
+ for (let item in this.columns) {
const key = this.columns[item].key;
this.columns[item].visible = !data.includes(key);
}
--
Gitblit v1.9.3