Compare commits
22 Commits
mvp_step2_
...
daitian
| Author | SHA1 | Date | |
|---|---|---|---|
| 99d3a01991 | |||
| ecb90e7120 | |||
| 5349c46225 | |||
| 3be4402239 | |||
| 4c482ea289 | |||
| 44a73478a7 | |||
| bceac2f172 | |||
| 98842db343 | |||
| 03904a4e35 | |||
| 09b3c8df47 | |||
| 26761f6d39 | |||
| 72608a8ffd | |||
| d1ec123c8b | |||
| 4102ff5522 | |||
| 08e857884b | |||
| c0db2d230b | |||
| 2b9b772b39 | |||
| c46e8a7047 | |||
| 6e6350d6ce | |||
|
|
a614d754f4 | ||
| 46a6ba534e | |||
| 8fecde4c42 |
1
backend/.gitignore
vendored
1
backend/.gitignore
vendored
@@ -56,6 +56,7 @@ coverage.xml
|
||||
|
||||
# Django stuff:
|
||||
*.log
|
||||
*.log.*
|
||||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -13,6 +13,7 @@ API_V1_AUTH_KEY = "X-Cybozu-Authorization"
|
||||
DEPLOY_MODE = "DEV" #DEV,PROD
|
||||
|
||||
DEPLOY_JS_URL = "https://ka-addin.azurewebsites.net/alc_runtime.js"
|
||||
#DEPLOY_JS_URL = "https://e84c-133-139-70-142.ngrok-free.app/alc_runtime.js"
|
||||
|
||||
KINTONE_FIELD_TYPE=["GROUP","GROUP_SELECT","CHECK_BOX","SUBTABLE","DROP_DOWN","USER_SELECT","RADIO_BUTTON","RICH_TEXT","LINK","REFERENCE_TABLE","CALC","TIME","NUMBER","ORGANIZATION_SELECT","FILE","DATETIME","DATE","MULTI_SELECT","SINGLE_LINE_TEXT","MULTI_LINE_TEXT"]
|
||||
|
||||
|
||||
@@ -279,7 +279,8 @@ def get_events(db: Session):
|
||||
return events
|
||||
|
||||
def get_eventactions(db: Session,eventid: str):
|
||||
eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
|
||||
#eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid == models.Action.id ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
|
||||
eveactions = db.query(models.Action).join(models.EventAction,models.EventAction.actionid != models.Action.id and models.EventAction.eventid == eventid ).join(models.Event,models.Event.id == models.EventAction.eventid).filter(models.Event.eventid == eventid).all()
|
||||
if not eveactions:
|
||||
raise HTTPException(status_code=404, detail="Data not found")
|
||||
return eveactions
|
||||
|
||||
@@ -85,6 +85,7 @@ class Event(Base):
|
||||
eventid= Column(String(100), nullable=False)
|
||||
function = Column(String(500), nullable=False)
|
||||
mobile = Column(Boolean, default=False)
|
||||
eventgroup = Column(Boolean, default=False)
|
||||
|
||||
class EventAction(Base):
|
||||
__tablename__ = "eventaction"
|
||||
|
||||
@@ -137,6 +137,7 @@ class Event(Base):
|
||||
eventid: str
|
||||
function: str
|
||||
mobile: bool
|
||||
eventgroup: bool
|
||||
|
||||
class Config:
|
||||
orm_mode = True
|
||||
|
||||
File diff suppressed because one or more lines are too long
147
document/サイトマップ.drawio
Normal file
147
document/サイトマップ.drawio
Normal file
@@ -0,0 +1,147 @@
|
||||
<mxfile host="app.diagrams.net" modified="2024-02-21T05:42:02.026Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36" etag="T2S5cjvthSOlO5DmGw-C" version="23.1.5" type="device">
|
||||
<diagram id="Z6uZM46JtkVaKDzPjE9h" name="サイトマップ">
|
||||
<mxGraphModel dx="1434" dy="820" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
||||
<root>
|
||||
<mxCell id="0" />
|
||||
<mxCell id="1" parent="0" />
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-14" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-1" target="Gi77RX5G2m4J9-6cMje4-13" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-1" value="テナント登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
|
||||
<mxGeometry x="60" y="50" width="120" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-2" value="Admin Login" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
|
||||
<mxGeometry x="60" y="270" width="120" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-8" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-7" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-9" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-7" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-12" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-5" target="Gi77RX5G2m4J9-6cMje4-11" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-5" value="Home" style="html=1;whiteSpace=wrap;strokeColor=#2D7600;fillColor=#60a917;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#ffffff;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
|
||||
<mxGeometry x="240" y="270" width="120" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-2" target="Gi77RX5G2m4J9-6cMje4-5" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-42" value="" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="Gi77RX5G2m4J9-6cMje4-7" target="Gi77RX5G2m4J9-6cMje4-41" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-7" value="ユーザー登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
|
||||
<mxGeometry x="440" y="220" width="120" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-11" value="ドメイン登録" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.home;" parent="1" vertex="1">
|
||||
<mxGeometry x="440" y="340" width="120" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-13" value="テナント管理者作成" style="html=1;whiteSpace=wrap;strokeColor=none;fillColor=#0079D6;labelPosition=center;verticalLabelPosition=middle;verticalAlign=top;align=center;fontSize=12;outlineConnect=0;spacingTop=-6;fontColor=#FFFFFF;sketch=0;shape=mxgraph.sitemap.login;" parent="1" vertex="1">
|
||||
<mxGeometry x="240" y="50" width="120" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-15" value="ライセンス情報" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
|
||||
<mxGeometry x="480" y="10" width="90" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-16" value="Adminユーザー" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1">
|
||||
<mxGeometry x="480" y="90" width="90" height="70" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-13" target="Gi77RX5G2m4J9-6cMje4-15" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;entryPerimeter=0;" parent="1" source="Gi77RX5G2m4J9-6cMje4-13" target="Gi77RX5G2m4J9-6cMje4-16" edge="1">
|
||||
<mxGeometry relative="1" as="geometry" />
|
||||
</mxCell>
|
||||
<mxCell id="Gi77RX5G2m4J9-6cMje4-19" value="テナントDB<br>作成" 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>
|
||||
BIN
document/収支明細管理設計書.xlsx
Normal file
BIN
document/収支明細管理設計書.xlsx
Normal file
Binary file not shown.
BIN
document/日報設計書new.xlsx
Normal file
BIN
document/日報設計書new.xlsx
Normal file
Binary file not shown.
@@ -36,7 +36,8 @@ module.exports = configure(function (/* ctx */) {
|
||||
// --> boot files are part of "main.js"
|
||||
// https://v2.quasar.dev/quasar-cli-vite/boot-files
|
||||
boot: [
|
||||
'axios'
|
||||
'axios',
|
||||
'error-handler'
|
||||
],
|
||||
|
||||
// https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
|
||||
|
||||
@@ -20,22 +20,20 @@ const token=localStorage.getItem('token')||'';
|
||||
if(token!==''){
|
||||
api.defaults.headers["Authorization"]='Bearer ' + token;
|
||||
}
|
||||
//axios例外キャプチャー
|
||||
api.interceptors.response.use(
|
||||
(response)=>response,
|
||||
(error)=>{
|
||||
const orgReq=error.config;
|
||||
if(error.response && error.response.status===401){
|
||||
console.error("401エラー");
|
||||
if (error.response && error.response.status === 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 }) => {
|
||||
|
||||
20
frontend/src/boot/error-handler.ts
Normal file
20
frontend/src/boot/error-handler.ts
Normal file
@@ -0,0 +1,20 @@
|
||||
// src/boot/error-handler.ts
|
||||
import { boot } from 'quasar/wrappers';
|
||||
import { Router } from 'vue-router';
|
||||
import { App } from 'vue';
|
||||
|
||||
export default boot(({ app, router }: { app: App<Element>; router: Router }) => {
|
||||
app.config.errorHandler = (err: any, instance: any, info: string) => {
|
||||
if (err.response && err.response.status === 401) {
|
||||
// 認証エラーの場合再ログインする
|
||||
console.error('(; ゚Д゚)/認証エラー(401):', err, info);
|
||||
localStorage.removeItem('token');
|
||||
router.replace({
|
||||
path:"/login",
|
||||
query:{redirect:router.currentRoute.value.fullPath}
|
||||
});
|
||||
} else {
|
||||
console.error('(; ゚Д゚)例外:', err, info);
|
||||
}
|
||||
};
|
||||
});
|
||||
@@ -3,13 +3,15 @@
|
||||
<div v-if="!isLoaded" class="spinner flex flex-center">
|
||||
<q-spinner color="primary" size="3em" />
|
||||
</div>
|
||||
<q-table v-else row-key="name" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
|
||||
<q-table v-else row-key="index" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows"
|
||||
class="action-table"
|
||||
flat bordered
|
||||
virtual-scroll
|
||||
:pagination="pagination"
|
||||
:rows-per-page-options="[0]"
|
||||
/>
|
||||
:filter="filter"
|
||||
>
|
||||
</q-table>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
@@ -20,9 +22,10 @@ export default {
|
||||
name: 'actionSelect',
|
||||
props: {
|
||||
name: String,
|
||||
type: String
|
||||
type: String,
|
||||
filter:String
|
||||
},
|
||||
setup() {
|
||||
setup(props) {
|
||||
const isLoaded=ref(false);
|
||||
const columns = [
|
||||
{ name: 'name', required: true,label: 'アクション名',align: 'left',field: 'name',sortable: true},
|
||||
@@ -32,9 +35,9 @@ export default {
|
||||
const rows = reactive([])
|
||||
onMounted(async () => {
|
||||
const res =await api.get('api/actions');
|
||||
res.data.forEach((item) =>
|
||||
res.data.forEach((item,index) =>
|
||||
{
|
||||
rows.push({name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
|
||||
rows.push({index,name:item.name,desc:item.title,outputPoints:item.outputpoints,property:item.property});
|
||||
});
|
||||
isLoaded.value=true;
|
||||
});
|
||||
@@ -54,5 +57,6 @@ export default {
|
||||
<style lang="scss">
|
||||
.action-table{
|
||||
height: 100%;
|
||||
max-height: 540px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -3,7 +3,19 @@
|
||||
<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" >
|
||||
<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"
|
||||
>
|
||||
<template v-slot:body-cell-description="props">
|
||||
<q-td :props="props">
|
||||
<q-scroll-area class="description-cell">
|
||||
@@ -23,7 +35,8 @@ export default {
|
||||
name: 'AppSelect',
|
||||
props: {
|
||||
name: String,
|
||||
type: String
|
||||
type: String,
|
||||
filter:String
|
||||
},
|
||||
setup() {
|
||||
const columns = [
|
||||
@@ -63,7 +76,10 @@ export default {
|
||||
columns,
|
||||
rows,
|
||||
selected: ref([]),
|
||||
isLoaded
|
||||
isLoaded,
|
||||
pagination:ref({
|
||||
rowsPerPage:10
|
||||
})
|
||||
}
|
||||
},
|
||||
|
||||
@@ -81,4 +97,8 @@ export default {
|
||||
min-height: 300px;
|
||||
min-width: 400px;
|
||||
}
|
||||
.app-table{
|
||||
height: 100%;
|
||||
max-height: 600px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" width="60vw" height="60vh">
|
||||
<show-dialog v-model:visible="showflg" name="条件エディタ" @close="closeDg" min-width="60vw" min-height="60vh">
|
||||
<template v-slot:toolbar>
|
||||
<q-btn flat round dense icon="more_vert" >
|
||||
<q-menu auto-close anchor="bottom start">
|
||||
|
||||
@@ -1,30 +1,41 @@
|
||||
<template>
|
||||
<q-field v-model="selectedField" labelColor="primary" class="condition-object"
|
||||
<q-field v-model="selectedObject" labelColor="primary" class="condition-object"
|
||||
:clearable="isSelected" stack-label :dense="true" :outlined="true" >
|
||||
<template v-slot:control >
|
||||
<q-chip color="primary" text-color="white" v-if="isSelected" :dense="true" class="selected-obj">
|
||||
{{ selectedField.name }}
|
||||
<q-chip color="primary" text-color="white" v-if="isSelected && selectedObject.objectType==='field'" :dense="true" class="selected-obj">
|
||||
{{ selectedObject.name }}
|
||||
</q-chip>
|
||||
<q-chip color="info" text-color="white" v-if="isSelected && selectedObject.objectType==='variable'" :dense="true" class="selected-obj">
|
||||
{{ selectedObject.name }}
|
||||
</q-chip>
|
||||
</template>
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" class="cursor-pointer" @click="showDg"/>
|
||||
</template>
|
||||
</q-field>
|
||||
<show-dialog v-model:visible="show" name="フィールド一覧" @close="closeDg" widht="400px">
|
||||
<condition-objects ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></condition-objects>
|
||||
<show-dialog v-model:visible="show" name="条件設定項目一覧" @close="closeDg" width="600px">
|
||||
<template v-slot:toolbar>
|
||||
<q-input dense debounce="200" v-model="filter" placeholder="検索" clearable>
|
||||
<template v-slot:before>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<condition-objects ref="appDg" name="フィールド" type="single" :filter="filter" :appId="store.appInfo?.appId" :vars="vars"></condition-objects>
|
||||
</show-dialog>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent, ref ,watchEffect,computed} from 'vue';
|
||||
import { defineComponent, reactive, ref ,watchEffect,computed} from 'vue';
|
||||
import ShowDialog from '../ShowDialog.vue';
|
||||
import ConditionObjects from '../ConditionObjects.vue';
|
||||
import { useFlowEditorStore } from '../../stores/flowEditor';
|
||||
import {IActionFlow,IActionNode,IActionVariable} from '../../types/ActionTypes';
|
||||
export default defineComponent({
|
||||
name: 'ConditionObject',
|
||||
components: {
|
||||
ShowDialog,
|
||||
ConditionObjects,
|
||||
ConditionObjects
|
||||
},
|
||||
props: {
|
||||
modelValue: {
|
||||
@@ -35,24 +46,28 @@
|
||||
setup(props, { emit }) {
|
||||
const appDg = ref();
|
||||
const show = ref(false);
|
||||
const selectedField = ref(props.modelValue);
|
||||
const selectedObject = ref(props.modelValue);
|
||||
const store = useFlowEditorStore();
|
||||
const isSelected = computed(()=>{
|
||||
return selectedField.value!==null && typeof selectedField.value === 'object' && ('name' in selectedField.value)
|
||||
return selectedObject.value!==null && typeof selectedObject.value === 'object' && ('name' in selectedObject.value)
|
||||
});
|
||||
|
||||
let vars:IActionVariable[] =[];
|
||||
if(store.currentFlow!==undefined && store.activeNode!==undefined ){
|
||||
vars =store.currentFlow.getVarNames(store.activeNode);
|
||||
}
|
||||
const filter=ref('');
|
||||
const showDg = () => {
|
||||
show.value = true;
|
||||
};
|
||||
|
||||
const closeDg = (val:string) => {
|
||||
if (val == 'OK') {
|
||||
selectedField.value = appDg.value.selected[0];
|
||||
selectedObject.value = appDg.value.selected[0];
|
||||
}
|
||||
};
|
||||
|
||||
watchEffect(() => {
|
||||
emit('update:modelValue', selectedField.value);
|
||||
emit('update:modelValue', selectedObject.value);
|
||||
});
|
||||
|
||||
return {
|
||||
@@ -61,8 +76,10 @@
|
||||
show,
|
||||
showDg,
|
||||
closeDg,
|
||||
selectedField,
|
||||
isSelected
|
||||
selectedObject,
|
||||
vars:reactive(vars),
|
||||
isSelected,
|
||||
filter
|
||||
};
|
||||
}
|
||||
});
|
||||
|
||||
@@ -106,11 +106,7 @@
|
||||
</div>
|
||||
</template>
|
||||
</q-tree>
|
||||
<!-- <q-btn @click="addCondition(tree.root)" class="q-mt-md" color="primary" icon="mdi-plus">Add Condition</q-btn> -->
|
||||
<!-- <q-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>
|
||||
<q-tooltip anchor="center middle" v-model="showingCondition" no-parent-event>
|
||||
import { finished } from 'stream';
|
||||
{{ conditionString }}
|
||||
</q-tooltip>
|
||||
|
||||
@@ -1,53 +1,58 @@
|
||||
<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 row-key="name" :selection="type" v-model:selected="selected" :columns="columns" :rows="rows" />
|
||||
</div>
|
||||
<div class="q-gutter-y-md" style="max-width: 600px;">
|
||||
<q-card >
|
||||
<q-tabs
|
||||
v-model="tab"
|
||||
dense
|
||||
class="text-grey"
|
||||
active-color="white"
|
||||
active-bg-color="primary"
|
||||
indicator-color="primary"
|
||||
align="justify"
|
||||
narrow-indicator
|
||||
>
|
||||
<q-tab name="fields" label="フィールド"></q-tab>
|
||||
<q-tab name="vars" label="変数"></q-tab>
|
||||
</q-tabs>
|
||||
|
||||
<q-separator></q-separator>
|
||||
|
||||
<q-tab-panels v-model="tab" animated>
|
||||
<q-tab-panel name="fields">
|
||||
<field-list v-model="selected" type="single" :filter="filter" :appId="appId"></field-list>
|
||||
</q-tab-panel>
|
||||
|
||||
<q-tab-panel name="vars" >
|
||||
<variable-list v-model="selected" type="single" :vars="vars"></variable-list>
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</q-card>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { ref,onMounted,reactive } from 'vue'
|
||||
import { api } from 'boot/axios';
|
||||
<script lang="ts">
|
||||
import { ref, onMounted, reactive } from 'vue'
|
||||
import FieldList from './FieldList.vue';
|
||||
import VariableList from './VariableList.vue';
|
||||
|
||||
export default {
|
||||
name: 'ConditionObjects',
|
||||
components:{
|
||||
FieldList,
|
||||
VariableList
|
||||
},
|
||||
props: {
|
||||
name: String,
|
||||
type: String,
|
||||
appId:Number
|
||||
appId: Number,
|
||||
vars: Array,
|
||||
filter:String
|
||||
},
|
||||
setup(props) {
|
||||
const isLoaded=ref(false);
|
||||
const columns = [
|
||||
{ name: 'name', required: true,label: 'フィールド名',align: 'left',field: row=>row.name,sortable: true},
|
||||
{ name: 'code', label: 'フィールドコード', align: 'left',field: 'code', sortable: true },
|
||||
{ name: 'type', label: 'フィールドタイプ', align: 'left',field: 'type', sortable: true }
|
||||
]
|
||||
const rows = reactive([])
|
||||
onMounted( async () => {
|
||||
const res = await api.get('api/v1/appfields', {
|
||||
params:{
|
||||
app: props.appId
|
||||
}
|
||||
});
|
||||
let fields = res.data.properties;
|
||||
console.log(fields);
|
||||
Object.keys(fields).forEach((key) =>
|
||||
{
|
||||
const fld=fields[key];
|
||||
// rows.push({name:fields[key].label,code:fields[key].code,type:fields[key].type});
|
||||
rows.push({name:fld.label,objectType:'field',...fld});
|
||||
});
|
||||
isLoaded.value=true;
|
||||
});
|
||||
|
||||
return {
|
||||
columns,
|
||||
rows,
|
||||
selected: ref([]),
|
||||
isLoaded
|
||||
}
|
||||
return {
|
||||
tab: ref('fields'),
|
||||
selected: ref([])
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
|
||||
@@ -75,7 +75,7 @@ import { ref } from 'vue';
|
||||
const headers = ref([{name:"Authorization",value:'Bearer ' + authStore.token}]);
|
||||
const props = withDefaults(defineProps<Props>(), {
|
||||
title:"設計書から導入する(csv or excel)",
|
||||
uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel`
|
||||
uploadUrl: `${process.env.KAB_BACKEND_URL}api/v1/createappfromexcel?format=1`
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
58
frontend/src/components/FieldList.vue
Normal file
58
frontend/src/components/FieldList.vue
Normal file
@@ -0,0 +1,58 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table flat bordered :loading="!isLoaded" row-key="name" :selection="type"
|
||||
:selected="modelValue"
|
||||
@update:selected="$emit('update:modelValue', $event)"
|
||||
:filter="filter"
|
||||
:columns="columns" :rows="rows" />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { ref, onMounted, reactive } from 'vue'
|
||||
import { api } from 'boot/axios';
|
||||
|
||||
export default {
|
||||
name: 'FieldList',
|
||||
props: {
|
||||
name: String,
|
||||
type: String,
|
||||
appId: Number,
|
||||
modelValue:Array,
|
||||
filter:String
|
||||
},
|
||||
emits:[
|
||||
'update:modelValue'
|
||||
],
|
||||
setup(props) {
|
||||
const isLoaded = ref(false);
|
||||
const columns = [
|
||||
{ name: 'name', required: true, label: 'フィールド名', align: 'left', field: row => row.name, sortable: true },
|
||||
{ name: 'code', label: 'フィールドコード', align: 'left', field: 'code', sortable: true },
|
||||
{ name: 'type', label: 'フィールドタイプ', align: 'left', field: 'type', sortable: true }
|
||||
]
|
||||
const rows = reactive([]);
|
||||
onMounted(async () => {
|
||||
const res = await api.get('api/v1/appfields', {
|
||||
params: {
|
||||
app: props.appId
|
||||
}
|
||||
});
|
||||
let fields = res.data.properties;
|
||||
console.log(fields);
|
||||
Object.keys(fields).forEach((key) => {
|
||||
const fld = fields[key];
|
||||
rows.push({ name: fld.label, objectType: 'field', ...fld });
|
||||
});
|
||||
isLoaded.value = true;
|
||||
});
|
||||
|
||||
return {
|
||||
columns,
|
||||
rows,
|
||||
// selected: ref([]),
|
||||
isLoaded
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
</script>
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<!-- <div class="q-pa-md q-gutter-sm" > -->
|
||||
<q-dialog :model-value="visible" persistent bordered>
|
||||
<q-card :style="{minWidth : width}" >
|
||||
<q-card :style="cardStyle" >
|
||||
<q-toolbar class="bg-grey-4">
|
||||
<q-toolbar-title>{{ name }}</q-toolbar-title>
|
||||
<q-space></q-space>
|
||||
@@ -11,7 +11,7 @@
|
||||
<q-card-section>
|
||||
<!-- <div class="text-h6">{{ name }}</div> -->
|
||||
</q-card-section>
|
||||
<q-card-section class="q-pt-none" :style="{...(height? {minHeight:height}:{}) }">
|
||||
<q-card-section class="q-pt-none" :style="sectionStyle">
|
||||
<slot></slot>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right" class="text-primary">
|
||||
@@ -23,14 +23,16 @@
|
||||
<!-- </div> -->
|
||||
</template>
|
||||
<script>
|
||||
|
||||
import {computed} from 'vue'
|
||||
export default {
|
||||
name: 'ShowDialog',
|
||||
props: {
|
||||
name:String,
|
||||
visible: Boolean,
|
||||
width:String,
|
||||
height:String
|
||||
height:String,
|
||||
minWidth:String,
|
||||
minHeight:String
|
||||
},
|
||||
emits: [
|
||||
'close'
|
||||
@@ -41,8 +43,20 @@ export default {
|
||||
context.emit('close', val);
|
||||
}
|
||||
|
||||
const cardStyle = computed(() => ({
|
||||
minWidth: props.minWidth,
|
||||
width: props.width
|
||||
}));
|
||||
|
||||
const sectionStyle = computed(() => ({
|
||||
height: props.height,
|
||||
minHeight: props.minHeight
|
||||
}));
|
||||
|
||||
return {
|
||||
CloseDialogue
|
||||
CloseDialogue,
|
||||
cardStyle,
|
||||
sectionStyle
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
44
frontend/src/components/VariableList.vue
Normal file
44
frontend/src/components/VariableList.vue
Normal file
@@ -0,0 +1,44 @@
|
||||
<template>
|
||||
<div class="q-pa-md">
|
||||
<q-table flat bordered row-key="name" :selection="type"
|
||||
:selected="modelValue"
|
||||
@update:selected="$emit('update:modelValue', $event)"
|
||||
:columns="columns" :rows="rows" />
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
import { ref, reactive, PropType, compile } from 'vue';
|
||||
import {IActionNode,IActionVariable} from '../types/ActionTypes';
|
||||
|
||||
export default {
|
||||
name: 'VariableList',
|
||||
props: {
|
||||
name: String,
|
||||
type: String,
|
||||
vars:{
|
||||
type:Array as PropType<IActionVariable[]>,
|
||||
reqired:true,
|
||||
default:()=>[]
|
||||
},
|
||||
modelValue:Array
|
||||
},
|
||||
emits:[
|
||||
'update:modelValue'
|
||||
],
|
||||
setup(props) {
|
||||
const columns= [
|
||||
{ name: 'actionName', label: 'アクション名',align: 'left',field: 'actionName',sortable: true},
|
||||
{ name: 'displayName', label: '変数表示名', align: 'left',field: 'displayName', sortable: true },
|
||||
{ name: 'name', label: '変数名', align: 'left',field: 'name',required: true, sortable: true }
|
||||
];
|
||||
const rows= props.vars.map((v)=>{
|
||||
return {objectType:'variable',...v};
|
||||
});
|
||||
|
||||
return {
|
||||
columns,
|
||||
rows:reactive(rows)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -22,8 +22,15 @@
|
||||
></q-btn>
|
||||
</div>
|
||||
</div>
|
||||
<ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" width="600px" >
|
||||
<AppSelect ref="appDg" name="アプリ" type="single"></AppSelect>
|
||||
<ShowDialog v-model:visible="showSelectApp" name="アプリ選択" @close="closeDg" min-width="680px" min-height="600px" height="600px">
|
||||
<template v-slot:toolbar>
|
||||
<q-input dense debounce="300" v-model="filter" placeholder="検索" clearable>
|
||||
<template v-slot:before>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<AppSelect ref="appDg" name="アプリ" type="single" :filter="filter"></AppSelect>
|
||||
</ShowDialog>
|
||||
</template>
|
||||
|
||||
@@ -73,7 +80,8 @@ export default defineComponent({
|
||||
showSelectApp,
|
||||
showAppDialog,
|
||||
closeDg,
|
||||
appDg
|
||||
appDg,
|
||||
filter:ref('')
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
<!-- <div class="q-pa-md q-gutter-sm"> -->
|
||||
<q-tree
|
||||
:nodes="store.eventTree.screens"
|
||||
node-key="label"
|
||||
node-key="eventId"
|
||||
children-key="events"
|
||||
no-connectors
|
||||
v-model:expanded="store.expandedScreen"
|
||||
:dense="true"
|
||||
:ref="tree"
|
||||
>
|
||||
<template v-slot:default-header="prop">
|
||||
<template v-slot:header-EVENT="prop">
|
||||
<div class="row col items-start no-wrap event-node" @click="onSelected(prop.node)">
|
||||
<q-icon v-if="prop.node.eventId"
|
||||
name="play_circle"
|
||||
@@ -16,27 +17,78 @@
|
||||
size="16px" class="q-mr-sm">
|
||||
</q-icon>
|
||||
<div class="no-wrap" :class="selectedEvent && prop.node.eventId===selectedEvent.eventId?'selected-node':''">{{ prop.node.label }}</div>
|
||||
<q-space></q-space>
|
||||
<!-- <q-icon v-if="prop.node.hasFlow" name="delete" color="negative" size="16px" class="q-mr-sm"></q-icon> -->
|
||||
</div>
|
||||
</template>
|
||||
<template v-slot:header-CHANGE="prop" >
|
||||
<div class="row col items-start no-wrap event-node" >
|
||||
<div class="no-wrap">{{ prop.node.label }}</div>
|
||||
<q-space></q-space>
|
||||
<q-icon name="add_circle" color="primary" size="16px" class="q-mr-sm" @click="addChangeEvent(prop.node)"></q-icon>
|
||||
</div>
|
||||
</template>
|
||||
</q-tree>
|
||||
<!-- </div> -->
|
||||
<show-dialog v-model:visible="showDialog" name="フィールド選択" @close="closeDg" widht="400px">
|
||||
<field-select ref="appDg" name="フィールド" type="single" :appId="store.appInfo?.appId"></field-select>
|
||||
</show-dialog>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent, computed, ref } from 'vue';
|
||||
import { IKintoneEvent } from '../../types/KintoneEvents';
|
||||
import { IKintoneEvent ,IKintoneEventGroup, IKintoneEventNode, kintoneEvent} from '../../types/KintoneEvents';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { useFlowEditorStore } from 'stores/flowEditor';
|
||||
import { ActionFlow, ActionNode, RootAction } from 'src/types/ActionTypes';
|
||||
import ShowDialog from '../ShowDialog.vue';
|
||||
import FieldSelect from '../FieldSelect.vue';
|
||||
import { QTree } from 'quasar';
|
||||
export default defineComponent({
|
||||
name: 'EventTree',
|
||||
components: {
|
||||
ShowDialog,
|
||||
FieldSelect,
|
||||
},
|
||||
setup(props, context) {
|
||||
const appDg = ref();
|
||||
const store = useFlowEditorStore();
|
||||
const showDialog = ref(false);
|
||||
const tree = ref<QTree>();
|
||||
// const eventTree=ref(kintoneEvents);
|
||||
// const selectedFlow = store.currentFlow;
|
||||
|
||||
// const expanded=ref();
|
||||
const selectedEvent = ref<IKintoneEvent|null>(null);
|
||||
const selectedChangeEvent=ref<IKintoneEventGroup|null>(null);
|
||||
const isFieldChange = (node:IKintoneEventNode)=>{
|
||||
return node.header=='EVENT' && node.eventId.indexOf(".change.")>-1;
|
||||
}
|
||||
//フィールド値変更イベント追加
|
||||
const closeDg = (val:string) => {
|
||||
if (val == 'OK') {
|
||||
if(!selectedChangeEvent.value){return;}
|
||||
const field = appDg.value.selected[0];
|
||||
const eventid = `${selectedChangeEvent.value.eventId}.${field.code}`;
|
||||
if(store.eventTree.findEventById(eventid)){
|
||||
return;
|
||||
}
|
||||
selectedChangeEvent.value?.events.push(
|
||||
new kintoneEvent(
|
||||
field.label,
|
||||
eventid,
|
||||
selectedChangeEvent.value.eventId)
|
||||
);
|
||||
tree.value?.expanded?.push(selectedChangeEvent.value.eventId);
|
||||
tree.value?.expandAll();
|
||||
}
|
||||
};
|
||||
const addChangeEvent=(node:IKintoneEventGroup)=>{
|
||||
if(store.appInfo===undefined){
|
||||
return;
|
||||
}
|
||||
selectedChangeEvent.value=node;
|
||||
showDialog.value=true;
|
||||
}
|
||||
const onSelected=(node:IKintoneEvent)=>{
|
||||
if(!node.eventId){
|
||||
return;
|
||||
@@ -45,24 +97,35 @@ export default defineComponent({
|
||||
if(store.appInfo===undefined){
|
||||
return;
|
||||
}
|
||||
const screen = store.eventTree.findScreen(node.eventId);
|
||||
const screen = store.eventTree.findEventById(node.parentId);
|
||||
let flow =store.findFlowByEventId(node.eventId);
|
||||
const screenName=screen!==null?screen.label:"";
|
||||
let screenName=screen!==null?screen.label:"";
|
||||
let nodeLabel = node.label;
|
||||
// if(isFieldChange(node)){
|
||||
// screenName=nodeLabel;
|
||||
// nodeLabel=`${node.label}の値を変更したとき`;
|
||||
// }
|
||||
if(flow!==undefined && flow!==null ){
|
||||
store.selectFlow(flow);
|
||||
}else{
|
||||
const root = new RootAction(node.eventId,screenName,node.label)
|
||||
const root = new RootAction(node.eventId,screenName,nodeLabel)
|
||||
const flow =new ActionFlow(root);
|
||||
store.flows?.push(flow);
|
||||
store.selectFlow(flow);
|
||||
selectedEvent.value.flowData=flow;
|
||||
}
|
||||
}
|
||||
};
|
||||
return {
|
||||
// eventTree,
|
||||
// expanded,
|
||||
appDg,
|
||||
tree,
|
||||
showDialog,
|
||||
isFieldChange,
|
||||
onSelected,
|
||||
selectedEvent,
|
||||
addChangeEvent,
|
||||
closeDg,
|
||||
store
|
||||
}
|
||||
}
|
||||
@@ -83,4 +146,6 @@ export default defineComponent({
|
||||
.event-node:hover{
|
||||
background-color: $light-blue-1;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }" >
|
||||
<div class="row justify-center no-wrap" >
|
||||
<div class="row">
|
||||
<q-card class="action-node" :class="nodeStyle" :square="false" @click="onNodeClick" >
|
||||
<q-toolbar class="col" >
|
||||
@@ -8,6 +8,10 @@
|
||||
<q-btn flat round dense icon="more_horiz" size="sm" >
|
||||
<q-menu auto-close anchor="top right">
|
||||
<q-list>
|
||||
<q-item clickable v-if="isRoot" @click="copyFlow">
|
||||
<q-item-section avatar><q-icon name="content_copy" ></q-icon></q-item-section>
|
||||
<q-item-section >コピーする</q-item-section>
|
||||
</q-item>
|
||||
<q-item clickable v-if="!isRoot" @click="onEditNode">
|
||||
<q-item-section avatar><q-icon name="edit" ></q-icon></q-item-section>
|
||||
<q-item-section >編集する</q-item-section>
|
||||
@@ -25,7 +29,7 @@
|
||||
</q-btn>
|
||||
</q-toolbar>
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
<q-card-section class="action-title">
|
||||
<div class="row">
|
||||
<span class="text-h7">{{ node.title }}</span>
|
||||
<q-space></q-space>
|
||||
@@ -44,23 +48,34 @@
|
||||
</div>
|
||||
</div>
|
||||
<template v-if="hasBranch">
|
||||
<div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
|
||||
<div v-for="(point, index) in node.outputPoints" :key="index">
|
||||
<node-line :action-node="node" :mode="getMode(point)" @addNode="addNode" :input-point="point"></node-line>
|
||||
<node-line :action-node="node" @addNode="addNode" :left-columns="leftColumns" :right-columns="rightColumns"></node-line>
|
||||
<div class="row justify-center no-wrap" >
|
||||
<div v-for="(point, index) in node.outputPoints" :key="index" class="column" style="min-width: 300px;">
|
||||
<div class="justify-center" >
|
||||
<node-item v-if="nextNode(point)!==undefined" :key="nextNode(point).id" :isSelected="nextNode(point) === store.activeNode"
|
||||
:actionNode="nextNode(point)" @addNode="addNodeFromItem" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
|
||||
@deleteNode="onDeleteNodeFromItem" @deleteAllNextNodes="onDeleteAllNextNodes" ></node-item>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<template v-if="!hasBranch">
|
||||
<div class="row justify-center" :style="{ marginLeft: node.inputPoint !== '' ? '240px' : '' }">
|
||||
<node-line :action-node="node" :mode="getMode('')" @addNode="addNode" input-point=""></node-line>
|
||||
<div class="row justify-center no-wrap" >
|
||||
<node-line :action-node="node" @addNode="addNode" ></node-line>
|
||||
</div>
|
||||
<div>
|
||||
<node-item v-if="nextNode('')!==undefined" :key="nextNode('').id" :isSelected="nextNode('') === store.activeNode"
|
||||
:actionNode="nextNode('')" @addNode="addNodeFromItem" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
|
||||
@deleteNode="onDeleteNodeFromItem" @deleteAllNextNodes="onDeleteAllNextNodes" ></node-item>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent, computed, ref } from 'vue';
|
||||
import { IActionNode } from '../../types/ActionTypes';
|
||||
import { IActionNode, IActionProperty } from '../../types/ActionTypes';
|
||||
import NodeLine, { Direction } from '../main/NodeLine.vue';
|
||||
import { useFlowEditorStore } from 'stores/flowEditor';
|
||||
export default defineComponent({
|
||||
name: 'NodeItem',
|
||||
components: {
|
||||
@@ -81,8 +96,10 @@ export default defineComponent({
|
||||
"nodeEdit",
|
||||
"deleteNode",
|
||||
"deleteAllNextNodes",
|
||||
"copyFlow"
|
||||
],
|
||||
setup(props, context) {
|
||||
const store = useFlowEditorStore();
|
||||
const hasBranch = computed(() => props.actionNode.outputPoints.length > 0);
|
||||
const nodeStyle = computed(() => {
|
||||
return {
|
||||
@@ -91,23 +108,11 @@ export default defineComponent({
|
||||
'selected': props.isSelected && !props.actionNode.isRoot
|
||||
};
|
||||
});
|
||||
const getMode = (point: string) => {
|
||||
if (point === '' || props.actionNode.outputPoints.length === 0) {
|
||||
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 nextNode=(point:string)=>{
|
||||
const nextId= props.actionNode.nextNodeIds.get(point);
|
||||
if(!nextId) return undefined;
|
||||
return store.currentFlow?.findNodeById(nextId);
|
||||
}
|
||||
/**
|
||||
* アクションノード追加イベントを
|
||||
@@ -116,6 +121,38 @@ export default defineComponent({
|
||||
const addNode = (point: string) => {
|
||||
context.emit('addNode', props.actionNode, point);
|
||||
}
|
||||
/**
|
||||
* アクションノード追加イベントを
|
||||
* @param point 入力ポイント
|
||||
*/
|
||||
const addNodeFromItem = (node:IActionNode,point: string) => {
|
||||
context.emit('addNode', node, point);
|
||||
}
|
||||
|
||||
const leftColumns=computed(()=>{
|
||||
if(!props.actionNode.outputPoints || props.actionNode.outputPoints.length<2){
|
||||
return 1;
|
||||
}
|
||||
const leftNode = nextNode(props.actionNode.outputPoints[0]);
|
||||
if(leftNode){
|
||||
return store.currentFlow?.getColumns(leftNode);
|
||||
}else{
|
||||
return 1;
|
||||
}
|
||||
});
|
||||
|
||||
const rightColumns=computed(()=>{
|
||||
if(!props.actionNode.outputPoints || props.actionNode.outputPoints.length<2){
|
||||
return 1;
|
||||
}
|
||||
const rightNode = nextNode(props.actionNode.outputPoints[1]);
|
||||
if(rightNode){
|
||||
return store.currentFlow?.getColumns(rightNode);
|
||||
}else{
|
||||
return 1;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* ノード選択状態
|
||||
*/
|
||||
@@ -123,9 +160,20 @@ export default defineComponent({
|
||||
context.emit('nodeSelected', props.actionNode);
|
||||
}
|
||||
|
||||
|
||||
const onNodeSelected = (node: IActionNode) => {
|
||||
context.emit('nodeSelected', node);
|
||||
}
|
||||
|
||||
const onEditNode=()=>{
|
||||
context.emit('nodeEdit', props.actionNode);
|
||||
}
|
||||
|
||||
const onNodeEdit=(node:IActionNode)=>{
|
||||
context.emit('nodeEdit', node);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* ノードを削除する
|
||||
*/
|
||||
@@ -133,12 +181,25 @@ export default defineComponent({
|
||||
context.emit('deleteNode', props.actionNode);
|
||||
}
|
||||
|
||||
/**
|
||||
* ノードを削除する
|
||||
*/
|
||||
const onDeleteNodeFromItem=(node:IActionNode)=>{
|
||||
context.emit('deleteNode', node);
|
||||
}
|
||||
/**
|
||||
* ノードの以下すべて削除する
|
||||
*/
|
||||
const onDeleteAllNode=()=>{
|
||||
context.emit('deleteAllNextNodes', props.actionNode);
|
||||
};
|
||||
|
||||
/**
|
||||
* ノードの以下すべて削除する
|
||||
*/
|
||||
const onDeleteAllNextNodes=(node:IActionNode)=>{
|
||||
context.emit('deleteAllNextNodes', node);
|
||||
};
|
||||
/**
|
||||
* 変数名取得
|
||||
*/
|
||||
@@ -146,25 +207,42 @@ export default defineComponent({
|
||||
const prop = node.actionProps.find((prop) => prop.props.name === "verName");
|
||||
return prop?.props.modelValue;
|
||||
};
|
||||
const copyFlow=()=>{
|
||||
context.emit('copyFlow', props.actionNode);
|
||||
}
|
||||
return {
|
||||
store,
|
||||
node: props.actionNode,
|
||||
nextNode,
|
||||
isRoot: props.actionNode.isRoot,
|
||||
hasBranch,
|
||||
nodeStyle,
|
||||
getMode,
|
||||
// getMode,
|
||||
addNode,
|
||||
addNodeFromItem,
|
||||
onNodeClick,
|
||||
onNodeSelected,
|
||||
onEditNode,
|
||||
onNodeEdit,
|
||||
onDeleteNode,
|
||||
onDeleteNodeFromItem,
|
||||
onDeleteAllNode,
|
||||
varName
|
||||
onDeleteAllNextNodes,
|
||||
copyFlow,
|
||||
varName,
|
||||
leftColumns,
|
||||
rightColumns
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<style lang="scss">
|
||||
.action-node {
|
||||
min-width: 300px !important;
|
||||
min-width: 280px !important;
|
||||
}
|
||||
.action-title{
|
||||
max-width: 280px !important;
|
||||
overflow-wrap: anywhere;
|
||||
}
|
||||
|
||||
.line {
|
||||
|
||||
@@ -1,11 +1,28 @@
|
||||
<template>
|
||||
<div>
|
||||
<svg class="node-line">
|
||||
<polyline :points="points.linePoints" class="line" ></polyline>
|
||||
<text class="add-icon" @click="addNode(node)" :x="points.iconPoint.x" :y="points.iconPoint.y" font-family="Arial" font-size="25"
|
||||
text-anchor="middle" dy=".3em" style="cursor: pointer;" >
|
||||
⊕
|
||||
</text>
|
||||
<div class="row justify-center">
|
||||
<svg class="node-line" style="width:100%" :viewBox="viewBox()">
|
||||
<template v-if="!node.outputPoints || node.outputPoints.length===0" >
|
||||
<polyline :points="points(getMode('')).linePoints" class="line" ></polyline>
|
||||
<text class="add-icon"
|
||||
@click="addNode(node,'')"
|
||||
:x="points(getMode('')).iconPoint.x"
|
||||
:y="points(getMode('')).iconPoint.y"
|
||||
font-family="Arial" font-size="25"
|
||||
text-anchor="middle" dy=".3em" style="cursor: pointer;" >
|
||||
⊕
|
||||
</text>
|
||||
</template>
|
||||
<template v-for="(point, index) in node.outputPoints" :key="index" >
|
||||
<polyline :points="points(getMode(point)).linePoints" class="line" ></polyline>
|
||||
<text class="add-icon"
|
||||
@click="addNode(node,point)"
|
||||
:x="points(getMode(point)).iconPoint.x"
|
||||
:y="points(getMode(point)).iconPoint.y"
|
||||
font-family="Arial" font-size="25"
|
||||
text-anchor="middle" dy=".3em" style="cursor: pointer;" >
|
||||
⊕
|
||||
</text>
|
||||
</template>
|
||||
</svg>
|
||||
</div>
|
||||
</template>
|
||||
@@ -27,55 +44,97 @@ export default defineComponent({
|
||||
type: Object as PropType<IActionNode>,
|
||||
required: true
|
||||
},
|
||||
mode: {
|
||||
type: String as PropType<Direction>,
|
||||
required: true
|
||||
leftColumns:{
|
||||
type:Number,
|
||||
required:false
|
||||
},
|
||||
inputPoint:{
|
||||
type:String
|
||||
rightColumns:{
|
||||
type:Number,
|
||||
required:false
|
||||
}
|
||||
},
|
||||
emits: ['addNode'],
|
||||
setup(props,context) {
|
||||
const hasBranch = computed(() => props.actionNode.outputPoints.length > 0);
|
||||
const points = computed(() => {
|
||||
switch (props.mode) {
|
||||
case Direction.Left:
|
||||
const getMode = (point: string):Direction => {
|
||||
if (point === '' || props.actionNode.outputPoints.length === 0) {
|
||||
return Direction.Default;
|
||||
}
|
||||
if (point === props.actionNode.outputPoints[0]) {
|
||||
if (props.actionNode.nextNodeIds.get(point)) {
|
||||
return Direction.Left;
|
||||
} else {
|
||||
return Direction.LeftNotNext;
|
||||
}
|
||||
} else {
|
||||
if (props.actionNode.nextNodeIds.get(point)) {
|
||||
return Direction.Right;
|
||||
} else {
|
||||
return Direction.RightNotNext;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const points = (mode:Direction) => {
|
||||
let startX ,endX;
|
||||
const leftColumn=props.leftColumns?props.leftColumns:1;
|
||||
const rightColumn=props.rightColumns?props.rightColumns:1;
|
||||
|
||||
switch (mode) {
|
||||
case Direction.Left:
|
||||
startX = leftColumn*300/2.0;
|
||||
endX = ((leftColumn+rightColumn)/2.0 - 0.25)*300;
|
||||
return {
|
||||
linePoints: '180, 0, 180, 40, 120, 40, 120, 60',
|
||||
iconPoint: { x: 180, y: 20 }
|
||||
linePoints: `${startX}, 60, ${startX}, 40, ${endX}, 40, ${endX}, 0`,
|
||||
iconPoint: { x: endX, y: 20 }
|
||||
};
|
||||
case Direction.Right:
|
||||
startX = ((leftColumn+rightColumn)/2.0 + 0.25)*300;
|
||||
endX = (leftColumn+(rightColumn/2.0))*300;
|
||||
return {
|
||||
linePoints: '60, 0, 60, 40, 120, 40, 120, 60',
|
||||
iconPoint: { x: 60, y: 20 }
|
||||
linePoints: `${startX}, 0, ${startX}, 40, ${endX}, 40, ${endX}, 60`,
|
||||
iconPoint: { x: startX, y: 20 }
|
||||
};
|
||||
case Direction.LeftNotNext:
|
||||
startX = ((leftColumn+rightColumn)/2.0 - 0.25)*300;
|
||||
return {
|
||||
linePoints: '180, 0, 180, 40',
|
||||
iconPoint: { x: 180, y: 20 }
|
||||
linePoints: `${startX}, 0, ${startX}, 40`,
|
||||
iconPoint: { x: startX, y: 20 }
|
||||
};
|
||||
case Direction.RightNotNext:
|
||||
startX = ((leftColumn+rightColumn)/2.0 + 0.25)*300;
|
||||
return {
|
||||
linePoints: '60, 0, 60, 40',
|
||||
iconPoint: { x: 60, y: 30 }
|
||||
linePoints: `${startX}, 0, ${startX}, 40`,
|
||||
iconPoint: { x: startX, y: 20 }
|
||||
};
|
||||
default:
|
||||
return {
|
||||
linePoints: '120, 0, 120, 60',
|
||||
iconPoint: { x: 120, y: 30 }
|
||||
linePoints: '150, 0, 150, 60',
|
||||
iconPoint: { x: 150, y: 30 }
|
||||
};
|
||||
}
|
||||
});
|
||||
const addNode=(prveNode:IActionNode)=>{
|
||||
context.emit('addNode',props.inputPoint);
|
||||
};
|
||||
|
||||
const addNode=(prveNode:IActionNode,point:string)=>{
|
||||
context.emit('addNode',point);
|
||||
}
|
||||
|
||||
const viewBox=()=>{
|
||||
let columns=0;
|
||||
if(props.leftColumns!==undefined) columns+=props.leftColumns;
|
||||
if(props.rightColumns!==undefined) columns+=props.rightColumns;
|
||||
if(columns===0) columns=1;
|
||||
const width= columns*300;
|
||||
return `0 0 ${width} 60`;
|
||||
};
|
||||
|
||||
return {
|
||||
node: props.actionNode,
|
||||
getMode,
|
||||
hasBranch,
|
||||
points,
|
||||
addNode
|
||||
addNode,
|
||||
viewBox
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,25 +1,27 @@
|
||||
<template>
|
||||
<div>
|
||||
<div v-for="(item, index) in componentData" :key="index">
|
||||
<component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
|
||||
<component :is="item.component" v-bind="item.props" :connectProps="connectProps" v-model="item.props.modelValue"></component>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent } from 'vue';
|
||||
import { defineComponent,computed } from 'vue';
|
||||
import InputText from '../right/InputText.vue';
|
||||
import SelectBox from '../right/SelectBox.vue';
|
||||
import DatePicker from '../right/DatePicker.vue';
|
||||
import FieldInput from '../right/FieldInput.vue';
|
||||
|
||||
import EventSetter from '../right/EventSetter.vue';
|
||||
import { IActionProperty, IProp } from 'src/types/ActionTypes';
|
||||
export default defineComponent({
|
||||
name: 'ActionProperty',
|
||||
components: {
|
||||
InputText,
|
||||
SelectBox,
|
||||
DatePicker,
|
||||
FieldInput
|
||||
FieldInput,
|
||||
EventSetter
|
||||
},
|
||||
props: {
|
||||
jsonData: {
|
||||
@@ -31,27 +33,43 @@ export default defineComponent({
|
||||
required: false,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
componentData() {
|
||||
return this.jsonData.elements.map((element: any) => {
|
||||
if(this.jsonValue != undefined )
|
||||
setup(props){
|
||||
const componentData=computed<Array<IActionProperty>>(()=>{
|
||||
return props.jsonData.elements.map((element: any) => {
|
||||
if(props.jsonValue != undefined )
|
||||
{
|
||||
if(this.jsonValue.hasOwnProperty(element.props.name))
|
||||
if(props.jsonValue.hasOwnProperty(element.props.name))
|
||||
{
|
||||
element.props.modelValue = this.jsonValue[element.props.name];
|
||||
element.props.modelValue = props.jsonValue[element.props.name];
|
||||
}
|
||||
else
|
||||
{
|
||||
element.props.modelValue = '';
|
||||
}
|
||||
|
||||
}
|
||||
return {
|
||||
component: element.component,
|
||||
props: element.props,
|
||||
};
|
||||
});
|
||||
},
|
||||
},
|
||||
});
|
||||
const connectProps=(props:IProp)=>{
|
||||
const connProps:any={};
|
||||
if(props && "connectProps" in props && props.connectProps!=undefined){
|
||||
for(let connProp of props.connectProps){
|
||||
let targetProp = componentData.value.find((prop)=>prop.props.name===connProp.propName);
|
||||
if(targetProp){
|
||||
connProps[connProp.key]=targetProp;
|
||||
}
|
||||
}
|
||||
}
|
||||
return connProps;
|
||||
}
|
||||
|
||||
return{
|
||||
componentData,
|
||||
connectProps
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
0
frontend/src/components/right/AppFieldSelect.vue
Normal file
0
frontend/src/components/right/AppFieldSelect.vue
Normal file
80
frontend/src/components/right/EventSetter.vue
Normal file
80
frontend/src/components/right/EventSetter.vue
Normal file
@@ -0,0 +1,80 @@
|
||||
<template>
|
||||
<q-input :label="displayName" v-model="inputValue" label-color="primary" :placeholder="placeholder" stack-label>
|
||||
<template v-slot:append>
|
||||
<q-btn round dense flat icon="add" @click="addButtonEvent()" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
|
||||
<script lang="ts">
|
||||
import { defineComponent,ref,watchEffect } from 'vue';
|
||||
import { useFlowEditorStore } from '../../stores/flowEditor';
|
||||
import { IKintoneEventGroup,kintoneEvent } from 'src/types/KintoneEvents';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'EventSetter',
|
||||
props: {
|
||||
displayName:{
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
name:{
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
placeholder: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
hint:{
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
modelValue: {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
connectProps:{
|
||||
type:Object,
|
||||
default:undefined
|
||||
}
|
||||
},
|
||||
|
||||
setup(props , { emit }) {
|
||||
const inputValue = ref(props.modelValue);
|
||||
const store = useFlowEditorStore();
|
||||
const addButtonEvent=()=>{
|
||||
const eventId =store.currentFlow?.getRoot()?.name;
|
||||
if(eventId===undefined){return;}
|
||||
let displayName = inputValue.value;
|
||||
if(props.connectProps!==undefined && "displayName" in props.connectProps){
|
||||
displayName =props.connectProps["displayName"].props.modelValue;
|
||||
}
|
||||
const customButtonId=`${eventId}.customButtonClick`;
|
||||
const findedEvent = store.eventTree.findEventById(customButtonId);
|
||||
if(findedEvent && "events" in findedEvent){
|
||||
const customEvents = findedEvent as IKintoneEventGroup;
|
||||
const addEventId = customButtonId+"." + inputValue.value;
|
||||
if(store.eventTree.findEventById(addEventId)){
|
||||
return;
|
||||
}
|
||||
customEvents.events.push(
|
||||
new kintoneEvent(
|
||||
displayName,
|
||||
addEventId,
|
||||
customButtonId)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
watchEffect(() => {
|
||||
emit('update:modelValue', inputValue.value);
|
||||
});
|
||||
|
||||
return {
|
||||
inputValue,
|
||||
addButtonEvent
|
||||
};
|
||||
},
|
||||
});
|
||||
</script>
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div>
|
||||
<div v-for="(item, index) in properties" :key="index" >
|
||||
<component :is="item.component" v-bind="item.props" v-model="item.props.modelValue"></component>
|
||||
<component :is="item.component" v-bind="item.props" :connectProps="connectProps(item.props)" v-model="item.props.modelValue"></component>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
@@ -17,7 +17,8 @@ import DatePicker from '../right/DatePicker.vue';
|
||||
import FieldInput from '../right/FieldInput.vue';
|
||||
import MuiltInputText from '../right/MuiltInputText.vue';
|
||||
import ConditionInput from '../right/ConditionInput.vue';
|
||||
import { IActionNode,IActionProperty } from 'src/types/ActionTypes';
|
||||
import EventSetter from '../right/EventSetter.vue';
|
||||
import { IActionNode,IActionProperty,IProp } from 'src/types/ActionTypes';
|
||||
|
||||
export default defineComponent({
|
||||
name: 'PropertyList',
|
||||
@@ -27,7 +28,8 @@ export default defineComponent({
|
||||
DatePicker,
|
||||
FieldInput,
|
||||
MuiltInputText,
|
||||
ConditionInput
|
||||
ConditionInput,
|
||||
EventSetter
|
||||
},
|
||||
props: {
|
||||
nodeProps: {
|
||||
@@ -40,9 +42,22 @@ export default defineComponent({
|
||||
}
|
||||
},
|
||||
setup(props, context) {
|
||||
const properties=ref(props.nodeProps)
|
||||
const properties=ref(props.nodeProps);
|
||||
const connectProps=(props:IProp)=>{
|
||||
const connProps:any={};
|
||||
if(props && "connectProps" in props && props.connectProps!=undefined){
|
||||
for(let connProp of props.connectProps){
|
||||
let targetProp = properties.value.find((prop)=>prop.props.name===connProp.propName);
|
||||
if(targetProp){
|
||||
connProps[connProp.key]=targetProp;
|
||||
}
|
||||
}
|
||||
}
|
||||
return connProps;
|
||||
}
|
||||
return {
|
||||
properties
|
||||
properties,
|
||||
connectProps
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
>
|
||||
<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() =>{
|
||||
|
||||
@@ -1 +1,25 @@
|
||||
// app global css in SCSS form
|
||||
::-webkit-scrollbar {
|
||||
height: 12px;
|
||||
width: 14px;
|
||||
background: transparent;
|
||||
z-index: 12;
|
||||
overflow: visible;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb {
|
||||
width: 10px;
|
||||
background-color: #c1c1c1;
|
||||
border-radius: 10px;
|
||||
z-index: 12;
|
||||
border: 4px solid rgba(0, 0, 0, 0);
|
||||
background-clip: padding-box;
|
||||
transition: background-color .32s ease-in-out;
|
||||
margin: 4px;
|
||||
min-height: 32px;
|
||||
min-width: 32px;
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-thumb:hover {
|
||||
background: #c1c1c1;
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
</q-header>
|
||||
|
||||
<q-drawer
|
||||
v-model="leftDrawerOpen"
|
||||
:model-value="authStore.toggleLeftDrawer"
|
||||
:show-if-above="false"
|
||||
bordered
|
||||
>
|
||||
@@ -151,11 +151,10 @@ const essentialLinks: EssentialLinkProps[] = [
|
||||
}
|
||||
];
|
||||
|
||||
const leftDrawerOpen = ref(false)
|
||||
const version = process.env.version;
|
||||
const productName = process.env.productName;
|
||||
|
||||
function toggleLeftDrawer() {
|
||||
leftDrawerOpen.value = !leftDrawerOpen.value
|
||||
authStore.toggleLeftMenu();
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1,246 +1,274 @@
|
||||
<template>
|
||||
<q-page>
|
||||
<q-layout
|
||||
container
|
||||
class="absolute-full shadow-2 rounded-borders"
|
||||
>
|
||||
<q-layout container class="absolute-full shadow-2 rounded-borders">
|
||||
<div class="q-pa-sm q-gutter-sm ">
|
||||
<q-drawer
|
||||
side="left"
|
||||
:overlay="true"
|
||||
bordered
|
||||
v-model="drawerLeft"
|
||||
:show-if-above="false"
|
||||
elevated
|
||||
>
|
||||
<div class="flex-center fixed-top app-selector" >
|
||||
<AppSelector />
|
||||
</div>
|
||||
<q-drawer side="left" :overlay="true" bordered v-model="drawerLeft" :show-if-above="false" elevated>
|
||||
<div class="flex-center fixed-top app-selector">
|
||||
<AppSelector />
|
||||
</div>
|
||||
|
||||
<div class="flex-center absolute-full" style="padding-top:65px;padding-left:15px;padding-right:15px;">
|
||||
<q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
|
||||
<EventTree />
|
||||
</q-scroll-area>
|
||||
</div>
|
||||
<div class="flex-center absolute-full" style="padding-top:65px;padding-left:15px;padding-right:15px;">
|
||||
<q-scroll-area class="fit" :horizontal-thumb-style="{ opacity: '0' }">
|
||||
<EventTree />
|
||||
</q-scroll-area>
|
||||
</div>
|
||||
|
||||
<div class="flex-center fixed-bottom bg-grey-3 q-pa-md row ">
|
||||
<q-btn color="secondary" glossy label="デプロイ" @click="onDeploy" icon="sync" :loading="deployLoading" />
|
||||
<q-space></q-space>
|
||||
<q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading"/>
|
||||
</div>
|
||||
<div class="flex-center fixed-bottom bg-grey-3 q-pa-md row ">
|
||||
<q-btn color="secondary" glossy label="デプロイ" @click="onDeploy" icon="sync" :loading="deployLoading" />
|
||||
<q-space></q-space>
|
||||
<q-btn color="primary" label="保存" @click="onSaveFlow" icon="save" :loading="saveLoading" />
|
||||
</div>
|
||||
</q-drawer>
|
||||
</div>
|
||||
<div class="q-pa-md q-gutter-sm">
|
||||
<div class="flowchart" v-if="store.currentFlow">
|
||||
<node-item v-for="(node,) in store.currentFlow.actionNodes" :key="node.id"
|
||||
:isSelected="node===state.activeNode" :actionNode="node"
|
||||
@addNode="addNode"
|
||||
@nodeSelected="onNodeSelected"
|
||||
@nodeEdit="onNodeEdit"
|
||||
@deleteNode="onDeleteNode"
|
||||
@deleteAllNextNodes="onDeleteAllNextNodes"
|
||||
></node-item>
|
||||
<q-btn flat dense round
|
||||
:icon="drawerLeft?'keyboard_double_arrow_left':'keyboard_double_arrow_right'"
|
||||
:style="[drawerLeft?{'left':'300px'}:{'left':'0px'}]"
|
||||
@click="drawerLeft=!drawerLeft" class="expand" />
|
||||
<div class="q-pa-md q-gutter-sm" :style="{minWidth: minPanelWidth}">
|
||||
<div class="flowchart" v-if="store.currentFlow" :style="[drawerLeft?{paddingLeft:'300px'}:{}]">
|
||||
<node-item v-if="rootNode!==undefined" :key="rootNode.id" :isSelected="rootNode === store.activeNode"
|
||||
:actionNode="rootNode" @addNode="addNode" @nodeSelected="onNodeSelected" @nodeEdit="onNodeEdit"
|
||||
@deleteNode="onDeleteNode" @deleteAllNextNodes="onDeleteAllNextNodes" @copyFlow="onCopyFlow"></node-item>
|
||||
</div>
|
||||
</div>
|
||||
<PropertyPanel :actionNode="state.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
|
||||
<PropertyPanel :actionNode="store.activeNode" v-model:drawerRight="drawerRight"></PropertyPanel>
|
||||
</q-layout>
|
||||
<ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" width="350px">
|
||||
<action-select ref="appDg" name="model" type="single"></action-select>
|
||||
<ShowDialog v-model:visible="showAddAction" name="アクション" @close="closeDg" min-width="500px" min-height="500px">
|
||||
<template v-slot:toolbar>
|
||||
<q-input dense debounce="200" v-model="filter" placeholder="検索" clearable>
|
||||
<template v-slot:before>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
<action-select ref="appDg" name="model" :filter="filter" type="single"></action-select>
|
||||
</ShowDialog>
|
||||
|
||||
</q-page>
|
||||
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref,reactive,computed,onMounted} from 'vue';
|
||||
import {IActionNode, ActionNode, IActionFlow, ActionFlow,RootAction, IActionProperty } from 'src/types/ActionTypes';
|
||||
import { ref, reactive, computed, onMounted } from 'vue';
|
||||
import { IActionNode, ActionNode, IActionFlow, ActionFlow, RootAction, IActionProperty } from 'src/types/ActionTypes';
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { useFlowEditorStore } from 'stores/flowEditor';
|
||||
import { useAuthStore } from 'stores/useAuthStore';
|
||||
|
||||
import NodeItem from 'src/components/main/NodeItem.vue';
|
||||
import ShowDialog from 'components/ShowDialog.vue';
|
||||
import ActionSelect from 'components/ActionSelect.vue';
|
||||
import PropertyPanel from 'components/right/PropertyPanel.vue';
|
||||
import AppSelector from 'components/left/AppSelector.vue';
|
||||
import EventTree from 'components/left/EventTree.vue';
|
||||
import {FlowCtrl } from '../control/flowctrl';
|
||||
import { FlowCtrl } from '../control/flowctrl';
|
||||
import { useQuasar } from 'quasar';
|
||||
const deployLoading = ref(false);
|
||||
const saveLoading = ref(false);
|
||||
|
||||
const drawerLeft = ref(false);
|
||||
const $q=useQuasar();
|
||||
const $q = useQuasar();
|
||||
const store = useFlowEditorStore();
|
||||
// ref関数を使ってtemplateとバインド
|
||||
const state=reactive({
|
||||
activeNode:{
|
||||
id:""
|
||||
},
|
||||
})
|
||||
const authStore = useAuthStore();
|
||||
|
||||
const appDg = ref();
|
||||
const prevNodeIfo=ref({
|
||||
prevNode:{} as IActionNode,
|
||||
inputPoint:""
|
||||
const prevNodeIfo = ref({
|
||||
prevNode: {} as IActionNode,
|
||||
inputPoint: ""
|
||||
});
|
||||
// const refFlow = ref<ActionFlow|null>(null);
|
||||
const showAddAction=ref(false);
|
||||
const drawerRight=ref(false);
|
||||
const model=ref("");
|
||||
const addActionNode=(action:IActionNode)=>{
|
||||
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);
|
||||
store.currentFlow?.actionNodes.push(action);
|
||||
}
|
||||
|
||||
const addNode=(node:IActionNode,inputPoint:string)=>{
|
||||
if(drawerRight.value){
|
||||
drawerRight.value=false;
|
||||
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";
|
||||
}
|
||||
showAddAction.value=true;
|
||||
prevNodeIfo.value.prevNode=node;
|
||||
prevNodeIfo.value.inputPoint=inputPoint;
|
||||
}
|
||||
});
|
||||
|
||||
const onNodeSelected=(node:IActionNode)=>{
|
||||
//右パネルが開いている場合、自動閉じる
|
||||
if(drawerRight.value && state.activeNode.id!==node.id){
|
||||
drawerRight.value=false;
|
||||
const addNode = (node: IActionNode, inputPoint: string) => {
|
||||
if (drawerRight.value) {
|
||||
drawerRight.value = false;
|
||||
}
|
||||
state.activeNode = node;
|
||||
showAddAction.value = true;
|
||||
prevNodeIfo.value.prevNode = node;
|
||||
prevNodeIfo.value.inputPoint = inputPoint;
|
||||
}
|
||||
|
||||
const onNodeEdit=(node:IActionNode)=>{
|
||||
state.activeNode = node;
|
||||
drawerRight.value=true;
|
||||
}
|
||||
|
||||
const onDeleteNode=(node:IActionNode)=>{
|
||||
if(!store.currentFlow) return;
|
||||
const onNodeSelected = (node: IActionNode) => {
|
||||
//右パネルが開いている場合、自動閉じる
|
||||
if(drawerRight.value && state.activeNode.id===node.id){
|
||||
drawerRight.value=false;
|
||||
if (drawerRight.value && store.activeNode?.id !== node.id) {
|
||||
drawerRight.value = false;
|
||||
}
|
||||
store.setActiveNode(node);
|
||||
}
|
||||
|
||||
const onNodeEdit = (node: IActionNode) => {
|
||||
store.setActiveNode(node);
|
||||
drawerRight.value = true;
|
||||
}
|
||||
|
||||
const onDeleteNode = (node: IActionNode) => {
|
||||
if (!store.currentFlow) return;
|
||||
//右パネルが開いている場合、自動閉じる
|
||||
if (drawerRight.value && store.activeNode?.id === node.id) {
|
||||
drawerRight.value = false;
|
||||
}
|
||||
store.currentFlow?.removeNode(node);
|
||||
}
|
||||
|
||||
const onDeleteAllNextNodes=(node:IActionNode)=>{
|
||||
if(!store.currentFlow) return;
|
||||
const onDeleteAllNextNodes = (node: IActionNode) => {
|
||||
if (!store.currentFlow) return;
|
||||
//右パネルが開いている場合、自動閉じる
|
||||
if(drawerRight.value){
|
||||
drawerRight.value=false;
|
||||
if (drawerRight.value) {
|
||||
drawerRight.value = false;
|
||||
}
|
||||
store.currentFlow?.removeAllNext(node.id);
|
||||
}
|
||||
const closeDg=(val :any)=>{
|
||||
console.log("Dialog closed->",val);
|
||||
const closeDg = (val: any) => {
|
||||
console.log("Dialog closed->", val);
|
||||
if (val == 'OK') {
|
||||
const data = appDg.value.selected[0];
|
||||
const actionProps=JSON.parse(data.property);
|
||||
const outputPoint =JSON.parse(data.outputPoints);
|
||||
const action = new ActionNode(data.name,data.desc,"",outputPoint,actionProps);
|
||||
store.currentFlow?.addNode(action, prevNodeIfo.value.prevNode,prevNodeIfo.value.inputPoint);
|
||||
const data = appDg.value.selected[0];
|
||||
const actionProps = JSON.parse(data.property);
|
||||
const outputPoint = JSON.parse(data.outputPoints);
|
||||
const action = new ActionNode(data.name, data.desc, "", outputPoint, actionProps);
|
||||
store.currentFlow?.addNode(action, prevNodeIfo.value.prevNode, prevNodeIfo.value.inputPoint);
|
||||
}
|
||||
}
|
||||
/*
|
||||
*フローのデータをコピーする
|
||||
*/
|
||||
const onCopyFlow = () => {
|
||||
if (navigator.clipboard) {
|
||||
const jsonData =JSON.stringify(store.currentFlow) ;
|
||||
navigator.clipboard.writeText(jsonData).then(() => {
|
||||
console.log('Text successfully copied to clipboard');
|
||||
},
|
||||
(err) => {
|
||||
console.error('Error in copying text: ', err);
|
||||
});
|
||||
} else {
|
||||
console.log('Clipboard API not available');
|
||||
}
|
||||
};
|
||||
/**
|
||||
* デプロイ
|
||||
*/
|
||||
const onDeploy= async ()=>{
|
||||
if(store.appInfo===undefined || store.flows?.length===0){
|
||||
const onDeploy = async () => {
|
||||
if (store.appInfo === undefined || store.flows?.length === 0) {
|
||||
$q.notify({
|
||||
type: 'negative',
|
||||
caption:"エラー",
|
||||
caption: "エラー",
|
||||
message: `設定されたフローがありません。`
|
||||
});
|
||||
return;
|
||||
}
|
||||
try{
|
||||
deployLoading.value=true;
|
||||
try {
|
||||
deployLoading.value = true;
|
||||
await store.deploy();
|
||||
deployLoading.value=false;
|
||||
deployLoading.value = false;
|
||||
$q.notify({
|
||||
type: 'positive',
|
||||
caption:"通知",
|
||||
caption: "通知",
|
||||
message: `デプロイを成功しました。`
|
||||
});
|
||||
}catch(error){
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
deployLoading.value=false;
|
||||
deployLoading.value = false;
|
||||
$q.notify({
|
||||
type: 'negative',
|
||||
caption:"エラー",
|
||||
caption: "エラー",
|
||||
message: `デプロイが失敗しました。`
|
||||
})
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
const onSaveFlow = async ()=>{
|
||||
const onSaveFlow = async () => {
|
||||
const targetFlow = store.selectedFlow;
|
||||
if(targetFlow===undefined){
|
||||
if (targetFlow === undefined) {
|
||||
$q.notify({
|
||||
type: 'negative',
|
||||
caption:"エラー",
|
||||
caption: "エラー",
|
||||
message: `編集中のフローがありません。`
|
||||
});
|
||||
return;
|
||||
}
|
||||
try{
|
||||
saveLoading.value=true;
|
||||
try {
|
||||
saveLoading.value = true;
|
||||
await store.saveFlow(targetFlow);
|
||||
saveLoading.value=false;
|
||||
saveLoading.value = false;
|
||||
$q.notify({
|
||||
type: 'positive',
|
||||
caption:"通知",
|
||||
caption: "通知",
|
||||
message: `${targetFlow.getRoot()?.subTitle}のフロー設定を保存しました。`
|
||||
});
|
||||
}catch(error){
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
saveLoading.value=false;
|
||||
saveLoading.value = false;
|
||||
$q.notify({
|
||||
type: 'negative',
|
||||
caption:"エラー",
|
||||
caption: "エラー",
|
||||
message: `${targetFlow.getRoot()?.subTitle}のフローの設定の保存が失敗しました。`
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const fetchData = async ()=>{
|
||||
drawerLeft.value=true;
|
||||
if(store.appInfo===undefined) return;
|
||||
const fetchData = async () => {
|
||||
drawerLeft.value = true;
|
||||
if (store.appInfo === undefined) return;
|
||||
const flowCtrl = new FlowCtrl();
|
||||
const actionFlows = await flowCtrl.getFlows(store.appInfo?.appId);
|
||||
if(actionFlows && actionFlows.length>0){
|
||||
if (actionFlows && actionFlows.length > 0) {
|
||||
store.setFlows(actionFlows);
|
||||
}
|
||||
if(actionFlows && actionFlows.length==1){
|
||||
if (actionFlows && actionFlows.length == 1) {
|
||||
store.selectFlow(actionFlows[0]);
|
||||
}
|
||||
const root =actionFlows[0].getRoot();
|
||||
if(root){
|
||||
state.activeNode=root;
|
||||
const root = actionFlows[0].getRoot();
|
||||
if (root) {
|
||||
store.setActiveNode(root);
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
authStore.toggleLeftMenu();
|
||||
fetchData();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.app-selector{
|
||||
padding:15px;
|
||||
z-index: 999;
|
||||
}
|
||||
.app-selector {
|
||||
padding: 15px;
|
||||
z-index: 999;
|
||||
}
|
||||
|
||||
.flowchart{
|
||||
padding-top: 10px;
|
||||
}
|
||||
.flow-toolbar{
|
||||
.flowchart {
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.flow-toolbar {
|
||||
opacity: 50%;
|
||||
}
|
||||
}
|
||||
|
||||
.event-tree .q-drawer {
|
||||
top:50px;
|
||||
z-index: 999;
|
||||
}
|
||||
.event-tree .q-drawer {
|
||||
top: 50px;
|
||||
z-index: 999;
|
||||
}
|
||||
.expand{
|
||||
position: fixed;
|
||||
left: 0px;
|
||||
top: 50%;
|
||||
z-index: 9999;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -5,7 +5,13 @@ const routes: RouteRecordRaw[] = [
|
||||
path: '/login',
|
||||
component: () => import('pages/LoginPage.vue')
|
||||
},
|
||||
|
||||
{
|
||||
path:'/FlowChart',
|
||||
component:()=>import('layouts/MainLayout.vue'),
|
||||
children:[
|
||||
{path:'',component:()=>import('pages/FlowChart.vue')}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: '/',
|
||||
component: () => import('layouts/MainLayout.vue'),
|
||||
@@ -16,7 +22,7 @@ const routes: RouteRecordRaw[] = [
|
||||
{ path: 'flow', component: () => import('pages/testFlow.vue') },
|
||||
{ path: 'FlowChartTest', component: () => import('pages/FlowChartTest.vue') },
|
||||
{ path: 'flowEditor', component: () => import('pages/FlowEditorPage.vue') },
|
||||
{ path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
|
||||
// { path: 'FlowChart', component: () => import('pages/FlowChart.vue') },
|
||||
{ path: 'right', component: () => import('pages/testRight.vue') },
|
||||
{ path: 'domain', component: () => import('pages/TenantDomain.vue') },
|
||||
{ path: 'userdomain', component: () => import('pages/UserDomain.vue')},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { defineStore } from 'pinia';
|
||||
import { AppInfo ,IActionFlow} from 'src/types/ActionTypes';
|
||||
import { kintoneEvents,IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
|
||||
import { AppInfo ,IActionFlow, IActionNode} from 'src/types/ActionTypes';
|
||||
import { IKintoneEvent,KintoneEventManager } from 'src/types/KintoneEvents';
|
||||
import {FlowCtrl } from '../control/flowctrl';
|
||||
|
||||
export interface FlowEditorState{
|
||||
@@ -8,18 +8,21 @@ export interface FlowEditorState{
|
||||
appInfo?:AppInfo;
|
||||
flows?:IActionFlow[];
|
||||
selectedFlow?:IActionFlow|undefined;
|
||||
activeNode:IActionNode|undefined;
|
||||
eventTree:KintoneEventManager;
|
||||
selectedEvent:IKintoneEvent|undefined;
|
||||
expandedScreen:any[];
|
||||
}
|
||||
const flowCtrl=new FlowCtrl();
|
||||
const eventTree = new KintoneEventManager();
|
||||
export const useFlowEditorStore = defineStore("flowEditor",{
|
||||
state: ():FlowEditorState => ({
|
||||
flowNames1: '',
|
||||
appInfo:undefined,
|
||||
flows:[],
|
||||
selectedFlow:undefined,
|
||||
eventTree:kintoneEvents,
|
||||
activeNode:undefined,
|
||||
eventTree:eventTree,
|
||||
selectedEvent:undefined,
|
||||
expandedScreen:[]
|
||||
}),
|
||||
@@ -53,6 +56,9 @@ export const useFlowEditorStore = defineStore("flowEditor",{
|
||||
selectFlow(flow:IActionFlow){
|
||||
this.selectedFlow=flow;
|
||||
},
|
||||
setActiveNode(node:IActionNode){
|
||||
this.activeNode=node;
|
||||
},
|
||||
setApp(app:AppInfo){
|
||||
this.appInfo=app;
|
||||
},
|
||||
|
||||
@@ -8,6 +8,7 @@ export interface IUserState{
|
||||
token?:string;
|
||||
returnUrl:string;
|
||||
currentDomain:IDomainInfo;
|
||||
LeftDrawer:boolean;
|
||||
}
|
||||
|
||||
export const useAuthStore = defineStore({
|
||||
@@ -20,10 +21,19 @@ export const useAuthStore = defineStore({
|
||||
return {
|
||||
token,
|
||||
returnUrl: '',
|
||||
LeftDrawer:false,
|
||||
currentDomain: JSON.parse(localStorage.getItem('currentDomain')||"{}")
|
||||
}
|
||||
},
|
||||
getters:{
|
||||
toggleLeftDrawer():boolean{
|
||||
return this.LeftDrawer;
|
||||
}
|
||||
},
|
||||
actions: {
|
||||
toggleLeftMenu(){
|
||||
this.LeftDrawer=!this.LeftDrawer;
|
||||
},
|
||||
async login(username:string, password:string) {
|
||||
const params = new URLSearchParams();
|
||||
params.append('username', username);
|
||||
|
||||
@@ -16,11 +16,9 @@ export interface AppInfo {
|
||||
}
|
||||
|
||||
/**
|
||||
* アクションのプロパティ定義
|
||||
* 属性項目情報
|
||||
*/
|
||||
export interface IActionProperty {
|
||||
component: string;
|
||||
props: {
|
||||
export interface IProp{
|
||||
//プロパティ名
|
||||
name: string;
|
||||
//プロパティ表示名
|
||||
@@ -28,9 +26,26 @@ export interface IActionProperty {
|
||||
placeholder: string;
|
||||
//入力提示・説明
|
||||
hint:string;
|
||||
//関連属性リスト
|
||||
connectProps:[{key:string,propName:string}]|undefined;
|
||||
//プロパティ設定値
|
||||
modelValue: any;
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* アクションのプロパティ定義
|
||||
*/
|
||||
export interface IActionProperty {
|
||||
component: string;
|
||||
props: IProp;
|
||||
}
|
||||
/**
|
||||
* 変数オブジェクト
|
||||
*/
|
||||
export interface IActionVariable{
|
||||
actionName:string;
|
||||
displayName:string;
|
||||
name:string;
|
||||
}
|
||||
/**
|
||||
* アクションタイプ定義
|
||||
@@ -40,6 +55,7 @@ export interface IActionNode {
|
||||
//アクション名
|
||||
name: string;
|
||||
title: string;
|
||||
varName:IProp|undefined;
|
||||
subTitle: string;
|
||||
inputPoint: string;
|
||||
//出力ポイント(条件分岐以外未使用)
|
||||
@@ -62,10 +78,12 @@ export interface IActionFlow {
|
||||
addNode(newNode: IActionNode, prevNode?: IActionNode, inputPoint?: string): IActionNode;
|
||||
removeNode(targetNode: IActionNode): boolean;
|
||||
removeAllNext(targetNodeId: string): void;
|
||||
getVarNames(currentNode:IActionNode):IActionVariable[];
|
||||
findNodeById(id: string): IActionNode | undefined;
|
||||
toJSON(): any;
|
||||
getRoot(): IActionNode | undefined;
|
||||
createNewId(): string;
|
||||
getColumns(node:IActionNode):number;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -73,16 +91,7 @@ export interface IActionFlow {
|
||||
*/
|
||||
class ActionProperty implements IActionProperty {
|
||||
component: string;
|
||||
props: {
|
||||
// プロパティ名
|
||||
name: string;
|
||||
// プロパティ表示名
|
||||
displayName: string;
|
||||
placeholder: string;
|
||||
hint:string;
|
||||
// プロパティ設定値
|
||||
modelValue: any;
|
||||
};
|
||||
props: IProp;
|
||||
|
||||
static defaultProperty(): IActionProperty {
|
||||
return new ActionProperty('InputText', 'displayName', '表示名', '表示を入力してください', '','');
|
||||
@@ -102,6 +111,7 @@ class ActionProperty implements IActionProperty {
|
||||
displayName: displayName,
|
||||
placeholder: placeholder,
|
||||
hint:hint,
|
||||
connectProps:undefined,
|
||||
modelValue: modelValue
|
||||
};
|
||||
}
|
||||
@@ -121,6 +131,13 @@ export class ActionNode implements IActionNode {
|
||||
get subTitle(): string {
|
||||
return this.name;
|
||||
};
|
||||
|
||||
//変数名
|
||||
get varName():IProp|undefined{
|
||||
const prop = this.actionProps.find((prop) => prop.props.name === "verName");
|
||||
return prop?.props;
|
||||
}
|
||||
|
||||
inputPoint: string;
|
||||
//出力ポイント(条件分岐以外未使用)
|
||||
outputPoints: Array<string>;
|
||||
@@ -168,6 +185,7 @@ export class RootAction implements IActionNode {
|
||||
title: string;
|
||||
subTitle: string;
|
||||
inputPoint: string;
|
||||
varName: IProp | undefined=undefined;
|
||||
//出力ポイント(条件分岐以外未使用)
|
||||
outputPoints: Array<string>;
|
||||
isRoot: boolean;
|
||||
@@ -225,7 +243,7 @@ export class ActionFlow implements IActionFlow {
|
||||
newNode.inputPoint = inputPoint;
|
||||
}
|
||||
if (prevNode !== undefined) {
|
||||
this.connectNodes(prevNode, newNode, inputPoint || '');
|
||||
this.resetNodeRelation(prevNode, newNode, inputPoint || '');
|
||||
} else {
|
||||
prevNode = this.actionNodes[this.actionNodes.length - 1];
|
||||
this.connectNodes(prevNode, newNode, inputPoint || '');
|
||||
@@ -269,9 +287,29 @@ export class ActionFlow implements IActionFlow {
|
||||
return false;
|
||||
}
|
||||
for (const [, id] of targetNode.nextNodeIds) {
|
||||
this.removeAllNext(id);
|
||||
this.removeFromActionNodes(id);
|
||||
this.removeAll(id);
|
||||
}
|
||||
targetNode.nextNodeIds.clear();
|
||||
}
|
||||
|
||||
/***
|
||||
* 目標ノードの次のノードを全部削除する
|
||||
*/
|
||||
removeAll(targetNodeId: string) {
|
||||
if (!targetNodeId || targetNodeId === '') {
|
||||
return;
|
||||
}
|
||||
const targetNode = this.findNodeById(targetNodeId);
|
||||
if (!targetNode) {
|
||||
return
|
||||
}
|
||||
if (targetNode.nextNodeIds.size == 0) {
|
||||
return
|
||||
}
|
||||
for (const [, id] of targetNode.nextNodeIds) {
|
||||
this.removeAll(id);
|
||||
}
|
||||
this.removeNode(targetNode);
|
||||
}
|
||||
|
||||
// 断开与前一个节点的连接
|
||||
@@ -319,8 +357,7 @@ export class ActionFlow implements IActionFlow {
|
||||
if (!nextNodeId) return;
|
||||
const nextNode = this.findNodeById(nextNodeId);
|
||||
if (!nextNode) return;
|
||||
nextNode.prevNodeId = prevNode.id;
|
||||
prevNode.nextNodeIds.set(targetNode.inputPoint || '', nextNodeId);
|
||||
this.connectNodes(prevNode,nextNode,targetNode.inputPoint || '');
|
||||
return;
|
||||
}
|
||||
//二つ以上の場合
|
||||
@@ -354,15 +391,16 @@ export class ActionFlow implements IActionFlow {
|
||||
|
||||
/**
|
||||
*
|
||||
* @param prevNode ノードの接続をリセットする
|
||||
* @param prevNode ノード挿入時の接続をリセットする
|
||||
* @param newNode
|
||||
* @param inputPoint
|
||||
*/
|
||||
resetNodeRelation(prevNode: IActionNode, newNode: IActionNode, inputPoint?: string) {
|
||||
//
|
||||
//元の次のノードを取得
|
||||
const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
|
||||
prevNode.nextNodeIds.set(inputPoint || '', newNode.id);
|
||||
newNode.prevNodeId = prevNode.id;
|
||||
const originalNextNodeId = prevNode.nextNodeIds.get(inputPoint || '');
|
||||
newNode.inputPoint=inputPoint||'';
|
||||
this.setNewNodeNextId(newNode, originalNextNodeId, inputPoint);
|
||||
}
|
||||
|
||||
@@ -374,15 +412,18 @@ export class ActionFlow implements IActionFlow {
|
||||
*/
|
||||
private setNewNodeNextId(newNode: IActionNode, originalNextNodeId: string | undefined, inputPoint?: string) {
|
||||
// 元の接続ノードが存在する
|
||||
if (originalNextNodeId) {
|
||||
// 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
|
||||
if (newNode.outputPoints.includes(inputPoint || '')) {
|
||||
newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
|
||||
} else {
|
||||
// inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
|
||||
const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
|
||||
newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
|
||||
}
|
||||
if (!originalNextNodeId) {return;}
|
||||
const originNextNode = this.findNodeById(originalNextNodeId);
|
||||
if (!originNextNode) {return;}
|
||||
// 新しいノードの outputPoints に該当 inputPointが存在するか場合をチェックする
|
||||
if (newNode.outputPoints.includes(inputPoint || '')) {
|
||||
newNode.nextNodeIds.set(inputPoint || '', originalNextNodeId);
|
||||
originNextNode.prevNodeId=newNode.id;
|
||||
} else {
|
||||
// inputPointが存在しない場合、outputPointのポイントの任意ポートを選択する
|
||||
const alternativeOutputPoint = newNode.outputPoints.length > 0 ? newNode.outputPoints[0] : '';
|
||||
newNode.nextNodeIds.set(alternativeOutputPoint, originalNextNodeId);
|
||||
originNextNode.prevNodeId=newNode.id;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -393,6 +434,36 @@ export class ActionFlow implements IActionFlow {
|
||||
return this.actionNodes.find((node) => node.id === id);
|
||||
}
|
||||
|
||||
getVarNames(currentNode:IActionNode):IActionVariable[]{
|
||||
let varNames:IActionVariable[]=[];
|
||||
if(currentNode.prevNodeId!==undefined){
|
||||
const prevNode=this.findNodeById(currentNode.prevNodeId);
|
||||
if(prevNode!==undefined){
|
||||
varNames = this.getPrevVarNames(prevNode);
|
||||
}
|
||||
}
|
||||
return varNames;
|
||||
}
|
||||
|
||||
getPrevVarNames(prevNode:IActionNode):IActionVariable[]{
|
||||
let varNames:IActionVariable[]=[];
|
||||
if(prevNode.varName!==undefined){
|
||||
varNames.unshift({
|
||||
actionName:prevNode.name,
|
||||
displayName:prevNode.varName.displayName,
|
||||
name:prevNode.varName.modelValue
|
||||
});
|
||||
}
|
||||
if(prevNode.prevNodeId!==undefined){
|
||||
const prevPrevNode=this.findNodeById(prevNode.prevNodeId);
|
||||
if(prevPrevNode!==undefined){
|
||||
const prevVars = this.getPrevVarNames(prevPrevNode);
|
||||
varNames=[...prevVars,...varNames];
|
||||
}
|
||||
}
|
||||
return varNames;
|
||||
}
|
||||
|
||||
toJSON() {
|
||||
return {
|
||||
id: this.id,
|
||||
@@ -400,12 +471,27 @@ export class ActionFlow implements IActionFlow {
|
||||
const { nextNodeIds, ...rest } = node;
|
||||
return {
|
||||
...rest,
|
||||
nextNodeIds: Array.from(nextNodeIds.entries())
|
||||
nextNodeIds: Object.fromEntries(nextNodeIds)
|
||||
};
|
||||
})
|
||||
};
|
||||
}
|
||||
|
||||
getColumns(node:IActionNode):number{
|
||||
let result= 1;
|
||||
if(node.outputPoints && node.outputPoints.length>1){
|
||||
result += node.outputPoints.length -1;
|
||||
}
|
||||
let nextNode;
|
||||
for (const [key, id] of node.nextNodeIds) {
|
||||
nextNode=this.findNodeById(id);
|
||||
if(nextNode){
|
||||
result +=this.getColumns(nextNode)-1;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
getRoot(): IActionNode | undefined {
|
||||
return this.actionNodes.find(node => node.isRoot)
|
||||
}
|
||||
@@ -419,9 +505,9 @@ export class ActionFlow implements IActionFlow {
|
||||
const parsedObject = JSON.parse(json);
|
||||
|
||||
const actionNodes = parsedObject.actionNodes.map((node: any) => {
|
||||
const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoint, node.actionProps)
|
||||
const nodeClass = !node.isRoot ? new ActionNode(node.name, node.title, node.inputPoint, node.outputPoints, node.actionProps)
|
||||
: new RootAction(node.name, node.title, node.subTitle);
|
||||
nodeClass.nextNodeIds = new Map(node.nextNodeIds);
|
||||
nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
|
||||
nodeClass.prevNodeId = node.prevNodeId;
|
||||
nodeClass.id = node.id;
|
||||
return nodeClass;
|
||||
|
||||
@@ -1,112 +1,197 @@
|
||||
import { publicDecrypt } from 'crypto';
|
||||
import {IActionFlow} from './ActionTypes';
|
||||
export interface TreeNode {
|
||||
export interface IKintoneEventNode {
|
||||
label: string;
|
||||
header:string;
|
||||
eventId:string;
|
||||
parentId:string;
|
||||
}
|
||||
|
||||
export interface IKintoneEvent extends TreeNode {
|
||||
eventId: string;
|
||||
export interface IKintoneEvent extends IKintoneEventNode {
|
||||
hasFlow: boolean;
|
||||
flowData?: IActionFlow;
|
||||
}
|
||||
|
||||
export interface IKintoneScreen extends TreeNode {
|
||||
label: string;
|
||||
events: IKintoneEvent[];
|
||||
export interface IKintoneEventGroup extends IKintoneEventNode {
|
||||
events: IKintoneEventNode[];
|
||||
}
|
||||
|
||||
|
||||
export class kintoneEvent implements IKintoneEvent{
|
||||
eventId: string;
|
||||
get hasFlow(): boolean{
|
||||
parentId:string;
|
||||
get hasFlow(): boolean{
|
||||
return this.flowData!==undefined && this.flowData.actionNodes.length>1
|
||||
};
|
||||
flowData?: IActionFlow | undefined;
|
||||
label: string;
|
||||
constructor({eventId,label}:{eventId:string,label:string}){
|
||||
get header():string{
|
||||
return "EVENT";
|
||||
}
|
||||
constructor(label:string,eventId:string,parentId:string){
|
||||
this.eventId=eventId;
|
||||
this.label=label;
|
||||
|
||||
this.parentId=parentId;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export class KintoneEventManager {
|
||||
public screens: IKintoneScreen[];
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
constructor(screens: IKintoneScreen[]) {
|
||||
this.screens = screens;
|
||||
|
||||
export class kintoneEventForChange implements IKintoneEventGroup{
|
||||
eventId: string;
|
||||
parentId:string;
|
||||
label: string;
|
||||
events: IKintoneEventNode[];
|
||||
get header():string{
|
||||
return "CHANGE";
|
||||
}
|
||||
constructor(eventId:string,label:string,events:IKintoneEventNode[],parentId:string){
|
||||
this.eventId=eventId;
|
||||
this.label=label;
|
||||
this.events=events;
|
||||
this.parentId=parentId;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
export class KintoneEventManager {
|
||||
public screens: IKintoneEventGroup[];
|
||||
|
||||
constructor() {
|
||||
this.screens = this.getKintoneEvents();
|
||||
}
|
||||
|
||||
public bindFlows(flows:IActionFlow[]){
|
||||
for (const screen of this.screens) {
|
||||
screen.events.forEach((ev)=>ev.flowData=undefined);
|
||||
}
|
||||
this.screens=this.getKintoneEvents();
|
||||
for (const flow of flows){
|
||||
const eventId =flow.getRoot()?.name;
|
||||
if(eventId!==undefined){
|
||||
const event = this.findEventById(eventId);
|
||||
if(event!==null){
|
||||
const eventNode = this.findEventById(eventId);
|
||||
if(eventNode!==null && eventNode.header==="EVENT"){
|
||||
const event =eventNode as kintoneEvent;
|
||||
event.flowData=flow;
|
||||
}else{
|
||||
//EventGroupのIDを取得
|
||||
const lastIndex = eventId.lastIndexOf(".");
|
||||
const groupId=eventId.substring(0,lastIndex);
|
||||
const eventNode = this.findEventById(groupId);
|
||||
if(eventNode && (eventNode.header==="EVENTGROUP" || eventNode.header==="CHANGE")){
|
||||
const groupEvent=eventNode as kintoneEventGroup;
|
||||
const newEvent =new kintoneEvent(
|
||||
flow.getRoot()?.subTitle || "",
|
||||
eventId,
|
||||
groupEvent.parentId
|
||||
);
|
||||
newEvent.flowData=flow;
|
||||
groupEvent.events.push(newEvent);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public findEventById(eventId: string): IKintoneEvent | null {
|
||||
public findEventById(eventId: string): IKintoneEventNode | null {
|
||||
const screen=this.findScreen(eventId);
|
||||
if(screen) {return screen;}
|
||||
for (const screen of this.screens) {
|
||||
for (const event of screen.events) {
|
||||
if (event.eventId === eventId) {
|
||||
return event;
|
||||
}
|
||||
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):IKintoneScreen|null{
|
||||
for (const screen of this.screens) {
|
||||
if(screen.events.some((ev:IKintoneEvent)=>ev.eventId===eventId)){
|
||||
return screen;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
public findScreen(eventId:string):IKintoneEventGroup|undefined{
|
||||
return this.screens.find(screen=>screen.eventId==eventId);
|
||||
}
|
||||
|
||||
public getKintoneEvents():IKintoneEventGroup[]{
|
||||
return [
|
||||
new kintoneEventGroup("app.record.create","レコード追加画面",[
|
||||
new kintoneEvent('レコード追加画面を表示した後','app.record.create.show',"app.record.create"),
|
||||
new kintoneEvent('保存をクリックしたとき','app.record.create.submit',"app.record.create"),
|
||||
new kintoneEvent('保存が成功したとき','app.record.create.submit.success',"app.record.create"),
|
||||
new kintoneEventForChange('app.record.create.change','フィールドの値を変更したとき',[],"app.record.create"),
|
||||
new kintoneEventGroup('app.record.create.show.customButtonClick','ボタンをクリックした時',[],"app.record.create")
|
||||
],""),
|
||||
new kintoneEventGroup("app.record.detail","レコード詳細画面",[
|
||||
new kintoneEvent('レコード詳細画面を表示した後','app.record.detail.show',"app.record.detail"),
|
||||
new kintoneEvent('レコードを削除するとき','app.record.detail.delete.submit',"app.record.detail"),
|
||||
new kintoneEvent('プロセス管理のアクションを実行したとき','app.record.detail.process.proceed',"app.record.detail"),
|
||||
new kintoneEventGroup('app.record.detail.show.customButtonClick','ボタンをクリックした時',[],"app.record.detail"),
|
||||
],""),
|
||||
new kintoneEventGroup("app.record.edit","レコード編集画面",[
|
||||
new kintoneEvent('レコード編集画面を表示した後','app.record.edit.show',"app.record.edit"),
|
||||
new kintoneEvent('保存をクリックしたとき','app.record.edit.submit',"app.record.edit"),
|
||||
new kintoneEvent('保存が成功したとき','app.record.edit.submit.success',"app.record.edit"),
|
||||
new kintoneEventForChange('app.record.edit.change','フィールドの値を変更したとき',[],"app.record.edit"),
|
||||
new kintoneEventGroup('app.record.edit.show.customButtonClick','ボタンをクリックした時',[],"app.record.edit"),
|
||||
],""),
|
||||
new kintoneEventGroup("app.record.index","レコード一覧画面",[
|
||||
new kintoneEvent('一覧画面を表示した後', 'app.record.index.show',"app.record.index"),
|
||||
new kintoneEvent('インライン編集を開始したとき','app.record.index.edit.show',"app.record.index"),
|
||||
new kintoneEvent('インライン編集の【保存】をクリックしたとき','app.record.index.edit.submit',"app.record.index"),
|
||||
new kintoneEvent('インライン編集の保存が成功したとき', 'app.record.index.edit.submit.success',"app.record.index"),
|
||||
new kintoneEventForChange('app.record.index.edit.change','インライン編集のフィールド値を変更したとき' ,[],"app.record.index"),
|
||||
new kintoneEventGroup('app.record.detail.show.customButtonClick','ボタンをクリックした時',[],"app.record.index"),
|
||||
],"")
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
export const kintoneEvents:KintoneEventManager = new KintoneEventManager([
|
||||
{
|
||||
label:'レコード追加画面',
|
||||
events:[
|
||||
new kintoneEvent({label:'レコード追加画面を表示した後',eventId:'app.record.create.show'}),
|
||||
new kintoneEvent({label:'保存をクリックしたとき',eventId:'app.record.create.submit'}),
|
||||
new kintoneEvent({label:'保存が成功したとき',eventId:'app.record.create.submit.success'}),
|
||||
new kintoneEvent({label:'フィールドの値を変更したとき',eventId:'app.record.create.change'}),
|
||||
]
|
||||
},
|
||||
{
|
||||
label:'レコード詳細画面',
|
||||
events:[
|
||||
new kintoneEvent({label:'レコード詳細画面を表示した後',eventId:'app.record.detail.show'}),
|
||||
new kintoneEvent({label:'レコードを削除するとき',eventId:'app.record.detail.delete.submit'}),
|
||||
new kintoneEvent({label:'プロセス管理のアクションを実行したとき',eventId:'app.record.detail.process.proceed'}),
|
||||
]
|
||||
},
|
||||
{
|
||||
label:'レコード編集画面',
|
||||
events:[new kintoneEvent({label:'レコード編集画面を表示した後',eventId:'app.record.edit.show'}),
|
||||
new kintoneEvent({label:'保存をクリックしたとき',eventId:'app.record.edit.submit'}),
|
||||
new kintoneEvent({label:'保存が成功したとき',eventId:'app.record.edit.submit.success'}),
|
||||
new kintoneEvent({label:'フィールドの値を変更したとき',eventId:'app.record.edit.change'}),
|
||||
]
|
||||
},
|
||||
{
|
||||
label:'レコード一覧画面',
|
||||
events:[
|
||||
new kintoneEvent({label:'一覧画面を表示した後', eventId:'app.record.index.show'}),
|
||||
new kintoneEvent({label:'インライン編集を開始したとき',eventId:'app.record.index.edit.show'}),
|
||||
new kintoneEvent({label:'インライン編集のフィールド値を変更したとき', eventId:'app.record.index.edit.change'}),
|
||||
new kintoneEvent({label:'インライン編集の【保存】をクリックしたとき',eventId:'app.record.index.edit.submit'}),
|
||||
new kintoneEvent({label:'インライン編集の保存が成功したとき', eventId:'app.record.index.edit.submit.success'}),
|
||||
]
|
||||
}
|
||||
]);
|
||||
// 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"),
|
||||
// ],"")
|
||||
// ]);
|
||||
|
||||
@@ -4,10 +4,12 @@
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"dev": "tsc && set \"SOURCE_MAP=true\" && vite build && vite preview",
|
||||
"build": "tsc && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
|
||||
"build:dev":"tsc && set \"SOURCE_MAP=true\" && vite build && xcopy dist\\*.js ..\\..\\backend\\Temp\\ /E /I /Y",
|
||||
"preview": "vite preview"
|
||||
"preview": "vite preview",
|
||||
"ngrok":"ngrok http http://localhost:4173/",
|
||||
"vite":"vite dev"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/jquery": "^3.5.24",
|
||||
|
||||
@@ -78,9 +78,10 @@
|
||||
| 4 | フィールド選択 | FieldInput | システムのフィールドを選択するための入力コンポーネントです。 |
|
||||
| 5 | 選択リスト | SelectBox | 複数のオプションから選択するためのドロップダウンリストです。 |
|
||||
| 6 | 条件式設定 | ConditionInput | 条件式やロジックを入力するためのコンポーネントです。 |
|
||||
| 7 | 色選択 | ColorPicker | 色を設定する(追加予定中) |
|
||||
| 8 | 他のアプリのフィールド選択 | AppFieldPicker | 他のアプリのフィールドを選択する(追加予定中) |
|
||||
| 9 |ユーザー選択 | UserPicker | ユーザーを選択する(追加予定中) |
|
||||
| 7 | イベント設定 |EventSetter | ボタンイベント設定のコンポーネントです。 |
|
||||
| 8 | 色選択 | ColorPicker | 色を設定する(追加予定中) |
|
||||
| 9 | 他のアプリのフィールド選択 | AppFieldPicker | 他のアプリのフィールドを選択する(追加予定中) |
|
||||
| 10 |ユーザー選択 | UserPicker | ユーザーを選択する(追加予定中) |
|
||||
|
||||
## 2.アクションアドインの開発
|
||||
|
||||
@@ -263,4 +264,28 @@ npm run build:dev
|
||||
|
||||
- デプロイの確認:
|
||||
- Azure App Service 拡張機能でデプロイが完了したことを確認します。
|
||||
- ka-addin の URL にアクセスしてアプリケーションが正常に動作しているか確認します。
|
||||
- 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/
|
||||
```
|
||||
@@ -7,7 +7,6 @@ declare global {
|
||||
interface Window { $format: any; }
|
||||
}
|
||||
|
||||
|
||||
interface IAutoNumberingProps{
|
||||
//文書番号を格納する
|
||||
field:IField;
|
||||
@@ -35,7 +34,13 @@ export class AutoNumbering implements IAction{
|
||||
globalThis.window.$format=this.format;
|
||||
this.register();
|
||||
}
|
||||
|
||||
/**
|
||||
* アクションの処理を実装する
|
||||
* @param actionNode アクションノード
|
||||
* @param event Kintoneのイベント
|
||||
* @param context コンテキスト(レコード、変数情報を持っている)
|
||||
* @returns
|
||||
*/
|
||||
async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
|
||||
let result={
|
||||
canNext:false,
|
||||
|
||||
107
plugin/kintone-addins/src/actions/button-add.ts
Normal file
107
plugin/kintone-addins/src/actions/button-add.ts
Normal file
@@ -0,0 +1,107 @@
|
||||
|
||||
import { actionAddins } from ".";
|
||||
import $ from 'jquery';
|
||||
import { IAction, IActionProperty, IActionNode, IActionResult } from "../types/ActionTypes";
|
||||
/**
|
||||
* ボタン配置属性定義
|
||||
*/
|
||||
interface IButtonAddProps {
|
||||
//ボタン表示名
|
||||
buttonName: string;
|
||||
//配置位置
|
||||
position: string;
|
||||
//イベント名
|
||||
eventName:string
|
||||
}
|
||||
|
||||
export class ButtonAddAction implements IAction {
|
||||
name: string;
|
||||
actionProps: IActionProperty[];
|
||||
props: IButtonAddProps;
|
||||
constructor() {
|
||||
this.name = "ボタンの配置";
|
||||
this.actionProps = [];
|
||||
this.props = {
|
||||
buttonName: '',
|
||||
position: '',
|
||||
eventName:''
|
||||
}
|
||||
this.register();
|
||||
}
|
||||
|
||||
/**
|
||||
* アクションの実行を呼び出す
|
||||
* @param actionNode
|
||||
* @param event
|
||||
* @returns
|
||||
*/
|
||||
async process(actionNode: IActionNode, event: any): Promise<IActionResult> {
|
||||
let result = {
|
||||
canNext: true,
|
||||
result: false
|
||||
};
|
||||
try {
|
||||
this.actionProps = actionNode.actionProps;
|
||||
if (!('buttonName' in actionNode.ActionValue) && !('position' in actionNode.ActionValue)) {
|
||||
return result
|
||||
}
|
||||
this.props = actionNode.ActionValue as IButtonAddProps;
|
||||
//ボタンを配置する
|
||||
const menuSpace = kintone.app.record.getHeaderMenuSpaceElement();
|
||||
if(!menuSpace) return result;
|
||||
if($("style#alc-button-add").length===0){
|
||||
const css=`
|
||||
.alc-button-normal {
|
||||
display: inline-block;
|
||||
box-sizing: border-box;
|
||||
padding: 0 16px;
|
||||
margin-left: 16px;
|
||||
margin-top: 8px;
|
||||
min-width: 100px;
|
||||
outline: none;
|
||||
border: 1px solid #e3e7e8;
|
||||
background-color: #f7f9fa;
|
||||
box-shadow: 1px 1px 1px #fff inset;
|
||||
color: #3498db;
|
||||
text-align: center;
|
||||
line-height: 32px;
|
||||
}
|
||||
.alc-button-normal:hover {
|
||||
background-color: #c8d6dd;
|
||||
box-shadow: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
.alc-button-normal:active {
|
||||
color: #f7f9fa;
|
||||
background-color: #54b8eb;
|
||||
}`;
|
||||
const style = $("<style id='alc-button-add'>/<style>");
|
||||
style.text(css);
|
||||
$("head").append(style);
|
||||
}
|
||||
const button =$(`<button id='${this.props.eventName}' class='alc-button-normal' >${this.props.buttonName}</button>`);
|
||||
if(this.props.position==="一番左に追加する"){
|
||||
$(menuSpace).prepend(button);
|
||||
}else{
|
||||
$(menuSpace).append(button);
|
||||
}
|
||||
const clickEventName = `${event.type}.customButtonClick.${this.props.eventName}`;
|
||||
button.on("click",()=>{
|
||||
$(document).trigger(clickEventName,event);
|
||||
});
|
||||
return result;
|
||||
} catch (error) {
|
||||
event.error = error;
|
||||
console.error(error);
|
||||
result.canNext = false;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
register(): void {
|
||||
actionAddins[this.name] = this;
|
||||
}
|
||||
|
||||
}
|
||||
new ButtonAddAction();
|
||||
109
plugin/kintone-addins/src/actions/condition-action.ts
Normal file
109
plugin/kintone-addins/src/actions/condition-action.ts
Normal file
@@ -0,0 +1,109 @@
|
||||
|
||||
import { actionAddins } from ".";
|
||||
import { IAction,IActionResult, IActionNode, IActionProperty, IContext } from "../types/ActionTypes";
|
||||
import { ConditionTree } from '../types/Conditions';
|
||||
/**
|
||||
* アクションの属性定義
|
||||
*/
|
||||
interface ICondition{
|
||||
condition:string;
|
||||
verName:string;
|
||||
}
|
||||
/**
|
||||
* 条件分岐アクション
|
||||
*/
|
||||
export class ConditionAction implements IAction{
|
||||
name: string;
|
||||
actionProps: IActionProperty[];
|
||||
props:ICondition;
|
||||
constructor(){
|
||||
this.name="条件式";
|
||||
this.actionProps=[];
|
||||
this.props={
|
||||
condition:'',
|
||||
verName:''
|
||||
}
|
||||
//アクションを登録する
|
||||
this.register();
|
||||
}
|
||||
/**
|
||||
* アクションの実行を呼び出す
|
||||
* @param actionNode
|
||||
* @param event
|
||||
* @returns
|
||||
*/
|
||||
async process(actionNode:IActionNode,event:any,context:IContext):Promise<IActionResult> {
|
||||
let result={
|
||||
canNext:true,
|
||||
result:''
|
||||
};
|
||||
try{
|
||||
//属性設定を取得する
|
||||
this.actionProps=actionNode.actionProps;
|
||||
if (!('condition' in actionNode.ActionValue) && !('verName' in actionNode.ActionValue)) {
|
||||
return result
|
||||
}
|
||||
this.props = actionNode.ActionValue as ICondition;
|
||||
//条件式の計算結果を取得
|
||||
const conditionResult = this.getConditionResult(context);
|
||||
console.log("条件計算結果:",conditionResult);
|
||||
if(conditionResult){
|
||||
result= {
|
||||
canNext:true,
|
||||
result:'はい'
|
||||
}
|
||||
}else{
|
||||
result= {
|
||||
canNext:true,
|
||||
result:'いいえ'
|
||||
}
|
||||
}
|
||||
if(this.props.verName){
|
||||
context.variables[this.props.verName]=result.result;
|
||||
}
|
||||
return result;
|
||||
}catch(error){
|
||||
event.error=error;
|
||||
console.error(error);
|
||||
result.canNext=false;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
/**
|
||||
*
|
||||
* @param context 条件式を実行する
|
||||
* @returns
|
||||
*/
|
||||
getConditionResult(context:any):boolean{
|
||||
const tree =this.getCondition(this.props.condition);
|
||||
if(!tree){
|
||||
//条件を設定されていません
|
||||
return true;
|
||||
}
|
||||
return tree.evaluate(tree.root,context);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param condition 条件式ツリーを取得する
|
||||
* @returns
|
||||
*/
|
||||
getCondition(condition:string):ConditionTree|null{
|
||||
try{
|
||||
const tree = new ConditionTree();
|
||||
tree.fromJson(condition);
|
||||
if(tree.getConditions(tree.root).length>0){
|
||||
return tree;
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
}catch(error){
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
register(): void {
|
||||
actionAddins[this.name]=this;
|
||||
}
|
||||
|
||||
}
|
||||
new ConditionAction();
|
||||
@@ -2,24 +2,26 @@
|
||||
import { actionAddins } from ".";
|
||||
import { IAction, IActionProperty, IActionNode, IContext, IActionResult } from "../types/ActionTypes";
|
||||
import { ConditionTree } from '../types/Conditions';
|
||||
|
||||
/**
|
||||
* アクションの属性定義
|
||||
*/
|
||||
interface IErrorShowProps {
|
||||
message: string;
|
||||
condition: string;
|
||||
}
|
||||
}
|
||||
|
||||
export class ErrorShowAction implements IAction {
|
||||
name: string;
|
||||
actionProps: IActionProperty[];
|
||||
props: IErrorShowProps;
|
||||
constructor() {
|
||||
name: string;
|
||||
actionProps: IActionProperty[]; //调用从import导入关于显示类的定义
|
||||
props: IErrorShowProps;//从上方的interface 定义这个props所需要接受的属性
|
||||
constructor() { //解构函数定义需要的类名
|
||||
this.name = "エラー表示";
|
||||
this.actionProps = [];
|
||||
this.props = {
|
||||
message: '',
|
||||
condition: ''
|
||||
}
|
||||
this.register();
|
||||
this.register(); //重置以上注册表
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -28,20 +30,20 @@ export class ErrorShowAction implements IAction {
|
||||
* @param event
|
||||
* @returns
|
||||
*/
|
||||
async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> {
|
||||
let result = {
|
||||
async process(actionNode: IActionNode, event: any, context: IContext): Promise<IActionResult> { //异步处理某函数下的:xx属性
|
||||
let result = {
|
||||
canNext: true,
|
||||
result: false
|
||||
};
|
||||
try {
|
||||
try { //尝试执行以下代码部分
|
||||
this.actionProps = actionNode.actionProps;
|
||||
if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) {
|
||||
if (!('message' in actionNode.ActionValue) && !('condition' in actionNode.ActionValue)) { //如果message以及condition两者都不存在的情况下return
|
||||
return result
|
||||
}
|
||||
this.props = actionNode.ActionValue as IErrorShowProps;
|
||||
const conditionResult = this.getConditionResult(context);
|
||||
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,
|
||||
|
||||
@@ -14,14 +14,58 @@ declare const alcflow : {
|
||||
};
|
||||
|
||||
$(function (){
|
||||
const getChangeEvents=(events:string[])=>{
|
||||
return events.filter((event)=>event.includes(".change."));
|
||||
}
|
||||
const getClickEvents=(events:string[])=>{
|
||||
return events.filter((event)=>event.includes(".customButtonClick."));
|
||||
}
|
||||
const getKintoneEvents=(events:string[])=>{
|
||||
return events.filter((event)=>{
|
||||
return !event.includes(".customButtonClick.") && !event.includes(".change.")
|
||||
});
|
||||
}
|
||||
const events=Object.keys(alcflow);
|
||||
kintone.events.on(events,async (event:any)=>{
|
||||
const flowinfo = alcflow[event.type];
|
||||
const flow=ActionFlow.fromJSON(flowinfo.content);
|
||||
if(flow!==undefined){
|
||||
const process = new ActionProcess(event.type,flow,event);
|
||||
await process.exec();
|
||||
}
|
||||
return event;
|
||||
});
|
||||
const changeEvents = getChangeEvents(events);
|
||||
const clickEvents = getClickEvents(events);
|
||||
const kintoneEvents = getKintoneEvents(events);
|
||||
if(kintoneEvents.length>0 ){
|
||||
//通常Kintoneイベントをバンド
|
||||
kintone.events.on(kintoneEvents,async (event:any)=>{
|
||||
const flowinfo = alcflow[event.type];
|
||||
const flow=ActionFlow.fromJSON(flowinfo.content);
|
||||
if(flow!==undefined){
|
||||
const process = new ActionProcess(event.type,flow,event);
|
||||
await process.exec();
|
||||
}
|
||||
return event;
|
||||
});
|
||||
}
|
||||
if(changeEvents.length>0){
|
||||
//値変更イベントをバンドする
|
||||
kintone.events.on(changeEvents,(event:any)=>{
|
||||
const flowinfo = alcflow[event.type];
|
||||
const flow=ActionFlow.fromJSON(flowinfo.content);
|
||||
if(flow!==undefined){
|
||||
const process = new ActionProcess(event.type,flow,event);
|
||||
process.exec();
|
||||
}
|
||||
return event;
|
||||
});
|
||||
}
|
||||
if(clickEvents.length>0){
|
||||
clickEvents.forEach((eventName:string)=>{
|
||||
$(document).on(eventName,async ()=>{
|
||||
const event=kintone.app.record.get();
|
||||
const flowinfo = alcflow[eventName];
|
||||
const flow=ActionFlow.fromJSON(flowinfo.content);
|
||||
if(flow!==undefined){
|
||||
const process = new ActionProcess(eventName,flow,event);
|
||||
await process.exec();
|
||||
}
|
||||
const record = event.record;
|
||||
kintone.app.record.set({record})
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
@@ -157,19 +157,19 @@ export class ActionNode implements IActionNode {
|
||||
prevNodeId?: string;
|
||||
nextNodeIds: Map<string, string>;
|
||||
constructor(
|
||||
{id,name,title,inputPoint,outputPoint,actionProps}:
|
||||
{id,name,title,inputPoint,outputPoints,actionProps}:
|
||||
{
|
||||
id:string,
|
||||
name: string,
|
||||
title: string,
|
||||
inputPoint: string,
|
||||
outputPoint: Array<string>,
|
||||
outputPoints: Array<string>,
|
||||
actionProps: Array<IActionProperty>}
|
||||
) {
|
||||
this.id=id;
|
||||
this.name = name;
|
||||
this.inputPoint = inputPoint;
|
||||
this.outputPoints = outputPoint;
|
||||
this.outputPoints = outputPoints;
|
||||
const defProp = ActionProperty.defaultProperty();
|
||||
defProp.props.modelValue = title;
|
||||
this.actionProps = actionProps;
|
||||
@@ -257,7 +257,7 @@ export class ActionFlow implements IActionFlow {
|
||||
const actionNodes = parsedObject.actionNodes.map((node: any) => {
|
||||
const nodeClass = !node.isRoot ? new ActionNode(node)
|
||||
: new RootAction(node);
|
||||
nodeClass.nextNodeIds = new Map(node.nextNodeIds);
|
||||
nodeClass.nextNodeIds = new Map<string,string>(Object.entries(node.nextNodeIds));
|
||||
nodeClass.prevNodeId = node.prevNodeId;
|
||||
nodeClass.id = node.id;
|
||||
return nodeClass;
|
||||
|
||||
@@ -324,12 +324,17 @@ export class ConditionTree {
|
||||
*/
|
||||
getObjectValue(object:any,context:IContext){
|
||||
if(!object || typeof object!=="object" || !("objectType" in object)){
|
||||
return object;
|
||||
return undefined;
|
||||
}
|
||||
if(object.objectType==='field'){
|
||||
return context.record[object.code].value;
|
||||
}else if(object.objectType==='var'){
|
||||
return context.variables[object.varName].value;
|
||||
const fieldValue = context.record[object.code];
|
||||
if(fieldValue.type==='NUMBER' && fieldValue.value!==undefined){
|
||||
return Number(fieldValue.value);
|
||||
}else{
|
||||
return fieldValue.value;
|
||||
}
|
||||
}else if(object.objectType==='variable'){
|
||||
return context.variables[object.name].value;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -397,6 +402,12 @@ export class ConditionTree {
|
||||
*/
|
||||
compare(operator: Operator, targetValue: any, value: any): boolean {
|
||||
// targetValue は日期时,value も日期に変換して比較する
|
||||
if(targetValue===undefined || targetValue===null||targetValue===''){
|
||||
if(value===undefined || value===null||value===''){
|
||||
targetValue='';
|
||||
value='';
|
||||
}
|
||||
}
|
||||
if (targetValue instanceof Date) {
|
||||
const dateValue = new Date(value);
|
||||
if (!isNaN(dateValue.getTime())) {
|
||||
|
||||
@@ -3,6 +3,9 @@ import { actionAddins } from "../actions";
|
||||
import '../actions/must-input';
|
||||
import '../actions/auto-numbering';
|
||||
import '../actions/field-shown';
|
||||
import '../actions/error-show';
|
||||
import '../actions/button-add';
|
||||
import '../actions/condition-action';
|
||||
import { ActionFlow,IActionFlow, IActionResult,IContext } from "./ActionTypes";
|
||||
|
||||
export class ActionProcess{
|
||||
@@ -35,7 +38,11 @@ export class ActionProcess{
|
||||
if(action!==undefined){
|
||||
result = await action.process(nextAction,this.event,this.context);
|
||||
}
|
||||
const nextInput = nextAction.outputPoints!==undefined?result.result||'':'';
|
||||
let nextInput = '';
|
||||
//outputPoints一つ以上の場合、次のInputPointは戻り値を設定する
|
||||
if(nextAction.outputPoints && nextAction.outputPoints.length>1){
|
||||
nextInput = result.result||'';
|
||||
}
|
||||
id=nextAction.nextNodeIds.get(nextInput);
|
||||
if(id===undefined) return;
|
||||
nextAction = this.flow.findNodeById(id);
|
||||
|
||||
244
sample.json
244
sample.json
@@ -1,33 +1,215 @@
|
||||
[
|
||||
{
|
||||
"component": "FieldInput",
|
||||
"props": {
|
||||
"displayName": "フィールド",
|
||||
"modelValue": {},
|
||||
"name": "field",
|
||||
"placeholder": "対象項目を選択してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "SelectBox",
|
||||
"props": {
|
||||
"displayName": "表示/非表示",
|
||||
"options": [
|
||||
"表示",
|
||||
"非表示"
|
||||
{
|
||||
"id": "",
|
||||
"actionNodes": [
|
||||
{
|
||||
"id": "cdd696f5-7e9c-4fd7-bf8b-9cd1b1605870",
|
||||
"name": "app.record.create.submit",
|
||||
"title": "レコード追加画面",
|
||||
"subTitle": "保存をクリックしたとき",
|
||||
"inputPoint": "",
|
||||
"outputPoints": [],
|
||||
"isRoot": true,
|
||||
"actionProps": [],
|
||||
"ActionValue": {},
|
||||
"nextNodeIds": [
|
||||
[
|
||||
"",
|
||||
"dfa6df09-7b3e-4848-89ad-2e9147004f31"
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "dfa6df09-7b3e-4848-89ad-2e9147004f31",
|
||||
"name": "自動採番する",
|
||||
"inputPoint": "",
|
||||
"outputPoints": [],
|
||||
"actionProps": [
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"name": "displayName",
|
||||
"displayName": "表示名",
|
||||
"placeholder": "表示を入力してください",
|
||||
"hint": "",
|
||||
"modelValue": "文書番号を自動採番する"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "FieldInput",
|
||||
"props": {
|
||||
"displayName": "採番項目",
|
||||
"modelValue": {
|
||||
"name": "文書番号",
|
||||
"type": "SINGLE_LINE_TEXT",
|
||||
"code": "文書番号",
|
||||
"label": "文書番号",
|
||||
"noLabel": false,
|
||||
"required": false,
|
||||
"minLength": "",
|
||||
"maxLength": "",
|
||||
"expression": "",
|
||||
"hideExpression": false,
|
||||
"unique": false,
|
||||
"defaultValue": ""
|
||||
},
|
||||
"name": "field",
|
||||
"placeholder": "採番項目を選択してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"displayName": "フォーマット",
|
||||
"modelValue": "000000",
|
||||
"name": "format",
|
||||
"placeholder": "数値書式文字列を指定します"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"displayName": "前につける文字列",
|
||||
"modelValue": "",
|
||||
"name": "prefix",
|
||||
"placeholder": "前につける文字列を入力してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"displayName": "後ろにつける文字列",
|
||||
"modelValue": "{$format('yyyyMMdd')}",
|
||||
"name": "suffix",
|
||||
"placeholder": "後ろにつける文字列を入力してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"displayName": "結果(戻り値)",
|
||||
"modelValue": "docNumber",
|
||||
"name": "verName",
|
||||
"placeholder": "変数名を入力してください"
|
||||
}
|
||||
}
|
||||
],
|
||||
"modelValue": "",
|
||||
"name": "show",
|
||||
"placeholder": ""
|
||||
"prevNodeId": "cdd696f5-7e9c-4fd7-bf8b-9cd1b1605870",
|
||||
"nextNodeIds": [
|
||||
[
|
||||
"",
|
||||
"b32bf329-f05a-486f-9b79-9920b57fe324"
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "b32bf329-f05a-486f-9b79-9920b57fe324",
|
||||
"name": "条件式",
|
||||
"inputPoint": "",
|
||||
"outputPoints": [
|
||||
"はい",
|
||||
"いいえ"
|
||||
],
|
||||
"actionProps": [
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"name": "displayName",
|
||||
"displayName": "表示名",
|
||||
"placeholder": "表示を入力してください",
|
||||
"hint": "",
|
||||
"modelValue": "条件式を設定する"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "ConditionInput",
|
||||
"props": {
|
||||
"displayName": "条件",
|
||||
"modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"部署\",\"objectType\":\"field\",\"type\":\"DROP_DOWN\",\"code\":\"ドロップダウン\",\"label\":\"部署\",\"noLabel\":false,\"required\":false,\"options\":{\"総務\":{\"label\":\"総務\",\"index\":\"2\"},\"サポート\":{\"label\":\"サポート\",\"index\":\"3\"},\"マーケティング\":{\"label\":\"マーケティング\",\"index\":\"1\"},\"営業\":{\"label\":\"営業\",\"index\":\"0\"},\"開発\":{\"label\":\"開発\",\"index\":\"4\"}},\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":2,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"所感、学び\",\"objectType\":\"field\",\"type\":\"MULTI_LINE_TEXT\",\"code\":\"文字列__複数行__0\",\"label\":\"所感、学び\",\"noLabel\":false,\"required\":false,\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":3,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"業務内容\",\"objectType\":\"field\",\"type\":\"MULTI_LINE_TEXT\",\"code\":\"文字列__複数行_\",\"label\":\"業務内容\",\"noLabel\":false,\"required\":false,\"defaultValue\":\"\"},\"operator\":\"!=\",\"value\":\"\"},{\"index\":4,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"name\":\"ステータス\",\"objectType\":\"field\",\"type\":\"STATUS\",\"code\":\"ステータス\",\"label\":\"ステータス\",\"enabled\":true},\"operator\":\"=\",\"value\":\"作成中\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
|
||||
"name": "condition",
|
||||
"placeholder": "条件式を設定してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"displayName": "結果(戻り値)",
|
||||
"modelValue": "conditionResult",
|
||||
"name": "verName",
|
||||
"placeholder": "変数名を入力してください"
|
||||
}
|
||||
}
|
||||
],
|
||||
"prevNodeId": "dfa6df09-7b3e-4848-89ad-2e9147004f31",
|
||||
"nextNodeIds": [
|
||||
[
|
||||
"いいえ",
|
||||
"82bdcbcc-d8c1-4e2c-b38f-f736c95b193a"
|
||||
]
|
||||
]
|
||||
},
|
||||
{
|
||||
"id": "82bdcbcc-d8c1-4e2c-b38f-f736c95b193a",
|
||||
"name": "表示/非表示",
|
||||
"inputPoint": "いいえ",
|
||||
"outputPoints": [],
|
||||
"actionProps": [
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"name": "displayName",
|
||||
"displayName": "表示名",
|
||||
"placeholder": "表示を入力してください",
|
||||
"hint": "",
|
||||
"modelValue": "指定項目の表示・非表示を設定する"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "FieldInput",
|
||||
"props": {
|
||||
"displayName": "フィールド",
|
||||
"modelValue": {
|
||||
"name": "文書番号",
|
||||
"type": "SINGLE_LINE_TEXT",
|
||||
"code": "文書番号",
|
||||
"label": "文書番号",
|
||||
"noLabel": false,
|
||||
"required": false,
|
||||
"minLength": "",
|
||||
"maxLength": "",
|
||||
"expression": "",
|
||||
"hideExpression": false,
|
||||
"unique": false,
|
||||
"defaultValue": ""
|
||||
},
|
||||
"name": "field",
|
||||
"placeholder": "対象項目を選択してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "SelectBox",
|
||||
"props": {
|
||||
"displayName": "表示/非表示",
|
||||
"options": [
|
||||
"表示",
|
||||
"非表示"
|
||||
],
|
||||
"modelValue": "非表示",
|
||||
"name": "show",
|
||||
"placeholder": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "ConditionInput",
|
||||
"props": {
|
||||
"displayName": "条件",
|
||||
"modelValue": "{\"index\":0,\"type\":\"root\",\"children\":[{\"index\":1,\"type\":\"condition\",\"parent\":\"root\",\"object\":{},\"operator\":\"=\",\"value\":\"\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
|
||||
"name": "condition",
|
||||
"placeholder": "条件式を設定してください"
|
||||
}
|
||||
}
|
||||
],
|
||||
"prevNodeId": "b32bf329-f05a-486f-9b79-9920b57fe324",
|
||||
"nextNodeIds": []
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "ConditionInput",
|
||||
"props": {
|
||||
"displayName": "条件",
|
||||
"modelValue": "",
|
||||
"name": "condition",
|
||||
"placeholder": "対象項目を選択してください"
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
94
sample2.json
94
sample2.json
@@ -1,59 +1,37 @@
|
||||
{
|
||||
"index": 0,
|
||||
"type": "root",
|
||||
"children": [
|
||||
{
|
||||
"index": 1,
|
||||
"type": "condition",
|
||||
"parent": "root",
|
||||
"logicalOperator": "AND",
|
||||
"object": {
|
||||
"label": "Field 1",
|
||||
"value": "field1"
|
||||
},
|
||||
"operator": "=",
|
||||
"value": "1"
|
||||
},
|
||||
{
|
||||
"index": 2,
|
||||
"type": "condition",
|
||||
"parent": "root",
|
||||
"logicalOperator": "AND",
|
||||
"object": {
|
||||
"label": "Field 1",
|
||||
"value": "field1"
|
||||
},
|
||||
"operator": "=",
|
||||
"value": "2"
|
||||
},
|
||||
{
|
||||
"index": 3,
|
||||
"type": "condition",
|
||||
"parent": "root",
|
||||
"logicalOperator": "AND",
|
||||
"object": {
|
||||
"label": "Field 1",
|
||||
"value": "field1"
|
||||
},
|
||||
"operator": {
|
||||
"label": ">",
|
||||
"value": "Greater"
|
||||
},
|
||||
"value": "3"
|
||||
},
|
||||
{
|
||||
"index": 4,
|
||||
"type": "condition",
|
||||
"parent": "root",
|
||||
"logicalOperator": "AND",
|
||||
"object": {
|
||||
"label": "Field 1",
|
||||
"value": "field1"
|
||||
},
|
||||
"operator": "=",
|
||||
"value": "4"
|
||||
[
|
||||
{
|
||||
"component": "InputText",
|
||||
"props": {
|
||||
"displayName": "ボタン名",
|
||||
"modelValue": "",
|
||||
"name": "buttonName",
|
||||
"placeholder": "ボタンのラベルを入力してください"
|
||||
}
|
||||
],
|
||||
"parent": null,
|
||||
"logicalOperator": "AND"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "SelectBox",
|
||||
"props": {
|
||||
"displayName": "追加位置",
|
||||
"modelValue": "",
|
||||
"name": "position",
|
||||
"options":[
|
||||
"一番右に追加する",
|
||||
"一番左に追加する"
|
||||
],
|
||||
"placeholder": "追加位置を選択してください"
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": "EventSetter",
|
||||
"props": {
|
||||
"displayName": "イベント名",
|
||||
"modelValue": "",
|
||||
"name": "eventName",
|
||||
"connectProps":[{
|
||||
"key":"displayName",
|
||||
"propName":"buttonName"
|
||||
}],
|
||||
"placeholder": "イベント名を入力してください"
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user