バグ修正:json文字列フェッチの問題

This commit is contained in:
Mouriya
2024-06-10 12:34:01 +09:00
parent 04f28a3be5
commit 343f97234a

View File

@@ -10,7 +10,8 @@ import { actionAddins } from ".";
interface Props {
displayName: string;
sources: Sources;
condition: Condition;
condition: string;
conditionO: Condition;
verName: VerName;
}
@@ -150,7 +151,9 @@ export class DataProcessingAction implements IAction {
): Promise<IActionResult> {
this.actionProps = nodes.actionProps;
this.dataProcessingProps = nodes.ActionValue as Props;
this.dataProcessingProps.conditionO = JSON.parse(
this.dataProcessingProps.condition
);
let result = {
canNext: true,
result: "",
@@ -160,7 +163,12 @@ export class DataProcessingAction implements IAction {
return result;
}
const data = await selectData(varGet(this.dataProcessingProps.condition.queryString,context.variables));
const data = await selectData(
varGet(
this.dataProcessingProps.conditionO.queryString,
context.variables
)
);
console.log("data ", data);
context.variables[this.dataProcessingProps.verName.name] =
@@ -189,6 +197,8 @@ export class DataProcessingAction implements IAction {
new DataProcessingAction();
const varGet = (str: string, vars: any) => {
console.log(str);
const regex = /var\((.*?)\)/g;
let match;
while ((match = regex.exec(str)) !== null) {
@@ -199,6 +209,7 @@ const varGet = (str: string, vars: any) => {
throw new Error(`変数${varName}が見つかりません`);
}
}
console.log(str);
return str;
};
@@ -251,7 +262,9 @@ const calc = (f: Var, result: Result) => {
}
const fun =
calcFunc[`${type}_${Operator[f.logicalOperator.operator as keyof typeof Operator]}`];
calcFunc[
`${type}_${Operator[f.logicalOperator.operator as keyof typeof Operator]}`
];
if (!fun) {
return ERROR_TYPE;
}