提交 a1ba1526 编写于 作者: ibizdev's avatar ibizdev

zhujiamin 发布系统代码 [TrainSys,网页端]

上级 86f0ef88
...@@ -34,7 +34,6 @@ ...@@ -34,7 +34,6 @@
>.bar-container { >.bar-container {
flex: auto; flex: auto;
margin-bottom: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
} }
>.bar-container { >.bar-container {
flex: auto; flex: auto;
margin-bottom: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
} }
.caption-info { .caption-info {
line-height: 48px; line-height: 42px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
} }
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
// 标题栏右侧工具栏 // 标题栏右侧工具栏
>.bar-container { >.bar-container {
flex: auto; flex: auto;
margin-bottom: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
......
...@@ -10,14 +10,13 @@ ...@@ -10,14 +10,13 @@
font-size: 12px; font-size: 12px;
} }
.caption-info { .caption-info {
line-height: 48px; line-height: 42px;
font-size: 14px; font-size: 14px;
font-weight: 600; font-weight: 600;
} }
// 标题栏右侧工具栏 // 标题栏右侧工具栏
>.bar-container { >.bar-container {
flex: auto; flex: auto;
margin-bottom: 4px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: flex-end; justify-content: flex-end;
......
...@@ -479,7 +479,13 @@ html, body{ ...@@ -479,7 +479,13 @@ html, body{
padding-right: 6px; padding-right: 6px;
} }
.exp-view_nav-view { .exp-view_nav-view {
padding-top: 4px;
padding-left: 16px; padding-left: 16px;
>.view-container.view-default.viewcontainer2 {
margin: 0;
height: 100%;
width: 100%;
}
} }
} }
.exp-view-top { .exp-view-top {
...@@ -502,7 +508,7 @@ html, body{ ...@@ -502,7 +508,7 @@ html, body{
// 导航部件头部 // 导航部件头部
.expbarcontrol-header { .expbarcontrol-header {
display: flex; display: flex;
min-height: 36px; min-height: 41px;
padding-bottom: 4px; padding-bottom: 4px;
border-bottom: 1px solid #E4E4E4; border-bottom: 1px solid #E4E4E4;
align-items: center; align-items: center;
...@@ -539,7 +545,6 @@ html, body{ ...@@ -539,7 +545,6 @@ html, body{
} }
.expbarcontrol-header + .expbarcontrol-xdata-ctrl { .expbarcontrol-header + .expbarcontrol-xdata-ctrl {
padding-top: 8px; padding-top: 8px;
// 标题高度 36 + padding 4 + 边框 1
max-height: calc(100% - 41px); max-height: calc(100% - 41px);
} }
} }
......
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</changeSet> </changeSet>
<!--输出实体[REGINFO]数据结构 --> <!--输出实体[REGINFO]数据结构 -->
<changeSet author="root" id="tab-reginfo-50-8"> <changeSet author="root" id="tab-reginfo-58-8">
<createTable tableName="T_REGINFO"> <createTable tableName="T_REGINFO">
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
......
...@@ -1109,6 +1109,27 @@ ...@@ -1109,6 +1109,27 @@
"type" : "DEFAULT" "type" : "DEFAULT"
} ], } ],
"getAllPSDEFValueRules" : [ { "getAllPSDEFValueRules" : [ {
"codeName" : "ValueRule2",
"name" : "测试实体值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "STUNO",
"name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
"paramType" : "ENTITYFIELD",
"paramValue" : "testaaa"
} ]
},
"ruleInfo" : "测试实体值规则",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
}, {
"codeName" : "ValueRule", "codeName" : "ValueRule",
"name" : "实体值规则", "name" : "实体值规则",
"getPSDEFVRGroupCondition" : { "getPSDEFVRGroupCondition" : {
......
...@@ -240,6 +240,49 @@ ...@@ -240,6 +240,49 @@
"codeName" : "ReginfoName" "codeName" : "ReginfoName"
} }
} ], } ],
"getPSDEGridEditItemVRs" : [ {
"checkMode" : 1,
"name" : "编辑项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"name" : "测试实体值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "STUNO",
"name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
"paramType" : "ENTITYFIELD",
"paramValue" : "testaaa"
} ]
},
"ruleInfo" : "测试实体值规则",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEGridEditItemName" : "stuno",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "编辑项值规则",
"getPSDEGridEditItemName" : "age",
"getPSSysValueRule" : {
"codeName" : "ValueRule4",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule4.json",
"name" : "正整数",
"regExCode" : "[0-9]*[1-9][0-9]*",
"ruleInfo" : "内容必须为正整数",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
} ],
"getPSDEGridEditItems" : [ { "getPSDEGridEditItems" : [ {
"caption" : "学员编号", "caption" : "学员编号",
"codeName" : "stuno", "codeName" : "stuno",
......
...@@ -669,6 +669,49 @@ ...@@ -669,6 +669,49 @@
"codeName" : "ReginfoName" "codeName" : "ReginfoName"
} }
} ], } ],
"getPSDEGridEditItemVRs" : [ {
"checkMode" : 1,
"name" : "编辑项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"name" : "测试实体值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "STUNO",
"name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
"paramType" : "ENTITYFIELD",
"paramValue" : "testaaa"
} ]
},
"ruleInfo" : "测试实体值规则",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEGridEditItemName" : "stuno",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "编辑项值规则",
"getPSDEGridEditItemName" : "age",
"getPSSysValueRule" : {
"codeName" : "ValueRule4",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule4.json",
"name" : "正整数",
"regExCode" : "[0-9]*[1-9][0-9]*",
"ruleInfo" : "内容必须为正整数",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
} ],
"getPSDEGridEditItems" : [ { "getPSDEGridEditItems" : [ {
"caption" : "学员编号", "caption" : "学员编号",
"codeName" : "stuno", "codeName" : "stuno",
......
...@@ -2127,6 +2127,49 @@ ...@@ -2127,6 +2127,49 @@
"codeName" : "ReginfoName" "codeName" : "ReginfoName"
} }
} ], } ],
"getPSDEGridEditItemVRs" : [ {
"checkMode" : 1,
"name" : "编辑项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"name" : "测试实体值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "STUNO",
"name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
"paramType" : "ENTITYFIELD",
"paramValue" : "testaaa"
} ]
},
"ruleInfo" : "测试实体值规则",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEGridEditItemName" : "stuno",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "编辑项值规则",
"getPSDEGridEditItemName" : "age",
"getPSSysValueRule" : {
"codeName" : "ValueRule4",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule4.json",
"name" : "正整数",
"regExCode" : "[0-9]*[1-9][0-9]*",
"ruleInfo" : "内容必须为正整数",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
} ],
"getPSDEGridEditItems" : [ { "getPSDEGridEditItems" : [ {
"caption" : "学员编号", "caption" : "学员编号",
"codeName" : "stuno", "codeName" : "stuno",
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册