字典翻译方法修改

ruoyi-ui/src/utils/ruoyi.js

@@ -69,45 +69,71 @@ export function addDateRange(params, dateRange, propName) {
 }
 
 // 回显数据字典
+// export function selectDictLabel(datas, value) {
+//   if (value === undefined) {
+//     return "";
+//   }
+//   var actions = [];
+//   Object.keys(datas).some((key) => {
+//     if (datas[key].value == ('' + value)) {
+//       actions.push(datas[key].label);
+//       return true;
+//     }
+//   })
+//   if (actions.length === 0) {
+//     actions.push(value);
+//   }
+//   return actions.join('');
+// }
 export function selectDictLabel(datas, value) {
-  if (value === undefined) {
-    return "";
-  }
   var actions = [];
   Object.keys(datas).some((key) => {
-    if (datas[key].value == ('' + value)) {
-      actions.push(datas[key].label);
+    if (datas[key].dictValue == ('' + value)) {
+      actions.push(datas[key].dictLabel);
       return true;
     }
   })
-  if (actions.length === 0) {
-    actions.push(value);
-  }
   return actions.join('');
 }
 
 // 回显数据字典（字符串、数组）
+// export function selectDictLabels(datas, value, separator) {
+//   if (value === undefined || value.length ===0) {
+//     return "";
+//   }
+//   if (Array.isArray(value)) {
+//     value = value.join(",");
+//   }
+//   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);
+// }
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length ===0) {
-    return "";
-  }
-  if (Array.isArray(value)) {
-    value = value.join(",");
+  if (!value) {
+    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 (datas[key].dictValue == ('' + temp[val])) {
+        actions.push(datas[key].dictLabel + currentSeparator);
       }
     })
-    if (!match) {
-      actions.push(temp[val] + currentSeparator);
-    }
   })
   return actions.join('').substring(0, actions.join('').length - 1);
 }