From 5a36334115c0eaff3ea1583b3d9a12609b541f4b Mon Sep 17 00:00:00 2001
From: RAHEEL <mraheeliftikhar1994@gmail.com>
Date: Thu, 9 May 2024 20:27:42 +0500
Subject: [PATCH] show custom tags in editable mode

---
 .../tableComp/column/columnTypeComps/columnTagsComp.tsx    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx
index e1dce5442..2f83b50df 100644
--- a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnTagsComp.tsx
@@ -171,6 +171,8 @@ export const TagStyled = styled(Tag)`
   }
 `;
 
+let tagOptionsList: any[] = [];
+
 const TagEdit = (props: TagEditPropsType) => {
   const defaultTags = useContext(TagsContext);
   const [tags, setTags] = useState(() => {
@@ -225,12 +227,12 @@ const TagEdit = (props: TagEditPropsType) => {
           <CustomSelect.Option value={value} key={index}>
             {value.split(",")[1] ? (
               value.split(",").map((item, i) => (
-                <Tag color={getTagColor(item, [])} key={i} style={{ marginRight: "8px" }}>
+                <Tag color={getTagColor(item, tagOptionsList)} icon={getTagIcon(item, tagOptionsList)} key={i} style={{ marginRight: "8px" }}>
                   {item}
                 </Tag>
               ))
             ) : (
-              <Tag color={getTagColor(value, [])} key={index}>
+              <Tag color={getTagColor(value, tagOptionsList)} icon={getTagIcon(value, tagOptionsList)} key={index}>
                 {value}
               </Tag>
             )}
@@ -246,6 +248,7 @@ export const ColumnTagsComp = (function () {
     childrenMap,
     (props, dispatch) => {
       const tagOptions = props.tagColors;
+      tagOptionsList = props.tagColors;
       let value = props.changeValue ?? getBaseValue(props, dispatch);
       value = typeof value === "string" && value.split(",")[1] ? value.split(",") : value;
       const tags = _.isArray(value) ? value : [value];