Skip to content

T
TrainSys
提交 ca982baf 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 af10f3ec
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 518 行增加 和 25 行删除
app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-indexview-layout/app-default-indexview-layout.tsx
浏览文件 @ ca982baf
......@@ -203,8 +203,8 @@ export class AppDefaultIndexViewLayout extends AppDefaultViewLayout {
</div>
<div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
<app-header-menus />
<app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' />
<app-orgsector />
{ this.Environment.showLang && <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' /> }
{ this.Environment.showOrg && <app-orgsector /> }
<app-user viewStyle={this.viewInstance.viewStyle} />
<app-message-popover />
</div>
......@@ -250,8 +250,8 @@ export class AppDefaultIndexViewLayout extends AppDefaultViewLayout {
</div>
<div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
<app-header-menus />
<app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' />
<app-orgsector />
{ this.Environment.showLang && <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;' />}
{ this.Environment.showOrg && <app-orgsector /> }
<app-user viewStyle={this.viewInstance.viewStyle} />
<app-message-popover />
</div>
......@@ -294,8 +294,8 @@ export class AppDefaultIndexViewLayout extends AppDefaultViewLayout {
</div>
<div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
<app-header-menus />
<app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;'></app-lang>
<app-orgsector></app-orgsector>
{this.Environment.showLang && <app-lang title={this.model.srfTitle || this.model.srfCaption} style='font-size: 15px;padding: 0 10px;'></app-lang>}
{ this.Environment.showOrg && <app-orgsector /> }
<app-user viewStyle={this.viewInstance.viewStyle}></app-user>
<app-message-popover></app-message-popover>
</div>
......
app_Web/packages/ibiz-vue/src/widgets/expbar-control-base.tsx
浏览文件 @ ca982baf
......@@ -478,11 +478,17 @@ export class ExpBarControlBase extends MainControlBase implements ExpBarControlI
if (!quickGroupSearch && !this.controlInstance.showTitleBar && !this.controlInstance.enableSearch && !(this.toolbarModels && this.toolbarModels.length)) {
return null;
}
const image = this.controlInstance.M.getPSSysImage;
return (
<div class="expbarcontrol-header">
{this.controlInstance.showTitleBar ?
<div class="caption">
<icon type="ios-home-outline" />
{
image ?
image.imagePath ? <img src={image.imagePath}/> :
image.cssClass ? <i class={image.cssClass}></i> : null :
<icon type="ios-home-outline" />
}
<span class="text">{this.$tl(this.controlInstance.getTitlePSLanguageRes()?.lanResTag, this.controlInstance.title)}</span>
</div> : null}
{quickGroupSearch ? quickGroupSearch : null}
......
app_Web/src/environments/environment.ts
浏览文件 @ ca982baf
......@@ -100,7 +100,11 @@ export const Environment = {
// 是否提示所有的字段的错误信息
noticeAllFieldsError: Boolean(process.env.VUE_APP_NOTICEALLFIELDSERROR === "true"),
// 系统默认的最大导出个数
exportMaxRowCount:Number(process.env.VUE_APP_EXPORTMAXROWCOUNT)
exportMaxRowCount:Number(process.env.VUE_APP_EXPORTMAXROWCOUNT),
// 应用是否显示多语言
showLang: true,
// 应用是否显示组织
showOrg: true,
};
// 挂载外部配置文件
if ((window as any).Environment) {
......
app_Web/src/styles/default.less
浏览文件 @ ca982baf
......@@ -483,7 +483,7 @@ html, body{
padding-left: 16px;
>.view-container.view-default.viewcontainer2 {
margin: 0;
height: 100%;
height: 100% !important;
width: 100%;
}
}
......@@ -508,7 +508,7 @@ html, body{
// 导航部件头部
.expbarcontrol-header {
display: flex;
min-height: 41px;
min-height: 43px;
padding-bottom: 4px;
border-bottom: 1px solid #E4E4E4;
align-items: center;
......@@ -545,7 +545,7 @@ html, body{
}
.expbarcontrol-header + .expbarcontrol-xdata-ctrl {
padding-top: 8px;
max-height: calc(100% - 41px);
max-height: calc(100% - 43px);
}
}
......
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ ca982baf
......@@ -2,7 +2,7 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[BXD]数据结构 -->
<changeSet author="root" id="tab-bxd-26-1">
<changeSet author="root" id="tab-bxd-27-1">
<createTable tableName="T_BXD">
<column name="CREATEMAN" remarks="" type="VARCHAR(60)">
</column>
......@@ -50,7 +50,7 @@
</changeSet>
<!--输出实体[BOOK]数据结构 -->
<changeSet author="root" id="tab-book-214-3">
<changeSet author="root" id="tab-book-215-3">
<createTable tableName="T_BOOK">
<column name="BOOKNAME" remarks="" type="VARCHAR(200)">
</column>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
浏览文件 @ ca982baf
......@@ -726,7 +726,7 @@
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
},
"getPickupPSAppView" : {
"modelref" : true,
......@@ -920,12 +920,12 @@
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
},
"getPickupPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
"viewType" : "DEGRIDVIEW"
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
"viewType" : "DEMPICKUPVIEW"
},
"valueItemName" : "field16",
"enableAC" : false,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
浏览文件 @ ca982baf
......@@ -847,7 +847,7 @@
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
},
"getPickupPSAppView" : {
"modelref" : true,
......@@ -1041,12 +1041,12 @@
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
},
"getPickupPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
"viewType" : "DEGRIDVIEW"
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
"viewType" : "DEMPICKUPVIEW"
},
"valueItemName" : "field16",
"enableAC" : false,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ ca982baf
......@@ -1070,6 +1070,12 @@
"viewType" : "DEDATAVIEWEXPVIEW",
"resource" : "Book",
"view" : "Usr0815395468DataViewExpView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
"viewType" : "DEMPICKUPVIEW",
"resource" : "BXD",
"view" : "MPickupView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentStudentGridView.json",
......@@ -4812,7 +4818,7 @@
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
},
"getPickupPSAppView" : {
"modelref" : true,
......@@ -5006,12 +5012,12 @@
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD.json"
},
"getPickupPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeGridView.json",
"viewType" : "DEGRIDVIEW"
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMPickupView.json",
"viewType" : "DEMPICKUPVIEW"
},
"valueItemName" : "field16",
"enableAC" : false,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或