Merge branch 'dev' into doubleClick_event_component

lowcoder-org · raheeliftikhar5 · Jun 16, 2025 · Jun 6, 2025 · Jun 10, 2025 · Jun 11, 2025
commit fe1dedad60d09f245160e380e65d1a9d7a02040b
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinkComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinkComp.tsx
@@ -12,6 +12,8 @@ import { styleControl } from "comps/controls/styleControl";
 import { TableColumnLinkStyle } from "comps/controls/styleControlConstants";
 import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";
 import { ComponentClickHandler } from "@lowcoder-ee/comps/utils/componentClickHandler";
+import { migrateOldData } from "@lowcoder-ee/comps/generators/simpleGenerators";
+import { fixOldActionData } from "comps/comps/tableComp/column/simpleColumnTypeComps";
 
 export const ColumnValueTooltip = trans("table.columnValueTooltip");
 
@@ -47,6 +49,9 @@ export const ColumnLink = React.memo(({ disabled, label, onClick }: { disabled:
   //   onClick?.();
   //   // onEvent?.("click");
   // }, [disabled, onClick, onEvent]);
+  //   if (disabled) return;
+  //   onClick?.("click");
+  // }, [disabled, onClick]);
 
   return (
     <StyledLink

diff --git a/...nt/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx b/...nt/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx
@@ -11,6 +11,8 @@ import { ColumnLink } from "comps/comps/tableComp/column/columnTypeComps/columnL
 import { LightActiveTextColor, PrimaryColor } from "constants/style";
 import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";
 import { ComponentClickHandler } from "@lowcoder-ee/comps/utils/componentClickHandler";
+import { migrateOldData } from "@lowcoder-ee/comps/generators/simpleGenerators";
+import { fixOldActionData } from "comps/comps/tableComp/column/simpleColumnTypeComps";
 
 const MenuLinkWrapper = styled.div`
   > a {
@@ -38,7 +40,7 @@ const MenuWrapper = styled.div`
   }  
 `;
 
-const LinksEventOptions = [clickEvent, doubleClickEvent] as const;
+const LinkEventOptions = [clickEvent, doubleClickEvent] as const;
 
 // Memoized menu item component
 const MenuItem = React.memo(({ option, index }: { option: any; index: number }) => {
@@ -84,41 +86,7 @@ const OptionItemTmp = new MultiCompBuilder(
   })
   .build();
 
-// Memoized menu item component
-const MenuItem = React.memo(({ option, index, onMainEvent }: { option: any; index: number; onMainEvent?: (eventName: string) => void }) => {
-  const handleClick = useCallback(() => {
-    if (!option.disabled) {
-      // Handle both option's event and main event through ComponentClickHandler
-      const combinedHandler = (event: "click" | "doubleClick") => {
-        option.onEvent?.(event);
-        onMainEvent?.(event);
-      };
-      ComponentClickHandler({onEvent: combinedHandler})();
-      // if (option.onClick) {
-      //   option.onClick();
-      // }
-      // // if (option.onEvent) {
-      // //   option.onEvent("click");
-      // // }
-      // // Trigger the main component's event handler
-      // if (onMainEvent) {
-      //   onMainEvent("click");
-      // }
-    }
-  }, [option.disabled, option.onEvent, onMainEvent]);
-
-  return (
-    <MenuLinkWrapper>
-      <ColumnLink
-        disabled={option.disabled}
-        label={option.label}
-        onEvent={handleClick}
-      />
-    </MenuLinkWrapper>
-  );
-});
-
-MenuItem.displayName = 'MenuItem';
+const OptionItem = migrateOldData(OptionItemTmp, fixOldActionData);
 
 // Memoized menu component
 const LinksMenu = React.memo(({ options }: { options: any[] }) => {

diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx
@@ -15,6 +15,7 @@ import { RecordConstructorToComp } from "lowcoder-core";
 import { ToViewReturn } from "@lowcoder-ee/comps/generators/multi";
 import { clickEvent, eventHandlerControl, doubleClickEvent } from "comps/controls/eventHandlerControl";
 import { ComponentClickHandler } from "@lowcoder-ee/comps/utils/componentClickHandler";
+import { migrateOldData } from "@lowcoder-ee/comps/generators/simpleGenerators";
 
 export const fixOldActionData = (oldData: any) => {
   if (!oldData) return oldData;
@@ -71,6 +72,8 @@ const ButtonStyled = React.memo(({ props }: { props: ToViewReturn<RecordConstruc
   //   props.onClick?.();
   //   // props.onEvent?.("click");
   // }, [props.onClick, props.onEvent]);
+  //   props.onClick?.("click");
+  // }, [props.onClick]);
 
   const buttonStyle = useMemo(() => ({
     margin: 0,