ActionFlow障害修正

2024-02-25 02:52:06 +09:00
parent 4102ff5522
commit d1ec123c8b
6 changed files with 400 additions and 88 deletions
--- a/frontend/src/components/FieldList.vue
+++ b/frontend/src/components/FieldList.vue
@@ -1,6 +1,9 @@
 <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)" :columns="columns" :rows="rows" />
+    <q-table flat bordered :loading="!isLoaded" row-key="name" :selection="type"
+    :selected="modelValue"
+    @update:selected="$emit('update:modelValue', $event)"
+    :columns="columns" :rows="rows" />
  </div>
 </template>
 <script>
--- a/frontend/src/types/ActionTypes.ts
+++ b/frontend/src/types/ActionTypes.ts
@@ -283,9 +283,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);
  }

  // 断开与前一个节点的连接
@@ -447,7 +467,7 @@ export class ActionFlow implements IActionFlow {
        const { nextNodeIds, ...rest } = node;
        return {
          ...rest,
-          nextNodeIds: Array.from(nextNodeIds.entries())
+          nextNodeIds: Object.fromEntries(nextNodeIds)
        };
      })
    };
@@ -466,9 +486,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;
--- a/plugin/kintone-addins/src/actions/auto-numbering.ts
+++ b/plugin/kintone-addins/src/actions/auto-numbering.ts
@@ -7,7 +7,6 @@ declare global {
    interface Window { $format: any; }  
 }

-
 interface IAutoNumberingProps{
    //文書番号を格納する
    field:IField;
--- a/plugin/kintone-addins/src/types/Conditions.ts
+++ b/plugin/kintone-addins/src/types/Conditions.ts
@@ -333,7 +333,7 @@ export class ConditionTree {
      }else{
        return fieldValue.value;
      }      
-    }else if(object.objectType==='var'){
+    }else if(object.objectType==='variable'){
      return context.variables[object.varName].value;
    }
  }
--- a/sample.json
+++ b/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": "対象項目を選択してください"
-    }
-  }
-]
+  ]
+}
--- a/sample2.json
+++ b/sample2.json
@@ -1,59 +1,167 @@
 {
-    "index": 0,
-    "type": "root",
-    "children": [
+    "id": "e4929dfe-32bb-448a-bd66-83c19dad9c79",
+    "actionNodes": [
        {
-            "index": 1,
-            "type": "condition",
-            "parent": "root",
-            "logicalOperator": "AND",
-            "object": {
-                "label": "Field 1",
-                "value": "field1"
-            },
-            "operator": "=",
-            "value": "1"
+            "id": "06388b74-ef56-4ba2-9fba-2dbde999c34d",
+            "name": "app.record.create.submit",
+            "title": "レコード追加画面",
+            "subTitle": "保存をクリックしたとき",
+            "inputPoint": "",
+            "outputPoints": [],
+            "isRoot": true,
+            "actionProps": [],
+            "ActionValue": {},
+            "nextNodeIds": {
+                "": "5963b63a-bfea-49d0-9a8e-b57abe99e2a7"
+            }
        },
        {
-            "index": 2,
-            "type": "condition",
-            "parent": "root",
-            "logicalOperator": "AND",
-            "object": {
-                "label": "Field 1",
-                "value": "field1"
-            },
-            "operator": "=",
-            "value": "2"
+            "id": "5963b63a-bfea-49d0-9a8e-b57abe99e2a7",
+            "name": "自動採番する",
+            "inputPoint": "",
+            "outputPoints": [],
+            "actionProps": [
+                {
+                    "component": "InputText",
+                    "props": {
+                        "name": "displayName",
+                        "displayName": "表示名",
+                        "placeholder": "表示を入力してください",
+                        "hint": "",
+                        "modelValue": "文書番号を自動採番する"
+                    }
+                },
+                {
+                    "component": "FieldInput",
+                    "props": {
+                        "displayName": "採番項目",
+                        "modelValue": {},
+                        "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": "",
+                        "name": "suffix",
+                        "placeholder": "後ろにつける文字列を入力してください"
+                    }
+                },
+                {
+                    "component": "InputText",
+                    "props": {
+                        "displayName": "結果（戻り値）",
+                        "modelValue": "DocumentNo",
+                        "name": "verName",
+                        "placeholder": "変数名を入力してください"
+                    }
+                }
+            ],
+            "prevNodeId": "06388b74-ef56-4ba2-9fba-2dbde999c34d",
+            "nextNodeIds": {
+                "": "f1fb6e7c-540c-4fcc-8d30-bd22aed7f923"
+            }
        },
        {
-            "index": 3,
-            "type": "condition",
-            "parent": "root",
-            "logicalOperator": "AND",
-            "object": {
-                "label": "Field 1",
-                "value": "field1"
-            },
-            "operator": {
-                "label": ">",
-                "value": "Greater"
-            },
-            "value": "3"
+            "id": "f1fb6e7c-540c-4fcc-8d30-bd22aed7f923",
+            "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\":\"STATUS\",\"code\":\"ステータス\",\"label\":\"ステータス\",\"enabled\":true},\"operator\":\"=\",\"value\":\"作成中\"},{\"index\":2,\"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\":4,\"type\":\"condition\",\"parent\":\"root\",\"object\":{\"objectType\":\"variable\",\"actionName\":\"自動採番する\",\"displayName\":\"結果（戻り値）\",\"name\":\"DocumentNo\"},\"operator\":\"=\",\"value\":\"\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
+                        "name": "condition",
+                        "placeholder": "条件式を設定してください"
+                    }
+                },
+                {
+                    "component": "InputText",
+                    "props": {
+                        "displayName": "結果（戻り値）",
+                        "modelValue": "conditionValue",
+                        "name": "verName",
+                        "placeholder": "変数名を入力してください"
+                    }
+                }
+            ],
+            "prevNodeId": "5963b63a-bfea-49d0-9a8e-b57abe99e2a7",
+            "nextNodeIds": {
+                "いいえ": "81987177-746f-44f2-8cd5-acf52ebb83bb"
+            }
        },
        {
-            "index": 4,
-            "type": "condition",
-            "parent": "root",
-            "logicalOperator": "AND",
-            "object": {
-                "label": "Field 1",
-                "value": "field1"
-            },
-            "operator": "=",
-            "value": "4"
+            "id": "81987177-746f-44f2-8cd5-acf52ebb83bb",
+            "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\":{\"objectType\":\"variable\",\"actionName\":\"条件式\",\"displayName\":\"結果（戻り値）\",\"name\":\"conditionValue\"},\"operator\":\"=\",\"value\":\"いいえ\"}],\"parent\":null,\"logicalOperator\":\"AND\"}",
+                        "name": "condition",
+                        "placeholder": "条件を選択または入力してください"
+                    }
+                },
+                {
+                    "component": "MuiltInputText",
+                    "props": {
+                        "displayName": "エラーメッセージ",
+                        "modelValue": "",
+                        "name": "message",
+                        "placeholder": "エラーメッセージを入力してください"
+                    }
+                }
+            ],
+            "prevNodeId": "f1fb6e7c-540c-4fcc-8d30-bd22aed7f923",
+            "nextNodeIds": {}
        }
-    ],
-    "parent": null,
-    "logicalOperator": "AND"
+    ]
 }