From 1d248bde4310a9a258de86d7a4ac771312a02adb Mon Sep 17 00:00:00 2001 From: kanarutsuda <–Kanaru.Tsuda@jp.ricoh.com> Date: Wed, 12 Jun 2024 17:34:13 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=8A=E8=A7=92=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E6=96=87=E5=AD=97=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kintone-addins/src/actions/validation-halfwidth.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugin/kintone-addins/src/actions/validation-halfwidth.ts b/plugin/kintone-addins/src/actions/validation-halfwidth.ts index 1ddc7dc..e093f24 100644 --- a/plugin/kintone-addins/src/actions/validation-halfwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-halfwidth.ts @@ -76,9 +76,7 @@ export class HalfWidthAction implements IAction{ //全て全角の文字列の場合はtrue、そうでない場合はfalse containsHalfWidthChars(text: string): boolean { - //半角英数字カナ記号を除外、対象フィールドすべてに適応 - // 全角文字 ^\x01-\x7E - const checkRegex="^[^\x01-\x7E\uFF61-\uFF9F]+$"; + const checkRegex="[^\x01-\x7E\uFF61-\uFF9F]"; //正規表現オブジェクト生成 const halfWidthRegex = new RegExp(checkRegex); From 55bbf50656a784a739783faba8eb9ffc7621250a Mon Sep 17 00:00:00 2001 From: kanarutsuda <–Kanaru.Tsuda@jp.ricoh.com> Date: Thu, 13 Jun 2024 14:51:28 +0900 Subject: [PATCH 2/4] =?UTF-8?q?feat=20236,284=20=E5=85=A8=E5=8D=8A?= =?UTF-8?q?=E8=A7=92=E3=81=AE=E6=94=B9=E4=BF=AE=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kintone-addins/src/actions/validation-fullwidth.ts | 2 +- plugin/kintone-addins/src/actions/validation-halfwidth.ts | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugin/kintone-addins/src/actions/validation-fullwidth.ts b/plugin/kintone-addins/src/actions/validation-fullwidth.ts index 0b83d38..8265b0e 100644 --- a/plugin/kintone-addins/src/actions/validation-fullwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-fullwidth.ts @@ -79,7 +79,7 @@ export class FullWidthAction implements IAction{ containsFullWidthChars(text: string): boolean { //半角英数字カナ記号を除外 - const checkRegex="[^\x01-\x7E\uFF61-\uFF9F]"; + const checkRegex="^[^\x01-\x7E\uFF61-\uFF9F]+$"; //正規表現オブジェクト生成 const fullWidthRegex = new RegExp(checkRegex); diff --git a/plugin/kintone-addins/src/actions/validation-halfwidth.ts b/plugin/kintone-addins/src/actions/validation-halfwidth.ts index e093f24..185d193 100644 --- a/plugin/kintone-addins/src/actions/validation-halfwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-halfwidth.ts @@ -18,7 +18,6 @@ export class HalfWidthAction implements IAction{ this.name="半角チェック"; /* pgadminのnameと同様 */ this.actionProps=[]; this.props={ - //checkOption:[], field:{code:''} } //アクションを登録する @@ -51,7 +50,7 @@ export class HalfWidthAction implements IAction{ return result; } //全角が含まれていた場合保存処理中止(エラー処理) - if(this.containsHalfWidthChars(value)){ + if(!this.containsHalfWidthChars(value)){ //エラー時に出力される文字設定 record[this.props.field.code].error="全角が含まれています"; //次の処理を中止する値設定 @@ -76,7 +75,7 @@ export class HalfWidthAction implements IAction{ //全て全角の文字列の場合はtrue、そうでない場合はfalse containsHalfWidthChars(text: string): boolean { - const checkRegex="[^\x01-\x7E\uFF61-\uFF9F]"; + const checkRegex="^[\x01-\x7E\uFF61-\uFF9F]+$"; //正規表現オブジェクト生成 const halfWidthRegex = new RegExp(checkRegex); From 80694ee49cc255c97eae27a5fd7f4b343567b847 Mon Sep 17 00:00:00 2001 From: kanarutsuda <–Kanaru.Tsuda@jp.ricoh.com> Date: Thu, 13 Jun 2024 15:12:30 +0900 Subject: [PATCH 3/4] =?UTF-8?q?feat=20236,284=E3=80=80=E5=85=A8=E5=8D=8A?= =?UTF-8?q?=E8=A7=92=E3=81=AE=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=80=80?= =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kintone-addins/src/actions/validation-fullwidth.ts | 2 +- plugin/kintone-addins/src/actions/validation-halfwidth.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/kintone-addins/src/actions/validation-fullwidth.ts b/plugin/kintone-addins/src/actions/validation-fullwidth.ts index 8265b0e..ecd2999 100644 --- a/plugin/kintone-addins/src/actions/validation-fullwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-fullwidth.ts @@ -78,7 +78,7 @@ export class FullWidthAction implements IAction{ //全て全角の文字列の場合はtrue、そうでない場合はfalse containsFullWidthChars(text: string): boolean { - //半角英数字カナ記号を除外 + // 半角英数字カナ記号を除外 const checkRegex="^[^\x01-\x7E\uFF61-\uFF9F]+$"; //正規表現オブジェクト生成 diff --git a/plugin/kintone-addins/src/actions/validation-halfwidth.ts b/plugin/kintone-addins/src/actions/validation-halfwidth.ts index 185d193..7f807ec 100644 --- a/plugin/kintone-addins/src/actions/validation-halfwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-halfwidth.ts @@ -75,7 +75,7 @@ export class HalfWidthAction implements IAction{ //全て全角の文字列の場合はtrue、そうでない場合はfalse containsHalfWidthChars(text: string): boolean { - const checkRegex="^[\x01-\x7E\uFF61-\uFF9F]+$"; + const checkRegex = "^[\x01-\x7E\uFF61-\uFF9F]+$"; //正規表現オブジェクト生成 const halfWidthRegex = new RegExp(checkRegex); From 5f2059fd6ae1422121ad31442c0729b8109fd3b5 Mon Sep 17 00:00:00 2001 From: kanarutsuda <–Kanaru.Tsuda@jp.ricoh.com> Date: Thu, 13 Jun 2024 15:20:04 +0900 Subject: [PATCH 4/4] =?UTF-8?q?feat=20236,284=20=E5=85=A8=E5=8D=8A?= =?UTF-8?q?=E8=A7=92=E3=81=AE=E6=94=B9=E4=BF=AE=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/kintone-addins/src/actions/validation-fullwidth.ts | 2 +- plugin/kintone-addins/src/actions/validation-halfwidth.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/kintone-addins/src/actions/validation-fullwidth.ts b/plugin/kintone-addins/src/actions/validation-fullwidth.ts index ecd2999..a24bb4b 100644 --- a/plugin/kintone-addins/src/actions/validation-fullwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-fullwidth.ts @@ -75,7 +75,7 @@ export class FullWidthAction implements IAction{ return result; } } - //全て全角の文字列の場合はtrue、そうでない場合はfalse + // 全て全角の文字列の場合はtrue、そうでない場合はfalse containsFullWidthChars(text: string): boolean { // 半角英数字カナ記号を除外 diff --git a/plugin/kintone-addins/src/actions/validation-halfwidth.ts b/plugin/kintone-addins/src/actions/validation-halfwidth.ts index 7f807ec..a2d34c2 100644 --- a/plugin/kintone-addins/src/actions/validation-halfwidth.ts +++ b/plugin/kintone-addins/src/actions/validation-halfwidth.ts @@ -72,7 +72,7 @@ export class HalfWidthAction implements IAction{ return result; } } - //全て全角の文字列の場合はtrue、そうでない場合はfalse + // 全て全角の文字列の場合はtrue、そうでない場合はfalse containsHalfWidthChars(text: string): boolean { const checkRegex = "^[\x01-\x7E\uFF61-\uFF9F]+$";