bugfix

backend/.gitignore

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

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

@@ -31,6 +31,8 @@ def getkintoneformat():
 
 
 def createkintonefields(property,value,trueformat):
+        if(type(value) == str):
+            value = value.replace("\"","⊡⊡")
         p = []
         if(property=="options"):
             o=[]
@@ -148,7 +150,7 @@ def getfieldsfromexcel(df,mapping):
               
 
         col.append(f"\"{df.iloc[row,codecolumn]}\":{{{','.join(p)}}}")
-        fields = ",".join(col).replace("\\", "\\\\")
+        fields = ",".join(col).replace("\\", "\\\\").replace("⊡⊡","\\\"")
     return  json.loads(f"{{{fields}}}")  
 
 def getsettingfromexcel(df):
@@ -218,8 +220,6 @@ def deoployappfromkintone(app:str,revision:str,c:config.KINTONE_ENV):
     r = httpx.post(url,headers=headers,data=json.dumps(data))
     return r.json
     
-# 既定項目に含めるアプリのフィールドのみ取得する
-# スペース、枠線、ラベルを含まない    
 def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
     headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
     params = {"app":app}
@@ -227,44 +227,6 @@ def getfieldsfromkintone(app:str,c:config.KINTONE_ENV):
     r = httpx.get(url,headers=headers,params=params)
     return r.json()
 
-# フォームに配置するフィールドのみ取得する
-# スペース、枠線、ラベルも含める
-def getformfromkintone(app:str,c:config.KINTONE_ENV):
-    headers={config.API_V1_AUTH_KEY:c.API_V1_AUTH_VALUE}
-    params = {"app":app}
-    url = f"{c.BASE_URL}{config.API_V1_STR}/form.json"
-    r = httpx.get(url,headers=headers,params=params)
-    return r.json()
-
-
-def merge_kintone_fields(fields_response: dict, form_response: dict) -> dict:
-    fields_properties = fields_response.get('properties', {})
-    form_properties = form_response.get('properties', [])
-
-    merged_properties = {k: v for k, v in fields_properties.items()}
-
-    for index, form_field in enumerate(form_properties):
-        code = form_field.get('code')
-        if code:
-            if code and code not in merged_properties:
-                merged_properties[code] = form_field
-        else:
-            element_id = form_field.get('elementId')
-            if element_id:
-                key = element_id
-                form_field['code']=element_id
-                form_field['label']=form_field.get('type')
-            # else:
-            #     key = f"{form_field.get('type')}_{index}"
-                merged_properties[key] = form_field 
-
-    merged_response = {
-        'revision': fields_response.get('revision', ''),
-        'properties': merged_properties
-    }
-    
-    return merged_response
-
 def analysefields(excel,kintone):
     updatefields={}
     addfields={}
@@ -404,12 +366,6 @@ def updateappjscss(app,uploads,c:config.KINTONE_ENV):
     r = httpx.put(url,headers=headers,data=json.dumps(data))
     return r.json()
 
-def getTempPath(filename):
-    scriptdir = Path(__file__).resolve().parent
-    rootdir = scriptdir.parent.parent.parent.parent
-    fpath = os.path.join(rootdir,"Temp",filename)
-    return fpath
-
 def createappjs(domainid,app):
     db = SessionLocal()
     flows = get_flows_by_app(db,domainid,app)
@@ -418,10 +374,10 @@ def createappjs(domainid,app):
     for flow in flows:
         content[flow.eventid] = {'flowid':flow.flowid,'name':flow.name,'content':flow.content}
     js = 'const alcflow=' + json.dumps(content)
-    # scriptdir = Path(__file__).resolve().parent
+    scriptdir = Path(__file__).resolve().parent
-    # rootdir = scriptdir.parent.parent.parent.parent
+    rootdir = scriptdir.parent.parent.parent.parent
-    # fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
+    fpath = os.path.join(rootdir,"Temp",f"alc_setting_{app}.js")
-    fpath = getTempPath(f"alc_setting_{app}.js")
+    print(rootdir)
     print(fpath)
     with open(fpath,'w') as file:
         file.write(js)
@@ -509,7 +465,7 @@ async def app(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     except Exception as e:
-        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAME}->{app}):",e)   
+        raise APIException('kintone:app',request.url._url, f"Error occurred while get app({c.DOMAIN_NAM}->{app}):",e)   
 
 @r.get("/allapps")
 async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -519,30 +475,21 @@ async def allapps(request:Request,c:config.KINTONE_ENV=Depends(getkintoneenv)):
         r = httpx.get(url,headers=headers)
         return r.json()
     except Exception as e:
-       raise APIException('kintone:allapps',request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAME}):",e)   
+       raise APIException('kintone:allapps',request.url._url, f"Error occurred while get allapps({c.DOMAIN_NAM}):",e)   
 
 @r.get("/appfields")
 async def appfields(request:Request,app:str,env = Depends(getkintoneenv)):
     try:
         return getfieldsfromkintone(app,env)
     except Exception as e:
-       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAME}->{app}):",e) 
+       raise APIException('kintone:appfields',request.url._url, f"Error occurred while get app fileds({env.DOMAIN_NAM}->{app}):",e) 
-
-@r.get("/allfields")
-async def allfields(request:Request,app:str,env = Depends(getkintoneenv)):
-    try:
-        field_resp = getfieldsfromkintone(app,env)
-        form_resp = getformfromkintone(app,env)
-        return merge_kintone_fields(field_resp,form_resp)
-    except Exception as e:
-       raise APIException('kintone:allfields',request.url._url, f"Error occurred while get form fileds({env.DOMAIN_NAME}->{app}):",e) 
 
 @r.get("/appprocess")
 async def appprocess(request:Request,app:str,env = Depends(getkintoneenv)):
     try:
         return getprocessfromkintone(app,env)
     except Exception as e:
-       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAME}->{app}):",e) 
+       raise APIException('kintone:appprocess',request.url._url, f"Error occurred while get app process({env.DOMAIN_NAM}->{app}):",e) 
 
 @r.get("/alljscss")
 async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -553,7 +500,7 @@ async def alljscs(request:Request,app:str,c:config.KINTONE_ENV=Depends(getkinton
         r = httpx.get(url,headers=headers,params=params)
         return r.json()
     except Exception as e:
-       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAME}->{app}):",e) 
+       raise APIException('kintone:alljscss',request.url._url, f"Error occurred while get app js/css({c.DOMAIN_NAM}->{app}):",e) 
 
 @r.post("/createapp",)
 async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkintoneenv)):
@@ -569,7 +516,7 @@ async def createapp(request:Request,name:str,c:config.KINTONE_ENV=Depends(getkin
             r = httpx.post(url,headers=headers,data=json.dumps(data))
         return r.json
     except Exception as e:
-        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAME}->{name}):",e) 
+        raise APIException('kintone:createapp',request.url._url, f"Error occurred while create app({c.DOMAIN_NAM}->{name}):",e) 
 
 
 @r.post("/createappfromexcel",)
@@ -599,7 +546,7 @@ async def createappfromexcel(request:Request,files:t.List[UploadFile] = File(...
                 if app.get("revision") != None:
                     result["revision"] = app["revision"]
                     app = addfieldstokintone(result["app"],fields,env)
-                if len(processes)> 0:
+                if len(processes["states"])> 0:
                     app = updateprocesstokintone(result["app"],processes,env)
                 if app.get("revision") != None:
                     result["revision"] = app["revision"]
@@ -698,7 +645,7 @@ async def updateprocessfromexcel(request:Request,app:str,env = Depends(getkinton
         if deploy:
             result = deoployappfromkintone(app,revision,env)
     except Exception as e:
-        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAME}->{app}):",e)
+        raise APIException('kintone:updateprocessfromexcel',request.url._url, f"Error occurred while update process ({env.DOMAIN_NAM}->{app}):",e)
        
     return result
 
@@ -709,8 +656,7 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
         jscs=[]
         files=[]
         files.append(createappjs(env.DOMAIN_ID, app))
-        files.append(getTempPath('alc_runtime.js'))
+        files.append('Temp\\alc_runtime.js')
-        files.append(getTempPath('alc_runtime.css'))        
         for file in files:
             upload = uploadkintonefiles(file,env)
             if upload.get('fileKey') != None:
@@ -720,4 +666,4 @@ async def createjstokintone(request:Request,app:str,env:config.KINTONE_ENV = Dep
            deoployappfromkintone(app,appjscs["revision"],env)
            return appjscs
     except Exception as e:
-        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAME}->{app}):",e)
+        raise APIException('kintone:createjstokintone',request.url._url, f"Error occurred while create js ({env.DOMAIN_NAM}->{app}):",e)

backend/app/core/config.py

@@ -5,15 +5,14 @@ PROJECT_NAME = "KintoneAppBuilder"
 
 #SQLALCHEMY_DATABASE_URI = "postgres://maxz64:m@xz1205@alicornkintone.postgres.database.azure.com/postgres"
 SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/postgres"
-#SQLALCHEMY_DATABASE_URI = "postgres://kabAdmin:P@ssw0rd!@kintonetooldb.postgres.database.azure.com/unittest"
+
 API_V1_STR = "/k/v1"
 
 API_V1_AUTH_KEY = "X-Cybozu-Authorization"
 
-DEPLOY_MODE = "PROD" #DEV,PROD
+DEPLOY_MODE = "DEV" #DEV,PROD
 
 DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/alc_runtime.js"
-#DEPLOY_JS_URL = "https://ce1c-133-139-70-194.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"]
 

backend/app/core/security.py

@@ -9,7 +9,7 @@ pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
 SECRET_KEY = "alicorns"
 ALGORITHM = "HS256"
-ACCESS_TOKEN_EXPIRE_MINUTES = 2880
+ACCESS_TOKEN_EXPIRE_MINUTES = 30
 
 
 def get_password_hash(password: str) -> str:
@@ -25,7 +25,7 @@ def create_access_token(*, data: dict, expires_delta: timedelta = None):
     if expires_delta:
         expire = datetime.utcnow() + expires_delta
     else:
-        expire = datetime.utcnow() + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
+        expire = datetime.utcnow() + timedelta(minutes=2880)
     to_encode.update({"exp": expire})
     encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt

backend/app/db/crud.py

@@ -279,8 +279,7 @@ def get_events(db: Session):
     return events
 
 def get_eventactions(db: Session,eventid: str):
-    #eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
+    eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).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

backend/app/db/models.py

@@ -85,7 +85,6 @@ class Event(Base):
     eventid= Column(String(100), nullable=False)
     function = Column(String(500), nullable=False)   
     mobile = Column(Boolean, default=False)
-    eventgroup = Column(Boolean, default=False)
 
 class EventAction(Base):
     __tablename__ = "eventaction"

backend/app/db/schemas.py

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

backend/readme.md

