Merge branch 'dev' into tooltip_for_buttons

lowcoder-org · FalkWolsky · May 22, 2025 · May 22, 2025 · May 22, 2025 · May 22, 2025
commit ae394c52e3874998d24451070fb767260d02044e
diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx
@@ -40,6 +40,7 @@ import ReactResizeDetector from "react-resize-detector";
 
 import { useContext } from "react";
 import { Tooltip } from "antd";
+import { AssetType, IconscoutControl } from "@lowcoder-ee/comps/controls/iconscoutControl";
 
 const Container = styled.div<{ $style: any }>`
   height: 100%;
@@ -256,44 +257,49 @@ let ButtonTmpComp = (function () {
                       : undefined
                   }
                 >
-                  <Tooltip title={trans("meeting.meetingControlCompName")}>
-                    <Button100
-                      ref={props.viewRef}
-                      $buttonStyle={props.style}
-                      loading={props.loading}
-                      style={
-                        props.autoHeight
-                          ? {
-                              width: "100%",
-                              height: "100%",
-                              aspectRatio: props.aspectRatio,
-                              borderRadius: props.style.radius,
-                            }
-                          : {
-                              aspectRatio: props.aspectRatio,
-                              borderRadius: props.style.radius,
-                            }
-                      }
-                      disabled={
-                        props.disabled ||
-                        (!isDefault(props.type) &&
-                          getForm(editorState, props.form)?.disableSubmit())
-                      }
-                      onClick={() =>
-                        isDefault(props.type)
-                          ? props.onEvent("click")
-                          : submitForm(editorState, props.form)
-                      }
-                    >
-                      {props.prefixIcon && (
-                        <IconWrapper
-                          $style={{ ...props.style, size: props.iconSize }}
-                        >
-                          {props.prefixIcon}
-                        </IconWrapper>
-                      )}
-                    </Button100>
-                  </Tooltip>
+                  <Button100
+                    ref={props.viewRef}
+                    $buttonStyle={props.style}
+                    loading={props.loading}
+                    style={
+                      props.autoHeight
+                        ? { 
+                          width: "100%", 
+                          height: "100%",
+                          aspectRatio: props.aspectRatio,
+                          borderRadius: props.style.radius,
+                        }
+                        : {
+                          aspectRatio: props.aspectRatio,
+                          borderRadius: props.style.radius,
+                        }
+                    }
+                    disabled={
+                      props.disabled ||
+                      (!isDefault(props.type) &&
+                        getForm(editorState, props.form)?.disableSubmit())
+                    }
+                    onClick={() =>
+                      isDefault(props.type)
+                        ? props.onEvent("click")
+                        : submitForm(editorState, props.form)
+                    }
+                  >
+                    {props.sourceMode === 'standard' && props.prefixIcon && (
+                      <IconWrapper
+                        $style={{ ...props.style, size: props.iconSize }}
+                      >
+                        {props.prefixIcon}
+                      </IconWrapper>
+                    )}
+                    {props.sourceMode === 'asset-library' && props.iconScoutAsset && (
+                      <IconScoutWrapper
+                        $style={{ ...props.style, size: props.iconSize }}
+                      >
+                        <img src={props.iconScoutAsset.value} />
+                      </IconScoutWrapper>
+                    )}
+                  </Button100>
                 </div>
               </Container>
             )}

diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx
@@ -14,6 +14,7 @@ import { trans } from "i18n";
 import { fixOldInputCompData } from "../textInputComp/textInputConstants";
 import { migrateOldData } from "comps/generators/simpleGenerators";
 import Tooltip from "antd/es/tooltip";
+import { useEffect, useRef } from "react";
 
 const getStyle = (style: RadioStyleType, inputFieldStyle?:RadioStyleType ) => {
   return css`