アプリからフィールド選択の複数選択・単一選択対応

backend/.gitignore

@@ -56,6 +56,7 @@ coverage.xml
 
 # Django stuff:
 *.log
+*.log.*
 local_settings.py
 db.sqlite3
 db.sqlite3-journal

backend/app/api/api_v1/routers/kintone.py

@@ -9,7 +9,7 @@ import app.core.config as config
 import os
 from pathlib import Path
 from app.db.session import SessionLocal
-from app.db.crud import get_flows_by_app,get_activedomain
+from app.db.crud import get_flows_by_app,get_activedomain,get_kintoneformat
 from app.core.auth import get_current_active_user,get_current_user
 from app.core.apiexception import APIException
 
@@ -23,28 +23,132 @@ def getkintoneenv(user = Depends(get_current_user)):
     return kintoneevn
     
 
-def getfieldsfromexcel(df):
+def getkintoneformat():
+    db = SessionLocal()
+    formats = get_kintoneformat(db)
+    db.close()
+    return formats
+
+
+def createkintonefields(property,value,trueformat):
+        p = []
+        if(property=="options"):
+            o=[]
+            for v in value.split(','):
+                o.append(f"\"{v.split('|')[0]}\":{{\"label\":\"{v.split('|')[0]}\",\"index\":\"{v.split('|')[1]}\"}}") 
+            p.append(f"\"options\":{{{','.join(o)}}}")
+        elif(property =="expression"):
+            p.append(f"\"hideExpression\":true")
+            p.append(f"\"expression\":\"{value.split(':')[1]}\"")
+        elif(property =="required" or property =="unique" or property =="defaultNowValue" or property =="hideExpression" or property =="digit"):
+            if str(value) == trueformat:
+                p.append(f"\"{property}\":true")
+            else:
+                p.append(f"\"{property}\":false")
+        elif(property =="protocol"):
+            if(value == "メールアドレス"):
+                p.append("\"protocol\":\"MAIL\"")
+            elif(value == "Webサイト"):
+                p.append("\"protocol\":\"WEB\"")
+            elif(value == "電話番号"):
+                p.append("\"protocol\":\"CALL\"")
+        else:
+            p.append(f"\"{property}\":\"{value}\"")
+        return p
+
+def getfieldsfromexcel(df,mapping):
+    startrow = mapping.startrow
+    startcolumn = mapping.startcolumn
+    typecolumn = mapping.typecolumn
+    codecolumn = mapping.codecolumn
+    property = mapping.field.split(",")
+    trueformat = mapping.trueformat
     appname = df.iloc[0,2]
     col=[]
-    for row in range(5,len(df)):
+    for row in range(startrow,len(df)):
-        if pd.isna(df.iloc[row,1]):
+        if pd.isna(df.iloc[row,startcolumn]):
             break
-        if not df.iloc[row,3] in config.KINTONE_FIELD_TYPE:
+        if not df.iloc[row,typecolumn] in config.KINTONE_FIELD_TYPE:
             continue
         p=[] 
-        for column in range(1,7):
+        for column in range(startcolumn,startcolumn + len(property)):
             if(not pd.isna(df.iloc[row,column])):
-                if(property[column-1]=="options"):
+                propertyname =property[column-1]
-                    o=[]
+                if(propertyname.find("[") == 0):
-                    for v in df.iloc[row,column].split(','):
+                   continue
-                        o.append(f"\"{v.split('|')[0]}\":{{\"label\":\"{v.split('|')[0]}\",\"index\":\"{v.split('|')[1]}\"}}") 
+                elif (propertyname =="remark"):
-                    p.append(f"\"{property[column-1]}\":{{{','.join(o)}}}")
+                    if (df.iloc[row,column].find("|") !=-1):
-                elif(property[column-1]=="required"):
+                        propertyname = "options"
-                    p.append(f"\"{property[column-1]}\":{df.iloc[row,column]}")
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    if (df.iloc[row,column] == "メールアドレス" or df.iloc[row,column] == "Webサイト" or df.iloc[row,column] == "電話番号"):
+                        propertyname = "protocol"
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    if (df.iloc[row,column].find("桁区切り") !=-1):
+                        propertyname = "digit"
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    if (df.iloc[row,column].find("前単位") !=-1):
+                        propertyname = "unitPosition"
+                        p = p + createkintonefields(propertyname, "BEFORE",trueformat)
+                    if (df.iloc[row,column].find("後単位") !=-1):
+                        propertyname = "unitPosition"
+                        p = p + createkintonefields(propertyname, "AFTER",trueformat)   
+                    if (df.iloc[row,column].find("単位「") !=-1):
+                        propertyname = "unit"
+                        ids = df.iloc[row,column].index("単位「")
+                        ide = df.iloc[row,column].index("」")
+                        unit = df.iloc[row,column][ids+3:ide]
+                        p = p + createkintonefields(propertyname, unit,trueformat)                         
+                    else:
+                        continue
+                elif(propertyname =="mixValue"):
+                    if(df.iloc[row,column].find("レコード登録時の日") != -1):
+                        propertyname = "defaultNowValue"
+                        df.iloc[row,column] = trueformat
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    elif(df.iloc[row,column].find("計:") != -1):
+                        propertyname = "expression"
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    elif(df.iloc[row,column] !=""):
+                        propertyname = "defaultValue"
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    else:
+                        continue
+                elif(propertyname=="max" or propertyname == "min"):
+                    if(df.iloc[row,typecolumn] == "NUMBER"):
+                        propertyname = property[column-1] + "Value"
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
+                    else:
+                        propertyname = property[column-1] + "Length"
+                        p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
                 else:
-                    p.append(f"\"{property[column-1]}\":\"{df.iloc[row,column]}\"")
+                    p = p + createkintonefields(propertyname, df.iloc[row,column],trueformat)
-        col.append(f"\"{df.iloc[row,2]}\":{{{','.join(p)}}}")
+
-    fields = ",".join(col).replace("False","false").replace("True","true")
+                # if(propertyname=="options"):
+                #     o=[]
+                #     for v in df.iloc[row,column].split(','):
+                #         o.append(f"\"{v.split('|')[0]}\":{{\"label\":\"{v.split('|')[0]}\",\"index\":\"{v.split('|')[1]}\"}}") 
+                #     p.append(f"\"options\":{{{','.join(o)}}}")
+                # elif(propertyname=="expression"):
+                #     p.append(f"\"hideExpression\":true")
+                #     p.append(f"\"expression\":{df.iloc[row,column].split(':')[1]}")
+                # elif(propertyname=="required" or propertyname =="unique" or propertyname=="defaultNowValue" or propertyname=="hideExpression" or propertyname=="digit"):
+                #     if (df.iloc[row,column] == trueformat):
+                #         p.append(f"\"{propertyname}\":true")
+                #     else:
+                #         p.append(f"\"{propertyname}\":false")
+                # elif(propertyname =="protocol"):
+                #     if(df.iloc[row,column] == "メールアドレス"):
+                #        p.append("\"protocol\":\"MAIL\"")
+                #     elif(df.iloc[row,column] == "Webサイト"):
+                #        p.append("\"protocol\":\"WEB\"")
+                #     elif(df.iloc[row,column] == "電話番号"):
+                #        p.append("\"protocol\":\"CALL\"")
+                # else:
+                #     p.append(f"\"{propertyname}\":\"{df.iloc[row,column]}\"")
+              
+
+        col.append(f"\"{df.iloc[row,codecolumn]}\":{{{','.join(p)}}}")
+        fields = ",".join(col).replace("\\", "\\\\")
     return  json.loads(f"{{{fields}}}")  
 
 def getsettingfromexcel(df):
@@ -129,8 +233,8 @@ def analysefields(excel,kintone):
     adds = excel.keys() - kintone.keys()
     dels = kintone.keys() - excel.keys()
     for key in updates:
-        for p in property:
+        for p in config.KINTONE_FIELD_PROPERTY:
-           if excel[key].get(p) != None and kintone[key][p] != excel[key][p]:
+           if excel[key].get(p) != None and kintone[key].get(p) != None and kintone[key][p] != excel[key][p]:
                 updatefields[key] = excel[key]
                 break
     for key in adds:
@@ -412,10 +516,14 @@ async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkin
     except Exception as e:
         raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAM}->{name}):",e) 
 
-property=["label","code","type","required","defaultValue","options"]
 
 @r.post("/createappfromexcel",)
-async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...),env = Depends(getkintoneenv)):
+async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...),format:int = 0,env = Depends(getkintoneenv)):
+    try:
+        mapping = getkintoneformat()[format]
+    except Exception as e:
+        raise APIException('kintone:createappfromexcel',request.url._url, f"Error occurred while get kintone format:",e)
+
     for file in files:
         if file.filename.endswith('.xlsx'):
             try:
@@ -425,7 +533,7 @@ async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...
                 appname = df.iloc[0,2]
                 desc = df.iloc[2,2] 
                 result = {"app":0,"revision":0,"msg":""}
-                fields = getfieldsfromexcel(df)
+                fields = getfieldsfromexcel(df,mapping)
                 users = getkintoneusers(env)
                 orgs =  getkintoneorgs(env)
                 processes = getprocessfromexcel(df,users["users"], orgs["organizationTitles"])
@@ -442,14 +550,19 @@ async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...
                     result["revision"] = app["revision"]
                     deoployappfromkintone(result["app"],result["revision"],env)
             except Exception as e:
-                raise APIException('kintone:createappfromexcel',request.url._url, f"Error occurred while parsing file ({env.DOMAIN_NAM}->{file.filename}):",e)
+                raise APIException('kintone:createappfromexcel',request.url._url, f"Error occurred while parsing file ({env.DOMAIN_NAME}->{file.filename}):",e)
         else:
             raise APIException('kintone:createappfromexcel',request.url._url, f"File {file.filename} is not an Excel file",e)   
     return result
 
 
 @r.post("/updateappfromexcel")
-async def updateappfromexcel(request:Request,app:str,files:t.List[UploadFile] = File(...),env = Depends(getkintoneenv)):
+async def updateappfromexcel(request:Request,app:str,files:t.List[UploadFile] = File(...),format:int = 0,env = Depends(getkintoneenv)):
+    try:
+        mapping = getkintoneformat()[format]
+    except Exception as e:
+        raise APIException('kintone:updateappfromexcel',request.url._url, f"Error occurred while get kintone format:",e)
+    
     for file in files:
         if file.filename.endswith('.xlsx'):
             try:
