Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
bef80087
提交
bef80087
编写于
8月 26, 2022
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhujiamin 发布系统代码 [TrainSys,网页端]
上级
2a8abfde
变更
13
显示空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
220 行增加
和
18 行删除
+220
-18
app-default-view-layout.less
...yout/app-default-view-layout/app-default-view-layout.less
+2
-2
default.less
app_Web/src/styles/default.less
+2
-2
swarm.yaml
app_Web/swarm.yaml
+1
-1
config.xml
config.xml
+0
-9
h2_table.xml
trainsys-core/src/main/resources/liquibase/h2_table.xml
+3
-3
CodeList83.json
...ces/model/cn/ibizlab/trainsys/PSCODELISTS/CodeList83.json
+1
-1
common.json
...resources/model/cn/ibizlab/trainsys/PSMODULES/common.json
+3
-0
CodeList25.json
...lab/trainsys/PSMODULES/common/PSCODELISTS/CodeList25.json
+20
-0
CodeList83.json
...lab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json
+27
-0
EditorTest.json
...YSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
+43
-0
bookBookEditViewEditorTest.json
...SSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
+43
-0
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+69
-0
PSSYSTEM.json
...rc/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+6
-0
未找到文件。
app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-view-layout/app-default-view-layout.less
浏览文件 @
bef80087
...
...
@@ -162,7 +162,7 @@
display: flex;
margin: 0;
flex-direction: column;
overflow
: auto
;
overflow
-y: scroll
;
flex-grow: 1;
}
...
...
@@ -237,7 +237,7 @@
display: flex;
margin: 0;
flex-direction: column;
overflow
: auto
;
overflow
-y: scroll
;
}
}
}
...
...
app_Web/src/styles/default.less
浏览文件 @
bef80087
...
...
@@ -490,12 +490,12 @@ html, body{
}
.expbarcontrol-xdata-ctrl {
flex-grow: 1;
// 标题高度 36 + padding 4 + 边框 1
max-height: calc(100% - 41px);
overflow: auto;
}
.expbarcontrol-header + .expbarcontrol-xdata-ctrl {
padding-top: 8px;
// 标题高度 36 + padding 4 + 边框 1
max-height: calc(100% - 41px);
}
}
...
...
app_Web/swarm.yaml
浏览文件 @
bef80087
...
...
@@ -3,7 +3,7 @@ services:
trainsys-app-web
:
image
:
dstimage
ports
:
-
"
5010
0:80"
-
"
8
0:80"
networks
:
-
agent_network
environment
:
...
...
config.xml
浏览文件 @
bef80087
...
...
@@ -55,15 +55,6 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
if [ -e app_Web/.dynamic ]
then
cd app_Web
else
cd app_Web/app
fi
sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
bef80087
...
...
@@ -25,7 +25,7 @@
</changeSet>
<!--输出实体[BXDMX]数据结构 -->
<changeSet
author=
"root"
id=
"tab-bxdmx-3
0
-2"
>
<changeSet
author=
"root"
id=
"tab-bxdmx-3
1
-2"
>
<createTable
tableName=
"T_BXDMX"
>
<column
name=
"BXDMXID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_BXDMX"
/>
...
...
@@ -50,7 +50,7 @@
</changeSet>
<!--输出实体[BOOK]数据结构 -->
<changeSet
author=
"root"
id=
"tab-book-11
5
-3"
>
<changeSet
author=
"root"
id=
"tab-book-11
8
-3"
>
<createTable
tableName=
"T_BOOK"
>
<column
name=
"BOOKNAME"
remarks=
""
type=
"VARCHAR(200)"
>
</column>
...
...
@@ -187,7 +187,7 @@
<!--输出实体[BXDMX]外键关系 -->
<changeSet
author=
"root"
id=
"fk-bxdmx-3
0
-8"
>
<changeSet
author=
"root"
id=
"fk-bxdmx-3
1
-8"
>
<addForeignKeyConstraint
baseColumnNames=
"BXDID"
baseTableName=
"T_BXDMX"
constraintName=
"F821DB7B87E31B879F"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"BXDID"
referencedTableName=
"T_BXD"
validate=
"true"
/>
</changeSet>
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/CodeList83.json
浏览文件 @
bef80087
...
...
@@ -24,7 +24,7 @@
"value"
:
"4"
}
],
"getPSCodeListTemplId"
:
"CODELIST_00090"
,
"refFlag"
:
fals
e
,
"refFlag"
:
tru
e
,
"systemTag"
:
"TrainSys"
,
"codeItemValueNumber"
:
false
,
"enableCache"
:
true
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common.json
浏览文件 @
bef80087
...
...
@@ -2,6 +2,9 @@
"getAllPSCodeLists"
:
[
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/PhoneType.json"
},
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/CodeList25.json"
},
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/CodeList.json"
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSCODELISTS/CodeList25.json
0 → 100644
浏览文件 @
bef80087
{
"codeListTag"
:
"common__CodeList25"
,
"codeListType"
:
"STATIC"
,
"codeName"
:
"CodeList25"
,
"dynaInstMode"
:
0
,
"dynaModelFilePath"
:
"PSMODULES/common/PSCODELISTS/CodeList25.json"
,
"emptyText"
:
"未定义"
,
"name"
:
"测试代码表"
,
"getPSSystemModule"
:
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common.json"
},
"refFlag"
:
false
,
"systemTag"
:
"TrainSys"
,
"codeItemValueNumber"
:
false
,
"enableCache"
:
true
,
"subSysAsCloud"
:
false
,
"subSysCodeList"
:
false
,
"userScope"
:
false
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json
0 → 100644
浏览文件 @
bef80087
{
"codeListTag"
:
"CodeList83"
,
"codeListType"
:
"STATIC"
,
"codeName"
:
"CodeList83"
,
"dynaInstMode"
:
0
,
"dynaModelFilePath"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json"
,
"emptyText"
:
"未定义"
,
"name"
:
"季度(1~4)"
,
"getPSCodeItems"
:
[
{
"codeName"
:
"Item_1"
,
"text"
:
"1季度"
,
"value"
:
"1"
},
{
"codeName"
:
"Item_2"
,
"text"
:
"2季度"
,
"value"
:
"2"
},
{
"codeName"
:
"Item_3"
,
"text"
:
"3季度"
,
"value"
:
"3"
},
{
"codeName"
:
"Item_4"
,
"text"
:
"4季度"
,
"value"
:
"4"
}
],
"enableCache"
:
true
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
浏览文件 @
bef80087
...
...
@@ -99,6 +99,13 @@
"name"
:
"FIELD4"
,
"codeName"
:
"Field4"
}
},
{
"id"
:
"type"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
}
},
{
"id"
:
"field2"
,
"dataType"
:
25
,
...
...
@@ -317,6 +324,10 @@
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"field4"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
...
...
@@ -326,6 +337,38 @@
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"caption"
:
"下拉列表框(多选)"
,
"codeName"
:
"type"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"type"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
},
"getPSEditor"
:
{
"editorType"
:
"MDROPDOWNLIST"
,
"name"
:
"type"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
},
"singleSelect"
:
false
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"caption"
:
"地址选择器"
,
"codeName"
:
"field2"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
浏览文件 @
bef80087
...
...
@@ -220,6 +220,13 @@
"name"
:
"FIELD4"
,
"codeName"
:
"Field4"
}
},
{
"id"
:
"type"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
}
},
{
"id"
:
"field2"
,
"dataType"
:
25
,
...
...
@@ -438,6 +445,10 @@
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"field4"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
...
...
@@ -447,6 +458,38 @@
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"caption"
:
"下拉列表框(多选)"
,
"codeName"
:
"type"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"type"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
},
"getPSEditor"
:
{
"editorType"
:
"MDROPDOWNLIST"
,
"name"
:
"type"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
},
"singleSelect"
:
false
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"caption"
:
"地址选择器"
,
"codeName"
:
"field2"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
bef80087
...
...
@@ -54,6 +54,32 @@
"value"
:
"1"
}
],
"enableCache"
:
true
},
{
"codeListTag"
:
"CodeList83"
,
"codeListType"
:
"STATIC"
,
"codeName"
:
"CodeList83"
,
"dynaInstMode"
:
0
,
"dynaModelFilePath"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json"
,
"emptyText"
:
"未定义"
,
"name"
:
"季度(1~4)"
,
"getPSCodeItems"
:
[
{
"codeName"
:
"Item_1"
,
"text"
:
"1季度"
,
"value"
:
"1"
},
{
"codeName"
:
"Item_2"
,
"text"
:
"2季度"
,
"value"
:
"2"
},
{
"codeName"
:
"Item_3"
,
"text"
:
"3季度"
,
"value"
:
"3"
},
{
"codeName"
:
"Item_4"
,
"text"
:
"4季度"
,
"value"
:
"4"
}
],
"enableCache"
:
true
},
{
"codeListTag"
:
"common__PhoneType"
,
"codeListType"
:
"STATIC"
,
...
...
@@ -4318,6 +4344,13 @@
"name"
:
"FIELD4"
,
"codeName"
:
"Field4"
}
},
{
"id"
:
"type"
,
"dataType"
:
25
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
}
},
{
"id"
:
"field2"
,
"dataType"
:
25
,
...
...
@@ -4536,6 +4569,10 @@
"getPSEditor"
:
{
"editorType"
:
"DROPDOWNLIST"
,
"name"
:
"field4"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList83.json"
},
"singleSelect"
:
true
},
"getPSLayoutPos"
:
{
...
...
@@ -4545,6 +4582,38 @@
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"caption"
:
"下拉列表框(多选)"
,
"codeName"
:
"type"
,
"dataType"
:
25
,
"detailStyle"
:
"DEFAULT"
,
"detailType"
:
"FORMITEM"
,
"enableCond"
:
3
,
"ignoreInput"
:
0
,
"labelPos"
:
"LEFT"
,
"labelWidth"
:
130
,
"name"
:
"type"
,
"noPrivDisplayMode"
:
1
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
},
"getPSEditor"
:
{
"editorType"
:
"MDROPDOWNLIST"
,
"name"
:
"type"
,
"getPSAppCodeList"
:
{
"modelref"
:
true
,
"path"
:
"PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
},
"singleSelect"
:
false
},
"getPSLayoutPos"
:
{
"colMD"
:
24
,
"layout"
:
"TABLE_24COL"
},
"allowEmpty"
:
true
,
"needCodeListConfig"
:
true
,
"showCaption"
:
true
},
{
"caption"
:
"地址选择器"
,
"codeName"
:
"field2"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
浏览文件 @
bef80087
...
...
@@ -288,6 +288,9 @@
},
{
"modelref"
:
true
,
"path"
:
"PSCODELISTS/CodeList31.json"
},
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/CodeList25.json"
},
{
"modelref"
:
true
,
"path"
:
"PSCODELISTS/CodeList105.json"
...
...
@@ -568,6 +571,9 @@
"getAllPSCodeLists"
:
[
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/PhoneType.json"
},
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/CodeList25.json"
},
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSCODELISTS/CodeList.json"
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录