Merge remote-tracking branch 'origin/4.0' into 4.0

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"

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>
                 ]
               },