variable override issue fixed

Imiss-U1025 · Imiss-U1025 · commit 6786b8ea807b · 2025-02-10T01:54:54.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
@@ -112,14 +112,12 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
   override getView() {
     const queryName = this.children.queryName.getView();
     // const queryParams = keyValueListToSearchStr(Array.isArray(this?.children?.query) ? (this.children.query as unknown as any[]).map((i: any) => i.getView() as KeyValue) : []);
-    const result = Object.values(this.children.queryVariables.children as Record<string, {
-      children: {
-        key: { unevaledValue: string },
-        value: { unevaledValue: string }
-      }}>)
-      .filter(item => item.children.key.unevaledValue !== "" && item.children.value.unevaledValue !== "")
-      .map(item => ({[item.children.key.unevaledValue]: item.children.value.unevaledValue}))
+    const result = this.children.queryVariables.toJsonValue()
+      .filter(item => item.key !== "" && item.value !== "")
+      .map(item => ({[item.key as string]: item.value}))
       .reduce((acc, curr) => Object.assign(acc, curr), {});
+    
+    result.$queryName = queryName;
     if (!queryName) {
       return () => Promise.resolve();
     }
diff --git a/client/packages/lowcoder/src/comps/queries/queryComp.tsx b/client/packages/lowcoder/src/comps/queries/queryComp.tsx
@@ -364,6 +364,7 @@ QueryCompTmp = class extends QueryCompTmp {
     if (action.type === CompActionTypes.EXECUTE_QUERY) {
       if (getReduceContext().disableUpdateState) return this;
       if(!action.args) action.args = this.children.variables.children.variables.toJsonValue().reduce((acc, curr) => Object.assign(acc, {[curr.key as string]:curr.value}), {});
+      action.args.$queryName = this.children.name.getView();
 
       return this.executeQuery(action);
     }
diff --git a/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx b/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx
@@ -28,9 +28,10 @@ export function toQueryView(params: FunctionProperty[]) {
     variables?: any;
     timeout: InstanceType<ParamsControlType>;
   }): Promise<QueryResult> => {
+    console.log("toQueryView props", props, params);
     const { applicationId, isViewMode } = getGlobalSettings();
 
-    const mappedVariables = Object.keys(props.variables).map(key => ({key: `query1.variable.${key}`, value: props.variables[key]}));
+    const mappedVariables = Object.keys(props.variables).map(key => ({key: `${props.args?.$queryName}.variables.${key}`, value: props.variables[key]}));
     let request: QueryExecuteRequest = {
       path: props.applicationPath,
       params: [

Original file line number	Diff line number	Diff line change
`@@ -364,6 +364,7 @@ QueryCompTmp = class extends QueryCompTmp {`
`364`	`364`	`if (action.type === CompActionTypes.EXECUTE_QUERY) {`
`365`	`365`	`if (getReduceContext().disableUpdateState) return this;`
`366`	`366`	`if(!action.args) action.args = this.children.variables.children.variables.toJsonValue().reduce((acc, curr) => Object.assign(acc, {[curr.key as string]:curr.value}), {});`
	`367`	`+ action.args.$queryName = this.children.name.getView();`
`367`	`368`
`368`	`369`	`return this.executeQuery(action);`
`369`	`370`	`}`