@@ -25,7 +25,3 @@ python -m venv env
    pip install -r requirements.txt
 
    ```
-4. backend 起動
-   ```bash
-   uvicorn app.main:app --reload
-   ```

document/サイトマップ.drawio

@@ -1,147 +0,0 @@
-<mxfile host="app.diagrams.net" modified="2024-02-21T05:42:02.026Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36" etag="T2S5cjvthSOlO5DmGw-C" version="23.1.5" type="device">
-  <diagram id="Z6uZM46JtkVaKDzPjE9h" name="サイトマップ">
-    <mxGraphModel dx="1434" dy="820" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
-      <root>
-        <mxCell id="0" />
-        <mxCell id="1" parent="0" />
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-14" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-1" target="Gi77RX5G2m4J9-6cMje4-13" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-1" value="テナント登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
-          <mxGeometry x="60" y="50" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-2" value="Admin Login" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
-          <mxGeometry x="60" y="270" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-8" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-7" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-9" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-7" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-12" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-11" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-5" value="Home" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="240" y="270" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-2" target="Gi77RX5G2m4J9-6cMje4-5" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-42" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-7" target="Gi77RX5G2m4J9-6cMje4-41" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-7" value="ユーザー登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="220" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-11" value="ドメイン登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="340" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-13" value="テナント管理者作成" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
-          <mxGeometry x="240" y="50" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-15" value="ライセンス情報" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="480" y="10" width="90" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-16" value="Adminユーザー" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="480" y="90" width="90" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-13" target="Gi77RX5G2m4J9-6cMje4-15" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-13" target="Gi77RX5G2m4J9-6cMje4-16" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-19" value="テナントDB&lt;br&gt;作成" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
-          <mxGeometry x="550" y="50" width="90" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-20" target="Gi77RX5G2m4J9-6cMje4-21" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-20" value="Login" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;sketch=0;shape=mxgraph.sitemap.login;fontColor=#ffffff;" parent="1" vertex="1">
-          <mxGeometry x="50" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-24" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-25" edge="1">
-          <mxGeometry relative="1" as="geometry">
-            <mxPoint x="430" y="645" as="targetPoint" />
-          </mxGeometry>
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-21" value="Home" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="230" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-27" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-25" target="Gi77RX5G2m4J9-6cMje4-26" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-25" value="アプリ一覧" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="440" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-29" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-26" target="Gi77RX5G2m4J9-6cMje4-28" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-26" value="フロー一覧" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="620" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-40" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-28" target="Gi77RX5G2m4J9-6cMje4-39" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-28" value="フローエディタ" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="800" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-33" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-30" target="Gi77RX5G2m4J9-6cMje4-32" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-30" value="設計書取込" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="440" y="715" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-30" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-32" value="取込結果表示" style="html=1;whiteSpace=wrap;strokeColor=#005700;fillColor=#008a00;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="620" y="715" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-37" value="設計書ダウロード" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="440" y="825" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-38" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-37" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-39" value="フロー履歴管理" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.news;" parent="1" vertex="1">
-          <mxGeometry x="980" y="610" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-41" value="ALC設定" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="620" y="220" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-43" value="管理ドメイン設定" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="800" y="220" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-44" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-41" target="Gi77RX5G2m4J9-6cMje4-43" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-45" value="プロファイル" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="935" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-21" target="Gi77RX5G2m4J9-6cMje4-45" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-50" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-47" target="Gi77RX5G2m4J9-6cMje4-49" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-47" value="プロファイル" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="440" y="450" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-48" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-47" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-49" value="ライセンス情報" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="620" y="450" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-51" value="ライセンス情報" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
-          <mxGeometry x="620" y="935" width="120" height="70" as="geometry" />
-        </mxCell>
-        <mxCell id="Gi77RX5G2m4J9-6cMje4-52" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-45" target="Gi77RX5G2m4J9-6cMje4-51" edge="1">
-          <mxGeometry relative="1" as="geometry" />
-        </mxCell>
-      </root>
-    </mxGraphModel>
-  </diagram>
-</mxfile>

frontend/.env

@@ -1,6 +1,3 @@
-#開発環境
+KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
-#KAB_BACKEND_URL="https://kab-backend.azurewebsites.net/"
+#KAB_BACKEND_URL="http://127.0.0.1:8000/"
-#単体テスト環境
+
-#KAB_BACKEND_URL="https://kab-backend-unittest.azurewebsites.net/"
-#ローカル開発環境
-KAB_BACKEND_URL="http://127.0.0.1:8000/"

frontend/index.html

@@ -2,6 +2,7 @@
 <html lang="ja-jp">
   <head>
     <title><%= productName %></title>
+
     <meta charset="utf-8">
     <meta name="description" content="<%= productDescription %>">
     <meta name="format-detection" content="telephone=no">

frontend/package.json

@@ -2,7 +2,7 @@
   "name": "kintone-automate",
   "version": "0.2.0",
   "description": "Kintoneアプリの自動生成とデプロイを支援ツールです",
-  "productName": "kintone Automate",
+  "productName": "Kintone Automate",
   "author": "maxiaozhe@alicorns.co.jp <maxiaozhe@alicorns.co.jp>",
   "private": true,
   "scripts": {
@@ -17,9 +17,8 @@
   },
   "dependencies": {
     "@quasar/extras": "^1.16.4",
-    "@vueuse/core": "^10.9.0",
     "axios": "^1.4.0",
-    "pinia": "^2.1.7",
+    "pinia": "^2.1.6",
     "quasar": "^2.6.0",
     "uuid": "^9.0.0",
     "vue": "^3.0.0",

frontend/quasar.config.js

@@ -36,8 +36,7 @@ module.exports = configure(function (/* ctx */) {
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-vite/boot-files
     boot: [
-      'axios',
+      'axios'
-      'error-handler'
     ],
 
     // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
@@ -94,7 +93,6 @@ module.exports = configure(function (/* ctx */) {
     // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer
     devServer: {
       // https: true
-      port:9001,
       open: true, // opens browser window automatically
       env: { ...dotenv },
     },

frontend/src/boot/axios.ts

@@ -20,20 +20,22 @@ const token=localStorage.getItem('token')||'';
 if(token!==''){
   api.defaults.headers["Authorization"]='Bearer ' + token;
 }
-//axios例外キャプチャー
 api.interceptors.response.use(
   (response)=>response,
   (error)=>{
+    const orgReq=error.config;
     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

@@ -1,21 +0,0 @@
-// src/boot/error-handler.ts
-import { boot } from 'quasar/wrappers';
-import { Router } from 'vue-router';
-import { App } from 'vue';
-
-export default boot(({ app, router }: { app: App<Element>; router: Router }) => {
-  document.documentElement.lang="ja-JP";
-  app.config.errorHandler = (err: any, instance: any, info: string) => {
-    if (err.response && err.response.status === 401) {
-      // 認証エラーの場合再ログインする
-      console.error('(; ﾟДﾟ)/認証エラー(401)：', err, info);
-      localStorage.removeItem('token');
-      router.replace({
-        path:"/login",
-        query:{redirect:router.currentRoute.value.fullPath}
-      });
-    } else {
-      console.error('(; ﾟДﾟ)例外：', err, info);
-    }
-  };
-});

frontend/src/components/ActionSelect.vue

@@ -3,15 +3,13 @@
     <div v-if="!isLoaded" class="spinner flex flex-center">
       <q-spinner  color="primary" size="3em" />
     </div>
-    <q-table v-else  row-key="index" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
+    <q-table v-else  row-key="name" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
     class="action-table"
     flat bordered
     virtual-scroll
     :pagination="pagination"
     :rows-per-page-options="[0]"
-    :filter="filter"
+    />
-    >
-    </q-table>
   </div>
 </template>
 <script>
@@ -22,10 +20,9 @@ export default {
   name: 'actionSelect',
   props: {
     name: String,
-    type: String,
+    type: String
-    filter:String
   },
-  setup(props) {
+  setup() {
     const isLoaded=ref(false);
     const columns = [
     { name: 'name', required: true,label: 'アクション名',align: 'left',field: 'name',sortable: true},
@@ -35,9 +32,9 @@ export default {
     const rows = reactive([])
     onMounted(async () => {
         const res =await api.get('api/actions');
-        res.data.forEach((item,index) =>
+        res.data.forEach((item) =>
         {
-          rows.push({index,name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
+          rows.push({name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
         });
         isLoaded.value=true;
       });
@@ -56,7 +53,6 @@ export default {
 </script>
 <style lang="scss">
 .action-table{
-  min-height: 10vh;
+  height: 100%;
-  max-height: 68vh;
 }
 </style>

frontend/src/components/AppFieldSelectBox.vue

@@ -1,128 +0,0 @@
-<template>
-
-    <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="selField?.app && !showSelectApp">{{ selField?.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 && selField?.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" :updateSelectFields="updateSelectFields"
-                    :appId="selField?.app?.id" not_page :filter="fieldFilter"
-                    :selectedFields="selField.fields"></field-select>
-            </div>
-        </div>
-    </div>
-    <div style="min-width: 45vw;" v-else>
-    </div>
-
-
-    <show-dialog v-model:visible="showSelectApp" name="アプリ選択">
-        <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>
-
-        <AppSelectBox ref="appDlg" name="アプリ" type="single" :filter="filter"
-            :updateSelectApp="updateSelectApp"></AppSelectBox>
-    </show-dialog>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref, watchEffect, computed, reactive } from 'vue';
-import ShowDialog from './ShowDialog.vue';
-import FieldSelect from './FieldSelect.vue';
-import AppSelectBox from './AppSelectBox.vue';
-interface IApp {
-    id: string,
-    name: string
-}
-interface IField {
-    name: string,
-    code: string,
-    type: string
-}
-
-interface IAppFields {
-    app?: IApp,
-    fields: IField[]
-}
-
-export default defineComponent({
-    inheritAttrs: false,
-    name: 'AppFieldSelectBox',
-    components: {
-        ShowDialog,
-        FieldSelect,
-        AppSelectBox,
-    },
-    props: {
-        selectedField: {
-            type: Object,
-            required: true
-        },
-        selectType: {
-            type: String,
-            default: 'single'
-        },
-
-    },
-    setup(props, { emit }) {
-        const showSelectApp = ref(false);
-        const selField = reactive(props.selectedField);
-
-        const isSelected = computed(() => {
-            return selField !== null && typeof selField === 'object' && ('app' in selField)
-        });
-
-        const updateSelectApp = (newAppinfo: IApp) => {
-            selField.app = newAppinfo
-        }
-        
-        const updateSelectFields = (newFields: IField[]) => {
-            selField.fields = newFields
-        }
-
-        watchEffect(() => {
-            emit('update:modelValue', selField);
-        });
-
-        return {
-            showSelectApp,
-            isSelected,
-            updateSelectApp,
-            filter: ref(),
-            updateSelectFields,
-            fieldFilter: ref(),
-            selField
-        };
-    }
-});
-</script>

frontend/src/components/AppSelect.vue

@@ -0,0 +1,84 @@
+<template>
+  <div class="q-pa-md" >
+    <div v-if="!isLoaded" class="spinner flex flex-center">
+      <q-spinner  color="primary" size="3em" />
+    </div>
+    <q-table v-else :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" >
+      <template v-slot:body-cell-description="props">
+          <q-td :props="props">
+              <q-scroll-area  class="description-cell">
+                <div v-html="props.row.description" ></div>
+              </q-scroll-area>
+          </q-td>
+      </template>
+    </q-table>
+  </div>
+</template>
+<script lang="ts">
+import { ref,onMounted,reactive } from 'vue'
+import { api } from 'boot/axios';
+import { LeftDataBus } from './flowEditor/left/DataBus';
+
+export default {
+  name: 'AppSelect',
+  props: {
+    name: String,
+    type: String
+  },
+  setup() {
+  const columns = [
+  { name: 'id', required: true,label: 'ID',align: 'left',field: 'id',sortable: true},
+  { name: 'name', label: 'アプリ名', field: 'name', sortable: true,align:'left' },
+  { name: 'description', label: '概要', field: 'description',align:'left', sortable: false },
+  { name: 'createdate', label: '作成日時', field: 'createdate',align:'left'}
+  ]
+    const isLoaded=ref(false);
+    const rows :any[]= reactive([]);
+    onMounted( () => {
+        api.get('api/v1/allapps').then(res =>{
+          res.data.apps.forEach((item:any) =>
+              {
+                rows.push({
+                  id:item.appId,
+                  name:item.name,
+                  description:item.description,
+                  createdate:dateFormat(item.createdAt)});
+                });
+                isLoaded.value=true;
+              });
+      });
+
+    const dateFormat=(dateStr:string)=>{
+      const date = new Date(dateStr);
+      const pad = (num:number) => num.toString().padStart(2, '0');
+      const year = date.getFullYear();
+      const month = pad(date.getMonth() + 1);
+      const day = pad(date.getDate());
+      const hours = pad(date.getHours());
+      const minutes = pad(date.getMinutes());
+      const seconds = pad(date.getSeconds());
+      return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
+    }
+    return {
+      columns,
+      rows,
+      selected: ref([]),
+      isLoaded
+    }
+  },
+
+}
+</script>
+<style lang="scss">
+.description-cell{
+  height: 60px;
+  width: 300px;
+  max-height: 60px;
+  max-width: 300px;
+  white-space: break-spaces;
+}
+.spinner{
+  min-height: 300px;
+  min-width: 400px;
+}
+</style>

frontend/src/components/AppSelectBox.vue

@@ -1,100 +0,0 @@
-<template>
-  <div class="q-px-xs">
-    <div v-if="!isLoaded" class="spinner flex flex-center">
-      <q-spinner color="primary" size="3em" />
-    </div>
-    <q-table v-else class="app-table" :selection="type" row-key="id" v-model:selected="selected" flat bordered
-      virtual-scroll :columns="columns" :rows="rows" :pagination="pagination" :rows-per-page-options="[0]"
-      :filter="filter" style="max-height: 65vh;">
-      <template v-slot:body-cell-description="props">
-        <q-td :props="props">
-          <q-scroll-area class="description-cell">
-            <div v-html="props.row.description"></div>
-          </q-scroll-area>
-        </q-td>
-      </template>
-    </q-table>
-  </div>
-</template>
-<script lang="ts">
-import { ref, onMounted, reactive, watchEffect } from 'vue'
-import { api } from 'boot/axios';
-
-export default {
-  name: 'AppSelectBox',
-  props: {
-    name: String,
-    type: String,
-    filter: String,
-    updateSelectApp: {
-      type: Function
-    }
-  },
-  setup(props) {
-    const columns = [
-      { name: 'id', required: true, label: 'ID', align: 'left', field: 'id', sortable: true },
-      { name: 'name', label: 'アプリ名', field: 'name', sortable: true, align: 'left' },
-      { name: 'description', label: '概要', field: 'description', align: 'left', sortable: false },
-      { name: 'createdate', label: '作成日時', field: 'createdate', align: 'left' }
-    ]
-    const isLoaded = ref(false);
-    const rows: any[] = reactive([]);
-    const selected = ref([])
-
-    watchEffect(()=>{
-      if (selected.value && selected.value[0] && props.updateSelectApp) {
-        props.updateSelectApp(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 year = date.getFullYear();
-      const month = pad(date.getMonth() + 1);
-      const day = pad(date.getDate());
-      const hours = pad(date.getHours());
-      const minutes = pad(date.getMinutes());
-      const seconds = pad(date.getSeconds());
-      return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
-    }
-    return {
-      columns,
-      rows,
-      selected,
-      isLoaded,
-      pagination: ref({
-        rowsPerPage: 10
-      })
-    }
-  },
-
-}
-</script>
-<style lang="scss">
-.description-cell {
-  height: 60px;
-  width: 300px;
-  max-height: 60px;
-  max-width: 300px;
-  white-space: break-spaces;
-}
-
-.spinner {
-  min-height: 300px;
-  min-width: 400px;
-}
-</style>

frontend/src/components/ConditionEditor/ConditionEditor.vue

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

frontend/src/components/ConditionEditor/ConditionObject.vue

@@ -1,111 +1,68 @@
 <template>
-  <q-field labelColor="primary" class="condition-object" :clearable="isSelected" stack-label :dense="true"
+  <q-field v-model="selectedField" labelColor="primary" class="condition-object"
-    :outlined="true">
+          :clearable="isSelected" stack-label  :dense="true" :outlined="true" >
     <template v-slot:control >
-      <!-- <q-chip  color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
+      <q-chip  color="primary" text-color="white"  v-if="isSelected" :dense="true" class="selected-obj">
-        {{ selectedObject.name }}
+        {{ selectedField.name }}
       </q-chip>
-      <q-chip  color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
-        {{ selectedObject.name.name }}
-      </q-chip> -->
-      {{ selectedObject?.sharedText }}
     </template>
    <template v-slot:append>
     <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
     </template>
   </q-field>
-  <show-dialog v-model:visible="show" name="設定項目" @close="closeDg" min-width="400px">
+  <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
-    <!-- <template v-slot:toolbar>
+    <condition-objects ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></condition-objects>
-        <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>
-  -->
-    <DynamicItemInput v-model:selectedObject="selectedObject" :canInput="config.canInput"
-      :buttonsConfig="config.buttonsConfig" :appId="store.appInfo?.appId" />
   </show-dialog>
   </template>
 
   <script lang="ts">
-import { defineComponent, reactive, ref, watchEffect, computed } from 'vue';
+  import { defineComponent, ref ,watchEffect,computed} from 'vue';
   import ShowDialog from '../ShowDialog.vue';
-// import ConditionObjects from '../ConditionObjects.vue';
+  import ConditionObjects from '../ConditionObjects.vue';
-import DynamicItemInput from '../DynamicItemInput/DynamicItemInput.vue';
   import { useFlowEditorStore } from '../../stores/flowEditor';
-import { IActionFlow, IActionNode, IActionVariable } from '../../types/ActionTypes';
   export default defineComponent({
     name: 'ConditionObject',
     components: {
       ShowDialog,
-    DynamicItemInput,
+      ConditionObjects,
-    // ConditionObjects
     },
     props: {
-    config: {
-      type: Object,
-      default: () => {
-        return {
-          canInput: false,
-          buttonsConfig: [
-            { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
-            { label: '変数', color: 'green', type: 'VariableAdd' },
-          ]
-        };
-      }
-    },
       modelValue: {
         type: Object,
         default: null
       },
     },
     setup(props, { emit }) {
-    // const appDg = ref();
+      const appDg = ref();
       const show = ref(false);
-    const selectedObject = ref(props.modelValue);
+      const selectedField = ref(props.modelValue);
       const store = useFlowEditorStore();
-    // const sharedText = ref(''); // 共享的文本状态
       const isSelected = computed(()=>{
-      return selectedObject?.value?.sharedText !== '';
+        return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
       });
-    // const isSelected = computed(()=>{
+
-    //   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') {
-        // selectedObject.value = appDg.value.selected[0];
+          selectedField.value = appDg.value.selected[0];
         }
       };
 
       watchEffect(() => {
-      emit('update:modelValue', selectedObject.value);
+        emit('update:modelValue', selectedField.value);
       });
 
       return {
         store,
-      // appDg,
+        appDg,
         show,
         showDg,
         closeDg,
-      selectedObject,
+        selectedField,
-      vars: reactive(vars),
+        isSelected
-      isSelected,
-      buttonsConfig: [
-        { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
-        { label: '変数', color: 'green', type: 'VariableAdd' },
-      ]
-      // filter
       };
     }
   });
@@ -114,10 +71,9 @@ export default defineComponent({
 .condition-object{
   min-width: 200px;
   max-height: 40px;
-  margin: 0 2px;
+  padding: 2px;
 }
-
 .selected-obj{
-  margin: 0 2px;
+  margin: 0px;
 }
 </style>

frontend/src/components/ConditionEditor/NodeCondition.vue

@@ -66,14 +66,12 @@
           </div>
           <!-- condition -->
           <div @click.stop @keypress.stop v-else >
-            <div class="row no-wrap items-center q-my-xs">
+            <div class="row no-wrap items-center">
-              <ConditionObject v-bind="prop.node" v-model="prop.node.object" :config="leftDynamicItemConfig" class="col-4"/>
+              <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"></ConditionObject>
               <q-select v-model="prop.node.operator" :options="operators"  class="operator" :outlined="true" :dense="true"></q-select>
-              <ConditionObject v-bind="prop.node" v-model="prop.node.value" :config="rightDynamicItemConfig" class="col-4"/>
+              <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
-              <!-- <ConditionObject v-bind="prop.node" v-model="prop.node.object" class="col-4"/> -->
-              <!-- <q-input v-if="!prop.node.object || !('options' in prop.node.object)"
                         v-model="prop.node.value"
-                        class="condition-value" :outlined="true" :dense="true" ></q-input> -->
+                        class="condition-value" :outlined="true" :dense="true" ></q-input>
               <q-select v-if="prop.node.object && ('options' in prop.node.object)"
                         v-model="prop.node.value"
                         :options="objectValueOptions(prop.node.object.options)"
@@ -108,6 +106,10 @@
           </div>
       </template>
     </q-tree>
+    <!-- <q-btn @click="addCondition(tree.root)" class="q-mt-md" color="primary" icon="mdi-plus">Add Condition</q-btn> -->
+    <!-- <q-btn @click="getConditionString()" class="q-mt-md" color="primary" icon="mdi-plus">Show Condtion</q-btn>
+    <q-btn @click="getConditionJson()" class="q-mt-md" color="primary" icon="mdi-plus">Show Condtion data</q-btn>
+    <q-btn @click="LoadCondition()" class="q-mt-md" color="primary" icon="mdi-plus">Load Condition</q-btn> -->
     <q-tooltip anchor="center middle" v-model="showingCondition" no-parent-event>
 import { finished } from 'stream';
       {{ conditionString }}
@@ -115,7 +117,7 @@ import { finished } from 'stream';
   </div>
 </template>
 <script lang="ts">
-import { defineComponent,ref,reactive, computed, inject } from 'vue';
+import { defineComponent,ref,reactive, computed } from 'vue';
 import { INode,ConditionTree,GroupNode,ConditionNode, LogicalOperator,Operator,NodeType } from '../../types/Conditions';
 import ConditionObject from './ConditionObject.vue';
 export default defineComponent( {
@@ -145,9 +147,12 @@ export default defineComponent( {
       return opts;
     });
 
-    const operator = inject('Operator')
     const operators =computed(()=>{
-      return operator ? operator : Object.values(Operator);
+      const opts=[];
+      for(const op in Operator){
+        opts.push(Operator[op as keyof typeof Operator]);
+      }
+      return opts;
     });
     const tree = reactive(props.conditionTree);
 
@@ -227,8 +232,6 @@ export default defineComponent( {
     // addCondition(tree.root);
 
     return {
-      leftDynamicItemConfig :inject('leftDynamicItemConfig'),
-      rightDynamicItemConfig:inject('rightDynamicItemConfig'),
       showingCondition,
       conditionString,
       tree,
@@ -258,12 +261,12 @@ export default defineComponent( {
 .condition-value{
   min-width: 200px;
   max-height: 40px;
-  margin: 0 2px;
+  padding: 2px;
 }
 .operator{
   min-width: 150px;
   max-height: 40px;
-  margin: 0 2px;
+  padding: 2px;
   text-align: center;
   font-size: 12pt;
 }

frontend/src/components/ConditionObjects.vue

@@ -1,61 +1,52 @@
 <template>
-  <div class="q-gutter-y-md" style="max-width: 600px;">
+  <div class="q-pa-md">
-    <q-card >
+    <div v-if="!isLoaded" class="spinner flex flex-center">
-     <q-tabs
+      <q-spinner  color="primary" size="3em" />
-          v-model="tab"
+    </div>
-          dense
+    <q-table v-else  row-key="name"  :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
-          class="text-grey"
-          active-color="white"
-          active-bg-color="primary"
-          indicator-color="primary"
-          align="justify"
-          narrow-indicator
-        >
-          <q-tab name="fields" label="フィールド"></q-tab>
-          <q-tab name="vars" label="変数"></q-tab>
-        </q-tabs>
-
-        <q-separator></q-separator>
-
-        <q-tab-panels v-model="tab" animated>
-          <q-tab-panel name="fields">
-              <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp :appId " :fields="sourceFields"></field-list>
-            </q-tab-panel>
-
-          <q-tab-panel name="vars" >
-            <variable-list v-model="selected" type="single" :vars="vars"></variable-list>
-          </q-tab-panel>
-        </q-tab-panels>
-      </q-card>
   </div>
 </template>
-<script lang="ts">
+<script>
-import { ref, onMounted, reactive, inject } from 'vue'
+import { ref,onMounted,reactive } from 'vue'
-import FieldList from './FieldList.vue';
+import { api } from 'boot/axios';
-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 selected = ref([]);
+    const isLoaded=ref(false);
-    console.log(selected);
+    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 {
-      sourceFields : inject('sourceFields'),
+        columns,
-      sourceApp : inject('sourceApp'),
+        rows,
-      tab: ref('fields'),
+        selected: ref([]),
-      selected
+        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?format=1`
+      uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel`
 
     });
 </script>

frontend/src/components/DynamicItemInput/DynamicItemInput.vue

@@ -1,141 +0,0 @@
-<template>
-    <div class="q-mx-md" style="max-width: 600px;">
-        <!-- <q-card> -->
-        <div class="q-mb-md">
-            <q-input ref="inputRef" outlined dense debounce="200" @update:model-value="updateSharedText"
-                v-model="sharedText" :readonly="!canInput">
-                <template v-slot:append>
-                    <q-btn flat round padding="none" icon="cancel" @click="clearSharedText" color="grey-6" />
-                </template>
-            </q-input>
-
-        </div>
-
-        <div class="row q-gutter-sm">
-            <q-btn v-for="button in buttonsConfig" :key="button.type" :color="button.color" @mousedown.prevent
-                @click="openDialog(button)" size="sm">
-                {{ button.label }}
-            </q-btn>
-        </div>
-
-        <show-dialog v-model:visible="dialogVisible" :name="currentDialogName" @close="closeDialog" min-width="400px">
-            <template v-slot:toolbar>
-                <q-input dense debounce="200" v-model="filter" clearable>
-                    <template v-slot:before>
-                        <q-icon name="search" />
-                    </template>
-                </q-input>
-            </template>
-            <!-- asdf -->
-            <component :is="currentComponent" @select="handleSelect" :filter="filter" :appId="appId" />
-        </show-dialog>
-        <!-- </q-card> -->
-    </div>
-</template>
-
-<script lang="ts">
-import { ref, inject, watchEffect, defineComponent } from 'vue';
-import FieldAdd from './FieldAdd.vue';
-import VariableAdd from './VariableAdd.vue';
-// import FunctionAdd from './FunctionAdd.vue';
-import ShowDialog from '../ShowDialog.vue';
-
-type ButtonConfig = {
-    label: string;
-    color: string;
-    type: string;
-    editable: boolean;
-};
-
-export default defineComponent({
-    name: 'DynamicItemInput',
-    components: {
-        FieldAdd,
-        VariableAdd,
-        // FunctionAdd,
-        ShowDialog
-    },
-    props: {
-        // canInput: {
-        //     type: Boolean,
-        //     default: false
-        // },
-        appId: {
-            type: String,
-        },
-        selectedObject: {
-            default: {}
-        },
-        buttonsConfig: {
-            type: Array as () => ButtonConfig[],
-            default: () => [
-                { label: 'フィールド', color: 'primary', type: 'FieldAdd' }
-            ]
-        }
-    },
-    setup(props, { emit }) {
-        const filter = ref('');
-        const dialogVisible = ref(false);
-        const currentDialogName = ref('');
-        const currentComponent = ref('FieldAdd');
-        const sharedText = ref(props.selectedObject?.sharedText ?? '');
-        const inputRef = ref();
-        const canInput = ref(true);
-        const editable = ref(false);
-
-        const openDialog = (button: ButtonConfig) => {
-            currentDialogName.value = button.label;
-            currentComponent.value = button.type;
-            dialogVisible.value = true;
-            editable.value = button.editable ?? true;
-        };
-
-        const closeDialog = () => {
-            dialogVisible.value = false;
-        };
-
-        const handleSelect = (value) => {
-            // 获取当前光标位置
-            // const cursorPosition = inputRef.value.getNativeElement().selectionStart;
-            // if (cursorPosition === undefined || cursorPosition === 0) {
-            sharedText.value = `${value._t}`;
-            // } else {
-            //     const textBefore = sharedText.value.substring(0, cursorPosition);
-            //     const textAfter = sharedText.value.substring(cursorPosition);
-            //     sharedText.value = `${textBefore}${value._t}${textAfter}`;
-            // }
-            
-            if (value && value._t && (value._t as string).length > 0) {
-                canInput.value = editable.value;
-            }
-            emit('update:selectedObject', { sharedText: sharedText.value, ...value });
-            dialogVisible.value = false;
-        };
-
-        const clearSharedText = () => {
-            sharedText.value = '';
-            canInput.value = true;
-            emit('update:selectedObject', {});
-        }
-        const updateSharedText = (value) => {
-            sharedText.value = value;
-            emit('update:selectedObject', { ...props.selectedObject, sharedText: value });
-        }
-
-        return {
-            filter,
-            dialogVisible,
-            currentDialogName,
-            currentComponent,
-            canInput,
-            openDialog,
-            closeDialog,
-            handleSelect,
-            clearSharedText,
-            updateSharedText,
-            sharedText,
-            inputRef
-        };
-    }
-});
-</script>

frontend/src/components/DynamicItemInput/FieldAdd.vue

@@ -1,41 +0,0 @@
-<template>
-    <field-list v-model="selected" type="single" :filter="filter" :appId="sourceApp ? sourceApp : appId"
-        :fields="sourceFields" @update:modelValue="handleSelect" />
-</template>
-<script lang="ts">
-import { computed, inject, ref } from 'vue';
-import FieldList from '../FieldList.vue';
-export default {
-    name: 'FieldAdd',
-    components: {
-        FieldList,
-    },
-    props: {
-        appId: Number,
-        filter: String
-    },
-    setup(props, { emit }) {
-        const sourceFields = inject<Array<unknown>>('sourceFields')
-        const sourceApp = inject<number>('sourceApp')
-        const appId = computed(() => {
-            if (sourceFields || sourceApp) {
-                return sourceApp.value
-            } else {
-                return props.appId
-            }
-        });
-        return {
-            sourceFields,
-            sourceApp,
-            selected: ref([]),
-            handleSelect: (newSelection: any[]) => {
-                
-                if (newSelection.length > 0) {
-                    const v = newSelection[0]
-                    emit('select', { _t: `field(${appId.value},${v.name})`, ...v }); // 假设您只需要选择的第一个字段的名称
-                }
-            }
-        }
-    },
-}
-</script>

frontend/src/components/DynamicItemInput/VariableAdd.vue

@@ -1,42 +0,0 @@
-<template>
-    <variable-list v-model="selected" type="single" :vars="vars" :filter="filter" @update:modelValue="handleSelect" />
-</template>
-<script lang="ts">
-import { ref } from 'vue';
-import VariableList from '../VariableList.vue';
-import { useFlowEditorStore } from 'src/stores/flowEditor';
-import { IActionVariable } from 'src/types/ActionTypes';
-export default {
-    name: 'VariableAdd',
-    components: {
-        VariableList,
-    },
-    props: {
-        appId: Number,
-        filter: String
-    },
-    setup(props, { emit }) {
-        const store = useFlowEditorStore();
-        let vars: IActionVariable[] = [];
-        console.log(store.currentFlow !== undefined && store.activeNode !== undefined);
-        
-        if (store.currentFlow !== undefined && store.activeNode !== undefined) {
-            vars = store.currentFlow.getVarNames(store.activeNode);
-        }
-        return {
-            vars,
-            selected: ref([]),
-            handleSelect: (newSelection: any[]) => {
-                if (newSelection.length > 0) {
-                    const v = newSelection[0];
-                    let name = v.name
-                    if (typeof name === 'object') {
-                        name = name.name
-                    }
-                    emit('select', { _t: `var(${name})`, ...v }); // 假设您只需要选择的第一个字段的名称
-                }
-            }
-        }
-    },
-}
-</script>

frontend/src/components/FieldList.vue

@@ -1,58 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <q-table flat bordered :loading="!isLoaded" row-key="name" :selection="type" :selected="modelValue"
-      @update:selected="$emit('update:modelValue', $event)" :filter="filter" :columns="columns" :rows="rows" />
-  </div>
-</template>
-<script lang="ts">
-import { useAsyncState } from '@vueuse/core';
-import { api } from 'boot/axios';
-import { computed } from 'vue';
-
-export default {
-  name: 'FieldList',
-  props: {
-    fields: Array,
-    name: String,
-    type: String,
-    appId: Number,
-    modelValue: Array,
-    filter: String
-  },
-  emits: [
-    'update:modelValue'
-  ],
-  setup(props) {
-    // const rows = ref([]);
-    // const isLoaded = ref(false);
-    const columns = [
-      { name: 'name', required: true, label: 'フィールド名', align: 'left', field: 'name', sortable: true },
-      { name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
-      { name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
-    ]
-    
-    const { state : rows, isReady: isLoaded, isLoading } = useAsyncState((args) => {
-      if (props.fields && Object.keys(props.fields).length > 0) {
-        return props.fields.map(f => ({ name: f.label, objectType: 'field', ...f }));
-      } else {
-        return api.get('api/v1/appfields', {
-          params: {
-            app: props.appId
-          }
-        }).then(res => {
-          console.log(res);
-          return Object.values(res.data.properties).map(f => ({ name: f.label, objectType: 'field', ...f }));
-        });
-      }
-    }, [{ name: '', objectType: '', type: '', code: '', label: '' }])
-   
-    return {
-      columns,
-      rows,
-      // selected: ref([]),
-      isLoaded
-    }
-  },
-
-}
-</script>

frontend/src/components/FieldSelect.vue

@@ -1,42 +1,21 @@
 <template>
-  <div class="q-px-md" style=" min-width: 50vw; max-width: 85vw;">
+  <div class="q-pa-md">
     <div v-if="!isLoaded" class="spinner flex flex-center">
       <q-spinner  color="primary" size="3em" />
     </div>
-    <q-table  flat bordered v-else row-key="name" :selection="type" v-model:selected="selected" :columns="columns"
+    <q-table v-else  row-key="name"  :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
-      :rows="rows" :pagination="pageSetting" :filter="filter" style="max-height: 55vh;"/>
   </div>
 </template>
 <script>
-import { ref, onMounted, reactive, watchEffect } from 'vue'
+import { ref,onMounted,reactive } from 'vue'
 import { api } from 'boot/axios';
 
-
 export default {
   name: 'fieldSelect',
   props: {
     name: String,
-    type: {
     type: String,
-      default: 'single'
+    appId:Number
-    },
-    appId: Number,
-    not_page: {
-      type: Boolean,
-      default: false,
-    },
-    selectedFields:{
-      type:Array,
-      default:()=>[]
-    },
-    fieldTypes:{
-      type:Array,
-      default:()=>[]
-    },
-    filter: String,
-    updateSelectFields: {
-      type: Function
-    },
   },
   setup(props) {
     const isLoaded=ref(false);
@@ -45,48 +24,29 @@ export default {
     { name: 'code', label: 'フィールドコード', align: 'left',field: 'code', sortable: true },
     { name: 'type', label: 'フィールドタイプ', align: 'left',field: 'type', sortable: true }
     ]
-    const pageSetting = ref({
+    const rows = reactive([])
-      sortBy: 'desc',
-      descending: false,
-      page: 1,
-      rowsPerPage: props.not_page ? 0 : 5
-      // rowsNumber: xx if getting data from a server
-    });
-    const rows = reactive([]);
-    const selected = ref(props.selectedFields && props.selectedFields.length>0?props.selectedFields:[]);
-
       onMounted( async () => {
-      const url = props.fieldTypes.includes('SPACER')?'api/v1/allfields':'api/v1/appfields';
+          const res = await api.get('api/v1/appfields', {
-      const res = await api.get(url, {
                 params:{
                   app: props.appId
                 }
             });
             let fields = res.data.properties;
-      Object.keys(fields).forEach((key) => {
+            console.log(fields);
+            Object.keys(fields).forEach((key) =>
+            {
               const fld=fields[key];
-        if(props.fieldTypes.length===0 || props.fieldTypes.includes(fld.type)){
+              // rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
-          rows.push({ name: fld.label || fld.code, ...fld });
+              rows.push({name:fld.label,...fld});
-        }else if(props.fieldTypes.includes("lookup") && ("lookup" in fld)){
-          rows.push({ name: fld.label || fld.code, ...fld });
-        }
-
             });
             isLoaded.value=true;
         });
 
-    watchEffect(()=>{
-      if (selected.value && selected.value[0] && props.updateSelectFields) {
-        props.updateSelectFields(selected)
-      }
-    });
-
       return {
         columns,
         rows,
-      selected,
+        selected: ref([]),
-      isLoaded,
+        isLoaded
-      pageSetting
       }
   },
 

frontend/src/components/ShowDialog.vue

@@ -1,14 +1,17 @@
 <template>
   <!-- <div class="q-pa-md q-gutter-sm" > -->
     <q-dialog :model-value="visible" persistent bordered>
-      <q-card class="" style="min-width: 40vw; max-width: 80vw; max-height: 95vh;" :style="cardStyle">
+      <q-card :style="{minWidth : width}" >
         <q-toolbar class="bg-grey-4">
           <q-toolbar-title>{{ name }}</q-toolbar-title>
           <q-space></q-space>
           <slot name="toolbar"></slot>
           <q-btn flat round dense icon="close" @click="CloseDialogue('Cancel')" />
         </q-toolbar>
-        <q-card-section class="q-mt-md" :style="sectionStyle">
+        <q-card-section>
+          <!-- <div class="text-h6">{{ name }}</div> -->
+        </q-card-section>
+        <q-card-section class="q-pt-none" :style="{...(height? {minHeight:height}:{}) }">
          <slot></slot>
         </q-card-section>
         <q-card-actions align="right" class="text-primary">
@@ -20,16 +23,14 @@
   <!-- </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'
@@ -40,20 +41,8 @@ export default {
       context.emit('close', val);
     }
 
-    const cardStyle = computed(() => ({
-      minWidth: props.minWidth,
-      width: props.width
-    }));
-
-    const sectionStyle = computed(() => ({
-      height: props.height,
-      minHeight: props.minHeight
-    }));
-
     return {
-      CloseDialogue,
+      CloseDialogue
-      cardStyle,
-      sectionStyle
     }
   },
 }

frontend/src/components/VariableList.vue

@@ -1,61 +0,0 @@
-<template>
-  <div class="q-pa-md">
-    <q-table flat bordered row-key="id" :selection="type" :selected="modelValue" :filter="filter"
-      @update:selected="$emit('update:modelValue', $event)" :columns="columns" :rows="rows" />
-  </div>
-</template>
-<script lang="ts">
-import { PropType, reactive } from 'vue';
-import { IActionVariable } from '../types/ActionTypes';
-import { v4 as uuidv4 } from 'uuid';
-
-export default {
-  name: 'VariableList',
-  props: {
-    name: String,
-    type: String,
-    vars: {
-      type: Array as PropType<IActionVariable[]>,
-      reqired: true,
-      default: () => []
-    },
-    modelValue: Array,
-    filter: String
-  },
-  emits: [
-    'update:modelValue'
-  ],
-  setup(props) {
-    const variableName = (field) => {
-      const name = field.name;
-      return name.name;
-    }
-    const columns = [
-      { name: 'actionName', label: 'アクション名', align: 'left', field: 'actionName', sortable: true },
-      { name: 'displayName', label: '変数表示名', align: 'left', field: 'displayName', sortable: true },
-      { name: 'name', label: '変数名', align: 'left', field: variableName, required: true, sortable: true }
-    ];
-
-    const rows = props.vars.flatMap((v) => {
-      if (v.name.vars && v.name.vars.length > 0) {
-        return v.name.vars
-          .filter(o => o.vName && o.logicalOperator && o.field)
-          .map(o => ({
-            id: uuidv4(),
-            objectType: 'variable',
-            name: { name: `${v.name.name}.${o.vName}` },
-            actionName: v.name.actionName,
-            displayName: v.name.displayName
-          }));
-      } else {
-        return [{ objectType: 'variable', ...v }];
-      }
-    });
-
-    return {
-      columns,
-      rows: reactive(rows)
-    }
-  }
-}
-</script>

frontend/src/components/left/AppSelector.vue

@@ -22,15 +22,8 @@
       ></q-btn>
     </div>
   </div>
-  <ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh" >
+  <ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" width="600px" >
-    <template v-slot:toolbar>
+      <AppSelect ref="appDg" name="アプリ" type="single"></AppSelect>
-        <q-input  dense debounce="300" v-model="filter" placeholder="検索" clearable>
-          <template v-slot:before>
-            <q-icon name="search" />
-          </template>
-        </q-input>
-      </template>
-      <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelectBox>
   </ShowDialog>
 </template>
 
@@ -38,7 +31,7 @@
 import { defineComponent,ref } from 'vue';
 import {AppInfo} from '../../types/ActionTypes'
 import ShowDialog from '../../components/ShowDialog.vue';
-import AppSelectBox from '../../components/AppSelectBox.vue';
+import AppSelect from '../../components/AppSelect.vue';
 import { useFlowEditorStore } from 'stores/flowEditor';
 import { useAuthStore } from 'src/stores/useAuthStore';
 export default defineComponent({
@@ -47,7 +40,7 @@ export default defineComponent({
     "appSelected"
   ],
   components:{
-    AppSelectBox,
+    AppSelect,
     ShowDialog
   },
   setup(props, context) {
@@ -80,8 +73,7 @@ export default defineComponent({
       showSelectApp,
       showAppDialog,
       closeDg,
-      appDg,
+      appDg
-      filter:ref('')
     }
   }
 });

frontend/src/components/left/EventTree.vue

@@ -1,113 +1,42 @@
 <template>
   <!-- <div class="q-pa-md q-gutter-sm"> -->
-  <q-tree :nodes="store.eventTree.screens" node-key="eventId" children-key="events" no-connectors
+    <q-tree
-    v-model:expanded="store.expandedScreen" :dense="true" :ref="tree">
+      :nodes="store.eventTree.screens"
-    <template v-slot:header-EVENT="prop">
+      node-key="label"
-      <div :ref="prop.node.eventId" class="row col items-center no-wrap event-node" @click="onSelected(prop.node)">
+      children-key="events"
-        <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px"
+      no-connectors
-          class="q-mr-sm">
+      v-model:expanded="store.expandedScreen"
+      :dense="true"
+    >
+      <template v-slot:default-header="prop">
+        <div class="row col items-start no-wrap event-node" @click="onSelected(prop.node)">
+          <q-icon v-if="prop.node.eventId"
+                  name="play_circle"
+                  :color="prop.node.hasFlow?'green':'grey'"
+                  size="16px" class="q-mr-sm">
                   </q-icon>
-        <div class="no-wrap"
-          :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''">{{
-            prop.node.label }}</div>
-        <q-space></q-space>
-        <!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
-      </div>
-    </template>
-    <template v-slot:header-CHANGE="prop">
-      <div class="row col items-start no-wrap event-node">
-        <div class="no-wrap"
-        :class="selectedEvent && prop.node.eventId === selectedEvent.eventId ? 'selected-node' : ''"
-        >{{ prop.node.label }}</div>
-        <q-space></q-space>
-        <q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm"
-          @click="addChangeEvent(prop.node)"></q-icon>
-      </div>
-    </template>
-    <template v-slot:header-DELETABLE="prop">
-      <div class="row col items-start event-node" @click="onSelected(prop.node)">
-          <q-icon v-if="prop.node.eventId" name="play_circle" :color="prop.node.hasFlow ? 'green' : 'grey'" size="16px" class="q-mr-sm" />
           <div class="no-wrap" :class="selectedEvent && prop.node.eventId===selectedEvent.eventId?'selected-node':''">{{ prop.node.label }}</div>
-          <q-space></q-space>
-          <q-icon  name="delete_forever"  color="negative" size="16px" @click="deleteEvent(prop.node)"></q-icon>
         </div>
       </template>
     </q-tree>
-  <show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg">
+  <!-- </div> -->
-    <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
-  </show-dialog>
 </template>
 
 <script lang="ts">
-import { QTree, useQuasar } from 'quasar';
+import { defineComponent, computed, ref } from 'vue';
-import { ActionFlow, RootAction } from 'src/types/ActionTypes';
+import { IKintoneEvent } from '../../types/KintoneEvents';
+import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import { defineComponent, ref } from 'vue';
+import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes';
-import { IKintoneEvent, IKintoneEventGroup, IKintoneEventNode } from '../../types/KintoneEvents';
-import FieldSelect from '../FieldSelect.vue';
-import ShowDialog from '../ShowDialog.vue';
 export default defineComponent({
   name: 'EventTree',
-  components: {
-    ShowDialog,
-    FieldSelect,
-  },
   setup(props, context) {
-    const $q = useQuasar();
-    const appDg = ref();
     const store = useFlowEditorStore();
-    const showDialog = ref(false);
-    const tree = ref<QTree>();
     // const eventTree=ref(kintoneEvents);
     // const selectedFlow = store.currentFlow;
 
     // const expanded=ref();
     const selectedEvent = ref<IKintoneEvent|null>(null);
-    const selectedChangeEvent = ref<IKintoneEventGroup | null>(null);
-    const isFieldChange = (node: IKintoneEventNode) => {
-      return node.header == 'EVENT' && node.eventId.indexOf(".change.") > -1;
-    }
-    //フィールド値変更イベント追加
-    const closeDg = (val: string) => {
-      if (val == 'OK') {
-        if (!selectedChangeEvent.value) { return; }
-        const field = appDg.value.selected[0];
-        const eventid = `${selectedChangeEvent.value.eventId}.${field.code}`;
-        if (store.eventTree.findEventById(eventid)) {
-          return;
-        }
-        selectedChangeEvent.value?.events.push({
-          eventId: eventid,
-          label: field.name,
-          parentId: selectedChangeEvent.value.eventId,
-          header: 'DELETABLE'
-        });
-        tree.value?.expanded?.push(selectedChangeEvent.value.eventId);
-        tree.value?.expandAll();
-      }
-    };
-    const addChangeEvent = (node: IKintoneEventGroup) => {
-      if (store.appInfo === undefined) {
-        return;
-      }
-      selectedChangeEvent.value = node;
-      showDialog.value = true;
-    }
-
-    const deleteEvent = (node: IKintoneEvent) => {
-      if (!node.eventId) {
-        return;
-      }
-      store.deleteEvent(node);
-      store.selectFlow(undefined)
-
-      $q.notify({
-        type: 'positive',
-        caption: "通知",
-        message: `イベント ${node.label} 削除`
-      })
-    }
-
     const onSelected=(node:IKintoneEvent)=>{
         if(!node.eventId){
           return;
@@ -116,38 +45,24 @@ export default defineComponent({
         if(store.appInfo===undefined){
           return;
         }
-      const screen = store.eventTree.findEventById(node.parentId);
+        const screen = store.eventTree.findScreen(node.eventId);
-
         let flow =store.findFlowByEventId(node.eventId);
-      let screenName = screen !== null ? screen.label : "";
+        const screenName=screen!==null?screen.label:"";
-      let nodeLabel = node.label;
-      // if(isFieldChange(node)){
-      //   screenName=nodeLabel;
-      //   nodeLabel=`${node.label}の値を変更したとき`;
-      // }
-
         if(flow!==undefined && flow!==null ){
           store.selectFlow(flow);
         }else{
-        const root = new RootAction(node.eventId, screenName, nodeLabel)
+          const root = new RootAction(node.eventId,screenName,node.label)
             const flow =new ActionFlow(root);
             store.flows?.push(flow);
             store.selectFlow(flow);
             selectedEvent.value.flowData=flow;
         }
-    };
+    }
     return {
       // eventTree,
       // expanded,
-      appDg,
-      tree,
-      showDialog,
-      isFieldChange,
       onSelected,
       selectedEvent,
-      addChangeEvent,
-      deleteEvent,
-      closeDg,
       store
     }
   }
@@ -158,21 +73,14 @@ export default defineComponent({
   flex-wrap:nowarp;
   text-wrap:nowarp;
 }
-
 .event-node{
   cursor:pointer;
 }
-
 .selected-node{
   color: $primary;
   font-weight: bolder;
 }
-
 .event-node:hover{
   background-color: $light-blue-1;
 }
-
-.delete-btn {
-  margin-right: 5px;
-}
 </style>

frontend/src/components/main/NodeItem.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="row justify-center no-wrap" >
+  <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }" >
     <div class="row">
       <q-card class="action-node" :class="nodeStyle" :square="false" @click="onNodeClick" >
         <q-toolbar class="col" >
@@ -8,10 +8,6 @@
           <q-btn flat round dense icon="more_horiz" size="sm" >
             <q-menu  auto-close anchor="top right">
                 <q-list>
-                  <q-item clickable v-if="isRoot" @click="copyFlow">
-                    <q-item-section avatar><q-icon name="content_copy" ></q-icon></q-item-section>
-                    <q-item-section >コピーする</q-item-section>
-                  </q-item>
                   <q-item clickable v-if="!isRoot" @click="onEditNode">
                     <q-item-section avatar><q-icon name="edit" ></q-icon></q-item-section>
                     <q-item-section >編集する</q-item-section>
@@ -29,7 +25,7 @@
           </q-btn>
         </q-toolbar>
         <q-separator />
-        <q-card-section class="action-title">
+        <q-card-section>
           <div class="row">
           <span class="text-h7">{{ node.title }}</span>
           <q-space></q-space>
@@ -48,34 +44,23 @@
     </div>
   </div>
   <template v-if="hasBranch">
-    <node-line :action-node="node"  @addNode="addNode" :left-columns="leftColumns" :right-columns="rightColumns"></node-line>
+    <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
-    <div class="row justify-center no-wrap" >
+      <div v-for="(point, index) in node.outputPoints" :key="index">
-      <div v-for="(point, index) in node.outputPoints" :key="index" class="column" style="min-width: 300px;">
+        <node-line :action-node="node" :mode="getMode(point)" @addNode="addNode" :input-point="point"></node-line>
-        <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 no-wrap" >
+    <div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
-      <node-line :action-node="node"  @addNode="addNode" ></node-line>
+      <node-line :action-node="node" :mode="getMode('')" @addNode="addNode" input-point=""></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, IActionProperty } from '../../types/ActionTypes';
+import { IActionNode } from '../../types/ActionTypes';
 import NodeLine, { Direction } from '../main/NodeLine.vue';
-import { useFlowEditorStore } from 'stores/flowEditor';
 export default defineComponent({
   name: 'NodeItem',
   components: {
@@ -96,10 +81,8 @@ export default defineComponent({
     "nodeEdit",
     "deleteNode",
     "deleteAllNextNodes",
-    "copyFlow"
   ],
   setup(props, context) {
-    const store = useFlowEditorStore();
     const hasBranch = computed(() => props.actionNode.outputPoints.length > 0);
     const nodeStyle = computed(() => {
       return {
@@ -108,11 +91,23 @@ export default defineComponent({
         'selected': props.isSelected && !props.actionNode.isRoot
       };
     });
-
+    const getMode = (point: string) => {
-    const nextNode=(point:string)=>{
+      if (point === '' || props.actionNode.outputPoints.length === 0) {
-        const nextId= props.actionNode.nextNodeIds.get(point);
+        return Direction.Default;
-        if(!nextId) return undefined;
+      }
-        return store.currentFlow?.findNodeById(nextId);
+      if (point === props.actionNode.outputPoints[0]) {
+        if (props.actionNode.nextNodeIds.get(point)) {
+          return Direction.Left;
+        } else {
+          return Direction.LeftNotNext;
+        }
+      } else {
+        if (props.actionNode.nextNodeIds.get(point)) {
+          return Direction.Right;
+        } else {
+          return Direction.RightNotNext;
+        }
+      }
     }
     /**
      * アクションノード追加イベントを
@@ -121,38 +116,6 @@ export default defineComponent({
     const addNode = (point: string) => {
       context.emit('addNode', props.actionNode, point);
     }
-    /**
-     * アクションノード追加イベントを
-     * @param point 入力ポイント
-     */
-     const addNodeFromItem = (node:IActionNode,point: string) => {
-      context.emit('addNode', node, point);
-    }
-
-    const leftColumns=computed(()=>{
-      if(!props.actionNode.outputPoints || props.actionNode.outputPoints.length<2){
-          return 1;
-      }
-      const leftNode = nextNode(props.actionNode.outputPoints[0]);
-      if(leftNode){
-        return store.currentFlow?.getColumns(leftNode);
-      }else{
-        return 1;
-      }
-    });
-
-    const rightColumns=computed(()=>{
-      if(!props.actionNode.outputPoints || props.actionNode.outputPoints.length<2){
-          return 1;
-      }
-      const rightNode = nextNode(props.actionNode.outputPoints[1]);
-      if(rightNode){
-        return store.currentFlow?.getColumns(rightNode);
-      }else{
-        return 1;
-      }
-    });
-
     /**
      * ノード選択状態
      */
@@ -160,20 +123,9 @@ export default defineComponent({
       context.emit('nodeSelected', props.actionNode);
     }
 
-
-    const onNodeSelected = (node: IActionNode) => {
-      context.emit('nodeSelected', node);
-    }
-
     const onEditNode=()=>{
       context.emit('nodeEdit', props.actionNode);
     }
-
-    const onNodeEdit=(node:IActionNode)=>{
-      context.emit('nodeEdit', node);
-    }
-
-
     /**
      * ノードを削除する
      */
@@ -181,68 +133,38 @@ export default defineComponent({
       context.emit('deleteNode', props.actionNode);
     }
 
-      /**
-     * ノードを削除する
-     */
-     const onDeleteNodeFromItem=(node:IActionNode)=>{
-      context.emit('deleteNode', node);
-    }
     /**
      * ノードの以下すべて削除する
      */
      const onDeleteAllNode=()=>{
       context.emit('deleteAllNextNodes', props.actionNode);
     };
-
-    /**
-     * ノードの以下すべて削除する
-     */
-     const onDeleteAllNextNodes=(node:IActionNode)=>{
-      context.emit('deleteAllNextNodes', node);
-    };
     /**
      * 変数名取得
      */
     const varName =(node:IActionNode)=>{
       const prop = node.actionProps.find((prop) => prop.props.name === "verName");
-      return prop?.props.modelValue.name;
+      return prop?.props.modelValue;
     };
-    const copyFlow=()=>{
-      context.emit('copyFlow', props.actionNode);
-    }
     return {
-      store,
       node: props.actionNode,
-      nextNode,
       isRoot: props.actionNode.isRoot,
       hasBranch,
       nodeStyle,
-      // getMode,
+      getMode,
       addNode,
-      addNodeFromItem,
       onNodeClick,
-      onNodeSelected,
       onEditNode,
-      onNodeEdit,
       onDeleteNode,
-      onDeleteNodeFromItem,
       onDeleteAllNode,
-      onDeleteAllNextNodes,
+      varName
-      copyFlow,
-      varName,
-      leftColumns,
-      rightColumns
     }
   }
 });
 </script>
 <style lang="scss">
 .action-node {
-  min-width: 280px !important;
+  min-width: 300px !important;
-}
-.action-title{
-  max-width: 280px !important;
-  overflow-wrap: anywhere;
 }
 
 .line {

frontend/src/components/main/NodeLine.vue

@@ -1,28 +1,11 @@
 <template>
-    <div class="row justify-center">
+    <div>
-      <svg class="node-line" style="width:100%" :viewBox="viewBox()">
+      <svg class="node-line">
-        <template v-if="!node.outputPoints || node.outputPoints.length===0" >
+        <polyline :points="points.linePoints" class="line" ></polyline>
-          <polyline :points="points(getMode('')).linePoints" class="line" ></polyline>
+        <text class="add-icon" @click="addNode(node)" :x="points.iconPoint.x" :y="points.iconPoint.y" font-family="Arial" font-size="25"
-          <text class="add-icon"
-          @click="addNode(node,'')"
-          :x="points(getMode('')).iconPoint.x"
-          :y="points(getMode('')).iconPoint.y"
-          font-family="Arial" font-size="25"
         text-anchor="middle" dy=".3em" style="cursor: pointer;" >
           ⊕
         </text>
-        </template>
-        <template v-for="(point, index) in node.outputPoints" :key="index" >
-          <polyline :points="points(getMode(point)).linePoints" class="line" ></polyline>
-          <text class="add-icon"
-          @click="addNode(node,point)"
-          :x="points(getMode(point)).iconPoint.x"
-          :y="points(getMode(point)).iconPoint.y"
-          font-family="Arial" font-size="25"
-          text-anchor="middle" dy=".3em" style="cursor: pointer;" >
-            ⊕
-          </text>
-        </template>
       </svg>
     </div>
 </template>
@@ -44,97 +27,55 @@ export default defineComponent({
       type: Object as PropType<IActionNode>,
       required: true
     },
-    leftColumns:{
+    mode: {
-      type:Number,
+      type: String as PropType<Direction>,
-      required:false
+      required: true
     },
-    rightColumns:{
+    inputPoint:{
-      type:Number,
+      type:String
-      required:false
     }
   },
   emits: ['addNode'],
   setup(props,context) {
     const hasBranch = computed(() => props.actionNode.outputPoints.length > 0);
-    const getMode = (point: string):Direction => {
+    const points = computed(() => {
-      if (point === '' || props.actionNode.outputPoints.length === 0) {
+      switch (props.mode) {
-        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: `${startX}, 60, ${startX}, 40, ${endX}, 40, ${endX}, 0`,
+            linePoints: '180, 0, 180, 40, 120, 40, 120, 60',
-            iconPoint: { x: endX, y: 20 }
+            iconPoint: { x: 180, y: 20 }
           };
         case Direction.Right:
-          startX = ((leftColumn+rightColumn)/2.0 + 0.25)*300;
-          endX = (leftColumn+(rightColumn/2.0))*300;
           return {
-            linePoints: `${startX}, 0, ${startX}, 40, ${endX}, 40, ${endX}, 60`,
+            linePoints: '60, 0, 60, 40, 120, 40, 120, 60',
-            iconPoint: { x: startX, y: 20 }
+            iconPoint: { x: 60, y: 20 }
           };
         case Direction.LeftNotNext:
-          startX = ((leftColumn+rightColumn)/2.0 - 0.25)*300;
           return {
-            linePoints: `${startX}, 0, ${startX}, 40`,
+            linePoints: '180, 0, 180, 40',
-            iconPoint: { x: startX, y: 20 }
+            iconPoint: { x: 180, y: 20 }
           };
         case Direction.RightNotNext:
-          startX = ((leftColumn+rightColumn)/2.0 + 0.25)*300;
           return {
-            linePoints: `${startX}, 0, ${startX}, 40`,
+            linePoints: '60, 0, 60, 40',
-            iconPoint: { x: startX, y: 20 }
+            iconPoint: { x: 60, y: 30 }
           };
         default:
           return {
-            linePoints: '150, 0, 150, 60',
+            linePoints: '120, 0, 120, 60',
-            iconPoint: { x: 150, y: 30 }
+            iconPoint: { x: 120, y: 30 }
           };
       }
-    };
+    });
-
+    const addNode=(prveNode:IActionNode)=>{
-    const addNode=(prveNode:IActionNode,point:string)=>{
+      context.emit('addNode',props.inputPoint);
-      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,27 +1,25 @@
 <template>
   <div>
     <div v-for="(item, index) in componentData" :key="index">
-      <component :is="item.component" v-bind="item.props" :connectProps="connectProps" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
     </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent,computed } from 'vue';
+import { defineComponent } from 'vue';
 import InputText from '../right/InputText.vue';
 import SelectBox from '../right/SelectBox.vue';
 import DatePicker from '../right/DatePicker.vue';
 import FieldInput from '../right/FieldInput.vue';
-import EventSetter from '../right/EventSetter.vue';
+
-import { IActionProperty, IProp } from 'src/types/ActionTypes';
 export default defineComponent({
   name: 'ActionProperty',
   components: {
     InputText,
     SelectBox,
     DatePicker,
-    FieldInput,
+    FieldInput
-    EventSetter
   },
   props: {
     jsonData: {
@@ -33,43 +31,27 @@ export default defineComponent({
       required: false,
     }
   },
-  setup(props){
+  computed: {
-    const componentData=computed<Array<IActionProperty>>(()=>{
+      componentData() {
-      return props.jsonData.elements.map((element: any) => {
+      return this.jsonData.elements.map((element: any) => {
-        if(props.jsonValue != undefined )
+        if(this.jsonValue != undefined )
         {
-          if(props.jsonValue.hasOwnProperty(element.props.name))
+          if(this.jsonValue.hasOwnProperty(element.props.name))
           {
-            element.props.modelValue = props.jsonValue[element.props.name];
+            element.props.modelValue = this.jsonValue[element.props.name];
           }
           else
           {
             element.props.modelValue = '';
           }
+
         }
         return {
           component: element.component,
           props: element.props,
         };
       });
-    });
+    },
-    const connectProps=(props:IProp)=>{
+  },
-       const connProps:any={};
-       if(props && "connectProps" in props && props.connectProps!=undefined){
-          for(let connProp of props.connectProps){
-            let targetProp = componentData.value.find((prop)=>prop.props.name===connProp.propName);
-            if(targetProp){
-              connProps[connProp.key]=targetProp;
-            }
-          }
-       }
-       return connProps;
-    }
-
-    return{
-        componentData,
-        connectProps
-    }
-  }
 });
 </script>

frontend/src/components/right/AppFieldSelect.vue

@@ -1,152 +0,0 @@
-<template>
-    <div class="q-my-md" v-bind="$attrs">
-        <q-card flat>
-            <q-card-section class="q-pa-none q-my-sm q-mr-md">
-                <!-- <div class=" q-my-none ">App Field Select</div> -->
-                <div class="row q-mb-xs">
-                    <div class="text-primary q-mb-xs text-caption">{{ $props.displayName }}</div>
-                </div>
-                <div class="row">
-                    <div class="col">
-                        <div class="q-mb-xs">{{ selectedField.app?.name || '未選択' }}</div>
-                    </div>
-                    <div class="col-1">
-                        <q-btn round flat size="sm" color="primary" icon="search" @click="showDg" />
-                    </div>
-                </div>
-            </q-card-section>
-            <q-separator />
-            <q-card-section class="q-pa-none q-ma-none">
-                <div style="">
-                    <div v-if="selectedField.fields && selectedField.fields.length > 0">
-                        <q-list bordered>
-                            <q-virtual-scroll style="max-height: 160px;" :items="selectedField.fields" separator
-                                v-slot="{ item, index }">
-                                <q-item :key="index" dense clickable>
-                                    <q-item-section>
-                                        <q-item-label>
-                                            {{ item.label }}
-                                        </q-item-label>
-                                    </q-item-section>
-                                    <q-item-section side>
-                                        <q-btn round flat size="sm" icon="clear" @click="removeField(index)" />
-                                    </q-item-section>
-                                </q-item>
-                            </q-virtual-scroll>
-                        </q-list>
-                    </div>
-                    <!-- <div v-else class="row q-mt-lg">
-                    </div> -->
-                </div>
-                <!-- <q-separator /> -->
-            </q-card-section>
-            <q-card-section class="q-px-none q-py-xs" v-if="selectedField.fields && selectedField.fields.length === 0">
-                <div class="row">
-                    <div class="text-grey text-caption"> {{ $props.placeholder }}</div>
-                    <!-- <q-btn flat color="grey" label="clear" @click="clear" /> -->
-                </div>
-            </q-card-section>
-        </q-card>
-    </div>
-    <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeAFBox">
-        <AppFieldSelectBox v-model:selectedField="selectedField" :selectType="selectType" ref="afBox"/>
-    </show-dialog>
-</template>
-
-<script lang="ts">
-import { defineComponent, ref, watchEffect } from 'vue';
-import AppFieldSelectBox from '../AppFieldSelectBox.vue';
-import ShowDialog from '../ShowDialog.vue';
-import { useFlowEditorStore } from 'stores/flowEditor';
-
-export interface IApp {
-    id: string,
-    name: string
-}
-export interface IField {
-    name: string,
-    code: string,
-    type: string
-}
-
-export interface IAppFields {
-    app?: IApp,
-    fields: IField[]
-}
-
-export default defineComponent({
-    inheritAttrs: false,
-    name: 'AppFieldSelect',
-    components: {
-        ShowDialog,
-        AppFieldSelectBox
-    },
-    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 show = ref(false);
-        const afBox = ref();
-        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 clear = () => {
-            selectedField.value = {
-                fields: []
-            };
-        }
-
-        const removeField = (index: number) => {
-            selectedField.value.fields.splice(index, 1);
-        }
-
-        const closeAFBox = (val: string) => {
-            if (val == 'OK') {
-                console.log(afBox.value);
-                
-                selectedField.value = afBox.value.selField;
-            }
-        };
-
-        watchEffect(() => {
-            emit('update:modelValue', selectedField.value);
-        });
-
-        return {
-            store,
-            afBox,
-            show,
-            showDg: () => { show.value = true },
-            selectedField,
-            clear,
-            removeField,
-            closeAFBox,
-        };
-    }
-});
-</script>

frontend/src/components/right/AppSelect.vue

@@ -1,93 +0,0 @@
-<template>
-    <div>
-        <q-field :label="displayName" labelColor="primary" stack-label>
-            <template v-slot:control>
-                <q-card flat class="full-width">
-                    <q-card-actions vertical>
-                        <q-btn color="grey-3" text-color="black" @click="() => { dgIsShow = true }">アプリ選択</q-btn>
-                    </q-card-actions>
-                    <q-card-section class="text-caption">
-                        <div v-if="selectedField.app.name">
-                            {{ selectedField.app.name }}
-                        </div>
-                        <div v-else>{{ placeholder }}</div>
-                    </q-card-section>
-                </q-card>
-            </template>
-        </q-field>
-    </div>
-
-    <ShowDialog v-model:visible="dgIsShow" name="アプリ選択" @close="closeDg" min-width="50vw" min-height="50vh">
-        <template v-slot:toolbar>
-            <q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
-                <template v-slot:before>
-                    <q-icon name="search" />
-                </template>
-            </q-input>
-        </template>
-        <AppSelectBox ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelectBox>
-    </ShowDialog>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, reactive, ref, watchEffect } from 'vue';
-import ShowDialog from '../ShowDialog.vue';
-import AppSelectBox from '../AppSelectBox.vue';
-
-
-export default defineComponent({
-    inheritAttrs: false,
-    name: 'AppSelect',
-    components: {
-        ShowDialog,
-        AppSelectBox
-    },
-    props: {
-        context: {
-            type: Array<Props>,
-            default: '',
-        },
-        displayName: {
-            type: String,
-            default: '',
-        },
-        name: {
-            type: String,
-            default: '',
-        },
-        placeholder: {
-            type: String,
-            default: '',
-        },
-        modelValue: {
-            type: Object,
-            default: null
-        }
-    },
-    setup(props, { emit }) {
-        const appDg = ref()
-        const dgIsShow = ref(false)
-        const selectedField = props.modelValue && props.modelValue.app ? props.modelValue : reactive({app:{}});
-        const closeDg = (state: string) => {
-            dgIsShow.value = false;
-            if (state == 'OK') {
-                selectedField.app = appDg.value.selected[0];
-            }
-        };
-
-        console.log(selectedField);
-
-        watchEffect(() => {
-            emit('update:modelValue', selectedField);
-        });
-
-        return {
-            filter: ref(''),
-            dgIsShow,
-            appDg,
-            closeDg,
-            selectedField
-        };
-    }
-});
-</script>

frontend/src/components/right/ColorPicker.vue

@@ -1,74 +0,0 @@
-<template>
-    <div class="" v-bind="$attrs">
-        <q-field v-model="color" :label="displayName" labelColor="primary"  :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
-            <template v-slot:control>
-                <q-chip text-color="black" color="white" v-if="isSelected">
-                    <div class="row">
-                        <div class="col-4">
-                            <q-avatar class="shadow-1" :style="{ background: color }" size="xs"></q-avatar>
-                        </div>
-                        <div class="col">
-                            {{ color }}
-                        </div>
-                    </div>
-                </q-chip>
-            </template>
-            <template v-slot:append>
-                <q-icon name="colorize" class="cursor-pointer" color="primary" >
-                    <q-popup-proxy cover transition-show="scale" transition-hide="scale">
-                        <q-color no-header default-view="palette" v-model="color" />
-                    </q-popup-proxy>
-                </q-icon>
-            </template>
-            <template v-slot:hint>
-                {{ placeholder }}
-            </template>
-        </q-field>
-
-
-    </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, ref,watchEffect } from 'vue';
-export default defineComponent({
-    inheritAttrs:false,
-    name: 'ColorPicker',
-    components: {
-    },
-    props: {
-        displayName: {
-            type: String,
-            default: '',
-        },
-        name: {
-            type: String,
-            default: '',
-        },
-        placeholder: {
-            type: String,
-            default: '',
-        },
-        hint: {
-            type: String,
-            default: '',
-        },
-        modelValue: {
-            type: String,
-            default: null
-        },
-    },
-
-    setup(props, { emit }) {
-        const color = ref(props.modelValue??"");
-        const isSelected = computed(()=>props.modelValue && props.modelValue!=="");
-        watchEffect(()=>{
-          emit('update:modelValue', color.value);
-        });
-        return {
-            color,
-            isSelected
-        };
-    }
-});
-</script>

frontend/src/components/right/ConditionInput.vue

@@ -1,11 +1,9 @@
 <template>
-  <div v-bind="$attrs">
   <q-field v-model="tree" :label="displayName" labelColor="primary" stack-label >
     <template v-slot:control >
       <q-card flat class="full-width">
         <q-card-actions vertical>
-            <q-btn color="grey-3" text-color="black" :disable="btnDisable" @click="showDg()">クリックで設定：{{ isSetted ?
+          <q-btn color="grey-3" text-color="black" @click="showDg()">クリックで設定：{{ isSetted?'設定済み':'未設定' }}</q-btn>
-              '設定済み' : '未設定' }}</q-btn>
         </q-card-actions>
         <q-card-section class="text-caption" >
           <div v-if="!isSetted">{{ placeholder }}</div>
@@ -15,54 +13,18 @@
     </template>
   </q-field>
   <condition-editor v-model:show="show" v-model:conditionTree="tree" @closed="onClosed"></condition-editor>
-  </div>
 </template>
 
-
-
   <script lang="ts">
-import { ConditionNode, ConditionTree, Operator, OperatorListItem } from 'app/src/types/Conditions';
+  import { defineComponent, ref ,watchEffect,computed,reactive} from 'vue';
-import { computed, defineComponent, provide, reactive, ref, watchEffect } from 'vue';
+  import { ConditionTree,GroupNode,ConditionNode,LogicalOperator,Operator } from 'app/src/types/Conditions';
-import ConditionEditor from '../ConditionEditor/ConditionEditor.vue';
+  import ConditionEditor from '../ConditionEditor/ConditionEditor.vue'
-
-type Props = {
-  props?: {
-    name: string;
-    modelValue?: {
-      app: {
-        id: string;
-        name: string;
-      },
-      fields: {
-        type: string;
-        label: string;
-        code: string;
-      }[]
-    }
-  }
-};
-
-type InputConfg = {
-  canInput: boolean;
-  buttonsConfig: {
-    label: string;
-    color: string;
-    type: string;
-  }[]
-};
-
-
   export default defineComponent({
     name: 'FieldInput',
-  inheritAttrs: false,
     components: {
       ConditionEditor
     },
     props: {
-    context: {
-      type: Array<Props>,
-      default: '',
-    },
       displayName:{
         type: String,
         default: '',
@@ -83,74 +45,16 @@ export default defineComponent({
         type: String,
         default: null
       },
-    sourceType: {
-      type: String,
-      default: 'field'
-    },
-    onlySourceSelect: {
-      type: Boolean,
-      default: false
-    },
-    operatorList: {
-      type: Array,
-    },
-    inputConfig: {
-      type: Object,
-      default: () => ({
-        left: {
-          canInput: false,
-          buttonsConfig: [
-            { label: 'フィールド', color: 'primary', type: 'FieldAdd' },
-            { label: '変数', color: 'green', type: 'VariableAdd' },
-          ]
-        },
-        right: {
-          canInput: true,
-          buttonsConfig: [
-            { label: '変数', color: 'green', type: 'VariableAdd' },
-          ]
-        },
-      })
-    }
     },
 
     setup(props, { emit }) {
-    const source = props.context.find(element => element?.props?.name === 'sources')
-
-    if (source) {
-      if (props.sourceType === 'field') {
-        provide('sourceFields', computed(() => source.props?.modelValue?.fields ?? []));
-      } else if (props.sourceType === 'app') {
-        provide('sourceApp', computed(() => source.props?.modelValue?.app?.id));
-      }
-    }
-
-    provide('leftDynamicItemConfig', props.inputConfig.left);
-    provide('rightDynamicItemConfig', props.inputConfig.right);
-    provide('Operator', props.operatorList);
-
-    const btnDisable = computed(() => {
-      const onlySourceSelect = props.onlySourceSelect;
-
-      if (!onlySourceSelect) {
-        return false;
-      }
-
-      if (props.sourceType === 'field') {
-        return source?.props?.modelValue?.fields?.length ?? 0 > 0;
-      } else if (props.sourceType === 'app') {
-        return source?.props?.modelValue?.app?.id ? false : true
-      }
-      return true;
-    })
-
       const appDg = ref();
       const show = ref(false);
       const tree = reactive(new ConditionTree());
       if(props.modelValue && props.modelValue!==''){
         tree.fromJson(props.modelValue);
       }else{
-      const newNode = new ConditionNode({}, (props.operatorList && props.operatorList.length > 0) ? props.operatorList[0] as OperatorListItem : Operator.Equal, '', tree.root);
+        const newNode = new ConditionNode({},Operator.Equal,'',tree.root);
         tree.addNode(tree.root,newNode);
       }
 
@@ -166,15 +70,13 @@ export default defineComponent({
 
       const onClosed = (val:string) => {
         if (val == 'OK') {
-        isSetted.value = true;
-        tree.setQuery(tree.buildConditionQueryString(tree.root));
           const conditionJson = tree.toJson();
+          isSetted.value=true;
           emit('update:modelValue', conditionJson);
         }
       };
 
       watchEffect(() => {
-      tree.setQuery(tree.buildConditionQueryString(tree.root));
         const conditionJson = tree.toJson();
         emit('update:modelValue', conditionJson);
       });
@@ -186,8 +88,7 @@ export default defineComponent({
         showDg,
         onClosed,
         tree,
-      conditionString,
+        conditionString
-      btnDisable
       };
     }
   });

frontend/src/components/right/DataMapping.vue

@@ -1,250 +0,0 @@
-<template>
-    <div>
-        <q-field :label="displayName" labelColor="primary" stack-label>
-            <template v-slot:control>
-                <q-card flat class="full-width">
-                    <q-card-actions vertical>
-                        <q-btn color="grey-3" text-color="black" :disable="btnDisable"
-                            @click="() => { dgIsShow = true }">クリックで設定</q-btn>
-                    </q-card-actions>
-                    <q-card-section class="text-caption">
-                        <div v-if="mappingObjectsInputDisplay && mappingObjectsInputDisplay.length > 0">
-                            <div v-for="(item) in mappingObjectsInputDisplay" :key="item">{{ item }}</div>
-                        </div>
-                        <div v-else>{{ placeholder }}</div>
-                    </q-card-section>
-                </q-card>
-            </template>
-        </q-field>
-        <show-dialog v-model:visible="dgIsShow" name="データマッピング" @close="closeDg" min-width="50vw" min-height="60vh">
-
-            <div class="q-mx-md">
-                <div class="row q-col-gutter-x-xs flex-center">
-                    <div class="col-6">
-                        <div class="q-mx-xs">ソース</div>
-                    </div>
-                    <!-- <div class="col-1">
-                    </div> -->
-                    <div class="col-6">
-                        <div class="q-mx-xs">目標</div>
-                    </div>
-                    <!-- <div class="col-1"><q-btn flat round dense icon="add" size="sm" @click="addMappingObject" /> -->
-                    <!-- </div> -->
-                </div>
-                <q-virtual-scroll style="max-height: 75vh;" :items="mappingProps" separator v-slot="{ item, index }">
-                    <!-- <div class="q-my-sm" v-for="(item, index) in mappingProps" :key="item.id"> -->
-                    <div class="row q-my-md q-col-gutter-x-md flex-center">
-                        <div class="col-6">
-                            <ConditionObject :config="config" v-model="item.from" />
-                        </div>
-                        <!-- <div class="col-1">
-                        </div> -->
-                        <div class="col-6">
-                            <q-field v-model="item.vName" type="text" outlined dense>
-                                <!-- <template v-slot:append>
-                                    <q-icon name="search" class="cursor-pointer"
-                                        @click="() => { mappingProps[index].to.isDialogVisible = true }" />
-                                </template> -->
-                                <template v-slot:control>
-                                    <div class="self-center full-width no-outline" tabindex="0"
-                                        v-if="item.to.app?.name && item.to.fields?.length > 0 && item.to.fields[0].label">
-                                        {{ `${item.to.fields[0].label}` }}
-                                        <q-tooltip>
-                                            <div>アプリ : {{ item.to.app.name }}</div>
-                                            <div>フィールドのコード : {{ item.to.fields[0].code }}</div>
-                                            <div>フィールドのタイプ : {{ item.to.fields[0].type }}</div>
-                                            <div>フィールド : {{ item.to.fields[0] }}</div>
-                                        </q-tooltip>
-                                    </div>
-                                </template>
-                            </q-field>
-                        </div>
-                        <!-- <div class="col-1">
-                            <q-btn flat round dense icon="delete" size="sm" @click="() => deleteMappingObject(index)" />
-                        </div> -->
-                    </div>
-
-                    <show-dialog v-model:visible="mappingProps[index].to.isDialogVisible" name="フィールド一覧"
-                        @close="closeToDg" ref="fieldDlg">
-                        <FieldSelect v-if="onlySourceSelect" ref="fieldDlg" name="フィールド" :appId="sourceAppId" not_page
-                            :selectedFields="mappingProps[index].to.fields"
-                            :updateSelects="(fields) => { mappingProps[index].to.fields = fields; mappingProps[index].to.app = sourceApp }">
-                        </FieldSelect>
-                        <AppFieldSelectBox v-else v-model:selectedField="mappingProps[index].to" />
-                    </show-dialog>
-                    <!-- </div> -->
-                </q-virtual-scroll>
-            </div>
-        </show-dialog>
-    </div>
-</template>
-
-<script lang="ts">
-import { v4 as uuidv4 } from 'uuid';
-import { computed, defineComponent, watch, isRef, reactive, ref, watchEffect } from 'vue';
-import ConditionObject from '../ConditionEditor/ConditionObject.vue';
-import ShowDialog from '../ShowDialog.vue';
-import AppFieldSelectBox from '../AppFieldSelectBox.vue';
-import FieldSelect from '../FieldSelect.vue';
-import IAppFields from './AppFieldSelect.vue';
-import { api } from 'boot/axios';
-
-type Props = {
-    props?: {
-        name: string;
-        modelValue?: {
-            app: {
-                id: string;
-                name: string;
-            }
-        }
-    }
-};
-type ValueType = {
-    id: string;
-    from: object;
-    to: typeof IAppFields & {
-        isDialogVisible: boolean;
-    };
-}
-
-
-export default defineComponent({
-    name: 'DataMapping',
-    inheritAttrs: false,
-    components: {
-        ShowDialog,
-        ConditionObject,
-        AppFieldSelectBox,
-        FieldSelect
-    },
-    props: {
-        context: {
-            type: Array<Props>,
-            default: '',
-        },
-        displayName: {
-            type: String,
-            default: '',
-        },
-        name: {
-            type: String,
-            default: '',
-        },
-        modelValue: {
-            type: Object as () => ValueType[],
-        },
-        placeholder: {
-            type: String,
-            default: '',
-        },
-        onlySourceSelect: {
-            type: Boolean,
-            default: false
-        }
-    },
-
-    setup(props, { emit }) {
-        const source = props.context.find(element => element?.props?.name === 'sources')
-
-        const sourceApp = computed(() => source?.props?.modelValue?.app);
-
-        const sourceAppId = computed(() => sourceApp.value?.id);
-
-        const closeDg = () => {
-            emit('update:modelValue', mappingProps.value
-            );
-        }
-
-        const closeToDg = () => {
-            emit('update:modelValue', mappingProps.value
-            );
-        }
-
-        const mappingProps = computed(() => props.modelValue ?? []);
-
-        watch(() => sourceAppId.value, async (newId, oldId) => {
-            if (!newId) return;
-            const a = await api.get('api/v1/appfields', {
-                params: {
-                    app: newId
-                }
-            }).then(res => {
-                return Object.values(res.data.properties)
-                    .map(f => ({ name: f.label, objectType: 'field', ...f }))
-                    .map(f => {
-                        return {
-                            id: uuidv4(),
-                            from: {},
-                            to: {
-                                app: sourceApp.value,
-                                fields: [f],
-                                isDialogVisible: false
-                            }
-                        }
-                    })
-            })
-            const modelValue = props.modelValue ?? [];
-
-            if (modelValue.length === 0 || newId !== oldId) {
-                emit('update:modelValue', a);
-                return;
-            }
-            const modelValueFieldNames = modelValue.map(item => item.to.fields[0].name);
-
-            const newFields = a.filter(field => !modelValueFieldNames.includes(field.to.fields[0].name));
-
-            const updatedModelValue = [...modelValue, ...newFields];
-
-            emit('update:modelValue', updatedModelValue);
-        })
-
-        console.log(mappingProps.value);
-
-        // const deleteMappingObject = (index: number) => mappingProps.length === 1
-        //     ? mappingProps.splice(0, mappingProps.length, defaultMappingProp())
-        //     : mappingProps.splice(index, 1);
-
-        const mappingObjectsInputDisplay = computed(() =>
-            (mappingProps.value && Array.isArray(mappingProps.value)) ?
-                mappingProps.value
-                    .filter(item => item.from?.sharedText && item.to.fields?.length > 0)
-                    .map(item => {
-                        return `field(${item.to.app?.id},${item.to.fields[0].label}) = ${item.from.sharedText} `;
-                    })
-                : []
-        );
-
-
-
-        const btnDisable = computed(() => props.onlySourceSelect ? !(source?.props?.modelValue?.app?.id) : false);
-
-        //集計処理方法
-
-        watchEffect(() => {
-            emit('update:modelValue', mappingProps.value);
-        });
-        return {
-            uuidv4,
-            dgIsShow: ref(false),
-            closeDg,
-            toDgIsShow: ref(false),
-            closeToDg,
-            mappingProps,
-            // addMappingObject: () => mappingProps.push(defaultMappingProp()),
-            // deleteMappingObject,
-            mappingObjectsInputDisplay,
-            sourceApp,
-            sourceAppId,
-            btnDisable,
-            config: {
-                canInput: false,
-                buttonsConfig: [
-                    { label: '変数', color: 'green', type: 'VariableAdd',editable:false },
-                ]
-            }
-        };
-    },
-});
-</script>
-<style lang="scss"></style>

frontend/src/components/right/DataProcessing.vue

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

frontend/src/components/right/DatePicker.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-bind="$attrs">
+
   <q-input v-model="selectedDate" :label="displayName" :placeholder="placeholder" label-color="primary" mask="date" :rules="['date']" stack-label>
     <template v-slot:append>
       <q-icon name="event" class="cursor-pointer">
@@ -13,7 +13,6 @@
       </q-icon>
     </template>
   </q-input>
-  </div>
 </template>
 
 <script lang="ts">
@@ -21,7 +20,6 @@ import { defineComponent, ref ,watchEffect} from 'vue';
 
 export default defineComponent({
   name: 'DatePicker',
-  inheritAttrs:false,
   props: {
     displayName:{
       type: String,

frontend/src/components/right/EventSetter.vue

@@ -1,83 +0,0 @@
-<template>
-  <div v-bind="$attrs">
-    <q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
-      <template v-slot:append>
-        <q-btn round dense flat icon="add" @click="addButtonEvent()" />
-      </template>
-    </q-input>
-  </div>
-</template>
-
-<script lang="ts">
-import { defineComponent,ref,watchEffect } from 'vue';
-import { useFlowEditorStore } from '../../stores/flowEditor';
-import { IKintoneEventGroup,kintoneEvent } from 'src/types/KintoneEvents';
-
-export default defineComponent({
-  name: 'EventSetter',
-  inheritAttrs:false,
-  props: {
-    displayName:{
-      type: String,
-      default: '',
-    },
-    name:{
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    hint:{
-      type: String,
-      default: '',
-    },
-    modelValue: {
-      type: String,
-      default: '',
-    },
-    connectProps:{
-      type:Object,
-      default:undefined
-    }
-  },
-
-  setup(props , { emit }) {
-    const inputValue = ref(props.modelValue);
-    const store = useFlowEditorStore();
-    const addButtonEvent=()=>{
-      const eventId =store.currentFlow?.getRoot()?.name;
-      if(eventId===undefined){return;}
-      let displayName = inputValue.value;
-      if(props.connectProps!==undefined && "displayName" in props.connectProps){
-        displayName =props.connectProps["displayName"].props.modelValue;
-      }
-      const customButtonId=`${eventId}.customButtonClick`;
-      const findedEvent = store.eventTree.findEventById(customButtonId);
-      if(findedEvent && "events" in findedEvent){
-        const customEvents = findedEvent as IKintoneEventGroup;
-        const addEventId = customButtonId+"." + inputValue.value;
-        if(store.eventTree.findEventById(addEventId)){
-          return;
-        }
-        customEvents.events.push({
-          eventId: addEventId,
-          label: displayName,
-          parentId: customButtonId,
-          header: 'DELETABLE'
-        });
-      }
-    }
-
-    watchEffect(() => {
-      emit('update:modelValue', inputValue.value);
-    });
-
-    return {
-      inputValue,
-      addButtonEvent
-    };
-  },
-});
-</script>

frontend/src/components/right/FieldInput.vue

@@ -1,24 +1,25 @@
 <template>
-  <div v-bind="$attrs">
+<q-field v-model="selectedField" :label="displayName" labelColor="primary"
-    <q-field v-model="selectedField" :label="displayName" labelColor="primary" :clearable="isSelected" stack-label
+        :clearable="isSelected" stack-label :bottom-slots="!isSelected" >
-      :bottom-slots="!isSelected">
   <template v-slot:control >
     <q-chip  color="primary" text-color="white"  v-if="isSelected">
       {{ selectedField.name }}
     </q-chip>
   </template>
+  <!-- <template v-slot:hint v-if="isSelected">
+    <div> 項目コード：<q-chip  size="sm" outline color="secondary" text-color="white">{{selectedField.code}}</q-chip></div>
+  </template> -->
   <template v-slot:hint v-if="!isSelected">
     {{ placeholder }}
   </template>
 
   <template v-slot:append>
-        <q-icon name="search" class="cursor-pointer" color="primary" @click="showDg" />
+  <q-icon name="search" class="cursor-pointer"  @click="showDg"/>
   </template>
 </q-field>
 <show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
-      <field-select ref="appDg" name="フィールド" :type="selectType" :appId="store.appInfo?.appId" :fieldTypes="fieldTypes"></field-select>
+  <field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
 </show-dialog>
-  </div>
 </template>
 
 <script lang="ts">
@@ -33,7 +34,6 @@ interface IField {
 }
 export default defineComponent({
   name: 'FieldInput',
-  inheritAttrs:false,
   components: {
     ShowDialog,
     FieldSelect,
@@ -51,14 +51,6 @@ export default defineComponent({
       type: String,
       default: '',
     },
-    selectType:{
-        type:String,
-        default:'single'
-    },
-    fieldTypes:{
-      type:Array,
-      default:()=>[]
-    },
     hint:{
       type: String,
       default: '',

frontend/src/components/right/InputText.vue

@@ -1,25 +1,12 @@
 <template>
-  <div v-bind="$attrs">
+  <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
-      :rules="rulesExp" :maxlength="maxLength">
-      <template v-slot:append v-if="hint !== ''">
-        <q-icon name="help" size="22px" color="blue-8">
-          <q-tooltip class="bg-yellow-2 text-black shadow-4" anchor="bottom right">
-            <div class="hint-text" v-html="hint" />
-          </q-tooltip>
-        </q-icon>
-      </template>
-    </q-input>
-  </div>
 </template>
 
 <script lang="ts">
-import { kMaxLength } from 'buffer';
+import { defineComponent,ref,watchEffect } from 'vue';
-import { defineComponent, ref, watchEffect, computed } from 'vue';
 
 export default defineComponent({
   name: 'InputText',
-  inheritAttrs: false,
   props: {
     displayName:{
       type: String,
@@ -33,71 +20,26 @@ export default defineComponent({
       type: String,
       default: '',
     },
-    fieldTypes:{
-      type:Array,
-      default:()=>[]
-    },
     hint:{
       type: String,
       default: '',
     },
-    maxLength: {
-      type: Number,
-      default: undefined
-    },
-    //例：[val=>!!val ||'入力してください']
-    rules: {
-      type: String,
-      default: undefined
-    },
     modelValue: {
-      // type: Any,
+      type: String,
       default: '',
     },
   },
 
   setup(props , { emit }) {
-    const inputValue = computed({
+    const inputValue = ref(props.modelValue);
-      get: () => {
-        if (props.modelValue !== null && typeof props.modelValue === 'object' && 'name' in props.modelValue) {
-          return props.modelValue.name;
-        } else {
-          return props.modelValue;
-        }
-      },
-      set: (val) => {
-        if (props.name === 'verName') {
-          // return props.modelValue.name;
-          emit('update:modelValue', { name: val });
-        } else {
-          emit('update:modelValue', val);
-        }
-      },
-    });
-    // const inputValue = ref(props.modelValue);
-    const rulesExp = props.rules === undefined ? null : eval(props.rules);
 
-    // const finalValue = computed(() => {
+    watchEffect(() => {
-    // return props.name !== 'verName' ? inputValue.value : {
+      emit('update:modelValue', inputValue.value);
-    // name: inputValue.value,
+    });
-    // };
-    // });
-    // watchEffect(() => {
-    //   emit('update:modelValue', finalValue);
-    // });
 
     return {
       inputValue,
-      showhint: ref(false),
-      rulesExp
     };
   },
 });
 </script>
-<style lang="scss">
-.hint-text {
-  white-space: always;
-  max-width: 450px;
-  font-size: 1.2em;
-}
-</style>

frontend/src/components/right/MuiltInputText.vue

@@ -1,8 +1,5 @@
 <template>
-  <div v-bind="$attrs">
+  <q-input :label="displayName"   label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow stack-label/>
-    <q-input :label="displayName" label-color="primary" v-model="inputValue" :placeholder="placeholder" autogrow
-      stack-label />
-  </div>
 </template>
 
 <script lang="ts">
@@ -10,7 +7,6 @@ import { defineComponent, ref, watchEffect } from 'vue';
 
 export default defineComponent({
   name: 'MuiltInputText',
-  inheritAttrs: false,
   props: {
     displayName:{
       type: String,

frontend/src/components/right/NumInput.vue

@@ -1,87 +0,0 @@
-<template>
-  <div class="" v-bind="$attrs">
-    <q-input v-model.number="numValue" type="number" :label="displayName" label-color="primary" stack-label bottom-slots
-     :min="min"
-     :max="max"
-     :rules="rulesExp"
-     >
-      <template v-slot:hint>
-        {{ placeholder }}
-      </template>
-    </q-input>
-  </div>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, ref, watchEffect } from 'vue';
-export default defineComponent({
-  name: 'NumInput',
-  inheritAttrs:false,
-  components: {
-  },
-  props: {
-    displayName: {
-      type: String,
-      default: '',
-    },
-    name: {
-      type: String,
-      default: '',
-    },
-    placeholder: {
-      type: String,
-      default: '',
-    },
-    hint: {
-      type: String,
-      default: '',
-    },
-    min:{
-      type:Number,
-      default:undefined
-    },
-    max:{
-      type:Number,
-      default:undefined
-    },
-    //[val=>!!val ||'数値を入力してください',val=>val<=100 && val>=1 || '1-100の範囲内の数値を入力してください']
-    rules:{
-      type:String,
-      default:undefined
-    },
-    modelValue: {
-      type: [Number , String],
-      default: undefined
-    },
-  },
-
-  setup(props, { emit }) {
-    const numValue = ref(props.modelValue);
-    const rulesExp = props.rules===undefined?null : eval(props.rules);
-    const isError = computed(()=>{
-      const val = numValue.value;
-      if (val === undefined) {
-        return false;
-      }
-      const numVal = typeof val === "string" ? parseInt(val) : val;
-      // Ensure parsed value is a valid number
-      if (isNaN(numVal)) {
-        return true;
-      }
-      // Check against min and max boundaries, if defined
-      if ((props.min !== undefined && numVal < props.min) || (props.max !== undefined && numVal > props.max)) {
-        return true;
-      }
-      return false;
-    });
-
-    watchEffect(()=>{
-      emit("update:modelValue",numValue.value);
-    });
-    return {
-      numValue,
-      rulesExp
-    };
-  }
-});
-</script>

frontend/src/components/right/PropertyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div v-for="(item, index) in properties" :key="index" >
-      <component :is="item.component" v-bind="item.props" :context="properties"  :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
+      <component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
     </div>
   </div>
 </template>
@@ -15,16 +15,9 @@ import InputText from '../right/InputText.vue';
 import SelectBox from '../right/SelectBox.vue';
 import DatePicker from '../right/DatePicker.vue';
 import FieldInput from '../right/FieldInput.vue';
-import AppFieldSelect from './AppFieldSelect.vue';
 import MuiltInputText from '../right/MuiltInputText.vue';
 import ConditionInput from '../right/ConditionInput.vue';
-import EventSetter from '../right/EventSetter.vue';
+import { IActionNode,IActionProperty } from 'src/types/ActionTypes';
-import ColorPicker from './ColorPicker.vue';
-import NumInput from './NumInput.vue';
-import DataProcessing from './DataProcessing.vue';
-import DataMapping from './DataMapping.vue';
-import AppSelect from './AppSelect.vue';
-import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes';
 
 export default defineComponent({
   name: 'PropertyList',
@@ -33,15 +26,8 @@ export default defineComponent({
     SelectBox,
     DatePicker,
     FieldInput,
-    AppFieldSelect,
     MuiltInputText,
-    ConditionInput,
+    ConditionInput
-    EventSetter,
-    ColorPicker,
-    NumInput,
-    DataProcessing,
-    DataMapping,
-    AppSelect
   },
   props: {
     nodeProps: {
@@ -54,22 +40,9 @@ export default defineComponent({
     }
   },
   setup(props, context) {
-    const properties=ref(props.nodeProps);
+    const properties=ref(props.nodeProps)
-    const connectProps=(props:IProp)=>{
-       const connProps:any={context:properties};
-       if(props && "connectProps" in props && props.connectProps!=undefined){
-          for(let connProp of props.connectProps){
-            let targetProp = properties.value.find((prop)=>prop.props.name===connProp.propName);
-            if(targetProp){
-              connProps[connProp.key]=targetProp;
-            }
-          }
-       }
-       return connProps;
-    }
     return {
-      properties,
+      properties
-      connectProps
     }
   }
 });

frontend/src/components/right/PropertyPanel.vue

@@ -11,9 +11,9 @@
          elevated
          overlay
        >
-        <q-card class="column" style="max-width: 300px;min-height: 100%">
+        <q-card class="column full-height" style="width: 300px">
          <q-card-section>
-           <div class="text-h6">{{ actionNode?.subTitle }}：設定</div>
+           <div class="text-h6">{{ actionNode.subTitle }}：設定</div>
          </q-card-section>
          <q-card-section class="col q-pt-none">
            <property-list :node-props="actionProps" v-if="showPanel" ></property-list>
@@ -51,10 +51,10 @@ import { IActionNode } from 'src/types/ActionTypes';
   ],
   setup(props,{emit}) {
     const showPanel =ref(props.drawerRight);
-    const actionProps =ref(props.actionNode?.actionProps);
+    const actionProps =ref(props.actionNode.actionProps);
     watchEffect(() => {
       showPanel.value = props.drawerRight;
-      actionProps.value= props.actionNode?.actionProps;
+      actionProps.value= props.actionNode.actionProps;
     });
 
     const cancel = async() =>{

frontend/src/components/right/SelectBox.vue

@@ -1,16 +1,12 @@
 <template>
-  <div v-bind="$attrs">
+  <q-select v-model="selectedValue" :label="displayName" :options="options"/>
-  <q-select v-model="selectedValue" :use-chips="multiple" :label="displayName" label-color="primary" :options="options" stack-label
-  :multiple="multiple"/>
-</div>
 </template>
 
 <script lang="ts">
-import { defineComponent,ref,watchEffect,computed } from 'vue';
+import { defineComponent,ref,watchEffect } from 'vue';
 
 export default defineComponent({
   name: 'SelectBox',
-  inheritAttrs:false,
   props: {
     displayName:{
       type: String,
@@ -24,27 +20,20 @@ export default defineComponent({
       type: Array,
       required: true,
     },
-    selectType:{
+    modelValue: {
       type: String,
       default: '',
     },
-    modelValue: {
-      type: [Array,String],
-      default: null,
-    },
   },
   setup(props, { emit }) {
     const selectedValue = ref(props.modelValue);
-    const multiple = computed(()=>{
+
-      return props.selectType==='multiple'
-    });
     watchEffect(() => {
       emit('update:modelValue', selectedValue.value);
     });
 
     return {
-      selectedValue,
+      selectedValue
-      multiple
     };
   },
 });

frontend/src/control/flowctrl.ts

@@ -1,8 +1,11 @@
 import { api } from 'boot/axios';
 import { ActionFlow } from 'src/types/ActionTypes';
 
-export class FlowCtrl {
+export class FlowCtrl
-  async getFlows(appId: string): Promise<ActionFlow[]> {
+{
+
+  async getFlows(appId:string):Promise<ActionFlow[]>
+  {
       const flows:ActionFlow[]=[];
       try{
         const result = await api.get(`api/flows/${appId}`);
@@ -21,9 +24,10 @@ export class FlowCtrl {
       }
   }
 
-  async SaveFlow(jsonData: any): Promise<boolean> {
+  async SaveFlow(jsonData:any):Promise<boolean>
+  {
        const result = await api.post('api/flow',jsonData);
-    console.info(result.data);
+       console.info(result.data)
        return true;
   }
   /**
@@ -31,19 +35,10 @@ export class FlowCtrl {
    * @param jsonData
    * @returns
    */
-  async UpdateFlow(jsonData: any): Promise<boolean> {
+  async  UpdateFlow(jsonData:any):Promise<boolean>
+  {
     const result = await api.put('api/flow/' + jsonData.flowid,jsonData);
-    console.info(result.data);
+    console.info(result.data)
-    return true;
-  }
-  /**
-   * フローを消去する
-   * @param flowId
-   * @returns
-   */
-  async DeleteFlow(flowId: string): Promise<boolean> {
-    const result = await api.delete('api/flow/' + flowId);
-    console.info(result.data);
     return true;
   }
   /**
@@ -51,9 +46,12 @@ export class FlowCtrl {
    * @param appid
    * @returns
    */
-  async depoly(appid: string): Promise<boolean> {
+  async depoly(appid:string):Promise<boolean>
+  {
     const result = await api.post(`api/v1/createjstokintone?app=${appid}`);
     console.info(result.data);
     return true;
   }
+
 }
+

frontend/src/css/app.scss

@@ -1,25 +1 @@
 // app global css in SCSS form
-::-webkit-scrollbar {
-  height: 12px;
-  width: 14px;
-  background: transparent;
-  z-index: 12;
-  overflow: visible;
-}
-
-::-webkit-scrollbar-thumb {
-  width: 10px;
-  background-color: #c1c1c1;
-  border-radius: 10px;
-  z-index: 12;
-  border: 4px solid rgba(0, 0, 0, 0);
-  background-clip: padding-box;
-  transition: background-color .32s ease-in-out;
-  margin: 4px;
-  min-height: 32px;
-  min-width: 32px;
-}
-
-::-webkit-scrollbar-thumb:hover {
-  background: #c1c1c1;
-}

frontend/src/layouts/MainLayout.vue

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

frontend/src/pages/FlowChart.vue

@@ -1,8 +1,18 @@
 <template>
   <q-page>
-    <q-layout container class="absolute-full shadow-2 rounded-borders">
+    <q-layout
+      container
+      class="absolute-full shadow-2 rounded-borders"
+    >
       <div class="q-pa-sm q-gutter-sm  ">
-        <q-drawer side="left" :overlay="true" bordered v-model="drawerLeft" :show-if-above="false" elevated>
+        <q-drawer
+        side="left"
+        :overlay="true"
+        bordered
+        v-model="drawerLeft"
+        :show-if-above="false"
+        elevated
+        >
             <div class="flex-center fixed-top app-selector" >
                 <AppSelector  />
             </div>
@@ -20,31 +30,26 @@
             </div>
         </q-drawer>
       </div>
-      <q-btn flat dense round
+      <div class="q-pa-md q-gutter-sm">
-              :icon="drawerLeft?'keyboard_double_arrow_left':'keyboard_double_arrow_right'"
+        <div class="flowchart" v-if="store.currentFlow">
-              :style="[drawerLeft?{'left':'300px'}:{'left':'0px'}]"
+          <node-item v-for="(node,) in store.currentFlow.actionNodes" :key="node.id"
-              @click="drawerLeft=!drawerLeft" class="expand" />
+          :isSelected="node===state.activeNode" :actionNode="node"
-      <div class="q-pa-md q-gutter-sm" :style="{minWidth: minPanelWidth}">
+          @addNode="addNode"
-        <div class="flowchart" v-if="store.currentFlow" :style="[drawerLeft?{paddingLeft:'300px'}:{}]">
+          @nodeSelected="onNodeSelected"
-          <node-item v-if="rootNode!==undefined" :key="rootNode.id" :isSelected="rootNode === store.activeNode"
+          @nodeEdit="onNodeEdit"
-            :actionNode="rootNode" @addNode="addNode" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
+          @deleteNode="onDeleteNode"
-            @deleteNode="onDeleteNode" @deleteAllNextNodes="onDeleteAllNextNodes" @copyFlow="onCopyFlow"></node-item>
+          @deleteAllNextNodes="onDeleteAllNextNodes"
+          ></node-item>
         </div>
       </div>
-      <PropertyPanel :actionNode="store.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
+      <PropertyPanel :actionNode="state.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
     </q-layout>
-    <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" min-width="500px" min-height="500px">
+    <ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" width="350px">
-      <template v-slot:toolbar>
+        <action-select ref="appDg" name="model" type="single"></action-select>
-        <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">
@@ -52,8 +57,6 @@ import { ref, reactive, computed, onMounted } from 'vue';
 import {IActionNode, ActionNode, IActionFlow, ActionFlow,RootAction, IActionProperty } from 'src/types/ActionTypes';
 import { storeToRefs } from 'pinia';
 import { useFlowEditorStore } from 'stores/flowEditor';
-import { useAuthStore } from 'stores/useAuthStore';
-
 import NodeItem from 'src/components/main/NodeItem.vue';
 import ShowDialog from 'components/ShowDialog.vue';
 import ActionSelect from 'components/ActionSelect.vue';
@@ -64,11 +67,16 @@ import { FlowCtrl } from '../control/flowctrl';
 import { useQuasar } from 'quasar';
 const deployLoading = ref(false);
 const saveLoading = ref(false);
+
 const drawerLeft = ref(false);
 const $q=useQuasar();
 const store = useFlowEditorStore();
-const authStore = useAuthStore();
+// ref関数を使ってtemplateとバインド
-
+const state=reactive({
+  activeNode:{
+    id:""
+  },
+})
 const appDg = ref();
 const prevNodeIfo=ref({
   prevNode:{} as IActionNode,
@@ -77,23 +85,11 @@ const prevNodeIfo = ref({
 // const refFlow = ref<ActionFlow|null>(null);
 const showAddAction=ref(false);
 const drawerRight=ref(false);
-const filter=ref("");
 const model=ref("");
 const addActionNode=(action:IActionNode)=>{
   // refFlow.value?.actionNodes.push(action);
  store.currentFlow?.actionNodes.push(action);
 }
-const rootNode = computed(()=>{
-  return store.currentFlow?.getRoot();
-});
-const minPanelWidth=computed(()=>{
-  const root = store.currentFlow?.getRoot();
-  if(store.currentFlow && root){
-    return store.currentFlow?.getColumns(root) * 300 + 'px';
-  }else{
-    return "300px";
-  }
-});
 
 const addNode=(node:IActionNode,inputPoint:string)=>{
   if(drawerRight.value){
@@ -106,21 +102,21 @@ const addNode = (node: IActionNode, inputPoint: string) => {
 
 const onNodeSelected=(node:IActionNode)=>{
   //右パネルが開いている場合、自動閉じる
-  if (drawerRight.value && store.activeNode?.id !== node.id) {
+  if(drawerRight.value && state.activeNode.id!==node.id){
     drawerRight.value=false;
   }
-  store.setActiveNode(node);
+  state.activeNode = node;
 }
 
 const onNodeEdit=(node:IActionNode)=>{
-  store.setActiveNode(node);
+  state.activeNode = node;
   drawerRight.value=true;
 }
 
 const onDeleteNode=(node:IActionNode)=>{
   if(!store.currentFlow) return;
   //右パネルが開いている場合、自動閉じる
-  if (drawerRight.value && store.activeNode?.id === node.id) {
+  if(drawerRight.value && state.activeNode.id===node.id){
     drawerRight.value=false;
   }
   store.currentFlow?.removeNode(node);
@@ -144,22 +140,6 @@ const closeDg = (val: any) => {
       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');
-  }
-};
 /**
  * デプロイ
  */
@@ -237,12 +217,11 @@ const fetchData = async () => {
   }
   const root =actionFlows[0].getRoot();
   if(root){
-    store.setActiveNode(root);
+    state.activeNode=root;
   }
 }
 
 onMounted(() => {
-  authStore.toggleLeftMenu();
   fetchData();
 });
 </script>
@@ -256,7 +235,6 @@ onMounted(() => {
   .flowchart{
     padding-top: 10px;
   }
-
   .flow-toolbar{
   opacity: 50%;
   }
@@ -265,10 +243,4 @@ onMounted(() => {
     top:50px;
     z-index: 999;
   }
-.expand{
-  position: fixed;
-  left: 0px;
-  top: 50%;
-  z-index: 9999;
-}
 </style>

frontend/src/pages/RuleEditor.vue

@@ -24,7 +24,7 @@
           <q-btn :label="model+'選択'" color="primary" @click="showDg()" />
           <show-dialog v-model:visible="show" :name="model" @close="closeDg" width="400px">
             <template v-if="model=='アプリ'">
-              <app-select-box ref="appDg" :name="model" type="single"></app-select-box>
+              <app-select ref="appDg" :name="model" type="single"></app-select>
             </template>
             <template v-if="model=='フィールド'">
               <field-select ref="appDg" :name="model" type="multiple" :appId="1"></field-select>
@@ -42,7 +42,7 @@
 
 <script setup lang="ts">
 import ShowDialog from 'components/ShowDialog.vue';
-import AppSelectBox from 'components/AppSelectBox.vue';
+import AppSelect from 'components/AppSelect.vue';
 import FieldSelect from 'components/FieldSelect.vue';
 import ActionSelect from 'components/ActionSelect.vue';
 import { ref } from 'vue'

frontend/src/router/routes.ts

@@ -5,13 +5,7 @@ const routes: RouteRecordRaw[] = [
     path: '/login',
     component: () => import('pages/LoginPage.vue')
   },
-  {
+
-    path:'/FlowChart',
-    component:()=>import('layouts/MainLayout.vue'),
-    children:[
-      {path:'',component:()=>import('pages/FlowChart.vue')}
-    ]
-  },
   {
     path: '/',
     component: () => import('layouts/MainLayout.vue'),
@@ -22,7 +16,7 @@ const routes: RouteRecordRaw[] = [
       { path: 'flow', component: () => import('pages/testFlow.vue') },
       { path: 'FlowChartTest', component: () => import('pages/FlowChartTest.vue') },
       { path: 'flowEditor', component: () => import('pages/FlowEditorPage.vue') },
-      // { path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
+      { path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
       { path: 'right', component: () => import('pages/testRight.vue') },
       { path: 'domain', component: () => import('pages/TenantDomain.vue') },
       { path: 'userdomain', component: () => import('pages/UserDomain.vue')},

frontend/src/stores/flowEditor.ts

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
-import { AppInfo, IActionFlow, IActionNode } from 'src/types/ActionTypes';
+import { AppInfo ,IActionFlow} from 'src/types/ActionTypes';
-import { IKintoneEvent, KintoneEventManager } from 'src/types/KintoneEvents';
+import { kintoneEvents,IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
 import {FlowCtrl } from '../control/flowctrl';
 
 export interface FlowEditorState{
@@ -8,23 +8,20 @@ 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",{
-export const useFlowEditorStore = defineStore('flowEditor', {
   state: ():FlowEditorState =>  ({
       flowNames1: '',
       appInfo:undefined,
       flows:[],
       selectedFlow:undefined,
-    activeNode: undefined,
+      eventTree:kintoneEvents,
-    eventTree: eventTree,
       selectedEvent:undefined,
-    expandedScreen: [],
+      expandedScreen:[]
     }),
   getters: {
     /**
@@ -43,29 +40,19 @@ export const useFlowEditorStore = defineStore('flowEditor', {
       return (eventId:string)=>{
           return state.flows?.find((flow)=>{
               const root=flow.getRoot();
-          return root?.name === eventId;
+              return root?.name===eventId
           });
-      };
+      }
-    },
+    }
-
-    findEventById(state) {
-      return (eventId: string) => {
-        return state.eventTree.findEventById(eventId);
-      };
-    },
-
   },
 
   actions: {
     setFlows(flows:IActionFlow[]){
       this.flows=flows;
     },
-    selectFlow(flow: IActionFlow | undefined) {
+    selectFlow(flow:IActionFlow){
       this.selectedFlow=flow;
     },
-    setActiveNode(node: IActionNode) {
-      this.activeNode = node;
-    },
     setApp(app:AppInfo){
       this.appInfo=app;
     },
@@ -87,7 +74,7 @@ export const useFlowEditorStore = defineStore('flowEditor', {
         if(actionFlows && actionFlows.length>0){
           this.selectFlow(actionFlows[0]);
         }
-      const expandNames = actionFlows.map((flow) => flow.getRoot()?.title);
+        const expandNames = actionFlows.map(flow=>flow.getRoot()?.title);
         // const expandName =actionFlows[0].getRoot()?.title;
         this.expandedScreen=expandNames;
     },
@@ -102,8 +89,8 @@ export const useFlowEditorStore = defineStore('flowEditor', {
         appid: this.appInfo?.appId,
         eventid: root?.name,
         name: root?.subTitle,
-        content: JSON.stringify(flow),
+        content: JSON.stringify(flow)
-      };
+      }
 
       if(isNew){
         return await flowCtrl.SaveFlow(jsonData);
@@ -111,24 +98,6 @@ export const useFlowEditorStore = defineStore('flowEditor', {
         return await flowCtrl.UpdateFlow(jsonData);
       }
     },
-
-
-    async deleteEvent(event: IKintoneEvent) {
-      const store = useFlowEditorStore();
-      if (event.flowData) {
-        const flow = event.flowData;
-        if (flow.id !== '') {
-          await flowCtrl.DeleteFlow(flow.id)
-          if (this.flows) {
-            this.flows = this.flows.filter((f) => f.id !== flow.id);
-          }
-        }
-        eventTree.deleteEvent(event, store);
-      }
-      else {
-        eventTree.deleteEvent(event, store);
-      }
-    },
     /**
      * デプロイする
      */
@@ -137,6 +106,7 @@ export const useFlowEditorStore = defineStore('flowEditor', {
         return false;
       }
       return await flowCtrl.depoly(this.appInfo?.appId);
-    },
+   }
-  },
+
+  }
 });

frontend/src/stores/useAuthStore.ts

@@ -8,7 +8,6 @@ export interface IUserState{
   token?:string;
   returnUrl:string;
   currentDomain:IDomainInfo;
-  LeftDrawer:boolean;
 }
 
 export const useAuthStore = defineStore({
@@ -21,19 +20,10 @@ export const useAuthStore = defineStore({
       return {
           token,
           returnUrl: '',
-          LeftDrawer:false,
           currentDomain: JSON.parse(localStorage.getItem('currentDomain')||"{}")
         }
     },
-    getters:{
-      toggleLeftDrawer():boolean{
-          return this.LeftDrawer;
-      }
-    },
     actions: {
-        toggleLeftMenu(){
-          this.LeftDrawer=!this.LeftDrawer;
-        },
         async login(username:string, password:string) {
           const params = new URLSearchParams();
           params.append('username', username);

frontend/src/types/ActionTypes.ts

@@ -16,9 +16,11 @@ export interface AppInfo {
 }
 
 /**
- * 属性項目情報
+* アクションのプロパティ定義
  */
-export interface IProp{
+export interface IActionProperty {
+  component: string;
+  props: {
     //プロパティ名
     name: string;
     //プロパティ表示名
@@ -26,34 +28,8 @@ export interface IProp{
     placeholder: string;
     //入力提示・説明
     hint:string;
-    //関連属性リスト
-    connectProps:[{key:string,propName:string}]|undefined;
     //プロパティ設定値
     modelValue: any;
-}
-
-/**
-* アクションのプロパティ定義
- */
-export interface IActionProperty {
-  component: string;
-  props: IProp;
-}
-/**
- * 変数オブジェクト
- */
-export interface IActionVariable{
-  actionName:string;
-  displayName:string;
-  name: {
-    name:string;
-    actionName:string;
-    displayName:string;
-    vars : {
-      vName:string;
-      logicalOperator:string;
-      field: object;
-    }[]
   };
 }
 /**
@@ -64,7 +40,6 @@ export interface IActionNode {
   //アクション名
   name: string;
   title: string;
-  varName:IProp|undefined;
   subTitle: string;
   inputPoint: string;
   //出力ポイント（条件分岐以外未使用）
@@ -87,12 +62,10 @@ export interface IActionFlow {
   addNode(newNode: IActionNode, prevNode?: IActionNode, inputPoint?: string): IActionNode;
   removeNode(targetNode: IActionNode): boolean;
   removeAllNext(targetNodeId: string): void;
-  getVarNames(currentNode:IActionNode):IActionVariable[];
   findNodeById(id: string): IActionNode | undefined;
   toJSON(): any;
   getRoot(): IActionNode | undefined;
   createNewId(): string;
-  getColumns(node:IActionNode):number;
 }
 
 /**
@@ -100,7 +73,16 @@ export interface IActionFlow {
  */
 class ActionProperty implements IActionProperty {
   component: string;
-  props: IProp;
+  props: {
+    // プロパティ名
+    name: string;
+    // プロパティ表示名
+    displayName: string;
+    placeholder: string;
+    hint:string;
+    // プロパティ設定値
+    modelValue: any;
+  };
 
   static defaultProperty(): IActionProperty {
     return new ActionProperty('InputText', 'displayName', '表示名', '表示を入力してください', '','');
@@ -120,7 +102,6 @@ class ActionProperty implements IActionProperty {
       displayName: displayName,
       placeholder: placeholder,
       hint:hint,
-      connectProps:undefined,
       modelValue: modelValue
     };
   }
@@ -140,13 +121,6 @@ export class ActionNode implements IActionNode {
   get subTitle(): string {
     return this.name;
   };
-
-  //変数名
-  get varName():IProp|undefined{
-      const prop = this.actionProps.find((prop) => prop.props.name === "verName");
-      return prop?.props;
-  }
-
   inputPoint: string;
   //出力ポイント（条件分岐以外未使用）
   outputPoints: Array<string>;
@@ -194,7 +168,6 @@ export class RootAction implements IActionNode {
   title: string;
   subTitle: string;
   inputPoint: string;
-  varName: IProp | undefined=undefined;
   //出力ポイント（条件分岐以外未使用）
   outputPoints: Array<string>;
   isRoot: boolean;
@@ -252,7 +225,7 @@ export class ActionFlow implements IActionFlow {
       newNode.inputPoint = inputPoint;
     }
     if (prevNode !== undefined) {
-      this.resetNodeRelation(prevNode, newNode, inputPoint || '');
+      this.connectNodes(prevNode, newNode, inputPoint || '');
     } else {
       prevNode = this.actionNodes[this.actionNodes.length - 1];
       this.connectNodes(prevNode, newNode, inputPoint || '');
@@ -296,29 +269,9 @@ export class ActionFlow implements IActionFlow {
       return false;
     }
     for (const [, id] of targetNode.nextNodeIds) {
-      this.removeAll(id);
+      this.removeAllNext(id);
+      this.removeFromActionNodes(id);
     }
-    targetNode.nextNodeIds.clear();
-  }
-
-  /***
-   * 目標ノードの次のノードを全部削除する
-   */
-  removeAll(targetNodeId: string) {
-    if (!targetNodeId || targetNodeId === '') {
-      return;
-    }
-    const targetNode = this.findNodeById(targetNodeId);
-    if (!targetNode) {
-      return
-    }
-    if (targetNode.nextNodeIds.size == 0) {
-      return
-    }
-    for (const [, id] of targetNode.nextNodeIds) {
-      this.removeAll(id);
-    }
-    this.removeNode(targetNode);
   }
 
   // 断开与前一个节点的连接
@@ -366,7 +319,8 @@ export class ActionFlow implements IActionFlow {
       if (!nextNodeId) return;
       const nextNode = this.findNodeById(nextNodeId);
       if (!nextNode) return;
-      this.connectNodes(prevNode,nextNode,targetNode.inputPoint || '');
+      nextNode.prevNodeId = prevNode.id;
+      prevNode.nextNodeIds.set(targetNode.inputPoint || '', nextNodeId);
       return;
     }
     //二つ以上の場合
@@ -400,16 +354,15 @@ export class ActionFlow implements IActionFlow {
 
   /**
    *
-   * @param prevNode ノード挿入時の接続をリセットする
+   * @param prevNode ノードの接続をリセットする
    * @param newNode
    * @param inputPoint
    */
   resetNodeRelation(prevNode: IActionNode, newNode: IActionNode, inputPoint?: string) {
-    //元の次のノードを取得
+    //
-    const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
     prevNode.nextNodeIds.set(inputPoint || '', newNode.id);
     newNode.prevNodeId = prevNode.id;
-    newNode.inputPoint=inputPoint||'';
+    const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
     this.setNewNodeNextId(newNode, originalNextNodeId, inputPoint);
   }
 
@@ -421,18 +374,15 @@ export class ActionFlow implements IActionFlow {
    */
   private setNewNodeNextId(newNode: IActionNode, originalNextNodeId: string | undefined, inputPoint?: string) {
     // 元の接続ノードが存在する
-    if (!originalNextNodeId) {return;}
+    if (originalNextNodeId) {
-    const originNextNode = this.findNodeById(originalNextNodeId);
-    if (!originNextNode) {return;}
       // 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
       if (newNode.outputPoints.includes(inputPoint || '')) {
         newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
-      originNextNode.prevNodeId=newNode.id;
       } else {
         //  inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
         const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
         newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
-      originNextNode.prevNodeId=newNode.id;
+      }
     }
   }
 
@@ -443,42 +393,6 @@ export class ActionFlow implements IActionFlow {
     return this.actionNodes.find((node) => node.id === id);
   }
 
-  getVarNames(currentNode:IActionNode):IActionVariable[]{
-    let varNames:IActionVariable[]=[];
-    if(currentNode.prevNodeId!==undefined){
-      const prevNode=this.findNodeById(currentNode.prevNodeId);
-      if(prevNode!==undefined){
-        varNames = this.getPrevVarNames(prevNode);
-      }
-    }
-    return varNames;
-  }
-
-  getPrevVarNames(prevNode:IActionNode):IActionVariable[]{
-    let varNames:IActionVariable[]=[];
-    if(prevNode.varName!==undefined && prevNode.varName.modelValue){
-
-      if(prevNode.varName.modelValue ==='object'){
-        console.log(prevNode);
-        
-      }
-
-      varNames.unshift({
-        actionName:prevNode.name,
-        displayName:prevNode.varName.displayName,
-        name:prevNode.varName.modelValue
-      });
-    }
-    if(prevNode.prevNodeId!==undefined){
-      const prevPrevNode=this.findNodeById(prevNode.prevNodeId);
-      if(prevPrevNode!==undefined){
-        const prevVars = this.getPrevVarNames(prevPrevNode);
-        varNames=[...prevVars,...varNames];
-      }
-    }
-    return varNames;
-  }
-
   toJSON() {
     return {
       id: this.id,
@@ -486,27 +400,12 @@ export class ActionFlow implements IActionFlow {
         const { nextNodeIds, ...rest } = node;
         return {
           ...rest,
-          nextNodeIds: Object.fromEntries(nextNodeIds)
+          nextNodeIds: Array.from(nextNodeIds.entries())
         };
       })
     };
   }
 
-  getColumns(node:IActionNode):number{
-    let result= 1;
-    if(node.outputPoints && node.outputPoints.length>1){
-      result += node.outputPoints.length -1;
-    }
-    let nextNode;
-    for (const [key, id] of node.nextNodeIds) {
-      nextNode=this.findNodeById(id);
-      if(nextNode){
-        result +=this.getColumns(nextNode)-1;
-      }
-    }
-    return result;
-  }
-
   getRoot(): IActionNode | undefined {
     return this.actionNodes.find(node => node.isRoot)
   }
@@ -520,9 +419,9 @@ export class ActionFlow implements IActionFlow {
     const parsedObject = JSON.parse(json);
 
     const actionNodes = parsedObject.actionNodes.map((node: any) => {
-      const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoints, node.actionProps)
+      const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoint, node.actionProps)
         : new RootAction(node.name, node.title, node.subTitle);
-      nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
+      nodeClass.nextNodeIds = new Map(node.nextNodeIds);
       nodeClass.prevNodeId = node.prevNodeId;
       nodeClass.id = node.id;
       return nodeClass;

frontend/src/types/Conditions.ts

@@ -74,11 +74,6 @@ export class GroupNode implements INode {
 
 }
 
-export type OperatorListItem = {
-  label: string;
-  value: string;
-}
-
 // 条件式ノード
 export class ConditionNode implements INode {
   index: number;
@@ -88,13 +83,13 @@ export class ConditionNode implements INode {
     return this.parent.logicalOperator;
   };
   object: any; // 比較元
-  operator: Operator | OperatorListItem; // 比較子
+  operator: Operator; // 比較子
   value: any;
   get header():string{
     return 'generic';
   }
 
-  constructor(object: any, operator: Operator | OperatorListItem, value: any, parent: GroupNode) {
+  constructor(object: any, operator: Operator, value: any, parent: GroupNode) {
     this.index=0;
     this.type = NodeType.Condition;
     this.object = object;
@@ -118,12 +113,10 @@ export class ConditionNode implements INode {
 export class ConditionTree {
   root: GroupNode;
   maxIndex:number;
-  queryString:string;
 
   constructor() {
     this.maxIndex=0;
     this.root = new GroupNode(LogicalOperator.AND, null);
-    this.queryString='';
   }
 
   // ノード追加
@@ -201,53 +194,16 @@ export class ConditionTree {
     } else {
       const condNode=node as ConditionNode;
       if (condNode.object && condNode.operator ) {
-        // let value=condNode.value;
+        let value=condNode.value;
-        // if(value && typeof value ==='object' && ('label' in value)){
+        if(value && typeof value ==='object' && ('label' in value)){
-        //     value =condNode.value.label;
+            value =condNode.value.label;
-        // }
+        }
-        return `${condNode.object.sharedText} ${typeof condNode.operator === 'object' ? condNode.operator.label : condNode.operator} ${condNode.value.sharedText}`;
+        return `${condNode.object.name} ${condNode.operator} '${value}'`;
-        // return `${typeof condNode.object.name === 'object' ? condNode.object.name.name : condNode.object.name} ${typeof condNode.operator === 'object' ? condNode.operator.label : condNode.operator} '${value}'`;
       } else {
         return '';
       }
     }
   }
-
-  buildConditionQueryString(node:INode){
-    if (node.type !== NodeType.Condition) {
-      let conditionString = '';
-      if(node.type !== NodeType.Root){
-        conditionString = '(';
-      }
-      
-      const groupNode = node as GroupNode;
-      for (let i = 0; i < groupNode.children.length; i++) {
-        const childConditionString = this.buildConditionQueryString(groupNode.children[i]);
-        if (childConditionString !== '') {
-          conditionString += childConditionString;
-          if (i < groupNode.children.length - 1) {
-            conditionString += ` ${groupNode.logicalOperator.toLowerCase()} `;
-          }
-        }
-      }
-
-      if(node.type !== NodeType.Root){
-        conditionString += ')';
-      }
-      return conditionString;
-    } else {
-      const condNode=node as ConditionNode;
-      if (condNode.object && condNode.operator ) {
-        if (!condNode.object.code || !condNode.value.sharedText){
-          return '';
-        }
-        return `${condNode.object.code} ${typeof condNode.operator === 'object' ? condNode.operator.value : condNode.operator} "${condNode.value.sharedText}"`;
-      } else {
-        return '';
-      }
-    }
-  }
-
   /**
    *
    * @param node ノード移動
@@ -369,7 +325,7 @@ export class ConditionTree {
   }
 
   toJson():string{
-    return JSON.stringify({queryString :this.queryString, ...this.root}, (key, value) => {
+    return JSON.stringify(this.root, (key, value) => {
       if (key === 'parent') {
         return value ? value.type : null;
       }
@@ -377,7 +333,4 @@ export class ConditionTree {
     });
   }
 
-  setQuery(queryString:string){
-    this.queryString=queryString;
-  }
 }

frontend/src/types/KintoneEvents.ts

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

node_modules/.package-lock.json

@@ -1,6 +0,0 @@
-{
-  "name": "App Builder for kintone",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {}
-}

node_modules/.yarn-integrity

@@ -1,15 +0,0 @@
-{
-  "systemParams": "win32-x64-108",
-  "modulesFolders": [
-    "node_modules"
-  ],
-  "flags": [],
-  "linkedModules": [
-    "@quasar\\quasar-ui-qactivity",
-    "docs"
-  ],
-  "topLevelPatterns": [],
-  "lockfileEntries": {},
-  "files": [],
-  "artifacts": {}
-}

plugin/kintone-addins/.env.dev

@@ -1,2 +0,0 @@
-VITE_SOURCE_MAP = inline
-VITE_PORT = 4173

plugin/kintone-addins/.env.production

@@ -1,2 +0,0 @@
-VITE_SOURCE_MAP = false
-VITE_PORT = 4173

plugin/kintone-addins/package-lock.json

@@ -8,8 +8,7 @@
       "name": "kintone-addins",
       "version": "0.0.0",
       "dependencies": {
-        "jquery": "^3.7.1",
+        "jquery": "^3.7.1"
-        "yarn": "^1.22.22"
       },
       "devDependencies": {
         "@types/jquery": "^3.5.24",
@@ -796,19 +795,6 @@
           "optional": true
         }
       }
-    },
-    "node_modules/yarn": {
-      "version": "1.22.22",
-      "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.22.tgz",
-      "integrity": "sha512-prL3kGtyG7o9Z9Sv8IPfBNrWTDmXB4Qbes8A9rEzt6wkJV8mUvoirjU0Mp3GGAU06Y0XQyA3/2/RQFVuK7MTfg==",
-      "hasInstallScript": true,
-      "bin": {
-        "yarn": "bin/yarn.js",
-        "yarnpkg": "bin/yarn.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
     }
   }
 }

plugin/kintone-addins/package.json

@@ -4,37 +4,19 @@
   "version": "0.0.0",
   "type": "module",
   "scripts": {
-    "dev": "run-p watch server ngrok",
+    "dev": "vite",
-    "watch": "vite build --watch --mode dev",
+    "build": "tsc && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "server": "vite dev --mode dev",
+    "build:dev":"tsc && set \"SOURCE_MAP=true\" && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "ngrok": "ngrok http 4173",
+    "preview": "vite preview"
-    "build": "run-s b:production copyjs:windows copycss:windows",
-    "build:dev": "run-s b:dev copyjs:windows copycss:windows",
-    "build:linux": "run-s b:production copyjs:linux copycss:linux",
-    "build:linux-dev": "run-s b:dev copy:linux",
-    "b:production": "tsc & vite build --mode production",
-    "b:dev": "tsc & vite build --mode dev",
-    "copyjs:windows": "xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
-    "copyjs:linux": "cp -ur dist/*.js ../../backend/Temp",
-    "copycss:windows": "xcopy dist\\*.css ..\\..\\backend\\Temp\\ /E /I /Y",
-    "copycss:linux": "cp -ur dist/*.css  ../../backend/Temp"
   },
   "devDependencies": {
     "@types/jquery": "^3.5.24",
     "@types/node": "^20.8.9",
-    "npm-run-all2": "^6.2.0",
     "sass": "^1.69.5",
     "typescript": "^5.0.2",
-    "vite": "^4.4.5",
+    "vite": "^4.4.5"
-    "vite-plugin-checker": "^0.6.4",
-    "vite-plugin-lib-inject-css": "^2.1.1"
   },
   "dependencies": {
-    "@kintone/rest-api-client": "^5.5.2",
+    "jquery": "^3.7.1"
-    "@popperjs/core": "^2.11.8",
-    "@types/bootstrap": "^5.2.10",
-    "bootstrap": "^5.3.3",
-    "jquery": "^3.7.1",
-    "vite-plugin-css-injected-by-js": "^3.5.1"
   }
 }

plugin/kintone-addins/readme.md

@@ -68,10 +68,6 @@
 | modelValue  | 空文字             | コンポーネントの初期値を設定します。<br>初期設定ないの場合は空文字で設定する。
 | name        | field              | 属性の設定値の名前です。   |
 | placeholder | 対象項目を選択してください| 入力フィールドに表示されるプレースホルダーのテキストです。この場合は設定されていません。          |
-| hint        | 説明文| 長い説明文を設定することが可能です。（markdown形式サポート予定、現在HTML可能）          |
-| selectType  |`single` or `multiple`| フィールド選択・他のアプリのフィールド選択の選択モードを設定する         |
-
-
 
 ### 使用可能なコンポーネント
 | No. | コンポーネント名      | コンポーネントタイプ | 説明                                     |
@@ -82,10 +78,9 @@
 | 4   | フィールド選択     | FieldInput       | システムのフィールドを選択するための入力コンポーネントです。   |
 | 5   | 選択リスト        | SelectBox        | 複数のオプションから選択するためのドロップダウンリストです。   |
 | 6   | 条件式設定       | ConditionInput   | 条件式やロジックを入力するためのコンポーネントです。         |
-| 7   | イベント設定       |EventSetter    | ボタンイベント設定のコンポーネントです。         |
+| 7   | 色選択       | ColorPicker   | 色を設定する（追加予定中）         |
-| 8   | 色選択       | ColorPicker   | 色を設定する（追加予定中）         |
+| 8   | 他のアプリのフィールド選択       | AppFieldPicker   | 他のアプリのフィールドを選択する（追加予定中）         |
-| 9   | 他のアプリのフィールド選択       | AppFieldPicker   | 他のアプリのフィールドを選択する（追加予定中）         |
+| 9   |ユーザー選択       | UserPicker   | ユーザーを選択する（追加予定中）         |
-| 10  |ユーザー選択       | UserPicker   | ユーザーを選択する（追加予定中）         |
 
 ## 2.アクションアドインの開発
 
@@ -269,27 +264,3 @@ npm run build:dev
 - デプロイの確認:
    - Azure App Service 拡張機能でデプロイが完了したことを確認します。
    - ka-addin の URL にアクセスしてアプリケーションが正常に動作しているか確認します。
-
-3. **ローカルでプラグインをテストする**
-1. kintone-addinsをPreviewで起動する
-```bash
-yarn build:dev
-yarn preview
-#またはyarn devは　yarn build:dev + yarn preview　と同じです
-yarn dev
-```
-2. **ngrokをインストールする**
-    1. [ngrok の公式ウェブサイト](https://ngrok.com/)にアクセスします。
-    2. 「Sign up」をクリックしてアカウントを登録するか、既存のアカウントにログインします。
-    3. 登録またはログイン後、ダッシュボードに進み、ダウンロードリンクが表示されます。操作システム（Windows、macOS、Linux）に応じて、適切なバージョンを選択してダウンロードします。
-    4. ダウンロード後、`.zip` ファイルを解凍します。
-    5. ngrok を設定する
-        1. ngrok ダッシュボードにログインし、ホームページで認証トークンを見つけます。
-        2. ターミナル（またはコマンドプロンプト）を開き、以下のコマンドを実行して認証トークンを追加します：
-        ```bash
-        ngrok config add-authtoken <認証トークン>
-        ```
-    6. ngrok を起動する
-        ```bash
-        ngrok https http://localhost:4173/
-        ```

plugin/kintone-addins/src/actions/auto-lookup.scss

@@ -1 +0,0 @@
-@import 'bootstrap/scss/bootstrap';

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

@@ -1,272 +0,0 @@
-import {
-  IAction,
-  IActionResult,
-  IActionNode,
-  IActionProperty,
-  IContext,
-  IField,
-} from "../types/ActionTypes";
-
-import { actionAddins } from ".";
-import type { Record} from "@kintone/rest-api-client/lib/src/client/types";
-import { KintoneRestAPIClient} from "@kintone/rest-api-client";
-import "./auto-lookup.scss";
-import "bootstrap/js/dist/modal";
-// import "bootstrap/js/dist/spinner";
-import {Modal} from "bootstrap"
-import $ from "jquery";
-
-interface Props {
-  displayName: string;
-  lookupField: LookupField;
-  condition: Condition;
-}
-
-interface Condition {
-  queryString: string;
-  index: number;
-  type: string;
-  children: Child[];
-  parent: null;
-  logicalOperator: string;
-}
-
-interface Child {
-  index: number;
-  type: string;
-  parent: string;
-  object: any;
-  operator: string;
-  value: string;
-}
-
-interface LookupField {
-  app: App;
-  fields: Field[];
-}
-
-interface Field {
-  name: string;
-  type: string;
-  code: string;
-  label: string;
-  noLabel: boolean;
-  required: boolean;
-  lookup: Lookup;
-}
-
-interface Lookup {
-  relatedApp: RelatedApp;
-  relatedKeyField: string;
-  fieldMappings: FieldMapping[];
-  lookupPickerFields: any[];
-  filterCond: string;
-  sort: string;
-}
-
-interface FieldMapping {
-  field: string;
-  relatedField: string;
-}
-
-interface RelatedApp {
-  app: string;
-  code: string;
-}
-
-interface App {
-  id: string;
-  name: string;
-  description: string;
-  createdate: string;
-}
-
-export class AutoLookUpAction implements IAction {
-  name: string;
-  actionProps: IActionProperty[];
-  props: Props;
-  constructor() {
-    this.name = "ルックアップ更新";
-    this.actionProps = [];
-    this.props = {} as Props;
-    this.register();
-  }
-
-  /***
-   * アクセスのメインの処理関数
-   */
-  async process(
-    prop: IActionNode,
-    event: any,
-    context: IContext
-  ): Promise<IActionResult> {
-    this.actionProps = prop.actionProps;
-    this.props = {
-      ...prop.ActionValue,
-      condition: JSON.parse((prop.ActionValue as any).condition),
-    } as Props;
-    // console.log(context);
-
-    let result = {
-      canNext: true,
-      result: "",
-    } as IActionResult;
-    try {
-      const lookUpFields = this.props.lookupField.fields.filter(
-        (f) => f.lookup && f.lookup.relatedApp.app === String(kintone.app.getId())
-      );
-      if (!lookUpFields || lookUpFields.length===0) {
-        throw new Error(
-          `ルックアップの設定は不正です。${this.props.lookupField.fields[0].label} `
-        );
-      }
-      const lookUpField = this.props.lookupField.fields[0]; 
-      const key = event.record[lookUpField.lookup.relatedKeyField].value;
-      const targetRecords = await this.getUpdateRecords(lookUpField, key);
-      //更新対象がない時にスキップ
-      if(targetRecords.length===0){
-        return result;
-      }
-      const updateRecords = this.convertForLookup(targetRecords,lookUpField,key);
-      console.log("updateRecords", updateRecords);
-      this.showSpinnerModel(this.props.lookupField.app);
-      await this.updateLookupTarget(updateRecords);
-      this.showResult(this.props.lookupField.app,updateRecords.length);
-    } catch (error) {
-        console.error("ルックアップ更新中例外が発生しました。", error);
-        if(error instanceof Error){
-          event.error = error.message;
-        }else{
-          event.error = "ルックアップ更新中例外が発生しました。";
-        }
-        result.canNext = false;
-    }
-    console.log("autoLookupProps", this.props);
-    return result;
-  }
-
-  /**
-   * REST API用クエリ作成
-   * TODO:共通関数として作成
-   * @param lookUpField 
-   * @param key 
-   * @returns 
-   */
-  makeQuery=(lookUpField:Field,key:any)=>{
-    if(typeof key==='number'){
-      return `${lookUpField.code} = ${key}`
-    }
-    if(typeof key==='string'){
-      return `${lookUpField.code} = "${key}"`
-    }
-  }
-
-  /**
-   * 更新対象のレコードを取得する
-   */
-  getUpdateRecords = async (lookUpField:Field,key:any):Promise< Record[]>=>{
-    const client=new KintoneRestAPIClient();
-    const resp = await client.record.getAllRecords({
-      app:this.props.lookupField.app.id,
-      fields:["$id"],
-      condition:this.makeQuery(lookUpField,key)
-    });
-    return resp;
-  }
-
- /**
-  * ルックアップ更新用レコードに変換する
-  * @param targetRecords 更新対象レコード
-  * @param lookUpField ルックアップフィールド
-  * @param key ルックアップフィールドの値
-  * @returns 
-  */
-  convertForLookup = (targetRecords:Record[],lookUpField:Field,key:any):Array<any>=>{
-    return targetRecords.map((r) => ({
-      id: Number(r["$id"].value),
-      record: { [lookUpField.code]: { value: key } },
-    }));
-  }
-
-  /**
-   * ルックアップ先を更新する
-   * @param updateRecords 
-   */
-  updateLookupTarget = async (updateRecords:Array<any>)=>{
-    if (updateRecords && updateRecords.length > 0) {
-      const client=new KintoneRestAPIClient();
-      client.record.updateAllRecords({
-        app:this.props.lookupField.app.id,
-        records:updateRecords
-      });
-      // await kintone.api(kintone.api.url("/k/v1/records.json", true), "PUT", {
-      //   app: this.props.lookupField.app.id,
-      //   records: updateRecords
-      // });
-    }
-  }
-
-  /**
-   * 更新中のダイアログ表示
-   * @param app 
-   */
-  showSpinnerModel = (app:App) => {
-    let dialog = $("#alcLookupModal");
-    if(dialog.length===0){
-      const modalHTML = `
-      <div class="modal" id="alcLookupModal" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
-        <div class="modal-dialog-centered">
-          <div class="modal-dialog modal-content">
-            <div class="modal-header">
-              <h1 class="modal-title fs-5" id="alcLookupModalLabel">ルックアップ同期処理</h1>
-              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <div class="modal-body">
-              <div class="row" id="app${app.id}">
-                  <div class="spinner-border text-secondary col-1 " role="alert"></div>
-                  <div class="col">${app.name}</div>
-              </div>
-            </div>
-            <div class="modal-footer">
-              <button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
-            </div>
-          </div>
-        </div>
-      </div>`;
-      dialog = $(modalHTML).appendTo("body");
-      dialog.get()[0].addEventListener('hidden.bs.modal',(ev)=>{
-        Modal.getOrCreateInstance(dialog.get()[0]).dispose();
-        $("#alcLookupModal").remove();
-      });
-    }else{
-      const dialogBody=$("#alcLookupModal .modal-body");
-      const htmlrow=` 
-          <div class="row" id="app${app.id}">
-            <div class="spinner-border text-secondary col-1 " role="alert">
-            </div>
-            <div class="col">${app.name}</div>
-          <div>`;
-      dialogBody.append(htmlrow);
-    }
-    Modal.getOrCreateInstance(dialog.get()[0]).show();
-  }
-
-  /**
-   * 更新結果を表示する
-   * @param app 　更新先アプリ情報
-   * @param count 更新件数
-   */
-  showResult=(app:App,count:number)=>{
-    const dialogBody=$(`#alcLookupModal .modal-body #app${app.id}`);
-    const html=`    <div class="col-1 text-success">✔</div>
-                    <div class="col">${app.name}</div>
-                    <div class="col">更新件数:${count}件</div>`;
-    dialogBody.html(html);
-  }
-
-  register(): void {
-    actionAddins[this.name] = this;
-  }
-}
-
-new AutoLookUpAction();

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