@@ -458,7 +571,7 @@ async def updateappfromexcel(request:Request,app:str,files:t.List[UploadFile] =
                 excel = getsettingfromexcel(df)
                 kintone= getsettingfromkintone(app,env)
                 settings = analysesettings(excel,kintone)
-                excel = getfieldsfromexcel(df)
+                excel = getfieldsfromexcel(df,mapping)
                 kintone = getfieldsfromkintone(app,env)
                 users = getkintoneusers(env)
                 orgs =  getkintoneorgs(env)
@@ -493,7 +606,7 @@ async def updateappfromexcel(request:Request,app:str,files:t.List[UploadFile] =
                 if deploy:
                     result = deoployappfromkintone(app,revision,env)
             except Exception as e:
-                raise APIException('kintone:updateappfromexcel',request.url._url, f"Error occurred while parsing file ({env.DOMAIN_NAM}->{file.filename}):",e)
+                raise APIException('kintone:updateappfromexcel',request.url._url, f"Error occurred while parsing file ({env.DOMAIN_NAME}->{file.filename}):",e)
         else:
             raise APIException('kintone:updateappfromexcel',request.url._url, f"File {file.filename} is not an Excel file",e)   
     return result

backend/app/core/config.py

@@ -13,9 +13,12 @@ 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 = ""

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 = 30
+ACCESS_TOKEN_EXPIRE_MINUTES = 2880
 
 
 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=15)
+        expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
     to_encode.update({"exp": expire})
     encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt

backend/app/db/crud.py

@@ -279,7 +279,8 @@ 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 ).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()
     if not eveactions:
         raise HTTPException(status_code=404, detail="Data not found")
     return eveactions
@@ -290,4 +291,8 @@ def create_log(db: Session, error:schemas.ErrorCreate):
     db.add(db_log)
     db.commit()  
     db.refresh(db_log) 
-    return db_log
+    return db_log
+
+def get_kintoneformat(db: Session):
+    formats = db.query(models.KintoneFormat).order_by(models.KintoneFormat.id).all()
+    return formats

backend/app/db/models.py

@@ -85,6 +85,7 @@ 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"
@@ -95,7 +96,18 @@ class EventAction(Base):
 
 class ErrorLog(Base):
        __tablename__ = "errorlog"
-       id = Column(Integer, primary_key=True, index=True)
+
        title = Column(String(50))
        location = Column(String(500))
-       content = Column(String(5000))
+       content = Column(String(5000))
+
+class KintoneFormat(Base):
+      __tablename__ = "kintoneformat"
+
+      name = Column(String(50))
+      startrow =Column(Integer)
+      startcolumn =Column(Integer)
+      typecolumn =Column(Integer)
+      codecolumn =Column(Integer)
+      field = Column(String(5000))
+      trueformat = Column(String(10))

backend/app/db/schemas.py

@@ -137,6 +137,7 @@ class Event(Base):
     eventid: str
     function: str 
     mobile: bool
+    eventgroup: bool
 
     class Config:
         orm_mode = True

document/サイトマップ.drawio

@@ -0,0 +1,147 @@
+<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>

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": {

frontend/quasar.config.js

@@ -36,7 +36,8 @@ module.exports = configure(function (/* ctx */) {
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-vite/boot-files
     boot: [
-      'axios'
+      'axios',
+      'error-handler'
     ],
 
     // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css

frontend/src/boot/axios.ts

@@ -20,22 +20,20 @@ const token=localStorage.getItem('token')||'';
 if(token!==''){
   api.defaults.headers["Authorization"]='Bearer ' + token;
 }
+//axios例外キャプチャー
 api.interceptors.response.use(
   (response)=>response,
   (error)=>{
-    const orgReq=error.config;
+    if (error.response && error.response.status === 401) {
-    if(error.response && error.response.status===401){
+      // 認証エラーの場合再ログインする
-      console.error("401エラー");
+      console.error('(; ﾟДﾟ)/認証エラー(401)：', error);
       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 }) => {

frontend/src/boot/error-handler.ts

@@ -0,0 +1,20 @@
+// 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 }) => {
+  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);
+    }
+  };
+});

frontend/src/components/ActionSelect.vue

@@ -3,13 +3,15 @@
     <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"
+    <q-table v-else  row-key="index" :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>
@@ -20,9 +22,10 @@ export default {
   name: 'actionSelect',
   props: {
     name: String,
-    type: String
+    type: String,
+    filter:String
   },
-  setup() {
+  setup(props) {
     const isLoaded=ref(false);
     const columns = [
     { name: 'name', required: true,label: 'アクション名',align: 'left',field: 'name',sortable: true},
@@ -32,9 +35,9 @@ export default {
     const rows = reactive([])
     onMounted(async () => {
         const res =await api.get('api/actions');
-        res.data.forEach((item) =>
+        res.data.forEach((item,index) =>
         {
-          rows.push({name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
+          rows.push({index,name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
         });
         isLoaded.value=true;
       });
@@ -53,6 +56,7 @@ export default {
 </script>
 <style lang="scss">
 .action-table{
-  height: 100%;
+  min-height: 10vh;
+  max-height: 68vh;
 }
 </style>

frontend/src/components/AppSelect.vue

@@ -1,56 +1,68 @@
 <template>
-  <div class="q-pa-md" >
+  <div class="q-px-xs">
     <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 :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" >
+    <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;">
       <template v-slot:body-cell-description="props">
-          <q-td :props="props">
+        <q-td :props="props">
-              <q-scroll-area  class="description-cell">
+          <q-scroll-area class="description-cell">
-                <div v-html="props.row.description" ></div>
+            <div v-html="props.row.description"></div>
-              </q-scroll-area>
+          </q-scroll-area>
-          </q-td>
+        </q-td>
       </template>
     </q-table>
   </div>
 </template>
 <script lang="ts">
-import { ref,onMounted,reactive } from 'vue'
+import { ref, onMounted, reactive, watchEffect } from 'vue'
 import { api } from 'boot/axios';
-import { LeftDataBus } from './flowEditor/left/DataBus';
 
 export default {
   name: 'AppSelect',
   props: {
     name: String,
-    type: String
+    type: String,
+    filter: String,
+    updateExternalSelectAppInfo: {
+      type: Function
+    }
   },
-  setup() {
+  setup(props) {
-  const columns = [
+    const columns = [
-  { name: 'id', required: true,label: 'ID',align: 'left',field: 'id',sortable: true},
+      { name: 'id', required: true, label: 'ID', align: 'left', field: 'id', sortable: true },
-  { name: 'name', label: 'アプリ名', field: 'name', sortable: true,align:'left' },
+      { name: 'name', label: 'アプリ名', field: 'name', sortable: true, align: 'left' },
-  { name: 'description', label: '概要', field: 'description',align:'left', sortable: false },
+      { name: 'description', label: '概要', field: 'description', align: 'left', sortable: false },
-  { name: 'createdate', label: '作成日時', field: 'createdate',align:'left'}
+      { name: 'createdate', label: '作成日時', field: 'createdate', align: 'left' }
-  ]
+    ]
-    const isLoaded=ref(false);
+    const isLoaded = ref(false);
-    const rows :any[]= reactive([]);
+    const rows: any[] = reactive([]);
-    onMounted( () => {
+    const selected = ref([])
-        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)=>{
+    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;
+      });
+    });
+
+    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());
@@ -62,22 +74,26 @@ export default {
     return {
       columns,
       rows,
-      selected: ref([]),
+      selected,
-      isLoaded
+      isLoaded,
+      pagination: ref({
+        rowsPerPage: 10
+      })
     }
   },
 
 }
 </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;
 }

frontend/src/components/ConditionEditor/ConditionEditor.vue

@@ -1,5 +1,5 @@
 <template>
-  <show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" width="60vw" height="60vh">
+  <show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" min-width="60vw" min-height="60vh">
     <template v-slot:toolbar>
       <q-btn flat round dense icon="more_vert" >
       <q-menu  auto-close anchor="bottom start">

frontend/src/components/ConditionEditor/ConditionObject.vue

@@ -1,30 +1,41 @@
 <template>
-  <q-field v-model="selectedField" labelColor="primary" class="condition-object"
+  <q-field v-model="selectedObject" 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" :dense="true" class="selected-obj">
+      <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
-        {{ selectedField.name }}
+        {{ selectedObject.name }}
+      </q-chip>
+      <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
+        {{ selectedObject.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" widht="400px">
+  <show-dialog v-model:visible="show" name="条件設定項目一覧" @close="closeDg" width="600px">
-    <condition-objects ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></condition-objects>
+    <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>
   </template>
 
   <script lang="ts">
-  import { defineComponent, ref ,watchEffect,computed} from 'vue';
+  import { defineComponent, reactive, 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: {
@@ -35,24 +46,28 @@
     setup(props, { emit }) {
       const appDg = ref();
       const show = ref(false);
-      const selectedField = ref(props.modelValue);
+      const selectedObject = ref(props.modelValue);
       const store = useFlowEditorStore();
       const isSelected = computed(()=>{
-        return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
+        return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.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') {
-          selectedField.value = appDg.value.selected[0];
+          selectedObject.value = appDg.value.selected[0];
         }
       };
 
       watchEffect(() => {
-        emit('update:modelValue', selectedField.value);
+        emit('update:modelValue', selectedObject.value);
       });
 
       return {
@@ -61,8 +76,10 @@
         show,
         showDg,
         closeDg,
-        selectedField,
+        selectedObject,
-        isSelected
+        vars:reactive(vars),
+        isSelected,
+        filter
       };
     }
   });

frontend/src/components/ConditionEditor/NodeCondition.vue

@@ -106,11 +106,7 @@
           </div>
       </template>
     </q-tree>
-    <!-- <q-btn @click="addCondition(tree.root)" class="q-mt-md" color="primary" icon="mdi-plus">Add Condition</q-btn> -->
+   <q-tooltip anchor="center middle" v-model="showingCondition" no-parent-event>
-    <!-- <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>

frontend/src/components/ConditionObjects.vue

@@ -1,53 +1,58 @@
 <template>
-  <div class="q-pa-md">
+  <div class="q-gutter-y-md" style="max-width: 600px;">
-    <div v-if="!isLoaded" class="spinner flex flex-center">
+    <q-card >
-      <q-spinner  color="primary" size="3em" />
+     <q-tabs
-    </div>
+          v-model="tab"
-    <q-table v-else  row-key="name"  :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
+          dense
-  </div>
+          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="appId"></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>
 </template>
-<script>
+<script lang="ts">
-import { ref,onMounted,reactive } from 'vue'
+import { ref, onMounted, reactive } from 'vue'
-import { api } from 'boot/axios';
+import FieldList from './FieldList.vue';
+import VariableList from './VariableList.vue';
 
 export default {
   name: 'ConditionObjects',
+  components:{
+    FieldList,
+    VariableList
+  },
   props: {
     name: String,
     type: String,
-    appId:Number
+    appId: Number,
+    vars: Array,
+    filter:String
   },
   setup(props) {
-    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 {
+    return {
-        columns,
+      tab: ref('fields'),
-        rows,
+      selected: ref([])
-        selected: ref([]),
+    }
-        isLoaded
-      }
   },
 
 }

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`
+      uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel?format=1`
 
     });
 </script>

frontend/src/components/FieldList.vue

@@ -0,0 +1,58 @@
+<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>
+import { ref, onMounted, reactive } from 'vue'
+import { api } from 'boot/axios';
+
+export default {
+  name: 'FieldList',
+  props: {
+    name: String,
+    type: String,
+    appId: Number,
+    modelValue:Array,
+    filter:String
+   },
+   emits:[
+   'update:modelValue'
+   ],
+  setup(props) {
+    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: fld.label, objectType: 'field', ...fld });
+      });
+      isLoaded.value = true;
+    });
+
+    return {
+      columns,
+      rows,
+      // selected: ref([]),
+      isLoaded
+    }
+  },
+
+}
+</script>

frontend/src/components/FieldSelect.vue

@@ -1,53 +1,82 @@
 <template>
-  <div class="q-pa-md">
+  <div class="q-px-md" style=" min-width: 50vw; max-width: 85vw;">
     <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  row-key="name"  :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
+    <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;"/>
   </div>
 </template>
 <script>
-import { ref,onMounted,reactive } from 'vue'
+import { ref, onMounted, reactive, watchEffect } from 'vue'
 import { api } from 'boot/axios';
 
 export default {
   name: 'fieldSelect',
   props: {
     name: String,
-    type: String,
+    type: {
-    appId:Number
+      type: String,
+      default: 'single'
+    },
+    appId: Number,
+    not_page: {
+      type: Boolean,
+      default: false,
+    },
+    selectedFields:{
+      type:Array,
+      default:()=>[]
+    },
+    updateSelects: {
+      type: Function
+    },
+    filter: String,
   },
   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: 'name', required: true, label: 'フィールド名', align: 'left', field: row => row.name, sortable: true },
-    { name: 'code', label: 'フィールドコード', align: 'left',field: 'code', sortable: true },
+      { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
-    { name: 'type', label: 'フィールドタイプ', align: 'left',field: 'type', sortable: true }
+      { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
     ]
-    const rows = reactive([])
+    const pageSetting = ref({
-      onMounted( async () => {
+      sortBy: 'desc',
-          const res = await api.get('api/v1/appfields', {
+      descending: false,
-                params:{
+      page: 2,
-                  app: props.appId
+      rowsPerPage: props.not_page ? 0 : 5
-                }
+      // rowsNumber: xx if getting data from a server
-            });
+    });
-            let fields = res.data.properties;
+    const rows = reactive([]);
-            console.log(fields);
+    const selected = ref(props.selectedFields && props.selectedFields.length>0?props.selectedFields:[]);
-            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;
-        });
 
-      return {
+    watchEffect(() => {
-        columns,
+        props.updateSelects(selected);
-        rows,
+    });
-        selected: ref([]),
+
-        isLoaded
+    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;
+    });
+
+    return {
+      columns,
+      rows,
+      selected,
+      isLoaded,
+      pageSetting
+    }
   },
 
 }

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-dialog :model-value="visible" persistent bordered >
-      <q-card :style="{minWidth : width}" >
+      <q-card :style="cardStyle"  style=" min-width: 40vw; max-width: 80vw; max-height: 95vh;">
         <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="{...(height? {minHeight:height}:{}) }">
+        <q-card-section class="q-pt-none" :style="sectionStyle">
          <slot></slot>
         </q-card-section>
-        <q-card-actions align="right" class="text-primary">
+        <q-card-actions align="right" class="text-primary q-mt-lg">
           <q-btn flat label="確定" v-close-popup @click="CloseDialogue('OK')" />
           <q-btn flat label="キャンセル" v-close-popup @click="CloseDialogue('Cancel')" />
         </q-card-actions>
@@ -23,14 +23,16 @@
   <!-- </div> -->
 </template>
 <script>
-
+import {computed} from 'vue'
 export default {
   name: 'ShowDialog',
   props: {
     name:String,
     visible: Boolean,
     width:String,
-    height:String
+    height:String,
+    minWidth:String,
+    minHeight:String
   },
   emits: [
     'close'
@@ -41,8 +43,20 @@ 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
+      CloseDialogue,
+      cardStyle,
+      sectionStyle
     }
   },
 }

