From d0205369a5c22478b747e159cb5e3c5bb3fc759d Mon Sep 17 00:00:00 2001 From: FLYPHT <1035748121@qq.com> Date: Thu, 28 Jul 2022 14:09:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/event/bpm/sys/base/dict/dict.js | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js diff --git a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js deleted file mode 100644 index fa3c318..0000000 --- a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dict.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Created by 1 at 2022-07-26 11:11:24 - * 注册事件类【数据字典管理】，参看event.defaultEvent.js -*/ -window.$swEvent.setup("bpm.sys.base.dict.dict", { - 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"); - }; - // 删除字典之后 - const afterDelDict = () => { - $api.loadOne("dictList"); - }; - return { - dictTypeRowClick, - afterAddDict, - afterDelDictType, - afterDelDict, - } - } -}); From 9110d4663d9d545f8a9c240e83095deb1f96fb41 Mon Sep 17 00:00:00 2001 From: FLYPHT <1035748121@qq.com> Date: Thu, 28 Jul 2022 14:17:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E:=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/static/event/bpm/sys/base/dict/dictList.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js b/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js index 52f58e5..a0e46f8 100644 --- a/smtweb-framework/bpm/src/main/resources/static/event/bpm/sys/base/dict/dictList.js +++ b/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, } From 330b54892d60b4eca129ffb4c27b55e5c98115cc Mon Sep 17 00:00:00 2001 From: xiaxl Date: Thu, 28 Jul 2022 15:04:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=93=8D=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": "" },