Skip to content

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

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

上级 508e9ad4
隐藏空白字符变更
内嵌 并排
正在显示 包含 88 行增加 和 85 行删除
app_Web/package.json
浏览文件 @ 6e44f887
......@@ -13,13 +13,13 @@
"dependencies": {
"@floating-ui/dom": "^1.0.11",
"@ibiz-template/command": "^0.0.1-beta.50",
"@ibiz-template/controller": "^0.0.1-beta.124",
"@ibiz-template/core": "^0.0.1-beta.124",
"@ibiz-template/model": "^0.0.1-beta.124",
"@ibiz-template/runtime": "^0.0.1-beta.124",
"@ibiz-template/service": "^0.0.1-beta.124",
"@ibiz-template/theme": "^0.0.1-beta.124",
"@ibiz-template/vue-util": "^0.0.1-beta.124",
"@ibiz-template/controller": "^0.0.1-beta.125",
"@ibiz-template/core": "^0.0.1-beta.125",
"@ibiz-template/model": "^0.0.1-beta.125",
"@ibiz-template/runtime": "^0.0.1-beta.125",
"@ibiz-template/service": "^0.0.1-beta.125",
"@ibiz-template/theme": "^0.0.1-beta.125",
"@ibiz-template/vue-util": "^0.0.1-beta.125",
"@ibiz/dynamic-model-api": "^2.1.28",
"@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7",
......
app_Web/pnpm-lock.yaml
浏览文件 @ 6e44f887
......@@ -12,26 +12,26 @@ dependencies:
specifier: ^0.0.1-beta.50
version: 0.0.1-beta.50
'@ibiz-template/controller':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/runtime@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/runtime@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(qx-util@0.4.8)
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(qx-util@0.4.8)
'@ibiz-template/service':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125
'@ibiz-template/vue-util':
specifier: ^0.0.1-beta.124
version: 0.0.1-beta.124(@ibiz-template/controller@0.0.1-beta.124)(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14)
specifier: ^0.0.1-beta.125
version: 0.0.1-beta.125(@ibiz-template/controller@0.0.1-beta.125)(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14)
'@ibiz/dynamic-model-api':
specifier: ^2.1.28
version: 2.1.28(qx-util@0.4.8)
......@@ -939,8 +939,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/controller@0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/runtime@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-z+s/rGCLv6Qy6447HlpaW8wSrJ9NQMRRexPVQCEY3H6cVgWObotvtuvQql2V8oIUQ5MutwfI9RhlVaqtJDA/jA==}
/@ibiz-template/controller@0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/runtime@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-ifHE04YIhIQB5l62ccGiMzuad3i5dBG+cqwZWaM9qit7uFNVDn+fvkxAFTkwDtaw8+TXo4U5hyv70xHjx9LPxg==}
peerDependencies:
'@ibiz-template/core': ^0.0.1-beta.30
'@ibiz-template/model': ^0.0.1-beta.30
......@@ -950,10 +950,10 @@ packages:
qs: ^6.11.0
qx-util: ^0.4.8
dependencies:
'@ibiz-template/core': 0.0.1-beta.124(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.124(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(qx-util@0.4.8)(ramda@0.28.0)
async-validator: 4.2.5
dayjs: 1.11.7
lodash-es: 4.17.21
......@@ -961,8 +961,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/core@0.0.1-beta.124(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-PmfmtflsxhTfkQKcewyhogUJLRULJPLTMLnGE7/NtrO62v5shXxmIXOAswYeTbsBqVRdbid5G8UgCrU2qg+1bA==}
/@ibiz-template/core@0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-SINrxnYI8NamGqUODPVyiF3jSzj8sz4hV4JHLwdMvHiU1FUbrZgGyk1oSZwWDw8M1I6ZjY9Y5W4G6EEZVcD55g==}
peerDependencies:
lodash-es: ^4.17.21
qx-util: ^0.4.8
......@@ -979,8 +979,8 @@ packages:
- debug
dev: false
/@ibiz-template/model@0.0.1-beta.124(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-uHQjyBkcdpkiKln03wLCp6d22ciT/b/v78Zhw9QbeOUBfPnMusuZAmfu10O330FLyUvWgXQ3C246FNBKqeH1dA==}
/@ibiz-template/model@0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-Uzatt11gfXTR4bHsOOnMtokhcRpfsRUL3DH1/kRpMvLj4HfGVxIdKKlBA5ZEl1aIkktcXFyxyFnxRI/DrIg8fQ==}
peerDependencies:
'@ibiz/dynamic-model-api': ^2.1.28
lodash-es: ^4.17.21
......@@ -992,8 +992,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/runtime@0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(qx-util@0.4.8):
resolution: {integrity: sha512-kQ1Q4t4FPqIHDxFREskvJN3ZNVxd6UaHLLJK2uNQsJLOxolynJbC7Cbbj8gbOBK3YCaV7bu8mgBsALkunRZTNQ==}
/@ibiz-template/runtime@0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(qx-util@0.4.8):
resolution: {integrity: sha512-UF+MJXleE241M4J99ymthQjBAsIfiRb7paA4NLlor0TYKiJqzMvVRktLChssUzwqz14QjZwmusEJYTe/Tfhq4Q==}
peerDependencies:
'@ibiz-template/core': ^0.0.1-beta.30
'@ibiz-template/model': ^0.0.1-beta.30
......@@ -1001,33 +1001,33 @@ packages:
qx-util: ^0.4.8
dependencies:
'@ibiz-template/command': 0.0.1-beta.50
'@ibiz-template/core': 0.0.1-beta.124(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.124(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(qx-util@0.4.8)(ramda@0.28.0)
qs: 6.11.1
qx-util: 0.4.8
dev: false
/@ibiz-template/service@0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-U36G40y3YFrbkdHpk60bZXVk0dGZeeEcPs8rb2ihZ71toPOfI7ErKaA2wEOy3jP0u5Dohc0n9haO5hjLNG3OeQ==}
/@ibiz-template/service@0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-ztVTvSXodM/vwslhEJlPcaM0XbICgZqbV+iIcnCE/VQWTUwfu7NUFlghUlncbfjyQqJlUAfEogKqvvJZiepfSg==}
peerDependencies:
'@ibiz-template/core': ^0.0.1-beta.30
'@ibiz-template/model': ^0.0.1-beta.30
qx-util: ^0.4.8
ramda: ^0.28.0
dependencies:
'@ibiz-template/core': 0.0.1-beta.124(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.124(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
qx-util: 0.4.8
ramda: 0.28.0
dev: false
/@ibiz-template/theme@0.0.1-beta.124:
resolution: {integrity: sha512-GIp3rY5tM+cnBlKWJjzuJSQiqa6GEMQkQM/Sddf3GlyanqdwEUN2HJZdeNL878/621Y4HaxAZB9FchTZrXfU4g==}
/@ibiz-template/theme@0.0.1-beta.125:
resolution: {integrity: sha512-9yEd3syK3HmimB4wsHeyvw2Y5ZQAleUeUyJPKzrS4qXiUGhAcILsmMBR4uzkRKbvajT940NHSiiebEy3avYMUg==}
dev: false
/@ibiz-template/vue-util@0.0.1-beta.124(@ibiz-template/controller@0.0.1-beta.124)(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14):
resolution: {integrity: sha512-2+NK0V6dHIhsgKvd778lQ7P1Nn9dWOGv3M6uQhr/sPhodPA4q9CxX7j2DuAswXLTbNctnGnfays1abnnUsYDuw==}
/@ibiz-template/vue-util@0.0.1-beta.125(@ibiz-template/controller@0.0.1-beta.125)(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14):
resolution: {integrity: sha512-g2/PO/cfKQeSWE1pHURKR+Cx2IuYA7EkZh5weXshdsV54gylcBHmRT1+6cpTmNkThCrUal3SOZSp0CAhN24JEw==}
peerDependencies:
'@ibiz-template/controller': ^0.0.1-beta.30
'@ibiz-template/core': ^0.0.1-beta.30
......@@ -1039,10 +1039,10 @@ packages:
vue: ^2.7.14
vue-router: ^3.6.5
dependencies:
'@ibiz-template/controller': 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(@ibiz-template/runtime@0.0.1-beta.124)(@ibiz-template/service@0.0.1-beta.124)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.124(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.124(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.124(@ibiz-template/core@0.0.1-beta.124)(@ibiz-template/model@0.0.1-beta.124)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/controller': 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(@ibiz-template/runtime@0.0.1-beta.125)(@ibiz-template/service@0.0.1-beta.125)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.125(@ibiz-template/core@0.0.1-beta.125)(@ibiz-template/model@0.0.1-beta.125)(qx-util@0.4.8)(ramda@0.28.0)
qs: 6.11.1
qx-util: 0.4.8
ramda: 0.28.0
......
app_Web/src/components/common/view-toolbar/view-toolbar.tsx
浏览文件 @ 6e44f887
......@@ -15,13 +15,15 @@ import '@ibiz-template/theme/style/components/common/view-toolbar/view-toolbar.s
const btnContent = (item: IPSDEToolbarItem, viewMode: string) => {
const image = item.getPSSysImage();
const showIcon = item.showIcon;
const showCaption = item.showCaption;
const caption = showCaption ? item.caption : '';
if (viewMode === 'EMBED') {
if (image) {
return [showIcon ? <app-icon icon={image} /> : null, item.caption];
return [showIcon ? <app-icon icon={image} /> : null, caption];
}
return [null, item.caption];
return [null, caption];
}
return [showIcon ? <app-icon icon={image} /> : null, item.caption];
return [showIcon ? <app-icon icon={image} /> : null, caption];
};
export const ViewToolbar = defineComponent({
......
app_Web/src/components/editor/check-box-list/ibiz-checkbox/ibiz-checkbox.tsx
浏览文件 @ 6e44f887
......@@ -128,7 +128,7 @@ export const IBizCheckbox = defineComponent({
return items.value
.filter(item => valueArr.includes(item.value))
.map(item => item.text)
.join(',');
.join('、');
});
return {
......
app_Web/src/components/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx
浏览文件 @ 6e44f887
......@@ -4,6 +4,7 @@ import {
getEditorEmits,
useNamespace,
} from '@ibiz-template/vue-util';
import '@ibiz-template/theme/style/components/editor/ibiz-picker-link/ibiz-picker-link.scss';
export const IBizPickerLink = defineComponent({
name: 'IBizPickerLink',
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 6e44f887
......@@ -9820,16 +9820,16 @@
"id" : "ViewMsg4"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-警告信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg6"
}
} ]
}, {
......@@ -9846,58 +9846,45 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图上方",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-弹出",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg10"
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg9"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
......@@ -9924,17 +9911,24 @@
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9946,6 +9940,12 @@
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup6",
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或