diff --git a/client/packages/lowcoder/src/components/table/EditableCell.tsx b/client/packages/lowcoder/src/components/table/EditableCell.tsx
index 936f1a047..3e68cfdff 100644
--- a/client/packages/lowcoder/src/components/table/EditableCell.tsx
+++ b/client/packages/lowcoder/src/components/table/EditableCell.tsx
@@ -7,6 +7,7 @@ import styled from "styled-components";
import { JSONValue } from "util/jsonTypes";
import ColumnTypeView from "./columnTypeView";
import { TableCellContext } from "comps/comps/tableComp/tableContext";
+import Tooltip from "antd/es/tooltip";
type StatusType = PresetStatusColorType | "none";
export const TABLE_EDITABLE_SWITCH_ON = true;
@@ -35,6 +36,7 @@ export interface CellProps {
candidateTags?: string[];
candidateStatus?: { text: string; status: StatusType }[];
textOverflow?: boolean;
+ cellTooltip?: string;
onTableEvent?: (eventName: any) => void;
}
@@ -54,6 +56,25 @@ const BorderDiv = styled.div`
left: 0;
`;
+const CellWrapper = ({
+ children,
+ tooltipTitle,
+}: {
+ children: ReactNode,
+ tooltipTitle?: string,
+}) => {
+ if (tooltipTitle) {
+ return (
+
+ {children}
+
+ )
+ }
+ return (
+ <>{children}
+ )
+};
+
interface EditableCellProps extends CellProps {
normalView: ReactNode;
dispatch: DispatchType;
@@ -123,27 +144,31 @@ export function EditableCell(props: EditableCellProps) {
);
}
-
+
return (
-
- {status === "toSave" && !isEditing && }
- {normalView}
- {/* overlay on normal view to handle double click for editing */}
- {editable && (
-
-
- )}
-
+
+ {status === "toSave" && !isEditing && }
+
+ {normalView}
+
+ {/* overlay on normal view to handle double click for editing */}
+ {editable && (
+
+
+
+
+ )}
+
);
}
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx
index b98924193..8c53650a8 100644
--- a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnBooleanComp.tsx
@@ -21,9 +21,10 @@ const Wrapper = styled.div`
padding: 0 8px;
`;
-const IconWrapper = styled.div<{ $style: CheckboxStyleType; $ifChecked: boolean }>`
- pointer-events: none;
+const IconWrapper = styled.span<{ $style: CheckboxStyleType; $ifChecked: boolean }>`
+ // pointer-events: none;
height: 22px;
+ display: inline-block;
svg {
width: 14px;
height: 22px;
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDropdownComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDropdownComp.tsx
index c3e35b13e..c09a74215 100644
--- a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDropdownComp.tsx
+++ b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnDropdownComp.tsx
@@ -47,7 +47,9 @@ export const ColumnDropdownComp = (function () {
const menu = (