bugfix

2024-02-07 18:06:22 +09:00 · 2024-02-07 16:52:34 +09:00
88 changed files with 1966 additions and 6087 deletions
--- a/backend/.gitignore
+++ b/backend/.gitignore
@@ -56,7 +56,6 @@ coverage.xml

 # Django stuff:
 *.log
-*.log.*
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
--- a/backend/Temp/alc_runtime.js
+++ b/backend/Temp/alc_runtime.js
--- a/backend/app/api/api_v1/routers/kintone.py
+++ b/backend/app/api/api_v1/routers/kintone.py
@@ -31,6 +31,8 @@ def getkintoneformat():


 def createkintonefields(property,value,trueformat):
+        if(type(value) == str):
+            value = value.replace("\"","⊡⊡")
        p = []
        if(property=="options"):
            o=[]
@@ -148,7 +150,7 @@ def getfieldsfromexcel(df,mapping):
              

        col.append(f"\"{df.iloc[row,codecolumn]}\":{{{','.join(p)}}}")
-        fields = ",".join(col).replace("\\", "\\\\")
+        fields = ",".join(col).replace("\\", "\\\\").replace("⊡⊡","\\\"")
    return  json.loads(f"{{{fields}}}")  

 def getsettingfromexcel(df):
@@ -217,9 +219,7 @@ def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
    data = {"apps":[{"app":app,"revision":revision}],"revert": False}
    r = httpx.post(url,headers=headers,data=json.dumps(data))
    return r.json
-
-# 既定項目に含めるアプリのフィールドのみ取得する
-# スペース、枠線、ラベルを含まない    
+    
 def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
    params = {"app":app}
@@ -227,44 +227,6 @@ def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
    r = httpx.get(url,headers=headers,params=params)
    return r.json()

-# フォームに配置するフィールドのみ取得する
-# スペース、枠線、ラベルも含める
-def getformfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-    params = {"app":app}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/form.json"
-    r = httpx.get(url,headers=headers,params=params)
-    return r.json()
-
-
-def merge_kintone_fields(fields_response: dict, form_response: dict) -> dict:
-    fields_properties = fields_response.get('properties', {})
-    form_properties = form_response.get('properties', [])
-
-    merged_properties = {k: v for k, v in fields_properties.items()}
-
-    for index, form_field in enumerate(form_properties):
-        code = form_field.get('code')
-        if code:
-            if code and code not in merged_properties:
-                merged_properties[code] = form_field
-        else:
-            element_id = form_field.get('elementId')
-            if element_id:
-                key = element_id
-                form_field['code']=element_id
-                form_field['label']=form_field.get('type')
-            # else:
-            #     key = f"{form_field.get('type')}_{index}"
-                merged_properties[key] = form_field 
-
-    merged_response = {
-        'revision': fields_response.get('revision', ''),
-        'properties': merged_properties
-    }
-    
-    return merged_response
-
 def analysefields(excel,kintone):
    updatefields={}
    addfields={}
@@ -522,15 +484,6 @@ async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
    except Exception as e:
       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAM}->{app}):",e) 

-@r.get("/allfields")
-async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
-    try:
-        field_resp = getfieldsfromkintone(app,env)
-        form_resp = getformfromkintone(app,env)
-        return merge_kintone_fields(field_resp,form_resp)
-    except Exception as e:
-       raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAM}->{app}):",e) 
-
@r.get("/appprocess")
 async def appprocess(request:Request,app:str,env = Depends(getkintoneenv)):
    try:
@@ -593,7 +546,7 @@ async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...
                if app.get("revision") != None:
                    result["revision"] = app["revision"]
                    app = addfieldstokintone(result["app"],fields,env)
-                if len(processes)> 0:
+                if len(processes["states"])> 0:
                    app = updateprocesstokintone(result["app"],processes,env)
                if app.get("revision") != None:
                    result["revision"] = app["revision"]
--- a/backend/app/core/config.py
+++ b/backend/app/core/config.py
@@ -13,14 +13,13 @@ 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://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/backend/app/core/security.py
+++ b/backend/app/core/security.py
@@ -9,7 +9,7 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")

 SECRET_KEY = "alicorns"
 ALGORITHM = "HS256"
-ACCESS_TOKEN_EXPIRE_MINUTES = 2880
+ACCESS_TOKEN_EXPIRE_MINUTES = 30


 def get_password_hash(password: str) -> str:
@@ -25,7 +25,7 @@ def create_access_token(*, data: dict, expires_delta: timedelta = None):
    if expires_delta:
        expire = datetime.utcnow() + expires_delta
    else:
-        expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+        expire = datetime.utcnow() + timedelta(minutes=2880)
    to_encode.update({"exp": expire})
    encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
    return encoded_jwt
--- a/backend/app/db/crud.py
+++ b/backend/app/db/crud.py
@@ -279,8 +279,7 @@ def get_events(db: Session):
    return events

 def get_eventactions(db: Session,eventid: str):
-    #eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
-    eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid != models.Action.id and models.EventAction.eventid == eventid ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
+    eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
    if not eveactions:
        raise HTTPException(status_code=404, detail="Data not found")
    return eveactions
--- a/backend/app/db/models.py
+++ b/backend/app/db/models.py
@@ -85,7 +85,6 @@ class Event(Base):
    eventid= Column(String(100), nullable=False)
    function = Column(String(500), nullable=False)   
    mobile = Column(Boolean, default=False)
-    eventgroup = Column(Boolean, default=False)

 class EventAction(Base):
    __tablename__ = "eventaction"
--- a/backend/app/db/schemas.py
+++ b/backend/app/db/schemas.py
@@ -137,7 +137,6 @@ class Event(Base):
    eventid: str
    function: str 
    mobile: bool
-    eventgroup: bool

    class Config:
        orm_mode = True
