fixed infinite loop for js queries

raheeliftikhar5 · raheeliftikhar5 · commit c8b9c18dbf82 · 2025-03-21T02:18:47.000+05:00
diff --git a/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx
@@ -56,6 +56,9 @@ const ExecuteQueryPropertyView = ({
   }, [placement]);
 
   const getVariableOptions = useCallback((editorState?: EditorState) => {
+    const queryVariables = comp.children.queryVariables.getView();
+    if (!queryVariables.length) return null;
+
     return comp.children.queryVariables.propertyView({
       label: trans("eventHandler.queryVariables"),
       layout: "vertical",
diff --git a/client/packages/lowcoder/src/comps/queries/queryComp.tsx b/client/packages/lowcoder/src/comps/queries/queryComp.tsx
@@ -259,7 +259,11 @@ QueryCompTmp = class extends QueryCompTmp {
         || isInputChangeTrigger
         || (isPageLoadTrigger && notExecuted)
       )
-      // && (!isJsQuery || (isJsQuery && notExecuted)) // query which has deps can be executed on page load(first time)
+      && (
+        !isJsQuery
+        || (isJsQuery && !isAutomatic)
+        || (isJsQuery && isAutomatic && notExecuted)
+      ) // query which has deps can be executed on page load(first time)
     ) {
       const next = super.reduce(action);
       const depends = this.children.comp.node()?.dependValues();
