From f92def87d8e3bc16eda4d8171772865eefa0b008 Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Tue, 16 Aug 2022 17:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BF=AE=E6=94=B9li?=
 =?UTF-8?q?st=5Fcard.ftl=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/template/default/incModel/inc_list_table.ftl          | 2 +-
 .../bpm/src/main/resources/static/template/default/index.yaml    | 6 +++---
 .../main/resources/static/template/default/model_list_card.ftl   | 9 ++-------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl
index 0b2cd65..737fdc9 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl
@@ -21,7 +21,7 @@
         "stripe": true,
         "showHeader": true,
         "fit": true,
-        "dataset": "${param.queryDs}",
+        "dataset": "${group.dataset}",
         "actionWidth": 120
     },
     "slots": {
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml b/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml
index 9e19b9c..fbb2540 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/index.yaml
@@ -26,11 +26,11 @@ model:
     # 布局
     layout:
       -
-        name: 'c1'
+        name: 'list'
         label: '简单列表'
         type: 'list'
         hasGroup: false
-      - name: 'c2'
+      - name: 'card'
         label: '编辑卡片'
         type: 'card'
         hasGroup: false
@@ -229,4 +229,4 @@ model:
         name: 'mainDs'
         type: 'ds'
         label: '主卡片数据集'
-        desc: '请选择主要卡片数据集'
\ No newline at end of file
+        desc: '请选择主要卡片数据集'
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl
index 728806e..6b8411e 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl
@@ -1,5 +1,5 @@
 {
-  <#list layout.c1 as group>
+  <#list layout.list as group>
   "form":
   [
     {
@@ -76,8 +76,6 @@
     <#else>
       "fxLink_text": "${param.editTitle}",
     </#if>
-
-                        "dataset": "${param.editDs}"
                       },
                       "id": "id${newId()}"
                     }
@@ -103,7 +101,7 @@
     <#if (group.sfilters?size>0)>
       <#include "incModel/inc_query_sfilters.ftl"/>
     </#if>
-    <#list layout.c2 as dialog>
+    <#list layout.card as dialog>
     ,{
       "page": {
         "id": "id${newId()}",
@@ -270,7 +268,6 @@
                         "leftIcon": "save",
                         "type": "success",
                         "action": "button:save",
-                        "dataset": "${param.editDs}"
                       },
                       "id": "id${newId()}"
                     },
@@ -280,8 +277,6 @@
                         "label": "关闭",
                         "leftIcon": "close",
                         "action": "button:closeDialog",
-                        "dataset": "${param.queryDs}",
-                        "nextAction": "button:search"
                       },
                       "id": "id${newId()}"
                     }