Skip to content

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

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

上级 47a23b84
隐藏空白字符变更
内嵌 并排
正在显示 包含 65 行增加 和 57 行删除
app_Web/package.json
浏览文件 @ edda7922
......@@ -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.92",
"@ibiz-template/core": "^0.0.1-beta.92",
"@ibiz-template/model": "^0.0.1-beta.92",
"@ibiz-template/runtime": "^0.0.1-beta.92",
"@ibiz-template/service": "^0.0.1-beta.92",
"@ibiz-template/theme": "^0.0.1-beta.92",
"@ibiz-template/vue-util": "^0.0.1-beta.92",
"@ibiz-template/controller": "^0.0.1-beta.93",
"@ibiz-template/core": "^0.0.1-beta.93",
"@ibiz-template/model": "^0.0.1-beta.93",
"@ibiz-template/runtime": "^0.0.1-beta.93",
"@ibiz-template/service": "^0.0.1-beta.93",
"@ibiz-template/theme": "^0.0.1-beta.93",
"@ibiz-template/vue-util": "^0.0.1-beta.93",
"@ibiz/dynamic-model-api": "^2.1.24",
"@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7",
......
app_Web/pnpm-lock.yaml
浏览文件 @ edda7922
lockfileVersion: '6.1'
lockfileVersion: '6.0'
settings:
autoInstallPeers: true
......@@ -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.92
version: 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/runtime@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
specifier: ^0.0.1-beta.93
version: 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/runtime@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core':
specifier: ^0.0.1-beta.92
version: 0.0.1-beta.92(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.93
version: 0.0.1-beta.93(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model':
specifier: ^0.0.1-beta.92
version: 0.0.1-beta.92(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
specifier: ^0.0.1-beta.93
version: 0.0.1-beta.93(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime':
specifier: ^0.0.1-beta.92
version: 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(qx-util@0.4.8)
specifier: ^0.0.1-beta.93
version: 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(qx-util@0.4.8)
'@ibiz-template/service':
specifier: ^0.0.1-beta.92
version: 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.93
version: 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme':
specifier: ^0.0.1-beta.92
version: 0.0.1-beta.92
specifier: ^0.0.1-beta.93
version: 0.0.1-beta.93
'@ibiz-template/vue-util':
specifier: ^0.0.1-beta.92
version: 0.0.1-beta.92(@ibiz-template/controller@0.0.1-beta.92)(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(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.93
version: 0.0.1-beta.93(@ibiz-template/controller@0.0.1-beta.93)(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(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.24
version: 2.1.24(qx-util@0.4.8)
......@@ -939,8 +939,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/controller@0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/runtime@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-Lr9rh5YaKw98U5/fkjt39WeAzNg2/HdxQrTQO+Wi0k7nG7rBRRLA7pLq7egRbKUKuA+PBZBZPSpVr8EHw7JFKQ==}
/@ibiz-template/controller@0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/runtime@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-9+8wm2qrHH6Oeb4BwJB/xPVL2wit90X5GugjTRV2FJUd2RAWicLG5lRmHKfYhY+OzI6sgsrtxqcDR55P7CUxUw==}
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.92(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.92(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.93(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.93(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(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.92(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-tvfUnBVRW1U6sHLxtIj4fSoRo1nEkdf7IN5iT09wbTh9CWJSW/R7uexTR+x885ma58GP602oTJw/8SWNg9k71Q==}
/@ibiz-template/core@0.0.1-beta.93(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-AErl7GKFKCD1TPPbvx13qXrNjLULoHStNgaks7iaZjBZHgw/GItWjgbTe80sm8jANAFVpWJ5kdB27ua1q9RlaA==}
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.92(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-FRbObU1lHD+BJY3dtnmNXJTUhhAI5zNVa69nbbtkQxaNRc33JTz+lJG3GXr5iYGBYGPc7GcNtkJn+NbnCjwPKw==}
/@ibiz-template/model@0.0.1-beta.93(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-+wVejCcHPkCuRSYS4+dEJKDdoIMBM3+4GKToXdngjrjjBsoRstI+7WVcDi3KQY+jnHZKHyfg/wqe2AVYKeItlQ==}
peerDependencies:
'@ibiz/dynamic-model-api': ^2.1.24
lodash-es: ^4.17.21
......@@ -992,8 +992,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/runtime@0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(qx-util@0.4.8):
resolution: {integrity: sha512-esDKkAQFaWkBH70FEpQDxwJVmHAlXPR0/M86ylQr5C3LHgLpOmtQOSBVJHtTgrRnLqZddSdIGakdwwFU5yatOQ==}
/@ibiz-template/runtime@0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(qx-util@0.4.8):
resolution: {integrity: sha512-pH35yxjg4pH92BFSmFelg+2dcv3JfqaCdHgwi8f/W9dvgmweeCCqzM2Ov3O6M5vweWkVVUN7tSKQoMliXEm8Dw==}
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.92(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.92(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.93(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.93(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(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.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-dlKHMCiwqN7+AnIGgtzzDwGt9ZoAj3N0fsLKfYyTxJrZiXRD2LbOgxdX2NnyHyYWD+Wkas/GMAa2oUrKDwUTfQ==}
/@ibiz-template/service@0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-J5l3Rvi3IQfHq/LbAtvsMxKvukqXmE40mWddiaQqq+0rRq7sUZP2sG24yjZLZgQAEjOojTUmjY3Q4us0OihjyQ==}
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.92(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.92(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.93(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.93(@ibiz/dynamic-model-api@2.1.24)(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.92:
resolution: {integrity: sha512-hW1kS3RHh6xIiUceQXARAlTBK4HJ9EyYY0abQKsI4Xet1NVPXtYUq3qgVcR7JorNGvK7BnCkwoHQ85PN1Q6xKw==}
/@ibiz-template/theme@0.0.1-beta.93:
resolution: {integrity: sha512-vwqkn8/4792onp389NH3J62otq2ZGhcwtj+OSQpNi0QDYnQ2+/vyagFOWmzwimErsDEGOnzMgfhAxKpN/92+MQ==}
dev: false
/@ibiz-template/vue-util@0.0.1-beta.92(@ibiz-template/controller@0.0.1-beta.92)(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(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-NLhHE+f3LNXg7L4l0XhIAPcmnU1wiMY8oTL2Thqldth9qNm3AVdbhgiSt8YakVZ8pyv8jDImZT6rdcsXOLLyFQ==}
/@ibiz-template/vue-util@0.0.1-beta.93(@ibiz-template/controller@0.0.1-beta.93)(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(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-8gHnhqNzF4+OkAUnov+XLYykZ7F9u+KEs2eUaRUqpOe/dnYMIAkyHOa0c5SNGmQO6n8ORxH6lq/LCgfYhcssNg==}
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.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(@ibiz-template/runtime@0.0.1-beta.92)(@ibiz-template/service@0.0.1-beta.92)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.92(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.92(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.92(@ibiz-template/core@0.0.1-beta.92)(@ibiz-template/model@0.0.1-beta.92)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/controller': 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(@ibiz-template/runtime@0.0.1-beta.93)(@ibiz-template/service@0.0.1-beta.93)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.93(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.93(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.93(@ibiz-template/core@0.0.1-beta.93)(@ibiz-template/model@0.0.1-beta.93)(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
浏览文件 @ edda7922
......@@ -106,6 +106,14 @@ export const ViewToolbar = defineComponent({
item.itemType === 'DEUIACTION' &&
this.toolbarState[item.id].visible
) {
// 特殊处理，工具栏关闭按钮在非顶级容器分页模式打开时(即页面本身有X按钮)的场景，自动去掉工具栏中的关闭按钮
const notShowCloseBtnViewMode = ['MODAL', 'DRAWER', 'POPOVER'];
if (notShowCloseBtnViewMode.includes(this.viewMode)) {
const uiAction = (item as IPSDETBUIActionItem).getPSUIAction();
if (uiAction?.codeName === 'Exit') {
return;
}
}
return (
<div
key={item.id}
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ edda7922
......@@ -1238,16 +1238,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"
}
} ]
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ edda7922
......@@ -2784,16 +2784,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"
}
} ]
} ],
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或