From 06fbda53248c3e4dfdb09db2bc05a957f918bfd9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 07 十一月 2022 11:20:02 +0800
Subject: [PATCH] 修复sheet超出最大行数异常问题
---
ruoyi-ui/src/utils/ruoyi.js | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index 8e3cb0c..d2cd2a0 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -68,8 +68,11 @@
return search;
}
-// 回显数据字典
+// 回显数据字典
export function selectDictLabel(datas, value) {
+ if (value === undefined) {
+ return "";
+ }
var actions = [];
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + value)) {
@@ -77,23 +80,31 @@
return true;
}
})
+ if (actions.length === 0) {
+ actions.push(value);
+ }
return actions.join('');
}
// 回显数据字典（字符串数组）
export function selectDictLabels(datas, value, separator) {
- if(value === undefined) {
+ if (value === undefined) {
return "";
}
var actions = [];
var currentSeparator = undefined === separator ? "," : separator;
var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => {
+ var match = false;
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + temp[val])) {
actions.push(datas[key].label + currentSeparator);
+ match = true;
}
})
+ if (!match) {
+ actions.push(temp[val] + currentSeparator);
+ }
})
return actions.join('').substring(0, actions.join('').length - 1);
}
@@ -196,10 +207,10 @@
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
- if (value !== null && typeof (value) !== "undefined") {
+ if (value !== null && value !== "" && typeof (value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
- if (value[key] !== null && typeof (value[key]) !== 'undefined') {
+ if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
var subPart = encodeURIComponent(params) + "=";
result += subPart + encodeURIComponent(value[key]) + "&";
@@ -222,4 +233,4 @@
} catch (error) {
return true;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2