作者 RuoYi

页面若未匹配到字典标签则返回原字典值

@@ -70,6 +70,9 @@ export function addDateRange(params, dateRange, propName) { @@ -70,6 +70,9 @@ export function addDateRange(params, dateRange, propName) {
70 70
71 // 回显数据字典 71 // 回显数据字典
72 export function selectDictLabel(datas, value) { 72 export function selectDictLabel(datas, value) {
  73 + if (value === undefined) {
  74 + return "";
  75 + }
73 var actions = []; 76 var actions = [];
74 Object.keys(datas).some((key) => { 77 Object.keys(datas).some((key) => {
75 if (datas[key].value == ('' + value)) { 78 if (datas[key].value == ('' + value)) {
@@ -77,23 +80,31 @@ export function selectDictLabel(datas, value) { @@ -77,23 +80,31 @@ export function selectDictLabel(datas, value) {
77 return true; 80 return true;
78 } 81 }
79 }) 82 })
  83 + if (actions.length === 0) {
  84 + actions.push(value);
  85 + }
80 return actions.join(''); 86 return actions.join('');
81 } 87 }
82 88
83 // 回显数据字典(字符串数组) 89 // 回显数据字典(字符串数组)
84 export function selectDictLabels(datas, value, separator) { 90 export function selectDictLabels(datas, value, separator) {
85 - if(value === undefined) { 91 + if (value === undefined) {
86 return ""; 92 return "";
87 } 93 }
88 var actions = []; 94 var actions = [];
89 var currentSeparator = undefined === separator ? "," : separator; 95 var currentSeparator = undefined === separator ? "," : separator;
90 var temp = value.split(currentSeparator); 96 var temp = value.split(currentSeparator);
91 Object.keys(value.split(currentSeparator)).some((val) => { 97 Object.keys(value.split(currentSeparator)).some((val) => {
  98 + var match = false;
92 Object.keys(datas).some((key) => { 99 Object.keys(datas).some((key) => {
93 if (datas[key].value == ('' + temp[val])) { 100 if (datas[key].value == ('' + temp[val])) {
94 actions.push(datas[key].label + currentSeparator); 101 actions.push(datas[key].label + currentSeparator);
  102 + match = true;
95 } 103 }
96 }) 104 })
  105 + if (!match) {
  106 + actions.push(temp[val] + currentSeparator);
  107 + }
97 }) 108 })
98 return actions.join('').substring(0, actions.join('').length - 1); 109 return actions.join('').substring(0, actions.join('').length - 1);
99 } 110 }