Commit 6786b8e

committed

variable override issue fixed

1 parent 424f429 commit 6786b8eCopy full SHA for 6786b8e

File tree

-8

lines changed

-8

lines changed

Lines changed: 5 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,14 +112,12 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {`
`112`	`112`	`override getView() {`
`113`	`113`	`const queryName = this.children.queryName.getView();`
`114`	`114`	`// const queryParams = keyValueListToSearchStr(Array.isArray(this?.children?.query) ? (this.children.query as unknown as any[]).map((i: any) => i.getView() as KeyValue) : []);`
`115`		`- const result = Object.values(this.children.queryVariables.children as Record<string, {`
`116`		`- children: {`
`117`		`- key: { unevaledValue: string },`
`118`		`- value: { unevaledValue: string }`
`119`		`- }}>)`
`120`		`- .filter(item => item.children.key.unevaledValue !== "" && item.children.value.unevaledValue !== "")`
`121`		`- .map(item => ({[item.children.key.unevaledValue]: item.children.value.unevaledValue}))`
	`115`	`+ const result = this.children.queryVariables.toJsonValue()`
	`116`	`+ .filter(item => item.key !== "" && item.value !== "")`
	`117`	`+ .map(item => ({[item.key as string]: item.value}))`
`122`	`118`	`.reduce((acc, curr) => Object.assign(acc, curr), {});`
	`119`	`+`
	`120`	`+ result.$queryName = queryName;`
`123`	`121`	`if (!queryName) {`
`124`	`122`	`return () => Promise.resolve();`
`125`	`123`	`}`

Lines changed: 1 addition & 0 deletions

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`	`}`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,10 @@ export function toQueryView(params: FunctionProperty[]) {`
`28`	`28`	`variables?: any;`
`29`	`29`	`timeout: InstanceType<ParamsControlType>;`
`30`	`30`	`}): Promise<QueryResult> => {`
	`31`	`+ console.log("toQueryView props", props, params);`
`31`	`32`	`const { applicationId, isViewMode } = getGlobalSettings();`
`32`	`33`
`33`		- const mappedVariables = Object.keys(props.variables).map(key => ({key: `query1.variable.${key}`, value: props.variables[key]}));
	`34`	+ const mappedVariables = Object.keys(props.variables).map(key => ({key: `${props.args?.$queryName}.variables.${key}`, value: props.variables[key]}));
`34`	`35`	`let request: QueryExecuteRequest = {`
`35`	`36`	`path: props.applicationPath,`
`36`	`37`	`params: [`

Comments

(0)