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

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

上级 5dd96f7a
......@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
......@@ -1569,16 +1569,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......
......@@ -528,13 +528,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -544,48 +544,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -28,26 +28,50 @@
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"defaultContent" : "房地产和中介关系表名称",
"lanResTag" : "DEF.LNAME.REALESTATEREALTORNAME",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[REALESTATEREALTORNAME]",
"refFlag" : true
"caption" : "房产",
"codeName" : "realestatename",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestatename",
"excelCaption" : "房产",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealEstateRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realestateid",
"name" : "realestatename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
},
"caption" : "房地产和中介关系表名称",
"codeName" : "realestaterealtorname",
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "中介",
"codeName" : "realtorname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestaterealtorname",
"excelCaption" : "房地产和中介关系表名称",
"name" : "realestaterealtorname",
"dataItemName" : "realtorname",
"excelCaption" : "中介",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealtorRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realtorid",
"name" : "realtorname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALTORNAME",
"codeName" : "RealtorName"
},
"width" : 150,
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
......@@ -105,10 +129,17 @@
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "realestaterealtorname",
"name" : "realestatename",
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
}
}, {
"dataType" : 25,
"name" : "realtorname",
"getPSAppDEField" : {
"name" : "REALTORNAME",
"codeName" : "RealtorName"
}
}, {
"dataType" : 25,
......
......@@ -353,7 +353,7 @@
"getPSAppViewParams" : [ {
"key" : "PROPERTYMAP",
"name" : "PROPERTYMAP",
"value" : "realestatename:realestatename"
"value" : "realestatename:realestatename,address:readdress"
} ],
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
......@@ -494,13 +494,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -510,48 +510,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -1231,13 +1231,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -1247,48 +1247,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -1230,13 +1230,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -1246,48 +1246,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -291,26 +291,50 @@
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"defaultContent" : "房地产和中介关系表名称",
"lanResTag" : "DEF.LNAME.REALESTATEREALTORNAME",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[REALESTATEREALTORNAME]",
"refFlag" : true
"caption" : "房产",
"codeName" : "realestatename",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestatename",
"excelCaption" : "房产",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealEstateRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realestateid",
"name" : "realestatename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
},
"caption" : "房地产和中介关系表名称",
"codeName" : "realestaterealtorname",
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "中介",
"codeName" : "realtorname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestaterealtorname",
"excelCaption" : "房地产和中介关系表名称",
"name" : "realestaterealtorname",
"dataItemName" : "realtorname",
"excelCaption" : "中介",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealtorRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realtorid",
"name" : "realtorname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALTORNAME",
"codeName" : "RealtorName"
},
"width" : 150,
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
......@@ -368,10 +392,17 @@
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "realestaterealtorname",
"name" : "realestatename",
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
}
}, {
"dataType" : 25,
"name" : "realtorname",
"getPSAppDEField" : {
"name" : "REALTORNAME",
"codeName" : "RealtorName"
}
}, {
"dataType" : 25,
......@@ -1194,7 +1225,6 @@
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : "房地产和中介关系表表格视图",
"getTitlePSLanguageRes" : {
"defaultContent" : "房地产和中介关系表表格视图",
......
......@@ -172,26 +172,50 @@
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"defaultContent" : "房地产和中介关系表名称",
"lanResTag" : "DEF.LNAME.REALESTATEREALTORNAME",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[REALESTATEREALTORNAME]",
"refFlag" : true
"caption" : "房产",
"codeName" : "realestatename",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestatename",
"excelCaption" : "房产",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealEstateRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realestateid",
"name" : "realestatename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
},
"caption" : "房地产和中介关系表名称",
"codeName" : "realestaterealtorname",
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "中介",
"codeName" : "realtorname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestaterealtorname",
"excelCaption" : "房地产和中介关系表名称",
"name" : "realestaterealtorname",
"dataItemName" : "realtorname",
"excelCaption" : "中介",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealtorRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realtorid",
"name" : "realtorname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALTORNAME",
"codeName" : "RealtorName"
},
"width" : 150,
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
......@@ -249,10 +273,17 @@
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "realestaterealtorname",
"name" : "realestatename",
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
}
}, {
"dataType" : 25,
"name" : "realtorname",
"getPSAppDEField" : {
"name" : "REALTORNAME",
"codeName" : "RealtorName"
}
}, {
"dataType" : 25,
......
......@@ -142,26 +142,50 @@
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"defaultContent" : "房地产和中介关系表名称",
"lanResTag" : "DEF.LNAME.REALESTATEREALTORNAME",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[REALESTATEREALTORNAME]",
"refFlag" : true
"caption" : "房产",
"codeName" : "realestatename",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestatename",
"excelCaption" : "房产",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealEstateRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realestateid",
"name" : "realestatename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
},
"caption" : "房地产和中介关系表名称",
"codeName" : "realestaterealtorname",
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "中介",
"codeName" : "realtorname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestaterealtorname",
"excelCaption" : "房地产和中介关系表名称",
"name" : "realestaterealtorname",
"dataItemName" : "realtorname",
"excelCaption" : "中介",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealtorRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realtorid",
"name" : "realtorname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALTORNAME",
"codeName" : "RealtorName"
},
"width" : 150,
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
......@@ -219,10 +243,17 @@
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "realestaterealtorname",
"name" : "realestatename",
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
}
}, {
"dataType" : 25,
"name" : "realtorname",
"getPSAppDEField" : {
"name" : "REALTORNAME",
"codeName" : "RealtorName"
}
}, {
"dataType" : 25,
......
......@@ -172,26 +172,50 @@
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"defaultContent" : "房地产和中介关系表名称",
"lanResTag" : "DEF.LNAME.REALESTATEREALTORNAME",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[REALESTATEREALTORNAME]",
"refFlag" : true
"caption" : "房产",
"codeName" : "realestatename",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestatename",
"excelCaption" : "房产",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealEstateRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realestateid",
"name" : "realestatename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
},
"caption" : "房地产和中介关系表名称",
"codeName" : "realestaterealtorname",
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "中介",
"codeName" : "realtorname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "realestaterealtorname",
"excelCaption" : "房地产和中介关系表名称",
"name" : "realestaterealtorname",
"dataItemName" : "realtorname",
"excelCaption" : "中介",
"getLinkPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealtorRedirectView.json",
"viewType" : "DEREDIRECTVIEW"
},
"linkValueItem" : "realtorid",
"name" : "realtorname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALTORNAME",
"codeName" : "RealtorName"
},
"width" : 150,
"width" : 100,
"widthUnit" : "PX",
"enableLinkView" : true,
"enableSort" : true
}, {
"align" : "LEFT",
......@@ -249,10 +273,17 @@
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "realestaterealtorname",
"name" : "realestatename",
"getPSAppDEField" : {
"name" : "REALESTATEREALTORNAME",
"codeName" : "RealEstateRealtorName"
"name" : "REALESTATENAME",
"codeName" : "RealEstateName"
}
}, {
"dataType" : 25,
"name" : "realtorname",
"getPSAppDEField" : {
"name" : "REALTORNAME",
"codeName" : "RealtorName"
}
}, {
"dataType" : 25,
......
......@@ -254,13 +254,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -270,48 +270,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -113,7 +113,7 @@
"getPSAppViewParams" : [ {
"key" : "PROPERTYMAP",
"name" : "PROPERTYMAP",
"value" : "realestatename:realestatename"
"value" : "realestatename:realestatename,address:readdress"
} ],
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
......@@ -254,13 +254,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -270,48 +270,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -1056,7 +1056,7 @@
"getPSAppViewParams" : [ {
"key" : "PROPERTYMAP",
"name" : "PROPERTYMAP",
"value" : "realestatename:realestatename"
"value" : "realestatename:realestatename,address:readdress"
} ],
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
......@@ -1197,13 +1197,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -1213,48 +1213,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -1055,7 +1055,7 @@
"getPSAppViewParams" : [ {
"key" : "PROPERTYMAP",
"name" : "PROPERTYMAP",
"value" : "realestatename:realestatename"
"value" : "realestatename:realestatename,address:readdress"
} ],
"getPSAppViewRefs" : [ {
"name" : "EDITDATA",
......@@ -1196,13 +1196,13 @@
"showIcon" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"caption" : "删除",
"groupExtractMode" : "ITEM",
"itemType" : "DEUIACTION",
"name" : "deuiaction2",
......@@ -1212,48 +1212,48 @@
"id" : "toolbar_deuiaction2"
},
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"actionTarget" : "MULTIKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TEXT.*.REMOVE",
"lanResType" : "TBB.TEXT",
"name" : "工具栏按钮文本[*.EDIT]",
"name" : "工具栏按钮文本[*.REMOVE]",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"name" : "表格界面_编辑操作",
"caption" : "删除",
"codeName" : "Remove",
"fullCodeName" : "Remove",
"name" : "表格界面_删除操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
"glyph" : "xf00d@FontAwesome",
"cssClass" : "fa fa-remove"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"predefinedType" : "GRIDVIEW_REMOVEACTION",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionTag" : "Remove",
"uIActionType" : "DEUIACTION"
},
"tooltip" : "编辑",
"tooltip" : "删除",
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"defaultContent" : "删除",
"lanResTag" : "TBB.TOOLTIP.*.REMOVE",
"lanResType" : "TBB.TOOLTIP",
"name" : "工具栏按钮提示[*.EDIT]",
"name" : "工具栏按钮提示[*.REMOVE]",
"refFlag" : true
},
"uIActionTarget" : "SINGLEKEY",
"uIActionTarget" : "MULTIKEY",
"showCaption" : true,
"showIcon" : true
} ],
......
......@@ -1676,6 +1676,28 @@
"layout" : "TABLE_24COL"
},
"tooltip" : "中介"
}, {
"accUserMode" : 2,
"caption" : "关联表",
"itemType" : "MENUITEM",
"name" : "menuitem77",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0108117198"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "关联表"
} ],
"getPSLayout" : {
"childColLG" : -1,
......
......@@ -742,6 +742,16 @@
"id" : "UsrAppFunc0108474888"
},
"tooltip" : "中介"
}, {
"accUserMode" : 2,
"caption" : "关联表",
"itemType" : "MENUITEM",
"name" : "menuitem77",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0108117198"
},
"tooltip" : "关联表"
} ],
"tooltip" : "N对N"
} ],
......
......@@ -4683,6 +4683,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr12114819GanttView.json",
"viewType" : "DEGANTTVIEW"
}
}, {
"appFuncType" : "APPVIEW",
"codeName" : "UsrAppFunc0108117198",
"name" : "房地产和中介关系表实体表格视图",
"openMode" : "INDEXVIEWTAB",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/RealEstateRealtorGridView.json",
"viewType" : "DEGRIDVIEW"
}
}, {
"appFuncType" : "APPVIEW",
"codeName" : "AppFunc25",
......@@ -12651,16 +12661,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......@@ -12721,10 +12731,10 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图方",
"name" : "消息位置-视图方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-弹出",
......@@ -12733,32 +12743,26 @@
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-视图上方",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
......@@ -12767,18 +12771,19 @@
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
......@@ -12793,21 +12798,26 @@
},
"position" : "POPUP"
}, {
"name" : "消息类型-警告信息",
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-无删除",
......@@ -12816,26 +12826,26 @@
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg13"
}
} ]
}, {
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-实体数据集",
"name" : "动态模式-静态内容",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg14"
"id" : "ViewMsg15"
}
}, {
"name" : "动态模式-静态内容",
"name" : "动态模式-实体数据集",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg15"
"id" : "ViewMsg14"
}
} ]
} ],
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
......@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- containerPort: 50000
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "50000:50000"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册