From 330b54892d60b4eca129ffb4c27b55e5c98115cc Mon Sep 17 00:00:00 2001
From: xiaxl <Jjkj_2020>
Date: Thu, 28 Jul 2022 15:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E6=A0=8F=E6=8C=89=E9=92=AE=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/static/template/incModel/inc_list_table.ftl | 15 +++++++++------
 .../main/resources/static/template/model_list_list.ftl    |  8 +++++---
 .../main/resources/static/template/model_tree_list.ftl    |  8 +++++---
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/smtweb-framework/bpm/src/main/resources/static/template/incModel/inc_list_table.ftl b/smtweb-framework/bpm/src/main/resources/static/template/incModel/inc_list_table.ftl
index c9e1eb3..292e700 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/incModel/inc_list_table.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/incModel/inc_list_table.ftl
@@ -47,11 +47,12 @@
             "type": "fx-button",
             "props": {
                 "label": "编辑",
-                "type": "text",
+                "type": "primary",
                 "leftIcon": "edit",
                 "action": "button:edit",
                 "dataset": "${group.dataset}",
-                "link": true,
+                "text": true,
+                "link": false,
                 "linkType": "",
                 "nextAction": "",
                 "fxLink": ""
@@ -63,10 +64,11 @@
             "type": "fx-button",
             "props": {
                 "label": "编辑",
-                "type": "text",
+                "type": "primary",
                 "leftIcon": "edit",
                 "action": "button:edit",
-                "link": true,
+                "link": false,
+                "text": true,
                 "linkType": "dialog",
                 "fxLink": "dialog:editDialog",
                 "fxLink_text": "${param.editTitle}",
@@ -79,11 +81,12 @@
             "type": "fx-button",
             "props": {
                 "label": "删除",
-                "type": "text",
+                "type": "danger",
                 "leftIcon": "delete-themes",
                 "action": "button:remove",
                 "preAction": "",
-                "link": true,
+                "link": false,
+                "text": true,
                 "confirm": ""
             }
         }
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/model_list_list.ftl b/smtweb-framework/bpm/src/main/resources/static/template/model_list_list.ftl
index 7978d5f..491ec02 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/model_list_list.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/model_list_list.ftl
@@ -423,7 +423,8 @@
                                 "type": "primary",
                                 "leftIcon": "edit",
                                 "action": "button:edit",
-                                "link": true,
+                                "link": false,
+                                "text": true,
                                 "dataset": "${param.editDs_main}",
                                 "linkType": "dialog",
                                 "fxLink": "dialog:editDict",
@@ -435,10 +436,11 @@
                               "type": "fx-button",
                               "props": {
                                 "label": "删除",
-                                "type": "primary",
+                                "type": "danger",
                                 "leftIcon": "delete",
                                 "action": "button:remove",
-                                "link": true,
+                                "link": false,
+                                "text": true,
                                 "dataset": "${param.editDs_main}",
                                 "preAction": ""
                               },
diff --git a/smtweb-framework/bpm/src/main/resources/static/template/model_tree_list.ftl b/smtweb-framework/bpm/src/main/resources/static/template/model_tree_list.ftl
index c260730..fbead06 100644
--- a/smtweb-framework/bpm/src/main/resources/static/template/model_tree_list.ftl
+++ b/smtweb-framework/bpm/src/main/resources/static/template/model_tree_list.ftl
@@ -286,7 +286,8 @@
                                 "type": "primary",
                                 "leftIcon": "edit",
                                 "action": "button:edit",
-                                "link": true,
+                                "link": false,
+                                "text": true,
                                 "dataset": "${param.editDs}",
                                 "linkType": "dialog",
                                 "fxLink": "dialog:editMainDialog",
@@ -298,10 +299,11 @@
                               "type": "fx-button",
                               "props": {
                                 "label": "删除",
-                                "type": "primary",
+                                "type": "danger",
                                 "leftIcon": "delete",
                                 "action": "button:remove",
-                                "link": true,
+                                "link": false,
+                                "text": true,
                                 "dataset": "${param.editDs}",
                                 "preAction": ""
                               },