zhenggm
/
smtweb2
1
0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

Merge branch 'master' of http://47.92.149.153:3000/zhenggm/smtweb2

master
郑根木 il y a 2 ans
Parent
8b0c263e45 d82740a358
révision
393daed604
4 fichiers modifiés avec 454 ajouts et 1 suppressions
Vue séparée
Option de Diff
Voir les Statistiques Télécharger le Fichier Patch Télécharger le Fichier des Différences
  1. +1
    -1
      smtweb-framework/bpm/src/main/resources/config/application.yaml
  2. +18
    -0
      smtweb-framework/bpm/src/main/resources/static/template/index.yaml
  3. +426
    -0
      smtweb-framework/bpm/src/main/resources/static/template/model_group_card.ftl
  4. +9
    -0
      smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/filter/XssSecurityConfig.java

+ 1
- 1
smtweb-framework/bpm/src/main/resources/config/application.yaml Voir le fichier

@@ -27,7 +27,7 @@ spring:
password:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/smt_asp?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
url: jdbc:mysql://127.0.0.1:3306/gdmz?useUnicode=true&characterEncoding=utf-8&allowMultiQueries=true&useSSL=false
username: root
password: root
servlet:


+ 18
- 0
smtweb-framework/bpm/src/main/resources/static/template/index.yaml Voir le fichier

@@ -57,6 +57,24 @@ model:
label: '列数'
desc: '请选择表单列数(目前只支持1，2，3)'
-
name: 'model_group_card'
label: '分组卡片'
# list/card/view
type: 'card'
# 布局
layout:
-
name: 'c1'
label: '分组卡片'
type: 'card'
hasGroup: true
param:
-
name: 'mainDs'
type: 'ds'
label: '主卡片数据集'
desc: '请选择主要卡片数据集'
-
name: 'model_list_card'
label: '简单列表(含卡片)'
# list/card/view


+ 426
- 0
smtweb-framework/bpm/src/main/resources/static/template/model_group_card.ftl Voir le fichier

