zhenggm
/
smtweb2
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/4.0' into 4.0

4.0
郑根木 2 years ago
parent
e6ddfb8fb6 ad26db8fc8
commit
a75c2638d2
19 changed files with 33 additions and 47 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -3
      smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_card_group.ftl
  2. +0
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_filter.ftl
  3. +0
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_form.ftl
  4. +1
    -2
      smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_grid_opt.ftl
  5. +2
    -2
      smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl
  6. +2
    -2
      smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl
  7. +1
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/model_card.ftl
  8. +0
    -2
      smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl
  9. +0
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl
  10. +1
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl
  11. +2
    -2
      smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl
  12. +2
    -2
      smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl
  13. +0
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list.ftl
  14. +6
    -8
      smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_1.ftl
  15. +6
    -8
      smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_2.ftl
  16. +4
    -3
      smtweb-framework/bpm/src/main/resources/static/template/default/model_list_normal.ftl
  17. +0
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/model_step_card.ftl
  18. +6
    -5
      smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list.ftl
  19. +0
    -1
      smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list_bak.ftl

+ 0
- 3
smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_card_group.ftl View File

@@ -15,7 +15,6 @@
"type": "fx-${field.editor}", "type": "fx-${field.editor}",
"props": { "props": {
"label": "${field.label}", "label": "${field.label}",
"type": "text",
"dataset": "${field.dataset}", "dataset": "${field.dataset}",
"required": "${field.required}", "required": "${field.required}",
"field": "${field.id}", "field": "${field.id}",
@@ -75,7 +74,6 @@
"type": "fx-button", "type": "fx-button",
"props": { "props": {
"label": "编辑", "label": "编辑",
"type": "text",
"leftIcon": "edit", "leftIcon": "edit",
"action": "button:edit", "action": "button:edit",
"dataset": "${group.dataset}", "dataset": "${group.dataset}",
@@ -90,7 +88,6 @@
"type": "fx-button", "type": "fx-button",
"props": { "props": {
"label": "删除", "label": "删除",
"type": "text",
"leftIcon": "delete-themes", "leftIcon": "delete-themes",
"action": "button:remove", "action": "button:remove",
"preAction": "", "preAction": "",


+ 0
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_filter.ftl View File

@@ -16,7 +16,6 @@
"type": "fx-${filter.editor}", "type": "fx-${filter.editor}",
"props": { "props": {
"label": "${filter.label}", "label": "${filter.label}",
"type": "text",
<#if filter.maxlength gt 0> <#if filter.maxlength gt 0>
"maxlength": ${filter.maxlength}, "maxlength": ${filter.maxlength},
</#if> </#if>


+ 0
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_form.ftl View File

@@ -16,7 +16,6 @@
"type": "fx-${field.editor}", "type": "fx-${field.editor}",
"props": { "props": {
"label": "${field.label}", "label": "${field.label}",
"type": "text",
<#if field.maxlength gt 0> <#if field.maxlength gt 0>
"maxlength": ${field.maxlength}, "maxlength": ${field.maxlength},
</#if> </#if>


+ 1
- 2
smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_grid_opt.ftl View File

@@ -40,7 +40,6 @@
"type": "fx-button", "type": "fx-button",
"props": { "props": {
"label": "编", "label": "编",
"type": "text",
"leftIcon": "edit", "leftIcon": "edit",
"action": "button:edit", "action": "button:edit",
"linkType": "dialog", "linkType": "dialog",
@@ -52,7 +51,7 @@
"type": "fx-button", "type": "fx-button",
"props": { "props": {
"label": "删", "label": "删",
"type": "text",
"leftIcon": "delete", "leftIcon": "delete",
"action": "button:del", "action": "button:del",
"dataset": "${group.dataset}" "dataset": "${group.dataset}"


+ 2
- 2
smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_query.ftl View File

@@ -9,9 +9,9 @@
"size": "56", "size": "56",
"shadow": "", "shadow": "",
"alignY": "center", "alignY": "center",
"paddingRight": 20,
"paddingRight": 16,
"gridTemplateColumns": "400px 400px 1fr", "gridTemplateColumns": "400px 400px 1fr",
"paddingLeft": 20
"paddingLeft": 16
}, },
"children": [ "children": [
<#assign fields = group.cfilters> <#assign fields = group.cfilters>


+ 2
- 2
smtweb-framework/bpm/src/main/resources/static/template/default/incModel/inc_list_table.ftl View File

@@ -7,8 +7,8 @@
"size": "", "size": "",
"label": "列表", "label": "列表",
"colNum": 0, "colNum": 0,
"paddingLeft": 20,
"paddingRight": 20,
"paddingLeft": 16,
"paddingRight": 16,
"shadow": "" "shadow": ""
}, },
"children": [{ "children": [{


+ 1
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/model_card.ftl View File

@@ -193,7 +193,7 @@
</#if> </#if>
"props": { "props": {
"label": "${field.label}", "label": "${field.label}",
"type": "text",
"dataset": "${field.dataset}", "dataset": "${field.dataset}",
"required": "${field.required}", "required": "${field.required}",
"field": "${field.id}", "field": "${field.id}",


+ 0
- 2
smtweb-framework/bpm/src/main/resources/static/template/default/model_card_flow.ftl View File

@@ -172,7 +172,6 @@
</#if> </#if>
"props": { "props": {
"label": "${fields.label}", "label": "${fields.label}",
"type": "text",
"dataset": "${fields.dataset}", "dataset": "${fields.dataset}",
"required": "${fields.required}", "required": "${fields.required}",
"field": "${fields.id}", "field": "${fields.id}",
@@ -287,7 +286,6 @@
</#if> </#if>
"props": { "props": {
"label": "${fields.label}", "label": "${fields.label}",
"type": "text",
"dataset": "${fields.dataset}", "dataset": "${fields.dataset}",
"required": "${fields.required}", "required": "${fields.required}",
"field": "${fields.id}", "field": "${fields.id}",


+ 0
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/model_card_ms.ftl View File

@@ -164,7 +164,6 @@
"type": "${field.editor}", "type": "${field.editor}",
"props": { "props": {
"label": "${field.label}", "label": "${field.label}",
"type": "text",
"dataset": "${field.dataset}", "dataset": "${field.dataset}",
"required": "${field.required}", "required": "${field.required}",
"field": "${field.field}", "field": "${field.field}",


+ 1
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/model_card_normal.ftl View File

@@ -65,7 +65,7 @@
"shape": "panel", "shape": "panel",
"props": { "props": {
"alignY": "center", "alignY": "center",
"size": "200",
"size": "400",
"backgroundImage":"bgImg-region-title", "backgroundImage":"bgImg-region-title",
"paddingLeft": 10 "paddingLeft": 10
}, },


+ 2
- 2
smtweb-framework/bpm/src/main/resources/static/template/default/model_list_card.ftl View File

@@ -32,8 +32,8 @@
"label": "查询条件", "label": "查询条件",
"colNum": 2, "colNum": 2,
"alignY": "center", "alignY": "center",
"paddingLeft": 20,
"paddingRight": 20,
"paddingLeft": 16,
"paddingRight": 16,
"shadow": "" "shadow": ""
}, },
"children": [ "children": [


+ 2
- 2
smtweb-framework/bpm/src/main/resources/static/template/default/model_list_flow.ftl View File

@@ -32,8 +32,8 @@
"label": "查询条件", "label": "查询条件",
"colNum": 2, "colNum": 2,
"alignY": "center", "alignY": "center",
"paddingLeft": 20,
"paddingRight": 20,
"paddingLeft": 16,
"paddingRight": 16,
"shadow": "" "shadow": ""
}, },
"children": [ "children": [


+ 0
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list.ftl View File

@@ -124,7 +124,6 @@
"type": "fx-${cfilters.editor}", "type": "fx-${cfilters.editor}",
"props": { "props": {
"label": "${cfilters.label}", "label": "${cfilters.label}",
"type": "text",
"maxlength": 50, "maxlength": 50,
"placeholder": "请输入${cfilters.label}", "placeholder": "请输入${cfilters.label}",
"labelWidth": 150, "labelWidth": 150,


+ 6
- 8
smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_1.ftl View File

@@ -45,10 +45,10 @@
"size": "50", "size": "50",
"alignY": "center", "alignY": "center",
"backgroundImage": "bgImg-region-title", "backgroundImage": "bgImg-region-title",
"paddingLeft": 32,
"paddingLeft": 16,
"colNum": 2, "colNum": 2,
"gridTemplateColumns": "", "gridTemplateColumns": "",
"paddingRight": 32
"paddingRight": 16
}, },
"children": [ "children": [
{ {
@@ -115,8 +115,8 @@
"alignY": "center", "alignY": "center",
"size": "50", "size": "50",
"gridTemplateColumns": "1fr 50px", "gridTemplateColumns": "1fr 50px",
"paddingLeft": 32,
"paddingRight": 32
"paddingLeft": 16,
"paddingRight": 16
}, },
"children": [ "children": [
<#list assist.cfilters as cfilters> <#list assist.cfilters as cfilters>
@@ -125,7 +125,6 @@
"type": "${cfilters.editor}", "type": "${cfilters.editor}",
"props": { "props": {
"label": "${cfilters.label}", "label": "${cfilters.label}",
"type": "text",
"maxlength": 50, "maxlength": 50,
"placeholder": "请输入${cfilters.label}", "placeholder": "请输入${cfilters.label}",
"labelWidth": 150, "labelWidth": 150,
@@ -282,7 +281,6 @@
"type": "${cfilters.editor}", "type": "${cfilters.editor}",
"props": { "props": {
"label": "${cfilters.label}", "label": "${cfilters.label}",
"type": "text",
"maxlength": 50, "maxlength": 50,
"placeholder": "请输入${cfilters.label}", "placeholder": "请输入${cfilters.label}",
"labelWidth": 100, "labelWidth": 100,
@@ -361,8 +359,8 @@
"backgroundImage": "bgImg-region-title", "backgroundImage": "bgImg-region-title",
"colNum": 2, "colNum": 2,
"alignY": "center", "alignY": "center",
"paddingLeft": 32,
"paddingRight": 32
"paddingLeft": 16,
"paddingRight": 16
}, },
"children": [ "children": [
{ {


+ 6
- 8
smtweb-framework/bpm/src/main/resources/static/template/default/model_list_list_2.ftl View File

@@ -45,10 +45,10 @@
"size": "50", "size": "50",
"alignY": "center", "alignY": "center",
"backgroundImage": "bgImg-region-title", "backgroundImage": "bgImg-region-title",
"paddingLeft": 32,
"paddingLeft": 16,
"colNum": 2, "colNum": 2,
"gridTemplateColumns": "", "gridTemplateColumns": "",
"paddingRight": 32
"paddingRight": 16
}, },
"children": [ "children": [
{ {
@@ -88,8 +88,8 @@
"alignY": "center", "alignY": "center",
"size": "50", "size": "50",
"gridTemplateColumns": "1fr 50px", "gridTemplateColumns": "1fr 50px",
"paddingLeft": 32,
"paddingRight": 32
"paddingLeft": 16,
"paddingRight": 16
}, },
"children": [ "children": [
<#list assist.cfilters as cfilters> <#list assist.cfilters as cfilters>
@@ -98,7 +98,6 @@
"type": "${cfilters.editor}", "type": "${cfilters.editor}",
"props": { "props": {
"label": "${cfilters.label}", "label": "${cfilters.label}",
"type": "text",
"maxlength": 50, "maxlength": 50,
"placeholder": "请输入${cfilters.label}", "placeholder": "请输入${cfilters.label}",
"labelWidth": 150, "labelWidth": 150,
@@ -224,7 +223,6 @@
"type": "${cfilters.editor}", "type": "${cfilters.editor}",
"props": { "props": {
"label": "${cfilters.label}", "label": "${cfilters.label}",
"type": "text",
"maxlength": 50, "maxlength": 50,
"placeholder": "请输入${cfilters.label}", "placeholder": "请输入${cfilters.label}",
"labelWidth": 100, "labelWidth": 100,
@@ -303,8 +301,8 @@
"backgroundImage": "bgImg-region-title", "backgroundImage": "bgImg-region-title",
"colNum": 2, "colNum": 2,
"alignY": "center", "alignY": "center",
"paddingLeft": 32,
"paddingRight": 32
"paddingLeft": 16,
"paddingRight": 16
}, },
"children": [ "children": [
{ {


+ 4
- 3
smtweb-framework/bpm/src/main/resources/static/template/default/model_list_normal.ftl View File

@@ -31,8 +31,8 @@
"label": "按钮区域", "label": "按钮区域",
"colNum": 2, "colNum": 2,
"alignY": "center", "alignY": "center",
"paddingLeft": 20,
"paddingRight": 20,
"paddingLeft": 16,
"paddingRight": 16,
"shadow": "" "shadow": ""
}, },
"children": [ "children": [
@@ -55,7 +55,8 @@
"type": "fx-button-group", "type": "fx-button-group",
"props": { "props": {
"showDropdown": false, "showDropdown": false,
"dataset": "${group.dataset}"
"dataset": "${group.dataset}",
"textAlign": "right"
}, },
"slots": { "slots": {
"default": [ "default": [


+ 0
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/model_step_card.ftl View File

@@ -278,7 +278,6 @@
</#if> </#if>
"props": { "props": {
"label": "${field.label}", "label": "${field.label}",
"type": "text",
"dataset": "${field.dataset}", "dataset": "${field.dataset}",
"required": "${field.required}", "required": "${field.required}",
"field": "${field.id}", "field": "${field.id}",


+ 6
- 5
smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list.ftl View File

@@ -87,7 +87,7 @@
"type": "fx-form-panel", "type": "fx-form-panel",
"shape": "panel", "shape": "panel",
"props": { "props": {
"size": "15",
"size": "16",
"backgroundColor": "--color-transparent" "backgroundColor": "--color-transparent"
}, },
"children": [] "children": []
@@ -113,8 +113,8 @@
"label": "按钮区域", "label": "按钮区域",
"colNum": 2, "colNum": 2,
"alignY": "center", "alignY": "center",
"paddingLeft": 20,
"paddingRight": 20,
"paddingLeft": 16,
"paddingRight": 16,
"shadow": "" "shadow": ""
}, },
"children": [ "children": [
@@ -137,7 +137,8 @@
"type": "fx-button-group", "type": "fx-button-group",
"props": { "props": {
"showDropdown": false, "showDropdown": false,
"dataset": "${group.dataset}"
"dataset": "${group.dataset}",
"textAlign": "right"
}, },
"slots": { "slots": {
"default": [ "default": [
@@ -168,7 +169,7 @@
"type": "fx-form-panel", "type": "fx-form-panel",
"shape": "panel", "shape": "panel",
"props": { "props": {
"size": "15",
"size": "16",
"backgroundColor": "transparent" "backgroundColor": "transparent"
}, },
"children": [] "children": []


+ 0
- 1
smtweb-framework/bpm/src/main/resources/static/template/default/model_tree_list_bak.ftl View File

@@ -108,7 +108,6 @@
"type": "fx-${cfilters.editor}", "type": "fx-${cfilters.editor}",
"props": { "props": {
"label": "${cfilters.label}", "label": "${cfilters.label}",
"type": "text",
"maxlength": 50, "maxlength": 50,
"hideLabel": true, "hideLabel": true,
"placeholder": "请输入${cfilters.label}", "placeholder": "请输入${cfilters.label}",


Write Preview
Loading…
Cancel
Save