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] =?UTF-8?q?feat=20236,284=20=E5=85=A8=E5=8D=8A=E8=A7=92?=
 =?UTF-8?q?=E3=81=AE=E6=94=B9=E4=BF=AE=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 | 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);