Merged PR 32: 全角チェック

指定したフィールドが全角かどうかをチェックし、全角でなければエラーを出す。
2024-06-05 06:05:07 +00:00
parent 6a6e772e32 f4a1bc3e58
commit 234e55bc01
8 changed files with 247 additions and 69 deletions
--- a/backend/Temp/alc_runtime.js
+++ b/backend/Temp/alc_runtime.js
--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -13,14 +13,14 @@ API_V1_AUTH_KEY = "X-Cybozu-Authorization"
 DEPLOY_MODE = "DEV" #DEV,PROD

 DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/alc_runtime.js"
-#DEPLOY_JS_URL = "https://92dc-133-139-109-57.ngrok-free.app/alc_runtime.js"
+#DEPLOY_JS_URL = "https://e84c-133-139-70-142.ngrok-free.app/alc_runtime.js"

 KINTONE_FIELD_TYPE=["GROUP","GROUP_SELECT","CHECK_BOX","SUBTABLE","DROP_DOWN","USER_SELECT","RADIO_BUTTON","RICH_TEXT","LINK","REFERENCE_TABLE","CALC","TIME","NUMBER","ORGANIZATION_SELECT","FILE","DATETIME","DATE","MULTI_SELECT","SINGLE_LINE_TEXT","MULTI_LINE_TEXT"]

 KINTONE_FIELD_PROPERTY=['label','code','type','required','unique','maxValue','minValue','maxLength','minLength','defaultValue','defaultNowValue','options','expression','hideExpression','digit','protocol','displayScale','unit','unitPosition']

 class KINTONE_ENV:
-    
+
    BASE_URL = ""

    API_V1_AUTH_VALUE = ""
--- a/plugin/kintone-addins/src/actions/button-add.ts
+++ b/plugin/kintone-addins/src/actions/button-add.ts
@@ -12,7 +12,7 @@ interface IButtonAddProps {
    position: string;
    //イベント名
    eventName:string
-}   
+}

 export class ButtonAddAction implements IAction {
    name: string; 
@@ -97,7 +97,6 @@ export class ButtonAddAction implements IAction {
            return result;
        }
    }
