Merge branch 'dev' of https://dev.azure.com/rj-se-service-design/App%20Builder%20for%20kintone/_git/App%20Builder%20for%20kintone into dev
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -51,13 +51,19 @@ export class MailCheckAction implements IAction {
|
|||||||
const value = record[this.props.field.code].value;
|
const value = record[this.props.field.code].value;
|
||||||
|
|
||||||
if (this.props.emailCheck === '厳格') {
|
if (this.props.emailCheck === '厳格') {
|
||||||
if (!/^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)) {
|
if (!/^[a-zA-Z0-9_-¥.]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)) {
|
||||||
record[this.props.field.code].error = this.props.message;
|
record[this.props.field.code].error = this.props.message;
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
record[this.props.field.code].error = null;
|
||||||
|
}
|
||||||
} else if (this.props.emailCheck === 'ゆるめ') {
|
} else if (this.props.emailCheck === 'ゆるめ') {
|
||||||
if (!/^[^@]+@[^@]+$/.test(value)) {
|
if (!/^[^@]+@[^@]+$/.test(value)) {
|
||||||
record[this.props.field.code].error = this.props.message;
|
record[this.props.field.code].error = this.props.message;
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
record[this.props.field.code].error = null;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
result = {
|
result = {
|
||||||
canNext: true,
|
canNext: true,
|
||||||
|
|||||||
@@ -42,7 +42,12 @@ $(function (){
|
|||||||
const flow=ActionFlow.fromJSON(flowinfo.content);
|
const flow=ActionFlow.fromJSON(flowinfo.content);
|
||||||
if(flow!==undefined){
|
if(flow!==undefined){
|
||||||
const process = new ActionProcess(event.type,flow,event);
|
const process = new ActionProcess(event.type,flow,event);
|
||||||
process.exec();
|
process.exec().then((res)=>{
|
||||||
|
const record = event.record;
|
||||||
|
kintone.app.record.set({record});
|
||||||
|
}).catch((err)=>{
|
||||||
|
console.error(err);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
return event;
|
return event;
|
||||||
});
|
});
|
||||||
@@ -58,7 +63,7 @@ $(function (){
|
|||||||
await process.exec();
|
await process.exec();
|
||||||
}
|
}
|
||||||
const record = event.record;
|
const record = event.record;
|
||||||
kintone.app.record.set({record})
|
kintone.app.record.set({record});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user