From 43f4df7b43f785fa6e2d0cfe86de45b66a75a89c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 27 Aug 2021 16:52:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=BA=E9=99=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E5=A4=9A=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E6=98=BE=E7=A4=BAid=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/common/js/tableUtils.js | 35 ++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index 4c5ebd8222..7670767713 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -428,14 +428,29 @@ export function getCustomFieldValue(row, field, members) {
     for (let i = 0; i < row.customFields.length; i++) {
       let item = row.customFields[i];
       if (item.name === field.name) {
-        if (field.type === 'member' || field.type === 'multipleMember') {
+        if (field.type === 'member') {
           for (let j = 0; j < members.length; j++) {
             let member = members[j];
             if (member.id === item.value) {
               return member.name;
             }
           }
-        } else if (['radio', 'select', 'multipleSelect', 'checkbox'].indexOf(field.type) > -1) {
+        } else if (field.type === 'multipleMember') {
+          if (item.value) {
+            let values = '';
+            item.value.forEach(v => {
+              for (let j = 0; j < members.length; j++) {
+                let member = members[j];
+                if (member.id === v) {
+                  values += member.name;
+                  values += " ";
+                  break;
+                }
+              }
+            });
+            return values;
+          }
+        } else if (['radio', 'select'].indexOf(field.type) > -1) {
           for (let j = 0; j < field.options.length; j++) {
             let option = field.options[j];
             if (option.value === item.value) {
@@ -443,6 +458,22 @@ export function getCustomFieldValue(row, field, members) {
             }
           }
         }
+        else if (['multipleSelect', 'checkbox'].indexOf(field.type) > -1) {
+          if (item.value) {
+            let values = '';
+            item.value.forEach(v => {
+              for (let j = 0; j < field.options.length; j++) {
+                let option = field.options[j];
+                if (option.value === v) {
+                  values += (field.system ? i18n.t(option.text) : option.text);
+                  values += " ";
+                  break;
+                }
+              }
+            });
+            return values;
+          }
+        }
         return item.value;
       }
     }