frontend/src/components/VariableList.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="q-pa-md">
+    <q-table flat bordered row-key="name" :selection="type"
+    :selected="modelValue"
+    @update:selected="$emit('update:modelValue', $event)"
+    :columns="columns" :rows="rows" />
+  </div>
+</template>
+<script lang="ts">
+import { ref, reactive, PropType, compile } from 'vue';
+import {IActionNode,IActionVariable} from '../types/ActionTypes';
+
+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 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: 'name',required: true, sortable: true }
+    ];
+    const rows= props.vars.map((v)=>{
+      return {objectType:'variable',...v};
+    });
+
+    return {
+      columns,
+      rows:reactive(rows)
+    }
+  }
+}
+</script>

frontend/src/components/left/AppSelector.vue

@@ -22,8 +22,15 @@
       ></q-btn>
     </div>
   </div>
-  <ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" width="600px" >
+  <ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh" >
-      <AppSelect ref="appDg" name="アプリ" type="single"></AppSelect>
+    <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>
 </template>
 
@@ -73,7 +80,8 @@ export default defineComponent({
       showSelectApp,
       showAppDialog,
       closeDg,
-      appDg
+      appDg,
+      filter:ref('')
     }
   }
 });

frontend/src/components/left/EventTree.vue

@@ -2,13 +2,14 @@
   <!-- <div class="q-pa-md q-gutter-sm"> -->
     <q-tree
       :nodes="store.eventTree.screens"
-      node-key="label"
+      node-key="eventId"
       children-key="events"
       no-connectors
       v-model:expanded="store.expandedScreen"
       :dense="true"
+      :ref="tree"
     >
-      <template v-slot:default-header="prop">
+      <template v-slot:header-EVENT="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"
@@ -16,27 +17,78 @@
                   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">{{ 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>
     </q-tree>
-  <!-- </div> -->
+    <show-dialog v-model:visible="showDialog" 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, computed, ref } from 'vue';
-import { IKintoneEvent } from '../../types/KintoneEvents';
+import { IKintoneEvent ,IKintoneEventGroup, IKintoneEventNode, kintoneEvent} from '../../types/KintoneEvents';
 import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes';
