From e82f445e4ec2c51bd3ab5556a29d9b08b0e1e8a9 Mon Sep 17 00:00:00 2001
From: FLYPHT <1035748121@qq.com>
Date: Mon, 22 Aug 2022 16:06:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Amodel=5Flist=5Fcard.?=
 =?UTF-8?q?ftl=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../smtweb/system/bpm/web/design/form/ModelFormHelper.java  |  9 ++++++++-
 .../static/template/default/incModel/inc_list_query.ftl     | 10 ++++++++--
 .../static/template/default/incModel/inc_query_sfilters.ftl | 10 ++++++++--
 .../resources/static/template/default/model_list_card.ftl   | 13 ++++++++++---
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
index 75da461..f6493e8 100644
--- a/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
+++ b/smtweb-framework/bpm/src/main/java/cc/smtweb/system/bpm/web/design/form/ModelFormHelper.java
@@ -497,6 +497,13 @@ public class ModelFormHelper {
             } else {
                 field.put("maxlength", 0);
             }
+            Map lookup = (Map)field.get("lookup");
+            if (lookup!=null){
+                long widgetId = MapUtil.readLong(lookup, "widgetId",-1L);
+                if(widgetId>0){
+                    setWidget.add(widgetId);
+                }
+            }
         }
     }
 
@@ -520,7 +527,7 @@ public class ModelFormHelper {
         col.put("editor", dtb != null ? dtb.editor: SwEnum.EditorType.INPUT.value);
 
         if (field.getLink() == 0L) return;
-        
+
         Set<ModelForm> set = ModelFormCache.getInstance().getListByTable(field.getLink(), SwEnum.FormType.WIDGET.value);
         if (set == null || set.isEmpty()) return;
         ModelForm form = set.iterator().next();
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
index 45ae051..72fdcb2 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
@@ -18,10 +18,9 @@
     <#list fields as filter>
     {
         "id": "id${newId()}",
-        "type": "fx-${filter.editor}",
+        "type": "${filter.editor}",
         "props": {
             "label": "${filter.label}",
-            "type": "text",
             <#if filter.maxlength gt 0>
             "maxlength": ${filter.maxlength},
             </#if>
@@ -31,6 +30,13 @@
             "affixError": false,
             "dataset": "${filter.dataset}",
             "field": "${filter.id}",
+            <#if filter.lookup??>
+                "lookup": {
+                <#list filter.lookup as k, v>
+                    "${k}": "${v}" <#if  k_has_next>,</#if>
+                </#list>
+                },
+            </#if>
             "name": "${filter.name}"
         },
         "events": {}
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl
index a788157..0128cd6 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_query_sfilters.ftl
@@ -39,10 +39,9 @@
                 <#list fields as filter >
                 {
                     "id": "id${newId()}",
-                    "type": "fx-${filter.editor}",
+                    "type": "${filter.editor}",
                     "props": {
                         "label": "${filter.label}",
-                        "type": "text",
                         <#if filter.maxlength gt 0 >
                         "maxlength": ${filter.maxlength},
                         </#if>
@@ -50,6 +49,13 @@
                         "labelWidth": 100,
                         "dataset": "${filter.dataset}",
                         "field": "${filter.id}",
+                       <#if filter.lookup??>
+                        "lookup": {
+                          <#list filter.lookup as k, v>
+                            "${k}": "${v}" <#if  k_has_next>,</#if>
+                          </#list>
+                        },
+                        </#if>
                         "name": "${filter.name}"
                     },
                     "events": {}
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 42e23bc..62b70d0 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
@@ -156,15 +156,22 @@
                       "id": "id${newId()}",
                       <#if (dfield.readonly = true)>
                         "type": "fx-text",
+                        "disabled": true,
                       <#else>
-                        "type": "fx-${dfield.editor}",
+                        "type": "${dfield.editor}",
                       </#if>
                       "props": {
                         "label": "${dfield.label}",
-                        "type": "text",
                         "dataset": "${dfield.dataset}",
                         "field": "${dfield.id}",
-                        "required": "${field.required}",
+                        "required": "${dfield.required}",
+                       <#if dfield.lookup??>
+                          "lookup": {
+                            <#list dfield.lookup as k, v>
+                               "${k}": "${v}" <#if  k_has_next>,</#if>
+                            </#list>
+                           },
+                        </#if>
                         <#if dfield.maxlength gt 0>
                           "maxlength": ${dfield.maxlength},
                         </#if>