diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index f5c0d8544..d8864e8b1 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -497,9 +497,16 @@ var table = {
},
// 回显数据字典
selectDictLabel: function(datas, value) {
- if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
- return '';
- }
+ if ($.common.isEmpty(value)) {
+ return ''
+ }
+ if ($.common.isEmpty(datas)) {
+ if($.common.isEmpty(value)){
+ return ''
+ }else{
+ return value
+ }
+ }
var actions = [];
$.each(datas, function(index, dict) {
if (dict.dictValue == ('' + value)) {
@@ -508,23 +515,38 @@ var table = {
return false;
}
});
+ if (actions.length === 0) {
+ actions.push($.common.sprintf("%s", value))
+ }
return actions.join('');
},
// 回显数据字典(字符串数组)
selectDictLabels: function(datas, value, separator) {
- if ($.common.isEmpty(datas) || $.common.isEmpty(value)) {
- return '';
- }
+ if ($.common.isEmpty(value)) {
+ return ''
+ }
+ if ($.common.isEmpty(datas)) {
+ if($.common.isEmpty(value)){
+ return ''
+ }else{
+ return value
+ }
+ }
var currentSeparator = $.common.isEmpty(separator) ? "," : separator;
var actions = [];
$.each(value.split(currentSeparator), function(i, val) {
+ var match = false
$.each(datas, function(index, dict) {
if (dict.dictValue == ('' + val)) {
var listClass = $.common.equals("default", dict.listClass) || $.common.isEmpty(dict.listClass) ? "" : "badge badge-" + dict.listClass;
actions.push($.common.sprintf("%s ", listClass, dict.dictLabel));
+ match = true
return false;
}
});
+ if (!match) {
+ actions.push($.common.sprintf("%s ", val));
+ }
});
return actions.join('');
},