diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl index 4f3d180..67d5491 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl @@ -43,7 +43,7 @@ "props": { "alignY": "center", "size": "200", - "paddingLeft": 20 + "paddingLeft": 16 }, "children": [ { @@ -56,73 +56,13 @@ } ] }, - { - "id": "${newId()}", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "alignY": "center", - "paddingRight": 20 - }, - "children": [ - { - "id": "${newId()}", - "type": "fx-button-group", - "props": { - "menus": [], - "textAlign": "" - }, - "slots": { - "default": [ - { - "id": "${newId()}", - "type": "fx-button", - "props": { - "name": "button:return", - "label": "返回", - "type": "success", - "size": "default", - "action": "button:backList", - "leftIcon": "list-top" - }, - "events": {}, - "vars": { - "$ref": "$ref" - } - }, - { - "type": "fx-button", - "props": { - "name": "button:delete", - "label": "删除", - "leftIcon": "delete", - "action": "button:delCard" - }, - "id": "${newId()}", - "vars": { - "$ref": "$ref" - } - }, - { - "id": "${newId()}", - "type": "fx-button", - "props": { - "name": "button:new", - "label": "新增", - "type": "primary", - "leftIcon": "plus", - "action": "button:addCard" - }, - "vars": { - "$ref": "$ref" - } - } - ], - "dropdown": [] - } - } - ] - }, +{ +"id": "${newId()}", +"type": "fx-form-panel", +"shape": "panel", +"props": {}, +"children": [] +}, { "id": "${newId()}", "type": "fx-form-panel", @@ -195,7 +135,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -308,7 +248,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -425,11 +365,11 @@ ] }, { - "id": "182e345bb14", + "id": "${newId()}", "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -542,7 +482,48 @@ "vars": { "$ref": "$ref" } - } + }, +{ +"id": "${newId()}", +"type": "fx-button", +"props": { +"name": "button:return", +"label": "返回", +"size": "default", +"action": "button:backList" +}, +"events": {}, +"vars": { +"$ref": "$ref" +} +}, +{ +"type": "fx-button", +"props": { +"name": "button:delete", +"label": "删除", +"type": "danger", +"action": "button:delCard" +}, +"id": "${newId()}", +"vars": { +"$ref": "$ref" +} +}, +{ +"id": "${newId()}", +"type": "fx-button", +"props": { +"name": "button:new", +"label": "新增", +"type": "primary", +"action": "button:addCard" +}, +"vars": { +"$ref": "$ref" +} +} + ] } } @@ -708,7 +689,172 @@ } ] } + }, +{ + "page": { + "id": "${newId()}", + "type": "fx-dialog", + "props": { + "title": "驳回", + "key": "dlgReject", + "width": "450px", + "height": "260px", + "showPrefix": true + }, + "events": {} +}, + "graph": { + "shape": "panel", + "id": "root_panel", + "type": "fx-split-panel", + "props": { + "horizontal": false, + "shadow": "never" + }, + "children": [ + { + "id": "${newId()}", + "type": "fx-split-panel", + "shape": "panel", + "props": { + "horizontal": false + }, + "children": [ + { + "shape": "panel", + "id": "form_panel", + "type": "fx-form-panel", + "props": { + "colNum": 1, + "paddingTop": 24, + "size": "0" + }, + "children": [ +{ +"id": "${newId()}", +"type": "fx-select", +"props": { +"name":"flowToTaskRef", +"label": "驳回到", +"clearable": true, +"labelWidth": 100, +"affixError": true, +"size": "default" +}, +"events": {}, +"vars": { +"$ref": "$ref" +} +}, + { + "id": "${newId()}", + "type": "fx-select", + "props": { + "label": "备选意见", + "clearable": true, + "labelWidth": 100, + "affixError": true, + "size": "default" + }, + "events": {} + }, + { + "id": "${newId()}", + "type": "fx-textarea", + "props": { + "label": "处理意见", + "maxlength": 200, + "placeholder": "请输入内容", + "labelWidth": 100, + "affixError": true, + "size": "default", + "dataset": "ds_182edc699cc", + "field": "id_182edc699cd", + "rows": 4 + }, + "events": {} + } + + ] + }, + { + "id": "${newId()}", + "type": "fx-form-panel", + "shape": "panel", + "props": {}, + "children": [] + } + ] + }, + { + "id": "${newId()}", + "type": "fx-form-panel", + "shape": "panel", + "props": { + "size": "0" + }, + "children": [ + { + "id": "${newId()}", + "type": "fx-divider", + "props": { + "label": "", + "contentPosition": "center", + "direction": "horizontal" + } + } + ] + }, + { + "id": "${newId()}", + "type": "fx-form-panel", + "shape": "panel", + "props": { + "size": "50", + "alignX": "end", + "alignY": "center", + "paddingRight": 10 + }, + "children": [ + { + "id": "${newId()}", + "type": "fx-button-group", + "props": { + "showDropdown": false + }, + "slots": { + "default": [ + { + "type": "fx-button", + "props": { + "label": "确认", + "leftIcon": "correct", + "type": "primary", + "action": "button:dlgDynConfirm", + "linkType": "" + }, + "id": "${newId()}", + "events": {} + }, + { + "type": "fx-button", + "props": { + "label": "取消", + "leftIcon": "error", + "action": "button:closeDialog" + }, + "id": "${newId()}", + "events": {} + } + ], + "dropdown": [] + } + } + ] } + ] +} +} ], "model": [ <#list datasets as dataset> diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl index c686d29..e8d834e 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl @@ -25,83 +25,6 @@ "type": "fx-split-panel", "shape": "panel", "props": { - "size": "56", - "horizontal": true, - "scroll": false, - "name": "s11" - }, - "children": [ - { - "id": "${newId()}", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "alignY": "center", - "size": "300", - "backgroundImage": "", - "paddingLeft": 30 - }, - "children": [ - { - "id": "${newId()}", - "type": "fx-title", - "props": { - "label": "${title}" - } - } - ] - }, - { - "id": "${newId()}", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "alignY": "center", - "backgroundImage": "", - "paddingRight": 32 - }, - "children": [ - { - "id": "${newId()}", - "type": "fx-button-group", - "props": { - "menus": [], - "textAlign": "right" - }, - "slots": { - "default": [ - ], - "dropdown": [] - } - } - ] - } - ] - }, - { - "id": "${newId()}", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "0" - }, - "children": [ - { - "id": "id${newId()}", - "type": "fx-divider", - "props": { - "label": "", - "contentPosition": "center", - "direction": "horizontal" - } - } - ] - }, - { - "id": "${newId()}", - "type": "fx-split-panel", - "shape": "panel", - "props": { "horizontal": false, "scroll": true, "tab": false @@ -112,24 +35,12 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", - "backgroundColor": "--color-transparent" - }, - "children": [] - }, - { - "id": "${newId()}", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "size": "48", + "size": "56", "label": "${group.label}", "colNum": 2, "alignY": "center", - "paddingLeft": 32, - "paddingRight": 32, - "shadow": "", - "backgroundImage": "bgImg-region-title" + "paddingLeft": 16, + "shadow": "" }, "children": [ { @@ -183,8 +94,8 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", - "backgroundColor": "transparent" + "size": "16", + "backgroundColor": "--color-transparent" }, "children": [] }, @@ -193,7 +104,7 @@ "type": "fx-split-panel", "shape": "panel", "props": { - "size": "48", + "size": "56", "horizontal": true }, "children": [ @@ -206,10 +117,8 @@ "label": "", "colNum": 2, "alignY": "center", - "paddingLeft": 32, - "paddingRight": 32, - "shadow": "", - "backgroundImage": "bgImg-region-title" + "paddingLeft": 16, + "shadow": "" }, "children": [ { @@ -233,10 +142,10 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "alignX": "center", + "alignX": "right", "size": "150", "alignY": "center", - "backgroundImage": "bgImg-region-title" + "paddingRight": 16 }, "children": [ { @@ -268,8 +177,8 @@ "size": "400", "label": "列表", "colNum": 0, - "paddingLeft": 20, - "paddingRight": 20, + "paddingLeft": 16, + "paddingRight": 16, "shadow": "", "paddingTop": 0 }, @@ -338,8 +247,15 @@ "id": "${newId()}", "type": "fx-form-panel", "shape": "panel", + "props": {}, + "children": [] + }, + { + "id": "${newId()}", + "type": "fx-form-panel", + "shape": "panel", "props": { - "size": "10", + "size": "16", "backgroundColor": "transparent" }, "children": [] diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl index 09f3f5c..1dc5ad6 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl @@ -40,34 +40,8 @@ "shape": "panel", "props": { "alignY": "center", - "backgroundImage":"bgImg-region-title", - "size": "50" - - }, - "children": [ - { - "id": "${newId()}", - "type": "fx-button-group", - "props": { - "menus": [] - }, - "slots": { - "default": [ - - ] - } - } - ] - }, - { - "id": "${newId()}", - "type": "fx-form-panel", - "shape": "panel", - "props": { - "alignY": "center", "size": "400", - "backgroundImage":"bgImg-region-title", - "paddingLeft": 10 + "paddingLeft": 16 }, "children": [ { @@ -85,8 +59,7 @@ "shape": "panel", "props": { "alignY": "center", - "backgroundImage": "bgImg-region-title", - "paddingRight": 32 + "paddingRight": 16 }, "children": [ { diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_1.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_1.ftl index 68b2108..e21af1d 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_1.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_1.ftl @@ -42,9 +42,8 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "50", + "size": "56", "alignY": "center", - "backgroundImage": "bgImg-region-title", "paddingLeft": 16, "colNum": 2, "gridTemplateColumns": "", @@ -170,7 +169,9 @@ "shape": "panel", "props": { "size": "", - "colNum": 0 + "colNum": 0, + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ { @@ -248,7 +249,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -270,7 +271,9 @@ "props": { "colNum": 3, "label": "查询条件", - "size": "50", + "paddingLeft": 16, + "paddingRight": 16, + "size": "56", "alignY": "center" }, "children": [ @@ -342,7 +345,7 @@ "shape": "panel", "props": { "label": "间隔", - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -355,7 +358,6 @@ "props": { "label": "${param.rListTitle}", "size": "50", - "backgroundImage": "bgImg-region-title", "colNum": 2, "alignY": "center", "paddingLeft": 16, @@ -404,7 +406,9 @@ "shape": "panel", "props": { "label": "表格区", - "colNum": 0 + "colNum": 0, + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ { diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_2.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_2.ftl index 182d3f0..ac310e5 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_2.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_2.ftl @@ -42,9 +42,8 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "50", + "size": "56", "alignY": "center", - "backgroundImage": "bgImg-region-title", "paddingLeft": 16, "colNum": 2, "gridTemplateColumns": "", @@ -143,7 +142,9 @@ "shape": "panel", "props": { "size": "", - "colNum": 0 + "colNum": 0, + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ { @@ -191,7 +192,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -213,7 +214,9 @@ "props": { "colNum": 3, "label": "查询条件", - "size": "50", + "size": "56", + "paddingLeft": 16, + "paddingRight": 16, "alignY": "center" }, "children": [ @@ -226,7 +229,8 @@ "maxlength": 50, "placeholder": "请输入${cfilters.label}", "labelWidth": 100, - "affixError": false + "affixError": false, + "hideLabel": true }, "events": {} }, @@ -284,8 +288,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "label": "间隔", - "size": "10", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -298,7 +301,6 @@ "props": { "label": "${param.rListTitle}", "size": "50", - "backgroundImage": "bgImg-region-title", "colNum": 2, "alignY": "center", "paddingLeft": 16, @@ -347,7 +349,9 @@ "shape": "panel", "props": { "label": "表格区", - "colNum": 0 + "colNum": 0, + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ { @@ -492,7 +496,7 @@ "shape": "panel", "props": { "size": "56", - "paddingRight": 10, + "paddingRight": 16, "alignY": "center" }, "children": [