Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025 · Feb 10, 2025
diff --git a/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx
  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
    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);
    }
        return undefined;
      }
      const newNode = Object.values(input.data)
        .filter((kvNode: any) => kvNode.key.value)
        .map((kvNode: any) => ({[kvNode.key.value]: kvNode.value.value}))
        .filter((kvNode: any) => kvNode.key)
        .map((kvNode: any) => ({[kvNode.key]: kvNode.value}))
        .reduce((prev, obj) => ({...prev, ...obj}), {});
      return newNode;
    },
    if (!originQuery) {
      return;
    }

    const jsonData = originQuery.toJsonValue();
    //Regenerate variable header
    jsonData.variables?.variables?.forEach(kv => {
      const [prefix, _] = (kv.key as string).split(/(?=\d+$)/);
      let i=1, newName = "";
      do {
        newName = prefix + (i++);
      } while(editorState.checkRename("", newName));
      kv.key = newName;
    })

    const newQueryName = this.genNewName(editorState);
    const id = genQueryId();
    this.dispatch(
      wrapActionExtraInfo(
        this.pushAction({
          ...originQuery.toJsonValue(),
          ...jsonData,
          id: id,
          name: newQueryName,
          isNewCreate: true,
            {
              type: "add",
              compName: name,
              compType:originQuery.children.compType.getView(),
              compType:jsonData.compType,
            },
          ],
        }
diff --git a/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx b/client/packages/lowcoder/src/comps/queries/queryCompUtils.tsx
    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
Expand Up		@@ -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();
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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);
		}
Expand DownExpand Up		@@ -673,8 +674,8 @@ export const QueryComp = withExposingConfigs(QueryCompTmp, [
		return undefined;
		}
		const newNode = Object.values(input.data)
		.filter((kvNode: any) => kvNode.key.value)
		.map((kvNode: any) => ({[kvNode.key.value]: kvNode.value.value}))
		.filter((kvNode: any) => kvNode.key)
		.map((kvNode: any) => ({[kvNode.key]: kvNode.value}))
		.reduce((prev, obj) => ({...prev, ...obj}), {});
		return newNode;
		},
Expand DownExpand Up		@@ -773,12 +774,24 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {
		if (!originQuery) {
		return;
		}

		const jsonData = originQuery.toJsonValue();
		//Regenerate variable header
		jsonData.variables?.variables?.forEach(kv => {
		const [prefix, _] = (kv.key as string).split(/(?=\d+$)/);
		let i=1, newName = "";
		do {
		newName = prefix + (i++);
		} while(editorState.checkRename("", newName));
		kv.key = newName;
		})

		const newQueryName = this.genNewName(editorState);
		const id = genQueryId();
		this.dispatch(
		wrapActionExtraInfo(
		this.pushAction({
		...originQuery.toJsonValue(),
		...jsonData,
		id: id,
		name: newQueryName,
		isNewCreate: true,
Expand All		@@ -789,7 +802,7 @@ class QueryListComp extends QueryListTmpComp implements BottomResListComp {
		{
		type: "add",
		compName: name,
		compType:originQuery.children.compType.getView(),
		compType:jsonData.compType,
		},
		],
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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: [
Expand Down