key to label on event handler popup

Author: Imiss-U1025

client/packages/lowcoder-design/src/components/keyValueList.tsx

@@ -76,6 +76,7 @@ export const KeyValueList = (props: {
   list: ReactNode[];
   onAdd: () => void;
   onDelete: (item: ReactNode, index: number) => void;
+  isStatic?: boolean;
 }) => (
   <>
     {props.list.map((item, index) => (
@@ -87,9 +88,11 @@ export const KeyValueList = (props: {
         />
       </KeyValueListItem>
     ))}
+    {!props.isStatic && 
     <AddBtn onClick={props.onAdd}>
       <AddIcon />
       {trans("addItem")}
     </AddBtn>
+    }
   </>
 );

client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx

@@ -89,6 +89,24 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
         });
       return options;
     };
+    const getVariableOptions = (editorState?: EditorState) => {
+      const options =
+        editorState
+          ?.getQueriesComp()
+          .getView()
+          .filter(
+            // Filter out the current query under query
+            (option) => {
+              return option.children.name.getView() === this.children.queryName.getView();
+            }
+          ) || [];
+      return this.children.query.propertyView({
+        label: trans("eventHandler.queryParams"),
+        layout: "vertical",
+        isStatic: true,
+        keyFixed: true,
+      });
+    }
     return (
       <>
         <BranchDiv $type={"inline"}>
@@ -107,10 +125,9 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
           </EditorContext.Consumer>
         </BranchDiv>
         <BranchDiv>
-          {this.children.query.propertyView({
-            label: trans("eventHandler.queryParams"),
-            layout: "vertical",
-          })}
+          <EditorContext.Consumer>
+            {(editorState) => getVariableOptions(editorState)}
+          </EditorContext.Consumer>
         </BranchDiv>
       </>
     );

client/packages/lowcoder/src/comps/controls/keyValueControl.tsx

@@ -47,6 +47,8 @@ export type KeyValueControlParams = ControlParams & {
   typeTooltip?: ReactNode;
   keyFlexBasics?: number;
   valueFlexBasics?: number;
+  isStatic?: boolean;
+  keyFixed?: boolean;
 };
 
 /**
@@ -82,16 +84,20 @@ function keyValueControl<T extends OptionsType>(
       return (
         <KeyValueWrapper>
           <KeyWrapper $flexBasics={params.keyFlexBasics}>
-            {this.children.key.propertyView({ placeholder: "key", indentWithTab: false })}
-            {hasType && params.showType && (
-              <TypeWrapper>
-                {this.children.type.propertyView({
-                  placeholder: "key",
-                  indentWithTab: false,
-                  tooltip: params.typeTooltip,
-                })}
-              </TypeWrapper>
-            )}
+            {params.keyFixed?
+              <>{this.children.key.getView()}</>
+            :<>
+              {this.children.key.propertyView({ placeholder: "key", indentWithTab: false })}
+              {hasType && params.showType && (
+                <TypeWrapper>
+                  {this.children.type.propertyView({
+                    placeholder: "key",
+                    indentWithTab: false,
+                    tooltip: params.typeTooltip,
+                  })}
+                </TypeWrapper>
+              )}
+            </>}
           </KeyWrapper>
           <ValueWrapper $flexBasics={params.valueFlexBasics}>
             {this.children.value.propertyView({
@@ -136,6 +142,7 @@ export function keyValueListControl<T extends OptionsType>(
             list={this.getView().map((child) => child.propertyView(params))}
             onAdd={() => this.dispatch(this.pushAction({}))}
             onDelete={(item, index) => this.dispatch(this.deleteAction(index))}
+            isStatic={params.isStatic}
           />
         </ControlPropertyViewWrapper>
       );