Merge branch 'dev' into feature/add-event-handler

lowcoder-org · Jul 3, 2024 · 23767c4 · 23767c4
2 parents d23fc09 + ace9e1e
commit 23767c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/selectComp.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/selectComp.tsx
@@ -28,7 +28,7 @@ let SelectBasicComp = (function () {
     style: withDefault(styleControl(InputFieldStyle),{background:'transparent'}),
     labelStyle: styleControl(LabelStyle),
     inputFieldStyle: withDefault(styleControl(SelectStyle),{borderWidth:'1px'}),
-    childrenInputFieldStyle: styleControl(ChildrenMultiSelectStyle)
+    childrenInputFieldStyle: withDefault(styleControl(ChildrenMultiSelectStyle),{text:'#000'})
   };
   return new UICompBuilder(childrenMap, (props, dispatch) => {
     const [

diff --git a/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx b/client/packages/lowcoder/src/comps/controls/styleControlConstants.tsx
@@ -1243,7 +1243,7 @@ export const TabContainerStyle = [
     [
       ...ContainerStyle.filter(
         (style) =>
-          ["border", "radius", "f", "margin", "padding"].includes(
+          ["border", "radius", "f", "margin", "padding",'borderWidth','borderStyle'].includes(
             style.name
           ) === false
       ),