From 99932d91c0144da9f34f5bb05683cc0b86303217 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 15 Mar 2022 12:03:01 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E6=82=AC=E5=81=9C=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/layout/components/Sidebar/Item.vue | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ruoyi-ui/src/layout/components/Sidebar/Item.vue b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
index 1a99d63f..37214aa0 100644
--- a/ruoyi-ui/src/layout/components/Sidebar/Item.vue
+++ b/ruoyi-ui/src/layout/components/Sidebar/Item.vue
@@ -21,7 +21,11 @@ export default {
}
if (title) {
- vnodes.push(<span slot='title'>{(title)}</span>)
+ if (title.length > 5) {
+ vnodes.push(<span slot='title' title={(title)}>{(title)}</span>)
+ } else {
+ vnodes.push(<span slot='title'>{(title)}</span>)
+ }
}
return vnodes
}
From 0b08933a8c742e6f839a279e0ea24e7d5cb1cc2e Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 15 Mar 2022 14:42:44 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=87=BA?=
=?UTF-8?q?=E6=95=B0=E6=8D=AELocalDateTime=E7=B1=BB=E5=9E=8B=E6=97=A0?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
index 21a8ad66..aa475e35 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -284,7 +284,7 @@ public class ExcelUtil<T>
String dateFormat = field.getAnnotation(Excel.class).dateFormat();
if (StringUtils.isNotEmpty(dateFormat))
{
- val = parseDateToStr(dateFormat, (Date) val);
+ val = parseDateToStr(dateFormat, val);
}
else
{
@@ -703,7 +703,7 @@ public class ExcelUtil<T>
String separator = attr.separator();
if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
{
- cell.setCellValue(parseDateToStr(dateFormat, (Date) value));
+ cell.setCellValue(parseDateToStr(dateFormat, value));
}
else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
{
From 242101ae6e7584e89f1ddec082aa7b24aa7a37c2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 16 Mar 2022 09:18:21 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=BE=A4?=
=?UTF-8?q?=E5=8F=B7=EF=BC=9A213618602?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
ruoyi-ui/src/views/index.vue | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 50daf9f8..ac241f0a 100644
--- a/README.md
+++ b/README.md
@@ -127,4 +127,4 @@ com.ruoyi
## 若依微服务交流群
-QQ群： [](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) 点击按钮入群。
\ No newline at end of file
+QQ群： [](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) 点击按钮入群。
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index 6110b996..e439bb8f 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -118,10 +118,10 @@
>
</p>
<p>
- <i class="el-icon-user-solid"></i> QQ群：<s>满42799195</s>
- <s>满170157040</s> <s>满130643120</s> <s>满225920371</s> <s>满201705537</s>
- <a href="https://jq.qq.com/?_wv=1027&k=qdT1Ojpz" target="_blank">
- 236543183</a
+ <i class="el-icon-user-solid"></i> QQ群：<s>满42799195</s> <s>满170157040</s>
+ <s>满130643120</s> <s>满225920371</s> <s>满201705537</s> <s>满236543183</s>
+ <a href="https://jq.qq.com/?_wv=1027&k=73TMBe12" target="_blank">
+ 213618602</a
>
</p>
<p>
From 368a9044be6f9416ace216cf121130dd05127522 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Mar 2022 09:48:00 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8DOracle=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=BA=93=E7=94=A8=E6=88=B7=E8=A1=A8=E5=A4=B4=E5=83=8F=E5=88=97?=
=?UTF-8?q?=E4=B8=BAnull=E6=97=B6=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E5=A4=B4=E5=83=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/store/modules/user.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 103706da..262de9b0 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -57,7 +57,7 @@ const user = {
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
- const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
From bc05b453df38542598c2624bd951ef7e6be4fb4f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Mar 2022 09:48:53 +0800
Subject: [PATCH 5/6] update README
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index ac241f0a..b41921a5 100644
--- a/README.md
+++ b/README.md
@@ -127,4 +127,4 @@ com.ruoyi
## 若依微服务交流群
-QQ群： [](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) 点击按钮入群。
\ No newline at end of file
+QQ群： [](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) 点击按钮入群。
\ No newline at end of file
From dc8938ab2f51194545c400464720d40d6a7d1c7a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Mar 2022 09:49:05 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=9B=BA=E5=AE=9AHeader?=
=?UTF-8?q?=E5=90=8E=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E9=97=AE=E9=A2=98(I4XDN5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/src/layout/index.vue | 4 ++++
ruoyi-ui/src/store/modules/app.js | 3 +++
2 files changed, 7 insertions(+)
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index 45844fd1..9540aa4b 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -101,6 +101,10 @@ export default {
width: calc(100% - 54px);
}
+ .sidebarHide .fixed-header {
+ width: calc(100%);
+ }
+
.mobile .fixed-header {
width: 100%;
}
diff --git a/ruoyi-ui/src/store/modules/app.js b/ruoyi-ui/src/store/modules/app.js
index e506730c..5a0ed6c9 100644
--- a/ruoyi-ui/src/store/modules/app.js
+++ b/ruoyi-ui/src/store/modules/app.js
@@ -12,6 +12,9 @@ const state = {
const mutations = {
TOGGLE_SIDEBAR: state => {
+ if (state.sidebar.hide) {
+ return false;
+ }
state.sidebar.opened = !state.sidebar.opened
state.sidebar.withoutAnimation = false
if (state.sidebar.opened) {