Skip to content

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

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

上级 18be0d4c
隐藏空白字符变更
内嵌 并排
正在显示 包含 83 行增加 和 83 行删除
app_Web/package.json
浏览文件 @ bc6cf427
......@@ -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.121",
"@ibiz-template/core": "^0.0.1-beta.121",
"@ibiz-template/model": "^0.0.1-beta.121",
"@ibiz-template/runtime": "^0.0.1-beta.121",
"@ibiz-template/service": "^0.0.1-beta.121",
"@ibiz-template/theme": "^0.0.1-beta.121",
"@ibiz-template/vue-util": "^0.0.1-beta.121",
"@ibiz-template/controller": "^0.0.1-beta.122",
"@ibiz-template/core": "^0.0.1-beta.122",
"@ibiz-template/model": "^0.0.1-beta.122",
"@ibiz-template/runtime": "^0.0.1-beta.122",
"@ibiz-template/service": "^0.0.1-beta.122",
"@ibiz-template/theme": "^0.0.1-beta.122",
"@ibiz-template/vue-util": "^0.0.1-beta.122",
"@ibiz/dynamic-model-api": "^2.1.28",
"@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7",
......
app_Web/pnpm-lock.yaml
浏览文件 @ bc6cf427
......@@ -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.121
version: 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/runtime@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
specifier: ^0.0.1-beta.122
version: 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/runtime@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core':
specifier: ^0.0.1-beta.121
version: 0.0.1-beta.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.122
version: 0.0.1-beta.122(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model':
specifier: ^0.0.1-beta.121
version: 0.0.1-beta.121(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
specifier: ^0.0.1-beta.122
version: 0.0.1-beta.122(@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.121
version: 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(qx-util@0.4.8)
specifier: ^0.0.1-beta.122
version: 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(qx-util@0.4.8)
'@ibiz-template/service':
specifier: ^0.0.1-beta.121
version: 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.122
version: 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme':
specifier: ^0.0.1-beta.121
version: 0.0.1-beta.121
specifier: ^0.0.1-beta.122
version: 0.0.1-beta.122
'@ibiz-template/vue-util':
specifier: ^0.0.1-beta.121
version: 0.0.1-beta.121(@ibiz-template/controller@0.0.1-beta.121)(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(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.122
version: 0.0.1-beta.122(@ibiz-template/controller@0.0.1-beta.122)(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(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.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/runtime@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-38lTZzyIRnvAXQovhfr7BslYXG26fYU7C0VuCzSL6nwIZmnryv0KI8Nco0ZIdSg1Y3zqEu8M4hHmYjHvn6Zkxw==}
/@ibiz-template/controller@0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/runtime@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-+e9xgGyM4hEZUiTrRVYcSkpkUmUnW6efrgPxnOKwCNq03T7Cp8RnROky7/aWohhunJ08OyyGzJzOtzOiR6bXSQ==}
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.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.121(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.122(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.122(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(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.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-7OMfynBY3gcZyIv1NaKCY9LsBEEKsHJGUXHejkpOIovPHeupEzod49PEdJn9YwxLq3HNZQpE4qDIgi1bzDf4HA==}
/@ibiz-template/core@0.0.1-beta.122(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-+alq666NiFWm311qqTmrMyKZp6SMbtF8qux6ez5ekxHdOAUyDhPxJF/KawVPHGBWLGZUBsmwm4svI+TdVgGkbA==}
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.121(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-20OFR4ueK6RQ6TkY4TiSWlCfQGePlFE8GRFv28WrXF6e2tx8rEDOR2LfjZ0dZz6pS7as+kuqsyNmQr9iomV51Q==}
/@ibiz-template/model@0.0.1-beta.122(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-JCqdFav7XcC/ws7Ei72PEVQd2jDHOQjI7HuQjaaNQKxBnA1+6zSUJcY+rA/9n6d0ZE0ONdBKjOFTIPbAF8pGDg==}
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.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(qx-util@0.4.8):
resolution: {integrity: sha512-txPAqnFMo+gt0wGuYX33es9/pM8+69fFGUo8KIhYEv6uhvgSGME1zd7RqjdDCOYj3Q0+ssN2Trqjm4+MB7P0Qg==}
/@ibiz-template/runtime@0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(qx-util@0.4.8):
resolution: {integrity: sha512-6ZdbBJGezzUtBV6/3TZNrlptgRmp+Iiaj9G9VTTbeNakaPASVHxv+s+G9OwzXO0T7bilsGJD1AmM/4TdRJ1ijw==}
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.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.121(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.122(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.122(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(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.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-7hjOM1/6Ory8EvG4r9FnxvSrMYr1vHJhyvgNLNdDSoeA/QyvYLQUWAVLdlrYeUhCvSUb2wu07NiF4sIYNZQyLQ==}
/@ibiz-template/service@0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-/JdujrYrhbMNAF3psXi3o3qZJ4chJhwMjINpyGQjuWLRqPYsByDaQRZMAI26oyGIaAtdbRkE31JQzfUU++B/8A==}
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.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.121(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.122(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.122(@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.121:
resolution: {integrity: sha512-EFF7w24UMJNhwkf/G9MFkOVTnZ7hHAp/ZWPVOBeRzTIWzARXdUP++ugtY1pNSeRXjcJxAJIFEGcGN990Ss8jDA==}
/@ibiz-template/theme@0.0.1-beta.122:
resolution: {integrity: sha512-0BoL19DupWlOnpH+n5pADajHeoeUgwRg+2rr3Ic4N4ZtNvfXwpao9r9tQ2MwKCMhEFdFnjUR/qPsV0XW2eFFYw==}
dev: false
/@ibiz-template/vue-util@0.0.1-beta.121(@ibiz-template/controller@0.0.1-beta.121)(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(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-XF1siOPXElCOx4M5jsNPSmUxPTpfBLq9nmtwsltCWwA2rzyl+BgES1pXN9mo8J61WXObc2uqdPoT68/vvk1Pbw==}
/@ibiz-template/vue-util@0.0.1-beta.122(@ibiz-template/controller@0.0.1-beta.122)(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(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-pnXMHYqbnDXWwHp5eB5fi5LJqZ/d0u4lgpNb+Pajw6wyC76L7zyLwRrzBke00r66WGSBm8jxmUP//uhoqGSreQ==}
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.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(@ibiz-template/runtime@0.0.1-beta.121)(@ibiz-template/service@0.0.1-beta.121)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.121(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.121(@ibiz-template/core@0.0.1-beta.121)(@ibiz-template/model@0.0.1-beta.121)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/controller': 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(@ibiz-template/runtime@0.0.1-beta.122)(@ibiz-template/service@0.0.1-beta.122)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.122(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.122(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.122(@ibiz-template/core@0.0.1-beta.122)(@ibiz-template/model@0.0.1-beta.122)(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/util/model-util/model-util.ts
浏览文件 @ bc6cf427
......@@ -48,7 +48,7 @@ export class ModalUtil implements IModalUtil {
async warning(params: ModalParams): Promise<void> {
this.modal.warning(convertParams(params));
return new Promise(resolve => {
this.modal.success({
this.modal.warning({
...convertParams(params),
onOk: () => {
resolve();
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ bc6cf427
......@@ -1432,16 +1432,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
浏览文件 @ bc6cf427
......@@ -9664,16 +9664,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"
}
} ]
}, {
......@@ -9734,48 +9734,34 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-弹出",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg10"
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg7"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9812,6 +9798,20 @@
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
......@@ -9823,16 +9823,16 @@
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-无删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg11"
}
} ]
}, {
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或