Merge pull request #635 from lowcoder-org/dev

Dev -> update feature branch
lowcoder-org · Jan 15, 2024 · a6685f9 · a6685f9
2 parents e1e8b3b + 96da6e4
commit a6685f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/client/packages/lowcoder-design/src/components/colorSelect/index.tsx b/client/packages/lowcoder-design/src/components/colorSelect/index.tsx
@@ -31,7 +31,6 @@ export const ColorSelect = (props: ColorSelectProps) => {
     }, 200),
     [dispatch]
   );
-
   return (
     <Popover
       trigger={trigger}
@@ -170,7 +169,7 @@ const BackDiv = styled.div.attrs<{ $color: string }>((props: { $color: string })
 `;
 // main block
 const ColorBlock = styled.div<{ $color: string }>`
-  background-color: ${(props) => (isValidColor(props.$color) ? props.color : "#FFFFFF")};
+  background-color: ${(props) => (isValidColor(props.$color) ? props.$color : "#FFFFFF")};
   border: 1px solid rgba(0, 0, 0, 0.1);
   border-radius: 4px;
   height: 24px;

diff --git a/client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx b/client/packages/lowcoder/src/comps/queries/resourceDropdown.tsx
@@ -39,7 +39,7 @@ const SelectOptionContains = styled.div`
   align-items: center;
   width: 99%;
 `;
-const SelectOption = styled((props: OptionProps) => <Option {...props} />)`
+const SelectOption = styled(Option)`
   display: flex;
   justify-content: space-between;