From 99e66bf11c38ebe2f21f73b956918468eae4929c Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 30 六月 2024 08:02:22 +0800
Subject: [PATCH] 若依 3.8.8
---
ruoyi-ui/src/utils/ruoyi.js | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ruoyi-ui/src/utils/ruoyi.js b/ruoyi-ui/src/utils/ruoyi.js
index d2cd2a0..44bf9c4 100644
--- a/ruoyi-ui/src/utils/ruoyi.js
+++ b/ruoyi-ui/src/utils/ruoyi.js
@@ -86,10 +86,13 @@
return actions.join('');
}
-// 回显数据字典（字符串数组）
+// 回显数据字典（字符串、数组）
export function selectDictLabels(datas, value, separator) {
- if (value === undefined) {
+ if (value === undefined || value.length ===0) {
return "";
+ }
+ if (Array.isArray(value)) {
+ value = value.join(",");
}
var actions = [];
var currentSeparator = undefined === separator ? "," : separator;
@@ -225,12 +228,6 @@
}
// 验证是否为blob格式
-export async function blobValidate(data) {
- try {
- const text = await data.text();
- JSON.parse(text);
- return false;
- } catch (error) {
- return true;
- }
+export function blobValidate(data) {
+ return data.type !== 'application/json'
}
--
Gitblit v1.9.2