From 9e6b2a12650c5a6d24be3de8c078d31e7548750e Mon Sep 17 00:00:00 2001
From: yuhong0206@sina.cn <yuhong0206@sina.cn>
Date: 星期一, 29 三月 2021 08:56:51 +0800
Subject: [PATCH] 读取excel增加 if(row == null) { continue; } 判断。防止有时候Excel表中有空数据行，导致读取时出现空指针异常。
---
ruoyi-ui/src/components/Screenfull/index.vue | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/components/Screenfull/index.vue b/ruoyi-ui/src/components/Screenfull/index.vue
index 099d74d..85937c9 100644
--- a/ruoyi-ui/src/components/Screenfull/index.vue
+++ b/ruoyi-ui/src/components/Screenfull/index.vue
@@ -22,11 +22,8 @@
},
methods: {
click() {
- if (!screenfull.enabled) {
- this.$message({
- message: 'you browser can not work',
- type: 'warning'
- })
+ if (!screenfull.isEnabled) {
+ this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
return false
}
screenfull.toggle()
@@ -35,12 +32,12 @@
this.isFullscreen = screenfull.isFullscreen
},
init() {
- if (screenfull.enabled) {
+ if (screenfull.isEnabled) {
screenfull.on('change', this.change)
}
},
destroy() {
- if (screenfull.enabled) {
+ if (screenfull.isEnabled) {
screenfull.off('change', this.change)
}
}
--
Gitblit v1.9.2