-  

    register(): void {
        actionAddins[this.name] = this;
--- a/plugin/kintone-addins/src/actions/field-shown.ts
+++ b/plugin/kintone-addins/src/actions/field-shown.ts
@@ -56,8 +56,8 @@ export class FieldShownAction implements IAction{
                }
            }
            result= {
-              canNext:true,
-              result:true
+            canNext:true,
+            result:true
            }
            return result;
        }catch(error){
@@ -69,9 +69,9 @@ export class FieldShownAction implements IAction{

    }
    /**
-     * 
+     *
     * @param context 条件式を実行する
-     * @returns 
+     * @returns
     */
    getConditionResult(context:any):boolean{
        const tree =this.getCondition(this.props.condition);
@@ -84,7 +84,7 @@ export class FieldShownAction implements IAction{

    /**
     * @param condition 条件式ツリーを取得する
-     * @returns 
+     * @returns
     */
    getCondition(condition:string):ConditionTree|null{
        try{
@@ -93,7 +93,7 @@ export class FieldShownAction implements IAction{
            if(tree.getConditions(tree.root).length>0){
                return tree;
            }else{
-                return null; 
+                return null;
            }
        }catch(error){
            return null;
@@ -103,6 +103,5 @@ export class FieldShownAction implements IAction{
    register(): void {
        actionAddins[this.name]=this;
    }
-    
 }
 new FieldShownAction();
--- a/plugin/kintone-addins/src/actions/validation
+++ b/plugin/kintone-addins/src/actions/validation
@@ -0,0 +1,102 @@
+import { actionAddins } from ".";
+import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
+
+//クラス名を設計書に揃える
+/**
+ * アクションの属性定義
+ */
+    interface FullWidthProps{
+        //checkOption:Array<string>,
+        field:IField
+    }
+/**
+ * 全角チェックアクション
+ */
+export class FullWidthAction implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:FullWidthProps;
+    constructor(){
+        this.name="全角チェック"; /* pgadminのnameと同様  */
+        this.actionProps=[];
+        this.props={
+            //checkOption:[],
+            field:{code:''}
+        }
+        //アクションを登録する
+        this.register();
+    }
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode
+     * @param event
+     * @returns
+     */
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+        let result={
+            canNext:true,
+            result:false
+        };
+        try{
+            //属性設定を取得する
+            this.actionProps=actionNode.actionProps;
+            if (!('field' in actionNode.ActionValue) ) {
+                return result
+            }
+            this.props = actionNode.ActionValue as FullWidthProps;
+            //条件式の計算結果を取得
+            const record = event.record;
+            const value = record[this.props.field.code]?.value;
+            //条件分岐
+            //未入力時は何も処理をせず終了
+            if(value===undefined || value===''){
+                return result;
+            }
+            //半角が含まれていた場合resultがfalse
+            if(!this.containsFullWidthChars(value)){
+                //エラー時に出力される文字設定
+                record[this.props.field.code].error="半角が含まれています";
+                //次の処理を中止する値設定
+                result.canNext=false;
+                return result;
+            }
+            //resultプロパティ指定
+            result= {
+            canNext:true,
+            result:true
+            }
+            return result;
+        //例外処理
+        }catch(error){
+            event.error=error;
+            console.error(error);
+            result.canNext=false;
+            return result;
+        }
+    }
+    //全て全角の文字列の場合はtrue、そうでない場合はfalse
+    containsFullWidthChars(text: string): boolean {
+        //半角英数字カナを除外
+        const checkRegex="^[^\x01-\x7E\uFF61-\uFF9F]+$";
+        //正規表現オブジェクト生成
+        const fullWidthRegex = new RegExp(checkRegex);
+        
+        //正規表現チェック
+        return fullWidthRegex.test(text);
+        
+        //全角を表すUnicodeの全角正規表現(参照先URL)
+        // \u3000-\u303F：句読点・記号
+        // \u3040-\u309F：すべてのひらがな
+        // \u30A0-\u30FF:すべてのカタカナ
+        // \u4E00-\u9FAF:すべての漢字
+        // \uFF00-\uFFEF:全角英数字と半角カタカナ
+        // \u3400-\u4DBF:CJK統合漢字拡張
+        //const fullWidthRegex = /[/^[\u3000-\u303F\u3040-\u309F\u30A0-\u30FF\uFF00-\uFFEF\u4E00-\u9FAF\u3400-\u4DBF]+$/g;
+        
+    }
+    //戻り値を持たないためvoid型
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+}
+new FullWidthAction();
--- a/plugin/kintone-addins/src/types/action-process.ts
+++ b/plugin/kintone-addins/src/types/action-process.ts
@@ -13,6 +13,7 @@ import '../actions/datetime-getter';
 import '../actions/insert-value';
 import '../actions/value-getter';
 import '../actions/string-join';
+import '../actions/validation fullwidth';
 import { ActionFlow,IActionFlow, IActionResult,IContext } from "./ActionTypes";

 export class ActionProcess{
--- a/plugin/kintone-addins/yarn.lock
+++ b/plugin/kintone-addins/yarn.lock
@@ -2,6 +2,111 @@
 # yarn lockfile v1


+"@esbuild/android-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
+  integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
+
+"@esbuild/android-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
+  integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
+
+"@esbuild/android-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
+  integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
+
+"@esbuild/darwin-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
+  integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
+
+"@esbuild/darwin-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
+  integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
+
+"@esbuild/freebsd-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
+  integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
+
+"@esbuild/freebsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
+  integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
+
+"@esbuild/linux-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
+  integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
+
+"@esbuild/linux-arm@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
+  integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
+
+"@esbuild/linux-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
+  integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
+
+"@esbuild/linux-loong64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
+  integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
+
+"@esbuild/linux-mips64el@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
+  integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
+
+"@esbuild/linux-ppc64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
+  integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
+
+"@esbuild/linux-riscv64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
+  integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
+
+"@esbuild/linux-s390x@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
+  integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
+
+"@esbuild/linux-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
+  integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
+
+"@esbuild/netbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
+  integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
+
+"@esbuild/openbsd-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
+  integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
+
+"@esbuild/sunos-x64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
+  integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
+
+"@esbuild/win32-arm64@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
+  integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
+
+"@esbuild/win32-ia32@0.18.20":
+  version "0.18.20"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
+  integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
+
 "@esbuild/win32-x64@0.18.20":
  version "0.18.20"
  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz"
@@ -14,7 +119,7 @@
  dependencies:
    "@types/sizzle" "*"

-"@types/node@^20.8.9", "@types/node@>= 14":
+"@types/node@^20.8.9":
  version "20.11.0"
  resolved "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz"
  integrity sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==
@@ -96,6 +201,11 @@ fill-range@^7.0.1:
  dependencies:
    to-regex-range "^5.0.1"

+fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 glob-parent@~5.1.2:
  version "5.1.2"
  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
@@ -180,7 +290,7 @@ rollup@^3.27.1:
  optionalDependencies:
    fsevents "~2.3.2"

-sass@*, sass@^1.69.5:
+sass@^1.69.5:
  version "1.69.7"
  resolved "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz"
  integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==
@@ -189,7 +299,7 @@ sass@*, sass@^1.69.5:
    immutable "^4.0.0"
    source-map-js ">=0.6.2 <2.0.0"

-source-map-js@^1.0.2, "source-map-js@>=0.6.2 <2.0.0":
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
  version "1.0.2"
  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
--- a/sample2.json
+++ b/sample2.json
@@ -1,55 +1,22 @@
 [
-    {
-        "component": "InputText",
-        "props": {
-            "displayName": "文字入力",
-            "modelValue": "",
-            "name": "str",
-            "placeholder": "文字を入力してください",
-            "maxLength":"20",
-            "hint":"文字列入力<br>入力ルール指定可能。ルールの設定例：[val=>!!val||'必須入力です']",
-            "rules":"[val=>!!val||'必須入力です']"
-        }
-    },
-    {
-        "component": "AppFieldSelect",
-        "props": {
-            "displayName": "フィールド選択(複数)",
-            "modelValue": {},
-            "name": "selectFields",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType":"multiple"
-        }
-    },
-    {
-        "component": "AppFieldSelect",
-        "props": {
-            "displayName": "フィールド選択(単一)",
-            "modelValue": {},
-            "name": "selectField",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType":"single"
-        }
-    },
-    {
-        "component": "ColorPicker",
-        "props": {
-            "displayName": "色選択",
-            "modelValue": "",
-            "name": "color",
-            "placeholder": "カラーを選択してください"
-        }
-    },
-    {
-        "component": "NumInput",
-        "props": {
-            "displayName": "数値入力フィールド",
-            "modelValue": "",
-            "name": "num",
-            "max":100,
-            "min":0,
-            "placeholder": "数値を入力してください",
-            "rules":"[val=>!!val ||'数値を入力してください',val=>val<=100 && val>=1 || '1-100の範囲内の数値を入力してください']"
-        }
+  {
+    "component": "FieldInput",
+    "props": {
+      "displayName": "フィールド",
+      "modelValue": {},
+      "name": "field",
+      "placeholder": "対象項目を選択してください"
    }
-]
+  },
+  {
+    "component": "SelectBox",
+    "props": {
+        "displayName": "チェックする全角文字",
+        "modelValue": null,
+        "name": "options",
+        "placeholder": "チェックしたい全角文字を選択する",
+        "selectType":"multiple",
+        "options":["全角記号および句読点","ひらがな","カタカナ","全角英数字","常用漢字","拡張漢字"]
+    }
+  }
+]