From ad26db8fc881ce444f3d683ef675f8c31966b78a Mon Sep 17 00:00:00 2001 From: xiaxl Date: Fri, 2 Sep 2022 18:02:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/template/default/incModel/inc_card_group.ftl | 3 --- .../static/template/default/incModel/inc_filter.ftl | 1 - .../static/template/default/incModel/inc_form.ftl | 1 - .../static/template/default/incModel/inc_grid_opt.ftl | 3 +-- .../static/template/default/incModel/inc_list_query.ftl | 4 ++-- .../static/template/default/incModel/inc_list_table.ftl | 4 ++-- .../main/resources/static/template/default/model_card.ftl | 2 +- .../resources/static/template/default/model_card_flow.ftl | 2 -- .../resources/static/template/default/model_card_ms.ftl | 1 - .../static/template/default/model_card_normal.ftl | 2 +- .../resources/static/template/default/model_list_card.ftl | 4 ++-- .../resources/static/template/default/model_list_flow.ftl | 4 ++-- .../resources/static/template/default/model_list_list.ftl | 1 - .../static/template/default/model_list_list_1.ftl | 14 ++++++-------- .../static/template/default/model_list_list_2.ftl | 14 ++++++-------- .../static/template/default/model_list_normal.ftl | 7 ++++--- .../resources/static/template/default/model_step_card.ftl | 1 - .../resources/static/template/default/model_tree_list.ftl | 11 ++++++----- .../static/template/default/model_tree_list_bak.ftl | 1 - 19 files changed, 33 insertions(+), 47 deletions(-) diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_card_group.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_card_group.ftl index b405113..9fadb95 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_card_group.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_card_group.ftl @@ -15,7 +15,6 @@ "type": "fx-${field.editor}", "props": { "label": "${field.label}", - "type": "text", "dataset": "${field.dataset}", "required": "${field.required}", "field": "${field.id}", @@ -75,7 +74,6 @@ "type": "fx-button", "props": { "label": "编辑", - "type": "text", "leftIcon": "edit", "action": "button:edit", "dataset": "${group.dataset}", @@ -90,7 +88,6 @@ "type": "fx-button", "props": { "label": "删除", - "type": "text", "leftIcon": "delete-themes", "action": "button:remove", "preAction": "", diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_filter.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_filter.ftl index f4bb800..759acbe 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_filter.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_filter.ftl @@ -16,7 +16,6 @@ "type": "fx-${filter.editor}", "props": { "label": "${filter.label}", - "type": "text", <#if filter.maxlength gt 0> "maxlength": ${filter.maxlength}, diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_form.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_form.ftl index 5ef0af9..69165d9 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_form.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_form.ftl @@ -16,7 +16,6 @@ "type": "fx-${field.editor}", "props": { "label": "${field.label}", - "type": "text", <#if field.maxlength gt 0> "maxlength": ${field.maxlength}, diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_grid_opt.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_grid_opt.ftl index 70220b4..74728f5 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_grid_opt.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_grid_opt.ftl @@ -40,7 +40,6 @@ "type": "fx-button", "props": { "label": "编", - "type": "text", "leftIcon": "edit", "action": "button:edit", "linkType": "dialog", @@ -52,7 +51,7 @@ "type": "fx-button", "props": { "label": "删", - "type": "text", + "leftIcon": "delete", "action": "button:del", "dataset": "${group.dataset}" 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 dbee6a3..c3176c9 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 @@ -9,9 +9,9 @@ "size": "56", "shadow": "", "alignY": "center", - "paddingRight": 20, + "paddingRight": 16, "gridTemplateColumns": "400px 400px 1fr", - "paddingLeft": 20 + "paddingLeft": 16 }, "children": [ <#assign fields = group.cfilters> diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl index 22e2f6f..d348c14 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl @@ -7,8 +7,8 @@ "size": "", "label": "列表", "colNum": 0, - "paddingLeft": 20, - "paddingRight": 20, + "paddingLeft": 16, + "paddingRight": 16, "shadow": "" }, "children": [{ diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card.ftl index 07d1386..12e4749 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_card.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_card.ftl @@ -193,7 +193,7 @@ "props": { "label": "${field.label}", - "type": "text", + "dataset": "${field.dataset}", "required": "${field.required}", "field": "${field.id}", 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 b4a0808..2c84e42 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 @@ -172,7 +172,6 @@ "props": { "label": "${fields.label}", - "type": "text", "dataset": "${fields.dataset}", "required": "${fields.required}", "field": "${fields.id}", @@ -287,7 +286,6 @@ "props": { "label": "${fields.label}", - "type": "text", "dataset": "${fields.dataset}", "required": "${fields.required}", "field": "${fields.id}", 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 51bc051..1faf737 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 @@ -164,7 +164,6 @@ "type": "${field.editor}", "props": { "label": "${field.label}", - "type": "text", "dataset": "${field.dataset}", "required": "${field.required}", "field": "${field.field}", 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 8b47cd4..09f3f5c 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 @@ -65,7 +65,7 @@ "shape": "panel", "props": { "alignY": "center", - "size": "200", + "size": "400", "backgroundImage":"bgImg-region-title", "paddingLeft": 10 }, 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 62b70d0..6547a5d 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 @@ -32,8 +32,8 @@ "label": "查询条件", "colNum": 2, "alignY": "center", - "paddingLeft": 20, - "paddingRight": 20, + "paddingLeft": 16, + "paddingRight": 16, "shadow": "" }, "children": [ diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl index f7267e1..d41fd38 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl @@ -32,8 +32,8 @@ "label": "查询条件", "colNum": 2, "alignY": "center", - "paddingLeft": 20, - "paddingRight": 20, + "paddingLeft": 16, + "paddingRight": 16, "shadow": "" }, "children": [ diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list.ftl index 9632154..b7883fc 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list.ftl @@ -124,7 +124,6 @@ "type": "fx-${cfilters.editor}", "props": { "label": "${cfilters.label}", - "type": "text", "maxlength": 50, "placeholder": "请输入${cfilters.label}", "labelWidth": 150, 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 512c276..e454b68 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 @@ -45,10 +45,10 @@ "size": "50", "alignY": "center", "backgroundImage": "bgImg-region-title", - "paddingLeft": 32, + "paddingLeft": 16, "colNum": 2, "gridTemplateColumns": "", - "paddingRight": 32 + "paddingRight": 16 }, "children": [ { @@ -115,8 +115,8 @@ "alignY": "center", "size": "50", "gridTemplateColumns": "1fr 50px", - "paddingLeft": 32, - "paddingRight": 32 + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ <#list assist.cfilters as cfilters> @@ -125,7 +125,6 @@ "type": "${cfilters.editor}", "props": { "label": "${cfilters.label}", - "type": "text", "maxlength": 50, "placeholder": "请输入${cfilters.label}", "labelWidth": 150, @@ -282,7 +281,6 @@ "type": "${cfilters.editor}", "props": { "label": "${cfilters.label}", - "type": "text", "maxlength": 50, "placeholder": "请输入${cfilters.label}", "labelWidth": 100, @@ -361,8 +359,8 @@ "backgroundImage": "bgImg-region-title", "colNum": 2, "alignY": "center", - "paddingLeft": 32, - "paddingRight": 32 + "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 bf4e104..2e1a985 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 @@ -45,10 +45,10 @@ "size": "50", "alignY": "center", "backgroundImage": "bgImg-region-title", - "paddingLeft": 32, + "paddingLeft": 16, "colNum": 2, "gridTemplateColumns": "", - "paddingRight": 32 + "paddingRight": 16 }, "children": [ { @@ -88,8 +88,8 @@ "alignY": "center", "size": "50", "gridTemplateColumns": "1fr 50px", - "paddingLeft": 32, - "paddingRight": 32 + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ <#list assist.cfilters as cfilters> @@ -98,7 +98,6 @@ "type": "${cfilters.editor}", "props": { "label": "${cfilters.label}", - "type": "text", "maxlength": 50, "placeholder": "请输入${cfilters.label}", "labelWidth": 150, @@ -224,7 +223,6 @@ "type": "${cfilters.editor}", "props": { "label": "${cfilters.label}", - "type": "text", "maxlength": 50, "placeholder": "请输入${cfilters.label}", "labelWidth": 100, @@ -303,8 +301,8 @@ "backgroundImage": "bgImg-region-title", "colNum": 2, "alignY": "center", - "paddingLeft": 32, - "paddingRight": 32 + "paddingLeft": 16, + "paddingRight": 16 }, "children": [ { diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_normal.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_normal.ftl index 2e101f4..d96829c 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_normal.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_list_normal.ftl @@ -31,8 +31,8 @@ "label": "按钮区域", "colNum": 2, "alignY": "center", - "paddingLeft": 20, - "paddingRight": 20, + "paddingLeft": 16, + "paddingRight": 16, "shadow": "" }, "children": [ @@ -55,7 +55,8 @@ "type": "fx-button-group", "props": { "showDropdown": false, - "dataset": "${group.dataset}" + "dataset": "${group.dataset}", + "textAlign": "right" }, "slots": { "default": [ diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_step_card.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_step_card.ftl index 521536f..d8dba81 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_step_card.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_step_card.ftl @@ -278,7 +278,6 @@ "props": { "label": "${field.label}", - "type": "text", "dataset": "${field.dataset}", "required": "${field.required}", "field": "${field.id}", diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list.ftl index 782bb21..ce9fe09 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list.ftl @@ -87,7 +87,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "15", + "size": "16", "backgroundColor": "--color-transparent" }, "children": [] @@ -113,8 +113,8 @@ "label": "按钮区域", "colNum": 2, "alignY": "center", - "paddingLeft": 20, - "paddingRight": 20, + "paddingLeft": 16, + "paddingRight": 16, "shadow": "" }, "children": [ @@ -137,7 +137,8 @@ "type": "fx-button-group", "props": { "showDropdown": false, - "dataset": "${group.dataset}" + "dataset": "${group.dataset}", + "textAlign": "right" }, "slots": { "default": [ @@ -168,7 +169,7 @@ "type": "fx-form-panel", "shape": "panel", "props": { - "size": "15", + "size": "16", "backgroundColor": "transparent" }, "children": [] diff --git a/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list_bak.ftl b/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list_bak.ftl index 6364a41..2be516e 100644 --- a/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list_bak.ftl +++ b/smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list_bak.ftl @@ -108,7 +108,6 @@ "type": "fx-${cfilters.editor}", "props": { "label": "${cfilters.label}", - "type": "text", "maxlength": 50, "hideLabel": true, "placeholder": "请输入${cfilters.label}",