diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl
index 5c06db7..e6f732a 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_dialog.ftl
@@ -15,7 +15,7 @@
       <#if (dfield.readonly = true)>
       "type": "fx-text",
       <#else>
-      "type": "fx-${dfield.editor}",
+      "type": "${dfield.editor}",
       </#if>
       "props": {
         "label": "${dfield.label}",
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 36cc1eb..51bc051 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
@@ -3,12 +3,11 @@
   "form": [
     {
       "page": {
-        "id": "id${newId()}",
+        "id": "p${newId()}",
         "type": "fx-page",
         "props": {
           "title": "${title}",
-          "key": "${newId()}",
-          "tipsExpand": false
+          "key": "${newId()}"
         }
       },
       "graph": {
@@ -17,7 +16,8 @@
         "type": "fx-split-panel",
         "props": {
           "horizontal": false,
-          "shadow": ""
+          "shadow": "never",
+          "size": "1200"
         },
         "children": [
           {
@@ -25,465 +25,529 @@
             "type": "fx-split-panel",
             "shape": "panel",
             "props": {
-              "horizontal": false,
-              "scroll": true
+              "size": "56",
+              "horizontal": true,
+              "scroll": false,
+              "name": "s11"
             },
             "children": [
-                {
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "alignY": "center",
+                  "size": "300",
+                  "backgroundImage": "",
+                  "paddingLeft": 30
+                },
+                "children": [
+                  {
                     "id": "${newId()}",
-                    "type": "fx-split-panel",
-                    "shape": "panel",
+                    "type": "fx-title",
                     "props": {
-                        "size": "60"
-                    },
-                    "children": [
-                        {
-                            "id": "${newId()}",
-                            "type": "fx-button-group",
-                            "props": {
-                                "showDropdown": false,
-                                "dataset":"${layout.cardMaster[0].dataset}"
-                            },
-                            "slots": {
-                                "default": [
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "保存",
-                                            "leftIcon": "save",
-                                            "type": "success",
-                                            "action": "button:saveCard"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    },
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "删除",
-                                            "leftIcon": "delete",
-                                            "type": "danger",
-                                            "action": "button:delCard"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    },
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "返回",
-                                            "leftIcon": "return",
-                                            "action": "button:backList"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    }
-                                ],
-                                "dropdown": []
-                            }
-                        }
-                    ]
+                      "label": "${title}"
+                    }
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "alignY": "center",
+                  "backgroundImage": "",
+                  "paddingRight": 32
                 },
-                {
+                "children": [
+                  {
                     "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
+                    "type": "fx-button-group",
                     "props": {
-                        "alignX": "stretch",
-                        "size": "0"
+                      "menus": [],
+                      "textAlign": "right"
                     },
-                     "children": [
-                        {
-                            "id": "${newId()}",
-                            "type": "fx-divider",
-                            "props": {
-                                "label": "",
-                                "contentPosition": "center",
-                                "direction": "horizontal"
-                            }
-                        }
-                     ]
+                    "slots": {
+                      "default": [
+                      ],
+                      "dropdown": []
+                    }
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "id": "${newId()}",
+            "type": "fx-form-panel",
+            "shape": "panel",
+            "props": {
+              "size": "0"
+            },
+            "children": [
+              {
+                "id": "id${newId()}",
+                "type": "fx-divider",
+                "props": {
+                  "label": "",
+                  "contentPosition": "center",
+                  "direction": "horizontal"
+                }
+              }
+            ]
+          },
+          {
+            "id": "${newId()}",
+            "type": "fx-split-panel",
+            "shape": "panel",
+            "props": {
+              "horizontal": false,
+              "scroll": true,
+              "tab": false
+            },
+            "children": [
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "10",
+                  "backgroundColor": "--color-transparent"
                 },
-                {
-                    "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
+                "children": []
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "48",
+                  "label": "${group.label}",
+                  "colNum": 2,
+                  "alignY": "center",
+                  "paddingLeft": 32,
+                  "paddingRight": 32,
+                  "shadow": "",
+                  "backgroundImage": "bgImg-region-title"
+                },
+                "children": [
+                  {
+                    "id": "id${newId()}",
+                    "type": "fx-title",
                     "props": {
-                        "size": "0",
-                        "paddingTop": 15,
-                        "colNum": "${param.masterCol}"
+                      "label": "${layout.cardMaster[0].label}",
+                      "fontSize": 16,
+                      "color": "#01070D",
+                      "fontWeight": "bold",
+                      "showPrefix": false,
+                      "prefixWidth": 5,
+                      "prefixHeight": 24,
+                      "prefixColor": "#1E90FF"
+                    }
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "0",
+                  "gridTemplateColumns": "1fr 1fr 1fr",
+                  "paddingTop": 10
+                },
+                "children": [
+                  <#list layout.cardMaster[0].fields as field>
+                  {
+                    "id": "${field.id}",
+                    "type": "${field.editor}",
+                    "props": {
+                      "label": "${field.label}",
+                      "type": "text",
+                      "dataset": "${field.dataset}",
+                      "required": "${field.required}",
+                      "field": "${field.field}",
+                      "placeholder": "请输入内容",
+                      "labelWidth": 150,
+                      "readonly": "${field.readonly}",
+                      "affixError": true
                     },
-                    <#assign mfields = layout.cardMaster[0].fields>
-                    "children": [
-                        <#list mfields as mfield>
-                            {
-                                "id": "id${newId()}",
-                                <#if (mfield.readonly = true)>
-                                    "type": "fx-text",
-                                    "disabled": true,
-                                <#else>
-                                    "type": "${mfield.editor}",
-                                </#if>
-                                "props": {
-                                    "label": "${mfield.label}",
-                                    "dataset": "${mfield.dataset}",
-                                    "field": "${mfield.id}",
-                                    "required": "${mfield.required}",
-                                    <#if mfield.maxlength gt 0>
-                                        "maxlength": ${mfield.maxlength},
-                                    </#if>
-                                    "placeholder": "请输入${mfield.label}",
-                                    <#if (param.masterCol gte 2)>
-                                        "tips": "${mfield.desc}",
-                                    </#if>
-                                    "labelWidth": 100,
-                                    <#if (mfield.readonly = true)>
-                                        "readonly": true,
-                                    <#else>
-                                        "readonly": false,
-                                    </#if>
-                                    "affixError": true
-                                },
-                                "events": {}
-                            }
-                            <#if mfield_has_next>
-                                <#if (param.masterCol lte 1 )>
-                                    <#if (mfield.desc != "")>
-                                        ,{
-                                            "id": "id${newId()}",
-                                            "type": "fx-label",
-                                            "props": {
-                                                "label": "${mfield.desc}",
-                                                "labelWidth": 0,
-                                                "affixError": true,
-                                                "labelAlign": "left"
-                                            }
-                                        }
-                                    <#else>
-                                        ,{
-                                            "id": "id${newId()}",
-                                            "type": "fx-placeholder",
-                                            "props": {
-                                                "label": "占位"
-                                            },
-                                            "layout": {
-                                                "row": 1
-                                            }
-                                        }
-                                    </#if>
-                                </#if>
-                            ,
-                            </#if>
-                        </#list>
-                    ]
+                    "events": {}
+                  }
+                  <#if field_has_next>,</#if>
+                  </#list>
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "10",
+                  "backgroundColor": "transparent"
+                },
+                "children": []
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-split-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "48",
+                  "horizontal": true
                 },
-                {
+                "children": [
+                  {
                     "id": "${newId()}",
                     "type": "fx-form-panel",
                     "shape": "panel",
                     "props": {
-                        "size": "0"
+                      "size": "",
+                      "label": "",
+                      "colNum": 2,
+                      "alignY": "center",
+                      "paddingLeft": 32,
+                      "paddingRight": 32,
+                      "shadow": "",
+                      "backgroundImage": "bgImg-region-title"
                     },
                     "children": [
-                        {
-                            "id": "${newId()}",
-                            "type": "fx-divider",
-                            "props": {
-                                "label": "",
-                                "contentPosition": "center",
-                                "direction": "horizontal"
-                            }
+                      {
+                        "id": "id${newId()}",
+                        "type": "fx-title",
+                        "props": {
+                          "label": "子表列表配置",
+                          "fontSize": 16,
+                          "color": "#01070D",
+                          "fontWeight": "bold",
+                          "showPrefix": false,
+                          "prefixWidth": 5,
+                          "prefixHeight": 24,
+                          "prefixColor": "#1E90FF"
                         }
+                      }
                     ]
-                },
-                {
-                    "id": "${newId()}",
+                  },
+                  {
+                    "id": "id${newId()}",
                     "type": "fx-form-panel",
                     "shape": "panel",
                     "props": {
-                        "size": "50",
-                        "alignX": "end",
-                        "alignY": "center",
-                        "paddingRight": 20,
-                        "colNum": 2,
-                        "gridTemplateColumns": "92px 1fr"
+                      "alignX": "center",
+                      "size": "150",
+                      "alignY": "center",
+                      "backgroundImage": "bgImg-region-title"
                     },
                     "children": [
+                      {
+                        "id": "id${newId()}",
+                        "type": "fx-button",
+                        "props": {
+                          "label": "新增",
+                          "type": "primary",
+                          "action": "button:addRow",
+                          "size": "default",
+                          "linkType": "dialog",
+                          "leftIcon": "plus",
+                          "fxLink": "dialog:cardSubDialog",
+                          "fxLink_text": "子表编辑卡片",
+                          "nextAction": "",
+                          "preAction": "",
+                          "dataset": "${layout.listSub[0].dataset}"
+                        },
+                        "events": {}
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "400",
+                  "label": "列表",
+                  "colNum": 0,
+                  "paddingLeft": 20,
+                  "paddingRight": 20,
+                  "shadow": "",
+                  "paddingTop": 0
+                },
+                "children": [
+                  {
+                    "id": "id${newId()}",
+                    "type": "fx-table",
+                    "props": {
+                      "label": "表格",
+                      "border": true,
+                      "stripe": true,
+                      "showHeader": true,
+                      "fit": true,
+                      "dataset": "${group.dataset}",
+                      "actionWidth": 150
+                    },
+                    "slots": {
+                      "default": [
+                        <#list layout.listSub[0].fields as field>
                         {
-                            "id": "${newId()}",
-                            "type": "fx-title",
-                            "props": {
-                                <#if (param.listSubTitle == "")>
-                                    "label": "明细列表",
-                                <#else>
-                                    "label": "${param.listSubTitle}",
-                                </#if>
-                                "fontWeight": "bold",
-                                "showPrefix": true,
-                                "fontSize": 16,
-                                "prefixWidth": 5
-                            }
+                          "id": "id${newId()}",
+                          "type": "fx-table-column",
+                          "props": {
+                            "field": "${field.id}",
+                            "label": "${field.label}"
+                          }
+                        }
+                        <#if field_has_next>,</#if>
+                        </#list>
+                      ],
+                      "button": [
+                        {
+                          "id": "id${newId()}",
+                          "type": "fx-button",
+                          "props": {
+                            "label": "编辑",
+                            "type": "text",
+                            "leftIcon": "edit",
+                            "action": "button:edit",
+                            "dataset": "${layout.listSub[0].dataset}",
+                            "link": true,
+                            "linkType": "",
+                            "nextAction": "",
+                            "fxLink": ""
+                          }
                         },
                         {
-                            "id": "${newId()}",
-                            "type": "fx-button-group",
-                            "props": {
-                                "showDropdown": false
-                            },
-                            "slots": {
-                                "default": [
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "新增",
-                                            "leftIcon": "plus",
-                                            "type": "primary",
-                                            "action": "button:addRow",
-                                            "linkType": "dialog",
-                                            "fxLink": "dialog:cardSubDialog",
-                                            "fxLink_text": "子表编辑卡片",
-                                            "nextAction": "",
-                                            "preAction": "",
-                                            "dataset": "${layout.listSub[0].dataset}"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    }
-                                ],
-                                "dropdown": []
-                            }
+                          "id": "id${newId()}",
+                          "type": "fx-button",
+                          "props": {
+                            "label": "删除",
+                            "type": "text",
+                            "leftIcon": "delete-themes",
+                            "action": "button:remove",
+                            "preAction": "",
+                            "link": true,
+                            "confirm": ""
+                          }
                         }
-                    ]
+                      ]
+                    },
+                    "events": {}
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "10",
+                  "backgroundColor": "transparent"
                 },
-                <#assign group = layout.listSub[0]>
-                <#include "incModel/inc_clist_ms.ftl"/>
-                {
-                    "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
-                    "props": {
-                        "size": "15",
-                        "backgroundColor": "transparent"
+                "children": []
+              }
+              <#if group_has_next>,</#if>
+            ]
+          },
+          {
+            "shape": "panel",
+            "id": "form_panel",
+            "type": "fx-form-panel",
+            "props": {
+              "colNum": 3,
+              "paddingX": 5,
+              "paddingY": 5,
+              "size": "56",
+              "alignX": "",
+              "alignY": "center",
+              "shadow": "always"
+            },
+            "children": [
+              {
+                "id": "id${newId()}",
+                "type": "fx-button-group",
+                "props": {
+                  "showDropdown": false,
+                  "textAlign": "center"
+                },
+                "slots": {
+                  "default": [
+                    {
+                      "type": "fx-button",
+                      "props": {
+                        "label": "保存",
+                        "leftIcon": "save",
+                        "type": "success",
+                        "action": "button:saveCard"
+                      },
+                      "id": "id${newId()}",
+                      "events": {}
+                    },
+                    {
+                      "type": "fx-button",
+                      "props": {
+                        "label": "删除",
+                        "leftIcon": "delete",
+                        "action": "button:delCard",
+                        "type": "danger"
+                      },
+                      "id": "id${newId()}"
                     },
-                    "children": []
+                    {
+                      "type": "fx-button",
+                      "props": {
+                        "label": "返回",
+                        "leftIcon": "return",
+                        "action": "button:backList"
+                      },
+                      "id": "${newId()}",
+                      "events": {}
+                    }
+                  ],
+                  "dropdown": []
+                },
+                "layout": {
+                  "row": 3,
+                  "col": 3
                 }
+              }
             ]
           }
         ]
       }
     },
+    <#list layout.listSub as assist_dialog>
     {
-        "page": {
+      "page": {
+        "id": "id${newId()}",
+        "type": "fx-dialog",
+        "props": {
+          <#if (param.cardSubTitle == "")>
+            "title": "子表编辑卡片",
+          <#else>
+          "title": "${param.cardSubTitle}",
+          </#if>
+          "key": "cardSubDialog",
+          "closeOnClickModal": false
+        },
+        "events": {}
+      },
+      "graph": {
+        "shape": "panel",
+        "id": "root_panel",
+        "type": "fx-split-panel",
+        "props": {
+          "horizontal": false,
+          "shadow": "never"
+        },
+        "children": [
+          {
             "id": "${newId()}",
-            "type": "fx-dialog",
+            "type": "fx-split-panel",
+            "shape": "panel",
             "props": {
-                "title": "子表编辑卡片",
-                "key": "cardSubDialog",
-                "width": "670px",
-                "height": "560px",
-                "showPrefix": true
+              "horizontal": false,
+              "scroll": true,
+              "backgroundColor": "--color-white"
             },
-            "events": {}
-        },
-        "graph": {
+            "children": [
+              <#assign dfields = assist_dialog.fields>
+              <#assign col = param.subCol>
+              <#include "incModel/inc_list_dialog.ftl"/>
+            ]
+          },
+          {
+            "id": "${newId()}",
+            "type": "fx-form-panel",
             "shape": "panel",
-            "id": "root_panel",
-            "type": "fx-split-panel",
             "props": {
-                "horizontal": false,
-                "shadow": "never"
+              "size": "0"
             },
             "children": [
-                {
-                    "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
-                    "props": {
-                        "size": "50",
-                        "alignX": "start",
-                        "alignY": "center",
-                        "paddingLeft": 20
-                    },
-                    "children": [
-                        {
-                            "id": "${newId()}",
-                            "type": "fx-title",
-                            "props": {
-                                <#if (param.cardSubTitle == "")>
-                                    "label": "明细编辑",
-                                <#else>
-                                    "label": "${param.cardSubTitle}",
-                                </#if>
-                                "fontWeight": "bold",
-                                "fontSize": 16,
-                                "showPrefix": true
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
-                    "props": {
-                        "paddingLeft": 50,
-                        "colNum": "${param.subCol}"
-                    },
-                    <#assign sfields = layout.listSub[0].fields>
-                    "children": [
-                        <#list sfields as sfield>
-                            {
-                                "id": "id${newId()}",
-                                <#if (sfield.readonly = true)>
-                                    "type": "fx-text",
-                                    "disabled": true,
-                                <#else>
-                                    "type": "${sfield.editor}",
-                                </#if>
-                                "props": {
-                                    "label": "${sfield.label}",
-                                    "dataset": "${sfield.dataset}",
-                                    "field": "${sfield.id}",
-                                    "required": "${sfield.required}",
-                                    <#if sfield.maxlength gt 0>
-                                        "maxlength": ${sfield.maxlength},
-                                    </#if>
-                                    "placeholder": "请输入${sfield.label}",
-                                    <#if (param.subCol gte 2)>
-                                        "tips": "${sfield.desc}",
-                                    </#if>
-                                    "labelWidth": 100,
-                                    <#if (sfield.readonly = true)>
-                                        "readonly": true,
-                                    <#else>
-                                        "readonly": false,
-                                    </#if>
-                                    "affixError": true
-                                },
-                                "events": {}
-                            }
-                            <#if sfield_has_next>
-                                <#if (param.subCol lte 1 )>
-                                    <#if (sfield.desc != "")>
-                                        ,{
-                                            "id": "id${newId()}",
-                                            "type": "fx-label",
-                                            "props": {
-                                                "label": "${sfield.desc}",
-                                                "labelWidth": 0,
-                                                "affixError": true,
-                                                "labelAlign": "left"
-                                            }
-                                        }
-                                    <#else>
-                                        ,{
-                                            "id": "id${newId()}",
-                                            "type": "fx-placeholder",
-                                            "props": {
-                                                "label": "占位"
-                                            },
-                                            "layout": {
-                                                "row": 1
-                                            }
-                                        }
-                                    </#if>
-                                </#if>
-                            ,
-                            </#if>
-                        </#list>
-                    ]
+              {
+                "id": "id${newId()}",
+                "type": "fx-divider",
+                "props": {
+                  "label": "",
+                  "contentPosition": "center",
+                  "direction": "horizontal"
+                }
+              }
+            ]
+          },
+          {
+            "id": "${newId()}",
+            "type": "fx-form-panel",
+            "shape": "panel",
+            "props": {
+              "size": "56",
+              "paddingRight": 10,
+              "alignY": "center"
+            },
+            "children": [
+              {
+                "id": "id${newId()}",
+                "type": "fx-button-group",
+                "props": {
+                  "menus": [],
+                  "textAlign": "right"
                 },
-                {
-                    "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
-                    "props": {
-                        "size": "0"
+                "slots": {
+                  "default": [
+                    {
+                      "type": "fx-button",
+                      "props": {
+                        "label": "保存",
+                        "leftIcon": "save",
+                        "type": "success",
+                        "action": "button:save",
+                        "dataset": "${assist_dialog.dataset}"
+                      },
+                      "id": "id${newId()}"
                     },
-                    "children": [
-                        {
-                            "id": "${newId()}",
-                            "type": "fx-divider",
-                            "props": {
-                                "label": "",
-                                "contentPosition": "center",
-                                "direction": "horizontal"
-                            }
-                        }
-                    ]
-                },
-                {
-                    "id": "${newId()}",
-                    "type": "fx-form-panel",
-                    "shape": "panel",
-                    "props": {
-                        "size": "50",
-                        "alignX": "end",
-                        "paddingRight": 20,
-                        "alignY": "center"
+                    {
+                      "type": "fx-button",
+                      "props": {
+                        "label": "保存并新增",
+                        "type": "primary",
+                        "action": "button:saveRow",
+                        "linkType": "curr",
+                        "dataset": "${layout.listSub[0].dataset}",
+                        "nextAction": "button:addRow"
+                      },
+                      "id": "${newId()}",
+                      "events": {}
                     },
-                    "children": [
-                        {
-                            "id": "${newId()}",
-                            "type": "fx-button-group",
-                            "props": {
-                                "showDropdown": false
-                            },
-                            "slots": {
-                                "default": [
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "保存",
-                                            "leftIcon": "save",
-                                            "type": "success",
-                                            "action": "button:saveRow",
-                                            "dataset": "${layout.listSub[0].dataset}",
-                                            "nextAction": "button:closeDialog"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    },
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "保存并新增",
-                                            "type": "primary",
-                                            "action": "button:saveRow",
-                                            "linkType": "curr",
-                                            "dataset": "${layout.listSub[0].dataset}",
-                                            "nextAction": "button:addRow"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    },
-                                    {
-                                        "type": "fx-button",
-                                        "props": {
-                                            "label": "返回",
-                                            "leftIcon": "return",
-                                            "action": "button:closeDialog"
-                                        },
-                                        "id": "${newId()}",
-                                        "events": {}
-                                    }
-                                ],
-                                "dropdown": []
-                            }
-                        }
-                    ]
+                    {
+                      "type": "fx-button",
+                      "props": {
+                        "label": "关闭",
+                        "leftIcon": "close",
+                        "type": "",
+                        "action": "button:closeDialog",
+                        "nextAction": "button:search"
+                      },
+                      "id": "id${newId()}"
+                    }
+                  ]
                 }
+              }
             ]
-        }
+          }
+        ]
+      }
     }
+    </#list>
   ],
   "model": [
     <#list datasets as dataset>
-        <#include "incModel/inc_model.ftl"/><#if dataset_has_next>,</#if>
+    <#include "incModel/inc_model.ftl"/>
+    <#if dataset_has_next>,</#if>
     </#list>
   ],
   "option": {
     "widgetRef": [${widgetRef}],
     "vars": []
   }
-}
+}
\ No newline at end of file
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl
index 61d64e4..8b47cd4 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl
@@ -17,7 +17,10 @@
         "type": "fx-split-panel",
         "props": {
           "horizontal": false,
-          "shadow": "never"
+          "shadow": "",
+          "scroll": false,
+          "size": "",
+          "name": "s0"
         },
         "children": [
           {
@@ -25,53 +28,82 @@
             "type": "fx-split-panel",
             "shape": "panel",
             "props": {
-              "size": "60"
+              "size": "56",
+              "horizontal": true,
+              "scroll": false,
+              "name": "s11"
             },
             "children": [
               {
                 "id": "${newId()}",
-                "type": "fx-button-group",
+                "type": "fx-form-panel",
+                "shape": "panel",
                 "props": {
-                  "showDropdown": false,
-                  "dataset":"${layout.card[0].dataset}"
+                  "alignY": "center",
+                  "backgroundImage":"bgImg-region-title",
+                  "size": "50"
+
                 },
-                "slots": {
-                  "default": [
-                    {
-                      "type": "fx-button",
-                      "props": {
-                        "label": "保存",
-                        "leftIcon": "save",
-                        "type": "success",
-                        "action": "button:saveCard"
-                      },
-                      "id": "${newId()}",
-                      "events": {}
+                "children": [
+                  {
+                    "id": "${newId()}",
+                    "type": "fx-button-group",
+                    "props": {
+                      "menus": []
                     },
-                    {
-                      "type": "fx-button",
-                      "props": {
-                        "label": "删除",
-                        "leftIcon": "delete",
-                        "type": "danger",
-                        "action": "button:delCard"
-                      },
-                      "id": "${newId()}",
-                      "events": {}
+                    "slots": {
+                      "default": [
+
+                      ]
+                    }
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "alignY": "center",
+                  "size": "200",
+                  "backgroundImage":"bgImg-region-title",
+                  "paddingLeft": 10
+                },
+                "children": [
+                  {
+                    "id": "${newId()}",
+                    "type": "fx-title",
+                    "props": {
+                      "label": "${title}"
+                    }
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "alignY": "center",
+                  "backgroundImage": "bgImg-region-title",
+                  "paddingRight": 32
+                },
+                "children": [
+                  {
+                    "id": "${newId()}",
+                    "type": "fx-button-group",
+                    "props": {
+                      "menus": [],
+                      "textAlign": "right"
                     },
-                    {
-                      "type": "fx-button",
-                      "props": {
-                        "label": "返回",
-                        "leftIcon": "return",
-                        "action": "button:backList"
-                      },
-                      "id": "${newId()}",
-                      "events": {}
+                    "slots": {
+                      "default": [
+
+                      ],
+                      "dropdown": []
                     }
-                  ],
-                  "dropdown": []
-                }
+                  }
+                ]
               }
             ]
           },
@@ -80,70 +112,196 @@
             "type": "fx-form-panel",
             "shape": "panel",
             "props": {
-                "colNum": "${param.col}"
+              "size": "0"
             },
-            <#assign dfields = layout.card[0].fields>
             "children": [
-            <#list dfields as dfield>
-                {
-                    "id": "id${newId()}",
-                    <#if (dfield.readonly = true)>
+              {
+                "id": "${newId()}",
+                "type": "fx-divider",
+                "props": {
+                  "label": "",
+                  "contentPosition": "center",
+                  "direction": "horizontal"
+                }
+              }
+            ]
+          },
+          {
+            "id": "${newId()}",
+            "type": "fx-split-panel",
+            "shape": "panel",
+            "props": {
+              "size": "",
+              "horizontal": false,
+              "scroll": true,
+              "name": "s12"
+            },
+            "children": [
+
+              {
+                <#list layout.card as group>
+                  "id": "${newId()}",
+                  "type": "fx-form-panel",
+                  "shape": "panel",
+                  "props": {
+                    "size": "0",
+                    <#if param.col lte 1 || param.col gte 3>
+                      "gridTemplateColumns": "1fr 1fr 1fr",
+                    <#elseif param.col == 2>
+                      "gridTemplateColumns": "1fr 1fr 1fr 1fr",
+                    </#if>
+                    "paddingTop": 32
+                  },
+                  "children": [
+                    <#list group.fields as field>
+                    <#if (param.col lte 1)>
+                    {
+                      "id": "id${newId()}",
+                      "type": "fx-placeholder",
+                      "props": {
+                        "label": "占位"
+                      },
+                      "layout": {
+                        "row": 1
+                      }
+                    },
+                    <#elseif (param.col = 2 && ((field_index+1) % 2 = 1 ) )>
+                      {
+                      "id": "id${newId()}",
+                      "type": "fx-placeholder",
+                      "props": {
+                        "label": "占位"
+                      },
+                      "layout": {
+                        "row": 1
+                      }
+                    },
+                    </#if>
+                    {
+                      "id": "id${newId()}",
+                      <#if (field.readonly = true)>
                         "type": "fx-text",
                         "disabled": true,
-                    <#else>
-                        "type": "${dfield.editor}",
-                    </#if>
-                    "props": {
-                        "label": "${dfield.label}",
-                        "dataset": "${dfield.dataset}",
-                        "field": "${dfield.id}",
-                        "required": "${dfield.required}",
-                        <#if dfield.maxlength gt 0>
-                          "maxlength": ${dfield.maxlength},
-                        </#if>
-                        "placeholder": "请输入${dfield.label}",
-                        <#if (param.col gte 2)>
-                          "tips": "${dfield.desc}",
-                        </#if>
-                        "labelWidth": 100,
-                        <#if (dfield.readonly = true)>
-                         "readonly": true,
-                        <#else>
-                         "readonly": false,
+                      <#else>
+                        "type": "${field.editor}",
+                      </#if>
+                      "props": {
+                        "label": "${field.label}",
+                        "type": "text",
+                        "dataset": "${field.dataset}",
+                        "required": "${field.required}",
+                        "field": "${field.id}",
+                        <#if field.maxlength gt 0>
+                          "maxlength": ${field.maxlength},
                         </#if>
+                        "placeholder": "请输入内容",
+                      <#if (param.col gte 2)>
+                        "tips": "${field.desc}",
+                      </#if>
+                        "labelWidth": 150,
+                        "readonly": false,
                         "affixError": true
-                    },
-                    "events": {}
-                }
-                <#if dfield_has_next>
-                    <#if (param.col lte 1 )>
-                        <#if (dfield.desc != "")>
-                            ,{
-                                "id": "id${newId()}",
-                                "type": "fx-label",
-                                "props": {
-                                    "label": "${dfield.desc}",
-                                    "labelWidth": 0,
-                                    "affixError": true,
-                                    "labelAlign": "left"
-                                }
-                            }
-                        <#else>
-                            ,{
-                                "id": "id${newId()}",
-                                "type": "fx-placeholder",
-                                "props": {
-                                    "label": "占位"
-                                },
-                                "layout": {
-                                    "row": 1
-                                }
+                      },
+                      "events": {}
+                    }
+                    <#if field_has_next>
+                      <#if (param.col lte 1 )>
+
+                        ,{
+                            "id": "id${newId()}",
+                            "type": "fx-placeholder",
+                            "props": {
+                              "label": "占位"
+                            },
+                            "layout": {
+                              "row": 1
                             }
-                        </#if>
+                        }
+
+                      </#if>
+                      <#if (param.col = 2 && ((field_index+1) % 2 = 0 ) )>
+                        ,{
+                          "id": "id${newId()}",
+                          "type": "fx-placeholder",
+                          "props": {
+                            "label": "占位"
+                          },
+                          "layout": {
+                            "row": 1
+                          }
+                        }
+                      </#if>
+                      ,
                     </#if>
-                ,
-                </#if>
-            </#list>
+                    </#list>
+                ]
+                </#list>
+              },
+
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "size": "56",
+                  "alignY": "center",
+                  "alignX": "center"
+                },
+                "children": [
+                  {
+                    "id": "${newId()}",
+                    "type": "fx-button-group",
+                    "props": {
+                      "menus": []
+                    },
+                    "slots": {
+                      "default": [
+                        {
+                          "type": "fx-button",
+                          "props": {
+                            "label": "保存",
+                            "leftIcon": "save",
+                            "type": "success",
+                            "action": "button:saveCard"
+                          },
+                          "id": "${newId()}",
+                          "events": {}
+                        },
+                        {
+                          "type": "fx-button",
+                          "props": {
+                            "label": "删除",
+                            "leftIcon": "delete",
+                            "type": "danger",
+                            "action": "button:delCard"
+                          },
+                          "id": "${newId()}",
+                          "events": {}
+                        },
+                        {
+                          "type": "fx-button",
+                          "props": {
+                            "label": "返回",
+                            "leftIcon": "return",
+                            "action": "button:backList"
+                          },
+                          "id": "${newId()}",
+                          "events": {}
+                        }
+                      ]
+                    }
+                  }
+                ]
+              },
+              {
+                "id": "${newId()}",
+                "type": "fx-form-panel",
+                "shape": "panel",
+                "props": {
+                  "name": "d2"
+                },
+                "children": []
+              }
             ]
           }
         ]
@@ -152,11 +310,11 @@
   ],
   "model": [
     <#list datasets as dataset>
-        <#include "incModel/inc_model.ftl"/><#if dataset_has_next>,</#if>
+    <#include "incModel/inc_model.ftl"/><#if dataset_has_next>,</#if>
     </#list>
   ],
   "option": {
     "widgetRef": [${widgetRef}],
     "vars": []
   }
-}
+}
\ No newline at end of file