revert table column's event handlers

raheeliftikhar5 · raheeliftikhar5 · commit 0d1e53e9b4b1 · 2025-06-12T23:18:56.000+05:00
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
@@ -19,6 +19,7 @@ const LinkEventOptions = [clickEvent] as const;
 
 const childrenMap = {
   text: StringControl,
+  onClick: ActionSelectorControlInContext,
   onEvent: eventHandlerControl(LinkEventOptions),
   disabled: BoolCodeControl,
   style: styleControl(TableColumnLinkStyle),
@@ -37,12 +38,12 @@ const StyledLink = styled.a<{ $disabled: boolean }>`
 `;
 
 // Memoized link component
-export const ColumnLink = React.memo(({ disabled, label, onEvent }: { disabled: boolean; label: string; onEvent?: (eventName: string) => void }) => {
+export const ColumnLink = React.memo(({ disabled, label, onClick, onEvent }: { disabled: boolean; label: string; onClick?: () => void; onEvent?: (eventName: string) => void }) => {
   const handleClick = useCallback(() => {
-    if (!disabled && onEvent) {
-      onEvent("click");
-    }
-  }, [disabled, onEvent]);
+    if (disabled) return;
+    onClick?.();
+    // onEvent?.("click");
+  }, [disabled, onClick, onEvent]);
 
   return (
     <StyledLink
@@ -109,7 +110,7 @@ export const LinkComp = (function () {
     childrenMap,
     (props, dispatch) => {
       const value = props.changeValue ?? getBaseValue(props, dispatch);
-      return <ColumnLink disabled={props.disabled} label={value} onEvent={props.onEvent} />;
+      return <ColumnLink disabled={props.disabled} label={value} onClick={props.onClick} />;
     },
     (nodeValue) => nodeValue.text.value,
     getBaseValue
@@ -128,7 +129,11 @@ export const LinkComp = (function () {
           tooltip: ColumnValueTooltip,
         })}
         {disabledPropertyView(children)}
-        {children.onEvent.propertyView()}
+        {/* {children.onEvent.propertyView()} */}
+        {children.onClick.propertyView({
+          label: trans("table.action"),
+          placement: "table",
+        })}
       </>
     ))
     .setStylePropertyViewFn((children) => (
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx
@@ -63,7 +63,7 @@ const OptionItem = new MultiCompBuilder(
         })}
         {hiddenPropertyView(children)}
         {disabledPropertyView(children)}
-        {children.onEvent.propertyView()}
+        {/* {children.onEvent.propertyView()} */}
       </>
     );
   })
@@ -76,9 +76,9 @@ const MenuItem = React.memo(({ option, index, onMainEvent }: { option: any; inde
       if (option.onClick) {
         option.onClick();
       }
-      if (option.onEvent) {
-        option.onEvent("click");
-      }
+      // if (option.onEvent) {
+      //   option.onEvent("click");
+      // }
       // Trigger the main component's event handler
       if (onMainEvent) {
         onMainEvent("click");
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx
@@ -38,6 +38,7 @@ const childrenMap = {
   text: StringControl,
   buttonType: dropdownControl(ButtonTypeOptions, "primary"),
   onEvent: eventHandlerControl(ButtonEventOptions),
+  onClick: ActionSelectorControlInContext,
   loading: BoolCodeControl,
   disabled: BoolCodeControl,
   prefixIcon: IconControl,
@@ -52,8 +53,9 @@ const ButtonStyled = React.memo(({ props }: { props: ToViewReturn<RecordConstruc
   const iconOnly = !hasText && (hasPrefixIcon || hasSuffixIcon);
 
   const handleClick = useCallback((e: React.MouseEvent) => {
-    props.onEvent("click");
-  }, [props.onEvent]);
+    props.onClick?.();
+    // props.onEvent?.("click");
+  }, [props.onClick, props.onEvent]);
 
   const buttonStyle = useMemo(() => ({
     margin: 0,
@@ -103,7 +105,11 @@ export const ButtonComp = (function () {
         })}
         {loadingPropertyView(children)}
         {disabledPropertyView(children)}
-        {children.onEvent.propertyView()}
+        {/* {children.onEvent.propertyView()} */}
+        {children.onClick.propertyView({
+          label: trans("table.action"),
+          placement: "table",
+        })}
       </>
     ))
     .build();
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx
@@ -17,6 +17,7 @@ import {
   ConstructorToView,
   deferAction,
   fromRecord,
+  isDynamicSegment,
   multiChangeAction,
   withFunction,
   wrapChildAction,
@@ -194,7 +195,6 @@ const ColumnPropertyView = React.memo(({
   summaryRowIndex: number; 
 }) => {
   const selectedColumn = comp.children.render.getSelectedComp();
-  
   const columnType = useMemo(() => 
     selectedColumn.getComp().children.compType.getView(),
     [selectedColumn]
@@ -205,7 +205,7 @@ const ColumnPropertyView = React.memo(({
     if (column.comp?.hasOwnProperty('src')) {
       return (column.comp as any).src;
     } else if (column.comp?.hasOwnProperty('text')) {
-      return (column.comp as any).text;
+      return isDynamicSegment((column.comp as any).text) ? '{{currentCell}}' : (column.comp as any).text;
     }
     return '{{currentCell}}';
   }, [selectedColumn]);
