Commit 155bab4

authored

Merge pull request #1531 from lowcoder-org/fix/variables_issue_s3

Fix issues on empty variable key & value and removed placeholder variables

2 parents f934eda + 5c160a8 commit 155bab4Copy full SHA for 155bab4

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

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

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,9 @@ 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);`
`32`	`31`	`const { applicationId, isViewMode } = getGlobalSettings();`
`33`	`32`
`34`		- const mappedVariables = Object.keys(props.variables).map(key => ({key: `${props.args?.$queryName}.variables.${key}`, value: props.variables[key]}));
	`33`	+ const mappedVariables = Object.keys(props.variables).filter(k=>k!=="$queryName").map(key => ({key: `${props.args?.$queryName}.variables.${key}`, value: props.variables[key]\|\|""}));
`35`	`34`	`let request: QueryExecuteRequest = {`
`36`	`35`	`path: props.applicationPath,`
`37`	`36`	`params: [`

Comments

(0)