@@ -1,19 +1,20 @@
 
 import { actionAddins } from ".";
-import { IField, IAction,IActionResult, IActionNode, IActionProperty, IContext, IVarName } from "../types/ActionTypes";
+import { IField, IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes";
 import { Formatter } from "../util/format";
 
 declare global {
     interface Window { $format: any; }  
 }
 
+
 interface IAutoNumberingProps{
     //文書番号を格納する
     field:IField;
     format:string;
     prefix:string;
     suffix:string;
-    verName:IVarName;
+    verName:string;
 }
 
 export class AutoNumbering implements IAction{
@@ -29,18 +30,12 @@ export class AutoNumbering implements IAction{
             format:'',
             prefix:'',
             suffix:'',
-            verName:{name:''}
+            verName:''
         }
         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,
@@ -56,8 +51,8 @@ export class AutoNumbering implements IAction{
             const docNum = await this.createNumber(this.props);
             record[this.props.field.code].value=docNum;
             //変数設定
-            if(this.props.verName && this.props.verName.name!==''){
+            if(this.props.verName){
-                context.variables[this.props.verName.name]=docNum;
+                context.variables[this.props.verName]=docNum;
             }
             result= {
               canNext:true,
@@ -84,7 +79,6 @@ export class AutoNumbering implements IAction{
 
     execEval(match:string,expr:string):string{
         console.log(match);
-        // @ts-ignore
         return eval(expr);
     }
 

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

@@ -1,24 +0,0 @@
-.alc-button-normal {
-    display: inline-block;
-    box-sizing: border-box;
-    padding: 0 16px;
-    margin-left: 16px;
-    margin-top: 8px;
-    min-width: 100px;
-    outline: none;
-    border: 1px solid #e3e7e8;
-    background-color: #f7f9fa;
-    box-shadow: 1px 1px 1px #fff inset;
-    color: #3498db;
-    text-align: center;
-    line-height: 32px;
-}
-.alc-button-normal:hover {
-    background-color: #c8d6dd;
-    box-shadow: none;
-    cursor: pointer;
-  }
-.alc-button-normal:active {
-    color: #f7f9fa;
-    background-color: #54b8eb;
-}

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

@@ -1,91 +0,0 @@
-
-import { actionAddins } from ".";
-import $ from 'jquery';
-import { IAction, IActionProperty, IActionNode, IActionResult } from "../types/ActionTypes";
-import "./button-add.css";
-
-/**
- * ボタン配置属性定義
- */
-interface IButtonAddProps {
-    //ボタン表示名
-    buttonName: string;
-    space?:ISpace;
-    //配置位置
-    position: string;
-    //イベント名
-    eventName:string
-}   
-
-interface ISpace{
-    type:string,
-    elementId:string
-}
-
-export class ButtonAddAction implements IAction {
-    name: string; 
-    actionProps: IActionProperty[]; 
-    props: IButtonAddProps;
-    constructor() { 
-        this.name = "ボタンの配置";
-        this.actionProps = [];
-        this.props = {
-            buttonName: '',
-            position: '',
-            eventName:''
-        }
-        this.register();
-    }
-
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode: IActionNode, event: any): Promise<IActionResult> { 
-        let result = { 
-            canNext: true,
-            result: false
-        };
-        try { 
-            this.actionProps = actionNode.actionProps;
-            if (!('buttonName' in actionNode.ActionValue) && !('position' in actionNode.ActionValue)) { 
-                return result
-            }
-            this.props = actionNode.ActionValue as IButtonAddProps; 
-            //ボタンを配置する
-            let buttonSpace;
-            if(this.props.space && this.props.space.elementId){
-                buttonSpace = kintone.app.record.getSpaceElement(this.props.space.elementId);
-            }else{
-                buttonSpace = kintone.app.record.getHeaderMenuSpaceElement();
-            }
-            if(!buttonSpace) return result;
-  
-            const button =$(`<button id='${this.props.eventName}' class='alc-button-normal' >${this.props.buttonName}</button>`);
-            if(this.props.position==="一番左に追加する"){
-                $(buttonSpace).prepend(button);
-            }else{
-                $(buttonSpace).append(button);
-            }
-            const clickEventName = `${event.type}.customButtonClick.${this.props.eventName}`;
-            button.on("click",()=>{
-                $(document).trigger(clickEventName,event);
-            });
-            return result;
-        } catch (error) {
-            event.error = error;
-            console.error(error);
-            result.canNext = false;
-            return result;
-        }
-    }
-  
-
-    register(): void {
-        actionAddins[this.name] = this;
-    }
-
-}
-new ButtonAddAction();

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

@@ -1,109 +0,0 @@
-
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IContext, IVarName } from "../types/ActionTypes";
-import { ConditionTree } from '../types/Conditions';
-/**
- * アクションの属性定義
- */
-interface ICondition{
-    condition:string;
-    verName:IVarName;
-}
-/**
- * 条件分岐アクション
- */
-export class ConditionAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:ICondition;
-    constructor(){
-        this.name="条件式";
-        this.actionProps=[];
-        this.props={
-            condition:'',
-            verName:{name:''}
-        }
-        //アクションを登録する
-        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 && this.props.verName.name!==''){
-                context.variables[this.props.verName.name]=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/counter-check.ts

@@ -1,75 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IStrCountCheckProps{
-    field:IField;//チェックするフィールドの対象
-    message:string;//エラーメッセージ
-    maxLength:number;//
-}
-/**
- * 正規表現チェックアクション
- */
-export class StrCountCheckAciton implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IStrCountCheckProps;
-    constructor(){
-        this.name="文字数チェック";
-        this.actionProps=[];
-        this.props={
-            field:{code:''},
-            message:'',
-            maxLength:0
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('strExpression'in actionNode.ActionValue)) {
-                return result
-            }
-            
-            this.props = actionNode.ActionValue as IStrCountCheckProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-            const maxLength = this.props.maxLength;
-            if(value === undefined || value === '' ){
-                return result;
-            }else if(maxLength < value.length){
-                record[this.props.field.code].error = this.props.message;
-            }else{
-                result= {
-                    canNext:true,
-                    result:true
-                  }
-            }
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new StrCountCheckAciton();

plugin/kintone-addins/src/actions/current-field-get.ts

@@ -1,74 +0,0 @@
-import {
-  IAction,
-  IActionResult,
-  IActionNode,
-  IActionProperty,
-  IContext,
-} from "../types/ActionTypes";
-import { actionAddins } from ".";
-
-
-interface Props {
-  displayName: string;
-  field: Field;
-  verName: VerName;
-}
-
-interface VerName {
-  name: string;
-}
-
-interface Field {
-  name: string;
-  type: string;
-  code: string;
-  label: string;
-  noLabel: boolean;
-  required: boolean;
-  minLength: string;
-  maxLength: string;
-  expression: string;
-  hideExpression: boolean;
-  unique: boolean;
-  defaultValue: string;
-}
-
-export class CurrentFieldGetAction implements IAction {
-  name: string;
-  actionProps: IActionProperty[];
-  currentFieldGetProps: Props;
-  constructor() {
-    this.name = "フィールドの値を取得する";
-    this.actionProps = [];
-    this.currentFieldGetProps = {} as Props;
-    this.register();
-  }
-
-  async process(
-    prop: IActionNode,
-    event: any,
-    context: IContext
-  ): Promise<IActionResult> {
-    this.currentFieldGetProps = prop.ActionValue as Props;
-    this.actionProps = prop.actionProps;
-
-    let result = {
-      canNext: true,
-      result: "",
-    } as IActionResult;
-    
-    try {
-      context.variables[this.currentFieldGetProps.verName.name] = context.record[this.currentFieldGetProps.field.code].value;
-    } catch (error) {
-      console.error("CurrentFieldGetAction error", error);
-      result.canNext = false;
-    }
-    return result;
-  }
-
-  register(): void {
-    actionAddins[this.name] = this;
-  }
-}
-
-new CurrentFieldGetAction();

plugin/kintone-addins/src/actions/data-mapping.ts

@@ -1,166 +0,0 @@
-import {
-  IAction,
-  IActionResult,
-  IActionNode,
-  IActionProperty,
-  IContext,
-} from "../types/ActionTypes";
-import { actionAddins } from ".";
-
-interface Props {
-  displayName: string;
-  sources: Sources;
-  dataMapping: DataMapping[];
-}
-
-interface DataMapping {
-  id: string;
-  from: From;
-  to: To;
-}
-
-interface To {
-  app: App;
-  fields: Field[];
-  isDialogVisible: boolean;
-}
-
-interface Field {
-  name: string;
-  type: string;
-  code: string;
-  label: string;
-  noLabel: boolean;
-  required: boolean;
-  minLength: string;
-  maxLength: string;
-  expression: string;
-  hideExpression: boolean;
-  unique: boolean;
-  defaultValue: string;
-}
-
-interface From {
-  sharedText: string;
-  _t: string;
-  id: string;
-  objectType: string;
-  name: Name;
-  actionName: string;
-  displayName: string;
-}
-
-interface Name {
-  name: string;
-}
-
-interface Sources {
-  app: App;
-}
-
-interface App {
-  id: string;
-  name: string;
-  description: string;
-  createdate: string;
-}
-
-export class DataMappingAction implements IAction {
-  name: string;
-  actionProps: IActionProperty[];
-  dataMappingProps: Props;
-  constructor() {
-    this.name = "データマッピング";
-    this.actionProps = [];
-    this.dataMappingProps = {} as Props;
-    this.register();
-  }
-
-  async process(
-    prop: IActionNode,
-    event: any,
-    context: IContext
-  ): Promise<IActionResult> {
-    this.actionProps = prop.actionProps;
-    this.dataMappingProps = prop.ActionValue as Props;
-    console.log(prop.ActionValue);
-
-    // this.initTypedActionProps();
-    let result = {
-      canNext: true,
-      result: "",
-    } as IActionResult;
-    try {
-      const record = this.dataMappingProps.dataMapping
-        .filter(
-          (item) =>
-            item.from.objectType === "variable" &&
-            item.from.name.name &&
-            item.to.app &&
-            item.to.fields &&
-            item.to.fields.length > 0
-        )
-        .reduce((accumulator, item) => {
-          return {...accumulator, [item.to.fields[0].code]: {
-            value: getValueByPath(context.variables, item.from.name.name),
-          }};
-      }, {});
-      if (record && Object.keys(record).length > 0) {
-        await kintone.api(kintone.api.url("/k/v1/record.json", true), "POST", {
-          app: this.dataMappingProps.sources.app.id,
-          record: record,
-        });
-      }
-    } catch (error) {
-      console.error("DataMappingAction error", error);
-      result.canNext = false;
-    }
-    console.log("dataMappingProps", this.dataMappingProps);
-
-    return result;
-  }
-
-  register(): void {
-    actionAddins[this.name] = this;
-  }
-}
-
-new DataMappingAction();
-
-const getValueByPath = (obj: any, path: string) => {
-  return path.split(".").reduce((o, k) => (o || {})[k], obj);
-};
-
-type Resp = { records: RespRecordType[] };
-
-type RespRecordType = {
-  [key: string]: {
-    type: string;
-    value: any;
-  };
-};
-
-type Result = {
-  type: string;
-  value: any[];
-};
-
-const selectData = async (appid: string, field: string): Promise<Result> => {
-  return kintone
-    .api(kintone.api.url("/k/v1/records", true), "GET", {
-      app: appid ?? kintone.app.getId(),
-      fields: [field],
-    })
-    .then((resp: Resp) => {
-      const result: Result = { type: "", value: [] };
-      resp.records.forEach((element) => {
-        for (const [key, value] of Object.entries(element)) {
-          if (result.type === "") {
-            result.type = value.type;
-          }
-          result.value.push(value.value);
-        }
-      });
-      return result;
-    });
-};

plugin/kintone-addins/src/actions/data-processing.ts

@@ -1,374 +0,0 @@
-import {
-  IAction,
-  IActionResult,
-  IActionNode,
-  IActionProperty,
-  IContext,
-} from "../types/ActionTypes";
-import { actionAddins } from ".";
-
-interface Props {
-  displayName: string;
-  sources: Sources;
-  condition: string;
-  conditionO: Condition;
-  verName: VerName;
-}
-
-interface Condition {
-  queryString: string;
-  index: number;
-  type: string;
-  children: Child[];
-  parent: null;
-  logicalOperator: string;
-}
-
-interface Child {
-  index: number;
-  type: string;
-  parent: string;
-  object: Object;
-  operator: ChildOperator;
-  value: Value;
-}
-
-interface Value {
-  sharedText: string;
-  _t: string;
-  objectType: string;
-  actionName: string;
-  displayName: string;
-  name: Name;
-}
-
-interface Name {
-  name: string;
-}
-
-interface ChildOperator {
-  label: string;
-  value: string;
-}
-
-interface Object {
-  sharedText: string;
-  _t: string;
-  name: string;
-  objectType: string;
-  type: string;
-  code: string;
-  label: string;
-  noLabel: boolean;
-  required: boolean;
-  minLength: string;
-  maxLength: string;
-  expression: string;
-  hideExpression: boolean;
-  unique: boolean;
-  defaultValue: string;
-}
-
-interface VerName {
-  name: string;
-  actionName: string;
-  displayName: string;
-  vars: Var[];
-}
-
-interface Var {
-  id: string;
-  field: Field2;
-  logicalOperator: LogicalOperator;
-  vName: string;
-}
-
-interface LogicalOperator {
-  operator: string;
-  label: string;
-}
-
-interface Field2 {
-  sharedText: string;
-  _t: string;
-  name: string;
-  objectType: string;
-  type: string;
-  code: string;
-  label: string;
-  noLabel: boolean;
-  required: boolean;
-  minLength: string;
-  maxLength: string;
-  expression: string;
-  hideExpression: boolean;
-  unique: boolean;
-  defaultValue: string;
-}
-
-interface Sources {
-  app: App;
-  fields: Field[];
-}
-
-interface Field {
-  name: string;
-  type: string;
-  code: string;
-  label: string;
-  noLabel: boolean;
-  required: boolean;
-  minLength: string;
-  maxLength: string;
-  expression: string;
-  hideExpression: boolean;
-  unique: boolean;
-  defaultValue: string;
-}
-
-interface App {
-  id: string;
-  name: string;
-  description: string;
-  createdate: string;
-}
-
-export class DataProcessingAction implements IAction {
-  name: string;
-  actionProps: IActionProperty[];
-  dataProcessingProps: Props | null;
-  constructor() {
-    this.name = "データ処理";
-    this.actionProps = [];
-    this.dataProcessingProps = null;
-    this.register();
-  }
-
-  async process(
-    nodes: IActionNode,
-    event: any,
-    context: IContext
-  ): Promise<IActionResult> {
-    this.actionProps = nodes.actionProps;
-    this.dataProcessingProps = nodes.ActionValue as Props;
-    this.dataProcessingProps.conditionO = JSON.parse(
-      this.dataProcessingProps.condition
-    );
-    let result = {
-      canNext: true,
-      result: "",
-    } as IActionResult;
-    try {
-      if (!this.dataProcessingProps) {
-        return result;
-      }
-
-      const data = await selectData(
-        varGet(
-          this.dataProcessingProps.conditionO.queryString,
-          context.variables
-        )
-      );
-      console.log("data ", data);
-
-      context.variables[this.dataProcessingProps.verName.name] =
-        this.dataProcessingProps.verName.vars.reduce((acc, f) => {
-          const v = calc(f, data);
-          if (v) {
-            acc[f.vName] = calc(f, data);
-          }
-          return acc;
-        }, {} as AnyObject);
-
-      console.log("context ", context);
-      return result;
-    } catch (error) {
-      console.error(error);
-      event.error = error;
-      return result;
-    }
-  }
-
-  register(): void {
-    actionAddins[this.name] = this;
-  }
-}
-
-new DataProcessingAction();
-
-const varGet = (str: string, vars: any) => {
-  console.log(str);
-
-  const regex = /var\((.*?)\)/g;
-  let match;
-  while ((match = regex.exec(str)) !== null) {
-    const varName = match[1];
-    if (varName in vars) {
-      str = str.replace(match[0], vars[varName]);
-    } else {
-      throw new Error(`変数${varName}が見つかりません`);
-    }
-  }
-  console.log(str);
-  return str;
-};
-
-const selectData = async (query?: string) => {
-  return kintone
-    .api(kintone.api.url("/k/v1/records", true), "GET", {
-      app: kintone.app.getId(),
-      query: query,
-    })
-    .then((resp: Resp) => {
-      const result: Result = {};
-      resp.records.forEach((element) => {
-        for (const [key, value] of Object.entries(element)) {
-          if (!result[key]) {
-            result[key] = { type: value.type, value: [] };
-          }
-          result[key].value.push(value.value);
-        }
-      });
-      return result;
-    });
-};
-
-type Resp = { records: RespRecordType[] };
-
-type RespRecordType = {
-  [key: string]: {
-    type: string;
-    value: any;
-  };
-};
-
-type Result = {
-  [key: string]: {
-    type: string;
-    value: any[];
-  };
-};
-
-type AnyObject = {
-  [key: string]: any;
-};
-
-const ERROR_TYPE = "ERROR_TYPE";
-
-const calc = (f: Var, result: Result) => {
-  const type = typeCheck(f.field.type);
-  if (!type) {
-    return ERROR_TYPE;
-  }
-
-  const fun =
-    calcFunc[
-      `${type}_${Operator[f.logicalOperator.operator as keyof typeof Operator]}`
-    ];
-  if (!fun) {
-    return ERROR_TYPE;
-  }
-  const values = result[f.field.code].value;
-  if (!values) {
-    return null;
-  }
-  return fun(values);
-};
-
-const typeCheck = (type: string) => {
-  switch (type) {
-    case "RECORD_NUMBER":
-    case "NUMBER":
-      return CalcType.NUMBER;
-    case "SINGLE_LINE_TEXT":
-    case "MULTI_LINE_TEXT":
-    case "RICH_TEXT":
-      return CalcType.STRING;
-    case "DATE":
-      return CalcType.DATE;
-    case "TIME":
-      return CalcType.TIME;
-    case "DATETIME":
-    case "UPDATED_TIME":
-      return CalcType.DATETIME;
-    default:
-      return null;
-  }
-};
-
-enum Operator {
-  SUM = "SUM",
-  AVG = "AVG",
-  MAX = "MAX",
-  MIN = "MIN",
-  COUNT = "COUNT",
-  FIRST = "FIRST",
-}
-
-enum CalcType {
-  NUMBER = "number",
-  STRING = "string",
-  DATE = "date",
-  TIME = "time",
-  DATETIME = "datetime",
-}
-
-const calcFunc: Record<string, (value: string[]) => string | null> = {
-  [`${CalcType.NUMBER}_${Operator.COUNT}`]: (value: string[]) =>
-    value.length.toString(),
-  [`${CalcType.STRING}_${Operator.COUNT}`]: (value: string[]) =>
-    value.length.toString(),
-  [`${CalcType.DATE}_${Operator.COUNT}`]: (value: string[]) =>
-    value.length.toString(),
-  [`${CalcType.TIME}_${Operator.COUNT}`]: (value: string[]) =>
-    value.length.toString(),
-  [`${CalcType.DATETIME}_${Operator.COUNT}`]: (value: string[]) =>
-    value.length.toString(),
-
-  [`${CalcType.NUMBER}_${Operator.SUM}`]: (value: string[]) =>
-    value.reduce((acc, v) => acc + Number(v), 0).toString(),
-  [`${CalcType.NUMBER}_${Operator.AVG}`]: (value: string[]) =>
-    (value.reduce((acc, v) => acc + Number(v), 0) / value.length).toString(),
-  [`${CalcType.NUMBER}_${Operator.MAX}`]: (value: string[]) =>
-    Math.max(...value.map(Number)).toString(),
-  [`${CalcType.NUMBER}_${Operator.MIN}`]: (value: string[]) =>
-    Math.min(...value.map(Number)).toString(),
-
-  [`${CalcType.STRING}_${Operator.SUM}`]: (value: string[]) => value.join(" "),
-
-  [`${CalcType.DATE}_${Operator.MAX}`]: (value: string[]) =>
-    value.reduce((maxDate, currentDate) =>
-      maxDate > currentDate ? maxDate : currentDate
-    ),
-
-  [`${CalcType.DATE}_${Operator.MIN}`]: (value: string[]) =>
-    value.reduce((minDate, currentDate) =>
-      minDate < currentDate ? minDate : currentDate
-    ),
-
-  [`${CalcType.TIME}_${Operator.MAX}`]: (value: string[]) =>
-    value.reduce((maxTime, currentTime) =>
-      maxTime > currentTime ? maxTime : currentTime
-    ),
-  [`${CalcType.TIME}_${Operator.MIN}`]: (value: string[]) =>
-    value.reduce((minTime, currentTime) =>
-      minTime < currentTime ? minTime : currentTime
-    ),
-
-  [`${CalcType.DATETIME}_${Operator.MAX}`]: (value: string[]) =>
-    value.reduce((maxDateTime, currentDateTime) =>
-      new Date(maxDateTime) > new Date(currentDateTime)
-        ? maxDateTime
-        : currentDateTime
-    ),
-
-  [`${CalcType.DATETIME}_${Operator.MIN}`]: (value: string[]) =>
-    value.reduce((minDateTime, currentDateTime) =>
-      new Date(minDateTime) < new Date(currentDateTime)
-        ? minDateTime
-        : currentDateTime
-    ),
-  [`${CalcType.STRING}_${Operator.FIRST}`]: (value: string[]) => {
-    return value[0];
-  },
-};

plugin/kintone-addins/src/actions/datetime-getter.ts

@@ -1,66 +0,0 @@
-import { actionAddins } from ".";
-import { IAction, IActionResult, IActionNode, IActionProperty, IField ,IContext, IVarName} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IDatetimeGetterProps {
-    /**変数の名前 */
-    verName:IVarName;
-}
-/**
- * 現在日時を取得するアクション
- */
-export class DatetimeGetterAction implements IAction {
-    name: string;
-    actionProps: IActionProperty[];
-    props: IDatetimeGetterProps;
-    constructor() {
-        this.name = "現在日時";
-        this.actionProps = [];
-        this.props = {
-            verName:{name:''}
-        }
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode: IActionNode, event: any,context:IContext): Promise<IActionResult> {
-        let result = {
-            canNext: true,
-            result: false
-        };
-
-        try {
-            //属性設定を取得する
-            this.actionProps = actionNode.actionProps;
-
-            if (!('verName' in actionNode.ActionValue) ) {
-                return result
-            }
-            this.props = actionNode.ActionValue as IDatetimeGetterProps;
-            
-            let today = new Date();
-          
-            if(this.props.verName && this.props.verName.name!==''){
-                context.variables[this.props.verName.name]=today.toISOString();
-            }
-
-            return result;
-
-        } catch (error) {
-            event.error = error;
-            console.error(error);
-            result.canNext = false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name] = this;
-    }
-
-}
-new DatetimeGetterAction();

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

@@ -2,9 +2,7 @@
 import { actionAddins } from ".";
 import { IAction, IActionProperty, IActionNode, IContext, IActionResult } from "../types/ActionTypes";
 import { ConditionTree } from '../types/Conditions';
-/**
+
- * アクションの属性定義
- */
 interface IErrorShowProps {
     message: string;
     condition: string;
@@ -12,16 +10,16 @@ interface IErrorShowProps {
 
 export class ErrorShowAction implements IAction {
     name: string;
-    actionProps: IActionProperty[]; //调用从import导入关于显示类的定义
+    actionProps: IActionProperty[];
-    props: IErrorShowProps;//从上方的interface 定义这个props所需要接受的属性
+    props: IErrorShowProps;
-    constructor() { //解构函数定义需要的类名
+    constructor() {
         this.name = "エラー表示";
         this.actionProps = [];
         this.props = {
             message: '',
             condition: ''
         }
-        this.register(); //重置以上注册表
+        this.register();
     }
 
     /**
@@ -30,20 +28,20 @@ export class ErrorShowAction implements IAction {
      * @param event 
      * @returns 
      */
-    async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> { //异步处理某函数下的：xx属性
+    async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> {
         let result = {
             canNext: true,
             result: false
         };
-        try { //尝试执行以下代码部分
+        try {
             this.actionProps = actionNode.actionProps;
-            if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) { //如果message以及condition两者都不存在的情况下return
+            if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) {
                 return result
             }
             this.props = actionNode.ActionValue as IErrorShowProps;
             const conditionResult = this.getConditionResult(context);
             if (conditionResult) {
-                event.error = this.props.message;
+                event.error = this.props.message
             } else {
                 result = {
                     canNext: false,

plugin/kintone-addins/src/actions/field-shown.ts

@@ -103,5 +103,6 @@ export class FieldShownAction implements IAction{
     register(): void {
         actionAddins[this.name]=this;
     }
+    
 }
 new FieldShownAction();

plugin/kintone-addins/src/actions/insert-value.ts

@@ -1,507 +0,0 @@
-
-
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
-import { ConditionTree } from '../types/Conditions';
-
-
-
-/**
- * アクションの属性定義
- */
-interface IInsertValueProps{
-    field:IField;
-    condition:string;
-    value:string;
-    show:string;
-}
-/**
- *
- */
-export class InsertValueAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IInsertValueProps;
-    constructor(){
-        this.name="値を挿入する";// DBに登録したアクション名
-        this.actionProps=[];
-        //プロパティ属性の初期化
-        this.props={
-            field:{code:''},
-            condition:'',
-            value:'',
-            show:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-
-    /**
-     * 空白文字を空白文字が非対応のフィールドに挿入しようとしていないか、必須項目フィールドに挿入しようとしていないかチェックする
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputBlank(fieldType :string | undefined,inputValue :string,fieldCode :string,fieldRequired :boolean | undefined,event :any): boolean{
-        //正規表現チェック
-        let blankCheck= inputValue.match(/^(\s|　)+?$/);//半角スペース・タブ文字・改行・改ページ・全角スペース
-
-        if(blankCheck !== null){
-            //空白文字を空白文字が非対応のフィールドに挿入しようとしている場合、例外を発生させる
-            if(fieldType === "NUMBER" || fieldType === "DATE" || fieldType === "DATETIME" || fieldType === "TIME" || fieldType === "USER_SELECT"
-                        || fieldType === "ORGANIZATION_SELECT" || fieldType === "GROUP_SELECT" || fieldType === "RADIO_BUTTON" || fieldType === "DROP_DOWN" || fieldType === "CHECK_BOX" || fieldType === "MULTI_SELECT"){
-                event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドには、空白文字は挿入できません。"; //レコードにエラーを表示
-                throw new Error("「"+fieldCode+"」"+"フィールドには、空白文字は挿入できません。「値を挿入する」コンポーネントの処理を中断しました。");
-
-            //空白文字を必須項目フィールドに挿入しようとしている場合、例外を発生させる
-            }else if(fieldRequired){
-                event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドは必須項目のため、空白文字は挿入できません。"; //レコードにエラーを表示
-                throw new Error("「"+fieldCode+"」"+"フィールドは必須項目のため、空白文字は挿入できません。「値を挿入する」コンポーネントの処理を中断しました。");
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * 入力値が半角数字かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な数値の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputNumber(inputValue :string,fieldCode :string,event :any): boolean{
-        let inputNumberValue = Number(inputValue);//数値型に変換
-
-        //有限数かどうか判定s
-        if(!isFinite(inputNumberValue)){
-            event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
-            throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、有効な数値ではありません。「値を挿入する」コンポーネントの処理を中断しました。");
-        }
-        return true;
-    }
-
-    /** 入力値が有効な日付形式かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputDate(inputValue :string,fieldCode :string,event :any): boolean{
-        //正規表現チェック
-        let twoDigitMonthDay = inputValue.match(/(\d{4})-(\d{2})-(\d{2})$/);//4桁の数字-2桁の数字-2桁の数字
-        let singleDigitMonthDay = inputValue.match(/(\d{4})-(\d{1})-(\d{1})$/);//4桁の数字-1桁の数字-2桁の数字
-        let singleDigitMonth = inputValue.match(/(\d{4})-(\d{1})-(\d{2})$/);//4桁の数字-1桁の数字-2桁の数字
-        let singleDigitDay = inputValue.match(/(\d{4})-(\d{2})-(\d{1})$/);//4桁の数字-2桁の数字-1桁の数字
-        let dateTime = inputValue.match(/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}).000Z/);//時刻入りのUTCの日付形式
-        let date;
-        //date型に変換
-        date = new Date(inputValue);
-
-        //date型変換できたか確認
-        if(date !== undefined && !isNaN(date.getDate())){
-            //正規表現チェック確認
-            if(twoDigitMonthDay === null && singleDigitMonth === null && singleDigitDay === null && singleDigitMonthDay === null && dateTime === null){
-                    event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
-                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。「値を挿入する」コンポーネントの処理を中断しました。");
-            }
-        }
-        return true;
-    }
-
-    /** 入力値が有効な時刻形式かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な日付形式の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputTime(inputValue :string,fieldCode :string,event :any): boolean{
-        //正規表現チェック
-        let timeFormat =inputValue.match(/^([0-9]|1[0-9]|2[0-3]):[0-5][0-9]$/);
-
-            //正規表現チェック確認
-            if(timeFormat === null){
-                    event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な時刻形式です。"; //レコードにエラーを表示
-                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な時刻形式です。「値を挿入する」コンポーネントの処理を中断しました。");
-            }
-        return true;
-    }
-
-    /**
-     * 入力値のフィールドタイプがDATETIMEであれば、時刻ありの日付形式変換し、DATEであれば時刻なしの日付形式変換する関数
-     * @param {string} inputValue -挿入する値
-     * @param {string} fieldType  -フィールドタイプ
-     * @return {string} -入力値が日付形式に変換できた場合は文字列を返し、そうでない場合は例外を発生させる
-     */
-    changeDateFormat(inputValue :string, fieldType :string,fieldCode :string,event :any): string{
-        let dateTime;
-        let date;
-
-        //挿入する値をdate型に変換
-        date = new Date(inputValue);
-        //date型変換できたか確認
-        if(date !== undefined && !isNaN(date.getDate())){
-
-            //日時フィールドの場合、時刻ありの日付形式変換
-            if(fieldType === "DATETIME"){
-                dateTime =date.toISOString();
-                return dateTime;
-            }
-
-            //日付フィールドの場合、時刻なしの日付形式変換
-            let dateArray=inputValue.match(/(\d{4})-(\d{1,2})-(\d{1,2})$/);//4桁の数字-1～2桁の数字-1～2桁の数字
-            if(dateArray !== null){
-                let yearIndex = 1;
-                let monthIndex = 2;
-                let dayIndex = 3;
-                let dateFormatted=`${dateArray[yearIndex]}-${dateArray[monthIndex]}-${dateArray[dayIndex]}`
-                return dateFormatted;
-            }
-
-        }
-
-        event.record[fieldCode]['error'] = "「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。"; //レコードにエラーを表示
-        throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした値は、無効な日付形式です。「値を挿入する」コンポーネントの処理を中断しました。");
-    }
-
-    /**
-     * 入力値がフィールドタイプ(ラジオボタン・ドロップダウン・複数選択・ドロップダウン)の選択肢に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {boolean} -入力値が有効な値の場合はtrueを返し、そうでない場合は例外を発生させる
-     */
-    checkInputOption(inputValue :string,fieldOptions :string | undefined,fieldCode :string,event :any): boolean {
-
-        //入力値が選択肢に存在する値かチェックし、存在したらtrueを返す
-        if(fieldOptions !== undefined){
-            let options = Object.keys(fieldOptions);
-            for(var optionsIndex in options){
-                if(options[optionsIndex] === inputValue){
-                    return true;
-                }
-            }
-        }
-
-        event.record[fieldCode]['error']="「"+fieldCode+"」"+"には、存在しない値を挿入しようとしたため、処理を中断しました。";
-        throw new Error("「"+fieldCode+"」"+"には、存在しない値を挿入しようとしたため、処理を中断しました。「値を挿入する」コンポーネントの処理を中断しました。");
-    }
-
-    /**
-     * 入力値がフィールドタイプ(ユーザー選択)で、ユーザー情報に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {string | boolean} 入力値が登録されているユーザー情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
-     */
-    async setInputUser(inputValue :string): Promise<string | boolean>{
-
-        //ユーザー名を格納する変数
-        let usersName;
-        const usersInfoColumnIndex=0;
-
-        try{
-            //APIでユーザー情報を取得する
-            const resp =await kintone.api(kintone.api.url('/v1/users', true), 'GET', {codes:[inputValue ]})
-
-            //入力されたログイン名(メールアドレス)がユーザー情報に登録されている場合、そのユーザー名を取得する
-            if (resp.users[usersInfoColumnIndex].code === inputValue) {
-                usersName=resp.users[usersInfoColumnIndex].name;
-            }
-
-            //ユーザー名が取得できた場合、ログイン名とユーザー名をフィールドにセットする
-            if(usersName === undefined){
-                throw new Error();
-            }
-        }catch{
-            return false;
-        }
-
-        return usersName;
-    }
-
-    /**
-     * 入力値がフィールドタイプ(組織選択)で、組織情報に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {string | boolean} 入力値が登録されている組織情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
-     */
-    async setInputOrganization(inputValue :string): Promise<string | boolean>{
-
-        //組織名を格納する変数
-        let organizationName;
-        const organizationsInfoColumnIndex=0;
-
-        try{
-            //APIで組織情報を取得する
-            const resp =await kintone.api(kintone.api.url('/v1/organizations.json', true), 'GET', {codes:[inputValue ]})
-
-            //入力された組織コードが組織情報に登録されている場合、その組織名を取得する
-                if (resp.organizations[organizationsInfoColumnIndex].code === inputValue) {
-                    organizationName=resp.organizations[organizationsInfoColumnIndex].name;
-                }
-
-            //組織名が取得できた場合、組織コードと組織名をフィールドにセットする
-            if(organizationName === undefined){
-                throw new Error();
-            }
-        }catch{
-            return false;
-        }
-
-        return organizationName;
-    }
-
-    /**
-     * 入力値がフィールドタイプ(グループ選択)で、グループ情報に存在する値かチェックする関数
-     * @param {string} inputValue - 挿入する値
-     * @return {string | boolean} 入力値が登録されているグループ情報から見つかった場合、trueを返し、見つからなかった場合、falseを返す
-     */
-    async setInputGroup(inputValue :string): Promise<string | boolean>{
-
-        //グループ名を格納する変数
-        let groupsName;
-        const groupsInfoColumnIndex=0;
-
-        try{
-            //APIでグループ情報を取得する
-            const resp =await kintone.api(kintone.api.url('/v1/groups.json', true), 'GET', {codes:[inputValue ]})
-
-            //入力されたグループコードがグループ情報に登録されている場合、そのグループ名を取得する
-            if (resp.groups[groupsInfoColumnIndex].code === inputValue) {
-                groupsName=resp.groups[groupsInfoColumnIndex].name;
-            }
-
-            //グループ名が取得できた場合、グループコードとグループ名をフィールドにセットする
-            if(groupsName === undefined){
-                throw new Error();
-            }
-        }catch{
-            return false;
-        }
-
-        return groupsName;
-    }
-
-
-
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode
-     * @param event
-     * @returns
-     */
-    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
-
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps = actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) && !('value' in actionNode.ActionValue)) {
-                return result
-            }
-
-            const fieldColumnIndex=1;
-            const valueColumnIndex=3;
-
-            //プロパティで選択されたフィールド
-            const field=this.actionProps[fieldColumnIndex].props.modelValue.type;
-            //プロパティの挿入する値
-            const value=this.actionProps[valueColumnIndex].props.modelValue;
-
-            //条件式の結果を取得
-            const conditionResult = this.getConditionResult(context);
-            if(!conditionResult){
-                return result;
-            }
-
-            //プロパティの値を挿入するフィールドが未選択の場合、例外を発生させる
-            if(field === null){
-                throw new Error("「値を挿入する」コンポーネントで、値を挿入するフィールドが指定されていなかったため、処理が中断されました。");
-            }
-
-            //プロパティの値を挿入するフィールドが非対応フィールドの場合、例外を発生させる
-            //添付ファイル・テーブル・カテゴリー・ステータス・作成者・更新者・作業者・リビジョン番号・レコード番号・レコードID・計算・作成日時・更新日時フィールドが選択されている場合、例外を発生させる
-            if(field === "FILE" || field === "SUBTABLE" || field === "CATEGORY" || field === "STATUS"
-                    || field === "STATUS_ASSIGNEE" || field === "CREATOR" || field === "MODIFIER" || field === "__REVISION__"
-                        || field === "RECORD_NUMBER"|| field === "__ID__" || field ==="CALC" || field === "CREATED_TIME" || field === "UPDATED_TIME" ){
-                throw new Error("「値を挿入する」コンポーネントで、選択されたフィールドは、値を挿入するコンポーネントでは非対応のフィールドのため、処理を中断しました。");
-            }
-
-            //プロパティの挿入する値が未入力の場合、例外を発生させる
-            if(value === ""){
-                throw new Error("「値を挿入する」コンポーネントで、フィールドに挿入する値が指定されていなかったため、処理が中断されました。");
-            }
-
-            //既定のプロパティのインターフェースへ変換する
-            this.props = actionNode.ActionValue as IInsertValueProps;
-
-            //挿入する値を取得
-            let fieldValue = this.props.value;
-            //フィールドの種類を取得
-            const fieldType = this.props.field.type;
-            //フィールドが必須項目なのか取得
-            const fieldRequired=this.props.field.required;
-            //挿入するフィールドのコードを取得
-            const fieldCode=this.props.field.code;
-            //挿入する値の形式（手入力か変数）を取得
-            const insertValueType=this.props.show;
-            //ラジオボタン・チェックボックス・複数選択・ドロップダウンの選択肢を取得
-            let fieldOptions =this.props.field.options;
-            //変数の値を格納する
-            let variableValue;
-
-            //変数の場合、値が取得できるかチェック
-            if(insertValueType === "変数" && conditionResult){
-                variableValue = context.variables[fieldValue];
-
-                if(variableValue === undefined){
-                    throw new Error("「"+fieldCode+"」"+"フィールドに入れようとした変数は、無効な入力形式です。");
-                }
-                fieldValue = variableValue;
-            }
-
-            //入力値チェック後、形式変換、型変換した値を格納する変数
-            let correctFormattedValue;
-            //入力値チェック後、形式変換、型変換した値を格納する配列
-            let correctValues :string[] = [];
-            //入力エラー（空白文字の混入）がないことをチェック
-            let notInputError=this.checkInputBlank(fieldType,fieldValue,fieldCode,fieldRequired,event);
-
-            //条件式の結果がtrue、入力エラー（空白文字の混入）がない場合、挿入する値をフィールドタイプ別にチェックする
-            if(conditionResult && notInputError){
-
-                //文字列型のフィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
-                if(fieldType === "SINGLE_LINE_TEXT" || fieldType === "MULTI_LINE_TEXT" || fieldType === "RICH_TEXT" || fieldType === "LINK" ){
-                    correctFormattedValue = fieldValue;
-
-                //数値型のフィールドに挿入しようとしている値が適切の場合、数値型に型変換してcorrectFormattedValueに代入する
-                }else if(fieldType === "NUMBER" ){
-                    if(this.checkInputNumber(fieldValue,fieldCode,event)){//入力値チェック
-                        correctFormattedValue = Number(fieldValue);//型変換
-                    }
-
-                //日付・日時型のフィールドに挿入しようとしている値が適切の場合、指定の日付・日時に形式変換してcorrectFormattedValueに代入する
-                }else if(fieldType === "DATE" || fieldType === "DATETIME" ){
-                    if(this.checkInputDate(fieldValue,fieldCode,event)){//入力値チェック
-                        let formattedDate = this.changeDateFormat(fieldValue,fieldType,fieldCode,event)
-                        if(formattedDate){
-                            correctFormattedValue = formattedDate
-                        }
-                    }
-
-                //時刻フィールドに挿入しようとしている値が適切の場合、correctFormattedValueに代入する
-                }else if(fieldType === "TIME"){
-                    if(this.checkInputTime(fieldValue,fieldCode,event)){//入力値チェック
-                        correctFormattedValue = fieldValue;
-                    }
-
-                //ラジオボタン・ドロップダウンのフィールドの選択肢と入力値が一致した場合、correctFormattedValueに代入する
-                }else if(fieldType === "RADIO_BUTTON" || fieldType === "DROP_DOWN"){
-                    if(this.checkInputOption(fieldValue,fieldOptions,fieldCode,event)){//入力値チェック
-                        correctFormattedValue = fieldValue;
-                    }
-
-                //チェックボックス・複数選択のフィールドの選択肢と入力値が一致した場合、correctValuesの配列に代入する
-                }else if(fieldType === "CHECK_BOX" || fieldType === "MULTI_SELECT" ){
-                    if(this.checkInputOption(fieldValue,fieldOptions,fieldCode,event)){//入力値チェック
-                        correctValues[0] = fieldValue;
-                    }
-
-                //ユーザー情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
-                }else if(fieldType === "USER_SELECT"){
-                    //挿入する値がユーザー情報から見つかれば、ユーザー名を格納
-                    let users=await this.setInputUser(fieldValue);
-
-                    //ユーザー名が格納できている場合、ログイン名とユーザー名をcorrectFormattedValueに代入する
-                    if(!users){
-                        event.record[fieldCode]['error']="ユーザー選択に、挿入しようとしたユーザー情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
-                        throw new Error("ユーザー選択に、挿入しようとしたユーザー情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
-                    }else{
-                        correctFormattedValue=[{ code: fieldValue, name: users }];
-                    }
-
-                //組織情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
-                }else if(fieldType === "ORGANIZATION_SELECT"){
-                    //挿入する値が組織情報から見つかれば、組織名を格納
-                    let organizations=await this.setInputOrganization(fieldValue);
-
-                    //組織名が格納できている場合、組織コードと組織名をcorrectFormattedValueに代入する
-                    if(!organizations){
-                        event.record[fieldCode]['error']="組織選択フィールドに、挿入しようとした組織情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
-                        throw new Error("組織選択フィールドに、挿入しようとした組織情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
-                    }else{
-                        correctFormattedValue=[{ code: fieldValue, name: organizations}];
-                    }
-
-                //グループ情報フィードに挿入しようとした値が適切な場合、correctFormattedValueに代入する
-                }else if(fieldType === "GROUP_SELECT"){
-                    //挿入する値がグループ情報から見つかれば、グループ名を格納
-                    let groups=await this.setInputGroup(fieldValue);
-
-                    //グループ名が格納できている場合、グループコードとグループ名をcorrectFormattedValueに代入する
-                    if(!groups){
-                        event.record[fieldCode]['error']="グループ選択フィールドに、挿入しようとしたグループ情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。";
-                        throw new Error("グループ選択フィールドに、挿入しようとしたグループ情報は見つかりませんでした。「値を挿入する」コンポーネントの処理を中断しました。");
-                    }else{
-                        correctFormattedValue=[{ code: fieldValue, name: groups}];
-                    }
-                }
-            }
-
-            //条件式の結果がtrueかつ挿入する値が変換できた場合、フィールド（ラジオボタン・ドロップダウン・チェックボックス・複数選択・文字列一行・文字列複数行・リッチエディタ・数値・日付・日時・時刻）にセット
-            if(conditionResult && (correctFormattedValue || correctValues)){
-                //条件式の結果がtureかつ、値を正しい形式に変換できた場合、フィールドに値をセットする
-                if(correctFormattedValue){
-                    event.record[fieldCode].value = correctFormattedValue;
-                //条件式の結果がtureかつ、値を正しい形式（配列）に変換できた場合、フィールドに値（配列）をセットする
-                }else if(correctValues.length > 0){
-                    event.record[fieldCode].value = correctValues;
-                }
-            }
-
-            result= {
-                canNext:true,
-                result:true
-            }
-            return result;
-        }catch(error:any){
-            event.record;
-            event.error=error.message;
-            console.error(error);
-            result.canNext=true;//次のノードは処理を続ける
-            return result;
-        }
-
-    }
-
-    /**
-     *
-     * @param context 条件式を実行する
-     * @returns
-     */
-    getConditionResult(context:any):boolean{
-        //プロパティ`condition`から条件ツリーを取得する
-        const tree =this.getCondition(this.props.condition);
-        if(!tree){
-            //条件を設定されていません
-            return true;
-        }
-        return tree.evaluate(tree.root,context);
-    }
-
-    /**
-     * @param condition 条件式ツリーを取得する
-     * @returns
-     */
-    getCondition(condition:string):ConditionTree|null{
-        try{
-            const tree = new ConditionTree();
-            tree.fromJson(condition);
-            if(tree.getConditions(tree.root).length>0){
-                return tree;
-            }else{
-                return null;
-            }
-        }catch(error){
-            return null;
-        }
-    }
-
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-
-}
-new InsertValueAction();

plugin/kintone-addins/src/actions/login-user-getter.ts

@@ -1,76 +0,0 @@
-import { actionAddins } from ".";
-import { IField,IAction,IActionResult, IActionNode, IActionProperty,IContext,IVarName} from "../types/ActionTypes";
-//右UI画面propertyのname:型：
-interface ILoginUserGetterProps{
-    //変数名にセット：値がオブジェクトの形式
-    verName:IVarName;
-}
-//IActionインタフェースを実装する新しいクラスActionを作成：
-export class LoginUserGetterAction implements IAction{
-    name: string;
-    //importから導入顕示定義
-    actionProps: IActionProperty[];
-    //上方のinterface Propsから、props受ける属性を定義：
-    props:ILoginUserGetterProps;
-    //関数定義に必要な類名を構築：
-    constructor(){
-        //pgAdminDBに登録したアクション名(name/subtitle)一致する必要がある：
-        this.name="ログインユーザー取得";
-        this.actionProps=[];
-        this.register();
-        //プロパティ属性初期化：
-        this.props={
-            verName:{name:''}
-        }
-        //リセット上記登録表：
-        this.register();
-    }
-/**
- * アクションの処理を実装する
- * @param actionNode アクションノード
- * @param event Kintoneのイベント
- * @param context コンテキスト（レコード、変数情報を持っている）
- * @returns 
- */
-　　//非同期処理ある関数下のある属性：
-    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する：
-            this.actionProps=actionNode.actionProps;
-            //プロパティ設定のデータ型は必要な情報含めますか？全部不存在時return:
-            if (!('verName' in actionNode.ActionValue)) {
-                return result
-            }
-            //既定のプロパティのインタフェースへ変換：
-            this.props = actionNode.ActionValue as ILoginUserGetterProps;
-//////////////////////////////////////////////////////////////////////////////////////
-            if(this.props.verName&&this.props.verName.name!==''){
-                context.variables[this.props.verName.name]=kintone.getLoginUser();
-                // window.alert("変数名"+this.props.verName.name+"の値は"+context.variables[this.props.verName.name]+"です");
-                // event.record["変数運用先のユーザ選択フィールド"].value= [{code:context.variables[this.props.verName.name].code}];
-            }
-//////////////////////////////////////////////////////////////////////////////////////
-            result= {
-                canNext:true,
-                result:true
-            }
-            return result;
-//////////////////////////////////////////////////////////////////////////////////////
-        }catch(error:any){;
-            event.error=error.message;
-            return {
-                canNext:false,
-                result:false
-            }
-        }
-    }
-//////////////////////////////////////////////////////////////////////////////////////
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-}
-new LoginUserGetterAction();

plugin/kintone-addins/src/actions/mail-check.ts

@@ -1,80 +0,0 @@
-import { actionAddins } from ".";
-import { IAction, IActionResult, IActionNode, IActionProperty, IField } from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IMailCheckProps {
-    field: IField;//チェックするフィールドの対象
-    message: string;//エラーメッセージ
-    emailCheck:string;
-}
-/**
- * メールアドレスチェックアクション
- */
-export class MailCheckAction implements IAction {
-    name: string;
-    actionProps: IActionProperty[];
-    props: IMailCheckProps;
-    constructor() {
-        this.name = "メールアドレスチェック";
-        this.actionProps = [];
-        this.props = {
-            field: { code: '' },
-            message: '',
-            emailCheck:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode: IActionNode, event: any): Promise<IActionResult> {
-        let result = {
-            canNext: true,
-            result: false
-        };
-
-        try {
-            //属性設定を取得する
-            this.actionProps = actionNode.actionProps;
-
-            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('emailCheck' in actionNode.ActionValue)) {
-                return result
-            }
-            this.props = actionNode.ActionValue as IMailCheckProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-
-            if (this.props.emailCheck === '厳格') {
-                if (!/^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/.test(value)) {
-                    record[this.props.field.code].error = this.props.message;
-                }
-            } else if (this.props.emailCheck === 'ゆるめ') {
-                if (!/^[^@]+@[^@]+$/.test(value)) {
-                    record[this.props.field.code].error = this.props.message;
-                }
-            } else {
-                result = {
-                    canNext: true,
-                    result: true
-                }
-            }
-            return result;
-        } catch (error) {
-            event.error = error;
-            console.error(error);
-            result.canNext = false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name] = this;
-    }
-
-}
-new MailCheckAction();

plugin/kintone-addins/src/actions/regular-check.ts

@@ -1,72 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IRegularCheckProps{
-    field:IField;//チェックするフィールドの対象
-    message:string;//エラーメッセージ
-    regExpression:string;//正規表現式
-}
-/**
- * 正規表現チェックアクション
- */
-export class RegularCheckAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IRegularCheckProps;
-    constructor(){
-        this.name="正規表現チェック";
-        this.actionProps=[];
-        this.props={
-            field:{code:''},
-            message:'',
-            regExpression:''
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) && !('message' in actionNode.ActionValue) && !('regExpression'in actionNode.ActionValue)) {
-                return result
-            }
-            this.props = actionNode.ActionValue as IRegularCheckProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-            const regex = new RegExp(this.props.regExpression);
-            if(!regex.test(value)){
-                record[this.props.field.code].error=this.props.message;
-            }else{
-                result= {
-                    canNext:true,
-                    result:true
-                  }
-            }
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new RegularCheckAction();

plugin/kintone-addins/src/actions/string-join.ts

@@ -1,211 +0,0 @@
-import { actionAddins } from ".";
-import { IField, IAction,IActionResult, IActionNode, IActionProperty } from "../types/ActionTypes";
-import { Formatter } from "../util/format";
-
-//右UI画面propertyのname:型：
-interface IStringJoinProps{
-    //保存先フィールド
-    saveField:IField;
-    //結合元フィールド1
-    joinField1:IField;
-    //結合元フィールド2
-    joinField2:IField;
-    //区切り文字
-    delimiter:string;
-}
-
-//IActionインタフェースを実装する新しいクラスActionを作成：
-export class StringJoinAction implements IAction{
-    name: string;
-    //importから導入顕示定義
-    actionProps: IActionProperty[];
-    //上方のinterface Propsから、props受ける属性を定義：
-    props:IStringJoinProps;
-    //関数定義に必要な類名を構築：
-    constructor(){
-        //pgAdminDBに登録したアクション名(name/subtitle)一致する必要がある：
-        this.name="文字結合";
-        this.actionProps=[];
-        this.register();
-        //プロパティ属性初期化：
-        this.props={
-            saveField:{code:''},
-            joinField1:{code:''},
-            joinField2:{code:''},
-            delimiter:''
-        }
-        //リセット上記登録表：
-        this.register();
-    }
-/**
- * アクションの処理を実装する
- * @param actionNode アクションノード
- * @param event Kintoneのイベント
- * @param context コンテキスト（レコード、変数情報を持っている）
- * @returns 
- */
-    //非同期処理ある関数下のある属性：
-    async process(actionNode:IActionNode,event:any):Promise<IActionResult> {
-        let result={
-            //後継処理不可：
-            canNext:false,
-            result:false
-        };
-        try{
-            //属性設定を取得する：
-            this.actionProps=actionNode.actionProps;
-            //プロパティ設定のデータ型は必要な情報含めますか？全部不存在時return:
-            if (!('saveField' in actionNode.ActionValue) && !('joinField1' in actionNode.ActionValue) && !('joinField2' in actionNode.ActionValue)) {
-                return result
-            }
-
-            //既定のプロパティのインタフェースへ変換：
-            this.props = actionNode.ActionValue as IStringJoinProps;
-            const record = event.record;
-
-            //kintoneフィールドタイプ取得：
-            const joinField1type=this.props.joinField1.type;
-            const joinField2type=this.props.joinField2.type;
-            const saveFieldtype=this.props.saveField.type;
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-            // //保存先フィールドは文字列フィールドではない場合、エラー発生：
-            if(!(saveFieldtype==='SINGLE_LINE_TEXT'||saveFieldtype==='MULTI_LINE_TEXT'||saveFieldtype==='RICH_TEXT')){
-                event.error='[エラーメッセージ]：結合保存先対応不可。結合しません';
-                if (event.type.includes('success')){
-                    window.alert("[windows alert]："+event.error);
-                }
-                result = {
-                    canNext: false,
-                    result: false
-                }
-                return result;
-            }
-//////////////////////////////////////////////////////////////////////////////////////////
-    //値取得方法定義：
-    function getValue(value:string,type:string|undefined,fieldCode:string,event:any){
-        if(event.record[fieldCode]?.value===undefined||event.record[fieldCode]?.value===null){
-            event.record[fieldCode].value='';
-        }
-        //作成者、更新者：
-        if(type==='CREATOR'||type==='MODIFIER'){
-            value = event.record[fieldCode]?.value.name;
-        //日時、作成日時、更新日時：
-        }else if(type==='DATETIME'||type==='CREATED_TIME'||type==='UPDATED_TIME'){
-            if(event.record[fieldCode]?.value!==undefined && event.record[fieldCode]?.value!==''){
-                value = Formatter.dateFormat(new Date(event.record[fieldCode]?.value),'yyyy-MM-dd HH:mm');
-                }else{
-                    value=event.record[fieldCode]?.value;
-                }
-        //ユーザ選択、組織選択、グループ選択、添付ファイル名、作業者、カテゴリー：
-        }else if(type==='USER_SELECT'||type==='ORGANIZATION_SELECT'||type==='GROUP_SELECT'||type==='FILE'||type==='STATUS_ASSIGNEE'){
-            if(event.record[fieldCode]?.value===undefined || event.record[fieldCode]?.value===''){
-                value = event.record[fieldCode]?.value;
-            }else{
-                const mototext=event.record[fieldCode]?.value;
-                let arr=[];
-                for(let i=0;i<mototext.length;i++){
-                    arr.push(mototext[i].name);
-                }
-                //配列要素を,で連結して文字列を作成：
-                value=arr.join();
-            }
-        //カテゴリー、チェックボックス、複数選択：
-        }else if(type==='CATEGORY'||type==='CHECK_BOX'||type==='MULTI_SELECT'){
-            if(event.record[fieldCode]?.value===undefined || event.record[fieldCode]?.value===''){
-                value = event.record[fieldCode]?.value;
-            }else{
-                const mototext=event.record[fieldCode]?.value;
-                let arr=[];
-                for(let i=0;i<mototext.length;i++){
-                    arr.push(mototext[i]);
-                }
-                //配列要素を,で連結して文字列を作成：
-                value=arr.join();
-            }
-        //詳細画面プロセス実行後のステータス：
-        }else if(type==='STATUS'&&event.type.includes('process')){
-            value = event.nextStatus.value;
-        }else{
-            value = event.record[fieldCode]?.value;
-        }
-        if (value===undefined || value===null){
-            value='';
-        }        
-        return value;     
-    }
-//////////////////////////////////////////////////////////////////////
-            //値取得方法呼出：
-            let joinValue1:string='';
-            joinValue1=getValue(joinValue1,joinField1type,this.props.joinField1.code,event);
-/////////////////////////////////////////////////////////////////////////////////////
-            let joinValue2:string='';
-            joinValue2=getValue(joinValue2,joinField2type,this.props.joinField2.code,event);
-//////////////////////////////////////////////////////////////////////////////////////////////////////////
-            const conString = this.props.delimiter;
-            let saveValue:string='';
-            //前後結合元が空白なら区切り文字も空白にする(例:1-8の8無いなら1。1-8の1無いなら8。1空白8の8無いなら1。結合元全部空白なら全部空白):
-            if(joinValue1===''&&joinValue2===''){
-                saveValue='';
-            }else if(joinValue1===''&&joinValue2!==''){
-                saveValue=joinValue2;
-            }else if(joinValue2===''&&joinValue1!==''){
-                saveValue=joinValue1;
-            }else if(joinValue1!==''&&joinValue2!==''){
-                saveValue=`${joinValue1}${conString}${joinValue2}`
-            }
-////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            //新規/更新/一覧保存成功後の以外のeventでPUT使用しない：
-            if (!event.type.includes('success')){
-                 //保存先フィールドに値セット：
-                 record[this.props.saveField.code].value=saveValue;
-                 window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。");
-            }else{
-                const params={
-                    "app":event.appId,
-                    "id":event.recordId,
-                    "record":{[this.props.saveField.code]:{"value":saveValue}}
-                };
-                return await kintone.api(kintone.api.url('/k/v1/record',true),'PUT',params).then((resp) => {
-                    //kintone保存先フィールド存在確認：
-                    record[this.props.saveField.code].value=saveValue;
-                    if (event.type.includes('index')){
-                        window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。一覧画面更新成功後自動リロードしません。必要に応じて手動リロードください。");
-                    }else{
-                        window.alert("文字結合行いました。"+this.props.joinField1.name+":"+joinValue1+","+this.props.joinField2.name+":"+joinValue2+"。");
-                    }
-                        //一覧画面更新成功後リロード：
-                    // if (event.type.includes('index')){
-                    //     event.url = location.href.endsWith('/') || location.href.endsWith('&') ?
-                    //     location.href.slice(0, -1) :
-                    //     location.href + (location.href.includes('?') ? '&' : '/');
-                    // }
-                }).catch((error) => {
-                    event.error = 'エラーが発生しました。結合しません。システム管理者へお問合せください';
-                    window.alert(event.error+"error message："+error);
-                    return event;
-                });
-            }
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-            result= {
-                canNext:true,
-                result:true
-            }
-            return result;
-        }catch(error){;
-            if (event.type.includes('success')){
-                window.alert("[windows alert]：処理中異常が発生しました。結合しません。システム担当者へお問合せください。errorメッセージ："+error)
-            }
-            event.error="[エラーメッセージ]：処理中異常が発生しました。結合しません。システム担当者へお問合せください。errorメッセージ："+error;
-            return {
-                canNext:false,
-                result:false
-            }
-        }
-    }
-///////////////////////////////////////////////////////////////////////////////////////////////
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-}
-new StringJoinAction();

plugin/kintone-addins/src/actions/validation-fullwidth.ts

@@ -1,96 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
-
-//クラス名を設計書に揃える
-/**
- * アクションの属性定義
- */
-    interface FullWidthProps{
-        //checkOption:Array<string>,
-        field:IField
-    }
-/**
- * 全角チェックアクション
- */
-export class FullWidthAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:FullWidthProps;
-    constructor(){
-        this.name="全角チェック"; /* pgadminのnameと同様  */
-        this.actionProps=[];
-        this.props={
-            //checkOption:[],
-            field:{code:''}
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode
-     * @param event
-     * @returns
-     */
-    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) ) {
-                return result
-            }
-            this.props = actionNode.ActionValue as FullWidthProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code]?.value;
-            //条件分岐
-            //未入力時は何も処理をせず終了
-            if(value===undefined || value===''){
-                return result;
-            }
-            //半角が含まれていた場合resultがfalse
-            if(!this.containsFullWidthChars(value)){
-                //エラー時に出力される文字設定
-                record[this.props.field.code].error="半角が含まれています";
-                //次の処理を中止する値設定
-                result.canNext=false;
-                return result;
-            }
-            //resultプロパティ指定
-            result= {
-            canNext:true,
-            result:true
-            }
-            return result;
-
-        //例外処理
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    }
-    // 全て全角の文字列の場合はtrue、そうでない場合はfalse
-    containsFullWidthChars(text: string): boolean {
-
-        // 半角英数字カナ記号を除外
-        const checkRegex="^[^\x01-\x7E\uFF61-\uFF9F]+$";
-
-        //正規表現オブジェクト生成
-        const fullWidthRegex = new RegExp(checkRegex);
-
-        //正規表現チェック
-        return fullWidthRegex.test(text);
-    }
-
-    //戻り値を持たないためvoid型
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-}
-new FullWidthAction();

plugin/kintone-addins/src/actions/validation-halfwidth.ts

@@ -1,90 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext } from "../types/ActionTypes";
-
-/**
- * アクションの属性定義
- */
-    interface HalfWidthProps{
-        field:IField
-    }
-/**
- * 半角チェックアクション
- */
-export class HalfWidthAction implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:HalfWidthProps;
-    constructor(){
-        this.name="半角チェック"; /* pgadminのnameと同様  */
-        this.actionProps=[];
-        this.props={
-            field:{code:''}
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode
-     * @param event
-     * @returns
-     */
-    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) ) {
-                return result
-            }
-            this.props = actionNode.ActionValue as HalfWidthProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code]?.value;
-            //条件分岐
-            //未入力時は何も処理をせず終了
-            if(value===undefined || value===''){
-                return result;
-            }
-            //全角が含まれていた場合保存処理中止(エラー処理)
-            if(!this.containsHalfWidthChars(value)){
-                //エラー時に出力される文字設定
-                record[this.props.field.code].error="全角が含まれています";
-                //次の処理を中止する値設定
-                result.canNext=false;
-                return result;
-            }
-            //半角の場合問題なく実行
-            //resultプロパティ指定
-            result= {
-            canNext:true,
-            result:true
-            }
-            return result;
-        //例外処理
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    }
-    // 全て全角の文字列の場合はtrue、そうでない場合はfalse
-    containsHalfWidthChars(text: string): boolean {
-
-        const checkRegex = "^[\x01-\x7E\uFF61-\uFF9F]+$";
-        //正規表現オブジェクト生成
-        const halfWidthRegex = new RegExp(checkRegex);
-
-        //正規表現チェック
-        return halfWidthRegex.test(text);
-    }
-    //戻り値を持たないためvoid型
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-}
-new HalfWidthAction();

plugin/kintone-addins/src/actions/value-getter.ts

@@ -1,70 +0,0 @@
-import { actionAddins } from ".";
-import {  IAction,IActionResult, IActionNode, IActionProperty, IField, IContext, IVarName} from "../types/ActionTypes";
-/**
- * アクションの属性定義
- */
-interface IGetValueProps{
-    field:IField;//チェックするフィールドの対象
-    verName:IVarName;
-}
-/**
- * 正規表現チェックアクション
- */
-export class GetValueAciton implements IAction{
-    name: string;
-    actionProps: IActionProperty[];
-    props:IGetValueProps;
-    constructor(){
-        this.name="値を取得する";
-        this.actionProps=[];
-        this.props={
-            field:{code:''},
-            verName:{name:''}
-        }
-        //アクションを登録する
-        this.register();
-    }
-    /**
-     * アクションの実行を呼び出す
-     * @param actionNode 
-     * @param event 
-     * @returns 
-     */
-    async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
-        let result={
-            canNext:true,
-            result:false
-        };
-        try{
-            //属性設定を取得する
-            this.actionProps=actionNode.actionProps;
-            if (!('field' in actionNode.ActionValue) && !('verName' in actionNode.ActionValue)) {
-                return result
-            }
-            
-            this.props = actionNode.ActionValue as IGetValueProps;
-            //条件式の計算結果を取得
-            const record = event.record;
-            const value = record[this.props.field.code].value;
-            if(this.props.verName && this.props.verName.name!==''){
-                context.variables[this.props.verName.name] = value;
-            }
-            result = {
-                canNext:true,
-                result:true
-                }
-            
-            return result;
-        }catch(error){
-            event.error=error;
-            console.error(error);
-            result.canNext=false;
-            return result;
-        }
-    };
-    register(): void {
-        actionAddins[this.name]=this;
-    }
-    
-}
-new GetValueAciton();

plugin/kintone-addins/src/index.ts

@@ -1,3 +1,9 @@
+// export const sum = (a: number, b: number) => {
+//   if ('development' === process.env.NODE_ENV) {
+//     console.log('boop');
+//   }
+//   return a + b;
+// };
 import $ from 'jquery';
 import { ActionProcess } from './types/action-process';
 import { ActionFlow } from './types/ActionTypes';
@@ -8,24 +14,8 @@ declare const alcflow : {
 };
 
 $(function (){
-    const getChangeEvents=(events:string[])=>{
-      return events.filter((event)=>event.includes(".change."));
-    }
-    const getClickEvents=(events:string[])=>{
-      return events.filter((event)=>event.includes(".customButtonClick."));
-    }
-    const getKintoneEvents=(events:string[])=>{
-      return events.filter((event)=>{
-        return !event.includes(".customButtonClick.") && !event.includes(".change.")
-      });
-    }
     const events=Object.keys(alcflow);
-    const changeEvents = getChangeEvents(events);
+    kintone.events.on(events,async (event:any)=>{
-    const clickEvents = getClickEvents(events);
-    const kintoneEvents = getKintoneEvents(events);
-    if(kintoneEvents.length>0 ){
-      //通常Kintoneイベントをバンド
-      kintone.events.on(kintoneEvents,async (event:any)=>{
       const flowinfo = alcflow[event.type];
       const flow=ActionFlow.fromJSON(flowinfo.content);
       if(flow!==undefined){
@@ -34,32 +24,4 @@ $(function (){
       }
       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

@@ -89,13 +89,6 @@ export interface IField{
   name?:string;
   code:string;
   type?:string;
-  required?:boolean;
-  options?:string;
-}
-//変数のインターフェース
-export interface IVarName{
-  name:string;
-  fields?:IVarName[];
 }
 
 /**
@@ -164,19 +157,19 @@ export class ActionNode implements IActionNode {
   prevNodeId?: string;
   nextNodeIds: Map<string, string>;
   constructor(
-    {id,name,title,inputPoint,outputPoints,actionProps}:
+    {id,name,title,inputPoint,outputPoint,actionProps}:
     {
       id:string,
       name: string,
       title: string,
       inputPoint: string,
-      outputPoints: Array<string>,
+      outputPoint: Array<string>,
       actionProps: Array<IActionProperty>}
   ) {
     this.id=id;
     this.name = name;
     this.inputPoint = inputPoint;
-    this.outputPoints = outputPoints;
+    this.outputPoints = outputPoint;
     const defProp = ActionProperty.defaultProperty();
     defProp.props.modelValue = title;
     this.actionProps = actionProps;
@@ -264,7 +257,7 @@ export class ActionFlow implements IActionFlow {
     const actionNodes = parsedObject.actionNodes.map((node: any) => {
       const nodeClass = !node.isRoot ? new ActionNode(node)
         : new RootAction(node);
-      nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
+      nodeClass.nextNodeIds = new Map(node.nextNodeIds);
       nodeClass.prevNodeId = node.prevNodeId;
       nodeClass.id = node.id;
       return nodeClass;

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

@@ -324,17 +324,12 @@ export class ConditionTree {
    */
   getObjectValue(object:any,context:IContext){
     if(!object || typeof object!=="object" || !("objectType" in object)){
-        return undefined;
+        return object;
     }
     if(object.objectType==='field'){
-      const fieldValue = context.record[object.code];
+      return context.record[object.code].value;
-      if(fieldValue.type==='NUMBER' && fieldValue.value!==undefined){
+    }else if(object.objectType==='var'){
-        return Number(fieldValue.value);
+      return context.variables[object.varName].value;
-      }else{
-        return fieldValue.value;
-      }      
-    }else if(object.objectType==='variable'){
-      return context.variables[object.name].value;
     }
   }
 
@@ -402,12 +397,6 @@ export class ConditionTree {
    */
   compare(operator: Operator, targetValue: any, value: any): boolean {
     // targetValue は日期时，value も日期に変換して比較する
-    if(targetValue===undefined || targetValue===null||targetValue===''){
-      if(value===undefined || value===null||value===''){
-        targetValue='';
-        value='';
-      }
-    }
     if (targetValue instanceof Date) {
       const dateValue = new Date(value);
       if (!isNaN(dateValue.getTime())) {