Content-Length: 11899 | pFad | http://github.com/lowcoder-org/lowcoder/pull/1699.diff

thub.com diff --git a/client/packages/lowcoder/src/comps/comps/buttonComp/buttonComp.tsx b/client/packages/lowcoder/src/comps/comps/buttonComp/buttonComp.tsx index 5d2ab8c10..7103438f4 100644 --- a/client/packages/lowcoder/src/comps/comps/buttonComp/buttonComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/buttonComp/buttonComp.tsx @@ -23,7 +23,7 @@ import { ButtonStyleControl, } from "./buttonCompConstants"; import { RefControl } from "comps/controls/refControl"; - +import { Tooltip } from "antd"; import React, { useContext, useEffect, useCallback } from "react"; import { AnimationStyle } from "@lowcoder-ee/comps/controls/styleControlConstants"; import { styleControl } from "@lowcoder-ee/comps/controls/styleControl"; @@ -187,22 +187,24 @@ const ButtonView = React.memo((props: ToViewReturn) => { {(editorState) => ( - - {props.prefixIcon && {props.prefixIcon}} - { - props.text || (props.prefixIcon || props.suffixIcon ? undefined : " ") // Avoid button disappearing - } - {props.suffixIcon && {props.suffixIcon}} - + + + {props.prefixIcon && {props.prefixIcon}} + { + props.text || (props.prefixIcon || props.suffixIcon ? undefined : " ") // Avoid button disappearing + } + {props.suffixIcon && {props.suffixIcon}} + + )} diff --git a/client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx b/client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx index f78fee7bb..af9828e2a 100644 --- a/client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx @@ -26,6 +26,7 @@ import { BoolControl } from "comps/controls/boolControl"; import { RefControl } from "comps/controls/refControl"; import React, { useContext, useEffect } from "react"; import { EditorContext } from "comps/editorState"; +import { Tooltip } from "antd"; const IconWrapper = styled.div` display: flex; @@ -78,20 +79,22 @@ const ToggleTmpComp = (function () { $showBorder={props.showBorder} $animationStyle={props.animationStyle} > - { - props.onEvent("change"); - props.value.onChange(!props.value.value); - }} - > - {props.iconPosition === "right" && text} - {{props.value.value ? props.trueIcon : props.falseIcon}} - {props.iconPosition === "left" && text} - + + { + props.onEvent("change"); + props.value.onChange(!props.value.value); + }} + > + {props.iconPosition === "right" && text} + {{props.value.value ? props.trueIcon : props.falseIcon}} + {props.iconPosition === "left" && text} + + ); }) diff --git a/client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx b/client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx index 132e1715e..bfc0f8f95 100644 --- a/client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx +++ b/client/packages/lowcoder/src/comps/comps/meetingComp/controlButton.tsx @@ -39,6 +39,7 @@ import { useEffect, useRef, useState } from "react"; import { useResizeDetector } 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 }>` @@ -258,49 +259,51 @@ let ButtonTmpComp = (function () { : undefined } > - - isDefault(props.type) - ? props.onEvent("click") - : submitForm(editorState, props.form) - } - > - {props.sourceMode === 'standard' && props.prefixIcon && ( - - {props.prefixIcon} - - )} - {props.sourceMode === 'asset-library' && props.iconScoutAsset && ( - - {Boolean(props.iconScoutAsset.value) &&

} - - )} - + + + isDefault(props.type) + ? props.onEvent("click") + : submitForm(editorState, props.form) + } + > + {props.sourceMode === 'standard' && props.prefixIcon && ( + + {props.prefixIcon} + + )} + {props.sourceMode === 'asset-library' && props.iconScoutAsset && ( + + {Boolean(props.iconScoutAsset.value) &&

} + + )} + + )} diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx index 72cae1493..a14983cfa 100644 --- a/client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx @@ -24,6 +24,7 @@ import { trans } from "i18n"; import { RefControl } from "comps/controls/refControl"; import { migrateOldData } from "comps/generators/simpleGenerators"; import { fixOldInputCompData } from "../textInputComp/textInputConstants"; +import Tooltip from "antd/es/tooltip"; import { useCallback, useRef, useEffect, memo } from "react"; export const getStyle = (style: CheckboxStyleType) => { @@ -155,7 +156,7 @@ const MemoizedCheckboxGroup = memo(({ disabled: boolean; style: CheckboxStyleType; layout: ValueFromOption; - options: Array<{ label: string; value: string; disabled?: boolean }>; + options: Array<{ label: any; value: string; disabled?: boolean }>; onChange: (values: string[]) => void; viewRef: React.Ref; tabIndex?: number @@ -230,7 +231,11 @@ let CheckboxBasicComp = (function () { return props.options .filter((option) => option.value !== undefined && !option.hidden) .map((option) => ({ - label: option.label, + label: ( + + {option.label} + + ), value: option.value, disabled: option.disabled, })); diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx index 97a490fe9..8bfe2a7b9 100644 --- a/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx +++ b/client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx @@ -13,6 +13,7 @@ import { EllipsisTextCss, ValueFromOption } from "lowcoder-design"; import { trans } from "i18n"; import { fixOldInputCompData } from "../textInputComp/textInputConstants"; import { migrateOldData } from "comps/generators/simpleGenerators"; +import Tooltip from "antd/es/tooltip"; import { useCallback, useRef, useEffect, memo } from "react"; const getStyle = (style: RadioStyleType, inputFieldStyle?:RadioStyleType ) => { @@ -133,7 +134,11 @@ const MemoizedRadio = memo(({ return options .filter((option) => option.value !== undefined && !option.hidden) .map((option) => ({ - label: option.label, + label: ( + + {option.label} + + ), value: option.value, disabled: option.disabled, }));

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier! Saves Data!