作者 RuoYi

修复回显数据字典数组异常问题(I60UYQ)

@@ -78,37 +78,24 @@ service.interceptors.response.use(res => { @@ -78,37 +78,24 @@ service.interceptors.response.use(res => {
78 if (code === 401) { 78 if (code === 401) {
79 if (!isRelogin.show) { 79 if (!isRelogin.show) {
80 isRelogin.show = true; 80 isRelogin.show = true;
81 - MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', {  
82 - confirmButtonText: '重新登录',  
83 - cancelButtonText: '取消',  
84 - type: 'warning'  
85 - }  
86 - ).then(() => {  
87 - isRelogin.show = false;  
88 - store.dispatch('LogOut').then(() => {  
89 - location.href = '/index';  
90 - }) 81 + MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
  82 + isRelogin.show = false;
  83 + store.dispatch('LogOut').then(() => {
  84 + location.href = '/index';
  85 + })
91 }).catch(() => { 86 }).catch(() => {
92 isRelogin.show = false; 87 isRelogin.show = false;
93 }); 88 });
94 } 89 }
95 return Promise.reject('无效的会话,或者会话已过期,请重新登录。') 90 return Promise.reject('无效的会话,或者会话已过期,请重新登录。')
96 } else if (code === 500) { 91 } else if (code === 500) {
97 - Message({  
98 - message: msg,  
99 - type: 'error'  
100 - }) 92 + Message({ message: msg, type: 'error' })
101 return Promise.reject(new Error(msg)) 93 return Promise.reject(new Error(msg))
102 } else if (code === 601) { 94 } else if (code === 601) {
103 - Message({  
104 - message: msg,  
105 - type: 'warning'  
106 - }) 95 + Message({ message: msg, type: 'warning' })
107 return Promise.reject('error') 96 return Promise.reject('error')
108 } else if (code !== 200) { 97 } else if (code !== 200) {
109 - Notification.error({  
110 - title: msg  
111 - }) 98 + Notification.error({ title: msg })
112 return Promise.reject('error') 99 return Promise.reject('error')
113 } else { 100 } else {
114 return res.data 101 return res.data
@@ -119,18 +106,12 @@ service.interceptors.response.use(res => { @@ -119,18 +106,12 @@ service.interceptors.response.use(res => {
119 let { message } = error; 106 let { message } = error;
120 if (message == "Network Error") { 107 if (message == "Network Error") {
121 message = "后端接口连接异常"; 108 message = "后端接口连接异常";
122 - }  
123 - else if (message.includes("timeout")) { 109 + } else if (message.includes("timeout")) {
124 message = "系统接口请求超时"; 110 message = "系统接口请求超时";
125 - }  
126 - else if (message.includes("Request failed with status code")) { 111 + } else if (message.includes("Request failed with status code")) {
127 message = "系统接口" + message.substr(message.length - 3) + "异常"; 112 message = "系统接口" + message.substr(message.length - 3) + "异常";
128 } 113 }
129 - Message({  
130 - message: message,  
131 - type: 'error',  
132 - duration: 5 * 1000  
133 - }) 114 + Message({ message: message, type: 'error', duration: 5 * 1000 })
134 return Promise.reject(error) 115 return Promise.reject(error)
135 } 116 }
136 ) 117 )
@@ -86,11 +86,14 @@ export function selectDictLabel(datas, value) { @@ -86,11 +86,14 @@ export function selectDictLabel(datas, value) {
86 return actions.join(''); 86 return actions.join('');
87 } 87 }
88 88
89 -// 回显数据字典(字符串数组) 89 +// 回显数据字典(字符串数组)
90 export function selectDictLabels(datas, value, separator) { 90 export function selectDictLabels(datas, value, separator) {
91 - if (value === undefined) { 91 + if (value === undefined || value.length ===0) {
92 return ""; 92 return "";
93 } 93 }
  94 + if (Array.isArray(value)) {
  95 + value = value.join(",");
  96 + }
94 var actions = []; 97 var actions = [];
95 var currentSeparator = undefined === separator ? "," : separator; 98 var currentSeparator = undefined === separator ? "," : separator;
96 var temp = value.split(currentSeparator); 99 var temp = value.split(currentSeparator);