diff --git a/plugin/kintone-addins/src/actions/auto-numbering.ts b/plugin/kintone-addins/src/actions/auto-numbering.ts index 39bc9e3..30d362f 100644 --- a/plugin/kintone-addins/src/actions/auto-numbering.ts +++ b/plugin/kintone-addins/src/actions/auto-numbering.ts @@ -1,6 +1,6 @@ import { actionAddins } from "."; -import { IField, IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes"; +import { IField, IAction,IActionResult, IActionNode, IActionProperty, IContext, IVarName } from "../types/ActionTypes"; import { Formatter } from "../util/format"; declare global { @@ -13,7 +13,7 @@ interface IAutoNumberingProps{ format:string; prefix:string; suffix:string; - verName:string; + verName:IVarName; } export class AutoNumbering implements IAction{ @@ -29,7 +29,7 @@ export class AutoNumbering implements IAction{ format:'', prefix:'', suffix:'', - verName:'' + verName:{name:''} } globalThis.window.$format=this.format; this.register(); @@ -56,8 +56,8 @@ export class AutoNumbering implements IAction{ const docNum = await this.createNumber(this.props); record[this.props.field.code].value=docNum; //変数設定 - if(this.props.verName){ - context.variables[this.props.verName]=docNum; + if(this.props.verName && this.props.verName.name!==''){ + context.variables[this.props.verName.name]=docNum; } result= { canNext:true, diff --git a/plugin/kintone-addins/src/actions/condition-action.ts b/plugin/kintone-addins/src/actions/condition-action.ts index fd73979..51c18b5 100644 --- a/plugin/kintone-addins/src/actions/condition-action.ts +++ b/plugin/kintone-addins/src/actions/condition-action.ts @@ -1,13 +1,13 @@ import { actionAddins } from "."; -import { IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes"; +import { IAction,IActionResult, IActionNode, IActionProperty, IContext, IVarName } from "../types/ActionTypes"; import { ConditionTree } from '../types/Conditions'; /** * アクションの属性定義 */ interface ICondition{ condition:string; - verName:string; + verName:IVarName; } /** * 条件分岐アクション @@ -21,7 +21,7 @@ export class ConditionAction implements IAction{ this.actionProps=[]; this.props={ condition:'', - verName:'' + verName:{name:''} } //アクションを登録する this.register(); @@ -58,8 +58,8 @@ export class ConditionAction implements IAction{ result:'いいえ' } } - if(this.props.verName){ - context.variables[this.props.verName]=result.result; + if(this.props.verName && this.props.verName.name!==''){ + context.variables[this.props.verName.name]=result.result; } return result; }catch(error){ diff --git a/plugin/kintone-addins/src/actions/datetime-getter.ts b/plugin/kintone-addins/src/actions/datetime-getter.ts index 7fc7d23..569f856 100644 --- a/plugin/kintone-addins/src/actions/datetime-getter.ts +++ b/plugin/kintone-addins/src/actions/datetime-getter.ts @@ -1,11 +1,11 @@ import { actionAddins } from "."; -import { IAction, IActionResult, IActionNode, IActionProperty, IField ,IContext} from "../types/ActionTypes"; +import { IAction, IActionResult, IActionNode, IActionProperty, IField ,IContext, IVarName} from "../types/ActionTypes"; /** * アクションの属性定義 */ interface IDatetimeGetterProps { /**変数の名前 */ - verName:string; + verName:IVarName; } /** * 現在日時を取得するアクション @@ -18,7 +18,7 @@ export class DatetimeGetterAction implements IAction { this.name = "現在日時"; this.actionProps = []; this.props = { - verName:'' + verName:{name:''} } this.register(); } @@ -45,8 +45,8 @@ export class DatetimeGetterAction implements IAction { let today = new Date(); - if(this.props.verName){ - context.variables[this.props.verName]=today.toISOString(); + if(this.props.verName && this.props.verName.name!==''){ + context.variables[this.props.verName.name]=today.toISOString(); } return result; diff --git a/plugin/kintone-addins/src/actions/string-join.ts b/plugin/kintone-addins/src/actions/string-join.ts index 36781a0..bc10219 100644 --- a/plugin/kintone-addins/src/actions/string-join.ts +++ b/plugin/kintone-addins/src/actions/string-join.ts @@ -44,7 +44,7 @@ export class StringJoinAction implements IAction{ * @param context コンテキスト(レコード、変数情報を持っている) * @returns */ -  //非同期処理ある関数下のある属性: + //非同期処理ある関数下のある属性: async process(actionNode:IActionNode,event:any):Promise { let result={ //後継処理不可: @@ -107,7 +107,7 @@ export class StringJoinAction implements IAction{ for(let i=0;i