@@ -0,0 +1,426 @@
{
"version": 6,
"form": [
{
"page": {
"id": "p${newId()}",
"type": "fx-page",
"props": {
"title": "${title}",
"key": "${newId()}"
}
},
"graph": {
"shape": "panel",
"id": "root_panel",
"type": "fx-split-panel",
"props": {
"horizontal": false,
"shadow": "never",
"size": "1200"
},
"children": [
{
"id": "${newId()}",
"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",
"backgroundImage": "",
"size": "50"
},
"children": [
{
"id": "${newId()}",
"type": "fx-button-group",
"props": {
"menus": []
},
"slots": {
"default": [
{
"type": "fx-button",
"props": {
"label": "返回",
"leftIcon": "left",
"action": "button:return",
"text": false,
"link": true,
"type": "primary",
"size": "large"
},
"id": "${newId()}"
}
],
"dropdown": []
}
}
]
},
{
"id": "${newId()}",
"type": "fx-form-panel",
"shape": "panel",
"props": {
"alignY": "center",
"size": "200",
"backgroundImage": "",
"paddingLeft": 10
},
"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": [
{
"type": "fx-button",
"props": {
"label": "删除",
"leftIcon": "delete",
"type": "",
"action": "button:remove"
},
"id": "${newId()}"
},
{
"id": "${newId()}",
"type": "fx-button",
"props": {
"label": "新增",
"type": "primary",
"linkType": "curr",
"leftIcon": "plus"
}
}
],
"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
},
"children": [
{
"id": "${newId()}",
"type": "fx-form-panel",
"shape": "panel",
"props": {
"size": "10",
"backgroundColor": "--color-transparent"
},
"children": []
},
<#list layout.c1 as group>

{
"id": "${newId()}",
"type": "fx-form-panel",
"shape": "panel",
"props": {
"size": "48",
"label": "${group.label}",
"colNum": 2,
"alignY": "center",
"paddingLeft": 32,
"paddingRight": 32,
"shadow": "",
"backgroundImage": "bgImg-region-title"
},
"children": [
{
"id": "id${newId()}",
"type": "fx-title",
"props": {
"label": "${group.label}",
"fontSize": 16,
"color": "#01070D",
"fontWeight": "bold",
"showPrefix": false,
"prefixWidth": 5,
"prefixHeight": 24,
"prefixColor": "#1E90FF"
}
}
]
},
<#if (group.type == "card")>
{
"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-form-panel",
"shape": "panel",
"props": {
"size": "0",
"gridTemplateColumns": "1fr 1fr 1fr",
"paddingTop": 32
},
"children": [
<#list group.fields as field>
{
"id": "${newId()}",
"type": "fx-${field.editor}",
"props": {
"label": "${field.label}",
"type": "text",
"dataset": "${field.dataset}",
"required": "${field.required}",
"field": "${field.id}",
"placeholder": "请输入内容",
"labelWidth": 150,
"readonly": "${field.readonly}",
"affixError": true
},
"events": {}
}<#if field_has_next>,</#if>
</#list>
]
},
<#elseif (group.type == "list")>
{
"id": "${newId()}",
"type": "fx-form-panel",
"shape": "panel",
"props": {
"size": "400",
"label": "列表",
"colNum": 0,
"paddingLeft": 20,
"paddingRight": 20,
"shadow": "",
"paddingTop": 0
},
"children": [
{
"id": "id${newId()}",
"type": "fx-table",
"props": {
"label": "表格",
"border": true,
"stripe": true,
"showHeader": true,
"fit": true,
"dataset": "${group.dataset}",
"actionWidth": 150
},
"slots": {
"default": [
<#list group.fields as field>
{
"id": "id${newId()}",
"type": "fx-table-column",
"props": {
"field": "${field.id}",
"label": "${field.label}"
}
}<#if field_has_next>,</#if>
</#list>
],
"button": [
{
"id": "id${newId()}",
"type": "fx-button",
"props": {
"label": "编辑",
"type": "text",
"leftIcon": "edit",
"action": "button:edit",
"dataset": "${group.dataset}",
"link": true,
"linkType": "",
"nextAction": "",
"fxLink": ""
}
},
{
"id": "id${newId()}",
"type": "fx-button",
"props": {
"label": "删除",
"type": "text",
"leftIcon": "delete-themes",
"action": "button:remove",
"preAction": "",
"link": true,
"confirm": ""
}
}
]
},
"events": {}
}
]
},
</#if>
{
"id": "${newId()}",
"type": "fx-form-panel",
"shape": "panel",
"props": {
"size": "10",
"backgroundColor": "transparent"
},
"children": []
}<#if group_has_next>,</#if>
</#list>
]
},
{
"shape": "panel",
"id": "form_panel",
"type": "fx-form-panel",
"props": {
"colNum": 3,
"paddingX": 5,
"paddingY": 5,
"size": "56",
"alignX": "",
"alignY": "center",
"shadow": "always"
},
"children": [
{
"id": "id${newId()}",
"type": "fx-button-group",
"props": {
"showDropdown": false,
"textAlign": "center"
},
"slots": {
"default": [
{
"type": "fx-button",
"props": {
"label": "重置",
"leftIcon": "",
"type": "",
"action": "button:add",
"linkType": "curr"
},
"id": "id${newId()}"
},
{
"type": "fx-button",
"props": {
"label": "保存",
"leftIcon": "",
"type": "primary",
"action": "button:save"
},
"id": "id${newId()}"
},
{
"type": "fx-button",
"props": {
"label": "保存并新增",
"leftIcon": "",
"action": "button:return",
"type": "primary"
},
"id": "id${newId()}"
}
],
"dropdown": []
},
"layout": {
"row": 3,
"col": 3
}
}
]
}
]
}
}
],
"model": [
<#list datasets as dataset>
<#include "incModel/inc_model.ftl"/><#if dataset_has_next>,</#if>
</#list>
],
"option": {
"widgetRef": [${widgetRef}],
"vars": []
}
}

+ 9
- 0
smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/filter/XssSecurityConfig.java Voir le fichier

@@ -59,6 +59,9 @@ public class XssSecurityConfig implements InitializingBean {

@Override
public void afterPropertiesSet() throws Exception {
if (!initSuccess()) {
return;
}
StringBuffer tempStr = new StringBuffer("^");
regex.forEach(k -> {
tempStr.append(k);
@@ -88,6 +91,7 @@ public class XssSecurityConfig implements InitializingBean {
* @return
*/
public String securityReplace(String text) {
if (!initSuccess()) return text;
if (StringUtils.isEmpty(text)) {
return text;
} else {
@@ -102,11 +106,16 @@ public class XssSecurityConfig implements InitializingBean {
* @return
*/
public boolean matches(String text) {
if (!initSuccess()) return false;
if (StringUtils.isEmpty(text)) {
return false;
}
return XSS_PATTERN.matcher(text).matches();
}

private boolean initSuccess() {
return regex != null && regex.size() > 0;
}
}



Écrire Aperçu
Chargement…
Annuler
Enregistrer