Merge branch 'dev' into doubleClick_event_component

Author: kamal-qureshi

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinkComp.tsx

@@ -20,6 +20,7 @@ const LinkEventOptions = [clickEvent, doubleClickEvent] as const;
 
 const childrenMap = {
   text: StringControl,
+  onClick: ActionSelectorControlInContext,
   onEvent: eventHandlerControl(LinkEventOptions),
   disabled: BoolCodeControl,
   style: styleControl(TableColumnLinkStyle),
@@ -38,12 +39,16 @@ 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) {
       ComponentClickHandler({onEvent})();
     }
   }, [disabled, onEvent]);
+  //   if (disabled) return;
+  //   onClick?.();
+  //   // onEvent?.("click");
+  // }, [disabled, onClick, onEvent]);
 
   return (
     <StyledLink
@@ -110,7 +115,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
@@ -129,7 +134,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) => (

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnLinksComp.tsx

@@ -64,7 +64,7 @@ const OptionItem = new MultiCompBuilder(
         })}
         {hiddenPropertyView(children)}
         {disabledPropertyView(children)}
-        {children.onEvent.propertyView()}
+        {/* {children.onEvent.propertyView()} */}
       </>
     );
   })
@@ -80,6 +80,16 @@ const MenuItem = React.memo(({ option, index, onMainEvent }: { option: any; inde
         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]);
 

client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx

@@ -39,6 +39,7 @@ const childrenMap = {
   text: StringControl,
   buttonType: dropdownControl(ButtonTypeOptions, "primary"),
   onEvent: eventHandlerControl(ButtonEventOptions),
+  onClick: ActionSelectorControlInContext,
   loading: BoolCodeControl,
   disabled: BoolCodeControl,
   prefixIcon: IconControl,
@@ -55,6 +56,9 @@ const ButtonStyled = React.memo(({ props }: { props: ToViewReturn<RecordConstruc
   const handleClick = useCallback((e: React.MouseEvent) => {
     ComponentClickHandler({onEvent: props.onEvent})
   }, [props.onEvent]);
+  //   props.onClick?.();
+  //   // props.onEvent?.("click");
+  // }, [props.onClick, props.onEvent]);
 
   const buttonStyle = useMemo(() => ({
     margin: 0,
@@ -104,7 +108,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();

client/packages/lowcoder/src/comps/comps/tableComp/column/tableColumnComp.tsx

@@ -194,26 +194,27 @@ const ColumnPropertyView = React.memo(({
   summaryRowIndex: number; 
 }) => {
   const selectedColumn = comp.children.render.getSelectedComp();
-  
   const columnType = useMemo(() => 
     selectedColumn.getComp().children.compType.getView(),
     [selectedColumn]
   );
-  
+
+  const initialColumns = useMemo(() => 
+    selectedColumn.getParams()?.initialColumns as OptionType[] || [],
+    [selectedColumn]
+  );
+
   const columnValue = useMemo(() => {
     const column = selectedColumn.getComp().toJsonValue();
     if (column.comp?.hasOwnProperty('src')) {
       return (column.comp as any).src;
     } else if (column.comp?.hasOwnProperty('text')) {
-      return (column.comp as any).text;
+      const value = (column.comp as any).text;
+      const isDynamicValue = initialColumns.find((column) => column.value === value);
+      return !isDynamicValue ? '{{currentCell}}' : value;
     }
     return '{{currentCell}}';
-  }, [selectedColumn]);
-
-  const initialColumns = useMemo(() => 
-    selectedColumn.getParams()?.initialColumns as OptionType[] || [],
-    [selectedColumn]
-  );
+  }, [selectedColumn, initialColumns]);
 
   const summaryColumns = comp.children.summaryColumns.getView();
 

client/packages/lowcoder/src/comps/queries/queryComp/queryPropertyView.tsx

@@ -239,6 +239,11 @@ export const QueryGeneralPropertyView = (props: {
     comp.children.datasourceId.dispatchChangeValueAction(QUICK_REST_API_ID);
   }
 
+  if (datasourceType === 'js' && datasourceId === '') {
+    datasourceId = JS_CODE_ID;
+    comp.children.datasourceId.dispatchChangeValueAction(JS_CODE_ID);
+  }
+
   const triggerOptions = useMemo(() => {
     if (datasourceType === "js" || datasourceType === "streamApi") {
       return JSTriggerTypeOptions;