From fbab383bd78e9ca1bd84e5a158d5833e5888f5ac Mon Sep 17 00:00:00 2001
From: 张利 <zhangli_wei555@163.com>
Date: Thu, 02 Nov 2023 10:57:04 +0800
Subject: [PATCH] update ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java. 此处新密码加密了两次，多余的操作，且会导致新生成的数据库密码与缓存中的密码不同，如果修改的不对还请讲解回复下，谢谢。
---
ruoyi-ui/src/components/RightToolbar/index.vue | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/components/RightToolbar/index.vue b/ruoyi-ui/src/components/RightToolbar/index.vue
index 976974e..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() {
// 显隐列初始默认隐藏列
--
Gitblit v1.9.2