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

---
 .../bpm/src/main/resources/static/template/default/model_card_flow.ftl  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 444d8f3..2b7efe8 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
@@ -106,7 +106,7 @@
                   "size": "default",
                   "hideLabel": true,
                   "dataset": "flow",
-                  "field": "pri_task_id"
+                  "field": "selTaskId"
                 },
                 "events": {
                    "on-change": "onTaskChange"

From f17ac83135745c9ec3b2b7cfae3f879990d68561 Mon Sep 17 00:00:00 2001
From: xiaxl <Jjkj_2020>
Date: Wed, 7 Sep 2022 15:08:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=82=B9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/template/default/model_card_ms.ftl      | 61 +++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl
index e8d834e..cb7867d 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl
@@ -85,7 +85,66 @@
                     },
                     "events": {}
                   }
-                  <#if field_has_next>,</#if>
+                  <#if field_has_next>
+                    <#if (param.masterCol lte 1 )>
+                      <#if (field.desc != "")>
+                        ,{
+                          "id": "id${newId()}",
+                          "type": "fx-label",
+                          "props": {
+                            "label": "${field.desc}",
+                            "labelWidth": 0,
+                            "affixError": true,
+                            "labelAlign": "left"
+                          }
+                        }
+                        ,{
+                          "id": "id${newId()}",
+                          "type": "fx-placeholder",
+                          "props": {
+                            "label": "占位"
+                          },
+                          "layout": {
+                            "row": 1
+                          }
+                        }
+                      <#else>
+                        ,{
+                          "id": "id${newId()}",
+                          "type": "fx-placeholder",
+                          "props": {
+                            "label": "占位"
+                          },
+                          "layout": {
+                            "row": 1
+                          }
+                        }
+                        ,{
+                          "id": "id${newId()}",
+                          "type": "fx-placeholder",
+                          "props": {
+                            "label": "占位"
+                          },
+                          "layout": {
+                            "row": 1
+                          }
+                        }
+                      </#if>
+                    </#if>
+                    <#if (param.masterCol = 2 && ((field_index+1) % 2 = 0 ) )>
+                      ,{
+                        "id": "id${newId()}",
+                        "type": "fx-placeholder",
+                        "props": {
+                          "label": "占位"
+                        },
+                        "layout": {
+                          "row": 1
+                        }
+                      }
+                    </#if>
+                    ,
+                  </#if>
                   </#list>
                 ]
               },