Merge remote-tracking branch 'origin/master'

smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js

@@ -6,18 +6,6 @@ window.$swEvent.setup("bpm.sys.base.dict.dictList", {
   setup(page){
     const { $params,$refs, $widgets, $model, $utils, $tabRouter, $api,$lifecycle } = page || {};
     const { $$message, $$http } = $utils || {};
-    // 数据字典类型表格行点击事件
-    const dictTypeRowClick = (row) => {
-      // 缓存变量
-      $model.temp?.setFormVal("dict_type_id",row.sdct_id);
-      // 调用字典加载
-      $api.loadOne("dictList");
-    };
-    // 数据字典新增初始化
-    const afterAddDict = () => {
-      // 设置字典类型
-      $model.dictEdit?.setFormVal("sdc_type", $model.temp?.getFormVal("dict_type_id"));
-    };
     // 删除类型之后
     const afterDelDictType = () => {
       $api.loadOne("dictTypeList");
@@ -27,8 +15,6 @@ window.$swEvent.setup("bpm.sys.base.dict.dictList", {
       $api.loadOne("dictList");
     };
     return {
-      dictTypeRowClick,
-      afterAddDict,
       afterDelDictType,
       afterDelDict,
     }

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": ""
             }
         }

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": ""
                               },

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": ""
                               },