Skip to content

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

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

上级 361c35c2
显示空白字符变更
内嵌 并排
正在显示 包含 205 行增加 和 24 行删除
app_Web/packages/ibiz-vue/src/components/common/app-panel-field/app-panel-field.less
浏览文件 @ 12bb7a29
.app-panel-field {
height: 100%;
width: 100%;
height: auto;
width: auto;
display: flex;
padding: 0 8px;
.editor{
......
app_Web/packages/ibiz-vue/src/components/common/app-simpleflex-container/app-simpleflex-container.less
浏览文件 @ 12bb7a29
.app-simpleflex-container{
width: 100%;
height: 100%;
display: flex;
.app-pos-container{
.app-simpleflex-container-item{
......
app_Web/packages/ibiz-vue/src/components/common/app-simpleflex-container/app-simpleflex-container.tsx
浏览文件 @ 12bb7a29
......@@ -91,10 +91,10 @@ export class AppSimpleFlexContainer extends Vue {
}
if (layoutPos && layoutPos.layout == 'SIMPLEFLEX') {
if (layoutPos?.grow && (layoutPos?.grow !== -1)) {
Object.assign(boxLayoutPosStyle, { width: `${(100 / 12) * layoutPos?.grow}%`, height: 'auto' });
Object.assign(boxLayoutPosStyle, { width: `${(100 / 12) * layoutPos?.grow}%`, height: '100%' });
} else {
// 简单FLEX布局自适应
Object.assign(boxLayoutPosStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, height: 'auto' });
Object.assign(boxLayoutPosStyle, { 'flex-grow': 1, 'min-width': `${(100 / 12)}%`, height: '100%' });
}
}
// 边缘布局
......
app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-dataview-base.tsx
浏览文件 @ 12bb7a29
......@@ -246,7 +246,7 @@ export class AppDataViewBase extends DataViewControlBase {
</row>
{this.selections.length > 0 ? this.renderBatchToolbar() : null}
{!this.ctrlLoadingService?.isLoading ? this.renderEmptyDataTip() : this.renderLoadDataTip()}
<el-backtop target={`#${this.controlId}`}></el-backtop>
{this.backTopVisible && <el-backtop target={`#${this.controlId}`}></el-backtop>}
</div>
);
}
......
app_Web/packages/ibiz-vue/src/components/editor/app-default-editor.tsx
浏览文件 @ 12bb7a29
......@@ -16,7 +16,7 @@ import SwitchEditor from './switch-editor/switch-editor';
import IpAddressEditor from './ipaddress-editor/ipaddress-editor';
import { IPSEditor } from '@ibiz/dynamic-model-api';
import CodeEditor from './code-editor/code-editor'
import { AppServiceBase, LogUtil } from 'ibiz-core';
import { AppServiceBase, LogUtil, Util } from 'ibiz-core';
/**
......@@ -419,6 +419,7 @@ export class AppDefaultEditor extends Vue {
if (editorComponentName) {
return this.$createElement(editorComponentName, {
class: this.editorInstance?.getPSSysCss()?.cssName,
key: Util.createUUID(),
ref: 'editor',
props: {
editorInstance: editor,
......
app_Web/packages/ibiz-vue/src/widgets/dataview-control-base.tsx
浏览文件 @ 12bb7a29
......@@ -236,6 +236,21 @@ export class DataViewControlBase extends MDControlBase implements DataViewContro
*/
public dataviewControlEvent: Subscription | undefined;
/**
* @description 是否显示回到顶部
* @readonly
* @type {boolean}
* @memberof DataViewControlBase
*/
get backTopVisible(): boolean {
let visible: boolean = false;
const el = document.querySelector(`#${this.controlId}`);
if (el) {
visible = true;
}
return visible;
}
/**
* 监听静态参数变化
*
......
app_Web/swarm.yaml
浏览文件 @ 12bb7a29
......@@ -3,7 +3,7 @@ services:
trainsys-app-web:
image: dstimage
ports:
- "50100:80"
- "80:80"
networks:
- agent_network
environment:
......
config.xml
浏览文件 @ 12bb7a29
......@@ -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
浏览文件 @ 12bb7a29
......@@ -50,7 +50,7 @@
</changeSet>
<!--输出实体[BOOK]数据结构 -->
<changeSet author="root" id="tab-book-114-3">
<changeSet author="root" id="tab-book-115-3">
<createTable tableName="T_BOOK">
<column name="BOOKNAME" remarks="" type="VARCHAR(200)">
</column>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSCODELISTS/CodeList46.json
浏览文件 @ 12bb7a29
......@@ -36,7 +36,7 @@
"value" : "1"
} ],
"getPSCodeListTemplId" : "CODELIST_00054",
"refFlag" : false,
"refFlag" : true,
"systemTag" : "TrainSys",
"codeItemValueNumber" : false,
"enableCache" : true,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common.json
浏览文件 @ 12bb7a29
......@@ -2,6 +2,9 @@
"getAllPSCodeLists" : [ {
"modelref" : true,
"path" : "PSMODULES/common/PSCODELISTS/PhoneType.json"
}, {
"modelref" : true,
"path" : "PSMODULES/common/PSCODELISTS/CodeList.json"
} ],
"getAllPSDataEntities" : [ {
"modelref" : true,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSCODELISTS/CodeList.json 0 → 100644
浏览文件 @ 12bb7a29
{
"codeListTag" : "common__CodeList",
"codeListType" : "DYNAMIC",
"codeName" : "CodeList",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSMODULES/common/PSCODELISTS/CodeList.json",
"emptyText" : "未定义",
"name" : "原材料（动态）",
"getPSDEDataSet" : {
"modelref" : true,
"id" : "Default"
},
"getPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/common/PSDATAENTITIES/RawMaterial.json"
},
"getPSSystemModule" : {
"modelref" : true,
"path" : "PSMODULES/common.json"
},
"refFlag" : true,
"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/CodeList.json 0 → 100644
浏览文件 @ 12bb7a29
{
"codeListTag" : "common__CodeList",
"codeListType" : "DYNAMIC",
"codeName" : "CodeList",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json",
"emptyText" : "未定义",
"name" : "原材料（动态）",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
},
"enableCache" : true
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json 0 → 100644
浏览文件 @ 12bb7a29
{
"codeListTag" : "CodeList46",
"codeListType" : "STATIC",
"codeName" : "CodeList46",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json",
"emptyText" : "未定义",
"name" : "星期（1～7）",
"getPSCodeItems" : [ {
"codeName" : "Item_2",
"text" : "星期一",
"value" : "2"
}, {
"codeName" : "Item_3",
"text" : "星期二",
"value" : "3"
}, {
"codeName" : "Item_4",
"text" : "星期三",
"value" : "4"
}, {
"codeName" : "Item_5",
"text" : "星期四",
"value" : "5"
}, {
"codeName" : "Item_6",
"text" : "星期五",
"value" : "6"
}, {
"codeName" : "Item_7",
"text" : "星期六",
"value" : "7"
}, {
"codeName" : "Item_1",
"text" : "星期日",
"value" : "1"
} ],
"enableCache" : true
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
浏览文件 @ 12bb7a29
......@@ -377,7 +377,11 @@
},
"getPSEditor" : {
"editorType" : "CHECKBOXLIST",
"name" : "field3"
"name" : "field3",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json"
}
},
"getPSLayoutPos" : {
"colMD" : 24,
......@@ -404,7 +408,11 @@
},
"getPSEditor" : {
"editorType" : "RADIOBUTTONLIST",
"name" : "field5"
"name" : "field5",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
}
},
"getPSLayoutPos" : {
"colMD" : 24,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
浏览文件 @ 12bb7a29
......@@ -498,7 +498,11 @@
},
"getPSEditor" : {
"editorType" : "CHECKBOXLIST",
"name" : "field3"
"name" : "field3",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json"
}
},
"getPSLayoutPos" : {
"colMD" : 24,
......@@ -525,7 +529,11 @@
},
"getPSEditor" : {
"editorType" : "RADIOBUTTONLIST",
"name" : "field5"
"name" : "field5",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
}
},
"getPSLayoutPos" : {
"colMD" : 24,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 12bb7a29
{
"getAllPSAppCodeLists" : [ {
"codeListTag" : "common__CodeList",
"codeListType" : "DYNAMIC",
"codeName" : "CodeList",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json",
"emptyText" : "未定义",
"name" : "原材料（动态）",
"getPSAppDEDataSet" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial.json"
},
"enableCache" : true
}, {
"codeListTag" : "CodeList46",
"codeListType" : "STATIC",
"codeName" : "CodeList46",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json",
"emptyText" : "未定义",
"name" : "星期（1～7）",
"getPSCodeItems" : [ {
"codeName" : "Item_2",
"text" : "星期一",
"value" : "2"
}, {
"codeName" : "Item_3",
"text" : "星期二",
"value" : "3"
}, {
"codeName" : "Item_4",
"text" : "星期三",
"value" : "4"
}, {
"codeName" : "Item_5",
"text" : "星期四",
"value" : "5"
}, {
"codeName" : "Item_6",
"text" : "星期五",
"value" : "6"
}, {
"codeName" : "Item_7",
"text" : "星期六",
"value" : "7"
}, {
"codeName" : "Item_1",
"text" : "星期日",
"value" : "1"
} ],
"enableCache" : true
}, {
"codeListTag" : "common__PhoneType",
"codeListType" : "STATIC",
"codeName" : "PhoneType",
......@@ -4541,7 +4596,11 @@
},
"getPSEditor" : {
"editorType" : "CHECKBOXLIST",
"name" : "field3"
"name" : "field3",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList46.json"
}
},
"getPSLayoutPos" : {
"colMD" : 24,
......@@ -4568,7 +4627,11 @@
},
"getPSEditor" : {
"editorType" : "RADIOBUTTONLIST",
"name" : "field5"
"name" : "field5",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList.json"
}
},
"getPSLayoutPos" : {
"colMD" : 24,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
浏览文件 @ 12bb7a29
......@@ -324,6 +324,9 @@
}, {
"modelref" : true,
"path" : "PSCODELISTS/CodeList49.json"
}, {
"modelref" : true,
"path" : "PSMODULES/common/PSCODELISTS/CodeList.json"
}, {
"modelref" : true,
"path" : "PSCODELISTS/CodeList26.json"
......@@ -565,6 +568,9 @@
"getAllPSCodeLists" : [ {
"modelref" : true,
"path" : "PSMODULES/common/PSCODELISTS/PhoneType.json"
}, {
"modelref" : true,
"path" : "PSMODULES/common/PSCODELISTS/CodeList.json"
} ],
"getAllPSDataEntities" : [ {
"modelref" : true,
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或