--- a/backend/readme.md
+++ b/backend/readme.md
@@ -24,8 +24,4 @@ python -m venv env
   ```bash
   pip install -r requirements.txt

-   ```
-4. backend 起動
-   ```bash
-   uvicorn app.main:app --reload
-   ```
+   ```
--- a/document/Kintone自動化ツール設計図.drawio
+++ b/document/Kintone自動化ツール設計図.drawio
--- a/document/サイトマップ.drawio
+++ b/document/サイトマップ.drawio
@@ -1,147 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2024-02-21T05:42:02.026Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36" etag="T2S5cjvthSOlO5DmGw-C" version="23.1.5" type="device">
-  <diagram id="Z6uZM46JtkVaKDzPjE9h" name="サイトマップ">
-    <mxGraphModel dx="1434" dy="820" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-14" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-1" target="Gi77RX5G2m4J9-6cMje4-13" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-1" value="テナント登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
-          <mxGeometry x="60" y="50" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-2" value="Admin Login" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
-          <mxGeometry x="60" y="270" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-8" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-7" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-9" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-7" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-12" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-11" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-5" value="Home" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="240" y="270" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-2" target="Gi77RX5G2m4J9-6cMje4-5" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-42" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-7" target="Gi77RX5G2m4J9-6cMje4-41" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-7" value="ユーザー登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="220" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-11" value="ドメイン登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="340" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-13" value="テナント管理者作成" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
-          <mxGeometry x="240" y="50" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-15" value="ライセンス情報" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="480" y="10" width="90" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-16" value="Adminユーザー" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="480" y="90" width="90" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-13" target="Gi77RX5G2m4J9-6cMje4-15" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-13" target="Gi77RX5G2m4J9-6cMje4-16" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-19" value="テナントDB&lt;br&gt;作成" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="550" y="50" width="90" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-20" target="Gi77RX5G2m4J9-6cMje4-21" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-20" value="Login" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.login;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="50" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-24" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-25" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="430" y="645" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-21" value="Home" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="230" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-27" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-25" target="Gi77RX5G2m4J9-6cMje4-26" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-25" value="アプリ一覧" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="440" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-29" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-26" target="Gi77RX5G2m4J9-6cMje4-28" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-26" value="フロー一覧" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="620" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-40" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-28" target="Gi77RX5G2m4J9-6cMje4-39" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-28" value="フローエディタ" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="800" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-33" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-30" target="Gi77RX5G2m4J9-6cMje4-32" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-30" value="設計書取込" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="440" y="715" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-30" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-32" value="取込結果表示" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="620" y="715" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-37" value="設計書ダウロード" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="440" y="825" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-37" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-39" value="フロー履歴管理" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="980" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-41" value="ALC設定" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="620" y="220" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-43" value="管理ドメイン設定" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="800" y="220" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-44" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-41" target="Gi77RX5G2m4J9-6cMje4-43" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-45" value="プロファイル" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="935" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-45" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-50" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-47" target="Gi77RX5G2m4J9-6cMje4-49" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-47" value="プロファイル" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="450" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-47" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-49" value="ライセンス情報" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="620" y="450" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-51" value="ライセンス情報" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="620" y="935" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-45" target="Gi77RX5G2m4J9-6cMje4-51" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>
--- a/document/収支明細管理設計書.xlsx
+++ b/document/収支明細管理設計書.xlsx
--- a/document/日報設計書new.xlsx
+++ b/document/日報設計書new.xlsx
--- a/frontend/.env
+++ b/frontend/.env
@@ -1,2 +1,3 @@
 KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
 #KAB_BACKEND_URL="http://127.0.0.1:8000/"
+
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -2,6 +2,7 @@
 <html lang="ja-jp">
  <head>
    <title><%= productName %></title>
+
    <meta charset="utf-8">
    <meta name="description" content="<%= productDescription %>">
    <meta name="format-detection" content="telephone=no">
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -2,7 +2,7 @@
  "name": "kintone-automate",
  "version": "0.2.0",
  "description": "Kintoneアプリの自動生成とデプロイを支援ツールです",
-  "productName": "kintone Automate",
+  "productName": "Kintone Automate",
  "author": "maxiaozhe@alicorns.co.jp <maxiaozhe@alicorns.co.jp>",
  "private": true,
  "scripts": {
@@ -17,9 +17,8 @@
  },
  "dependencies": {
    "@quasar/extras": "^1.16.4",
-    "@vueuse/core": "^10.9.0",
    "axios": "^1.4.0",
-    "pinia": "^2.1.7",
+    "pinia": "^2.1.6",
    "quasar": "^2.6.0",
    "uuid": "^9.0.0",
    "vue": "^3.0.0",
--- a/frontend/quasar.config.js
+++ b/frontend/quasar.config.js
@@ -36,8 +36,7 @@ module.exports = configure(function (/* ctx */) {
    // --> boot files are part of "main.js"
    // https://v2.quasar.dev/quasar-cli-vite/boot-files
    boot: [
-      'axios',
-      'error-handler'
+      'axios'
    ],

    // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
--- a/frontend/src/boot/axios.ts
+++ b/frontend/src/boot/axios.ts
@@ -20,20 +20,22 @@ const token=localStorage.getItem('token')||'';
 if(token!==''){
  api.defaults.headers["Authorization"]='Bearer ' + token;
 }
-//axios例外キャプチャー
 api.interceptors.response.use(
  (response)=>response,
  (error)=>{
-    if (error.response && error.response.status === 401) {
-      // 認証エラーの場合再ログインする
-      console.error('(; ﾟДﾟ)/認証エラー(401)：', error);
+    const orgReq=error.config;
+    if(error.response && error.response.status===401){
+      console.error("401エラー");
      localStorage.removeItem('token');
      router.replace({
        path:"/login",
        query:{redirect:router.currentRoute.value.fullPath}
      });
+      // router.push({
+      //     path:"/login",
+      //     query:{redirect:router.currentRoute.value.fullPath}
+      //   });
    }
-    return Promise.reject(error);
  }
 )
 export default boot(({ app }) => {
--- a/frontend/src/boot/error-handler.ts
+++ b/frontend/src/boot/error-handler.ts
@@ -1,21 +0,0 @@
-// src/boot/error-handler.ts
-import { boot } from 'quasar/wrappers';
-import { Router } from 'vue-router';
-import { App } from 'vue';
-
-export default boot(({ app, router }: { app: App<Element>; router: Router }) => {
-  document.documentElement.lang="ja-JP";
-  app.config.errorHandler = (err: any, instance: any, info: string) => {
-    if (err.response && err.response.status === 401) {
-      // 認証エラーの場合再ログインする
-      console.error('(; ﾟДﾟ)/認証エラー(401)：', err, info);
-      localStorage.removeItem('token');
-      router.replace({
-        path:"/login",
-        query:{redirect:router.currentRoute.value.fullPath}
-      });
-    } else {
-      console.error('(; ﾟДﾟ)例外：', err, info);
-    }
-  };
-});
--- a/frontend/src/components/ActionSelect.vue
+++ b/frontend/src/components/ActionSelect.vue
@@ -3,15 +3,13 @@
    <div v-if="!isLoaded" class="spinner flex flex-center">
      <q-spinner  color="primary" size="3em" />
    </div>
-    <q-table v-else  row-key="index" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
+    <q-table v-else  row-key="name" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
    class="action-table"
    flat bordered
    virtual-scroll
    :pagination="pagination"
    :rows-per-page-options="[0]"
-    :filter="filter"
-    >
-    </q-table>
+    />
  </div>
 </template>
 <script>
@@ -22,10 +20,9 @@ export default {
  name: 'actionSelect',
  props: {
    name: String,
-    type: String,
-    filter:String
+    type: String
  },
-  setup(props) {
+  setup() {
    const isLoaded=ref(false);
    const columns = [
    { name: 'name', required: true,label: 'アクション名',align: 'left',field: 'name',sortable: true},
@@ -35,9 +32,9 @@ export default {
    const rows = reactive([])
    onMounted(async () => {
        const res =await api.get('api/actions');
-        res.data.forEach((item,index) =>
+        res.data.forEach((item) =>
        {
-          rows.push({index,name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
+          rows.push({name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
        });
        isLoaded.value=true;
      });
@@ -56,7 +53,6 @@ export default {
 </script>
 <style lang="scss">
 .action-table{
-  min-height: 10vh;
-  max-height: 68vh;
+  height: 100%;
 }
 </style>
--- a/frontend/src/components/AppSelect.vue
+++ b/frontend/src/components/AppSelect.vue
@@ -1,68 +1,56 @@
 <template>
-  <div class="q-px-xs">
+  <div class="q-pa-md" >
    <div v-if="!isLoaded" class="spinner flex flex-center">
-      <q-spinner color="primary" size="3em" />
+      <q-spinner  color="primary" size="3em" />
    </div>
-    <q-table v-else class="app-table" :selection="type" row-key="id" v-model:selected="selected" flat bordered
-      virtual-scroll :columns="columns" :rows="rows" :pagination="pagination" :rows-per-page-options="[0]"
-      :filter="filter" style="max-height: 65vh;">
+    <q-table v-else :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" >
      <template v-slot:body-cell-description="props">
-        <q-td :props="props">
-          <q-scroll-area class="description-cell">
-            <div v-html="props.row.description"></div>
-          </q-scroll-area>
-        </q-td>
+          <q-td :props="props">
+              <q-scroll-area  class="description-cell">
+                <div v-html="props.row.description" ></div>
+              </q-scroll-area>
+          </q-td>
      </template>
    </q-table>
  </div>
 </template>
 <script lang="ts">
-import { ref, onMounted, reactive, watchEffect } from 'vue'
+import { ref,onMounted,reactive } from 'vue'
 import { api } from 'boot/axios';
+import { LeftDataBus } from './flowEditor/left/DataBus';

 export default {
  name: 'AppSelect',
  props: {
    name: String,
-    type: String,
-    filter: String,
-    updateExternalSelectAppInfo: {
-      type: Function
-    }
+    type: String
  },
-  setup(props) {
-    const columns = [
-      { name: 'id', required: true, label: 'ID', align: 'left', field: 'id', sortable: true },
-      { name: 'name', label: 'アプリ名', field: 'name', sortable: true, align: 'left' },
-      { name: 'description', label: '概要', field: 'description', align: 'left', sortable: false },
-      { name: 'createdate', label: '作成日時', field: 'createdate', align: 'left' }
-    ]
-    const isLoaded = ref(false);
-    const rows: any[] = reactive([]);
-    const selected = ref([])
-
-    watchEffect(()=>{
-      if (selected.value && selected.value[0] && props.updateExternalSelectAppInfo) {
-        props.updateExternalSelectAppInfo(selected.value[0])
-      }
-    });
-    onMounted(() => {
-      api.get('api/v1/allapps').then(res => {
-        res.data.apps.forEach((item: any) => {
-          rows.push({
-            id: item.appId,
-            name: item.name,
-            description: item.description,
-            createdate: dateFormat(item.createdAt)
-          });
-        });
-        isLoaded.value = true;
+  setup() {
+  const columns = [
+  { name: 'id', required: true,label: 'ID',align: 'left',field: 'id',sortable: true},
+  { name: 'name', label: 'アプリ名', field: 'name', sortable: true,align:'left' },
+  { name: 'description', label: '概要', field: 'description',align:'left', sortable: false },
+  { name: 'createdate', label: '作成日時', field: 'createdate',align:'left'}
+  ]
+    const isLoaded=ref(false);
+    const rows :any[]= reactive([]);
+    onMounted( () => {
+        api.get('api/v1/allapps').then(res =>{
+          res.data.apps.forEach((item:any) =>
+              {
+                rows.push({
+                  id:item.appId,
+                  name:item.name,
+                  description:item.description,
+                  createdate:dateFormat(item.createdAt)});
+                });
+                isLoaded.value=true;
+              });
      });
-    });

-    const dateFormat = (dateStr: string) => {
+    const dateFormat=(dateStr:string)=>{
      const date = new Date(dateStr);
-      const pad = (num: number) => num.toString().padStart(2, '0');
+      const pad = (num:number) => num.toString().padStart(2, '0');
      const year = date.getFullYear();
      const month = pad(date.getMonth() + 1);
      const day = pad(date.getDate());
@@ -74,26 +62,22 @@ export default {
    return {
      columns,
      rows,
-      selected,
-      isLoaded,
-      pagination: ref({
-        rowsPerPage: 10
-      })
+      selected: ref([]),
+      isLoaded
    }
  },

 }
 </script>
 <style lang="scss">
-.description-cell {
+.description-cell{
  height: 60px;
  width: 300px;
  max-height: 60px;
  max-width: 300px;
  white-space: break-spaces;
 }
-
-.spinner {
+.spinner{
  min-height: 300px;
  min-width: 400px;
 }
--- a/frontend/src/components/ConditionEditor/ConditionEditor.vue
+++ b/frontend/src/components/ConditionEditor/ConditionEditor.vue
@@ -1,5 +1,5 @@
 <template>
-  <show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" min-width="50vw" min-height="60vh">
+  <show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" width="60vw" height="60vh">
    <template v-slot:toolbar>
      <q-btn flat round dense icon="more_vert" >
      <q-menu  auto-close anchor="bottom start">
--- a/frontend/src/components/ConditionEditor/ConditionObject.vue
+++ b/frontend/src/components/ConditionEditor/ConditionObject.vue
@@ -1,41 +1,30 @@
 <template>
-  <q-field v-model="selectedObject" labelColor="primary" class="condition-object"
+  <q-field v-model="selectedField" labelColor="primary" class="condition-object"
          :clearable="isSelected" stack-label  :dense="true" :outlined="true" >
    <template v-slot:control >
-      <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
-        {{ selectedObject.name }}
-      </q-chip>
-      <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
-        {{ selectedObject.name.name }}
+      <q-chip  color="primary" text-color="white"  v-if="isSelected" :dense="true" class="selected-obj">
+        {{ selectedField.name }}
      </q-chip>
    </template>
   <template v-slot:append>
    <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
    </template>
  </q-field>
-  <show-dialog v-model:visible="show" name="設定項目一覧" @close="closeDg" min-width="400px">
-    <template v-slot:toolbar>
-        <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
-          <template v-slot:before>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-    </template>
-    <condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
+  <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
+    <condition-objects ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></condition-objects>
  </show-dialog>
  </template>

  <script lang="ts">
-  import { defineComponent, reactive, ref ,watchEffect,computed} from 'vue';
+  import { defineComponent, ref ,watchEffect,computed} from 'vue';
  import ShowDialog from '../ShowDialog.vue';
  import ConditionObjects from '../ConditionObjects.vue';
  import { useFlowEditorStore } from '../../stores/flowEditor';
-  import {IActionFlow,IActionNode,IActionVariable} from '../../types/ActionTypes';
  export default defineComponent({
    name: 'ConditionObject',
    components: {
      ShowDialog,
-      ConditionObjects
+      ConditionObjects,
    },
    props: {
      modelValue: {
@@ -46,28 +35,24 @@
    setup(props, { emit }) {
      const appDg = ref();
      const show = ref(false);
-      const selectedObject = ref(props.modelValue);
+      const selectedField = ref(props.modelValue);
      const store = useFlowEditorStore();
      const isSelected = computed(()=>{
-        return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)
+        return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
      });
-      let vars:IActionVariable[] =[];
-      if(store.currentFlow!==undefined && store.activeNode!==undefined ){
-        vars =store.currentFlow.getVarNames(store.activeNode);
-      }
-      const filter=ref('');
+
      const showDg = () => {
        show.value = true;
      };

      const closeDg = (val:string) => {
        if (val == 'OK') {
-          selectedObject.value = appDg.value.selected[0];
+          selectedField.value = appDg.value.selected[0];
        }
      };

      watchEffect(() => {
-        emit('update:modelValue', selectedObject.value);
+        emit('update:modelValue', selectedField.value);
      });

      return {
@@ -76,10 +61,8 @@
        show,
        showDg,
        closeDg,
-        selectedObject,
-        vars:reactive(vars),
-        isSelected,
-        filter
+        selectedField,
+        isSelected
      };
    }
  });
@@ -88,9 +71,9 @@
 .condition-object{
  min-width: 200px;
  max-height: 40px;
-  margin: 0 2px;
+  padding: 2px;
 }
 .selected-obj{
-  margin: 0 2px;
+  margin: 0px;
 }
 </style>
--- a/frontend/src/components/ConditionEditor/NodeCondition.vue
+++ b/frontend/src/components/ConditionEditor/NodeCondition.vue
@@ -66,7 +66,7 @@
          </div>
          <!-- condition -->
          <div @click.stop @keypress.stop v-else >
-            <div class="row no-wrap items-center q-my-xs">
+            <div class="row no-wrap items-center">
              <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"></ConditionObject>
              <q-select v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
              <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
@@ -106,7 +106,11 @@
          </div>
      </template>
    </q-tree>
-   <q-tooltip anchor="center middle" v-model="showingCondition" no-parent-event>
+    <!-- <q-btn @click="addCondition(tree.root)" class="q-mt-md" color="primary" icon="mdi-plus">Add Condition</q-btn> -->
+    <!-- <q-btn @click="getConditionString()" class="q-mt-md" color="primary" icon="mdi-plus">Show Condtion</q-btn>
+    <q-btn @click="getConditionJson()" class="q-mt-md" color="primary" icon="mdi-plus">Show Condtion data</q-btn>
+    <q-btn @click="LoadCondition()" class="q-mt-md" color="primary" icon="mdi-plus">Load Condition</q-btn> -->
+    <q-tooltip anchor="center middle" v-model="showingCondition" no-parent-event>
 import { finished } from 'stream';
      {{ conditionString }}
    </q-tooltip>
@@ -257,12 +261,12 @@ export default defineComponent( {
 .condition-value{
  min-width: 200px;
  max-height: 40px;
-  margin: 0 2px;
+  padding: 2px;
 }
 .operator{
  min-width: 150px;
  max-height: 40px;
-  margin: 0 2px;
+  padding: 2px;
  text-align: center;
  font-size: 12pt;
 }
--- a/frontend/src/components/ConditionObjects.vue
+++ b/frontend/src/components/ConditionObjects.vue
@@ -1,62 +1,53 @@
 <template>
-  <div class="q-gutter-y-md" style="max-width: 600px;">
-    <q-card >
-     <q-tabs
-          v-model="tab"
-          dense
-          class="text-grey"
-          active-color="white"
-          active-bg-color="primary"
-          indicator-color="primary"
-          align="justify"
-          narrow-indicator
-        >
-          <q-tab name="fields" label="フィールド"></q-tab>
-          <q-tab name="vars" label="変数"></q-tab>
-        </q-tabs>
-
-        <q-separator></q-separator>
-
-        <q-tab-panels v-model="tab" animated>
-          <q-tab-panel name="fields">
-              <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp :appId " :fields="sourceFields"></field-list>
-            </q-tab-panel>
-
-          <q-tab-panel name="vars" >
-            <variable-list v-model="selected" type="single" :vars="vars"></variable-list>
-          </q-tab-panel>
-        </q-tab-panels>
-      </q-card>
-</div>
+  <div class="q-pa-md">
+    <div v-if="!isLoaded" class="spinner flex flex-center">
+      <q-spinner  color="primary" size="3em" />
+    </div>
+    <q-table v-else  row-key="name"  :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
+  </div>
 </template>
-<script lang="ts">
-import { ref, onMounted, reactive, inject } from 'vue'
-import FieldList from './FieldList.vue';
-import VariableList from './VariableList.vue';
+<script>
+import { ref,onMounted,reactive } from 'vue'
+import { api } from 'boot/axios';

 export default {
  name: 'ConditionObjects',
-  components:{
-    FieldList,
-    VariableList
-  },
  props: {
    name: String,
    type: String,
-    appId: Number,
-    vars: Array,
-    filter:String
+    appId:Number
  },
  setup(props) {
-    const selected = ref([]);
-    console.log(selected);
-    
-    return {
-      sourceFields : inject('sourceFields'),
-      sourceApp : inject('sourceApp'),
-      tab: ref('fields'),
-      selected
-    }
+    const isLoaded=ref(false);
+    const columns = [
+    { name: 'name', required: true,label: 'フィールド名',align: 'left',field: row=>row.name,sortable: true},
+    { name: 'code', label: 'フィールドコード', align: 'left',field: 'code', sortable: true },
+    { name: 'type', label: 'フィールドタイプ', align: 'left',field: 'type', sortable: true }
+    ]
+    const rows = reactive([])
+      onMounted( async () => {
+          const res = await api.get('api/v1/appfields', {
+                params:{
+                  app: props.appId
+                }
+            });
+            let fields = res.data.properties;
+            console.log(fields);
+            Object.keys(fields).forEach((key) =>
+            {
+              const fld=fields[key];
+              // rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
+              rows.push({name:fld.label,objectType:'field',...fld});
+            });
+            isLoaded.value=true;
+        });
+
+      return {
+        columns,
+        rows,
+        selected: ref([]),
+        isLoaded
+      }
  },

 }
--- a/frontend/src/components/DocUpload.vue
+++ b/frontend/src/components/DocUpload.vue
@@ -75,7 +75,7 @@ import { ref } from 'vue';
    const headers = ref([{name:"Authorization",value:'Bearer ' + authStore.token}]);
    const props = withDefaults(defineProps<Props>(), {
      title:"設計書から導入する(csv or excel)",
-      uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel?format=1`
+      uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel`

    });
 </script>
--- a/frontend/src/components/FieldList.vue
+++ b/frontend/src/components/FieldList.vue
@@ -1,58 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <q-table flat bordered :loading="!isLoaded" row-key="name" :selection="type" :selected="modelValue"
-      @update:selected="$emit('update:modelValue', $event)" :filter="filter" :columns="columns" :rows="rows" />
-  </div>
-</template>
-<script lang="ts">
-import { useAsyncState } from '@vueuse/core';
-import { api } from 'boot/axios';
-import { computed } from 'vue';
-
-export default {
-  name: 'FieldList',
-  props: {
-    fields: Array,
-    name: String,
-    type: String,
-    appId: Number,
-    modelValue: Array,
-    filter: String
-  },
-  emits: [
-    'update:modelValue'
-  ],
-  setup(props) {
-    // const rows = ref([]);
-    // const isLoaded = ref(false);
-    const columns = [
-      { name: 'name', required: true, label: 'フィールド名', align: 'left', field: 'name', sortable: true },
-      { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
-      { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
-    ]
-
-    const { state : rows, isReady: isLoaded, isLoading } = useAsyncState((args) => {
-      if (props.fields) {
-        return props.fields.map(f => ({ name: f.label, objectType: 'field', ...f }));
-      } else {
-        return api.get('api/v1/appfields', {
-          params: {
-            app: props.appId
-          }
-        }).then(res => {
-          console.log(res);
-          return Object.values(res.data.properties).map(f => ({ name: f.label, objectType: 'field', ...f }));
-        });
-      }
-    }, [{ name: '', objectType: '', type: '', code: '', label: '' }])
-   
-    return {
-      columns,
-      rows,
-      // selected: ref([]),
-      isLoaded
-    }
-  },
-
-}
-</script>
--- a/frontend/src/components/FieldSelect.vue
+++ b/frontend/src/components/FieldSelect.vue
@@ -1,81 +1,53 @@
 <template>
-  <div class="q-px-md" style=" min-width: 50vw; max-width: 85vw;">
+  <div class="q-pa-md">
    <div v-if="!isLoaded" class="spinner flex flex-center">
-      <q-spinner color="primary" size="3em" />
+      <q-spinner  color="primary" size="3em" />
    </div>
-    <q-table  flat bordered v-else row-key="name" :selection="type" v-model:selected="selected" :columns="columns"
-      :rows="rows" :pagination="pageSetting" :filter="filter" style="max-height: 55vh;"/>
+    <q-table v-else  row-key="name"  :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
  </div>
 </template>
 <script>
-import { ref, onMounted, reactive, watchEffect } from 'vue'
+import { ref,onMounted,reactive } from 'vue'
 import { api } from 'boot/axios';

-
 export default {
  name: 'fieldSelect',
  props: {
    name: String,
-    type: {
-      type: String,
-      default: 'single'
-    },
-    appId: Number,
-    not_page: {
-      type: Boolean,
-      default: false,
-    },
-    selectedFields:{
-      type:Array,
-      default:()=>[]
-    },
-    fieldTypes:{
-      type:Array,
-      default:()=>[]
-    },
-    filter: String,
+    type: String,
+    appId:Number
  },
  setup(props) {
-    const isLoaded = ref(false);
+    const isLoaded=ref(false);
    const columns = [
-      { name: 'name', required: true, label: 'フィールド名', align: 'left', field: row => row.name, sortable: true },
-      { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
-      { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
+    { name: 'name', required: true,label: 'フィールド名',align: 'left',field: row=>row.name,sortable: true},
+    { name: 'code', label: 'フィールドコード', align: 'left',field: 'code', sortable: true },
+    { name: 'type', label: 'フィールドタイプ', align: 'left',field: 'type', sortable: true }
    ]
-    const pageSetting = ref({
-      sortBy: 'desc',
-      descending: false,
-      page: 1,
-      rowsPerPage: props.not_page ? 0 : 5
-      // rowsNumber: xx if getting data from a server
-    });
-    const rows = reactive([]);
-    const selected = ref(props.selectedFields && props.selectedFields.length>0?props.selectedFields:[]);
+    const rows = reactive([])
+      onMounted( async () => {
+          const res = await api.get('api/v1/appfields', {
+                params:{
+                  app: props.appId
+                }
+            });
+            let fields = res.data.properties;
+            console.log(fields);
+            Object.keys(fields).forEach((key) =>
+            {
+              const fld=fields[key];
+              // rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
+              rows.push({name:fld.label,...fld});
+            });
+            isLoaded.value=true;
+        });

-    onMounted(async () => {
-      const url = props.fieldTypes.includes('SPACER')?'api/v1/allfields':'api/v1/appfields';
-      const res = await api.get(url, {
-        params: {
-          app: props.appId
-        }
-      });
-      let fields = res.data.properties;
-      Object.keys(fields).forEach((key) => {
-        const fld = fields[key];
-        if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){
-          rows.push({ name: fld.code, ...fld });
-        }
-      });
-      isLoaded.value = true;
-    });
-
-    return {
-      columns,
-      rows,
-      selected,
-      isLoaded,
-      pageSetting
-    }
+      return {
+        columns,
+        rows,
+        selected: ref([]),
+        isLoaded
+      }
  },

 }
--- a/frontend/src/components/ShowDialog.vue
+++ b/frontend/src/components/ShowDialog.vue
@@ -1,7 +1,7 @@
 <template>
  <!-- <div class="q-pa-md q-gutter-sm" > -->
-    <q-dialog :model-value="visible" persistent bordered >
-      <q-card style="min-width: 40vw; max-width: 80vw; max-height: 95vh;" :style="cardStyle">
+    <q-dialog :model-value="visible" persistent bordered>
+      <q-card :style="{minWidth : width}" >
        <q-toolbar class="bg-grey-4">
          <q-toolbar-title>{{ name }}</q-toolbar-title>
          <q-space></q-space>
@@ -11,10 +11,10 @@
        <q-card-section>
          <!-- <div class="text-h6">{{ name }}</div> -->
        </q-card-section>
-        <q-card-section class="q-pt-none" :style="sectionStyle">
+        <q-card-section class="q-pt-none" :style="{...(height? {minHeight:height}:{}) }">
         <slot></slot>
        </q-card-section>
-        <q-card-actions align="right" class="text-primary q-mt-lg">
+        <q-card-actions align="right" class="text-primary">
          <q-btn flat label="確定" v-close-popup @click="CloseDialogue('OK')" />
          <q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
        </q-card-actions>
@@ -23,16 +23,14 @@
  <!-- </div> -->
 </template>
 <script>
-import {computed} from 'vue'
+
 export default {
  name: 'ShowDialog',
  props: {
    name:String,
    visible: Boolean,
    width:String,
-    height:String,
-    minWidth:String,
-    minHeight:String
+    height:String
  },
  emits: [
    'close'
@@ -43,20 +41,8 @@ export default {
      context.emit('close', val);
    }

-    const cardStyle = computed(() => ({
-      minWidth: props.minWidth,
-      width: props.width
-    }));
-
-    const sectionStyle = computed(() => ({
-      height: props.height,
-      minHeight: props.minHeight
-    }));
-
    return {
-      CloseDialogue,
-      cardStyle,
-      sectionStyle
+      CloseDialogue
    }
  },
 }
--- a/frontend/src/components/VariableList.vue
+++ b/frontend/src/components/VariableList.vue
@@ -1,60 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <q-table flat bordered row-key="id" :selection="type" :selected="modelValue"
-      @update:selected="$emit('update:modelValue', $event)" :columns="columns" :rows="rows" />
-  </div>
-</template>
-<script lang="ts">
-import { PropType, reactive } from 'vue';
-import { IActionVariable } from '../types/ActionTypes';
-import { v4 as uuidv4 } from 'uuid';
-
-export default {
-  name: 'VariableList',
-  props: {
-    name: String,
-    type: String,
-    vars: {
-      type: Array as PropType<IActionVariable[]>,
-      reqired: true,
-      default: () => []
-    },
-    modelValue: Array
-  },
-  emits: [
-    'update:modelValue'
-  ],
-  setup(props) {
-    const variableName = (field) => {
-      const name = field.name;
-      return name.name;
-    }
-    const columns = [
-      { name: 'actionName', label: 'アクション名', align: 'left', field: 'actionName', sortable: true },
-      { name: 'displayName', label: '変数表示名', align: 'left', field: 'displayName', sortable: true },
-      { name: 'name', label: '変数名', align: 'left', field: variableName, required: true, sortable: true }
-    ];
-
-    const rows = props.vars.flatMap((v) => {
-      if (v.name.vars && v.name.vars.length > 0) {
-        return v.name.vars
-          .filter(o => o.vName && o.logicalOperator && o.field)
-          .map(o => ({
-            id: uuidv4(),
-            objectType: 'variable',
-            name: { name: `${v.name.name}.${o.vName}` },
-            actionName: v.name.actionName,
-            displayName: v.name.displayName
-          }));
-      } else {
-        return [{ objectType: 'variable', ...v }];
-      }
-    });
-
-    return {
-      columns,
-      rows: reactive(rows)
-    }
-  }
-}
-</script>
--- a/frontend/src/components/left/AppSelector.vue
+++ b/frontend/src/components/left/AppSelector.vue
@@ -22,15 +22,8 @@
      ></q-btn>
    </div>
  </div>
-  <ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh" >
-    <template v-slot:toolbar>
-        <q-input  dense debounce="300" v-model="filter" placeholder="検索" clearable>
-          <template v-slot:before>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <AppSelect ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelect>
+  <ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" width="600px" >
+      <AppSelect ref="appDg" name="アプリ" type="single"></AppSelect>
  </ShowDialog>
 </template>

@@ -80,8 +73,7 @@ export default defineComponent({
      showSelectApp,
      showAppDialog,
      closeDg,
-      appDg,
-      filter:ref('')
+      appDg
    }
  }
 });
--- a/frontend/src/components/left/EventTree.vue
+++ b/frontend/src/components/left/EventTree.vue
@@ -1,178 +1,86 @@
 <template>
  <!-- <div class="q-pa-md q-gutter-sm"> -->
-  <q-tree :nodes="store.eventTree.screens" node-key="eventId" children-key="events" no-connectors
-    v-model:expanded="store.expandedScreen" :dense="true" :ref="tree">
-    <template v-slot:header-EVENT="prop">
-      <div :ref="prop.node.eventId" class="row col items-center no-wrap event-node" @click="onSelected(prop.node)">
-        <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px"
-          class="q-mr-sm">
-        </q-icon>
-        <div class="no-wrap"
-          :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''">{{
-            prop.node.label }}</div>
-        <q-space></q-space>
-        <!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
-      </div>
-    </template>
-    <template v-slot:header-CHANGE="prop">
-      <div class="row col items-start no-wrap event-node">
-        <div class="no-wrap"
-        :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''"
-        >{{ prop.node.label }}</div>
-        <q-space></q-space>
-        <q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm"
-          @click="addChangeEvent(prop.node)"></q-icon>
-      </div>
-    </template>
-    <template v-slot:header-DELETABLE="prop">
-      <div class="row col items-start event-node" @click="onSelected(prop.node)">
-          <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px" class="q-mr-sm" />
-          <div class="no-wrap" :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''" >{{ prop.node.label }}</div>
-          <q-space></q-space>
-          <q-icon  name="delete_forever"  color="negative" size="16px" @click="deleteEvent(prop.node)"></q-icon>
-      </div>
-    </template>
-  </q-tree>
-  <show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg">
-    <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
-  </show-dialog>
+    <q-tree
+      :nodes="store.eventTree.screens"
+      node-key="label"
+      children-key="events"
+      no-connectors
+      v-model:expanded="store.expandedScreen"
+      :dense="true"
+    >
+      <template v-slot:default-header="prop">
+        <div class="row col items-start no-wrap event-node" @click="onSelected(prop.node)">
+          <q-icon v-if="prop.node.eventId"
+                  name="play_circle"
+                  :color="prop.node.hasFlow?'green':'grey'"
+                  size="16px" class="q-mr-sm">
+                  </q-icon>
+          <div class="no-wrap" :class="selectedEvent && prop.node.eventId===selectedEvent.eventId?'selected-node':''">{{ prop.node.label }}</div>
+        </div>
+      </template>
+    </q-tree>
+  <!-- </div> -->
 </template>

 <script lang="ts">
-import { QTree, useQuasar } from 'quasar';
-import { ActionFlow, RootAction } from 'src/types/ActionTypes';
+import { defineComponent, computed, ref } from 'vue';
+import { IKintoneEvent } from '../../types/KintoneEvents';
+import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import { defineComponent, ref } from 'vue';
-import { IKintoneEvent, IKintoneEventGroup, IKintoneEventNode } from '../../types/KintoneEvents';
-import FieldSelect from '../FieldSelect.vue';
-import ShowDialog from '../ShowDialog.vue';
+import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes';
 export default defineComponent({
  name: 'EventTree',
-  components: {
-    ShowDialog,
-    FieldSelect,
-  },
  setup(props, context) {
-    const $q = useQuasar();
-    const appDg = ref();
    const store = useFlowEditorStore();
-    const showDialog = ref(false);
-    const tree = ref<QTree>();
    // const eventTree=ref(kintoneEvents);
    // const selectedFlow = store.currentFlow;

    // const expanded=ref();
-    const selectedEvent = ref<IKintoneEvent | null>(null);
-    const selectedChangeEvent = ref<IKintoneEventGroup | null>(null);
-    const isFieldChange = (node: IKintoneEventNode) => {
-      return node.header == 'EVENT' && node.eventId.indexOf(".change.") > -1;
-    }
-    //フィールド値変更イベント追加
-    const closeDg = (val: string) => {
-      if (val == 'OK') {
-        if (!selectedChangeEvent.value) { return; }
-        const field = appDg.value.selected[0];
-        const eventid = `${selectedChangeEvent.value.eventId}.${field.code}`;
-        if (store.eventTree.findEventById(eventid)) {
+    const selectedEvent = ref<IKintoneEvent|null>(null);
+    const onSelected=(node:IKintoneEvent)=>{
+        if(!node.eventId){
          return;
        }
-        selectedChangeEvent.value?.events.push({
-          eventId: eventid,
-          label: field.name,
-          parentId: selectedChangeEvent.value.eventId,
-          header: 'DELETABLE'
-        });
-        tree.value?.expanded?.push(selectedChangeEvent.value.eventId);
-        tree.value?.expandAll();
-      }
-    };
-    const addChangeEvent = (node: IKintoneEventGroup) => {
-      if (store.appInfo === undefined) {
-        return;
-      }
-      selectedChangeEvent.value = node;
-      showDialog.value = true;
+        selectedEvent.value=node;
+        if(store.appInfo===undefined){
+          return;
+        }
+        const screen = store.eventTree.findScreen(node.eventId);
+        let flow =store.findFlowByEventId(node.eventId);
+        const screenName=screen!==null?screen.label:"";
+        if(flow!==undefined && flow!==null ){
+          store.selectFlow(flow);
+        }else{
+          const root = new RootAction(node.eventId,screenName,node.label)
+            const flow =new ActionFlow(root);
+            store.flows?.push(flow);
+            store.selectFlow(flow);
+            selectedEvent.value.flowData=flow;
+        }
    }
-
-    const deleteEvent = (node: IKintoneEvent) => {
-      if (!node.eventId) {
-        return;
-      }
-      store.deleteEvent(node);
-      store.selectFlow(undefined)
-
-      $q.notify({
-        type: 'positive',
-        caption: "通知",
-        message: `イベント ${node.label} 削除`
-      })
-    }
-
-    const onSelected = (node: IKintoneEvent) => {
-      if (!node.eventId) {
-        return;
-      }
-      selectedEvent.value = node;
-      if (store.appInfo === undefined) {
-        return;
-      }
-      const screen = store.eventTree.findEventById(node.parentId);
-
-      let flow = store.findFlowByEventId(node.eventId);
-      let screenName = screen !== null ? screen.label : "";
-      let nodeLabel = node.label;
-      // if(isFieldChange(node)){
-      //   screenName=nodeLabel;
-      //   nodeLabel=`${node.label}の値を変更したとき`;
-      // }
-
-      if (flow !== undefined && flow !== null) {
-        store.selectFlow(flow);
-      } else {
-        const root = new RootAction(node.eventId, screenName, nodeLabel)
-        const flow = new ActionFlow(root);
-        store.flows?.push(flow);
-        store.selectFlow(flow);
-        selectedEvent.value.flowData = flow;
-      }
-    };
    return {
      // eventTree,
      // expanded,
-      appDg,
-      tree,
-      showDialog,
-      isFieldChange,
      onSelected,
      selectedEvent,
-      addChangeEvent,
-      deleteEvent,
-      closeDg,
      store
    }
  }
 });
 </script>
 <style lang="scss">
-.nowrap {
-  flex-wrap: nowarp;
-  text-wrap: nowarp;
+.nowrap{
+  flex-wrap:nowarp;
+  text-wrap:nowarp;
 }
-
-.event-node {
-  cursor: pointer;
+.event-node{
+  cursor:pointer;
 }
-
-.selected-node {
+.selected-node{
  color: $primary;
  font-weight: bolder;
 }
-
-.event-node:hover {
+.event-node:hover{
  background-color: $light-blue-1;
 }
-
-.delete-btn {
-  margin-right: 5px;
-}
 </style>
--- a/frontend/src/components/main/NodeItem.vue
+++ b/frontend/src/components/main/NodeItem.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="row justify-center no-wrap" >
+  <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }" >
    <div class="row">
      <q-card class="action-node" :class="nodeStyle" :square="false" @click="onNodeClick" >
        <q-toolbar class="col" >
@@ -8,10 +8,6 @@
          <q-btn flat round dense icon="more_horiz" size="sm" >
            <q-menu  auto-close anchor="top right">
                <q-list>
-                  <q-item clickable v-if="isRoot" @click="copyFlow">
-                    <q-item-section avatar><q-icon name="content_copy" ></q-icon></q-item-section>
-                    <q-item-section >コピーする</q-item-section>
-                  </q-item>
                  <q-item clickable v-if="!isRoot" @click="onEditNode">
                    <q-item-section avatar><q-icon name="edit" ></q-icon></q-item-section>
                    <q-item-section >編集する</q-item-section>
@@ -29,7 +25,7 @@
          </q-btn>
        </q-toolbar>
        <q-separator />
-        <q-card-section class="action-title">
+        <q-card-section>
          <div class="row">
          <span class="text-h7">{{ node.title }}</span>
          <q-space></q-space>
@@ -48,34 +44,23 @@
    </div>
  </div>
  <template v-if="hasBranch">
-    <node-line :action-node="node"  @addNode="addNode" :left-columns="leftColumns" :right-columns="rightColumns"></node-line>
-    <div class="row justify-center no-wrap" >
-      <div v-for="(point, index) in node.outputPoints" :key="index" class="column" style="min-width: 300px;">
-        <div class="justify-center" >
-          <node-item v-if="nextNode(point)!==undefined" :key="nextNode(point).id" :isSelected="nextNode(point) === store.activeNode"
-            :actionNode="nextNode(point)" @addNode="addNodeFromItem" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
-            @deleteNode="onDeleteNodeFromItem" @deleteAllNextNodes="onDeleteAllNextNodes" ></node-item>
-        </div>
+    <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
+      <div v-for="(point, index) in node.outputPoints" :key="index">
+        <node-line :action-node="node" :mode="getMode(point)" @addNode="addNode" :input-point="point"></node-line>
      </div>
    </div>
  </template>
  <template v-if="!hasBranch">
-    <div class="row justify-center no-wrap" >
-      <node-line :action-node="node"  @addNode="addNode" ></node-line>
-    </div>
-    <div>
-    <node-item v-if="nextNode('')!==undefined" :key="nextNode('').id" :isSelected="nextNode('') === store.activeNode"
-            :actionNode="nextNode('')" @addNode="addNodeFromItem" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
-            @deleteNode="onDeleteNodeFromItem" @deleteAllNextNodes="onDeleteAllNextNodes" ></node-item>
+    <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
+      <node-line :action-node="node" :mode="getMode('')" @addNode="addNode" input-point=""></node-line>
    </div>
  </template>
 </template>

 <script lang="ts">
 import { defineComponent, computed, ref } from 'vue';
-import { IActionNode, IActionProperty } from '../../types/ActionTypes';
+import { IActionNode } from '../../types/ActionTypes';
 import NodeLine, { Direction } from '../main/NodeLine.vue';
-import { useFlowEditorStore } from 'stores/flowEditor';
 export default defineComponent({
  name: 'NodeItem',
  components: {
@@ -96,10 +81,8 @@ export default defineComponent({
    "nodeEdit",
    "deleteNode",
    "deleteAllNextNodes",
-    "copyFlow"
  ],
  setup(props, context) {
-    const store = useFlowEditorStore();
    const hasBranch = computed(() => props.actionNode.outputPoints.length > 0);
    const nodeStyle = computed(() => {
      return {
@@ -108,11 +91,23 @@ export default defineComponent({
        'selected': props.isSelected && !props.actionNode.isRoot
      };
    });
-
-    const nextNode=(point:string)=>{
-        const nextId= props.actionNode.nextNodeIds.get(point);
-        if(!nextId) return undefined;
-        return store.currentFlow?.findNodeById(nextId);
+    const getMode = (point: string) => {
+      if (point === '' || props.actionNode.outputPoints.length === 0) {
+        return Direction.Default;
+      }
+      if (point === props.actionNode.outputPoints[0]) {
+        if (props.actionNode.nextNodeIds.get(point)) {
+          return Direction.Left;
+        } else {
+          return Direction.LeftNotNext;
+        }
+      } else {
+        if (props.actionNode.nextNodeIds.get(point)) {
+          return Direction.Right;
+        } else {
+          return Direction.RightNotNext;
+        }
+      }
    }
    /**
     * アクションノード追加イベントを
@@ -121,38 +116,6 @@ export default defineComponent({
    const addNode = (point: string) => {
      context.emit('addNode', props.actionNode, point);
    }
-    /**
-     * アクションノード追加イベントを
-     * @param point 入力ポイント
-     */
-     const addNodeFromItem = (node:IActionNode,point: string) => {
-      context.emit('addNode', node, point);
-    }
-
-    const leftColumns=computed(()=>{
-      if(!props.actionNode.outputPoints || props.actionNode.outputPoints.length<2){
-          return 1;
-      }
-      const leftNode = nextNode(props.actionNode.outputPoints[0]);
-      if(leftNode){
-        return store.currentFlow?.getColumns(leftNode);
-      }else{
-        return 1;
-      }
-    });
-
-    const rightColumns=computed(()=>{
-      if(!props.actionNode.outputPoints || props.actionNode.outputPoints.length<2){
-          return 1;
-      }
-      const rightNode = nextNode(props.actionNode.outputPoints[1]);
-      if(rightNode){
-        return store.currentFlow?.getColumns(rightNode);
-      }else{
-        return 1;
-      }
-    });
-
    /**
     * ノード選択状態
     */
@@ -160,20 +123,9 @@ export default defineComponent({
      context.emit('nodeSelected', props.actionNode);
    }

-
-    const onNodeSelected = (node: IActionNode) => {
-      context.emit('nodeSelected', node);
-    }
-
    const onEditNode=()=>{
      context.emit('nodeEdit', props.actionNode);
    }
-
-    const onNodeEdit=(node:IActionNode)=>{
-      context.emit('nodeEdit', node);
-    }
-
-
    /**
     * ノードを削除する
     */
@@ -181,68 +133,38 @@ export default defineComponent({
      context.emit('deleteNode', props.actionNode);
    }

-      /**
-     * ノードを削除する
-     */
-     const onDeleteNodeFromItem=(node:IActionNode)=>{
-      context.emit('deleteNode', node);
-    }
    /**
     * ノードの以下すべて削除する
     */
     const onDeleteAllNode=()=>{
      context.emit('deleteAllNextNodes', props.actionNode);
    };
-
-    /**
-     * ノードの以下すべて削除する
-     */
-     const onDeleteAllNextNodes=(node:IActionNode)=>{
-      context.emit('deleteAllNextNodes', node);
-    };
    /**
     * 変数名取得
     */
    const varName =(node:IActionNode)=>{
      const prop = node.actionProps.find((prop) => prop.props.name === "verName");
-      return prop?.props.modelValue.name;
+      return prop?.props.modelValue;
    };
-    const copyFlow=()=>{
-      context.emit('copyFlow', props.actionNode);
-    }
    return {
-      store,
      node: props.actionNode,
-      nextNode,
      isRoot: props.actionNode.isRoot,
      hasBranch,
      nodeStyle,
-      // getMode,
+      getMode,
      addNode,
-      addNodeFromItem,
      onNodeClick,
-      onNodeSelected,
      onEditNode,
-      onNodeEdit,
      onDeleteNode,
-      onDeleteNodeFromItem,
      onDeleteAllNode,
-      onDeleteAllNextNodes,
-      copyFlow,
-      varName,
-      leftColumns,
-      rightColumns
+      varName
    }
  }
 });
 </script>
 <style lang="scss">
 .action-node {
-  min-width: 280px !important;
-}
-.action-title{
-  max-width: 280px !important;
-  overflow-wrap: anywhere;
+  min-width: 300px !important;
 }

 .line {
--- a/frontend/src/components/main/NodeLine.vue
+++ b/frontend/src/components/main/NodeLine.vue
@@ -1,28 +1,11 @@
 <template>
-    <div class="row justify-center">
-      <svg class="node-line" style="width:100%" :viewBox="viewBox()">
-        <template v-if="!node.outputPoints || node.outputPoints.length===0" >
-          <polyline :points="points(getMode('')).linePoints" class="line" ></polyline>
-          <text class="add-icon"
-          @click="addNode(node,'')"
-          :x="points(getMode('')).iconPoint.x"
-          :y="points(getMode('')).iconPoint.y"
-          font-family="Arial" font-size="25"
-          text-anchor="middle" dy=".3em" style="cursor: pointer;" >
-            ⊕
-          </text>
-        </template>
-        <template v-for="(point, index) in node.outputPoints" :key="index" >
-          <polyline :points="points(getMode(point)).linePoints" class="line" ></polyline>
-          <text class="add-icon"
-          @click="addNode(node,point)"
-          :x="points(getMode(point)).iconPoint.x"
-          :y="points(getMode(point)).iconPoint.y"
-          font-family="Arial" font-size="25"
-          text-anchor="middle" dy=".3em" style="cursor: pointer;" >
-            ⊕
-          </text>
-        </template>
+    <div>
+      <svg class="node-line">
+        <polyline :points="points.linePoints" class="line" ></polyline>
+        <text class="add-icon" @click="addNode(node)" :x="points.iconPoint.x" :y="points.iconPoint.y" font-family="Arial" font-size="25"
+        text-anchor="middle" dy=".3em" style="cursor: pointer;" >
+          ⊕
+        </text>
      </svg>
    </div>
 </template>
@@ -44,97 +27,55 @@ export default defineComponent({
      type: Object as PropType<IActionNode>,
      required: true
    },
-    leftColumns:{
-      type:Number,
-      required:false
+    mode: {
+      type: String as PropType<Direction>,
+      required: true
    },
-    rightColumns:{
-      type:Number,
-      required:false
+    inputPoint:{
+      type:String
    }
  },
  emits: ['addNode'],
  setup(props,context) {
    const hasBranch = computed(() => props.actionNode.outputPoints.length > 0);
-    const getMode = (point: string):Direction => {
-      if (point === '' || props.actionNode.outputPoints.length === 0) {
-        return Direction.Default;
-      }
-      if (point === props.actionNode.outputPoints[0]) {
-        if (props.actionNode.nextNodeIds.get(point)) {
-          return Direction.Left;
-        } else {
-          return Direction.LeftNotNext;
-        }
-      } else {
-        if (props.actionNode.nextNodeIds.get(point)) {
-          return Direction.Right;
-        } else {
-          return Direction.RightNotNext;
-        }
-      }
-    }
-
-    const points = (mode:Direction) => {
-      let startX ,endX;
-      const leftColumn=props.leftColumns?props.leftColumns:1;
-      const rightColumn=props.rightColumns?props.rightColumns:1;
-
-      switch (mode) {
-         case Direction.Left:
-          startX = leftColumn*300/2.0;
-          endX = ((leftColumn+rightColumn)/2.0 - 0.25)*300;
+    const points = computed(() => {
+      switch (props.mode) {
+        case Direction.Left:
          return {
-            linePoints: `${startX}, 60, ${startX}, 40, ${endX}, 40, ${endX}, 0`,
-            iconPoint: { x: endX, y: 20 }
+            linePoints: '180, 0, 180, 40, 120, 40, 120, 60',
+            iconPoint: { x: 180, y: 20 }
          };
        case Direction.Right:
-          startX = ((leftColumn+rightColumn)/2.0 + 0.25)*300;
-          endX = (leftColumn+(rightColumn/2.0))*300;
          return {
-            linePoints: `${startX}, 0, ${startX}, 40, ${endX}, 40, ${endX}, 60`,
-            iconPoint: { x: startX, y: 20 }
+            linePoints: '60, 0, 60, 40, 120, 40, 120, 60',
+            iconPoint: { x: 60, y: 20 }
          };
        case Direction.LeftNotNext:
-          startX = ((leftColumn+rightColumn)/2.0 - 0.25)*300;
          return {
-            linePoints: `${startX}, 0, ${startX}, 40`,
-            iconPoint: { x: startX, y: 20 }
+            linePoints: '180, 0, 180, 40',
+            iconPoint: { x: 180, y: 20 }
          };
        case Direction.RightNotNext:
-          startX = ((leftColumn+rightColumn)/2.0 + 0.25)*300;
          return {
-            linePoints: `${startX}, 0, ${startX}, 40`,
-            iconPoint: { x: startX, y: 20 }
+            linePoints: '60, 0, 60, 40',
+            iconPoint: { x: 60, y: 30 }
          };
        default:
          return {
-            linePoints: '150, 0, 150, 60',
-            iconPoint: { x: 150, y: 30 }
+            linePoints: '120, 0, 120, 60',
+            iconPoint: { x: 120, y: 30 }
          };
      }
-    };
-
-    const addNode=(prveNode:IActionNode,point:string)=>{
-      context.emit('addNode',point);
+    });
+    const addNode=(prveNode:IActionNode)=>{
+      context.emit('addNode',props.inputPoint);
    }

-    const viewBox=()=>{
-      let columns=0;
-      if(props.leftColumns!==undefined) columns+=props.leftColumns;
-      if(props.rightColumns!==undefined) columns+=props.rightColumns;
-      if(columns===0) columns=1;
-      const width= columns*300;
-      return `0 0 ${width} 60`;
-    };
-
    return {
      node: props.actionNode,
-      getMode,
      hasBranch,
      points,
-      addNode,
-      viewBox
+      addNode
    }
  }
 });
--- a/frontend/src/components/right/ActionProperty.vue
+++ b/frontend/src/components/right/ActionProperty.vue
@@ -1,27 +1,25 @@
 <template>
  <div>
    <div v-for="(item, index) in componentData" :key="index">
-      <component :is="item.component" v-bind="item.props" :connectProps="connectProps" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
    </div>
  </div>
 </template>

 <script lang="ts">
-import { defineComponent,computed } from 'vue';
+import { defineComponent } from 'vue';
 import InputText from '../right/InputText.vue';
 import SelectBox from '../right/SelectBox.vue';
 import DatePicker from '../right/DatePicker.vue';
 import FieldInput from '../right/FieldInput.vue';
-import EventSetter from '../right/EventSetter.vue';
-import { IActionProperty, IProp } from 'src/types/ActionTypes';
+
 export default defineComponent({
  name: 'ActionProperty',
  components: {
    InputText,
    SelectBox,
    DatePicker,
-    FieldInput,
-    EventSetter
+    FieldInput
  },
  props: {
    jsonData: {
@@ -33,43 +31,27 @@ export default defineComponent({
      required: false,
    }
  },
-  setup(props){
-    const componentData=computed<Array<IActionProperty>>(()=>{
-      return props.jsonData.elements.map((element: any) => {
-        if(props.jsonValue != undefined )
+  computed: {
+      componentData() {
+      return this.jsonData.elements.map((element: any) => {
+        if(this.jsonValue != undefined )
        {
-          if(props.jsonValue.hasOwnProperty(element.props.name))
+          if(this.jsonValue.hasOwnProperty(element.props.name))
          {
-            element.props.modelValue = props.jsonValue[element.props.name];
+            element.props.modelValue = this.jsonValue[element.props.name];
          }
          else
          {
            element.props.modelValue = '';
          }
+
        }
        return {
          component: element.component,
          props: element.props,
        };
      });
-    });
-    const connectProps=(props:IProp)=>{
-       const connProps:any={};
-       if(props && "connectProps" in props && props.connectProps!=undefined){
-          for(let connProp of props.connectProps){
-            let targetProp = componentData.value.find((prop)=>prop.props.name===connProp.propName);
-            if(targetProp){
-              connProps[connProp.key]=targetProp;
-            }
-          }
-       }
-       return connProps;
-    }
-
-    return{
-        componentData,
-        connectProps
-    }
-  }
+    },
+  },
 });
 </script>
--- a/frontend/src/components/right/AppFieldSelect.vue
+++ b/frontend/src/components/right/AppFieldSelect.vue
@@ -1,228 +0,0 @@
-<template>
-    <div class="q-my-md" v-bind="$attrs">
-        <q-card flat>
-            <q-card-section class="q-pa-none q-my-sm q-mr-md">
-                <!-- <div class=" q-my-none ">App Field Select</div> -->
-                <div class="row q-mb-xs">
-                    <div class="text-primary q-mb-xs text-caption">{{ $props.displayName }}</div>
-                </div>
-                <div class="row">
-                    <div class="col">
-                        <div class="q-mb-xs">{{ selectedField.app?.name || '未選択' }}</div>
-                    </div>
-                    <div class="col-1">
-                        <q-btn round flat size="sm" color="primary" icon="search" @click="showDg" />
-                    </div>
-                </div>
-            </q-card-section>
-            <q-separator />
-            <q-card-section class="q-pa-none q-ma-none">
-                <div style="">
-                    <div v-if="selectedField.fields && selectedField.fields.length > 0 ">
-                      <q-list bordered>
-                        <q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator v-slot="{ item, index }">
-                            <q-item :key="index" dense clickable >
-                                <q-item-section>
-                                        <q-item-label>
-                                            {{ item.label }}
-                                        </q-item-label>
-                                </q-item-section>
-                                <q-item-section side>
-                                    <q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
-                                </q-item-section>
-                            </q-item>
-                        </q-virtual-scroll>
-                      </q-list>
-                    </div>
-                    <!-- <div v-else class="row q-mt-lg">
-                    </div> -->
-                </div>
-                <!-- <q-separator /> -->
-            </q-card-section>
-            <q-card-section class="q-px-none q-py-xs" v-if="selectedField.fields && selectedField.fields.length===0">
-                <div class="row">
-                    <div class="text-grey text-caption"> {{ $props.placeholder }}</div>
-                    <!-- <q-btn flat color="grey" label="clear" @click="clear" /> -->
-                </div>
-            </q-card-section>
-        </q-card>
-     </div>
-
-    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeFieldDialog" ref="fieldDlg">
-
-        <div class="q-mx-md q-mb-lg">
-            <div class="q-mb-xs q-ml-md text-primary">アプリ選択</div>
-
-            <div class="q-pa-md row" style="border: 1px solid rgba(0, 0, 0, 0.12); border-radius: 4px;">
-                <div v-if="!showSelectApp && selectedField.app">{{ selectedField.app?.name }}</div>
-                <q-space />
-                <div>
-                    <q-btn outline dense label="選 択" padding="none sm" color="primary" @click="() => {
-                        showSelectApp = true;
-                    }"></q-btn>
-                </div>
-            </div>
-        </div>
-
-        <div v-if="!showSelectApp && selectedField.app?.name">
-            <div>
-                <div class="row q-mb-md">
-                    <!-- <div class="col"> -->
-                    <div class="q-mb-xs q-ml-md text-primary">フィールド選択</div>
-                    <!-- </div> -->
-                    <q-space />
-                    <!-- <div class="col"> -->
-                    <div class="q-mr-md">
-                      <q-input dense debounce="300" v-model="fieldFilter" placeholder="フィールド検索" clearable>
-                          <template v-slot:before>
-                              <q-icon name="search" />
-                          </template>
-                      </q-input>
-                    </div>
-                </div>
-                <div class="row">
-                    <field-select ref="fieldDlg" name="フィールド" :type="selectType"
-                        :appId="selectedField.app?.id" not_page :filter="fieldFilter" :selectedFields="selectedField.fields" :fieldTypes="fieldTypes"></field-select>
-                </div>
-            </div>
-        </div>
-        <div style="min-width: 45vw;" v-else>
-        </div>
-
-    </show-dialog>
-
-    <show-dialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeAppDlg">
-        <template v-slot:toolbar>
-            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
-                <template v-slot:before>
-                    <q-icon name="search" />
-                </template>
-            </q-input>
-        </template>
-        <AppSelect ref="appDlg" name="アプリ" type="single" :filter="filter" ></AppSelect>
-    </show-dialog>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref, watchEffect, computed } from 'vue';
-import ShowDialog from '../ShowDialog.vue';
-import FieldSelect from '../FieldSelect.vue';
-import { useFlowEditorStore } from 'stores/flowEditor';
-import AppSelect from '../AppSelect.vue';
-interface IApp{
-  id:string,
-  name:string
-}
-interface IField {
-    name: string,
-    code: string,
-    type: string
-}
-
-interface IAppFields{
-   app?:IApp,
-   fields:IField[]
-}
-
-export default defineComponent({
-    inheritAttrs:false,
-    name: 'AppFieldSelect',
-    components: {
-        ShowDialog,
-        FieldSelect,
-        AppSelect,
-    },
-    props: {
-        displayName: {
-            type: String,
-            default: '',
-        },
-        name: {
-            type: String,
-            default: '',
-        },
-        placeholder: {
-            type: String,
-            default: '',
-        },
-        modelValue: {
-            type: Object,
-            default: null
-        },
-        selectType:{
-            type:String,
-            default:'single'
-        },
-        fieldTypes:{
-            type:Array,
-            default:()=>[]
-        }
-    },
-    setup(props, { emit }) {
-        const appDlg = ref();
-        const fieldDlg = ref();
-        const show = ref(false);
-        const showSelectApp = ref(false);
-       const selectedField = ref<IAppFields>({
-          app:undefined,
-          fields:[]
-       });
-       if(props.modelValue && "app" in props.modelValue && "fields" in props.modelValue){
-         selectedField.value=props.modelValue as IAppFields;
-       }
-        const store = useFlowEditorStore();
-
-        const isSelected = computed(() => {
-            return selectedField.value !== null && typeof selectedField.value === 'object' && ('app' in selectedField.value)
-        });
-
-        const showDg = () => {
-            show.value = true;
-        };
-
-        const clear = () => {
-            selectedField.value ={
-              fields:[]
-            } ;
-        }
-
-        const closeAppDlg = (val: string) => {
-            if (val == 'OK') {
-                selectedField.value.app = appDlg.value.selected[0];
-                selectedField.value.fields=[];
-                showSelectApp.value=false;
-            }
-        };
-
-        const closeFieldDialog=(val:string)=>{
-          if (val == 'OK') {
-                selectedField.value.fields = fieldDlg.value.selected;
-            }
-        };
-
-        const removeField=(index:number)=>{
-          selectedField.value.fields.splice(index,1);
-        }
-        watchEffect(() => {
-            emit('update:modelValue', selectedField.value);
-        });
-
-        return {
-            store,
-            appDlg,
-            fieldDlg,
-            show,
-            showDg,
-            closeAppDlg,
-            closeFieldDialog,
-            selectedField,
-            showSelectApp,
-            isSelected,
-            filter: ref(),
-            clear,
-            fieldFilter: ref(),
-            removeField
-        };
-    }
-});
-</script>
--- a/frontend/src/components/right/ColorPicker.vue
+++ b/frontend/src/components/right/ColorPicker.vue
@@ -1,74 +0,0 @@
-<template>
-    <div class="" v-bind="$attrs">
-        <q-field v-model="color" :label="displayName" labelColor="primary"  :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
-            <template v-slot:control>
-                <q-chip text-color="black" color="white" v-if="isSelected">
-                    <div class="row">
-                        <div class="col-4">
-                            <q-avatar class="shadow-1" :style="{ background: color }" size="xs"></q-avatar>
-                        </div>
-                        <div class="col">
-                            {{ color }}
-                        </div>
-                    </div>
-                </q-chip>
-            </template>
-            <template v-slot:append>
-                <q-icon name="colorize" class="cursor-pointer" color="primary" >
-                    <q-popup-proxy cover transition-show="scale" transition-hide="scale">
-                        <q-color no-header default-view="palette" v-model="color" />
-                    </q-popup-proxy>
-                </q-icon>
-            </template>
-            <template v-slot:hint>
-                {{ placeholder }}
-            </template>
-        </q-field>
-
-
-    </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, ref,watchEffect } from 'vue';
-export default defineComponent({
-    inheritAttrs:false,
-    name: 'ColorPicker',
-    components: {
-    },
-    props: {
-        displayName: {
-            type: String,
-            default: '',
-        },
-        name: {
-            type: String,
-            default: '',
-        },
-        placeholder: {
-            type: String,
-            default: '',
-        },
-        hint: {
-            type: String,
-            default: '',
-        },
-        modelValue: {
-            type: String,
-            default: null
-        },
-    },
-
-    setup(props, { emit }) {
-        const color = ref(props.modelValue??"");
-        const isSelected = computed(()=>props.modelValue && props.modelValue!=="");
-        watchEffect(()=>{
-          emit('update:modelValue', color.value);
-        });
-        return {
-            color,
-            isSelected
-        };
-    }
-});
-</script>
--- a/frontend/src/components/right/ConditionInput.vue
+++ b/frontend/src/components/right/ConditionInput.vue
@@ -1,134 +1,95 @@
 <template>
-  <div v-bind="$attrs">
-    <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label>
-      <template v-slot:control>
-        <q-card flat class="full-width">
-          <q-card-actions vertical>
-            <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted ? '設定済み' : '未設定' }}</q-btn>
-          </q-card-actions>
-          <q-card-section class="text-caption">
-            <div v-if="!isSetted">{{ placeholder }}</div>
-            <div v-else>{{ conditionString }}</div>
-          </q-card-section>
-        </q-card>
-      </template>
-    </q-field>
-    <condition-editor v-model:show="show" v-model:conditionTree="tree" @closed="onClosed"></condition-editor>
-  </div>
+  <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label >
+    <template v-slot:control >
+      <q-card flat class="full-width">
+        <q-card-actions vertical>
+          <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted?'設定済み':'未設定' }}</q-btn>
+        </q-card-actions>
+        <q-card-section class="text-caption" >
+          <div v-if="!isSetted">{{ placeholder }}</div>
+          <div v-else>{{ conditionString }}</div>
+        </q-card-section>
+      </q-card>
+    </template>
+  </q-field>
+  <condition-editor v-model:show="show" v-model:conditionTree="tree" @closed="onClosed"></condition-editor>
 </template>

-
-
-<script lang="ts">
-import { ConditionNode, ConditionTree, Operator } from 'app/src/types/Conditions';
-import { computed, defineComponent, provide, reactive, ref, watchEffect } from 'vue';
-import ConditionEditor from '../ConditionEditor/ConditionEditor.vue';
-
-type Props = {
-  props?: {
-    name: string;
-    modelValue?: {
-      fields: {
-        type: string;
-        label: string;
-        code: string;
-      }[]
-    }
-  }
-};
-
-
-export default defineComponent({
-  name: 'FieldInput',
-  inheritAttrs: false,
-  components: {
-    ConditionEditor
-  },
-  props: {
-    context: {
-      type: Array<Props>,
-      default: '',
+  <script lang="ts">
+  import { defineComponent, ref ,watchEffect,computed,reactive} from 'vue';
+  import { ConditionTree,GroupNode,ConditionNode,LogicalOperator,Operator } from 'app/src/types/Conditions';
+  import ConditionEditor from '../ConditionEditor/ConditionEditor.vue'
+  export default defineComponent({
+    name: 'FieldInput',
+    components: {
+      ConditionEditor
    },
-    displayName: {
-      type: String,
-      default: '',
+    props: {
+      displayName:{
+        type: String,
+        default: '',
+      },
+      name:{
+        type: String,
+        default: '',
+      },
+      placeholder: {
+        type: String,
+        default: '',
+      },
+      hint:{
+        type: String,
+        default: '',
+      },
+      modelValue: {
+        type: String,
+        default: null
+      },
    },
-    name: {
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    hint: {
-      type: String,
-      default: '',
-    },
-    modelValue: {
-      type: String,
-      default: null
-    },
-    sourceType: {
-      type: String,
-      default: 'field'
-    }
-  },

-  setup(props, { emit }) {
-    const source = props.context.find(element => element?.props?.name === 'sources')
-    
-    if (source) {
-      if(props.sourceType === 'field'){
-        provide('sourceFields', computed( () => source.props?.modelValue?.fields ?? []));
-      } else if(props.sourceType === 'app'){
-        console.log('sourceApp', source.props?.modelValue);
-        provide('sourceApp', computed( () => source.props?.modelValue?.app?.id));
+    setup(props, { emit }) {
+      const appDg = ref();
+      const show = ref(false);
+      const tree = reactive(new ConditionTree());
+      if(props.modelValue && props.modelValue!==''){
+        tree.fromJson(props.modelValue);
+      }else{
+        const newNode = new ConditionNode({},Operator.Equal,'',tree.root);
+        tree.addNode(tree.root,newNode);
      }
-    }

-    const appDg = ref();
-    const show = ref(false);
-    const tree = reactive(new ConditionTree());
-    if (props.modelValue && props.modelValue !== '') {
-      tree.fromJson(props.modelValue);
-    } else {
-      const newNode = new ConditionNode({}, Operator.Equal, '', tree.root);
-      tree.addNode(tree.root, newNode);
-    }
+      const isSetted=ref(props.modelValue && props.modelValue!=='');

-    const isSetted = ref(props.modelValue && props.modelValue !== '');
+      const conditionString = computed(()=>{
+          return tree.buildConditionString(tree.root);
+      });

-    const conditionString = computed(() => {
-      return tree.buildConditionString(tree.root);
-    });
+      const showDg = () => {
+        show.value = true;
+      };

-    const showDg = () => {
-      show.value = true;
-    };
+      const onClosed = (val:string) => {
+        if (val == 'OK') {
+          const conditionJson = tree.toJson();
+          isSetted.value=true;
+          emit('update:modelValue', conditionJson);
+        }
+      };

-    const onClosed = (val: string) => {
-      if (val == 'OK') {
+      watchEffect(() => {
        const conditionJson = tree.toJson();
-        isSetted.value = true;
        emit('update:modelValue', conditionJson);
-      }
-    };
+      });

-    watchEffect(() => {
-      const conditionJson = tree.toJson();
-      emit('update:modelValue', conditionJson);
-    });
-
-    return {
-      appDg,
-      isSetted,
-      show,
-      showDg,
-      onClosed,
-      tree,
-      conditionString
-    };
-  }
-});
-</script>
+      return {
+        appDg,
+        isSetted,
+        show,
+        showDg,
+        onClosed,
+        tree,
+        conditionString
+      };
+    }
+  });
+  </script>
--- a/frontend/src/components/right/DataProcessing.vue
+++ b/frontend/src/components/right/DataProcessing.vue
@@ -1,229 +0,0 @@
-<template>
-  <div>
-    <q-field :label="displayName" labelColor="primary" stack-label>
-      <template v-slot:control>
-        <q-card flat class="full-width">
-          <q-card-actions vertical>
-            <q-btn color="grey-3" text-color="black" @click="() => { dgIsShow = true }">クリックで設定</q-btn>
-          </q-card-actions>
-          <q-card-section class="text-caption">
-            <div v-if="processingObjectsInputDisplay && processingObjectsInputDisplay.length>0">
-              <div v-for="(item) in processingObjectsInputDisplay" :key="item">{{ item }}</div>
-            </div>
-            <div v-else>{{ placeholder }}</div>
-          </q-card-section>
-        </q-card>
-      </template>
-    </q-field>
-    <show-dialog v-model:visible="dgIsShow" name="集計処理" @close="closeDg" min-width="50vw" min-height="60vh">
-      <div class="q-mx-md q-mb-md">
-        <q-input v-model="processingProps.name" type="text" label-color="primary" label="集計結果の変数名"
-          placeholder="集計結果を格納する変数名を入力してください" stack-label />
-      </div>
-
-      <div class="q-mx-md">
-        <div class="row q-col-gutter-x-xs flex-center">
-          <div class="col-5">
-            <div class="q-mx-xs">データソース</div>
-          </div>
-          <div class="col-2">
-            <div class="q-mx-xs">集計計算</div>
-          </div>
-          <div class="col-4">
-            <div class="q-mx-xs">集計結果変数名</div>
-          </div>
-          <div class="col-1"><q-btn flat round dense icon="add" size="sm" @click="addProcessingObject" />
-          </div>
-        </div>
-        <div class="q-my-sm" v-for="(item, index) in processingObjects" :key="item.id">
-          <div class="row q-col-gutter-x-xs flex-center">
-            <div class="col-5">
-              <ConditionObject v-model="item.field" />
-            </div>
-            <div class="col-2">
-              <q-select v-model="item.logicalOperator" :options="logicalOperators"  outlined dense></q-select>
-            </div>
-            <div class="col-4">
-              <q-input v-model="item.vName" type="text"  outlined dense />
-            </div>
-            <div class="col-1">
-              <q-btn flat round dense icon="delete" size="sm" @click="() => deleteProcessingObject(index)" />
-
-            </div>
-          </div>
-        </div>
-      </div>
-    </show-dialog>
-  </div>
-</template>
-
-<script lang="ts">
-import { v4 as uuidv4 } from 'uuid';
-import { computed, defineComponent, provide, reactive, ref, watchEffect } from 'vue';
-import ConditionObject from '../ConditionEditor/ConditionObject.vue';
-import ShowDialog from '../ShowDialog.vue';
-
-type Props = {
-  props?: {
-    name: string;
-    modelValue?: {
-      fields: {
-        type: string;
-        label: string;
-        code: string;
-      }[]
-    } | string
-  }
-};
-
-type ProcessingObjectType = {
-  field?: {
-    name: string | {
-      name: string;
-    };
-    objectType: string;
-    type: string;
-    code: string;
-    label: string;
-    noLabel: boolean;
-  };
-  logicalOperator?: string;
-  vName?: string;
-  id: string;
-}
-
-type ValueType = {
-  name: string;
-  actionName: string,
-  displayName: string,
-  vars: ProcessingObjectType[];
-}
-
-export default defineComponent({
-  name: 'DataProcessing',
-  inheritAttrs: false,
-  components: {
-    ShowDialog,
-    ConditionObject,
-  },
-  props: {
-    context: {
-      type: Array<Props>,
-      default: '',
-    },
-    displayName: {
-      type: String,
-      default: '',
-    },
-    name: {
-      type: String,
-      default: '',
-    },
-    modelValue: {
-      type: Object as () => ValueType,
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-  },
-
-  setup(props, { emit }) {
-    const source = props.context.find(element => element?.props?.name === 'sources')
-
-    if (source) {
-      provide('sourceFields', computed(() => {
-        const modelValue = source.props?.modelValue;
-        if (modelValue && typeof modelValue !== 'string') {
-          return modelValue.fields;
-        }
-        return null;
-      }));
-    }
-
-    const actionName = props.context.find(element => element?.props?.name === 'displayName')
-
-    const processingProps: ValueType = props.modelValue && props.modelValue.vars
-      ? props.modelValue
-      : reactive({
-        name: '',
-        actionName: actionName?.props?.modelValue as string,
-        displayName: '結果（戻り値）',
-        vars: [{ id: uuidv4() }]
-      });
-
-    const closeDg = () => {
-      emit('update:modelValue', processingProps
-      );
-    }
-
-    const processingObjects = processingProps.vars;
-
-    const deleteProcessingObject = (index: number) => processingObjects.length === 1
-      ? processingObjects.splice(0, processingObjects.length, { id: uuidv4() })
-      : processingObjects.splice(index, 1);
-
-    const processingObjectsInputDisplay = computed(() =>
-      processingObjects ?
-        processingObjects
-          .filter(item => item.field && item.logicalOperator && item.vName)
-          .map(item => {
-            const name = typeof item.field?.name === 'string'
-              ? item.field.name
-              : item.field?.name.name;
-            return item.logicalOperator.operator!==''?
-                     `${processingProps.name}.${item.vName} = ${item.logicalOperator.operator}(${name})`
-                    :`${processingProps.name}.${item.vName} = ${name}`
-          })
-        : []
-    );
-    //集計処理方法
-    const logicalOperators = ref([
-      {
-        "operator": "",
-        "label": "なし"
-      },
-      {
-        "operator": "SUM",
-        "label": "合計"
-      },
-      {
-        "operator": "AVG",
-        "label": "平均"
-      },
-      {
-        "operator": "MAX",
-        "label": "最大値"
-      },
-      {
-        "operator": "MIN",
-        "label": "最小値"
-      },
-      {
-        "operator": "COUNT",
-        "label": "カウント"
-      },
-      {
-        "operator": "FIRST",
-        "label": "最初の値"
-      }
-    ]);
-
-    watchEffect(() => {
-      emit('update:modelValue', processingProps);
-    });
-    return {
-      uuidv4,
-      dgIsShow: ref(false),
-      closeDg,
-      processingObjects,
-      processingProps,
-      addProcessingObject: () => processingObjects.push({ id: uuidv4() }),
-      deleteProcessingObject,
-      logicalOperators,
-      processingObjectsInputDisplay,
-    };
-  },
-});
-</script>
-<style lang="scss"></style>
--- a/frontend/src/components/right/DatePicker.vue
+++ b/frontend/src/components/right/DatePicker.vue
@@ -1,19 +1,18 @@
 <template>
-  <div v-bind="$attrs">
-    <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="['date']" stack-label>
-      <template v-slot:append>
-        <q-icon name="event" class="cursor-pointer">
-          <q-popup-proxy cover transition-show="scale" transition-hide="scale">
-            <q-date v-model="selectedDate">
-              <div class="row items-center justify-end">
-                <q-btn v-close-popup label="Close" color="primary" flat />
-              </div>
-            </q-date>
-          </q-popup-proxy>
-        </q-icon>
-      </template>
-    </q-input>
-  </div>
+
+  <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="['date']" stack-label>
+    <template v-slot:append>
+      <q-icon name="event" class="cursor-pointer">
+        <q-popup-proxy cover transition-show="scale" transition-hide="scale">
+          <q-date v-model="selectedDate">
+            <div class="row items-center justify-end">
+              <q-btn v-close-popup label="Close" color="primary" flat />
+            </div>
+          </q-date>
+        </q-popup-proxy>
+      </q-icon>
+    </template>
+  </q-input>
 </template>

 <script lang="ts">
@@ -21,7 +20,6 @@ import { defineComponent, ref ,watchEffect} from 'vue';

 export default defineComponent({
  name: 'DatePicker',
-  inheritAttrs:false,
  props: {
    displayName:{
      type: String,
--- a/frontend/src/components/right/EventSetter.vue
+++ b/frontend/src/components/right/EventSetter.vue
@@ -1,83 +0,0 @@
-<template>
-  <div v-bind="$attrs">
-    <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
-      <template v-slot:append>
-        <q-btn round dense flat icon="add" @click="addButtonEvent()" />
-      </template>
-    </q-input>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent,ref,watchEffect } from 'vue';
-import { useFlowEditorStore } from '../../stores/flowEditor';
-import { IKintoneEventGroup,kintoneEvent } from 'src/types/KintoneEvents';
-
-export default defineComponent({
-  name: 'EventSetter',
-  inheritAttrs:false,
-  props: {
-    displayName:{
-      type: String,
-      default: '',
-    },
-    name:{
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    hint:{
-      type: String,
-      default: '',
-    },
-    modelValue: {
-      type: String,
-      default: '',
-    },
-    connectProps:{
-      type:Object,
-      default:undefined
-    }
-  },
-
-  setup(props , { emit }) {
-    const inputValue = ref(props.modelValue);
-    const store = useFlowEditorStore();
-    const addButtonEvent=()=>{
-      const eventId =store.currentFlow?.getRoot()?.name;
-      if(eventId===undefined){return;}
-      let displayName = inputValue.value;
-      if(props.connectProps!==undefined && "displayName" in props.connectProps){
-        displayName =props.connectProps["displayName"].props.modelValue;
-      }
-      const customButtonId=`${eventId}.customButtonClick`;
-      const findedEvent = store.eventTree.findEventById(customButtonId);
-      if(findedEvent && "events" in findedEvent){
-        const customEvents = findedEvent as IKintoneEventGroup;
-        const addEventId = customButtonId+"." + inputValue.value;
-        if(store.eventTree.findEventById(addEventId)){
-          return;
-        }
-        customEvents.events.push({
-          eventId: addEventId,
-          label: displayName,
-          parentId: customButtonId,
-          header: 'DELETABLE'
-        });
-      }
-    }
-
-    watchEffect(() => {
-      emit('update:modelValue', inputValue.value);
-    });
-
-    return {
-      inputValue,
-      addButtonEvent
-    };
-  },
-});
-</script>
--- a/frontend/src/components/right/FieldInput.vue
+++ b/frontend/src/components/right/FieldInput.vue
@@ -1,49 +1,49 @@
 <template>
-  <div v-bind="$attrs">
-    <q-field v-model="selectedField" :label="displayName" labelColor="primary" :clearable="isSelected" stack-label
-      :bottom-slots="!isSelected">
-      <template v-slot:control>
-        <q-chip color="primary" text-color="white" v-if="isSelected">
-          {{ selectedField.name }}
-        </q-chip>
-      </template>
-      <template v-slot:hint v-if="!isSelected">
-        {{ placeholder }}
-      </template>
+<q-field v-model="selectedField" :label="displayName" labelColor="primary"
+        :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
+  <template v-slot:control >
+    <q-chip  color="primary" text-color="white"  v-if="isSelected">
+      {{ selectedField.name }}
+    </q-chip>
+  </template>
+  <!-- <template v-slot:hint v-if="isSelected">
+    <div> 項目コード：<q-chip  size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
+  </template> -->
+  <template v-slot:hint v-if="!isSelected">
+    {{ placeholder }}
+  </template>

-      <template v-slot:append>
-        <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg" />
-      </template>
-    </q-field>
-    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
-      <field-select ref="appDg" name="フィールド" :type="selectType" :appId="store.appInfo?.appId" :fieldTypes="fieldTypes"></field-select>
-    </show-dialog>
-  </div>
+  <template v-slot:append>
+  <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
+  </template>
+</q-field>
+<show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
+  <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
+</show-dialog>
 </template>

 <script lang="ts">
-import { defineComponent, ref, watchEffect, computed } from 'vue';
+import { defineComponent, ref ,watchEffect,computed} from 'vue';
 import ShowDialog from '../ShowDialog.vue';
 import FieldSelect from '../FieldSelect.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
-interface IField {
-  name: string,
-  code: string,
-  type: string
+interface IField{
+  name:string,
+  code:string,
+  type:string
 }
 export default defineComponent({
  name: 'FieldInput',
-  inheritAttrs:false,
  components: {
    ShowDialog,
    FieldSelect,
  },
  props: {
-    displayName: {
+    displayName:{
      type: String,
      default: '',
    },
-    name: {
+    name:{
      type: String,
      default: '',
    },
@@ -51,15 +51,7 @@ export default defineComponent({
      type: String,
      default: '',
    },
-    selectType:{
-        type:String,
-        default:'single'
-    },
-    fieldTypes:{
-      type:Array,
-      default:()=>[]
-    },
-    hint: {
+    hint:{
      type: String,
      default: '',
    },
@@ -74,15 +66,15 @@ export default defineComponent({
    const show = ref(false);
    const selectedField = ref(props.modelValue);
    const store = useFlowEditorStore();
-    const isSelected = computed(() => {
-      return selectedField.value !== null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
+    const isSelected = computed(()=>{
+      return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
    });

    const showDg = () => {
      show.value = true;
    };

-    const closeDg = (val: string) => {
+    const closeDg = (val:string) => {
      if (val == 'OK') {
        selectedField.value = appDg.value.selected[0];
      }
--- a/frontend/src/components/right/InputText.vue
+++ b/frontend/src/components/right/InputText.vue
@@ -1,31 +1,18 @@
 <template>
-  <div v-bind="$attrs">
-    <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label
-      :rules="rulesExp" :maxlength="maxLength">
-      <template v-slot:append v-if="hint !== ''">
-        <q-icon name="help" size="22px" color="blue-8">
-          <q-tooltip class="bg-yellow-2 text-black shadow-4" anchor="bottom right">
-            <div class="hint-text" v-html="hint" />
-          </q-tooltip>
-        </q-icon>
-      </template>
-    </q-input>
-  </div>
+  <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label/>
 </template>

 <script lang="ts">
-import { kMaxLength } from 'buffer';
-import { defineComponent, ref, watchEffect, computed } from 'vue';
+import { defineComponent,ref,watchEffect } from 'vue';

 export default defineComponent({
  name: 'InputText',
-  inheritAttrs: false,
  props: {
-    displayName: {
+    displayName:{
      type: String,
      default: '',
    },
-    name: {
+    name:{
      type: String,
      default: '',
    },
@@ -33,71 +20,26 @@ export default defineComponent({
      type: String,
      default: '',
    },
-    fieldTypes:{
-      type:Array,
-      default:()=>[]
-    },
-    hint: {
+    hint:{
      type: String,
      default: '',
    },
-    maxLength: {
-      type: Number,
-      default: undefined
-    },
-    //例：[val=>!!val ||'入力してください']
-    rules: {
-      type: String,
-      default: undefined
-    },
    modelValue: {
-      // type: Any,
+      type: String,
      default: '',
    },
  },

-  setup(props, { emit }) {
-    const inputValue = computed({
-      get: () => {
-        if (props.modelValue !== null && typeof props.modelValue === 'object' && 'name' in props.modelValue) {
-          return props.modelValue.name;
-        } else {
-          return props.modelValue;
-        }
-      },
-      set: (val) => {
-        if (props.name === 'verName') {
-          // return props.modelValue.name;
-          emit('update:modelValue', { name: val });
-        } else {
-          emit('update:modelValue', val);
-        }
-      },
-    });
-    // const inputValue = ref(props.modelValue);
-    const rulesExp = props.rules === undefined ? null : eval(props.rules);
+  setup(props , { emit }) {
+    const inputValue = ref(props.modelValue);

-    // const finalValue = computed(() => {
-    // return props.name !== 'verName' ? inputValue.value : {
-    // name: inputValue.value,
-    // };
-    // });
-    // watchEffect(() => {
-    //   emit('update:modelValue', finalValue);
-    // });
+    watchEffect(() => {
+      emit('update:modelValue', inputValue.value);
+    });

    return {
      inputValue,
-      showhint: ref(false),
-      rulesExp
    };
  },
 });
 </script>
-<style lang="scss">
-.hint-text {
-  white-space: always;
-  max-width: 450px;
-  font-size: 1.2em;
-}
-</style>
--- a/frontend/src/components/right/MuiltInputText.vue
+++ b/frontend/src/components/right/MuiltInputText.vue
@@ -1,22 +1,18 @@
 <template>
-  <div v-bind="$attrs">
-    <q-input :label="displayName" label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow
-      stack-label />
-  </div>
+  <q-input :label="displayName"   label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow stack-label/>
 </template>

 <script lang="ts">
-import { defineComponent, ref, watchEffect } from 'vue';
+import { defineComponent,ref,watchEffect } from 'vue';

 export default defineComponent({
  name: 'MuiltInputText',
-  inheritAttrs: false,
  props: {
-    displayName: {
+    displayName:{
      type: String,
      default: '',
    },
-    name: {
+    name:{
      type: String,
      default: '',
    },
@@ -24,7 +20,7 @@ export default defineComponent({
      type: String,
      default: '',
    },
-    hint: {
+    hint:{
      type: String,
      default: '',
    },
--- a/frontend/src/components/right/MultiFieldInput.vue
+++ b/frontend/src/components/right/MultiFieldInput.vue
--- a/frontend/src/components/right/NumInput.vue
+++ b/frontend/src/components/right/NumInput.vue
@@ -1,87 +0,0 @@
-<template>
-  <div class="" v-bind="$attrs">
-    <q-input v-model.number="numValue" type="number" :label="displayName" label-color="primary" stack-label bottom-slots
-     :min="min"
-     :max="max"
-     :rules="rulesExp"
-     >
-      <template v-slot:hint>
-        {{ placeholder }}
-      </template>
-    </q-input>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, ref, watchEffect } from 'vue';
-export default defineComponent({
-  name: 'NumInput',
-  inheritAttrs:false,
-  components: {
-  },
-  props: {
-    displayName: {
-      type: String,
-      default: '',
-    },
-    name: {
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    hint: {
-      type: String,
-      default: '',
-    },
-    min:{
-      type:Number,
-      default:undefined
-    },
-    max:{
-      type:Number,
-      default:undefined
-    },
-    //[val=>!!val ||'数値を入力してください',val=>val<=100 && val>=1 || '1-100の範囲内の数値を入力してください']
-    rules:{
-      type:String,
-      default:undefined
-    },
-    modelValue: {
-      type: [Number , String],
-      default: undefined
-    },
-  },
-
-  setup(props, { emit }) {
-    const numValue = ref(props.modelValue);
-    const rulesExp = props.rules===undefined?null : eval(props.rules);
-    const isError = computed(()=>{
-      const val = numValue.value;
-      if (val === undefined) {
-        return false;
-      }
-      const numVal = typeof val === "string" ? parseInt(val) : val;
-      // Ensure parsed value is a valid number
-      if (isNaN(numVal)) {
-        return true;
-      }
-      // Check against min and max boundaries, if defined
-      if ((props.min !== undefined && numVal < props.min) || (props.max !== undefined && numVal > props.max)) {
-        return true;
-      }
-      return false;
-    });
-
-    watchEffect(()=>{
-      emit("update:modelValue",numValue.value);
-    });
-    return {
-      numValue,
-      rulesExp
-    };
-  }
-});
-</script>
--- a/frontend/src/components/right/PropertyList.vue
+++ b/frontend/src/components/right/PropertyList.vue
@@ -1,7 +1,7 @@
 <template>
  <div>
    <div v-for="(item, index) in properties" :key="index" >
-      <component :is="item.component" v-bind="item.props" :context="properties"  :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
    </div>
  </div>
 </template>
@@ -15,14 +15,9 @@ import InputText from '../right/InputText.vue';
 import SelectBox from '../right/SelectBox.vue';
 import DatePicker from '../right/DatePicker.vue';
 import FieldInput from '../right/FieldInput.vue';
-import AppFieldSelect from './AppFieldSelect.vue';
 import MuiltInputText from '../right/MuiltInputText.vue';
 import ConditionInput from '../right/ConditionInput.vue';
-import EventSetter from '../right/EventSetter.vue';
-import ColorPicker from './ColorPicker.vue';
-import NumInput from './NumInput.vue';
-import DataProcessing from './DataProcessing.vue';
-import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes';
+import { IActionNode,IActionProperty } from 'src/types/ActionTypes';

 export default defineComponent({
  name: 'PropertyList',
@@ -31,13 +26,8 @@ export default defineComponent({
    SelectBox,
    DatePicker,
    FieldInput,
-    AppFieldSelect,
    MuiltInputText,
-    ConditionInput,
-    EventSetter,
-    ColorPicker,
-    NumInput,
-    DataProcessing
+    ConditionInput
  },
  props: {
    nodeProps: {
@@ -50,22 +40,9 @@ export default defineComponent({
    }
  },
  setup(props, context) {
-    const properties=ref(props.nodeProps);
-    const connectProps=(props:IProp)=>{
-       const connProps:any={context:properties};
-       if(props && "connectProps" in props && props.connectProps!=undefined){
-          for(let connProp of props.connectProps){
-            let targetProp = properties.value.find((prop)=>prop.props.name===connProp.propName);
-            if(targetProp){
-              connProps[connProp.key]=targetProp;
-            }
-          }
-       }
-       return connProps;
-    }
+    const properties=ref(props.nodeProps)
    return {
-      properties,
-      connectProps
+      properties
    }
  }
 });
--- a/frontend/src/components/right/PropertyPanel.vue
+++ b/frontend/src/components/right/PropertyPanel.vue
@@ -11,9 +11,9 @@
         elevated
         overlay
       >
-        <q-card class="column" style="max-width: 300px;min-height: 100%">
+        <q-card class="column full-height" style="width: 300px">
         <q-card-section>
-           <div class="text-h6">{{ actionNode?.subTitle }}：設定</div>
+           <div class="text-h6">{{ actionNode.subTitle }}：設定</div>
         </q-card-section>
         <q-card-section class="col q-pt-none">
           <property-list :node-props="actionProps" v-if="showPanel" ></property-list>
@@ -51,10 +51,10 @@ import { IActionNode } from 'src/types/ActionTypes';
  ],
  setup(props,{emit}) {
    const showPanel =ref(props.drawerRight);
-    const actionProps =ref(props.actionNode?.actionProps);
+    const actionProps =ref(props.actionNode.actionProps);
    watchEffect(() => {
      showPanel.value = props.drawerRight;
-      actionProps.value= props.actionNode?.actionProps;
+      actionProps.value= props.actionNode.actionProps;
    });

    const cancel = async() =>{
--- a/frontend/src/components/right/SelectBox.vue
+++ b/frontend/src/components/right/SelectBox.vue
@@ -1,16 +1,12 @@
 <template>
-  <div v-bind="$attrs">
-  <q-select v-model="selectedValue" :use-chips="multiple" :label="displayName" label-color="primary" :options="options" stack-label
-  :multiple="multiple"/>
-</div>
+  <q-select v-model="selectedValue" :label="displayName" :options="options"/>
 </template>

 <script lang="ts">
-import { defineComponent,ref,watchEffect,computed } from 'vue';
+import { defineComponent,ref,watchEffect } from 'vue';

 export default defineComponent({
  name: 'SelectBox',
-  inheritAttrs:false,
  props: {
    displayName:{
      type: String,
@@ -24,27 +20,20 @@ export default defineComponent({
      type: Array,
      required: true,
    },
-    selectType:{
-      type:String,
-      default:'',
-    },
    modelValue: {
-      type: [Array,String],
-      default: null,
+      type: String,
+      default: '',
    },
  },
  setup(props, { emit }) {
    const selectedValue = ref(props.modelValue);
-    const multiple = computed(()=>{
-      return props.selectType==='multiple'
-    });
+
    watchEffect(() => {
      emit('update:modelValue', selectedValue.value);
    });

    return {
-      selectedValue,
-      multiple
+      selectedValue
    };
  },
 });
--- a/frontend/src/control/flowctrl.ts
+++ b/frontend/src/control/flowctrl.ts
@@ -1,49 +1,44 @@
 import { api } from 'boot/axios';
 import { ActionFlow } from 'src/types/ActionTypes';

-export class FlowCtrl {
-  async getFlows(appId: string): Promise<ActionFlow[]> {
-    const flows: ActionFlow[] = [];
-    try {
-      const result = await api.get(`api/flows/${appId}`);
-      //console.info(result.data);
-      if (!result.data || !Array.isArray(result.data)) {
-        return [];
-      }
+export class FlowCtrl
+{

-      for (const flow of result.data) {
-        flows.push(ActionFlow.fromJSON(flow.content));
+  async getFlows(appId:string):Promise<ActionFlow[]>
+  {
+      const flows:ActionFlow[]=[];
+      try{
+        const result = await api.get(`api/flows/${appId}`);
+        //console.info(result.data);
+         if(!result.data || !Array.isArray(result.data)){
+           return [];
+         }
+
+         for(const flow of result.data){
+             flows.push(ActionFlow.fromJSON(flow.content));
+         }
+        return flows;
+      }catch(error){
+        console.error(error);
+        return flows;
      }
-      return flows;
-    } catch (error) {
-      console.error(error);
-      return flows;
-    }
  }

-  async SaveFlow(jsonData: any): Promise<boolean> {
-    const result = await api.post('api/flow', jsonData);
-    console.info(result.data);
-    return true;
+  async SaveFlow(jsonData:any):Promise<boolean>
+  {
+       const result = await api.post('api/flow',jsonData);
+       console.info(result.data)
+       return true;
  }
  /**
   * フローを更新する
   * @param jsonData
   * @returns
   */
-  async UpdateFlow(jsonData: any): Promise<boolean> {
-    const result = await api.put('api/flow/' + jsonData.flowid, jsonData);
-    console.info(result.data);
-    return true;
-  }
-  /**
-   * フローを消去する
-   * @param flowId
-   * @returns
-   */
-  async DeleteFlow(flowId: string): Promise<boolean> {
-    const result = await api.delete('api/flow/' + flowId);
-    console.info(result.data);
+  async  UpdateFlow(jsonData:any):Promise<boolean>
+  {
+    const result = await api.put('api/flow/' + jsonData.flowid,jsonData);
+    console.info(result.data)
    return true;
  }
  /**
@@ -51,9 +46,12 @@ export class FlowCtrl {
   * @param appid
   * @returns
   */
-  async depoly(appid: string): Promise<boolean> {
+  async depoly(appid:string):Promise<boolean>
+  {
    const result = await api.post(`api/v1/createjstokintone?app=${appid}`);
    console.info(result.data);
    return true;
  }
+
 }
+
--- a/frontend/src/css/app.scss
+++ b/frontend/src/css/app.scss
@@ -1,25 +1 @@
 // app global css in SCSS form
-::-webkit-scrollbar {
-  height: 12px;
-  width: 14px;
-  background: transparent;
-  z-index: 12;
-  overflow: visible;
-}
-
-::-webkit-scrollbar-thumb {
-  width: 10px;
-  background-color: #c1c1c1;
-  border-radius: 10px;
-  z-index: 12;
-  border: 4px solid rgba(0, 0, 0, 0);
-  background-clip: padding-box;
-  transition: background-color .32s ease-in-out;
-  margin: 4px;
-  min-height: 32px;
-  min-width: 32px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: #c1c1c1;
-}
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -20,7 +20,7 @@
    </q-header>

    <q-drawer
-      :model-value="authStore.toggleLeftDrawer"
+      v-model="leftDrawerOpen"
      :show-if-above="false"
      bordered
    >
@@ -151,10 +151,11 @@ const essentialLinks: EssentialLinkProps[] = [
  }
 ];

+const leftDrawerOpen = ref(false)
 const version = process.env.version;
 const productName = process.env.productName;

 function toggleLeftDrawer() {
-  authStore.toggleLeftMenu();
+  leftDrawerOpen.value = !leftDrawerOpen.value
 }
 </script>
--- a/frontend/src/pages/FlowChart.vue
+++ b/frontend/src/pages/FlowChart.vue
@@ -1,274 +1,246 @@
 <template>
  <q-page>
-    <q-layout container class="absolute-full shadow-2 rounded-borders">
+    <q-layout
+      container
+      class="absolute-full shadow-2 rounded-borders"
+    >
      <div class="q-pa-sm q-gutter-sm  ">
-        <q-drawer side="left" :overlay="true" bordered v-model="drawerLeft" :show-if-above="false" elevated>
-          <div class="flex-center fixed-top app-selector">
-            <AppSelector />
-          </div>
+        <q-drawer
+        side="left"
+        :overlay="true"
+        bordered
+        v-model="drawerLeft"
+        :show-if-above="false"
+        elevated
+        >
+            <div class="flex-center fixed-top app-selector" >
+                <AppSelector  />
+            </div>

-          <div class="flex-center absolute-full" style="padding-top:65px;padding-left:15px;padding-right:15px;">
-            <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
-              <EventTree />
-            </q-scroll-area>
-          </div>
+            <div class="flex-center absolute-full" style="padding-top:65px;padding-left:15px;padding-right:15px;">
+              <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
+                <EventTree />
+              </q-scroll-area>
+            </div>

-          <div class="flex-center fixed-bottom bg-grey-3 q-pa-md row ">
-            <q-btn color="secondary" glossy label="デプロイ" @click="onDeploy" icon="sync" :loading="deployLoading" />
-            <q-space></q-space>
-            <q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading" />
-          </div>
+            <div class="flex-center fixed-bottom bg-grey-3 q-pa-md row ">
+              <q-btn color="secondary" glossy label="デプロイ"  @click="onDeploy" icon="sync" :loading="deployLoading" />
+              <q-space></q-space>
+              <q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading"/>
+            </div>
        </q-drawer>
      </div>
-      <q-btn flat dense round
-              :icon="drawerLeft?'keyboard_double_arrow_left':'keyboard_double_arrow_right'"
-              :style="[drawerLeft?{'left':'300px'}:{'left':'0px'}]"
-              @click="drawerLeft=!drawerLeft" class="expand" />
-      <div class="q-pa-md q-gutter-sm" :style="{minWidth: minPanelWidth}">
-        <div class="flowchart" v-if="store.currentFlow" :style="[drawerLeft?{paddingLeft:'300px'}:{}]">
-          <node-item v-if="rootNode!==undefined" :key="rootNode.id" :isSelected="rootNode === store.activeNode"
-            :actionNode="rootNode" @addNode="addNode" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
-            @deleteNode="onDeleteNode" @deleteAllNextNodes="onDeleteAllNextNodes" @copyFlow="onCopyFlow"></node-item>
+      <div class="q-pa-md q-gutter-sm">
+        <div class="flowchart" v-if="store.currentFlow">
+          <node-item v-for="(node,) in store.currentFlow.actionNodes" :key="node.id"
+          :isSelected="node===state.activeNode" :actionNode="node"
+          @addNode="addNode"
+          @nodeSelected="onNodeSelected"
+          @nodeEdit="onNodeEdit"
+          @deleteNode="onDeleteNode"
+          @deleteAllNextNodes="onDeleteAllNextNodes"
+          ></node-item>
        </div>
      </div>
-      <PropertyPanel :actionNode="store.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
+      <PropertyPanel :actionNode="state.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
    </q-layout>
-    <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" min-width="500px" min-height="500px">
-      <template v-slot:toolbar>
-        <q-input  dense debounce="200" v-model="filter" placeholder="検索" clearable>
-          <template v-slot:before>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <action-select ref="appDg" name="model" :filter="filter"  type="single"></action-select>
+    <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" width="350px">
+        <action-select ref="appDg" name="model" type="single"></action-select>
    </ShowDialog>

  </q-page>
+
 </template>

 <script setup lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue';
-import { IActionNode, ActionNode, IActionFlow, ActionFlow, RootAction, IActionProperty } from 'src/types/ActionTypes';
+import {ref,reactive,computed,onMounted} from 'vue';
+import {IActionNode, ActionNode, IActionFlow, ActionFlow,RootAction, IActionProperty } from 'src/types/ActionTypes';
 import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import { useAuthStore } from 'stores/useAuthStore';
-
 import NodeItem from 'src/components/main/NodeItem.vue';
 import ShowDialog from 'components/ShowDialog.vue';
 import ActionSelect from 'components/ActionSelect.vue';
 import PropertyPanel from 'components/right/PropertyPanel.vue';
 import AppSelector from 'components/left/AppSelector.vue';
 import EventTree from 'components/left/EventTree.vue';
-import { FlowCtrl } from '../control/flowctrl';
+import {FlowCtrl } from '../control/flowctrl';
 import { useQuasar } from 'quasar';
 const deployLoading = ref(false);
 const saveLoading = ref(false);
-const drawerLeft = ref(false);
-const $q = useQuasar();
-const store = useFlowEditorStore();
-const authStore = useAuthStore();

+const drawerLeft = ref(false);
+const $q=useQuasar();
+const store = useFlowEditorStore();
+// ref関数を使ってtemplateとバインド
+const state=reactive({
+  activeNode:{
+    id:""
+  },
+})
 const appDg = ref();
-const prevNodeIfo = ref({
-  prevNode: {} as IActionNode,
-  inputPoint: ""
+const prevNodeIfo=ref({
+  prevNode:{} as IActionNode,
+  inputPoint:""
 });
 // const refFlow = ref<ActionFlow|null>(null);
-const showAddAction = ref(false);
-const drawerRight = ref(false);
-const filter=ref("");
-const model = ref("");
-const addActionNode = (action: IActionNode) => {
+const showAddAction=ref(false);
+const drawerRight=ref(false);
+const model=ref("");
+const addActionNode=(action:IActionNode)=>{
  // refFlow.value?.actionNodes.push(action);
-  store.currentFlow?.actionNodes.push(action);
-}
-const rootNode = computed(()=>{
-  return store.currentFlow?.getRoot();
-});
-const minPanelWidth=computed(()=>{
-  const root = store.currentFlow?.getRoot();
-  if(store.currentFlow && root){
-    return store.currentFlow?.getColumns(root) * 300 + 'px';
-  }else{
-    return "300px";
-  }
-});
-
-const addNode = (node: IActionNode, inputPoint: string) => {
-  if (drawerRight.value) {
-    drawerRight.value = false;
-  }
-  showAddAction.value = true;
-  prevNodeIfo.value.prevNode = node;
-  prevNodeIfo.value.inputPoint = inputPoint;
+ store.currentFlow?.actionNodes.push(action);
 }

-const onNodeSelected = (node: IActionNode) => {
+const addNode=(node:IActionNode,inputPoint:string)=>{
+  if(drawerRight.value){
+    drawerRight.value=false;
+  }
+  showAddAction.value=true;
+  prevNodeIfo.value.prevNode=node;
+  prevNodeIfo.value.inputPoint=inputPoint;
+}
+
+const onNodeSelected=(node:IActionNode)=>{
  //右パネルが開いている場合、自動閉じる
-  if (drawerRight.value && store.activeNode?.id !== node.id) {
-    drawerRight.value = false;
+  if(drawerRight.value && state.activeNode.id!==node.id){
+    drawerRight.value=false;
  }
-  store.setActiveNode(node);
+  state.activeNode = node;
 }

-const onNodeEdit = (node: IActionNode) => {
-  store.setActiveNode(node);
-  drawerRight.value = true;
+const onNodeEdit=(node:IActionNode)=>{
+  state.activeNode = node;
+  drawerRight.value=true;
 }

-const onDeleteNode = (node: IActionNode) => {
-  if (!store.currentFlow) return;
+const onDeleteNode=(node:IActionNode)=>{
+  if(!store.currentFlow) return;
  //右パネルが開いている場合、自動閉じる
-  if (drawerRight.value && store.activeNode?.id === node.id) {
-    drawerRight.value = false;
+  if(drawerRight.value && state.activeNode.id===node.id){
+    drawerRight.value=false;
  }
  store.currentFlow?.removeNode(node);
 }

-const onDeleteAllNextNodes = (node: IActionNode) => {
-  if (!store.currentFlow) return;
+const onDeleteAllNextNodes=(node:IActionNode)=>{
+  if(!store.currentFlow) return;
  //右パネルが開いている場合、自動閉じる
-  if (drawerRight.value) {
-    drawerRight.value = false;
+  if(drawerRight.value){
+    drawerRight.value=false;
  }
  store.currentFlow?.removeAllNext(node.id);
 }
-const closeDg = (val: any) => {
-  console.log("Dialog closed->", val);
+const closeDg=(val :any)=>{
+  console.log("Dialog closed->",val);
  if (val == 'OK') {
-    const data = appDg.value.selected[0];
-    const actionProps = JSON.parse(data.property);
-    const outputPoint = JSON.parse(data.outputPoints);
-    const action = new ActionNode(data.name, data.desc, "", outputPoint, actionProps);
-    store.currentFlow?.addNode(action, prevNodeIfo.value.prevNode, prevNodeIfo.value.inputPoint);
+      const data  = appDg.value.selected[0];
+      const actionProps=JSON.parse(data.property);
+      const outputPoint =JSON.parse(data.outputPoints);
+      const action = new ActionNode(data.name,data.desc,"",outputPoint,actionProps);
+      store.currentFlow?.addNode(action, prevNodeIfo.value.prevNode,prevNodeIfo.value.inputPoint);
  }
 }
-/*
- *フローのデータをコピーする
- */
-const onCopyFlow = () => {
-  if (navigator.clipboard) {
-    const jsonData =JSON.stringify(store.currentFlow) ;
-    navigator.clipboard.writeText(jsonData).then(() => {
-      console.log('Text successfully copied to clipboard');
-    },
-      (err) => {
-        console.error('Error in copying text: ', err);
-      });
-  } else {
-    console.log('Clipboard API not available');
-  }
-};
 /**
 * デプロイ
 */
-const onDeploy = async () => {
-  if (store.appInfo === undefined || store.flows?.length === 0) {
+const onDeploy= async ()=>{
+  if(store.appInfo===undefined || store.flows?.length===0){
    $q.notify({
      type: 'negative',
-      caption: "エラー",
+      caption:"エラー",
      message: `設定されたフローがありません。`
    });
    return;
  }
-  try {
-    deployLoading.value = true;
+  try{
+    deployLoading.value=true;
    await store.deploy();
-    deployLoading.value = false;
+    deployLoading.value=false;
    $q.notify({
      type: 'positive',
-      caption: "通知",
+      caption:"通知",
      message: `デプロイを成功しました。`
    });
-  } catch (error) {
+  }catch(error){
    console.error(error);
-    deployLoading.value = false;
+    deployLoading.value=false;
    $q.notify({
      type: 'negative',
-      caption: "エラー",
+      caption:"エラー",
      message: `デプロイが失敗しました。`
    })
  }
  return;
 }

-const onSaveFlow = async () => {
+const onSaveFlow = async ()=>{
  const targetFlow = store.selectedFlow;
-  if (targetFlow === undefined) {
+  if(targetFlow===undefined){
    $q.notify({
      type: 'negative',
-      caption: "エラー",
+      caption:"エラー",
      message: `編集中のフローがありません。`
    });
    return;
  }
-  try {
-    saveLoading.value = true;
+  try{
+    saveLoading.value=true;
    await store.saveFlow(targetFlow);
-    saveLoading.value = false;
+    saveLoading.value=false;
    $q.notify({
      type: 'positive',
-      caption: "通知",
+      caption:"通知",
      message: `${targetFlow.getRoot()?.subTitle}のフロー設定を保存しました。`
    });
-  } catch (error) {
+  }catch(error){
    console.error(error);
-    saveLoading.value = false;
+    saveLoading.value=false;
    $q.notify({
      type: 'negative',
-      caption: "エラー",
+      caption:"エラー",
      message: `${targetFlow.getRoot()?.subTitle}のフローの設定の保存が失敗しました。`
    })
  }

 }

-const fetchData = async () => {
-  drawerLeft.value = true;
-  if (store.appInfo === undefined) return;
+const fetchData = async ()=>{
+  drawerLeft.value=true;
+  if(store.appInfo===undefined) return;
  const flowCtrl = new FlowCtrl();
  const actionFlows = await flowCtrl.getFlows(store.appInfo?.appId);
-  if (actionFlows && actionFlows.length > 0) {
+  if(actionFlows && actionFlows.length>0){
    store.setFlows(actionFlows);
  }
-  if (actionFlows && actionFlows.length == 1) {
+  if(actionFlows && actionFlows.length==1){
    store.selectFlow(actionFlows[0]);
  }
-  const root = actionFlows[0].getRoot();
-  if (root) {
-    store.setActiveNode(root);
+  const root =actionFlows[0].getRoot();
+  if(root){
+    state.activeNode=root;
  }
 }

 onMounted(() => {
-  authStore.toggleLeftMenu();
  fetchData();
 });
 </script>

 <style lang="scss">
-.app-selector {
-  padding: 15px;
-  z-index: 999;
-}
+  .app-selector{
+    padding:15px;
+    z-index: 999;
+  }

-.flowchart {
-  padding-top: 10px;
-}
-
-.flow-toolbar {
+  .flowchart{
+    padding-top: 10px;
+  }
+  .flow-toolbar{
  opacity: 50%;
-}
+  }

-.event-tree .q-drawer {
-  top: 50px;
-  z-index: 999;
-}
-.expand{
-  position: fixed;
-  left: 0px;
-  top: 50%;
-  z-index: 9999;
-}
+  .event-tree .q-drawer {
+    top:50px;
+    z-index: 999;
+  }
 </style>
--- a/frontend/src/router/routes.ts
+++ b/frontend/src/router/routes.ts
@@ -5,13 +5,7 @@ const routes: RouteRecordRaw[] = [
    path: '/login',
    component: () => import('pages/LoginPage.vue')
  },
-  {
-    path:'/FlowChart',
-    component:()=>import('layouts/MainLayout.vue'),
-    children:[
-      {path:'',component:()=>import('pages/FlowChart.vue')}
-    ]
-  },
+
  {
    path: '/',
    component: () => import('layouts/MainLayout.vue'),
@@ -22,7 +16,7 @@ const routes: RouteRecordRaw[] = [
      { path: 'flow', component: () => import('pages/testFlow.vue') },
      { path: 'FlowChartTest', component: () => import('pages/FlowChartTest.vue') },
      { path: 'flowEditor', component: () => import('pages/FlowEditorPage.vue') },
-      // { path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
+      { path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
      { path: 'right', component: () => import('pages/testRight.vue') },
      { path: 'domain', component: () => import('pages/TenantDomain.vue') },
      { path: 'userdomain', component: () => import('pages/UserDomain.vue')},
--- a/frontend/src/stores/flowEditor.ts
+++ b/frontend/src/stores/flowEditor.ts
@@ -1,142 +1,112 @@
 import { defineStore } from 'pinia';
-import { AppInfo, IActionFlow, IActionNode } from 'src/types/ActionTypes';
-import { IKintoneEvent, KintoneEventManager } from 'src/types/KintoneEvents';
-import { FlowCtrl } from '../control/flowctrl';
+import { AppInfo ,IActionFlow} from 'src/types/ActionTypes';
+import { kintoneEvents,IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
+import {FlowCtrl } from '../control/flowctrl';

-export interface FlowEditorState {
-  flowNames1: string;
-  appInfo?: AppInfo;
-  flows?: IActionFlow[];
-  selectedFlow?: IActionFlow | undefined;
-  activeNode: IActionNode | undefined;
-  eventTree: KintoneEventManager;
-  selectedEvent: IKintoneEvent | undefined;
-  expandedScreen: any[];
+export interface FlowEditorState{
+  flowNames1:string;
+  appInfo?:AppInfo;
+  flows?:IActionFlow[];
+  selectedFlow?:IActionFlow|undefined;
+  eventTree:KintoneEventManager;
+  selectedEvent:IKintoneEvent|undefined;
+  expandedScreen:any[];
 }
-const flowCtrl = new FlowCtrl();
-const eventTree = new KintoneEventManager();
-export const useFlowEditorStore = defineStore('flowEditor', {
-  state: (): FlowEditorState => ({
-    flowNames1: '',
-    appInfo: undefined,
-    flows: [],
-    selectedFlow: undefined,
-    activeNode: undefined,
-    eventTree: eventTree,
-    selectedEvent: undefined,
-    expandedScreen: [],
-  }),
+const flowCtrl=new FlowCtrl();
+export const useFlowEditorStore = defineStore("flowEditor",{
+  state: ():FlowEditorState =>  ({
+      flowNames1: '',
+      appInfo:undefined,
+      flows:[],
+      selectedFlow:undefined,
+      eventTree:kintoneEvents,
+      selectedEvent:undefined,
+      expandedScreen:[]
+    }),
  getters: {
    /**
     *
     * @returns 現在編集しているフロー
     */
-    currentFlow(): IActionFlow | undefined {
-      return this.selectedFlow;
+    currentFlow():IActionFlow|undefined{
+        return this.selectedFlow;
    },
    /**
     * KintoneイベントIDから、バンドしているフローを検索する
     * @param state
     * @returns
     */
-    findFlowByEventId(state) {
-      return (eventId: string) => {
-        return state.flows?.find((flow) => {
-          const root = flow.getRoot();
-          return root?.name === eventId;
-        });
-      };
-    },
-
-    findEventById(state) {
-      return (eventId: string) => {
-        return state.eventTree.findEventById(eventId);
-      };
-    },
-
+    findFlowByEventId(state){
+      return (eventId:string)=>{
+          return state.flows?.find((flow)=>{
+              const root=flow.getRoot();
+              return root?.name===eventId
+          });
+      }
+    }
  },

  actions: {
-    setFlows(flows: IActionFlow[]) {
-      this.flows = flows;
+    setFlows(flows:IActionFlow[]){
+      this.flows=flows;
    },
-    selectFlow(flow: IActionFlow | undefined) {
-      this.selectedFlow = flow;
+    selectFlow(flow:IActionFlow){
+      this.selectedFlow=flow;
    },
-    setActiveNode(node: IActionNode) {
-      this.activeNode = node;
-    },
-    setApp(app: AppInfo) {
-      this.appInfo = app;
+    setApp(app:AppInfo){
+      this.appInfo=app;
    },
    /**
     * DBからフルーを保存する
     * @returns
     */
-    async loadFlow() {
-      if (this.appInfo === undefined) return;
-      const actionFlows = await flowCtrl.getFlows(this.appInfo?.appId);
-      //eventTreeにバンドする
-      this.eventTree.bindFlows(actionFlows);
-      if (actionFlows === undefined || actionFlows.length === 0) {
-        this.flows = [];
-        this.selectedFlow = undefined;
-        return;
-      }
-      this.setFlows(actionFlows);
-      if (actionFlows && actionFlows.length > 0) {
-        this.selectFlow(actionFlows[0]);
-      }
-      const expandNames = actionFlows.map((flow) => flow.getRoot()?.title);
-      // const expandName =actionFlows[0].getRoot()?.title;
-      this.expandedScreen = expandNames;
+    async loadFlow(){
+        if(this.appInfo===undefined) return;
+        const actionFlows = await flowCtrl.getFlows(this.appInfo?.appId);
+        //eventTreeにバンドする
+        this.eventTree.bindFlows(actionFlows);
+        if(actionFlows===undefined || actionFlows.length===0){
+          this.flows=[];
+          this.selectedFlow=undefined;
+          return;
+        }
+        this.setFlows(actionFlows);
+        if(actionFlows && actionFlows.length>0){
+          this.selectFlow(actionFlows[0]);
+        }
+        const expandNames = actionFlows.map(flow=>flow.getRoot()?.title);
+        // const expandName =actionFlows[0].getRoot()?.title;
+        this.expandedScreen=expandNames;
    },
    /**
     * フローをDBに保存及び更新する
     */
-    async saveFlow(flow: IActionFlow) {
-      const root = flow.getRoot();
-      const isNew = flow.id === '';
-      const jsonData = {
-        flowid: isNew ? flow.createNewId() : flow.id,
+    async saveFlow(flow:IActionFlow){
+      const root=flow.getRoot();
+      const isNew = flow.id==='';
+      const jsonData={
+        flowid: isNew ? flow.createNewId():flow.id,
        appid: this.appInfo?.appId,
        eventid: root?.name,
        name: root?.subTitle,
-        content: JSON.stringify(flow),
-      };
+        content: JSON.stringify(flow)
+      }

-      if (isNew) {
+      if(isNew){
        return await flowCtrl.SaveFlow(jsonData);
-      } else {
+      }else{
        return await flowCtrl.UpdateFlow(jsonData);
      }
    },
-
-
-    async deleteEvent(event: IKintoneEvent) {
-      const store = useFlowEditorStore();
-      if (event.flowData) {
-        const flow = event.flowData;
-        if (flow.id !== '') {
-          await flowCtrl.DeleteFlow(flow.id)
-          if (this.flows) {
-            this.flows = this.flows.filter((f) => f.id !== flow.id);
-          }
-        }
-        eventTree.deleteEvent(event, store);
-      }
-      else {
-        eventTree.deleteEvent(event, store);
-      }
-    },
    /**
     * デプロイする
     */
-    async deploy(): Promise<boolean> {
-      if (this.appInfo === undefined) {
+    async deploy():Promise<boolean>{
+      if(this.appInfo===undefined){
        return false;
      }
      return await flowCtrl.depoly(this.appInfo?.appId);
-    },
-  },
+   }
+
+  }
 });
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -8,7 +8,6 @@ export interface IUserState{
  token?:string;
  returnUrl:string;
  currentDomain:IDomainInfo;
-  LeftDrawer:boolean;
 }

 export const useAuthStore = defineStore({
@@ -21,19 +20,10 @@ export const useAuthStore = defineStore({
      return {
          token,
          returnUrl: '',
-          LeftDrawer:false,
          currentDomain: JSON.parse(localStorage.getItem('currentDomain')||"{}")
        }
    },
-    getters:{
-      toggleLeftDrawer():boolean{
-          return this.LeftDrawer;
-      }
-    },
    actions: {
-        toggleLeftMenu(){
-          this.LeftDrawer=!this.LeftDrawer;
-        },
        async login(username:string, password:string) {
          const params = new URLSearchParams();
          params.append('username', username);
--- a/frontend/src/types/ActionTypes.ts
+++ b/frontend/src/types/ActionTypes.ts
@@ -16,9 +16,11 @@ export interface AppInfo {
 }

 /**
- * 属性項目情報
+* アクションのプロパティ定義
 */
-export interface IProp{
+export interface IActionProperty {
+  component: string;
+  props: {
    //プロパティ名
    name: string;
    //プロパティ表示名
@@ -26,34 +28,8 @@ export interface IProp{
    placeholder: string;
    //入力提示・説明
    hint:string;
-    //関連属性リスト
-    connectProps:[{key:string,propName:string}]|undefined;
    //プロパティ設定値
    modelValue: any;
-}
-
-/**
-* アクションのプロパティ定義
- */
-export interface IActionProperty {
-  component: string;
-  props: IProp;
-}
-/**
- * 変数オブジェクト
- */
-export interface IActionVariable{
-  actionName:string;
-  displayName:string;
-  name: {
-    name:string;
-    actionName:string;
-    displayName:string;
-    vars : {
-      vName:string;
-      logicalOperator:string;
-      field: object;
-    }[]
  };
 }
 /**
@@ -64,7 +40,6 @@ export interface IActionNode {
  //アクション名
  name: string;
  title: string;
-  varName:IProp|undefined;
  subTitle: string;
  inputPoint: string;
  //出力ポイント（条件分岐以外未使用）
@@ -87,12 +62,10 @@ export interface IActionFlow {
  addNode(newNode: IActionNode, prevNode?: IActionNode, inputPoint?: string): IActionNode;
  removeNode(targetNode: IActionNode): boolean;
  removeAllNext(targetNodeId: string): void;
-  getVarNames(currentNode:IActionNode):IActionVariable[];
  findNodeById(id: string): IActionNode | undefined;
  toJSON(): any;
  getRoot(): IActionNode | undefined;
  createNewId(): string;
-  getColumns(node:IActionNode):number;
 }

 /**
@@ -100,7 +73,16 @@ export interface IActionFlow {
 */
 class ActionProperty implements IActionProperty {
  component: string;
-  props: IProp;
+  props: {
+    // プロパティ名
+    name: string;
+    // プロパティ表示名
+    displayName: string;
+    placeholder: string;
+    hint:string;
+    // プロパティ設定値
+    modelValue: any;
+  };

  static defaultProperty(): IActionProperty {
    return new ActionProperty('InputText', 'displayName', '表示名', '表示を入力してください', '','');
@@ -120,7 +102,6 @@ class ActionProperty implements IActionProperty {
      displayName: displayName,
      placeholder: placeholder,
      hint:hint,
-      connectProps:undefined,
      modelValue: modelValue
    };
  }
@@ -140,13 +121,6 @@ export class ActionNode implements IActionNode {
  get subTitle(): string {
    return this.name;
  };
-
-  //変数名
-  get varName():IProp|undefined{
-      const prop = this.actionProps.find((prop) => prop.props.name === "verName");
-      return prop?.props;
-  }
-
  inputPoint: string;
  //出力ポイント（条件分岐以外未使用）
  outputPoints: Array<string>;
@@ -194,7 +168,6 @@ export class RootAction implements IActionNode {
  title: string;
  subTitle: string;
  inputPoint: string;
-  varName: IProp | undefined=undefined;
  //出力ポイント（条件分岐以外未使用）
  outputPoints: Array<string>;
  isRoot: boolean;
@@ -252,7 +225,7 @@ export class ActionFlow implements IActionFlow {
      newNode.inputPoint = inputPoint;
    }
    if (prevNode !== undefined) {
-      this.resetNodeRelation(prevNode, newNode, inputPoint || '');
+      this.connectNodes(prevNode, newNode, inputPoint || '');
    } else {
      prevNode = this.actionNodes[this.actionNodes.length - 1];
      this.connectNodes(prevNode, newNode, inputPoint || '');
@@ -296,29 +269,9 @@ export class ActionFlow implements IActionFlow {
      return false;
    }
    for (const [, id] of targetNode.nextNodeIds) {
-      this.removeAll(id);
+      this.removeAllNext(id);
+      this.removeFromActionNodes(id);
    }
-    targetNode.nextNodeIds.clear();
-  }
-
-  /***
-   * 目標ノードの次のノードを全部削除する
-   */
-  removeAll(targetNodeId: string) {
-    if (!targetNodeId || targetNodeId === '') {
-      return;
-    }
-    const targetNode = this.findNodeById(targetNodeId);
-    if (!targetNode) {
-      return
-    }
-    if (targetNode.nextNodeIds.size == 0) {
-      return
-    }
-    for (const [, id] of targetNode.nextNodeIds) {
-      this.removeAll(id);
-    }
-    this.removeNode(targetNode);
  }

  // 断开与前一个节点的连接
@@ -366,7 +319,8 @@ export class ActionFlow implements IActionFlow {
      if (!nextNodeId) return;
      const nextNode = this.findNodeById(nextNodeId);
      if (!nextNode) return;
-      this.connectNodes(prevNode,nextNode,targetNode.inputPoint || '');
+      nextNode.prevNodeId = prevNode.id;
+      prevNode.nextNodeIds.set(targetNode.inputPoint || '', nextNodeId);
      return;
    }
    //二つ以上の場合
@@ -400,16 +354,15 @@ export class ActionFlow implements IActionFlow {

  /**
   *
-   * @param prevNode ノード挿入時の接続をリセットする
+   * @param prevNode ノードの接続をリセットする
   * @param newNode
   * @param inputPoint
   */
  resetNodeRelation(prevNode: IActionNode, newNode: IActionNode, inputPoint?: string) {
-    //元の次のノードを取得
-    const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
+    //
    prevNode.nextNodeIds.set(inputPoint || '', newNode.id);
    newNode.prevNodeId = prevNode.id;
-    newNode.inputPoint=inputPoint||'';
+    const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
    this.setNewNodeNextId(newNode, originalNextNodeId, inputPoint);
  }

@@ -421,18 +374,15 @@ export class ActionFlow implements IActionFlow {
   */
  private setNewNodeNextId(newNode: IActionNode, originalNextNodeId: string | undefined, inputPoint?: string) {
    // 元の接続ノードが存在する
-    if (!originalNextNodeId) {return;}
-    const originNextNode = this.findNodeById(originalNextNodeId);
-    if (!originNextNode) {return;}
-    // 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
-    if (newNode.outputPoints.includes(inputPoint || '')) {
-      newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
-      originNextNode.prevNodeId=newNode.id;
-    } else {
-      //  inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
-      const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
-      newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
-      originNextNode.prevNodeId=newNode.id;
+    if (originalNextNodeId) {
+      // 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
+      if (newNode.outputPoints.includes(inputPoint || '')) {
+        newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
+      } else {
+        //  inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
+        const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
+        newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
+      }
    }
  }

@@ -443,42 +393,6 @@ export class ActionFlow implements IActionFlow {
    return this.actionNodes.find((node) => node.id === id);
  }

-  getVarNames(currentNode:IActionNode):IActionVariable[]{
-    let varNames:IActionVariable[]=[];
-    if(currentNode.prevNodeId!==undefined){
-      const prevNode=this.findNodeById(currentNode.prevNodeId);
-      if(prevNode!==undefined){
-        varNames = this.getPrevVarNames(prevNode);
-      }
-    }
-    return varNames;
-  }
-
-  getPrevVarNames(prevNode:IActionNode):IActionVariable[]{
-    let varNames:IActionVariable[]=[];
-    if(prevNode.varName!==undefined && prevNode.varName.modelValue){
-
-      if(prevNode.varName.modelValue ==='object'){
-        console.log(prevNode);
-        
-      }
-
-      varNames.unshift({
-        actionName:prevNode.name,
-        displayName:prevNode.varName.displayName,
-        name:prevNode.varName.modelValue
-      });
-    }
-    if(prevNode.prevNodeId!==undefined){
-      const prevPrevNode=this.findNodeById(prevNode.prevNodeId);
-      if(prevPrevNode!==undefined){
-        const prevVars = this.getPrevVarNames(prevPrevNode);
-        varNames=[...prevVars,...varNames];
-      }
-    }
-    return varNames;
-  }
-
  toJSON() {
    return {
      id: this.id,
@@ -486,27 +400,12 @@ export class ActionFlow implements IActionFlow {
        const { nextNodeIds, ...rest } = node;
        return {
          ...rest,
-          nextNodeIds: Object.fromEntries(nextNodeIds)
+          nextNodeIds: Array.from(nextNodeIds.entries())
        };
      })
    };
  }

-  getColumns(node:IActionNode):number{
-    let result= 1;
-    if(node.outputPoints && node.outputPoints.length>1){
-      result += node.outputPoints.length -1;
-    }
-    let nextNode;
-    for (const [key, id] of node.nextNodeIds) {
-      nextNode=this.findNodeById(id);
-      if(nextNode){
-        result +=this.getColumns(nextNode)-1;
-      }
-    }
-    return result;
-  }
-
  getRoot(): IActionNode | undefined {
    return this.actionNodes.find(node => node.isRoot)
  }
@@ -520,9 +419,9 @@ export class ActionFlow implements IActionFlow {
    const parsedObject = JSON.parse(json);

    const actionNodes = parsedObject.actionNodes.map((node: any) => {
-      const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoints, node.actionProps)
+      const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoint, node.actionProps)
        : new RootAction(node.name, node.title, node.subTitle);
-      nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
+      nodeClass.nextNodeIds = new Map(node.nextNodeIds);
      nodeClass.prevNodeId = node.prevNodeId;
      nodeClass.id = node.id;
      return nodeClass;
--- a/frontend/src/types/Conditions.ts
+++ b/frontend/src/types/Conditions.ts
@@ -198,7 +198,7 @@ export class ConditionTree {
        if(value && typeof value ==='object' && ('label' in value)){
            value =condNode.value.label;
        }
-        return `${typeof condNode.object.name === 'object' ? condNode.object.name.name : condNode.object.name} ${condNode.operator} '${value}'`;
+        return `${condNode.object.name} ${condNode.operator} '${value}'`;
      } else {
        return '';
      }
--- a/frontend/src/types/KintoneEvents.ts
+++ b/frontend/src/types/KintoneEvents.ts
@@ -1,338 +1,112 @@
-import { useFlowEditorStore } from 'src/stores/flowEditor';
-import { IActionFlow } from './ActionTypes';
-export interface IKintoneEventNode {
+import { publicDecrypt } from 'crypto';
+import {IActionFlow} from './ActionTypes';
+export interface TreeNode {
  label: string;
-  header: string;
-  eventId: string;
-  parentId: string;
 }

-export interface IKintoneEvent extends IKintoneEventNode {
+export interface IKintoneEvent extends TreeNode {
+  eventId: string;
  hasFlow: boolean;
  flowData?: IActionFlow;
 }

-export interface IKintoneEventGroup extends IKintoneEventNode {
-  events: IKintoneEventNode[];
+export interface IKintoneScreen extends TreeNode {
+  label: string;
+  events: IKintoneEvent[];
 }

-export class kintoneEvent implements IKintoneEvent {
+export class kintoneEvent implements IKintoneEvent{
  eventId: string;
-  parentId: string;
-  get hasFlow(): boolean {
-    return this.flowData !== undefined && this.flowData.actionNodes.length > 1;
-  }
+  get hasFlow(): boolean{
+    return this.flowData!==undefined && this.flowData.actionNodes.length>1
+  };
  flowData?: IActionFlow | undefined;
  label: string;
-  header = 'EVENT';
-  constructor(label: string, eventId: string, parentId: string) {
-    this.eventId = eventId;
-    this.label = label;
-    this.parentId = parentId;
-  }
-}
+  constructor({eventId,label}:{eventId:string,label:string}){
+    this.eventId=eventId;
+    this.label=label;

-export class kintoneEventGroup implements IKintoneEventGroup {
-  eventId: string;
-  parentId: string;
-  label: string;
-  events: IKintoneEventNode[];
-  get header(): string {
-    return 'EVENTGROUP';
  }
-  constructor(
-    eventId: string,
-    label: string,
-    events: IKintoneEventNode[],
-    parentId: string
-  ) {
-    this.eventId = eventId;
-    this.label = label;
-    this.events = events;
-    this.parentId = parentId;
-  }
-}

-export class kintoneEventForChange implements IKintoneEventGroup {
-  eventId: string;
-  parentId: string;
-  label: string;
-  events: IKintoneEventNode[];
-  get header(): string {
-    return 'CHANGE';
-  }
-  constructor(
-    eventId: string,
-    label: string,
-    events: IKintoneEventNode[],
-    parentId: string
-  ) {
-    this.eventId = eventId;
-    this.label = label;
-    this.events = events;
-    this.parentId = parentId;
-  }
 }

 export class KintoneEventManager {
-  public screens: IKintoneEventGroup[];
+  public screens: IKintoneScreen[];

-  constructor() {
-    this.screens = this.getKintoneEvents();
+  constructor(screens: IKintoneScreen[]) {
+    this.screens = screens;
  }

-  public bindFlows(flows: IActionFlow[]) {
-    this.screens = this.getKintoneEvents();
-    for (const flow of flows) {
-      const eventId = flow.getRoot()?.name;
-      if (eventId !== undefined) {
-        const eventNode = this.findEventById(eventId);
-        if (eventNode !== null && eventNode.header === 'EVENT') {
-          const event = eventNode as kintoneEvent;
-          event.flowData = flow;
-        } else {
-          //EventGroupのIDを取得
-          const lastIndex = eventId.lastIndexOf('.');
-          const groupId = eventId.substring(0, lastIndex);
-          const eventNode = this.findEventById(groupId);
-          if (eventNode && (eventNode.header === 'EVENTGROUP' || eventNode.header === 'CHANGE')) {
-            const groupEvent = eventNode as kintoneEventGroup;
-
-            const newEvent = {
-              label: flow.getRoot()?.subTitle || '',
-              eventId: eventId,
-              parentId: groupId,
-              header: 'DELETABLE',
-              hasFlow: true,
-              flowData: flow,
-            };
-
-            groupEvent.events.push(newEvent);
-          }
+  public bindFlows(flows:IActionFlow[]){
+    for (const screen of this.screens) {
+      screen.events.forEach((ev)=>ev.flowData=undefined);
+    }
+    for (const flow of flows){
+      const eventId =flow.getRoot()?.name;
+      if(eventId!==undefined){
+        const event = this.findEventById(eventId);
+        if(event!==null){
+          event.flowData=flow;
        }
      }
    }
  }

-  public findEventById(eventId: string): IKintoneEventNode | null {
-    const screen = this.findScreen(eventId);
-    if (screen) {
-      return screen;
-    }
+  public findEventById(eventId: string): IKintoneEvent | null {
    for (const screen of this.screens) {
      for (const event of screen.events) {
        if (event.eventId === eventId) {
          return event;
        }
-        if (event.header === 'EVENTGROUP' || event.header === 'CHANGE') {
-          const eventGroup = event as IKintoneEventGroup;
-          const targetEvent = eventGroup.events.find((ev) => {
-            return ev.eventId === eventId;
-          });
-          if (targetEvent) {
-            return targetEvent;
-          }
-        }
      }
    }
    return null;
  }

-  public findScreen(eventId: string): IKintoneEventGroup | undefined {
-    return this.screens.find((screen) => screen.eventId == eventId);
-  }
-
-  public deleteEvent(
-    event: kintoneEvent,
-    store: ReturnType<typeof useFlowEditorStore>
-  ) {
-    if (event.header !== 'DELETABLE') {
-      return;
+  public findScreen(eventId:string):IKintoneScreen|null{
+    for (const screen of this.screens) {
+      if(screen.events.some((ev:IKintoneEvent)=>ev.eventId===eventId)){
+        return screen;
+      }
    }
-
-    const parent = store.findEventById(event.parentId);
-    if (parent?.header !== 'CHANGE' && parent?.header !== 'EVENTGROUP') {
-      return;
-    }
-    const realParent = parent as kintoneEventForChange;
-
-    const index = realParent.events.findIndex(
-      (e) => e.eventId === event.eventId
-    );
-
-    if (index !== -1) {
-      realParent.events.splice(index, 1);
-    }
-  }
-
-  public getKintoneEvents(): IKintoneEventGroup[] {
-    return [
-      new kintoneEventGroup(
-        'app.record.create',
-        'レコード追加画面',
-        [
-          new kintoneEvent(
-            'レコード追加画面を表示した後',
-            'app.record.create.show',
-            'app.record.create'
-          ),
-          new kintoneEvent(
-            '保存をクリックしたとき',
-            'app.record.create.submit',
-            'app.record.create'
-          ),
-          new kintoneEvent(
-            '保存が成功したとき',
-            'app.record.create.submit.success',
-            'app.record.create'
-          ),
-          new kintoneEventForChange(
-            'app.record.create.change',
-            'フィールドの値を変更したとき',
-            [],
-            'app.record.create'
-          ),
-          new kintoneEventGroup(
-            'app.record.create.show.customButtonClick',
-            'ボタンをクリックした時',
-            [],
-            'app.record.create'
-          ),
-        ],
-        ''
-      ),
-      new kintoneEventGroup(
-        'app.record.detail',
-        'レコード詳細画面',
-        [
-          new kintoneEvent(
-            'レコード詳細画面を表示した後',
-            'app.record.detail.show',
-            'app.record.detail'
-          ),
-          new kintoneEvent(
-            'レコードを削除するとき',
-            'app.record.detail.delete.submit',
-            'app.record.detail'
-          ),
-          new kintoneEvent(
-            'プロセス管理のアクションを実行したとき',
-            'app.record.detail.process.proceed',
-            'app.record.detail'
-          ),
-          new kintoneEventGroup(
-            'app.record.detail.show.customButtonClick',
-            'ボタンをクリックした時',
-            [],
-            'app.record.detail'
-          ),
-        ],
-        ''
-      ),
-      new kintoneEventGroup(
-        'app.record.edit',
-        'レコード編集画面',
-        [
-          new kintoneEvent(
-            'レコード編集画面を表示した後',
-            'app.record.edit.show',
-            'app.record.edit'
-          ),
-          new kintoneEvent(
-            '保存をクリックしたとき',
-            'app.record.edit.submit',
-            'app.record.edit'
-          ),
-          new kintoneEvent(
-            '保存が成功したとき',
-            'app.record.edit.submit.success',
-            'app.record.edit'
-          ),
-          new kintoneEventForChange(
-            'app.record.edit.change',
-            'フィールドの値を変更したとき',
-            [],
-            'app.record.edit'
-          ),
-          new kintoneEventGroup(
-            'app.record.edit.show.customButtonClick',
-            'ボタンをクリックした時',
-            [],
-            'app.record.edit'
-          ),
-        ],
-        ''
-      ),
-      new kintoneEventGroup(
-        'app.record.index',
-        'レコード一覧画面',
-        [
-          new kintoneEvent(
-            '一覧画面を表示した後',
-            'app.record.index.show',
-            'app.record.index'
-          ),
-          new kintoneEvent(
-            'インライン編集を開始したとき',
-            'app.record.index.edit.show',
-            'app.record.index'
-          ),
-          new kintoneEvent(
-            'インライン編集の【保存】をクリックしたとき',
-            'app.record.index.edit.submit',
-            'app.record.index'
-          ),
-          new kintoneEvent(
-            'インライン編集の保存が成功したとき',
-            'app.record.index.edit.submit.success',
-            'app.record.index'
-          ),
-          new kintoneEventForChange(
-            'app.record.index.edit.change',
-            'インライン編集のフィールド値を変更したとき',
-            [],
-            'app.record.index'
-          ),
-          new kintoneEventGroup(
-            'app.record.detail.show.customButtonClick',
-            'ボタンをクリックした時',
-            [],
-            'app.record.index'
-          ),
-        ],
-        ''
-      ),
-    ];
+    return null;
  }
 }

-// export const kintoneEvents:KintoneEventManager = new KintoneEventManager([
-//     new kintoneEventGroup("app.record.create","レコード追加画面",[
-//       new kintoneEvent('レコード追加画面を表示した後','app.record.create.show',"app.record.create"),
-//       new kintoneEvent('保存をクリックしたとき','app.record.create.submit',"app.record.create"),
-//       new kintoneEvent('保存が成功したとき','app.record.create.submit.success',"app.record.create"),
-//       new kintoneEventForChange('app.record.create.change','フィールドの値を変更したとき',[],"app.record.create"),
-//       new kintoneEventGroup('app.record.create.customButtonClick','ボタンをクリックした時',[],"app.record.create")
-//     ],""),
-//     new kintoneEventGroup("app.record.detail","レコード詳細画面",[
-//       new kintoneEvent('レコード詳細画面を表示した後','app.record.detail.show',"app.record.detail"),
-//       new kintoneEvent('レコードを削除するとき','app.record.detail.delete.submit',"app.record.detail"),
-//       new kintoneEvent('プロセス管理のアクションを実行したとき','app.record.detail.process.proceed',"app.record.detail"),
-//       new kintoneEventGroup('app.record.detail.customButtonClick','ボタンをクリックした時',[],"app.record.detail"),
-//     ],""),
-//     new kintoneEventGroup("app.record.edit","レコード編集画面",[
-//       new kintoneEvent('レコード編集画面を表示した後','app.record.edit.show',"app.record.edit"),
-//       new kintoneEvent('保存をクリックしたとき','app.record.edit.submit',"app.record.edit"),
-//       new kintoneEvent('保存が成功したとき','app.record.edit.submit.success',"app.record.edit"),
-//       new kintoneEventForChange('app.record.edit.change','フィールドの値を変更したとき',[],"app.record.edit"),
-//       new kintoneEventGroup('app.record.edit.customButtonClick','ボタンをクリックした時',[],"app.record.edit"),
-//     ],""),
-//     new kintoneEventGroup("app.record.index","レコード一覧画面",[
-//       new kintoneEvent('一覧画面を表示した後', 'app.record.index.show',"app.record.index"),
-//       new kintoneEvent('インライン編集を開始したとき','app.record.index.edit.show',"app.record.index"),
-//       new kintoneEvent('インライン編集の【保存】をクリックしたとき','app.record.index.edit.submit',"app.record.index"),
-//       new kintoneEvent('インライン編集の保存が成功したとき', 'app.record.index.edit.submit.success',"app.record.index"),
-//       new kintoneEventForChange('app.record.index.edit.change','インライン編集のフィールド値を変更したとき' ,[],"app.record.index"),
-//       new kintoneEventGroup('app.record.detail.customButtonClick','ボタンをクリックした時',[],"app.record.index"),
-//     ],"")
-// ]);
+export const kintoneEvents:KintoneEventManager = new KintoneEventManager([
+  {
+    label:'レコード追加画面',
+    events:[
+      new kintoneEvent({label:'レコード追加画面を表示した後',eventId:'app.record.create.show'}),
+      new kintoneEvent({label:'保存をクリックしたとき',eventId:'app.record.create.submit'}),
+      new kintoneEvent({label:'保存が成功したとき',eventId:'app.record.create.submit.success'}),
+      new kintoneEvent({label:'フィールドの値を変更したとき',eventId:'app.record.create.change'}),
+    ]
+  },
+  {
+    label:'レコード詳細画面',
+    events:[
+      new kintoneEvent({label:'レコード詳細画面を表示した後',eventId:'app.record.detail.show'}),
+      new kintoneEvent({label:'レコードを削除するとき',eventId:'app.record.detail.delete.submit'}),
+      new kintoneEvent({label:'プロセス管理のアクションを実行したとき',eventId:'app.record.detail.process.proceed'}),
+    ]
+  },
+  {
+    label:'レコード編集画面',
+    events:[new kintoneEvent({label:'レコード編集画面を表示した後',eventId:'app.record.edit.show'}),
+      new kintoneEvent({label:'保存をクリックしたとき',eventId:'app.record.edit.submit'}),
+      new kintoneEvent({label:'保存が成功したとき',eventId:'app.record.edit.submit.success'}),
+      new kintoneEvent({label:'フィールドの値を変更したとき',eventId:'app.record.edit.change'}),
+    ]
+  },
+  {
+    label:'レコード一覧画面',
+    events:[
+      new kintoneEvent({label:'一覧画面を表示した後', eventId:'app.record.index.show'}),
+      new kintoneEvent({label:'インライン編集を開始したとき',eventId:'app.record.index.edit.show'}),
+      new kintoneEvent({label:'インライン編集のフィールド値を変更したとき', eventId:'app.record.index.edit.change'}),
+      new kintoneEvent({label:'インライン編集の【保存】をクリックしたとき',eventId:'app.record.index.edit.submit'}),
+      new kintoneEvent({label:'インライン編集の保存が成功したとき', eventId:'app.record.index.edit.submit.success'}),
+    ]
+  }
+]);
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +0,0 @@
-{
-  "name": "App Builder for kintone",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}
--- a/node_modules/.yarn-integrity
+++ b/node_modules/.yarn-integrity
@@ -1,10 +0,0 @@
-{
-  "systemParams": "win32-x64-115",
-  "modulesFolders": [],
-  "flags": [],
-  "linkedModules": [],
-  "topLevelPatterns": [],
-  "lockfileEntries": {},
-  "files": [],
-  "artifacts": {}
-}
--- a/plugin/kintone-addins/package-lock.json
+++ b/plugin/kintone-addins/package-lock.json
@@ -8,8 +8,7 @@
      "name": "kintone-addins",
      "version": "0.0.0",
      "dependencies": {
-        "jquery": "^3.7.1",
-        "yarn": "^1.22.22"
+        "jquery": "^3.7.1"
      },
      "devDependencies": {
        "@types/jquery": "^3.5.24",
@@ -796,19 +795,6 @@
          "optional": true
        }
      }
-    },
-    "node_modules/yarn": {
-      "version": "1.22.22",
-      "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz",
-      "integrity": "sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==",
-      "hasInstallScript": true,
-      "bin": {
-        "yarn": "bin/yarn.js",
-        "yarnpkg": "bin/yarn.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
    }
  }
 }
--- a/plugin/kintone-addins/package.json
+++ b/plugin/kintone-addins/package.json
@@ -4,25 +4,19 @@
  "version": "0.0.0",
  "type": "module",
  "scripts": {
-    "dev": "tsc && set \"SOURCE_MAP=true\" && vite build && vite preview",
+    "dev": "vite",
    "build": "tsc && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "build:linux": "tsc && vite build && cp -ur dist/*.js ../../backend/Temp",
-    "build:dev": "tsc && set \"SOURCE_MAP=true\" && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "preview": "vite preview",
-    "ngrok": "ngrok http http://localhost:4173/",
-    "vite": "vite dev"
+    "build:dev":"tsc && set \"SOURCE_MAP=true\" && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
+    "preview": "vite preview"
  },
  "devDependencies": {
    "@types/jquery": "^3.5.24",
    "@types/node": "^20.8.9",
    "sass": "^1.69.5",
    "typescript": "^5.0.2",
-    "vite": "^4.4.5",
-    "vite-plugin-checker": "^0.6.4"
+    "vite": "^4.4.5"
  },
  "dependencies": {
-    "jquery": "^3.7.1",
-    "vite-plugin-css-injected-by-js": "^3.5.1",
-    "yarn": "^1.22.22"
+    "jquery": "^3.7.1"
  }
 }
--- a/plugin/kintone-addins/readme.md
+++ b/plugin/kintone-addins/readme.md
@@ -68,10 +68,6 @@
 | modelValue  | 空文字             | コンポーネントの初期値を設定します。<br>初期設定ないの場合は空文字で設定する。
 | name        | field              | 属性の設定値の名前です。   |
 | placeholder | 対象項目を選択してください| 入力フィールドに表示されるプレースホルダーのテキストです。この場合は設定されていません。          |
-| hint        | 説明文| 長い説明文を設定することが可能です。（markdown形式サポート予定、現在HTML可能）          |
-| selectType  |`single` or `multiple`| フィールド選択・他のアプリのフィールド選択の選択モードを設定する         |
-
-

 ### 使用可能なコンポーネント
 | No. | コンポーネント名      | コンポーネントタイプ | 説明                                     |
@@ -82,10 +78,9 @@
 | 4   | フィールド選択     | FieldInput       | システムのフィールドを選択するための入力コンポーネントです。   |
 | 5   | 選択リスト        | SelectBox        | 複数のオプションから選択するためのドロップダウンリストです。   |
 | 6   | 条件式設定       | ConditionInput   | 条件式やロジックを入力するためのコンポーネントです。         |
-| 7   | イベント設定       |EventSetter    | ボタンイベント設定のコンポーネントです。         |
-| 8   | 色選択       | ColorPicker   | 色を設定する（追加予定中）         |
-| 9   | 他のアプリのフィールド選択       | AppFieldPicker   | 他のアプリのフィールドを選択する（追加予定中）         |
-| 10  |ユーザー選択       | UserPicker   | ユーザーを選択する（追加予定中）         |
+| 7   | 色選択       | ColorPicker   | 色を設定する（追加予定中）         |
+| 8   | 他のアプリのフィールド選択       | AppFieldPicker   | 他のアプリのフィールドを選択する（追加予定中）         |
+| 9   |ユーザー選択       | UserPicker   | ユーザーを選択する（追加予定中）         |

 ## 2.アクションアドインの開発

@@ -268,28 +263,4 @@ npm run build:dev

 - デプロイの確認:
   - Azure App Service 拡張機能でデプロイが完了したことを確認します。
-   - ka-addin の URL にアクセスしてアプリケーションが正常に動作しているか確認します。
-
-3. **ローカルでプラグインをテストする**
-1. kintone-addinsをPreviewで起動する
-```bash
-yarn build:dev
-yarn preview
-#またはyarn devは　yarn build:dev + yarn preview　と同じです
-yarn dev
-```
-2. **ngrokをインストールする**
-    1. [ngrok の公式ウェブサイト](https://ngrok.com/)にアクセスします。
-    2. 「Sign up」をクリックしてアカウントを登録するか、既存のアカウントにログインします。
-    3. 登録またはログイン後、ダッシュボードに進み、ダウンロードリンクが表示されます。操作システム（Windows、macOS、Linux）に応じて、適切なバージョンを選択してダウンロードします。
-    4. ダウンロード後、`.zip` ファイルを解凍します。
-    5. ngrok を設定する
-        1. ngrok ダッシュボードにログインし、ホームページで認証トークンを見つけます。
-        2. ターミナル（またはコマンドプロンプト）を開き、以下のコマンドを実行して認証トークンを追加します：
-        ```bash
-        ngrok config add-authtoken <認証トークン>
-        ```
-    6. ngrok を起動する
-        ```bash
-        ngrok https http://localhost:4173/
-        ```
+   - ka-addin の URL にアクセスしてアプリケーションが正常に動作しているか確認します。
--- a/plugin/kintone-addins/src/actions/auto-numbering.ts
+++ b/plugin/kintone-addins/src/actions/auto-numbering.ts
@@ -7,6 +7,7 @@ declare global {
    interface Window { $format: any; }  
 }

+
 interface IAutoNumberingProps{
    //文書番号を格納する
    field:IField;
@@ -34,13 +35,7 @@ export class AutoNumbering implements IAction{
        globalThis.window.$format=this.format;
        this.register();
    }
-/**
- * アクションの処理を実装する
- * @param actionNode アクションノード
- * @param event Kintoneのイベント
- * @param context コンテキスト（レコード、変数情報を持っている）
- * @returns 
- */
+
    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
        let result={
            canNext:false,
@@ -84,7 +79,6 @@ export class AutoNumbering implements IAction{

    execEval(match:string,expr:string):string{
        console.log(match);
-        // @ts-ignore
        return eval(expr);
    }

--- a/plugin/kintone-addins/src/actions/button-add.css
+++ b/plugin/kintone-addins/src/actions/button-add.css
@@ -1,24 +0,0 @@
-.alc-button-normal {
-    display: inline-block;
-    box-sizing: border-box;
-    padding: 0 16px;
-    margin-left: 16px;
-    margin-top: 8px;
-    min-width: 100px;
-    outline: none;
-    border: 1px solid #e3e7e8;
-    background-color: #f7f9fa;
-    box-shadow: 1px 1px 1px #fff inset;
-    color: #3498db;
-    text-align: center;
-    line-height: 32px;
-}
-.alc-button-normal:hover {
-    background-color: #c8d6dd;
-    box-shadow: none;
-    cursor: pointer;
-  }
-.alc-button-normal:active {
-    color: #f7f9fa;
-    background-color: #54b8eb;
-}
--- a/plugin/kintone-addins/src/actions/button-add.ts
+++ b/plugin/kintone-addins/src/actions/button-add.ts
@@ -1,91 +0,0 @@
-
-import { actionAddins } from ".";
-import $ from 'jquery';
-import { IAction, IActionProperty, IActionNode, IActionResult } from "../types/ActionTypes";
-import "./button-add.css";
-
-/**
- * ボタン配置属性定義
- */
-interface IButtonAddProps {
-    //ボタン表示名
-    buttonName: string;
-    space?:ISpace;
-    //配置位置
-    position: string;
-    //イベント名
-    eventName:string
-}   
-
-interface ISpace{
-    type:string,
-    elementId:string
-}
-
-export class ButtonAddAction implements IAction {
-    name: string; 
-    actionProps: IActionProperty[]; 
-    props: IButtonAddProps;
-    constructor() { 
-        this.name = "ボタンの配置";
-        this.actionProps = [];
-        this.props = {
-            buttonName: '',
-            position: '',
-            eventName:''
-        }
-        this.register();
-    }
-
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode: IActionNode, event: any): Promise<IActionResult> { 
-        let result = { 
-            canNext: true,
-            result: false
-        };
-        try { 
-            this.actionProps = actionNode.actionProps;
-            if (!('buttonName' in actionNode.ActionValue) && !('position' in actionNode.ActionValue)) { 
-                return result
-            }
-            this.props = actionNode.ActionValue as IButtonAddProps; 
-            //ボタンを配置する
-            let buttonSpace;
-            if(this.props.space && this.props.space.elementId){
-                buttonSpace = kintone.app.record.getSpaceElement(this.props.space.elementId);
-            }else{
-                buttonSpace = kintone.app.record.getHeaderMenuSpaceElement();
-            }
-            if(!buttonSpace) return result;
-  
-            const button =$(`<button id='${this.props.eventName}' class='alc-button-normal' >${this.props.buttonName}</button>`);
-            if(this.props.position==="一番左に追加する"){
-                $(buttonSpace).prepend(button);
-            }else{
-                $(buttonSpace).append(button);
-            }
-            const clickEventName = `${event.type}.customButtonClick.${this.props.eventName}`;
-            button.on("click",()=>{
-                $(document).trigger(clickEventName,event);
-            });
-            return result;
-        } catch (error) {
-            event.error = error;
-            console.error(error);
-            result.canNext = false;
-            return result;
-        }
-    }
-  
-
-    register(): void {
-        actionAddins[this.name] = this;
-    }
-
-}
-new ButtonAddAction();
--- a/plugin/kintone-addins/src/actions/condition-action.ts
+++ b/plugin/kintone-addins/src/actions/condition-action.ts
@@ -1,109 +0,0 @@
-
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes";
-import { ConditionTree } from '../types/Conditions';
-/**
- * アクションの属性定義
- */
-interface ICondition{
-    condition:string;
-    verName:string;
-}
-/**
- * 条件分岐アクション
- */
-export class ConditionAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:ICondition;
-    constructor(){
-        this.name="条件式";
-        this.actionProps=[];
-        this.props={
-            condition:'',
-            verName:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:''
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('condition' in actionNode.ActionValue) && !('verName' in actionNode.ActionValue)) {
-                return result
-            }
-            this.props = actionNode.ActionValue as ICondition;
-            //条件式の計算結果を取得
-            const conditionResult = this.getConditionResult(context);
-            console.log("条件計算結果:",conditionResult);
-            if(conditionResult){
-                result= {
-                    canNext:true,
-                    result:'はい'
-                  }
-            }else{
-                result= {
-                    canNext:true,
-                    result:'いいえ'
-                  }
-            }
-            if(this.props.verName){
-                context.variables[this.props.verName]=result.result;
-            }
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    }
-    /**
-     * 
-     * @param context 条件式を実行する
-     * @returns 
-     */
-    getConditionResult(context:any):boolean{
-        const tree =this.getCondition(this.props.condition);
-        if(!tree){
-            //条件を設定されていません
-            return true;
-        }
-        return tree.evaluate(tree.root,context);
-    }
-
-    /**
-     * @param condition 条件式ツリーを取得する
-     * @returns 
-     */
-    getCondition(condition:string):ConditionTree|null{
-        try{
-            const tree = new ConditionTree();
-            tree.fromJson(condition);
-            if(tree.getConditions(tree.root).length>0){
-                return tree;
-            }else{
-                return null; 
-            }
-        }catch(error){
-            return null;
-        }
-    }
-
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new ConditionAction();
--- a/plugin/kintone-addins/src/actions/counter-check.ts
+++ b/plugin/kintone-addins/src/actions/counter-check.ts
@@ -1,75 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IStrCountCheckProps{
-    field:IField;//チェックするフィールドの対象
-    message:string;//エラーメッセージ
-    maxLength:number;//
-}
-/**
- * 正規表現チェックアクション
- */
-export class StrCountCheckAciton implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IStrCountCheckProps;
-    constructor(){
-        this.name="文字数チェック";
-        this.actionProps=[];
-        this.props={
-            field:{code:''},
-            message:'',
-            maxLength:0
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('strExpression'in actionNode.ActionValue)) {
-                return result
-            }
-            
-            this.props = actionNode.ActionValue as IStrCountCheckProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-            const maxLength = this.props.maxLength;
-            if(value === undefined || value === '' ){
-                return result;
-            }else if(maxLength < value.length){
-                record[this.props.field.code].error = this.props.message;
-            }else{
-                result= {
-                    canNext:true,
-                    result:true
-                  }
-            }
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new StrCountCheckAciton();
--- a/plugin/kintone-addins/src/actions/datetime-getter.ts
+++ b/plugin/kintone-addins/src/actions/datetime-getter.ts
@@ -1,66 +0,0 @@
-import { actionAddins } from ".";
-import { IAction, IActionResult, IActionNode, IActionProperty, IField ,IContext} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IDatetimeGetterProps {
-    /**変数の名前 */
-    verName:string;
-}
-/**
- * 現在日時を取得するアクション
- */
-export class DatetimeGetterAction implements IAction {
-    name: string;
-    actionProps: IActionProperty[];
-    props: IDatetimeGetterProps;
-    constructor() {
-        this.name = "現在日時";
-        this.actionProps = [];
-        this.props = {
-            verName:''
-        }
-        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 (!('verName' in actionNode.ActionValue) ) {
-                return result
-            }
-            this.props = actionNode.ActionValue as IDatetimeGetterProps;
-            
-            let today = new Date();
-          
-            if(this.props.verName){
-                context.variables[this.props.verName]=today.toISOString();
-            }
-
-            return result;
-
-        } catch (error) {
-            event.error = error;
-            console.error(error);
-            result.canNext = false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name] = this;
-    }
-
-}
-new DatetimeGetterAction();
--- a/plugin/kintone-addins/src/actions/error-show.ts
+++ b/plugin/kintone-addins/src/actions/error-show.ts
@@ -2,26 +2,24 @@
 import { actionAddins } from ".";
 import { IAction, IActionProperty, IActionNode, IContext, IActionResult } from "../types/ActionTypes";
 import { ConditionTree } from '../types/Conditions';
-/**
- * アクションの属性定義
- */
+
 interface IErrorShowProps {
    message: string;
    condition: string;
-}   
+}

 export class ErrorShowAction implements IAction {
-    name: string; 
-    actionProps: IActionProperty[]; //调用从import导入关于显示类的定义
-    props: IErrorShowProps;//从上方的interface 定义这个props所需要接受的属性
-    constructor() { //解构函数定义需要的类名
+    name: string;
+    actionProps: IActionProperty[];
+    props: IErrorShowProps;
+    constructor() {
        this.name = "エラー表示";
        this.actionProps = [];
        this.props = {
            message: '',
            condition: ''
        }
-        this.register(); //重置以上注册表
+        this.register();
    }

    /**
@@ -30,20 +28,20 @@ export class ErrorShowAction implements IAction {
     * @param event 
     * @returns 
     */
-    async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> { //异步处理某函数下的：xx属性
-        let result = { 
+    async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> {
+        let result = {
            canNext: true,
            result: false
        };
-        try { //尝试执行以下代码部分
+        try {
            this.actionProps = actionNode.actionProps;
-            if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) { //如果message以及condition两者都不存在的情况下return
+            if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) {
                return result
            }
-            this.props = actionNode.ActionValue as IErrorShowProps; 
-            const conditionResult = this.getConditionResult(context); 
+            this.props = actionNode.ActionValue as IErrorShowProps;
+            const conditionResult = this.getConditionResult(context);
            if (conditionResult) {
-                event.error = this.props.message;
+                event.error = this.props.message
            } else {
                result = {
                    canNext: false,
--- 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,5 +103,6 @@ export class FieldShownAction implements IAction{
    register(): void {
        actionAddins[this.name]=this;
    }
+    
 }
 new FieldShownAction();
--- a/plugin/kintone-addins/src/actions/insert-value.ts
+++ b/plugin/kintone-addins/src/actions/insert-value.ts
@@ -1,507 +0,0 @@
-
-
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
-import { ConditionTree } from '../types/Conditions';
-
-
-
-/**
- * アクションの属性定義
- */
-interface IInsertValueProps{
-    field:IField;
-    condition:string;
-    value:string;
-    show:string;
-}
-/**
- *
- */
-export class InsertValueAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IInsertValueProps;
-    constructor(){
-        this.name="値を挿入する";// DBに登録したアクション名
-        this.actionProps=[];
-        //プロパティ属性の初期化
-        this.props={
-            field:{code:''},
-            condition:'',
-            value:'',
-            show:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-
-    /**
-     * 空白文字を空白文字が非対応のフィールドに挿入しようとしていないか、必須項目フィールドに挿入しようとしていないかチェックする
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputBlank(fieldType :string | undefined,inputValue :string,fieldCode :string,fieldRequired :boolean | undefined,event :any): boolean{
-        //正規表現チェック
-        let blankCheck= inputValue.match(/^(\s|　)+?$/);//半角スペース・タブ文字・改行・改ページ・全角スペース
-
-        if(blankCheck !== null){
-            //空白文字を空白文字が非対応のフィールドに挿入しようとしている場合、例外を発生させる
-            if(fieldType === "NUMBER" || fieldType === "DATE" || fieldType === "DATETIME" || fieldType === "TIME" || fieldType === "USER_SELECT"
-                        || fieldType === "ORGANIZATION_SELECT" || fieldType === "GROUP_SELECT" || fieldType === "RADIO_BUTTON" || fieldType === "DROP_DOWN" || fieldType === "CHECK_BOX" || fieldType === "MULTI_SELECT"){
-                event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドには、空白文字は挿入できません。"; //レコードにエラーを表示
-                throw new Error("「"+fieldCode+"」"+"フィールドには、空白文字は挿入できません。「値を挿入する」コンポーネントの処理を中断しました。");
-
-            //空白文字を必須項目フィールドに挿入しようとしている場合、例外を発生させる
-            }else if(fieldRequired){
-                event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドは必須項目のため、空白文字は挿入できません。"; //レコードにエラーを表示
-                throw new Error("「"+fieldCode+"」"+"フィールドは必須項目のため、空白文字は挿入できません。「値を挿入する」コンポーネントの処理を中断しました。");
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * 入力値が半角数字かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な数値の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputNumber(inputValue :string,fieldCode :string,event :any): boolean{
-        let inputNumberValue = Number(inputValue);//数値型に変換
-
-        //有限数かどうか判定s
-        if(!isFinite(inputNumberValue)){
-            event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
-            throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、有効な数値ではありません。「値を挿入する」コンポーネントの処理を中断しました。");
-        }
-        return true;
-    }
-
-    /** 入力値が有効な日付形式かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputDate(inputValue :string,fieldCode :string,event :any): boolean{
-        //正規表現チェック
-        let twoDigitMonthDay = inputValue.match(/(\d{4})-(\d{2})-(\d{2})$/);//4桁の数字-2桁の数字-2桁の数字
-        let singleDigitMonthDay = inputValue.match(/(\d{4})-(\d{1})-(\d{1})$/);//4桁の数字-1桁の数字-2桁の数字
-        let singleDigitMonth = inputValue.match(/(\d{4})-(\d{1})-(\d{2})$/);//4桁の数字-1桁の数字-2桁の数字
-        let singleDigitDay = inputValue.match(/(\d{4})-(\d{2})-(\d{1})$/);//4桁の数字-2桁の数字-1桁の数字
-        let dateTime = inputValue.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}).000Z/);//時刻入りのUTCの日付形式
-        let date;
-        //date型に変換
-        date = new Date(inputValue);
-
-        //date型変換できたか確認
-        if(date !== undefined && !isNaN(date.getDate())){
-            //正規表現チェック確認
-            if(twoDigitMonthDay === null && singleDigitMonth === null && singleDigitDay === null && singleDigitMonthDay === null && dateTime === null){
-                    event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
-                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。「値を挿入する」コンポーネントの処理を中断しました。");
-            }
-        }
-        return true;
-    }
-
-    /** 入力値が有効な時刻形式かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputTime(inputValue :string,fieldCode :string,event :any): boolean{
-        //正規表現チェック
-        let timeFormat =inputValue.match(/^([0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/);
-
-            //正規表現チェック確認
-            if(timeFormat === null){
-                    event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な時刻形式です。"; //レコードにエラーを表示
-                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な時刻形式です。「値を挿入する」コンポーネントの処理を中断しました。");
-            }
-        return true;
-    }
-
-    /**
-     * 入力値のフィールドタイプがDATETIMEであれば、時刻ありの日付形式変換し、DATEであれば時刻なしの日付形式変換する関数
-     * @param {string} inputValue -挿入する値
-     * @param {string} fieldType  -フィールドタイプ
-     * @return {string} -入力値が日付形式に変換できた場合は文字列を返し、そうでない場合は例外を発生させる
-     */
-    changeDateFormat(inputValue :string, fieldType :string,fieldCode :string,event :any): string{
-        let dateTime;
-        let date;
-
-        //挿入する値をdate型に変換
-        date = new Date(inputValue);
-        //date型変換できたか確認
-        if(date !== undefined && !isNaN(date.getDate())){
-
-            //日時フィールドの場合、時刻ありの日付形式変換
-            if(fieldType === "DATETIME"){
-                dateTime =date.toISOString();
-                return dateTime;
-            }
-
-            //日付フィールドの場合、時刻なしの日付形式変換
-            let dateArray=inputValue.match(/(\d{4})-(\d{1,2})-(\d{1,2})$/);//4桁の数字-1～2桁の数字-1～2桁の数字
-            if(dateArray !== null){
-                let yearIndex = 1;
-                let monthIndex = 2;
-                let dayIndex = 3;
-                let dateFormatted=`${dateArray[yearIndex]}-${dateArray[monthIndex]}-${dateArray[dayIndex]}`
-                return dateFormatted;
-            }
-
-        }
-
-        event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
-        throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。「値を挿入する」コンポーネントの処理を中断しました。");
-    }
-
-    /**
-     * 入力値がフィールドタイプ(ラジオボタン・ドロップダウン・複数選択・ドロップダウン)の選択肢に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な値の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputOption(inputValue :string,fieldOptions :string | undefined,fieldCode :string,event :any): boolean {
-
-        //入力値が選択肢に存在する値かチェックし、存在したらtrueを返す
-        if(fieldOptions !== undefined){
-            let options = Object.keys(fieldOptions);
-            for(var optionsIndex in options){
-                if(options[optionsIndex] === inputValue){
-                    return true;
-                }
-            }
-        }
-
-        event.record[fieldCode]['error']="「"+fieldCode+"」"+"には、存在しない値を挿入しようとしたため、処理を中断しました。";
-        throw new Error("「"+fieldCode+"」"+"には、存在しない値を挿入しようとしたため、処理を中断しました。「値を挿入する」コンポーネントの処理を中断しました。");
-    }
-
-    /**
-     * 入力値がフィールドタイプ(ユーザー選択)で、ユーザー情報に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {string | boolean} 入力値が登録されているユーザー情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
-     */
-    async setInputUser(inputValue :string): Promise<string | boolean>{
-
-        //ユーザー名を格納する変数
-        let usersName;
-        const usersInfoColumnIndex=0;
-
-        try{
-            //APIでユーザー情報を取得する
-            const resp =await kintone.api(kintone.api.url('/v1/users', true), 'GET', {codes:[inputValue ]})
-
-            //入力されたログイン名(メールアドレス)がユーザー情報に登録されている場合、そのユーザー名を取得する
-            if (resp.users[usersInfoColumnIndex].code === inputValue) {
-                usersName=resp.users[usersInfoColumnIndex].name;
-            }
-
-            //ユーザー名が取得できた場合、ログイン名とユーザー名をフィールドにセットする
-            if(usersName === undefined){
-                throw new Error();
-            }
-        }catch{
-            return false;
-        }
-
-        return usersName;
-    }
-
-    /**
-     * 入力値がフィールドタイプ(組織選択)で、組織情報に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {string | boolean} 入力値が登録されている組織情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
-     */
-    async setInputOrganization(inputValue :string): Promise<string | boolean>{
-
-        //組織名を格納する変数
-        let organizationName;
-        const organizationsInfoColumnIndex=0;
-
-        try{
-            //APIで組織情報を取得する
-            const resp =await kintone.api(kintone.api.url('/v1/organizations.json', true), 'GET', {codes:[inputValue ]})
-
-            //入力された組織コードが組織情報に登録されている場合、その組織名を取得する
-                if (resp.organizations[organizationsInfoColumnIndex].code === inputValue) {
-                    organizationName=resp.organizations[organizationsInfoColumnIndex].name;
-                }
-
-            //組織名が取得できた場合、組織コードと組織名をフィールドにセットする
-            if(organizationName === undefined){
-                throw new Error();
-            }
-        }catch{
-            return false;
-        }
-
-        return organizationName;
-    }
-
-    /**
-     * 入力値がフィールドタイプ(グループ選択)で、グループ情報に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {string | boolean} 入力値が登録されているグループ情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
-     */
-    async setInputGroup(inputValue :string): Promise<string | boolean>{
-
-        //グループ名を格納する変数
-        let groupsName;
-        const groupsInfoColumnIndex=0;
-
-        try{
-            //APIでグループ情報を取得する
-            const resp =await kintone.api(kintone.api.url('/v1/groups.json', true), 'GET', {codes:[inputValue ]})
-
-            //入力されたグループコードがグループ情報に登録されている場合、そのグループ名を取得する
-            if (resp.groups[groupsInfoColumnIndex].code === inputValue) {
-                groupsName=resp.groups[groupsInfoColumnIndex].name;
-            }
-
-            //グループ名が取得できた場合、グループコードとグループ名をフィールドにセットする
-            if(groupsName === undefined){
-                throw new Error();
-            }
-        }catch{
-            return false;
-        }
-
-        return groupsName;
-    }
-
-
-
-    /**
-     * アクションの実行を呼び出す
-     * @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) && !('value' in actionNode.ActionValue)) {
-                return result
-            }
-
-            const fieldColumnIndex=1;
-            const valueColumnIndex=3;
-
-            //プロパティで選択されたフィールド
-            const field=this.actionProps[fieldColumnIndex].props.modelValue.type;
-            //プロパティの挿入する値
-            const value=this.actionProps[valueColumnIndex].props.modelValue;
-
-            //条件式の結果を取得
-            const conditionResult = this.getConditionResult(context);
-            if(!conditionResult){
-                return result;
-            }
-
-            //プロパティの値を挿入するフィールドが未選択の場合、例外を発生させる
-            if(field === null){
-                throw new Error("「値を挿入する」コンポーネントで、値を挿入するフィールドが指定されていなかったため、処理が中断されました。");
-            }
-
-            //プロパティの値を挿入するフィールドが非対応フィールドの場合、例外を発生させる
-            //添付ファイル・テーブル・カテゴリー・ステータス・作成者・更新者・作業者・リビジョン番号・レコード番号・レコードID・計算・作成日時・更新日時フィールドが選択されている場合、例外を発生させる
-            if(field === "FILE" || field === "SUBTABLE" || field === "CATEGORY" || field === "STATUS"
-                    || field === "STATUS_ASSIGNEE" || field === "CREATOR" || field === "MODIFIER" || field === "__REVISION__"
-                        || field === "RECORD_NUMBER"|| field === "__ID__" || field ==="CALC" || field === "CREATED_TIME" || field === "UPDATED_TIME" ){
-                throw new Error("「値を挿入する」コンポーネントで、選択されたフィールドは、値を挿入するコンポーネントでは非対応のフィールドのため、処理を中断しました。");
-            }
-
-            //プロパティの挿入する値が未入力の場合、例外を発生させる
-            if(value === ""){
-                throw new Error("「値を挿入する」コンポーネントで、フィールドに挿入する値が指定されていなかったため、処理が中断されました。");
-            }
-
-            //既定のプロパティのインターフェースへ変換する
-            this.props = actionNode.ActionValue as IInsertValueProps;
-
-            //挿入する値を取得
-            let fieldValue = this.props.value;
-            //フィールドの種類を取得
-            const fieldType = this.props.field.type;
-            //フィールドが必須項目なのか取得
-            const fieldRequired=this.props.field.required;
-            //挿入するフィールドのコードを取得
-            const fieldCode=this.props.field.code;
-            //挿入する値の形式（手入力か変数）を取得
-            const insertValueType=this.props.show;
-            //ラジオボタン・チェックボックス・複数選択・ドロップダウンの選択肢を取得
-            let fieldOptions =this.props.field.options;
-            //変数の値を格納する
-            let variableValue;
-
-            //変数の場合、値が取得できるかチェック
-            if(insertValueType === "変数" && conditionResult){
-                variableValue = context.variables[fieldValue];
-
-                if(variableValue === undefined){
-                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした変数は、無効な入力形式です。");
-                }
-                fieldValue = variableValue;
-            }
-
-            //入力値チェック後、形式変換、型変換した値を格納する変数
-            let correctFormattedValue;
-            //入力値チェック後、形式変換、型変換した値を格納する配列
-            let correctValues :string[] = [];
-            //入力エラー（空白文字の混入）がないことをチェック
-            let notInputError=this.checkInputBlank(fieldType,fieldValue,fieldCode,fieldRequired,event);
-
-            //条件式の結果がtrue、入力エラー（空白文字の混入）がない場合、挿入する値をフィールドタイプ別にチェックする
-            if(conditionResult && notInputError){
-
-                //文字列型のフィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
-                if(fieldType === "SINGLE_LINE_TEXT" || fieldType === "MULTI_LINE_TEXT" || fieldType === "RICH_TEXT" || fieldType === "LINK" ){
-                    correctFormattedValue = fieldValue;
-
-                //数値型のフィールドに挿入しようとしている値が適切の場合、数値型に型変換してcorrectFormattedValueに代入する
-                }else if(fieldType === "NUMBER" ){
-                    if(this.checkInputNumber(fieldValue,fieldCode,event)){//入力値チェック
-                        correctFormattedValue = Number(fieldValue);//型変換
-                    }
-
-                //日付・日時型のフィールドに挿入しようとしている値が適切の場合、指定の日付・日時に形式変換してcorrectFormattedValueに代入する
-                }else if(fieldType === "DATE" || fieldType === "DATETIME" ){
-                    if(this.checkInputDate(fieldValue,fieldCode,event)){//入力値チェック
-                        let formattedDate = this.changeDateFormat(fieldValue,fieldType,fieldCode,event)
-                        if(formattedDate){
-                            correctFormattedValue = formattedDate
-                        }
-                    }
-
-                //時刻フィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
-                }else if(fieldType === "TIME"){
-                    if(this.checkInputTime(fieldValue,fieldCode,event)){//入力値チェック
-                        correctFormattedValue = fieldValue;
-                    }
-
-                //ラジオボタン・ドロップダウンのフィールドの選択肢と入力値が一致した場合、correctFormattedValueに代入する
-                }else if(fieldType === "RADIO_BUTTON" || fieldType === "DROP_DOWN"){
-                    if(this.checkInputOption(fieldValue,fieldOptions,fieldCode,event)){//入力値チェック
-                        correctFormattedValue = fieldValue;
-                    }
-
-                //チェックボックス・複数選択のフィールドの選択肢と入力値が一致した場合、correctValuesの配列に代入する
-                }else if(fieldType === "CHECK_BOX" || fieldType === "MULTI_SELECT" ){
-                    if(this.checkInputOption(fieldValue,fieldOptions,fieldCode,event)){//入力値チェック
-                        correctValues[0] = fieldValue;
-                    }
-
-                //ユーザー情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
-                }else if(fieldType === "USER_SELECT"){
-                    //挿入する値がユーザー情報から見つかれば、ユーザー名を格納
-                    let users=await this.setInputUser(fieldValue);
-
-                    //ユーザー名が格納できている場合、ログイン名とユーザー名をcorrectFormattedValueに代入する
-                    if(!users){
-                        event.record[fieldCode]['error']="ユーザー選択に、挿入しようとしたユーザー情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
-                        throw new Error("ユーザー選択に、挿入しようとしたユーザー情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
-                    }else{
-                        correctFormattedValue=[{ code: fieldValue, name: users }];
-                    }
-
-                //組織情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
-                }else if(fieldType === "ORGANIZATION_SELECT"){
-                    //挿入する値が組織情報から見つかれば、組織名を格納
-                    let organizations=await this.setInputOrganization(fieldValue);
-
-                    //組織名が格納できている場合、組織コードと組織名をcorrectFormattedValueに代入する
-                    if(!organizations){
-                        event.record[fieldCode]['error']="組織選択フィールドに、挿入しようとした組織情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
-                        throw new Error("組織選択フィールドに、挿入しようとした組織情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
-                    }else{
-                        correctFormattedValue=[{ code: fieldValue, name: organizations}];
-                    }
-
-                //グループ情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
-                }else if(fieldType === "GROUP_SELECT"){
-                    //挿入する値がグループ情報から見つかれば、グループ名を格納
-                    let groups=await this.setInputGroup(fieldValue);
-
-                    //グループ名が格納できている場合、グループコードとグループ名をcorrectFormattedValueに代入する
-                    if(!groups){
-                        event.record[fieldCode]['error']="グループ選択フィールドに、挿入しようとしたグループ情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
-                        throw new Error("グループ選択フィールドに、挿入しようとしたグループ情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
-                    }else{
-                        correctFormattedValue=[{ code: fieldValue, name: groups}];
-                    }
-                }
-            }
-
-            //条件式の結果がtrueかつ挿入する値が変換できた場合、フィールド（ラジオボタン・ドロップダウン・チェックボックス・複数選択・文字列一行・文字列複数行・リッチエディタ・数値・日付・日時・時刻）にセット
-            if(conditionResult && (correctFormattedValue || correctValues)){
-                //条件式の結果がtureかつ、値を正しい形式に変換できた場合、フィールドに値をセットする
-                if(correctFormattedValue){
-                    event.record[fieldCode].value = correctFormattedValue;
-                //条件式の結果がtureかつ、値を正しい形式（配列）に変換できた場合、フィールドに値（配列）をセットする
-                }else if(correctValues.length > 0){
-                    event.record[fieldCode].value = correctValues;
-                }
-            }
-
-            result= {
-                canNext:true,
-                result:true
-            }
-            return result;
-        }catch(error:any){
-            event.record;
-            event.error=error.message;
-            console.error(error);
-            result.canNext=true;//次のノードは処理を続ける
-            return result;
-        }
-
-    }
-
-    /**
-     *
-     * @param context 条件式を実行する
-     * @returns
-     */
-    getConditionResult(context:any):boolean{
-        //プロパティ`condition`から条件ツリーを取得する
-        const tree =this.getCondition(this.props.condition);
-        if(!tree){
-            //条件を設定されていません
-            return true;
-        }
-        return tree.evaluate(tree.root,context);
-    }
-
-    /**
-     * @param condition 条件式ツリーを取得する
-     * @returns
-     */
-    getCondition(condition:string):ConditionTree|null{
-        try{
-            const tree = new ConditionTree();
-            tree.fromJson(condition);
-            if(tree.getConditions(tree.root).length>0){
-                return tree;
-            }else{
-                return null;
-            }
-        }catch(error){
-            return null;
-        }
-    }
-
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-
-}
-new InsertValueAction();
--- a/plugin/kintone-addins/src/actions/mail-check.ts
+++ b/plugin/kintone-addins/src/actions/mail-check.ts
@@ -1,80 +0,0 @@
-import { actionAddins } from ".";
-import { IAction, IActionResult, IActionNode, IActionProperty, IField } from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IMailCheckProps {
-    field: IField;//チェックするフィールドの対象
-    message: string;//エラーメッセージ
-    emailCheck:string;
-}
-/**
- * メールアドレスチェックアクション
- */
-export class MailCheckAction implements IAction {
-    name: string;
-    actionProps: IActionProperty[];
-    props: IMailCheckProps;
-    constructor() {
-        this.name = "メールアドレスチェック";
-        this.actionProps = [];
-        this.props = {
-            field: { code: '' },
-            message: '',
-            emailCheck:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode: IActionNode, event: any): Promise<IActionResult> {
-        let result = {
-            canNext: true,
-            result: false
-        };
-
-        try {
-            //属性設定を取得する
-            this.actionProps = actionNode.actionProps;
-
-            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('emailCheck' in actionNode.ActionValue)) {
-                return result
-            }
-            this.props = actionNode.ActionValue as IMailCheckProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-
-            if (this.props.emailCheck === '厳格') {
-                if (!/^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)) {
-                    record[this.props.field.code].error = this.props.message;
-                }
-            } else if (this.props.emailCheck === 'ゆるめ') {
-                if (!/^[^@]+@[^@]+$/.test(value)) {
-                    record[this.props.field.code].error = this.props.message;
-                }
-            } else {
-                result = {
-                    canNext: true,
-                    result: true
-                }
-            }
-            return result;
-        } catch (error) {
-            event.error = error;
-            console.error(error);
-            result.canNext = false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name] = this;
-    }
-
-}
-new MailCheckAction();
--- a/plugin/kintone-addins/src/actions/regular-check.ts
+++ b/plugin/kintone-addins/src/actions/regular-check.ts
@@ -1,72 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IRegularCheckProps{
-    field:IField;//チェックするフィールドの対象
-    message:string;//エラーメッセージ
-    regExpression:string;//正規表現式
-}
-/**
- * 正規表現チェックアクション
- */
-export class RegularCheckAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IRegularCheckProps;
-    constructor(){
-        this.name="正規表現チェック";
-        this.actionProps=[];
-        this.props={
-            field:{code:''},
-            message:'',
-            regExpression:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('regExpression'in actionNode.ActionValue)) {
-                return result
-            }
-            this.props = actionNode.ActionValue as IRegularCheckProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-            const regex = new RegExp(this.props.regExpression);
-            if(!regex.test(value)){
-                record[this.props.field.code].error=this.props.message;
-            }else{
-                result= {
-                    canNext:true,
-                    result:true
-                  }
-            }
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new RegularCheckAction();
--- a/plugin/kintone-addins/src/actions/string-join.ts
+++ b/plugin/kintone-addins/src/actions/string-join.ts
@@ -1,211 +0,0 @@
-import { actionAddins } from ".";
-import { IField, IAction,IActionResult, IActionNode, IActionProperty } from "../types/ActionTypes";
-import { Formatter } from "../util/format";
-
-//右UI画面propertyのname:型：
-interface IStringJoinProps{
-    //保存先フィールド
-    saveField:IField;
-    //結合元フィールド1
-    joinField1:IField;
-    //結合元フィールド2
-    joinField2:IField;
-    //区切り文字
-    delimiter:string;
-}
-
-//IActionインタフェースを実装する新しいクラスActionを作成：
-export class StringJoinAction implements IAction{
-    name: string;
-    //importから導入顕示定義
-    actionProps: IActionProperty[];
-    //上方のinterface Propsから、props受ける属性を定義：
-    props:IStringJoinProps;
-    //関数定義に必要な類名を構築：
-    constructor(){
-        //pgAdminDBに登録したアクション名(name/subtitle)一致する必要がある：
-        this.name="文字結合";
-        this.actionProps=[];
-        this.register();
-        //プロパティ属性初期化：
-        this.props={
-            saveField:{code:''},
-            joinField1:{code:''},
-            joinField2:{code:''},
-            delimiter:''
-        }
-        //リセット上記登録表：
-        this.register();
-    }
-/**
- * アクションの処理を実装する
- * @param actionNode アクションノード
- * @param event Kintoneのイベント
- * @param context コンテキスト（レコード、変数情報を持っている）
- * @returns 
- */
-　　//非同期処理ある関数下のある属性：
-    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
-        let result={
-            //後継処理不可：
-            canNext:false,
-            result:false
-        };
-        try{
-            //属性設定を取得する：
-            this.actionProps=actionNode.actionProps;
-            //プロパティ設定のデータ型は必要な情報含めますか？全部不存在時return:
-            if (!('saveField' in actionNode.ActionValue) && !('joinField1' in actionNode.ActionValue) && !('joinField2' in actionNode.ActionValue)) {
-                return result
-            }
-
-            //既定のプロパティのインタフェースへ変換：
-            this.props = actionNode.ActionValue as IStringJoinProps;
-            const record = event.record;
-
-            //kintoneフィールドタイプ取得：
-            const joinField1type=this.props.joinField1.type;
-            const joinField2type=this.props.joinField2.type;
-            const saveFieldtype=this.props.saveField.type;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-            // //保存先フィールドは文字列フィールドではない場合、エラー発生：
-            if(!(saveFieldtype==='SINGLE_LINE_TEXT'||saveFieldtype==='MULTI_LINE_TEXT'||saveFieldtype==='RICH_TEXT')){
-                event.error='[エラーメッセージ]：結合保存先対応不可。結合しません';
-                if (event.type.includes('success')){
-                    window.alert("[windows alert]："+event.error);
-                }
-                result = {
-                    canNext: false,
-                    result: false
-                }
-                return result;
-            }
-//////////////////////////////////////////////////////////////////////////////////////////
-    //値取得方法定義：
-    function getValue(value:string,type:string|undefined,fieldCode:string,event:any){
-        if(event.record[fieldCode]?.value===undefined||event.record[fieldCode]?.value===null){
-            event.record[fieldCode].value='';
-        }
-        //作成者、更新者：
-        if(type==='CREATOR'||type==='MODIFIER'){
-            value = event.record[fieldCode]?.value.name;
-        //日時、作成日時、更新日時：
-        }else if(type==='DATETIME'||type==='CREATED_TIME'||type==='UPDATED_TIME'){
-            if(event.record[fieldCode]?.value!==undefined && event.record[fieldCode]?.value!==''){
-                value = Formatter.dateFormat(new Date(event.record[fieldCode]?.value),'yyyy-MM-dd HH:mm');
-                }else{
-                    value=event.record[fieldCode]?.value;
-                }
-        //ユーザ選択、組織選択、グループ選択、添付ファイル名、作業者、カテゴリー：
-        }else if(type==='USER_SELECT'||type==='ORGANIZATION_SELECT'||type==='GROUP_SELECT'||type==='FILE'||type==='STATUS_ASSIGNEE'){
-            if(event.record[fieldCode]?.value===undefined || event.record[fieldCode]?.value===''){
-                value = event.record[fieldCode]?.value;
-            }else{
-                const mototext=event.record[fieldCode]?.value;
-                let arr=[];
-                for(let i=0;i<mototext.length;i++){
-                    arr.push(mototext[i].name);
-                }
-          　　　//配列要素を,で連結して文字列を作成：
-                value=arr.join();
-            }
-        //カテゴリー、チェックボックス、複数選択：
-        }else if(type==='CATEGORY'||type==='CHECK_BOX'||type==='MULTI_SELECT'){
-            if(event.record[fieldCode]?.value===undefined || event.record[fieldCode]?.value===''){
-                value = event.record[fieldCode]?.value;
-            }else{
-                const mototext=event.record[fieldCode]?.value;
-                let arr=[];
-                for(let i=0;i<mototext.length;i++){
-                    arr.push(mototext[i]);
-                }
-          　　　//配列要素を,で連結して文字列を作成：
-                value=arr.join();
-            }
-        //詳細画面プロセス実行後のステータス：
-        }else if(type==='STATUS'&&event.type.includes('process')){
-            value = event.nextStatus.value;
-        }else{
-            value = event.record[fieldCode]?.value;
-        }
-        if (value===undefined || value===null){
-            value='';
-        }        
-        return value;     
-    }
-//////////////////////////////////////////////////////////////////////
-            //値取得方法呼出：
-            let joinValue1:string='';
-            joinValue1=getValue(joinValue1,joinField1type,this.props.joinField1.code,event);
-/////////////////////////////////////////////////////////////////////////////////////
-            let joinValue2:string='';
-            joinValue2=getValue(joinValue2,joinField2type,this.props.joinField2.code,event);
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-            const conString = this.props.delimiter;
-            let saveValue:string='';
-            //前後結合元が空白なら区切り文字も空白にする(例:1-8の8無いなら1。1-8の1無いなら8。1空白8の8無いなら1。結合元全部空白なら全部空白):
-            if(joinValue1===''&&joinValue2===''){
-                saveValue='';
-            }else if(joinValue1===''&&joinValue2!==''){
-                saveValue=joinValue2;
-            }else if(joinValue2===''&&joinValue1!==''){
-                saveValue=joinValue1;
-            }else if(joinValue1!==''&&joinValue2!==''){
-                saveValue=`${joinValue1}${conString}${joinValue2}`
-            }
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            //新規/更新/一覧保存成功後の以外のeventでPUT使用しない：
-            if (!event.type.includes('success')){
-                 //保存先フィールドに値セット：
-                 record[this.props.saveField.code].value=saveValue;
-                 window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。");
-            }else{
-                const params={
-                    "app":event.appId,
-                    "id":event.recordId,
-                    "record":{[this.props.saveField.code]:{"value":saveValue}}
-                };
-                return await kintone.api(kintone.api.url('/k/v1/record',true),'PUT',params).then((resp) => {
-                    //kintone保存先フィールド存在確認：
-                    record[this.props.saveField.code].value=saveValue;
-                    if (event.type.includes('index')){
-                        window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。一覧画面更新成功後自動リロードしません。必要に応じて手動リロードください。");
-                    }else{
-                        window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。");
-                    }
-                        //一覧画面更新成功後リロード：
-                    // if (event.type.includes('index')){
-                    //     event.url = location.href.endsWith('/') || location.href.endsWith('&') ?
-                    //     location.href.slice(0, -1) :
-                    //     location.href + (location.href.includes('?') ? '&' : '/');
-                    // }
-                }).catch((error) => {
-                    event.error = 'エラーが発生しました。結合しません。システム管理者へお問合せください';
-                    window.alert(event.error+"error message："+error);
-                    return event;
-                });
-            }
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-            result= {
-                canNext:true,
-                result:true
-            }
-            return result;
-        }catch(error){;
-            if (event.type.includes('success')){
-                window.alert("[windows alert]：処理中異常が発生しました。結合しません。システム担当者へお問合せください。errorメッセージ："+error)
-            }
-            event.error="[エラーメッセージ]：処理中異常が発生しました。結合しません。システム担当者へお問合せください。errorメッセージ："+error;
-            return {
-                canNext:false,
-                result:false
-            }
-        }
-    }
-///////////////////////////////////////////////////////////////////////////////////////////////
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-}
-new StringJoinAction();
--- a/plugin/kintone-addins/src/actions/validation
+++ b/plugin/kintone-addins/src/actions/validation
@@ -1,102 +0,0 @@
-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/actions/value-getter.ts
+++ b/plugin/kintone-addins/src/actions/value-getter.ts
@@ -1,68 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IGetValueProps{
-    field:IField;//チェックするフィールドの対象
-    verName:string;
-}
-/**
- * 正規表現チェックアクション
- */
-export class GetValueAciton implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IGetValueProps;
-    constructor(){
-        this.name="値を取得する";
-        this.actionProps=[];
-        this.props={
-            field:{code:''},
-            verName:''
-        }
-        //アクションを登録する
-        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) && !('verName' in actionNode.ActionValue)) {
-                return result
-            }
-            
-            this.props = actionNode.ActionValue as IGetValueProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-            context.variables[this.props.verName] = value;
-            result = {
-                canNext:true,
-                result:true
-                }
-            
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new GetValueAciton();
--- a/plugin/kintone-addins/src/index.ts
+++ b/plugin/kintone-addins/src/index.ts
@@ -1,3 +1,9 @@
+// export const sum = (a: number, b: number) => {
+//   if ('development' === process.env.NODE_ENV) {
+//     console.log('boop');
+//   }
+//   return a + b;
+// };
 import $ from 'jquery';
 import { ActionProcess } from './types/action-process';
 import { ActionFlow } from './types/ActionTypes';
@@ -8,58 +14,14 @@ declare const alcflow : {
 };

 $(function (){
-    const getChangeEvents=(events:string[])=>{
-      return events.filter((event)=>event.includes(".change."));
-    }
-    const getClickEvents=(events:string[])=>{
-      return events.filter((event)=>event.includes(".customButtonClick."));
-    }
-    const getKintoneEvents=(events:string[])=>{
-      return events.filter((event)=>{
-        return !event.includes(".customButtonClick.") && !event.includes(".change.")
-      });
-    }
    const events=Object.keys(alcflow);
-    const changeEvents = getChangeEvents(events);
-    const clickEvents = getClickEvents(events);
-    const kintoneEvents = getKintoneEvents(events);
-    if(kintoneEvents.length>0 ){
-      //通常Kintoneイベントをバンド
-      kintone.events.on(kintoneEvents,async (event:any)=>{
-        const flowinfo = alcflow[event.type];
-        const flow=ActionFlow.fromJSON(flowinfo.content);
-        if(flow!==undefined){
-          const process = new ActionProcess(event.type,flow,event);
-          await process.exec();
-        }
-        return event;
-      });
-    }
-    if(changeEvents.length>0){
-      //値変更イベントをバンドする
-      kintone.events.on(changeEvents,(event:any)=>{
-        const flowinfo = alcflow[event.type];
-        const flow=ActionFlow.fromJSON(flowinfo.content);
-        if(flow!==undefined){
-          const process = new ActionProcess(event.type,flow,event);
-          process.exec();
-        }
-        return event;
-      });
-    }
-    if(clickEvents.length>0){
-      clickEvents.forEach((eventName:string)=>{
-        $(document).on(eventName,async ()=>{
-          const event=kintone.app.record.get();
-          const flowinfo = alcflow[eventName];
-          const flow=ActionFlow.fromJSON(flowinfo.content);
-          if(flow!==undefined){
-            const process = new ActionProcess(eventName,flow,event);
-            await process.exec();
-          }
-          const record = event.record;
-          kintone.app.record.set({record})
-        });
-      });
-    }
+    kintone.events.on(events,async (event:any)=>{
+      const flowinfo = alcflow[event.type];
+      const flow=ActionFlow.fromJSON(flowinfo.content);
+      if(flow!==undefined){
+        const process = new ActionProcess(event.type,flow,event);
+        await process.exec();
+      }
+      return event;
+    });
 });
--- a/plugin/kintone-addins/src/types/ActionTypes.ts
+++ b/plugin/kintone-addins/src/types/ActionTypes.ts
@@ -89,8 +89,6 @@ export interface IField{
  name?:string;
  code:string;
  type?:string;
-  required?:boolean;
-  options?:string;
 }

 /**
@@ -159,19 +157,19 @@ export class ActionNode implements IActionNode {
  prevNodeId?: string;
  nextNodeIds: Map<string, string>;
  constructor(
-    {id,name,title,inputPoint,outputPoints,actionProps}:
+    {id,name,title,inputPoint,outputPoint,actionProps}:
    {
      id:string,
      name: string,
      title: string,
      inputPoint: string,
-      outputPoints: Array<string>,
+      outputPoint: Array<string>,
      actionProps: Array<IActionProperty>}
  ) {
    this.id=id;
    this.name = name;
    this.inputPoint = inputPoint;
-    this.outputPoints = outputPoints;
+    this.outputPoints = outputPoint;
    const defProp = ActionProperty.defaultProperty();
    defProp.props.modelValue = title;
    this.actionProps = actionProps;
@@ -259,7 +257,7 @@ export class ActionFlow implements IActionFlow {
    const actionNodes = parsedObject.actionNodes.map((node: any) => {
      const nodeClass = !node.isRoot ? new ActionNode(node)
        : new RootAction(node);
-      nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
+      nodeClass.nextNodeIds = new Map(node.nextNodeIds);
      nodeClass.prevNodeId = node.prevNodeId;
      nodeClass.id = node.id;
      return nodeClass;
--- a/plugin/kintone-addins/src/types/Conditions.ts
+++ b/plugin/kintone-addins/src/types/Conditions.ts
@@ -324,17 +324,12 @@ export class ConditionTree {
   */
  getObjectValue(object:any,context:IContext){
    if(!object || typeof object!=="object" || !("objectType" in object)){
-        return undefined;
+        return object;
    }
    if(object.objectType==='field'){
-      const fieldValue = context.record[object.code];
-      if(fieldValue.type==='NUMBER' && fieldValue.value!==undefined){
-        return Number(fieldValue.value);
-      }else{
-        return fieldValue.value;
-      }      
-    }else if(object.objectType==='variable'){
-      return context.variables[object.name].value;
+      return context.record[object.code].value;
+    }else if(object.objectType==='var'){
+      return context.variables[object.varName].value;
    }
  }

@@ -402,12 +397,6 @@ export class ConditionTree {
   */
  compare(operator: Operator, targetValue: any, value: any): boolean {
    // targetValue は日期时，value も日期に変換して比較する
-    if(targetValue===undefined || targetValue===null||targetValue===''){
-      if(value===undefined || value===null||value===''){
-        targetValue='';
-        value='';
-      }
-    }
    if (targetValue instanceof Date) {
      const dateValue = new Date(value);
      if (!isNaN(dateValue.getTime())) {
--- a/plugin/kintone-addins/src/types/action-process.ts
+++ b/plugin/kintone-addins/src/types/action-process.ts
@@ -3,17 +3,6 @@ import { actionAddins } from "../actions";
 import '../actions/must-input';
 import '../actions/auto-numbering';
 import '../actions/field-shown';
-import '../actions/error-show';
-import '../actions/button-add';
-import '../actions/condition-action';
-import '../actions/regular-check';
-import '../actions/mail-check';
-import '../actions/counter-check';
-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{
@@ -46,11 +35,7 @@ export class ActionProcess{
           if(action!==undefined){
            result = await action.process(nextAction,this.event,this.context);
           }
-           let nextInput = '';
-           //outputPoints一㝤以上㝮場坈〝次㝮InputPoint㝯戻り値を設定㝙る
-           if(nextAction.outputPoints && nextAction.outputPoints.length>1){
-             nextInput = result.result||'';
-           }
+           const nextInput = nextAction.outputPoints!==undefined?result.result||'':'';
           id=nextAction.nextNodeIds.get(nextInput);
           if(id===undefined) return;
           nextAction = this.flow.findNodeById(id); 
--- a/plugin/kintone-addins/tsconfig.json
+++ b/plugin/kintone-addins/tsconfig.json
@@ -15,8 +15,8 @@

    /* Linting */
    "strict": true,
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
    "noFallthroughCasesInSwitch": true,
    "esModuleInterop": true
  },
--- a/plugin/kintone-addins/vite.config.js
+++ b/plugin/kintone-addins/vite.config.js
@@ -1,26 +1,16 @@
 // vite.config.js
-import { defineConfig } from "vite";
-import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js";
-import checker from "vite-plugin-checker";
-
-const sourcemap = process.env.SOURCE_MAP === "true";
+import { defineConfig } from 'vite'
+const sourcemap = process.env.SOURCE_MAP==='true';

 export default defineConfig({
-  plugins: [
-    checker({
-      typescript: true,
-    }),
-    cssInjectedByJsPlugin(),
-  ],
  build: {
-    cssCodeSplit: false,
    rollupOptions: {
-      input: "src/index.ts", // entry file
-      output: {
-        entryFileNames: "alc_runtime.js",
+      input: 'src/index.ts',  // entry file
+      output:{
+        entryFileNames:'alc_runtime.js',
        // assetFileNames:'alc_kintone_style.css'
-      },
+      }
    },
-    sourcemap: sourcemap,
-  },
-});
+    sourcemap:sourcemap
+  }
+})
--- a/plugin/kintone-addins/yarn.lock
+++ b/plugin/kintone-addins/yarn.lock
@@ -2,160 +2,11 @@
 # yarn lockfile v1


-"@babel/code-frame@^7.12.13":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
-  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
-  dependencies:
-    "@babel/highlight" "^7.24.7"
-    picocolors "^1.0.0"
-
-"@babel/helper-validator-identifier@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
-  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
-
-"@babel/highlight@^7.24.7":
-  version "7.24.7"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
-  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.24.7"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-    picocolors "^1.0.0"
-
-"@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"
  integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==

-"@nodelib/fs.scandir@2.1.5":
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
-  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
-  dependencies:
-    "@nodelib/fs.stat" "2.0.5"
-    run-parallel "^1.1.9"
-
-"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
-  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
-
-"@nodelib/fs.walk@^1.2.3":
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
-  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
-  dependencies:
-    "@nodelib/fs.scandir" "2.1.5"
-    fastq "^1.6.0"
-
 "@types/jquery@^3.5.24":
  version "3.5.24"
  resolved "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.24.tgz"
@@ -163,7 +14,7 @@
  dependencies:
    "@types/sizzle" "*"

-"@types/node@^20.8.9":
+"@types/node@^20.8.9", "@types/node@>= 14":
  version "20.11.0"
  resolved "https://registry.npmjs.org/@types/node/-/node-20.11.0.tgz"
  integrity sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==
@@ -175,32 +26,6 @@
  resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.5.tgz"
  integrity sha512-tAe4Q+OLFOA/AMD+0lq8ovp8t3ysxAOeaScnfNdZpUxaGl51ZMDEITxkvFl1STudQ58mz6gzVGl9VhMKhwRnZQ==

-ansi-escapes@^4.3.0:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
-  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
-  dependencies:
-    type-fest "^0.21.3"
-
-ansi-regex@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
-  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
-
-ansi-styles@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
-  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
-  dependencies:
-    color-convert "^1.9.0"
-
-ansi-styles@^4.1.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
-  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
-  dependencies:
-    color-convert "^2.0.1"
-
 anymatch@~3.1.2:
  version "3.1.3"
  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
@@ -209,31 +34,11 @@ anymatch@~3.1.2:
    normalize-path "^3.0.0"
    picomatch "^2.0.4"

-balanced-match@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
-  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
-
 binary-extensions@^2.0.0:
  version "2.2.0"
  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==

-brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
-  dependencies:
-    balanced-match "^1.0.0"
-    concat-map "0.0.1"
-
-braces@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
-  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
-  dependencies:
-    fill-range "^7.1.1"
-
 braces@~3.0.2:
  version "3.0.2"
  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
@@ -241,23 +46,6 @@ braces@~3.0.2:
  dependencies:
    fill-range "^7.0.1"

-chalk@^2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
-  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
 "chokidar@>=3.0.0 <4.0.0":
  version "3.5.3"
  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
@@ -273,55 +61,6 @@ chalk@^4.1.1:
  optionalDependencies:
    fsevents "~2.3.2"

-chokidar@^3.5.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
-  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
-  dependencies:
-    anymatch "~3.1.2"
-    braces "~3.0.2"
-    glob-parent "~5.1.2"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.6.0"
-  optionalDependencies:
-    fsevents "~2.3.2"
-
-color-convert@^1.9.0:
-  version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
-  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
-  dependencies:
-    color-name "1.1.3"
-
-color-convert@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
-  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
-  dependencies:
-    color-name "~1.1.4"
-
-color-name@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
-
-color-name@~1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
-  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
-
-commander@^8.0.0:
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
-  integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
-
-concat-map@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
-
 esbuild@^0.18.10:
  version "0.18.20"
  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz"
@@ -350,29 +89,6 @@ esbuild@^0.18.10:
    "@esbuild/win32-ia32" "0.18.20"
    "@esbuild/win32-x64" "0.18.20"

-escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
-
-fast-glob@^3.2.7:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
-  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fastq@^1.6.0:
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
-  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
-  dependencies:
-    reusify "^1.0.4"
-
 fill-range@^7.0.1:
  version "7.0.1"
  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
@@ -380,49 +96,13 @@ fill-range@^7.0.1:
  dependencies:
    to-regex-range "^5.0.1"

-fill-range@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
-  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
-  dependencies:
-    to-regex-range "^5.0.1"
-
-fs-extra@^11.1.0:
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.2.0.tgz#e70e17dfad64232287d01929399e0ea7c86b0e5b"
-  integrity sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-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, glob-parent@~5.1.2:
+glob-parent@~5.1.2:
  version "5.1.2"
  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
  dependencies:
    is-glob "^4.0.1"

-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
-  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
-
-has-flag@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
-
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
 immutable@^4.0.0:
  version "4.3.4"
  resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz"
@@ -457,40 +137,6 @@ jquery@^3.7.1:
  resolved "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz"
  integrity sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==

-js-tokens@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
-  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-merge2@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
-  integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
-
-micromatch@^4.0.4:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
-  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
-  dependencies:
-    braces "^3.0.3"
-    picomatch "^2.3.1"
-
-minimatch@^3.0.4:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
 nanoid@^3.3.6:
  version "3.3.6"
  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz"
@@ -501,24 +147,12 @@ normalize-path@^3.0.0, normalize-path@~3.0.0:
  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==

-npm-run-path@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
-  integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
-  dependencies:
-    path-key "^3.0.0"
-
-path-key@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
 picocolors@^1.0.0:
  version "1.0.0"
  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

-picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
+picomatch@^2.0.4, picomatch@^2.2.1:
  version "2.3.1"
  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
@@ -532,11 +166,6 @@ postcss@^8.4.27:
    picocolors "^1.0.0"
    source-map-js "^1.0.2"

-queue-microtask@^1.2.2:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
-  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
-
 readdirp@~3.6.0:
  version "3.6.0"
  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
@@ -544,11 +173,6 @@ readdirp@~3.6.0:
  dependencies:
    picomatch "^2.2.1"

-reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
-
 rollup@^3.27.1:
  version "3.29.4"
  resolved "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz"
@@ -556,14 +180,7 @@ rollup@^3.27.1:
  optionalDependencies:
    fsevents "~2.3.2"

-run-parallel@^1.1.9:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
-  integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
-  dependencies:
-    queue-microtask "^1.2.2"
-
-sass@^1.69.5:
+sass@*, sass@^1.69.5:
  version "1.69.7"
  resolved "https://registry.npmjs.org/sass/-/sass-1.69.7.tgz"
  integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ==
@@ -572,42 +189,11 @@ sass@^1.69.5:
    immutable "^4.0.0"
    source-map-js ">=0.6.2 <2.0.0"

-semver@^7.3.4, semver@^7.5.0:
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
-  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
-
-"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
+source-map-js@^1.0.2, "source-map-js@>=0.6.2 <2.0.0":
  version "1.0.2"
  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==

-strip-ansi@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-supports-color@^5.3.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
-  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
-  dependencies:
-    has-flag "^3.0.0"
-
-supports-color@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
-  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
-  dependencies:
-    has-flag "^4.0.0"
-
-tiny-invariant@^1.1.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127"
-  integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==
-
 to-regex-range@^5.0.1:
  version "5.0.1"
  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
@@ -615,11 +201,6 @@ to-regex-range@^5.0.1:
  dependencies:
    is-number "^7.0.0"

-type-fest@^0.21.3:
-  version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
-  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
-
 typescript@^5.0.2:
  version "5.2.2"
  resolved "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz"
@@ -630,37 +211,6 @@ undici-types@~5.26.4:
  resolved "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz"
  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==

-universalify@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d"
-  integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==
-
-vite-plugin-checker@^0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/vite-plugin-checker/-/vite-plugin-checker-0.6.4.tgz#aca186ab605aa15bd2c5dd9cc6d7c8fdcbe214ec"
-  integrity sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    ansi-escapes "^4.3.0"
-    chalk "^4.1.1"
-    chokidar "^3.5.1"
-    commander "^8.0.0"
-    fast-glob "^3.2.7"
-    fs-extra "^11.1.0"
-    npm-run-path "^4.0.1"
-    semver "^7.5.0"
-    strip-ansi "^6.0.0"
-    tiny-invariant "^1.1.0"
-    vscode-languageclient "^7.0.0"
-    vscode-languageserver "^7.0.0"
-    vscode-languageserver-textdocument "^1.0.1"
-    vscode-uri "^3.0.2"
-
-vite-plugin-css-injected-by-js@^3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/vite-plugin-css-injected-by-js/-/vite-plugin-css-injected-by-js-3.5.1.tgz#b9c568c21b131d08e31aa6d368ee39c9d6c1b6c1"
-  integrity sha512-9ioqwDuEBxW55gNoWFEDhfLTrVKXEEZgl5adhWmmqa88EQGKfTmexy4v1Rh0pAS6RhKQs2bUYQArprB32JpUZQ==
-
 vite@^4.4.5:
  version "4.5.0"
  resolved "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz"
@@ -671,52 +221,3 @@ vite@^4.4.5:
    rollup "^3.27.1"
  optionalDependencies:
    fsevents "~2.3.2"
-
-vscode-jsonrpc@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0.tgz#108bdb09b4400705176b957ceca9e0880e9b6d4e"
-  integrity sha512-wnJA4BnEjOSyFMvjZdpiOwhSq9uDoK8e/kpRJDTaMYzwlkrhG1fwDIZI94CLsLzlCK5cIbMMtFlJlfR57Lavmg==
-
-vscode-languageclient@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageclient/-/vscode-languageclient-7.0.0.tgz#b505c22c21ffcf96e167799757fca07a6bad0fb2"
-  integrity sha512-P9AXdAPlsCgslpP9pRxYPqkNYV7Xq8300/aZDpO35j1fJm/ncize8iGswzYlcvFw5DQUx4eVk+KvfXdL0rehNg==
-  dependencies:
-    minimatch "^3.0.4"
-    semver "^7.3.4"
-    vscode-languageserver-protocol "3.16.0"
-
-vscode-languageserver-protocol@3.16.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0.tgz#34135b61a9091db972188a07d337406a3cdbe821"
-  integrity sha512-sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==
-  dependencies:
-    vscode-jsonrpc "6.0.0"
-    vscode-languageserver-types "3.16.0"
-
-vscode-languageserver-textdocument@^1.0.1:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.11.tgz#0822a000e7d4dc083312580d7575fe9e3ba2e2bf"
-  integrity sha512-X+8T3GoiwTVlJbicx/sIAF+yuJAqz8VvwJyoMVhwEMoEKE/fkDmrqUgDMyBECcM2A2frVZIUj5HI/ErRXCfOeA==
-
-vscode-languageserver-types@3.16.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247"
-  integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==
-
-vscode-languageserver@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/vscode-languageserver/-/vscode-languageserver-7.0.0.tgz#49b068c87cfcca93a356969d20f5d9bdd501c6b0"
-  integrity sha512-60HTx5ID+fLRcgdHfmz0LDZAXYEV68fzwG0JWwEPBode9NuMYTIxuYXPg4ngO8i8+Ou0lM7y6GzaYWbiDL0drw==
-  dependencies:
-    vscode-languageserver-protocol "3.16.0"
-
-vscode-uri@^3.0.2:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-3.0.8.tgz#1770938d3e72588659a172d0fd4642780083ff9f"
-  integrity sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==
-
-yarn@^1.22.22:
-  version "1.22.22"
-  resolved "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz"
-  integrity sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==
--- a/sample.json
+++ b/sample.json
@@ -1,113 +1,33 @@
-{
-  "id": "",
-  "actionNodes": [
-    {
-      "id": "c5cd772a-04be-418e-a811-3787f98a2285",
-      "name": "app.record.create.show",
-      "title": "レコード追加画面",
-      "subTitle": "レコード追加画面を表示した後",
-      "inputPoint": "",
-      "outputPoints": [],
-      "isRoot": true,
-      "actionProps": [],
-      "ActionValue": {},
-      "nextNodeIds": {
-        "": "1eb097b1-9d08-462e-97b0-6e3e1232edef"
-      }
-    },
-    {
-      "id": "1eb097b1-9d08-462e-97b0-6e3e1232edef",
-      "name": "属性UIテスト用",
-      "inputPoint": "",
-      "outputPoints": [],
-      "actionProps": [
-        {
-          "component": "InputText",
-          "props": {
-            "name": "displayName",
-            "displayName": "表示名",
-            "placeholder": "表示を入力してください",
-            "hint": "",
-            "modelValue": "属性UIテスト用"
-          }
-        },
-        {
-          "component": "AppFieldSelect",
-          "props": {
-            "displayName": "フィールド選択(複数)",
-            "modelValue": {
-              "app": {
-                "id": "64",
-                "name": "日報テスト",
-                "description": "日々の業務内容、報告事項、所感などを記載していくアプリです。\n記録を行うだけでなく、あとからの振り返りやメンバー間のコミュニケーションにも活用できます。",
-                "createdate": "2023/07/15 10:15:03"
-              },
-              "fields": [
-                {
-                  "name": "ステータス",
-                  "type": "STATUS",
-                  "code": "ステータス",
-                  "label": "ステータス",
-                  "enabled": false
-                }
-              ]
-            },
-            "name": "selectFields",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType": "multiple"
-          }
-        },
-        {
-          "component": "AppFieldSelect",
-          "props": {
-            "displayName": "フィールド選択(単一)",
-            "modelValue": {
-              "app": {
-                "id": "58",
-                "name": "日報",
-                "description": "",
-                "createdate": "2023/07/13 19:05:26"
-              },
-              "fields": [
-                {
-                  "name": "所感、学び",
-                  "type": "MULTI_LINE_TEXT",
-                  "code": "文字列__複数行__0",
-                  "label": "所感、学び",
-                  "noLabel": false,
-                  "required": false,
-                  "defaultValue": ""
-                }
-              ]
-            },
-            "name": "selectField",
-            "placeholder": "アプリ選択後、フィールドを選んでください",
-            "selectType": "single"
-          }
-        },
-        {
-          "component": "ColorPicker",
-          "props": {
-            "displayName": "色選択",
-            "modelValue": "#f50000",
-            "name": "color",
-            "placeholder": "カラーを選択してください"
-          }
-        },
-        {
-          "component": "NumInput",
-          "props": {
-            "displayName": "数値入力フィールド",
-            "modelValue": 100,
-            "name": "num",
-            "max": 100,
-            "min": 0,
-            "placeholder": "数値を入力してください"
-          }
-        }
-      ],
-      "prevNodeId": "c5cd772a-04be-418e-a811-3787f98a2285",
-      "nextNodeIds": {}
+[
+  {
+    "component": "FieldInput",
+    "props": {
+      "displayName": "フィールド",
+      "modelValue": {},
+      "name": "field",
+      "placeholder": "対象項目を選択してください"
    }
-  ]
-}
+  },
+  {
+    "component": "SelectBox",
+    "props": {
+      "displayName": "表示／非表示",
+      "options": [
+        "表示",
+        "非表示"
+      ],
+      "modelValue": "",
+      "name": "show",
+      "placeholder": ""
+    }
+  },
+  {
+    "component": "ConditionInput",
+    "props": {
+      "displayName": "条件",
+      "modelValue": "",
+      "name": "condition",
+      "placeholder": "対象項目を選択してください"
+    }
+  }
+]
--- a/sample2.json
+++ b/sample2.json
@@ -1,22 +1,59 @@
-[
-  {
-    "component": "FieldInput",
-    "props": {
-      "displayName": "フィールド",
-      "modelValue": {},
-      "name": "field",
-      "placeholder": "対象項目を選択してください"
-    }
-  },
-  {
-    "component": "SelectBox",
-    "props": {
-        "displayName": "チェックする全角文字",
-        "modelValue": null,
-        "name": "options",
-        "placeholder": "チェックしたい全角文字を選択する",
-        "selectType":"multiple",
-        "options":["全角記号および句読点","ひらがな","カタカナ","全角英数字","常用漢字","拡張漢字"]
-    }
-  }
-]
+{
+    "index": 0,
+    "type": "root",
+    "children": [
+        {
+            "index": 1,
+            "type": "condition",
+            "parent": "root",
+            "logicalOperator": "AND",
+            "object": {
+                "label": "Field 1",
+                "value": "field1"
+            },
+            "operator": "=",
+            "value": "1"
+        },
+        {
+            "index": 2,
+            "type": "condition",
+            "parent": "root",
+            "logicalOperator": "AND",
+            "object": {
+                "label": "Field 1",
+                "value": "field1"
+            },
+            "operator": "=",
+            "value": "2"
+        },
+        {
+            "index": 3,
+            "type": "condition",
+            "parent": "root",
+            "logicalOperator": "AND",
+            "object": {
+                "label": "Field 1",
+                "value": "field1"
+            },
+            "operator": {
+                "label": ">",
+                "value": "Greater"
+            },
+            "value": "3"
+        },
+        {
+            "index": 4,
+            "type": "condition",
+            "parent": "root",
+            "logicalOperator": "AND",
+            "object": {
+                "label": "Field 1",
+                "value": "field1"
+            },
+            "operator": "=",
+            "value": "4"
+        }
+    ],
+    "parent": null,
+    "logicalOperator": "AND"
+}
--- a/yarn.lock
+++ b/yarn.lock
@@ -1,4 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
Author	SHA1	Message	Date
方柏	58e22dc55f	bugfix	2024-02-07 18:06:22 +09:00
方柏	f861955b51	bugfix	2024-02-07 16:52:34 +09:00