+import ShowDialog from '../ShowDialog.vue';
+import FieldSelect from '../FieldSelect.vue';
+import { QTree } from 'quasar';
 export default defineComponent({
   name: 'EventTree',
+  components: {
+    ShowDialog,
+    FieldSelect,
+  },
   setup(props, context) {
+    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)){
+          return;
+        }
+        selectedChangeEvent.value?.events.push(
+          new kintoneEvent(
+            field.label,
+            eventid,
+            selectedChangeEvent.value.eventId)
+        );
+        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;
+    }
     const onSelected=(node:IKintoneEvent)=>{
         if(!node.eventId){
           return;
@@ -45,24 +97,35 @@ export default defineComponent({
         if(store.appInfo===undefined){
           return;
         }
-        const screen = store.eventTree.findScreen(node.eventId);
+        const screen = store.eventTree.findEventById(node.parentId);
         let flow =store.findFlowByEventId(node.eventId);
-        const screenName=screen!==null?screen.label:"";
+        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,node.label)
+          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,
+      closeDg,
       store
     }
   }
@@ -83,4 +146,6 @@ export default defineComponent({
 .event-node:hover{
   background-color: $light-blue-1;
 }
+
 </style>
+

frontend/src/components/main/NodeItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }" >
+  <div class="row justify-center no-wrap" >
     <div class="row">
       <q-card class="action-node" :class="nodeStyle" :square="false" @click="onNodeClick" >
         <q-toolbar class="col" >
@@ -8,6 +8,10 @@
           <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>
@@ -25,7 +29,7 @@
           </q-btn>
         </q-toolbar>
         <q-separator />
-        <q-card-section>
+        <q-card-section class="action-title">
           <div class="row">
           <span class="text-h7">{{ node.title }}</span>
           <q-space></q-space>
@@ -44,23 +48,34 @@
     </div>
   </div>
   <template v-if="hasBranch">
-    <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
+    <node-line :action-node="node"  @addNode="addNode" :left-columns="leftColumns" :right-columns="rightColumns"></node-line>
-      <div v-for="(point, index) in node.outputPoints" :key="index">
+    <div class="row justify-center no-wrap" >
-        <node-line :action-node="node" :mode="getMode(point)" @addNode="addNode" :input-point="point"></node-line>
+      <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>
     </div>
   </template>
   <template v-if="!hasBranch">
-    <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
+    <div class="row justify-center no-wrap" >
-      <node-line :action-node="node" :mode="getMode('')" @addNode="addNode" input-point=""></node-line>
+      <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>
   </template>
 </template>
 
 <script lang="ts">
 import { defineComponent, computed, ref } from 'vue';
-import { IActionNode } from '../../types/ActionTypes';
+import { IActionNode, IActionProperty } from '../../types/ActionTypes';
 import NodeLine, { Direction } from '../main/NodeLine.vue';
+import { useFlowEditorStore } from 'stores/flowEditor';
 export default defineComponent({
   name: 'NodeItem',
   components: {
@@ -81,8 +96,10 @@ 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 {
@@ -91,23 +108,11 @@ export default defineComponent({
         'selected': props.isSelected && !props.actionNode.isRoot
       };
     });
-    const getMode = (point: string) => {
+
-      if (point === '' || props.actionNode.outputPoints.length === 0) {
+    const nextNode=(point:string)=>{
-        return Direction.Default;
+        const nextId= props.actionNode.nextNodeIds.get(point);
-      }
+        if(!nextId) return undefined;
-      if (point === props.actionNode.outputPoints[0]) {
+        return store.currentFlow?.findNodeById(nextId);
-        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;
-        }
-      }
     }
     /**
      * アクションノード追加イベントを
@@ -116,6 +121,38 @@ 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;
+      }
+    });
+
     /**
      * ノード選択状態
      */
@@ -123,9 +160,20 @@ 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);
+    }
+
+
     /**
      * ノードを削除する
      */
@@ -133,12 +181,25 @@ 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);
+    };
     /**
      * 変数名取得
      */
@@ -146,25 +207,42 @@ export default defineComponent({
       const prop = node.actionProps.find((prop) => prop.props.name === "verName");
       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,
-      varName
+      onDeleteAllNextNodes,
+      copyFlow,
+      varName,
+      leftColumns,
+      rightColumns
     }
   }
 });
 </script>
 <style lang="scss">
 .action-node {
-  min-width: 300px !important;
+  min-width: 280px !important;
+}
+.action-title{
+  max-width: 280px !important;
+  overflow-wrap: anywhere;
 }
 
 .line {

frontend/src/components/main/NodeLine.vue

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

frontend/src/components/right/ActionProperty.vue

@@ -1,25 +1,27 @@
 <template>
   <div>
     <div v-for="(item, index) in componentData" :key="index">
-      <component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" :connectProps="connectProps" v-model="item.props.modelValue"></component>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue';
+import { defineComponent,computed } 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
+    FieldInput,
+    EventSetter
   },
   props: {
     jsonData: {
@@ -31,27 +33,43 @@ export default defineComponent({
       required: false,
     }
   },
-  computed: {
+  setup(props){
-      componentData() {
+    const componentData=computed<Array<IActionProperty>>(()=>{
-      return this.jsonData.elements.map((element: any) => {
+      return props.jsonData.elements.map((element: any) => {
-        if(this.jsonValue != undefined )
+        if(props.jsonValue != undefined )
         {
-          if(this.jsonValue.hasOwnProperty(element.props.name))
+          if(props.jsonValue.hasOwnProperty(element.props.name))
           {
-            element.props.modelValue = this.jsonValue[element.props.name];
+            element.props.modelValue = props.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>

frontend/src/components/right/AppFieldSelect.vue

@@ -0,0 +1,235 @@
+<template>
+
+    <div class="q-my-md">
+        <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" :updateSelects="updateItems"
+                        :appId="selectedField.app?.id" not_page :filter="fieldFilter" :selectedFields="selectedField.fields"></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"
+            :updateExternalSelectAppInfo="updateExternalSelectAppInfo"></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({
+    name: 'FieldInput',
+    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'
+        }
+    },
+    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 updateExternalSelectAppInfo = (newAppinfo:IApp) => {
+          // selectedField.value.app = newAppinfo
+        }
+
+        const updateItems = (newFields:IField[]) => {
+          // selectedField.value.fields = newFields
+        }
+
+        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,
+            updateExternalSelectAppInfo,
+            filter: ref(),
+            updateItems,
+            clear,
+            fieldFilter: ref(),
+            removeField
+        };
+    }
+});
+</script>

frontend/src/components/right/EventSetter.vue

@@ -0,0 +1,80 @@
+<template>
+  <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>
+</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',
+  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(
+          new kintoneEvent(
+            displayName,
+            addEventId,
+            customButtonId)
+        );
+      }
+    }
+
+    watchEffect(() => {
+      emit('update:modelValue', inputValue.value);
+    });
+
+    return {
+      inputValue,
+      addButtonEvent
+    };
+  },
+});
+</script>

frontend/src/components/right/FieldInput.vue

@@ -1,98 +1,98 @@
 <template>
-<q-field v-model="selectedField" :label="displayName" labelColor="primary"
+    <q-field v-model="selectedField" :label="displayName" labelColor="primary"
-        :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
+            :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
-  <template v-slot:control >
+      <template v-slot:control >
-    <q-chip  color="primary" text-color="white"  v-if="isSelected">
+        <q-chip  color="primary" text-color="white"  v-if="isSelected">
-      {{ selectedField.name }}
+          {{ selectedField.name }}
-    </q-chip>
+        </q-chip>
-  </template>
+      </template>
-  <!-- <template v-slot:hint v-if="isSelected">
+      <!-- <template v-slot:hint v-if="isSelected">
-    <div> 項目コード：<q-chip  size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
+        <div> 項目コード：<q-chip  size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
-  </template> -->
+      </template> -->
-  <template v-slot:hint v-if="!isSelected">
+      <template v-slot:hint v-if="!isSelected">
-    {{ placeholder }}
+        {{ placeholder }}
-  </template>
+      </template>
 
-  <template v-slot:append>
+      <template v-slot:append>
-  <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
+      <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg"/>
-  </template>
+      </template>
-</q-field>
+    </q-field>
-<show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
+    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
-  <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
+      <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
-</show-dialog>
+    </show-dialog>
-</template>
+    </template>
 
-<script lang="ts">
+    <script lang="ts">
-import { defineComponent, ref ,watchEffect,computed} from 'vue';
+    import { defineComponent, ref ,watchEffect,computed} from 'vue';
-import ShowDialog from '../ShowDialog.vue';
+    import ShowDialog from '../ShowDialog.vue';
-import FieldSelect from '../FieldSelect.vue';
+    import FieldSelect from '../FieldSelect.vue';
-import { useFlowEditorStore } from 'stores/flowEditor';
+    import { useFlowEditorStore } from 'stores/flowEditor';
-interface IField{
+    interface IField{
-  name:string,
+      name:string,
-  code:string,
+      code:string,
-  type:string
+      type:string
-}
+    }
-export default defineComponent({
+    export default defineComponent({
-  name: 'FieldInput',
+      name: 'FieldInput',
-  components: {
+      components: {
-    ShowDialog,
+        ShowDialog,
-    FieldSelect,
+        FieldSelect,
-  },
+      },
-  props: {
+      props: {
-    displayName:{
+        displayName:{
-      type: String,
+          type: String,
-      default: '',
+          default: '',
-    },
+        },
-    name:{
+        name:{
-      type: String,
+          type: String,
-      default: '',
+          default: '',
-    },
+        },
-    placeholder: {
+        placeholder: {
-      type: String,
+          type: String,
-      default: '',
+          default: '',
-    },
+        },
-    hint:{
+        hint:{
-      type: String,
+          type: String,
-      default: '',
+          default: '',
-    },
+        },
-    modelValue: {
+        modelValue: {
-      type: Object,
+          type: Object,
-      default: null
+          default: null
-    },
+        },
-  },
+      },
 
-  setup(props, { emit }) {
+      setup(props, { emit }) {
-    const appDg = ref();
+        const appDg = ref();
-    const show = ref(false);
+        const show = ref(false);
-    const selectedField = ref(props.modelValue);
+        const selectedField = ref(props.modelValue);
-    const store = useFlowEditorStore();
+        const store = useFlowEditorStore();
-    const isSelected = computed(()=>{
+        const isSelected = computed(()=>{
-      return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
+          return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
-    });
+        });
 
-    const showDg = () => {
+        const showDg = () => {
-      show.value = true;
+          show.value = true;
-    };
+        };
 
-    const closeDg = (val:string) => {
+        const closeDg = (val:string) => {
-      if (val == 'OK') {
+          if (val == 'OK') {
-        selectedField.value = appDg.value.selected[0];
+            selectedField.value = appDg.value.selected[0];
+          }
+        };
+
+        watchEffect(() => {
+          emit('update:modelValue', selectedField.value);
+        });
+
+        return {
+          store,
+          appDg,
+          show,
+          showDg,
+          closeDg,
+          selectedField,
+          isSelected
+        };
       }
-    };
-
-    watchEffect(() => {
-      emit('update:modelValue', selectedField.value);
     });
-
+    </script>
-    return {
-      store,
-      appDg,
-      show,
-      showDg,
-      closeDg,
-      selectedField,
-      isSelected
-    };
-  }
-});
-</script>

frontend/src/components/right/InputText.vue

@@ -1,5 +1,11 @@
 <template>
-  <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label/>
+  <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
+  <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>
 </template>
 
 <script lang="ts">
@@ -39,7 +45,15 @@ export default defineComponent({
 
     return {
       inputValue,
+      showhint:ref(false)
     };
   },
 });
 </script>
+<style lang="scss">
+.hint-text{
+  white-space : always;
+  max-width: 450px;
+  font-size: 1.2em;
+}
+</style>

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" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
     </div>
   </div>
 </template>
@@ -15,9 +15,11 @@ 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 { IActionNode,IActionProperty } from 'src/types/ActionTypes';
+import EventSetter from '../right/EventSetter.vue';
+import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes';
 
 export default defineComponent({
   name: 'PropertyList',
@@ -26,8 +28,10 @@ export default defineComponent({
     SelectBox,
     DatePicker,
     FieldInput,
+    AppFieldSelect,
     MuiltInputText,
-    ConditionInput
+    ConditionInput,
+    EventSetter
   },
   props: {
     nodeProps: {
@@ -40,9 +44,22 @@ export default defineComponent({
     }
   },
   setup(props, context) {
-    const properties=ref(props.nodeProps)
+    const properties=ref(props.nodeProps);
+    const connectProps=(props:IProp)=>{
+       const connProps:any={};
+       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;
+    }
     return {
-      properties
+      properties,
+      connectProps
     }
   }
 });

frontend/src/components/right/PropertyPanel.vue

@@ -11,9 +11,9 @@
          elevated
          overlay
        >
-        <q-card class="column full-height" style="width: 300px">
+        <q-card class="column" style="max-width: 300px;min-height: 100%">
          <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() =>{

frontend/src/css/app.scss

@@ -1 +1,25 @@
 // 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;
+}

frontend/src/layouts/MainLayout.vue

@@ -20,7 +20,7 @@
     </q-header>
 
     <q-drawer
-      v-model="leftDrawerOpen"
+      :model-value="authStore.toggleLeftDrawer"
       :show-if-above="false"
       bordered
     >
@@ -151,11 +151,10 @@ const essentialLinks: EssentialLinkProps[] = [
   }
 ];
 
-const leftDrawerOpen = ref(false)
 const version = process.env.version;
 const productName = process.env.productName;
 
 function toggleLeftDrawer() {
-  leftDrawerOpen.value = !leftDrawerOpen.value
+  authStore.toggleLeftMenu();
 }
 </script>

frontend/src/pages/FlowChart.vue

@@ -1,246 +1,274 @@
 <template>
   <q-page>
-    <q-layout
+    <q-layout container class="absolute-full shadow-2 rounded-borders">
-      container
-      class="absolute-full shadow-2 rounded-borders"
-    >
       <div class="q-pa-sm q-gutter-sm  ">
-        <q-drawer
+        <q-drawer side="left" :overlay="true" bordered v-model="drawerLeft" :show-if-above="false" elevated>
-        side="left"
+          <div class="flex-center fixed-top app-selector">
-        :overlay="true"
+            <AppSelector />
-        bordered
+          </div>
-        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;">
+          <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' }">
+            <q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
-                <EventTree />
+              <EventTree />
-              </q-scroll-area>
+            </q-scroll-area>
-            </div>
+          </div>
 
-            <div class="flex-center fixed-bottom bg-grey-3 q-pa-md row ">
+          <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-btn color="secondary" glossy label="デプロイ" @click="onDeploy" icon="sync" :loading="deployLoading" />
-              <q-space></q-space>
+            <q-space></q-space>
-              <q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading"/>
+            <q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading" />
-            </div>
+          </div>
         </q-drawer>
       </div>
-      <div class="q-pa-md q-gutter-sm">
+      <q-btn flat dense round
-        <div class="flowchart" v-if="store.currentFlow">
+              :icon="drawerLeft?'keyboard_double_arrow_left':'keyboard_double_arrow_right'"
-          <node-item v-for="(node,) in store.currentFlow.actionNodes" :key="node.id"
+              :style="[drawerLeft?{'left':'300px'}:{'left':'0px'}]"
-          :isSelected="node===state.activeNode" :actionNode="node"
+              @click="drawerLeft=!drawerLeft" class="expand" />
-          @addNode="addNode"
+      <div class="q-pa-md q-gutter-sm" :style="{minWidth: minPanelWidth}">
-          @nodeSelected="onNodeSelected"
+        <div class="flowchart" v-if="store.currentFlow" :style="[drawerLeft?{paddingLeft:'300px'}:{}]">
-          @nodeEdit="onNodeEdit"
+          <node-item v-if="rootNode!==undefined" :key="rootNode.id" :isSelected="rootNode === store.activeNode"
-          @deleteNode="onDeleteNode"
+            :actionNode="rootNode" @addNode="addNode" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
-          @deleteAllNextNodes="onDeleteAllNextNodes"
+            @deleteNode="onDeleteNode" @deleteAllNextNodes="onDeleteAllNextNodes" @copyFlow="onCopyFlow"></node-item>
-          ></node-item>
         </div>
       </div>
-      <PropertyPanel :actionNode="state.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
+      <PropertyPanel :actionNode="store.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
     </q-layout>
-    <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" width="350px">
+    <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" min-width="500px" min-height="500px">
-        <action-select ref="appDg" name="model" type="single"></action-select>
+      <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>
 
   </q-page>
-
 </template>
 
 <script setup lang="ts">
-import {ref,reactive,computed,onMounted} from 'vue';
+import { ref, reactive, computed, onMounted } from 'vue';
-import {IActionNode, ActionNode, IActionFlow, ActionFlow,RootAction, IActionProperty } from 'src/types/ActionTypes';
+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 $q = useQuasar();
 const store = useFlowEditorStore();
-// ref関数を使ってtemplateとバインド
+const authStore = useAuthStore();
-const state=reactive({
+
-  activeNode:{
-    id:""
-  },
-})
 const appDg = ref();
-const prevNodeIfo=ref({
+const prevNodeIfo = ref({
-  prevNode:{} as IActionNode,
+  prevNode: {} as IActionNode,
-  inputPoint:""
+  inputPoint: ""
 });
 // const refFlow = ref<ActionFlow|null>(null);
-const showAddAction=ref(false);
+const showAddAction = ref(false);
-const drawerRight=ref(false);
+const drawerRight = ref(false);
-const model=ref("");
+const filter=ref("");
-const addActionNode=(action:IActionNode)=>{
+const model = ref("");
+const addActionNode = (action: IActionNode) => {
   // refFlow.value?.actionNodes.push(action);
- store.currentFlow?.actionNodes.push(action);
+  store.currentFlow?.actionNodes.push(action);
 }
-
+const rootNode = computed(()=>{
-const addNode=(node:IActionNode,inputPoint:string)=>{
+  return store.currentFlow?.getRoot();
-  if(drawerRight.value){
+});
-    drawerRight.value=false;
+const minPanelWidth=computed(()=>{
+  const root = store.currentFlow?.getRoot();
+  if(store.currentFlow && root){
+    return store.currentFlow?.getColumns(root) * 300 + 'px';
+  }else{
+    return "300px";
   }
-  showAddAction.value=true;
+});
-  prevNodeIfo.value.prevNode=node;
-  prevNodeIfo.value.inputPoint=inputPoint;
-}
 
-const onNodeSelected=(node:IActionNode)=>{
+const addNode = (node: IActionNode, inputPoint: string) => {
-  //右パネルが開いている場合、自動閉じる
+  if (drawerRight.value) {
-  if(drawerRight.value && state.activeNode.id!==node.id){
+    drawerRight.value = false;
-    drawerRight.value=false;
   }
-  state.activeNode = node;
+  showAddAction.value = true;
+  prevNodeIfo.value.prevNode = node;
+  prevNodeIfo.value.inputPoint = inputPoint;
 }
 
-const onNodeEdit=(node:IActionNode)=>{
+const onNodeSelected = (node: IActionNode) => {
-  state.activeNode = node;
-  drawerRight.value=true;
-}
-
-const onDeleteNode=(node:IActionNode)=>{
-  if(!store.currentFlow) return;
   //右パネルが開いている場合、自動閉じる
-  if(drawerRight.value && state.activeNode.id===node.id){
+  if (drawerRight.value && store.activeNode?.id !== node.id) {
-    drawerRight.value=false;
+    drawerRight.value = false;
+  }
+  store.setActiveNode(node);
+}
+
+const onNodeEdit = (node: IActionNode) => {
+  store.setActiveNode(node);
+  drawerRight.value = true;
+}
+
+const onDeleteNode = (node: IActionNode) => {
+  if (!store.currentFlow) return;
+  //右パネルが開いている場合、自動閉じる
+  if (drawerRight.value && store.activeNode?.id === node.id) {
+    drawerRight.value = false;
   }
   store.currentFlow?.removeNode(node);
 }
 
-const onDeleteAllNextNodes=(node:IActionNode)=>{
+const onDeleteAllNextNodes = (node: IActionNode) => {
-  if(!store.currentFlow) return;
+  if (!store.currentFlow) return;
   //右パネルが開いている場合、自動閉じる
-  if(drawerRight.value){
+  if (drawerRight.value) {
-    drawerRight.value=false;
+    drawerRight.value = false;
   }
   store.currentFlow?.removeAllNext(node.id);
 }
-const closeDg=(val :any)=>{
+const closeDg = (val: any) => {
-  console.log("Dialog closed->",val);
+  console.log("Dialog closed->", val);
   if (val == 'OK') {
-      const data  = appDg.value.selected[0];
+    const data = appDg.value.selected[0];
-      const actionProps=JSON.parse(data.property);
+    const actionProps = JSON.parse(data.property);
-      const outputPoint =JSON.parse(data.outputPoints);
+    const outputPoint = JSON.parse(data.outputPoints);
-      const action = new ActionNode(data.name,data.desc,"",outputPoint,actionProps);
+    const action = new ActionNode(data.name, data.desc, "", outputPoint, actionProps);
-      store.currentFlow?.addNode(action, prevNodeIfo.value.prevNode,prevNodeIfo.value.inputPoint);
+    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 ()=>{
+const onDeploy = async () => {
-  if(store.appInfo===undefined || store.flows?.length===0){
+  if (store.appInfo === undefined || store.flows?.length === 0) {
     $q.notify({
       type: 'negative',
-      caption:"エラー",
+      caption: "エラー",
       message: `設定されたフローがありません。`
     });
     return;
   }
-  try{
+  try {
-    deployLoading.value=true;
+    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{
+  try {
-    saveLoading.value=true;
+    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 ()=>{
+const fetchData = async () => {
-  drawerLeft.value=true;
+  drawerLeft.value = true;
-  if(store.appInfo===undefined) return;
+  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();
+  const root = actionFlows[0].getRoot();
-  if(root){
+  if (root) {
-    state.activeNode=root;
+    store.setActiveNode(root);
   }
 }
 
 onMounted(() => {
+  authStore.toggleLeftMenu();
   fetchData();
 });
 </script>
 
 <style lang="scss">
-  .app-selector{
+.app-selector {
-    padding:15px;
+  padding: 15px;
-    z-index: 999;
+  z-index: 999;
-  }
+}
 
-  .flowchart{
+.flowchart {
-    padding-top: 10px;
+  padding-top: 10px;
-  }
+}
-  .flow-toolbar{
+
+.flow-toolbar {
   opacity: 50%;
-  }
+}
 
-  .event-tree .q-drawer {
+.event-tree .q-drawer {
-    top:50px;
+  top: 50px;
-    z-index: 999;
+  z-index: 999;
-  }
+}
+.expand{
+  position: fixed;
+  left: 0px;
+  top: 50%;
+  z-index: 9999;
+}
 </style>

frontend/src/router/routes.ts

@@ -5,7 +5,13 @@ 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'),
@@ -16,7 +22,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')},

frontend/src/stores/flowEditor.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
-import { AppInfo ,IActionFlow} from 'src/types/ActionTypes';
+import { AppInfo ,IActionFlow, IActionNode} from 'src/types/ActionTypes';
-import { kintoneEvents,IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
+import { IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
 import {FlowCtrl } from '../control/flowctrl';
 
 export interface FlowEditorState{
@@ -8,18 +8,21 @@ export interface FlowEditorState{
   appInfo?:AppInfo;
   flows?:IActionFlow[];
   selectedFlow?:IActionFlow|undefined;
+  activeNode:IActionNode|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,
-      eventTree:kintoneEvents,
+      activeNode:undefined,
+      eventTree:eventTree,
       selectedEvent:undefined,
       expandedScreen:[]
     }),
@@ -53,6 +56,9 @@ export const useFlowEditorStore = defineStore("flowEditor",{
     selectFlow(flow:IActionFlow){
       this.selectedFlow=flow;
     },
+    setActiveNode(node:IActionNode){
+      this.activeNode=node;
+    },
     setApp(app:AppInfo){
       this.appInfo=app;
     },

frontend/src/stores/useAuthStore.ts

@@ -8,6 +8,7 @@ export interface IUserState{
   token?:string;
   returnUrl:string;
   currentDomain:IDomainInfo;
+  LeftDrawer:boolean;
 }
 
 export const useAuthStore = defineStore({
@@ -20,10 +21,19 @@ 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);

frontend/src/types/ActionTypes.ts

@@ -16,11 +16,9 @@ export interface AppInfo {
 }
 
 /**
-* アクションのプロパティ定義
+ * 属性項目情報
  */
-export interface IActionProperty {
+export interface IProp{
-  component: string;
-  props: {
     //プロパティ名
     name: string;
     //プロパティ表示名
@@ -28,9 +26,26 @@ export interface IActionProperty {
     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:string;
 }
 /**
  * アクションタイプ定義
@@ -40,6 +55,7 @@ export interface IActionNode {
   //アクション名
   name: string;
   title: string;
+  varName:IProp|undefined;
   subTitle: string;
   inputPoint: string;
   //出力ポイント（条件分岐以外未使用）
@@ -62,10 +78,12 @@ 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;
 }
 
 /**
@@ -73,16 +91,7 @@ export interface IActionFlow {
  */
 class ActionProperty implements IActionProperty {
   component: string;
-  props: {
+  props: IProp;
-    // プロパティ名
-    name: string;
-    // プロパティ表示名
-    displayName: string;
-    placeholder: string;
-    hint:string;
-    // プロパティ設定値
-    modelValue: any;
-  };
 
   static defaultProperty(): IActionProperty {
     return new ActionProperty('InputText', 'displayName', '表示名', '表示を入力してください', '','');
@@ -102,6 +111,7 @@ class ActionProperty implements IActionProperty {
       displayName: displayName,
       placeholder: placeholder,
       hint:hint,
+      connectProps:undefined,
       modelValue: modelValue
     };
   }
@@ -121,6 +131,13 @@ 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>;
@@ -168,6 +185,7 @@ export class RootAction implements IActionNode {
   title: string;
   subTitle: string;
   inputPoint: string;
+  varName: IProp | undefined=undefined;
   //出力ポイント（条件分岐以外未使用）
   outputPoints: Array<string>;
   isRoot: boolean;
@@ -225,7 +243,7 @@ export class ActionFlow implements IActionFlow {
       newNode.inputPoint = inputPoint;
     }
     if (prevNode !== undefined) {
-      this.connectNodes(prevNode, newNode, inputPoint || '');
+      this.resetNodeRelation(prevNode, newNode, inputPoint || '');
     } else {
       prevNode = this.actionNodes[this.actionNodes.length - 1];
       this.connectNodes(prevNode, newNode, inputPoint || '');
@@ -269,9 +287,29 @@ export class ActionFlow implements IActionFlow {
       return false;
     }
     for (const [, id] of targetNode.nextNodeIds) {
-      this.removeAllNext(id);
+      this.removeAll(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);
   }
 
   // 断开与前一个节点的连接
@@ -319,8 +357,7 @@ export class ActionFlow implements IActionFlow {
       if (!nextNodeId) return;
       const nextNode = this.findNodeById(nextNodeId);
       if (!nextNode) return;
-      nextNode.prevNodeId = prevNode.id;
+      this.connectNodes(prevNode,nextNode,targetNode.inputPoint || '');
-      prevNode.nextNodeIds.set(targetNode.inputPoint || '', nextNodeId);
       return;
     }
     //二つ以上の場合
@@ -354,15 +391,16 @@ 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;
-    const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
+    newNode.inputPoint=inputPoint||'';
     this.setNewNodeNextId(newNode, originalNextNodeId, inputPoint);
   }
 
@@ -374,15 +412,18 @@ export class ActionFlow implements IActionFlow {
    */
   private setNewNodeNextId(newNode: IActionNode, originalNextNodeId: string | undefined, inputPoint?: string) {
     // 元の接続ノードが存在する
-    if (originalNextNodeId) {
+    if (!originalNextNodeId) {return;}
-      // 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
+    const originNextNode = this.findNodeById(originalNextNodeId);
-      if (newNode.outputPoints.includes(inputPoint || '')) {
+    if (!originNextNode) {return;}
-        newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
+    // 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
-      } else {
+    if (newNode.outputPoints.includes(inputPoint || '')) {
-        //  inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
+      newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
-        const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
+      originNextNode.prevNodeId=newNode.id;
-        newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
+    } else {
-      }
+      //  inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
+      const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
+      newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
+      originNextNode.prevNodeId=newNode.id;
     }
   }
 
@@ -393,6 +434,36 @@ 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){
+      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,
@@ -400,12 +471,27 @@ export class ActionFlow implements IActionFlow {
         const { nextNodeIds, ...rest } = node;
         return {
           ...rest,
-          nextNodeIds: Array.from(nextNodeIds.entries())
+          nextNodeIds: Object.fromEntries(nextNodeIds)
         };
       })
     };
   }
 
+  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)
   }
@@ -419,9 +505,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.outputPoint, node.actionProps)
+      const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoints, node.actionProps)
         : new RootAction(node.name, node.title, node.subTitle);
-      nodeClass.nextNodeIds = new Map(node.nextNodeIds);
+      nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
       nodeClass.prevNodeId = node.prevNodeId;
       nodeClass.id = node.id;
       return nodeClass;

frontend/src/types/KintoneEvents.ts

@@ -1,112 +1,197 @@
-import { publicDecrypt } from 'crypto';
 import {IActionFlow} from './ActionTypes';
-export interface TreeNode {
+export interface IKintoneEventNode {
   label: string;
+  header:string;
+  eventId:string;
+  parentId:string;
 }
 
-export interface IKintoneEvent extends TreeNode {
+export interface IKintoneEvent extends IKintoneEventNode {
-  eventId: string;
   hasFlow: boolean;
   flowData?: IActionFlow;
 }
 
-export interface IKintoneScreen extends TreeNode {
+export interface IKintoneEventGroup extends IKintoneEventNode {
-  label: string;
+  events: IKintoneEventNode[];
-  events: IKintoneEvent[];
 }
 
+
 export class kintoneEvent implements IKintoneEvent{
   eventId: string;
-  get hasFlow(): boolean{
+  parentId:string;
+   get hasFlow(): boolean{
     return this.flowData!==undefined && this.flowData.actionNodes.length>1
   };
   flowData?: IActionFlow | undefined;
   label: string;
-  constructor({eventId,label}:{eventId:string,label:string}){
+  get header():string{
+    return "EVENT";
+  }
+  constructor(label:string,eventId:string,parentId:string){
     this.eventId=eventId;
     this.label=label;
-
+    this.parentId=parentId;
   }
-
 }
 
-export class KintoneEventManager {
+export class kintoneEventGroup implements IKintoneEventGroup{
-  public screens: IKintoneScreen[];
+  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;
+  }
+}
 
-  constructor(screens: IKintoneScreen[]) {
+
-    this.screens = screens;
+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[];
+
+  constructor() {
+    this.screens = this.getKintoneEvents();
   }
 
   public bindFlows(flows:IActionFlow[]){
-    for (const screen of this.screens) {
+    this.screens=this.getKintoneEvents();
-      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);
+        const eventNode = this.findEventById(eventId);
-        if(event!==null){
+        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 =new kintoneEvent(
+              flow.getRoot()?.subTitle || "",
+              eventId,
+              groupEvent.parentId
+            );
+            newEvent.flowData=flow;
+            groupEvent.events.push(newEvent);
+          }
         }
       }
     }
   }
 
-  public findEventById(eventId: string): IKintoneEvent | null {
+  public findEventById(eventId: string): IKintoneEventNode | null {
+    const screen=this.findScreen(eventId);
+    if(screen) {return screen;}
     for (const screen of this.screens) {
       for (const event of screen.events) {
-        if (event.eventId === eventId) {
+          if (event.eventId === eventId) {
-          return event;
+            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):IKintoneScreen|null{
+  public findScreen(eventId:string):IKintoneEventGroup|undefined{
-    for (const screen of this.screens) {
+    return this.screens.find(screen=>screen.eventId==eventId);
-      if(screen.events.some((ev:IKintoneEvent)=>ev.eventId===eventId)){
+  }
-        return screen;
+
-      }
+  public getKintoneEvents():IKintoneEventGroup[]{
-    }
+    return [
-    return null;
+        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"),
+        ],"")
+    ];
   }
 }
 
-export const kintoneEvents:KintoneEventManager = new KintoneEventManager([
+// export const kintoneEvents:KintoneEventManager = new KintoneEventManager([
-  {
+//     new kintoneEventGroup("app.record.create","レコード追加画面",[
-    label:'レコード追加画面',
+//       new kintoneEvent('レコード追加画面を表示した後','app.record.create.show',"app.record.create"),
-    events:[
+//       new kintoneEvent('保存をクリックしたとき','app.record.create.submit',"app.record.create"),
-      new kintoneEvent({label:'レコード追加画面を表示した後',eventId:'app.record.create.show'}),
+//       new kintoneEvent('保存が成功したとき','app.record.create.submit.success',"app.record.create"),
-      new kintoneEvent({label:'保存をクリックしたとき',eventId:'app.record.create.submit'}),
+//       new kintoneEventForChange('app.record.create.change','フィールドの値を変更したとき',[],"app.record.create"),
-      new kintoneEvent({label:'保存が成功したとき',eventId:'app.record.create.submit.success'}),
+//       new kintoneEventGroup('app.record.create.customButtonClick','ボタンをクリックした時',[],"app.record.create")
-      new kintoneEvent({label:'フィールドの値を変更したとき',eventId:'app.record.create.change'}),
+//     ],""),
-    ]
+//     new kintoneEventGroup("app.record.detail","レコード詳細画面",[
-  },
+//       new kintoneEvent('レコード詳細画面を表示した後','app.record.detail.show',"app.record.detail"),
-  {
+//       new kintoneEvent('レコードを削除するとき','app.record.detail.delete.submit',"app.record.detail"),
-    label:'レコード詳細画面',
+//       new kintoneEvent('プロセス管理のアクションを実行したとき','app.record.detail.process.proceed',"app.record.detail"),
-    events:[
+//       new kintoneEventGroup('app.record.detail.customButtonClick','ボタンをクリックした時',[],"app.record.detail"),
-      new kintoneEvent({label:'レコード詳細画面を表示した後',eventId:'app.record.detail.show'}),
+//     ],""),
-      new kintoneEvent({label:'レコードを削除するとき',eventId:'app.record.detail.delete.submit'}),
+//     new kintoneEventGroup("app.record.edit","レコード編集画面",[
-      new kintoneEvent({label:'プロセス管理のアクションを実行したとき',eventId:'app.record.detail.process.proceed'}),
+//       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"),
-    label:'レコード編集画面',
+//       new kintoneEventGroup('app.record.edit.customButtonClick','ボタンをクリックした時',[],"app.record.edit"),
-    events:[new kintoneEvent({label:'レコード編集画面を表示した後',eventId:'app.record.edit.show'}),
+//     ],""),
-      new kintoneEvent({label:'保存をクリックしたとき',eventId:'app.record.edit.submit'}),
+//     new kintoneEventGroup("app.record.index","レコード一覧画面",[
-      new kintoneEvent({label:'保存が成功したとき',eventId:'app.record.edit.submit.success'}),
+//       new kintoneEvent('一覧画面を表示した後', 'app.record.index.show',"app.record.index"),
-      new kintoneEvent({label:'フィールドの値を変更したとき',eventId:'app.record.edit.change'}),
+//       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"),
-    label:'レコード一覧画面',
+//       new kintoneEventGroup('app.record.detail.customButtonClick','ボタンをクリックした時',[],"app.record.index"),
-    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'}),
-    ]
-  }
-]);

plugin/kintone-addins/package.json

@@ -4,10 +4,12 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "tsc && set \"SOURCE_MAP=true\" && vite build && vite preview",
     "build": "tsc && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
     "build:dev":"tsc && set \"SOURCE_MAP=true\" && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "ngrok":"ngrok http http://localhost:4173/",
+    "vite":"vite dev"
   },
   "devDependencies": {
     "@types/jquery": "^3.5.24",

plugin/kintone-addins/readme.md

@@ -0,0 +1,295 @@
+# kintone自動化開発ツールのアクションのアドイン開発手順
+
+## 1. アクションの登録
+
+アクションプラグインをシステムに登録するためには、以下の情報をデータベースの`action`表に挿入する必要があります。
+
+|列名    | 項目          | 説明                                     |
+|-----   |-------------|-------------------------------------------|
+|name    | 名前        | アクションプラグイン名（ユニークな名前が必要）  |
+|title   |タイトル      | タイトル （20文字以内）                                  |
+|subtitle|サブタイトル  | サブタイトル                               |
+|outputpoint|出力ポイント  | 出力値に分岐がある場合の接続点            |
+|property|プロパティ    | アクションプラグインの属性（json形式）      |
+
+### 登録の例
+
+以下は「表示／非表示」アクションプラグインを登録する例です。
+
+- name: "表示／非表示"
+- title: "指定項目の表示・非表示を設定する"
+- subtitle: "表示／非表示"
+- outputpoint: "[]"
+- property:
+
+```json
+[
+  {
+    "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": "条件式を設定してください"
+    }
+  }
+]
+```
+
+### プロパティ属性設定画面
+![プロパティ属性設定画面](../../document/action-property.png)
+
+
+### 属性UIコンポーネントの共通属性
+| 属性          | 設定値の例                  | 説明                                                                         |
+|-------------|--------------------|----------------------------------------------------------------------------|
+| component   | InputText  | コンポーネントの種類を示しており、この場合は選択リストを意味します。<br>使用可能なコンポーネントを参照|
+| displayName | 表示／非表示         | ユーザーに対して表示されるコンポーネントの名前です。                                         |
+| options     | ["表示", "非表示"]   | ユーザーが選択できるオプションの配列です。<br>SelectBoxのみ使用可能 |
+| modelValue  | 空文字             | コンポーネントの初期値を設定します。<br>初期設定ないの場合は空文字で設定する。
+| name        | field              | 属性の設定値の名前です。   |
+| placeholder | 対象項目を選択してください| 入力フィールドに表示されるプレースホルダーのテキストです。この場合は設定されていません。          |
+| hint        | 説明文| 長い説明文を設定することが可能です。（markdown形式サポート予定、現在HTML可能）          |
+| selectType  |`single` or `multiple`| フィールド選択・他のアプリのフィールド選択の選択モードを設定する         |
+
+
+
+### 使用可能なコンポーネント
+| No. | コンポーネント名      | コンポーネントタイプ | 説明                                     |
+|-----|------------------|------------------|-----------------------------------------|
+| 1   | テキストボックス    | InputText        | 一行のテキスト入力が可能なフィールドです。                 |
+| 2   | テキストボックス（改行可能） | MuiltInputText   | 複数行のテキスト入力が可能なテキストエリアです。          |
+| 3   | 日付            | DatePicker       | 日付を選択するためのカレンダーコンポーネントです。          |
+| 4   | フィールド選択     | FieldInput       | システムのフィールドを選択するための入力コンポーネントです。   |
+| 5   | 選択リスト        | SelectBox        | 複数のオプションから選択するためのドロップダウンリストです。   |
+| 6   | 条件式設定       | ConditionInput   | 条件式やロジックを入力するためのコンポーネントです。         |
+| 7   | イベント設定       |EventSetter    | ボタンイベント設定のコンポーネントです。         |
+| 8   | 色選択       | ColorPicker   | 色を設定する（追加予定中）         |
+| 9   | 他のアプリのフィールド選択       | AppFieldPicker   | 他のアプリのフィールドを選択する（追加予定中）         |
+| 10  |ユーザー選択       | UserPicker   | ユーザーを選択する（追加予定中）         |
+
+## 2.アクションアドインの開発
+
+### 1. Action pluginファイルの追加
+アクションプラグインを作成するためには、以下のディレクトリ構造に`TypeScript`ファイルを追加します。
+```
+KintoneAppBuilder
+└─ plugin
+    └─ kintone-addins
+        └─ src
+            └─ actions
+                └─ your-action.ts // ここにアクションプラグインのtsファイルを追加
+```
+### 2. アクションクラスの実装手順
+`IAction` インターフェースに従ってアクションクラスを実装します。
+```typescript
+
+/**
+ * アクションのインターフェース
+ */
+export interface IAction{
+  // アクションのユニークな名前
+  name:string;
+  //属性設定情報
+  actionProps: Array<IActionProperty>;
+  //アクションのプロセス実行関数
+  process(prop:IActionNode,event:any,context:IContext):Promise<IActionResult>;
+  //アクションの登録関数
+  register():void;
+}
+```
+#### サンプルコード
+```ts
+// アクションの属性定義
+interface IShownProps{
+    field:IField;
+    show:string; 
+    condition:string;
+}
+
+// 表示／非表示アクション
+export class FieldShownAction implements IAction{
+    name: string;
+    actionProps: IActionProperty[];
+    props:IShownProps;
+    constructor(){
+        this.name="表示／非表示";　// DBに登録したアクション名一致する必要があり
+        this.actionProps=[];
+        //プロパティ属性の初期化
+        this.props={
+            field:{code:''},
+            show:'',
+            condition:''
+        }
+        //アクションの自動登録
+        this.register();
+    }
+     /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
+        // ... (アクション処理の実装)
+    }
+ 
+    register(): void {
+        actionAddins[this.name]=this;
+    }
+}
+new FieldShownAction();
+
+```
+アクションプラグインを実装するには、`IAction`インターフェースの定義に従って、必要なメソッドとプロパティをクラスに実装します。
+以下に、`IAction`インターフェースを用いて`表示／非表示`アクションを実装する手順を説明します。
+1. **アクションの属性定義**
+
+2. **アクションクラスの作成**:
+   - `IAction`インターフェースを実装する新しいクラス`FieldShownAction`を作成します。
+
+3. **コンストラクタの定義**:
+   - アクション名や初期プロパティを設定します。
+   - このクラスのインスタンスが作成された際に、自動的にアクションが登録されるように、コンストラクタ内で`register`メソッドを呼び出します。
+
+4. **プロセス実行関数の実装** (`process`):
+   - `process`メソッドは、アクションの主要なロジックを含み、アクションの実行時に呼び出されます。
+   
+
+- * 以下は`process`関数のパラメータとその用途を説明します。
+
+| パラメータ名 | 型              | 用途                                                                                             |
+|----------|----------------|------------------------------------------------------------------------------------------------|
+| actionNode | `IActionNode`  | Kintone自動化ツールのアクションの設定やプロパティ情報を保持します。                 |
+| event     |kintoneのイベント情報| レコードやエラー制御で使用します                       |
+| context   | `IContext`     | 現在のレコード情報や変数など、実行に必要なデータへのアクセスを提供します。 |
+
+   - このメソッド内で、アクションに必要な処理を行います。
+   - 1. アクションプロパティの取得:    
+     `Kitone自動化ツール`を設定したプロパティの値を取得する
+
+```ts
+//プロパティ設定を取得する
+this.actionProps=actionNode.actionProps;
+//プロパティ設定のデータ型は必要な情報が含めますか
+if (!('field' in actionNode.ActionValue) && !('show' in actionNode.ActionValue)) {
+    return result
+}
+//既定のプロパティのインターフェースへ変換する
+this.props = actionNode.ActionValue as IShownProps;
+```
+
+- 2. 条件式の評価
+    getConditionResult関数を呼び出して条件式を評価します。この関数は、現在のコンテキストに基づいて条件式が真か偽かを返します。
+```ts
+//条件式の計算結果を取得
+const conditionResult = this.getConditionResult(context);
+    /**
+ * 
+    * @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);
+}
+```    
+- 3. Kintone APIを使用して、フィールドの表示／非表示の制御
+```ts
+    //条件式の計算結果を取得
+    const conditionResult = this.getConditionResult(context);
+    if(conditionResult){
+        if(this.props.show==='表示'){
+            kintone.app.record.setFieldShown(this.props.field.code,true);
+        }else if (this.props.show==='非表示'){
+            kintone.app.record.setFieldShown(this.props.field.code,false);
+        }
+    }
+```
+5. **登録関数の実装** (`register`):
+   - アクションをアドインシステムに登録するための`register`メソッドを実装します。
+
+6. **アクションプロセス`ActionProcess`に参照追加**
+```ts
+import { actionAddins } from "../actions";
+import '../actions/must-input';
+import '../actions/auto-numbering';
+import '../actions/field-shown'; 
+import '../actions/your-action'; //ここに新規のアクションの参照を追加する
+...
+```
+### 3. デプロイ
+1. **プロジェクトをビルドする**
+- 本番環境にデプロイする場合
+```bash
+cd plug\kintone-addins\
+npm install
+npm run build
+```
+- 開発環境にデプロイする場合（ソースマップ出力ます）
+```bash
+cd plug\kintone-addins\
+npm install
+npm run build:dev
+```
+2. **Azureにデプロイする**
+- Azure 拡張機能のインストール:    
+  VSCode の拡張機能ペインで`Azure Tools`を検索し、インストールします。
+
+- Azure にログイン:
+  - Azure Account 拡張機能を使用して Azure にログインします。
+
+- Azure へのデプロイ:
+   - 「Deploy to Web App」オプションを使用し、デプロイするファイルやフォルダを指定します。
+
+- デプロイの確認:
+   - 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/
+        ```

plugin/kintone-addins/src/actions/auto-numbering.ts

@@ -7,7 +7,6 @@ declare global {
     interface Window { $format: any; }  
 }
 
-
 interface IAutoNumberingProps{
     //文書番号を格納する
     field:IField;
@@ -35,7 +34,13 @@ 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,

plugin/kintone-addins/src/actions/button-add.ts

@@ -0,0 +1,107 @@
+
+import { actionAddins } from ".";
+import $ from 'jquery';
+import { IAction, IActionProperty, IActionNode, IActionResult } from "../types/ActionTypes";
+/**
+ * ボタン配置属性定義
+ */
+interface IButtonAddProps {
+    //ボタン表示名
+    buttonName: string;
+    //配置位置
+    position: string;
+    //イベント名
+    eventName: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; 
+            //ボタンを配置する
+            const menuSpace = kintone.app.record.getHeaderMenuSpaceElement();
+            if(!menuSpace) return result;
+            if($("style#alc-button-add").length===0){
+                const css=`
+                .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;
+                }`;
+                const style = $("<style id='alc-button-add'>/<style>");
+                style.text(css);
+                $("head").append(style);
+            }
+            const button =$(`<button id='${this.props.eventName}' class='alc-button-normal' >${this.props.buttonName}</button>`);
+            if(this.props.position==="一番左に追加する"){
+                $(menuSpace).prepend(button);
+            }else{
+                $(menuSpace).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();

plugin/kintone-addins/src/actions/condition-action.ts

@@ -0,0 +1,109 @@
+
+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();

plugin/kintone-addins/src/actions/error-show.ts

@@ -0,0 +1,99 @@
+
+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() { //解构函数定义需要的类名
+        this.name = "エラー表示";
+        this.actionProps = [];
+        this.props = {
+            message: '',
+            condition: ''
+        }
+        this.register(); //重置以上注册表
+    }
+
+    /**
+     * アクションの実行を呼び出す
+     * @param actionNode 
+     * @param event 
+     * @returns 
+     */
+    async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> { //异步处理某函数下的：xx属性
+        let result = { 
+            canNext: true,
+            result: false
+        };
+        try { //尝试执行以下代码部分
+            this.actionProps = actionNode.actionProps;
+            if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) { //如果message以及condition两者都不存在的情况下return
+                return result
+            }
+            this.props = actionNode.ActionValue as IErrorShowProps; 
+            const conditionResult = this.getConditionResult(context); 
+            if (conditionResult) {
+                event.error = this.props.message;
+            } else {
+                result = {
+                    canNext: false,
+                    result: true
+                }
+            }
+            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 ErrorShowAction();

plugin/kintone-addins/src/index.ts

@@ -14,14 +14,58 @@ 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);
-    kintone.events.on(events,async (event:any)=>{
+    const changeEvents = getChangeEvents(events);
-      const flowinfo = alcflow[event.type];
+    const clickEvents = getClickEvents(events);
-      const flow=ActionFlow.fromJSON(flowinfo.content);
+    const kintoneEvents = getKintoneEvents(events);
-      if(flow!==undefined){
+    if(kintoneEvents.length>0 ){
-        const process = new ActionProcess(event.type,flow,event);
+      //通常Kintoneイベントをバンド
-        await process.exec();
+      kintone.events.on(kintoneEvents,async (event:any)=>{
-      }
+        const flowinfo = alcflow[event.type];
-      return event;
+        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})
+        });
+      });
+    }
 });

plugin/kintone-addins/src/types/ActionTypes.ts

@@ -157,19 +157,19 @@ export class ActionNode implements IActionNode {
   prevNodeId?: string;
   nextNodeIds: Map<string, string>;
   constructor(
-    {id,name,title,inputPoint,outputPoint,actionProps}:
+    {id,name,title,inputPoint,outputPoints,actionProps}:
     {
       id:string,
       name: string,
       title: string,
       inputPoint: string,
-      outputPoint: Array<string>,
+      outputPoints: Array<string>,
       actionProps: Array<IActionProperty>}
   ) {
     this.id=id;
     this.name = name;
     this.inputPoint = inputPoint;
-    this.outputPoints = outputPoint;
+    this.outputPoints = outputPoints;
     const defProp = ActionProperty.defaultProperty();
     defProp.props.modelValue = title;
     this.actionProps = actionProps;
@@ -257,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(node.nextNodeIds);
+      nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
       nodeClass.prevNodeId = node.prevNodeId;
       nodeClass.id = node.id;
       return nodeClass;

plugin/kintone-addins/src/types/Conditions.ts

@@ -324,12 +324,17 @@ export class ConditionTree {
    */
   getObjectValue(object:any,context:IContext){
     if(!object || typeof object!=="object" || !("objectType" in object)){
-        return object;
+        return undefined;
     }
     if(object.objectType==='field'){
-      return context.record[object.code].value;
+      const fieldValue = context.record[object.code];
-    }else if(object.objectType==='var'){
+      if(fieldValue.type==='NUMBER' && fieldValue.value!==undefined){
-      return context.variables[object.varName].value;
+        return Number(fieldValue.value);
+      }else{
+        return fieldValue.value;
+      }      
+    }else if(object.objectType==='variable'){
+      return context.variables[object.name].value;
     }
   }
 
@@ -397,6 +402,12 @@ 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())) {

plugin/kintone-addins/src/types/action-process.ts

@@ -3,6 +3,9 @@ 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 { ActionFlow,IActionFlow, IActionResult,IContext } from "./ActionTypes";
 
 export class ActionProcess{
@@ -35,7 +38,11 @@ export class ActionProcess{
            if(action!==undefined){
             result = await action.process(nextAction,this.event,this.context);
            }
-           const nextInput = nextAction.outputPoints!==undefined?result.result||'':'';
+           let nextInput = '';
+           //outputPoints一つ以上の場合、次のInputPointは戻り値を設定する
+           if(nextAction.outputPoints && nextAction.outputPoints.length>1){
+             nextInput = result.result||'';
+           }
            id=nextAction.nextNodeIds.get(nextInput);
            if(id===undefined) return;
            nextAction = this.flow.findNodeById(id); 

sample.json

@@ -1,33 +1,215 @@
-[
+{
-  {
+  "id": "",
-    "component": "FieldInput",
+  "actionNodes": [
-    "props": {
+    {
-      "displayName": "フィールド",
+      "id": "cdd696f5-7e9c-4fd7-bf8b-9cd1b1605870",
-      "modelValue": {},
+      "name": "app.record.create.submit",
-      "name": "field",
+      "title": "レコード追加画面",
-      "placeholder": "対象項目を選択してください"
+      "subTitle": "保存をクリックしたとき",
-    }
+      "inputPoint": "",
-  },
+      "outputPoints": [],
-  {
+      "isRoot": true,
-    "component": "SelectBox",
+      "actionProps": [],
-    "props": {
+      "ActionValue": {},
-      "displayName": "表示／非表示",
+      "nextNodeIds": [
-      "options": [
+        [
-        "表示",
+          "",
-        "非表示"
+          "dfa6df09-7b3e-4848-89ad-2e9147004f31"
+        ]
+      ]
+    },
+    {
+      "id": "dfa6df09-7b3e-4848-89ad-2e9147004f31",
+      "name": "自動採番する",
+      "inputPoint": "",
+      "outputPoints": [],
+      "actionProps": [
+        {
+          "component": "InputText",
+          "props": {
+            "name": "displayName",
+            "displayName": "表示名",
+            "placeholder": "表示を入力してください",
+            "hint": "",
+            "modelValue": "文書番号を自動採番する"
+          }
+        },
+        {
+          "component": "FieldInput",
+          "props": {
+            "displayName": "採番項目",
+            "modelValue": {
+              "name": "文書番号",
+              "type": "SINGLE_LINE_TEXT",
+              "code": "文書番号",
+              "label": "文書番号",
+              "noLabel": false,
+              "required": false,
+              "minLength": "",
+              "maxLength": "",
+              "expression": "",
+              "hideExpression": false,
+              "unique": false,
+              "defaultValue": ""
+            },
+            "name": "field",
+            "placeholder": "採番項目を選択してください"
+          }
+        },
+        {
+          "component": "InputText",
+          "props": {
+            "displayName": "フォーマット",
+            "modelValue": "000000",
+            "name": "format",
+            "placeholder": "数値書式文字列を指定します"
+          }
+        },
+        {
+          "component": "InputText",
+          "props": {
+            "displayName": "前につける文字列",
+            "modelValue": "",
+            "name": "prefix",
+            "placeholder": "前につける文字列を入力してください"
+          }
+        },
+        {
+          "component": "InputText",
+          "props": {
+            "displayName": "後ろにつける文字列",
+            "modelValue": "{$format('yyyyMMdd')}",
+            "name": "suffix",
+            "placeholder": "後ろにつける文字列を入力してください"
+          }
+        },
+        {
+          "component": "InputText",
+          "props": {
+            "displayName": "結果（戻り値）",
+            "modelValue": "docNumber",
+            "name": "verName",
+            "placeholder": "変数名を入力してください"
+          }
+        }
       ],
-      "modelValue": "",
+      "prevNodeId": "cdd696f5-7e9c-4fd7-bf8b-9cd1b1605870",
-      "name": "show",
+      "nextNodeIds": [
-      "placeholder": ""
+        [
+          "",
+          "b32bf329-f05a-486f-9b79-9920b57fe324"
+        ]
+      ]
+    },
+    {
+      "id": "b32bf329-f05a-486f-9b79-9920b57fe324",
+      "name": "条件式",
+      "inputPoint": "",
+      "outputPoints": [
+        "はい",
+        "いいえ"
+      ],
+      "actionProps": [
+        {
+          "component": "InputText",
+          "props": {
+            "name": "displayName",
+            "displayName": "表示名",
+            "placeholder": "表示を入力してください",
+            "hint": "",
+            "modelValue": "条件式を設定する"
+          }
+        },
+        {
+          "component": "ConditionInput",
+          "props": {
+            "displayName": "条件",
+            "modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"部署\",\"objectType\":\"field\",\"type\":\"DROP_DOWN\",\"code\":\"ドロップダウン\",\"label\":\"部署\",\"noLabel\":false,\"required\":false,\"options\":{\"総務\":{\"label\":\"総務\",\"index\":\"2\"},\"サポート\":{\"label\":\"サポート\",\"index\":\"3\"},\"マーケティング\":{\"label\":\"マーケティング\",\"index\":\"1\"},\"営業\":{\"label\":\"営業\",\"index\":\"0\"},\"開発\":{\"label\":\"開発\",\"index\":\"4\"}},\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":2,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"所感、学び\",\"objectType\":\"field\",\"type\":\"MULTI_LINE_TEXT\",\"code\":\"文字列__複数行__0\",\"label\":\"所感、学び\",\"noLabel\":false,\"required\":false,\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":3,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"業務内容\",\"objectType\":\"field\",\"type\":\"MULTI_LINE_TEXT\",\"code\":\"文字列__複数行_\",\"label\":\"業務内容\",\"noLabel\":false,\"required\":false,\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":4,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"ステータス\",\"objectType\":\"field\",\"type\":\"STATUS\",\"code\":\"ステータス\",\"label\":\"ステータス\",\"enabled\":true},\"operator\":\"=\",\"value\":\"作成中\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
+            "name": "condition",
+            "placeholder": "条件式を設定してください"
+          }
+        },
+        {
+          "component": "InputText",
+          "props": {
+            "displayName": "結果（戻り値）",
+            "modelValue": "conditionResult",
+            "name": "verName",
+            "placeholder": "変数名を入力してください"
+          }
+        }
+      ],
+      "prevNodeId": "dfa6df09-7b3e-4848-89ad-2e9147004f31",
+      "nextNodeIds": [
+        [
+          "いいえ",
+          "82bdcbcc-d8c1-4e2c-b38f-f736c95b193a"
+        ]
+      ]
+    },
+    {
+      "id": "82bdcbcc-d8c1-4e2c-b38f-f736c95b193a",
+      "name": "表示／非表示",
+      "inputPoint": "いいえ",
+      "outputPoints": [],
+      "actionProps": [
+        {
+          "component": "InputText",
+          "props": {
+            "name": "displayName",
+            "displayName": "表示名",
+            "placeholder": "表示を入力してください",
+            "hint": "",
+            "modelValue": "指定項目の表示・非表示を設定する"
+          }
+        },
+        {
+          "component": "FieldInput",
+          "props": {
+            "displayName": "フィールド",
+            "modelValue": {
+              "name": "文書番号",
+              "type": "SINGLE_LINE_TEXT",
+              "code": "文書番号",
+              "label": "文書番号",
+              "noLabel": false,
+              "required": false,
+              "minLength": "",
+              "maxLength": "",
+              "expression": "",
+              "hideExpression": false,
+              "unique": false,
+              "defaultValue": ""
+            },
+            "name": "field",
+            "placeholder": "対象項目を選択してください"
+          }
+        },
+        {
+          "component": "SelectBox",
+          "props": {
+            "displayName": "表示／非表示",
+            "options": [
+              "表示",
+              "非表示"
+            ],
+            "modelValue": "非表示",
+            "name": "show",
+            "placeholder": ""
+          }
+        },
+        {
+          "component": "ConditionInput",
+          "props": {
+            "displayName": "条件",
+            "modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{},\"operator\":\"=\",\"value\":\"\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
+            "name": "condition",
+            "placeholder": "条件式を設定してください"
+          }
+        }
+      ],
+      "prevNodeId": "b32bf329-f05a-486f-9b79-9920b57fe324",
+      "nextNodeIds": []
     }
-  },
+  ]
-  {
+}
-    "component": "ConditionInput",
-    "props": {
-      "displayName": "条件",
-      "modelValue": "",
-      "name": "condition",
-      "placeholder": "対象項目を選択してください"
-    }
-  }
-]

sample2.json

@@ -1,59 +1,37 @@
-{
+[
-    "index": 0,
+    {
-    "type": "root",
+        "component": "InputText",
-    "children": [
+        "props": {
-        {
+            "displayName": "ボタン名",
-            "index": 1,
+            "modelValue": "",
-            "type": "condition",
+            "name": "buttonName",
-            "parent": "root",
+            "placeholder": "ボタンのラベルを入力してください"
-            "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"
+        "component": "SelectBox",
-}
+        "props": {
+            "displayName": "追加位置",
+            "modelValue": "",
+            "name": "position",
+            "options":[
+                "一番右に追加する",
+                "一番左に追加する"
+            ],
+            "placeholder": "追加位置を選択してください"
+        }
+    },
+    {
+        "component": "EventSetter",
+        "props": {
+            "displayName": "イベント名",
+            "modelValue": "",
+            "name": "eventName",
+            "connectProps":[{
+                "key":"displayName",
+                "propName":"buttonName"
+            }],
+            "placeholder": "イベント名を入力してください"
+        }
+    }
+]