From 1dd0ec37d5af59c21443c545fde4e1a4abe00c3c Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Tue, 6 Sep 2022 15:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/template/default/model_card_flow.ftl    | 47 +++++++++++++---------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
index d6898fb..4b12bfe 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
@@ -546,7 +546,7 @@
     },
     {
       "page": {
-        "id": "id182f81da2e3",
+        "id": "${newId()}",
         "type": "fx-dialog",
         "props": {
           "title": "审批意见",
@@ -559,7 +559,7 @@
       },
       "graph": {
         "shape": "panel",
-        "id": "root_panel",
+        "id": "${newId()}",
         "type": "fx-split-panel",
         "props": {
           "horizontal": false,
@@ -567,7 +567,7 @@
         },
         "children": [
           {
-            "id": "182f81da2e6",
+            "id": "${newId()}",
             "type": "fx-split-panel",
             "shape": "panel",
             "props": {
@@ -576,28 +576,32 @@
             "children": [
               {
                 "shape": "panel",
-                "id": "form_panel",
+                "id": "${newId()}",
                 "type": "fx-form-panel",
                 "props": {
+                  "name": "dlgOptForm",
                   "colNum": 1,
                   "paddingTop": 24,
                   "size": "0"
                 },
                 "children": [
                   {
-                    "id": "id182f81da30b",
+                    "id": "${newId()}",
                     "type": "fx-select",
                     "props": {
+                      "name":"flowSelComment",
                       "label": "备选意见",
                       "clearable": true,
                       "labelWidth": 100,
                       "affixError": true,
+                      "dataset": "dlgOpt",
+                      "field": "selComment",
                       "size": "default"
                     },
                     "events": {}
                   },
                   {
-                    "id": "id182f81da30e",
+                    "id": "${newId()}",
                     "type": "fx-textarea",
                     "props": {
                       "label": "处理意见",
@@ -606,8 +610,8 @@
                       "labelWidth": 100,
                       "affixError": true,
                       "size": "default",
-                      "dataset": "ds_182edc699cc",
-                      "field": "id_182edc699cd",
+                      "dataset": "dlgOpt",
+                      "field": "comment",
                       "rows": 4
                     },
                     "events": {}
@@ -615,7 +619,7 @@
                 ]
               },
               {
-                "id": "182f81da311",
+                "id": "${newId()}",
                 "type": "fx-form-panel",
                 "shape": "panel",
                 "props": {},
@@ -624,7 +628,7 @@
             ]
           },
           {
-            "id": "182f81da2e7",
+            "id": "${newId()}",
             "type": "fx-form-panel",
             "shape": "panel",
             "props": {
@@ -632,7 +636,7 @@
             },
             "children": [
               {
-                "id": "id182f81da2e8",
+                "id": "${newId()}",
                 "type": "fx-divider",
                 "props": {
                   "label": "",
@@ -654,7 +658,7 @@
             },
             "children": [
               {
-                "id": "id182f81da303",
+                "id": "${newId()}",
                 "type": "fx-button-group",
                 "props": {
                   "showDropdown": false
@@ -670,7 +674,7 @@
                         "action": "button:dlgDynConfirm",
                         "linkType": ""
                       },
-                      "id": "id182f81da304",
+                      "id": "${newId()}",
                       "events": {}
                     },
                     {
@@ -680,7 +684,7 @@
                         "leftIcon": "error",
                         "action": "button:closeDialog"
                       },
-                      "id": "id182f81da308",
+                      "id": "${newId()}",
                       "events": {}
                     }
                   ],
@@ -707,7 +711,7 @@
 },
   "graph": {
   "shape": "panel",
-      "id": "root_panel",
+      "id": "${newId()}",
       "type": "fx-split-panel",
       "props": {
     "horizontal": false,
@@ -724,9 +728,10 @@
       "children": [
         {
           "shape": "panel",
-          "id": "form_panel",
+          "id": "${newId()}",
           "type": "fx-form-panel",
           "props": {
+            "name": "dlgOptForm",
             "colNum": 1,
             "paddingTop": 24,
             "size": "0"
@@ -743,7 +748,8 @@
 "affixError": true,
 "size": "default",
 "multiple": true,
-"required": true
+"dataset": "dlgOpt",
+"field": "toTaskId"
 },
 "events": {},
 "vars": {
@@ -754,10 +760,13 @@
               "id": "${newId()}",
               "type": "fx-select",
               "props": {
+                "name":"flowSelComment",
                 "label": "备选意见",
                 "clearable": true,
                 "labelWidth": 100,
                 "affixError": true,
+                "dataset": "dlgOpt",
+                "field": "selComment",
                 "size": "default"
               },
               "events": {}
@@ -772,8 +781,8 @@
                 "labelWidth": 100,
                 "affixError": true,
                 "size": "default",
-                "dataset": "ds_182edc699cc",
-                "field": "id_182edc699cd",
+                "dataset": "dlgOpt",
+                "field": "comment",
                 "rows": 4
               },
               "events": {}