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

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

上级 4d80e1fb
...@@ -36,27 +36,26 @@ ...@@ -36,27 +36,26 @@
:class="labelclasses" :class="labelclasses"
> >
<span v-if="required" style="color:red;">* </span> <span v-if="required" style="color:red;">* </span>
<span v-if="!isEmptyCaption"> <span v-if="!isEmptyCaption">
<el-tooltip v-if="isShowTip" placement="top" effect="light" popper-class="app-form-item__tip"> <el-tooltip v-if="isShowTip" placement="top" effect="light" popper-class="app-form-item__tip">
<i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/> <i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
<img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt=""> <img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
<span v-html="caption"></span> {{caption}}
<template > <template>
<span slot="content" v-html="caption" ></span> <span slot="content" v-html="caption"></span>
</template>
</el-tooltip>
<template v-if="!isShowTip" class="app-form-item__show-tip">
<i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
<img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
<span v-html="caption" ></span>
</template> </template>
</span> </el-tooltip>
<template v-else class="app-form-item__show-tip">
<i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
<img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
{{caption}}
</template>
</span>
</span> </span>
<div <div
v-if="viewStyle !== 'STYLE2' && ( Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT') )" v-if="viewStyle !== 'STYLE2' && ( Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT') )"
class="app-form-item__content" class="app-form-item__content"
:style="slotstyle" :style="slotstyle">
>
<form-item :prop="name" :error="error" :rules="rules"> <form-item :prop="name" :error="error" :rules="rules">
<slot></slot> <slot></slot>
</form-item> </form-item>
......
.app-embed-picker { .app-embed-picker {
height: 100%;
.app-embed-picker__value, .app-embed-picker__placeholder { .app-embed-picker__value, .app-embed-picker__placeholder {
line-height: 32px; line-height: 32px;
height: 32px; height: 32px;
...@@ -7,14 +8,14 @@ ...@@ -7,14 +8,14 @@
color: #dcdfe6; color: #dcdfe6;
} }
.view-default.view-container { .view-default.view-container {
padding: 0; padding: 0;
.ivu-card { .ivu-card {
> .ivu-card-body { > .ivu-card-body {
padding: 0;
> .content-container {
padding: 0; padding: 0;
> .content-container {
padding: 0;
}
} }
} }
} }
}
} }
\ No newline at end of file
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
height: 100%; height: 100%;
padding: 0 6px; padding: 0 6px;
.app-form-item__tip,.app-form-item__show-tip{ .app-form-item__tip,.app-form-item__show-tip{
i,img{ i,img{
margin-right: 4px; margin-right: 4px;
} }
} }
.app-form-item__label { .app-form-item__label {
padding: 6px 8px 6px 0px; padding: 6px 8px 6px 0px;
...@@ -15,32 +15,32 @@ ...@@ -15,32 +15,32 @@
font-weight: 600; font-weight: 600;
} }
&.label--top, &.label--bottom { &.label--top, &.label--bottom {
.app-form-item__label { >.app-form-item__label {
display: block; display: block;
} }
} }
&.label--left, &.label--right { &.label--left, &.label--right {
//todo 编辑器样式名待修改 //todo 编辑器样式名待修改
.app-form-item__label, .editor { >.app-form-item__label {
height: 100%; height: 36px;
} }
} }
&.label--left { &.label--left {
.app-form-item__label { >.app-form-item__label {
float: left; float: left;
text-align: right; text-align: right;
} }
} }
&.label--right { &.label--right {
.app-form-item__label { >.app-form-item__label {
float: right; float: right;
padding: 6px 0px 6px 10px; padding: 6px 0px 6px 10px;
} }
} }
&.label--none { &.label--none {
.app-form-item__label { >.app-form-item__label {
display: none; display: none;
} }
} }
} }
.app-form-item__content { .app-form-item__content {
...@@ -50,10 +50,11 @@ ...@@ -50,10 +50,11 @@
height: 100%; height: 100%;
min-height: 36px; min-height: 36px;
.ivu-form-item-error-tip{ .ivu-form-item-error-tip{
padding-top: 0; padding-top: 0;
} }
} }
> .ivu-form-item { > .ivu-form-item {
margin-bottom: 16px; height: 100%;
margin-bottom: 16px;
} }
} }
\ No newline at end of file
...@@ -5,6 +5,13 @@ ...@@ -5,6 +5,13 @@
width: 100%; width: 100%;
border: 0; border: 0;
} }
.app-form-item.label--left,
.app-form-item.label--right {
>.app-form-item__label {
position: relative;
top: -5px;
}
}
.app-form-item__content > .ivu-form-item { .app-form-item__content > .ivu-form-item {
margin-bottom: 8px; margin-bottom: 8px;
} }
......
// 嵌入视图容器布局 // 嵌入视图容器布局
.view-container2{ .view-container2 {
padding: 4px; padding: 4px;
.view-content__left,
.view-content__right,
.view-content__body {
flex-grow: 1;
min-height: 0;
min-width: 0;
}
} }
\ No newline at end of file
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</changeSet> </changeSet>
<!--输出实体[REGINFO]数据结构 --> <!--输出实体[REGINFO]数据结构 -->
<changeSet author="root" id="tab-reginfo-88-8"> <changeSet author="root" id="tab-reginfo-91-8">
<createTable tableName="T_REGINFO"> <createTable tableName="T_REGINFO">
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
...@@ -303,7 +303,7 @@ ...@@ -303,7 +303,7 @@
</changeSet> </changeSet>
<!--输出实体[REGINFO]外键关系 --> <!--输出实体[REGINFO]外键关系 -->
<changeSet author="root" id="fk-reginfo-88-12"> <changeSet author="root" id="fk-reginfo-91-12">
<addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/> <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
</changeSet> </changeSet>
......
...@@ -807,6 +807,28 @@ ...@@ -807,6 +807,28 @@
"requestPath" : "/select", "requestPath" : "/select",
"builtinMethod" : false "builtinMethod" : false
} ], } ],
"getAllPSAppDEUIActions" : [ {
"actionTarget" : "SINGLEKEY",
"caption" : "选项操作",
"codeName" : "openOpt",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
"viewType" : "DEOPTVIEW"
},
"frontProcessType" : "WIZARD",
"fullCodeName" : "Reginfo_openOpt",
"name" : "打开选项操作视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "openOpt",
"uIActionType" : "DEUIACTION",
"id" : "openOpt@Reginfo"
} ],
"getAllPSDEOPPrivs" : [ { "getAllPSDEOPPrivs" : [ {
"logicName" : "建立", "logicName" : "建立",
"name" : "CREATE" "name" : "CREATE"
......
...@@ -32,6 +32,17 @@ ...@@ -32,6 +32,17 @@
} ] } ]
} ], } ],
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"eventArg" : "tbitem1_openopt",
"eventNames" : "CLICK",
"logicTrigger" : "CTRLEVENT",
"logicType" : "APPVIEWUIACTION",
"name" : "toolbar_tbitem1_openopt_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_tbitem1_openopt"
},
"getPSViewCtrlName" : "toolbar"
}, {
"eventArg" : "tbitem3", "eventArg" : "tbitem3",
"eventNames" : "CLICK", "eventNames" : "CLICK",
"logicTrigger" : "CTRLEVENT", "logicTrigger" : "CTRLEVENT",
...@@ -244,6 +255,18 @@ ...@@ -244,6 +255,18 @@
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "toolbar_tbitem1_openopt",
"getPSUIAction" : {
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"modelref" : true,
"id" : "openOpt@Reginfo"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "toolbar_tbitem3", "name" : "toolbar_tbitem3",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
...@@ -1057,6 +1080,16 @@ ...@@ -1057,6 +1080,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}, },
"getPSControlLogics" : [ { "getPSControlLogics" : [ {
"eventArg" : "tbitem1_openopt",
"eventNames" : "CLICK",
"logicTag" : "toolbar",
"logicType" : "APPVIEWLOGIC",
"name" : "toolbar_tbitem1_openopt_click",
"getPSAppViewLogic" : {
"modelref" : true,
"id" : "toolbar_tbitem1_openopt_click"
}
}, {
"eventArg" : "tbitem3", "eventArg" : "tbitem3",
"eventNames" : "CLICK", "eventNames" : "CLICK",
"logicTag" : "toolbar", "logicTag" : "toolbar",
...@@ -1191,6 +1224,45 @@ ...@@ -1191,6 +1224,45 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "选项操作",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "tbitem1_openopt",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_tbitem1_openopt"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "选项操作",
"codeName" : "openOpt",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
"viewType" : "DEOPTVIEW"
},
"frontProcessType" : "WIZARD",
"fullCodeName" : "Reginfo_openOpt",
"name" : "打开选项操作视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "openOpt",
"uIActionType" : "DEUIACTION",
"id" : "openOpt@Reginfo"
},
"tooltip" : "选项操作",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "tbitem2",
"spanMode" : false
}, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.NEW" "lanResTag" : "TBB.TEXT.*.NEW"
}, },
......
...@@ -1604,6 +1604,17 @@ ...@@ -1604,6 +1604,17 @@
} ] } ]
} ], } ],
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"eventArg" : "tbitem1_openopt",
"eventNames" : "CLICK",
"logicTrigger" : "CTRLEVENT",
"logicType" : "APPVIEWUIACTION",
"name" : "toolbar_tbitem1_openopt_click",
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_tbitem1_openopt"
},
"getPSViewCtrlName" : "toolbar"
}, {
"eventArg" : "tbitem3", "eventArg" : "tbitem3",
"eventNames" : "CLICK", "eventNames" : "CLICK",
"logicTrigger" : "CTRLEVENT", "logicTrigger" : "CTRLEVENT",
...@@ -1816,6 +1827,18 @@ ...@@ -1816,6 +1827,18 @@
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "toolbar_tbitem1_openopt",
"getPSUIAction" : {
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"modelref" : true,
"id" : "openOpt@Reginfo"
},
"uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid"
}, {
"name" : "toolbar_tbitem3", "name" : "toolbar_tbitem3",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
...@@ -2629,6 +2652,16 @@ ...@@ -2629,6 +2652,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
}, },
"getPSControlLogics" : [ { "getPSControlLogics" : [ {
"eventArg" : "tbitem1_openopt",
"eventNames" : "CLICK",
"logicTag" : "toolbar",
"logicType" : "APPVIEWLOGIC",
"name" : "toolbar_tbitem1_openopt_click",
"getPSAppViewLogic" : {
"modelref" : true,
"id" : "toolbar_tbitem1_openopt_click"
}
}, {
"eventArg" : "tbitem3", "eventArg" : "tbitem3",
"eventNames" : "CLICK", "eventNames" : "CLICK",
"logicTag" : "toolbar", "logicTag" : "toolbar",
...@@ -2763,6 +2796,45 @@ ...@@ -2763,6 +2796,45 @@
"id" : "TOOLBAR" "id" : "TOOLBAR"
}, },
"getPSDEToolbarItems" : [ { "getPSDEToolbarItems" : [ {
"caption" : "选项操作",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "tbitem1_openopt",
"noPrivDisplayMode" : 2,
"getPSAppViewUIAction" : {
"modelref" : true,
"id" : "toolbar_tbitem1_openopt"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "选项操作",
"codeName" : "openOpt",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
"viewType" : "DEOPTVIEW"
},
"frontProcessType" : "WIZARD",
"fullCodeName" : "Reginfo_openOpt",
"name" : "打开选项操作视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "openOpt",
"uIActionType" : "DEUIACTION",
"id" : "openOpt@Reginfo"
},
"tooltip" : "选项操作",
"showCaption" : true,
"showIcon" : true
}, {
"itemType" : "SEPERATOR",
"name" : "tbitem2",
"spanMode" : false
}, {
"getCapPSLanguageRes" : { "getCapPSLanguageRes" : {
"lanResTag" : "TBB.TEXT.*.NEW" "lanResTag" : "TBB.TEXT.*.NEW"
}, },
...@@ -12894,6 +12966,28 @@ ...@@ -12894,6 +12966,28 @@
"requestPath" : "/select", "requestPath" : "/select",
"builtinMethod" : false "builtinMethod" : false
} ], } ],
"getAllPSAppDEUIActions" : [ {
"actionTarget" : "SINGLEKEY",
"caption" : "选项操作",
"codeName" : "openOpt",
"getFrontPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
"viewType" : "DEOPTVIEW"
},
"frontProcessType" : "WIZARD",
"fullCodeName" : "Reginfo_openOpt",
"name" : "打开选项操作视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
},
"timeout" : 60000,
"uIActionMode" : "FRONT",
"uIActionTag" : "openOpt",
"uIActionType" : "DEUIACTION",
"id" : "openOpt@Reginfo"
} ],
"getAllPSDEOPPrivs" : [ { "getAllPSDEOPPrivs" : [ {
"logicName" : "建立", "logicName" : "建立",
"name" : "CREATE" "name" : "CREATE"
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册