Skip to content

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

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

上级 0884a14d
显示空白字符变更
内嵌 并排
正在显示 包含 205 行增加 和 199 行删除
app_Web/package.json
浏览文件 @ b68ea176
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
"dependencies": { "dependencies": {
"@floating-ui/dom": "^1.0.11", "@floating-ui/dom": "^1.0.11",
"@ibiz-template/command": "^0.0.1-beta.50", "@ibiz-template/command": "^0.0.1-beta.50",
"@ibiz-template/controller": "^0.0.1-beta.118", "@ibiz-template/controller": "^0.0.1-beta.121",
"@ibiz-template/core": "^0.0.1-beta.118", "@ibiz-template/core": "^0.0.1-beta.121",
"@ibiz-template/model": "^0.0.1-beta.118", "@ibiz-template/model": "^0.0.1-beta.121",
"@ibiz-template/runtime": "^0.0.1-beta.118", "@ibiz-template/runtime": "^0.0.1-beta.121",
"@ibiz-template/service": "^0.0.1-beta.118", "@ibiz-template/service": "^0.0.1-beta.121",
"@ibiz-template/theme": "^0.0.1-beta.118", "@ibiz-template/theme": "^0.0.1-beta.121",
"@ibiz-template/vue-util": "^0.0.1-beta.118", "@ibiz-template/vue-util": "^0.0.1-beta.121",
"@ibiz/dynamic-model-api": "^2.1.28", "@ibiz/dynamic-model-api": "^2.1.28",
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
......
app_Web/pnpm-lock.yaml
浏览文件 @ b68ea176
...@@ -12,26 +12,26 @@ dependencies: ...@@ -12,26 +12,26 @@ dependencies:
specifier: ^0.0.1-beta.50 specifier: ^0.0.1-beta.50
version: 0.0.1-beta.50 version: 0.0.1-beta.50
'@ibiz-template/controller': '@ibiz-template/controller':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/runtime@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8) 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)
'@ibiz-template/core': '@ibiz-template/core':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) version: 0.0.1-beta.121(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': '@ibiz-template/model':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) version: 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': '@ibiz-template/runtime':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(qx-util@0.4.8) 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)
'@ibiz-template/service': '@ibiz-template/service':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(qx-util@0.4.8)(ramda@0.28.0) 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)
'@ibiz-template/theme': '@ibiz-template/theme':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118 version: 0.0.1-beta.121
'@ibiz-template/vue-util': '@ibiz-template/vue-util':
specifier: ^0.0.1-beta.118 specifier: ^0.0.1-beta.121
version: 0.0.1-beta.118(@ibiz-template/controller@0.0.1-beta.118)(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14) 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)
'@ibiz/dynamic-model-api': '@ibiz/dynamic-model-api':
specifier: ^2.1.28 specifier: ^2.1.28
version: 2.1.28(qx-util@0.4.8) version: 2.1.28(qx-util@0.4.8)
...@@ -939,8 +939,8 @@ packages: ...@@ -939,8 +939,8 @@ packages:
qx-util: 0.4.8 qx-util: 0.4.8
dev: false dev: false
/@ibiz-template/controller@0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/runtime@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8): /@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-/I9/7BPuUva/U3jmJ2ec4QJnoNV6yxCAX6ORCPXr1dWDwwER6yrFzV+mqymjcP+cLPHl+kECV3iKbbEZtyPGRg==} resolution: {integrity: sha512-38lTZzyIRnvAXQovhfr7BslYXG26fYU7C0VuCzSL6nwIZmnryv0KI8Nco0ZIdSg1Y3zqEu8M4hHmYjHvn6Zkxw==}
peerDependencies: peerDependencies:
'@ibiz-template/core': ^0.0.1-beta.30 '@ibiz-template/core': ^0.0.1-beta.30
'@ibiz-template/model': ^0.0.1-beta.30 '@ibiz-template/model': ^0.0.1-beta.30
...@@ -950,10 +950,10 @@ packages: ...@@ -950,10 +950,10 @@ packages:
qs: ^6.11.0 qs: ^6.11.0
qx-util: ^0.4.8 qx-util: ^0.4.8
dependencies: dependencies:
'@ibiz-template/core': 0.0.1-beta.118(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@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.118(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@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.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(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.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(qx-util@0.4.8)(ramda@0.28.0) '@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)
async-validator: 4.2.5 async-validator: 4.2.5
dayjs: 1.11.7 dayjs: 1.11.7
lodash-es: 4.17.21 lodash-es: 4.17.21
...@@ -961,8 +961,8 @@ packages: ...@@ -961,8 +961,8 @@ packages:
qx-util: 0.4.8 qx-util: 0.4.8
dev: false dev: false
/@ibiz-template/core@0.0.1-beta.118(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0): /@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-f4pG7DmzIhf1SziahwaAfs695DOx5LquEQv6N7lPYvIEmbUeB/ygpJxc96VkDAoVG8qIsAau/CEQlDUFlIusXw==} resolution: {integrity: sha512-7OMfynBY3gcZyIv1NaKCY9LsBEEKsHJGUXHejkpOIovPHeupEzod49PEdJn9YwxLq3HNZQpE4qDIgi1bzDf4HA==}
peerDependencies: peerDependencies:
lodash-es: ^4.17.21 lodash-es: ^4.17.21
qx-util: ^0.4.8 qx-util: ^0.4.8
...@@ -979,8 +979,8 @@ packages: ...@@ -979,8 +979,8 @@ packages:
- debug - debug
dev: false dev: false
/@ibiz-template/model@0.0.1-beta.118(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8): /@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-LW9rACQHN5EPmhiat1YagreoHKzsywoJcd+TkvPDO99v9//HQygvYNhuN0X2s8JhN6HnfKw4ElHi6pObf6ZjzA==} resolution: {integrity: sha512-20OFR4ueK6RQ6TkY4TiSWlCfQGePlFE8GRFv28WrXF6e2tx8rEDOR2LfjZ0dZz6pS7as+kuqsyNmQr9iomV51Q==}
peerDependencies: peerDependencies:
'@ibiz/dynamic-model-api': ^2.1.28 '@ibiz/dynamic-model-api': ^2.1.28
lodash-es: ^4.17.21 lodash-es: ^4.17.21
...@@ -992,8 +992,8 @@ packages: ...@@ -992,8 +992,8 @@ packages:
qx-util: 0.4.8 qx-util: 0.4.8
dev: false dev: false
/@ibiz-template/runtime@0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(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):
resolution: {integrity: sha512-5Z3AWBlm5w8snyOBwKeix5sskXY7saZYQyQNp9EyqtbH4NAu+B95N7Eox4VL8ZEMaPl5vTQQVSNIDx6l/YFR8A==} resolution: {integrity: sha512-txPAqnFMo+gt0wGuYX33es9/pM8+69fFGUo8KIhYEv6uhvgSGME1zd7RqjdDCOYj3Q0+ssN2Trqjm4+MB7P0Qg==}
peerDependencies: peerDependencies:
'@ibiz-template/core': ^0.0.1-beta.30 '@ibiz-template/core': ^0.0.1-beta.30
'@ibiz-template/model': ^0.0.1-beta.30 '@ibiz-template/model': ^0.0.1-beta.30
...@@ -1001,33 +1001,33 @@ packages: ...@@ -1001,33 +1001,33 @@ packages:
qx-util: ^0.4.8 qx-util: ^0.4.8
dependencies: dependencies:
'@ibiz-template/command': 0.0.1-beta.50 '@ibiz-template/command': 0.0.1-beta.50
'@ibiz-template/core': 0.0.1-beta.118(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@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.118(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@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.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(qx-util@0.4.8)(ramda@0.28.0) '@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)
qs: 6.11.1 qs: 6.11.1
qx-util: 0.4.8 qx-util: 0.4.8
dev: false dev: false
/@ibiz-template/service@0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(qx-util@0.4.8)(ramda@0.28.0): /@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-y1b2Q+xaxjIbtUqTMUGBSAA4JgpbogFGCGx1KBhYYMDJV84sAC3gkfb8L1FzVw+INl+fcazr9HgtyMex3QNrdQ==} resolution: {integrity: sha512-7hjOM1/6Ory8EvG4r9FnxvSrMYr1vHJhyvgNLNdDSoeA/QyvYLQUWAVLdlrYeUhCvSUb2wu07NiF4sIYNZQyLQ==}
peerDependencies: peerDependencies:
'@ibiz-template/core': ^0.0.1-beta.30 '@ibiz-template/core': ^0.0.1-beta.30
'@ibiz-template/model': ^0.0.1-beta.30 '@ibiz-template/model': ^0.0.1-beta.30
qx-util: ^0.4.8 qx-util: ^0.4.8
ramda: ^0.28.0 ramda: ^0.28.0
dependencies: dependencies:
'@ibiz-template/core': 0.0.1-beta.118(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@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.118(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@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)
qx-util: 0.4.8 qx-util: 0.4.8
ramda: 0.28.0 ramda: 0.28.0
dev: false dev: false
/@ibiz-template/theme@0.0.1-beta.118: /@ibiz-template/theme@0.0.1-beta.121:
resolution: {integrity: sha512-2/hj+PQ+5mF1aMTP4cCpzC+6DpbDDeIIOXiwsQLUOr0bWT/rHmk89L1Bu3695VHMX22iEIwcX1VYzwXWsi217A==} resolution: {integrity: sha512-EFF7w24UMJNhwkf/G9MFkOVTnZ7hHAp/ZWPVOBeRzTIWzARXdUP++ugtY1pNSeRXjcJxAJIFEGcGN990Ss8jDA==}
dev: false dev: false
/@ibiz-template/vue-util@0.0.1-beta.118(@ibiz-template/controller@0.0.1-beta.118)(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14): /@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-cl+blVpFOTNJvbyhXIGIKrg97pFEskbWa/w8grQH6h7RFSWhP4iE/yx2Alvb0fNQWdAfGjcy9+xlWgxvQK9vAA==} resolution: {integrity: sha512-XF1siOPXElCOx4M5jsNPSmUxPTpfBLq9nmtwsltCWwA2rzyl+BgES1pXN9mo8J61WXObc2uqdPoT68/vvk1Pbw==}
peerDependencies: peerDependencies:
'@ibiz-template/controller': ^0.0.1-beta.30 '@ibiz-template/controller': ^0.0.1-beta.30
'@ibiz-template/core': ^0.0.1-beta.30 '@ibiz-template/core': ^0.0.1-beta.30
...@@ -1039,10 +1039,10 @@ packages: ...@@ -1039,10 +1039,10 @@ packages:
vue: ^2.7.14 vue: ^2.7.14
vue-router: ^3.6.5 vue-router: ^3.6.5
dependencies: dependencies:
'@ibiz-template/controller': 0.0.1-beta.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(@ibiz-template/runtime@0.0.1-beta.118)(@ibiz-template/service@0.0.1-beta.118)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8) '@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.118(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@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.118(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@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.118(@ibiz-template/core@0.0.1-beta.118)(@ibiz-template/model@0.0.1-beta.118)(qx-util@0.4.8)(ramda@0.28.0) '@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)
qs: 6.11.1 qs: 6.11.1
qx-util: 0.4.8 qx-util: 0.4.8
ramda: 0.28.0 ramda: 0.28.0
......
app_Web/src/components/common/extend-action-timeline/extend-action-timeline.tsx
浏览文件 @ b68ea176
...@@ -46,7 +46,7 @@ export const ExtendActionTimeLine = defineComponent({ ...@@ -46,7 +46,7 @@ export const ExtendActionTimeLine = defineComponent({
* @param {IData[]} handleTasks * @param {IData[]} handleTasks
* @return {*} * @return {*}
*/ */
const handleVal = (handleTasks: IData[]) => { const handleVal = (handleTasks: IData[], isChild: boolean = false) => {
const commentsData: IData[] = []; const commentsData: IData[] = [];
let tasks = clone(handleTasks); let tasks = clone(handleTasks);
if (tasks.length > 0) { if (tasks.length > 0) {
...@@ -55,8 +55,8 @@ export const ExtendActionTimeLine = defineComponent({ ...@@ -55,8 +55,8 @@ export const ExtendActionTimeLine = defineComponent({
if (task.usertasks) { if (task.usertasks) {
// 有子流程没有comments 递归处理 // 有子流程没有comments 递归处理
const copyTasks = clone(task.usertasks); const copyTasks = clone(task.usertasks);
Object.assign(task, { tasks: handleVal(copyTasks) }); Object.assign(task, { tasks: handleVal(copyTasks, true) });
task.isShow = false; task.isShow = true;
} }
if (task.identitylinks.length === 0 && task.comments.length === 0) { if (task.identitylinks.length === 0 && task.comments.length === 0) {
Object.assign(task, { taskName: task.userTaskName }); Object.assign(task, { taskName: task.userTaskName });
...@@ -78,7 +78,12 @@ export const ExtendActionTimeLine = defineComponent({ ...@@ -78,7 +78,12 @@ export const ExtendActionTimeLine = defineComponent({
Object.assign(comment, { taskName: task.userTaskName }); Object.assign(comment, { taskName: task.userTaskName });
}); });
task.comments.sort(sortData); task.comments.sort(sortData);
commentsData.push(...task.comments); task.comments.forEach((comment: IData) => {
if (isChild && comment.type === '启动流程') {
return;
}
commentsData.push(comment);
});
} }
}); });
return commentsData; return commentsData;
......
app_Web/src/components/layout/app-layout/app-layout.tsx
浏览文件 @ b68ea176
...@@ -6,18 +6,11 @@ import '@ibiz-template/theme/style/components/layout/app-layout/app-layout.scss' ...@@ -6,18 +6,11 @@ import '@ibiz-template/theme/style/components/layout/app-layout/app-layout.scss'
function renderLogo(ns: Namespace, model: IndexViewModel) { function renderLogo(ns: Namespace, model: IndexViewModel) {
return ( return (
<div class={[ns.e('logo'), model.source?.mainMenuAlign?.toLowerCase()]}> <div class={ns.e('logo')}>
{model.appIconPath ? ( {model.appIconPath ? (
<img class={ns.e('logo-img')} src={model.appIconPath}></img> <img class={ns.e('logo-img')} src={model.appIconPath}></img>
) : null} ) : null}
<div <div class={ns.e('logo-caption')}>{model.caption}</div>
class={[
ns.e('logo-caption'),
model.source?.mainMenuAlign?.toLowerCase(),
]}
>
{model.caption}
</div>
</div> </div>
); );
} }
...@@ -56,12 +49,15 @@ export const AppLayout = defineComponent({ ...@@ -56,12 +49,15 @@ export const AppLayout = defineComponent({
return { ns, collapseChange, isBlank, collapseMenus }; return { ns, collapseChange, isBlank, collapseMenus };
}, },
render() { render() {
if (this.isComplete) { return this.isComplete ? (
let content = null; <i-layout
if (this.model.source.mainMenuAlign === 'CENTER') { class={[
content = this.$slots.menu; this.ns.b(),
} else { this.isBlank ? this.ns.m('blank') : '',
content = [ this.ns.is('collapse', this.collapseChange),
this.ns.is('tab', this.isShowTabPageExp),
]}
>
<i-sider <i-sider
hide-trigger hide-trigger
class={[ class={[
...@@ -69,13 +65,12 @@ export const AppLayout = defineComponent({ ...@@ -69,13 +65,12 @@ export const AppLayout = defineComponent({
this.ns.is('collapse', this.collapseChange), this.ns.is('collapse', this.collapseChange),
]} ]}
value={this.collapseChange} value={this.collapseChange}
key='1'
> >
{renderLogo(this.ns, this.model)} {renderLogo(this.ns, this.model)}
{this.$slots.menu} {this.$slots.menu}
</i-sider>, </i-sider>
<i-layout class={[this.ns.b('content')]} key='2'> <i-layout class={[this.ns.b('content')]}>
<i-header class={this.ns.b('header')} key='3'> <i-header class={this.ns.b('header')}>
<div class={this.ns.be('header', 'left')}> <div class={this.ns.be('header', 'left')}>
{renderLogo(this.ns, this.model)} {renderLogo(this.ns, this.model)}
<div class={this.ns.be('header', 'collapse-icon')}> <div class={this.ns.be('header', 'collapse-icon')}>
...@@ -103,27 +98,13 @@ export const AppLayout = defineComponent({ ...@@ -103,27 +98,13 @@ export const AppLayout = defineComponent({
<app-user /> <app-user />
</div> </div>
</i-header> </i-header>
<i-content class={this.ns.be('content', 'main')} key='4'> <i-content class={this.ns.be('content', 'main')}>
{this.$slots.tabPageExp} {this.$slots.tabPageExp}
{this.$slots.default} {this.$slots.default}
</i-content> </i-content>
{/* <i-footer class={this.ns.b('footer')}>Footer</i-footer> */} {/* <i-footer class={this.ns.b('footer')}>Footer</i-footer> */}
</i-layout>,
];
}
return (
<i-layout
class={[
this.ns.b(),
this.isBlank ? this.ns.m('blank') : '',
this.ns.is('collapse', this.collapseChange),
this.ns.is('tab', this.isShowTabPageExp),
]}
>
{content}
</i-layout> </i-layout>
); </i-layout>
} ) : null;
return null;
}, },
}); });
app_Web/src/components/widgets/form-control/form-item/form-item.tsx
浏览文件 @ b68ea176
...@@ -33,6 +33,7 @@ export const FormItem = defineComponent({ ...@@ -33,6 +33,7 @@ export const FormItem = defineComponent({
// 编辑器内容 // 编辑器内容
let editor = null; let editor = null;
if (this.c.form.isLoaded) { if (this.c.form.isLoaded) {
this.controller.editor?.calcPlaceHolder(this.controller.disabled);
if (this.controller.editorProvider) { if (this.controller.editorProvider) {
editor = h(this.controller.editorProvider.formEditor, { editor = h(this.controller.editorProvider.formEditor, {
props: { props: {
......
app_Web/src/components/widgets/grid-control/grid-control.util.ts
浏览文件 @ b68ea176
...@@ -30,6 +30,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) { ...@@ -30,6 +30,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) {
resizable: true, resizable: true,
sortable: !c.noSort && column.source.enableSort ? 'custom' : false, sortable: !c.noSort && column.source.enableSort ? 'custom' : false,
columnType: column.source.columnType, columnType: column.source.columnType,
userParams: column.source.userParams,
}; };
if (columnChildren.length > 0) { if (columnChildren.length > 0) {
Object.assign(columnData, { children: columnChildren }); Object.assign(columnData, { children: columnChildren });
...@@ -109,8 +110,11 @@ export function useITableColumns(c: GridController) { ...@@ -109,8 +110,11 @@ export function useITableColumns(c: GridController) {
// 如果是操作列，固定右边 // 如果是操作列，固定右边
const uaColumn = copy.find(column => column.columnType === 'UAGRIDCOLUMN'); const uaColumn = copy.find(column => column.columnType === 'UAGRIDCOLUMN');
if (uaColumn) { if (uaColumn) {
const userParams = uaColumn.userParams;
if (userParams && userParams.fixed === 'true') {
uaColumn.fixed = 'right'; uaColumn.fixed = 'right';
} }
}
return copy; return copy;
}); });
return [columns, originColumns]; return [columns, originColumns];
......
app_Web/src/views/index-view/index-view.vue
浏览文件 @ b68ea176
<script setup lang="ts"> <script setup lang="ts">
import { ViewNeuron } from '@ibiz-template/controller'; import { ViewNeuron } from '@ibiz-template/controller';
import { useIndexViewController } from '@ibiz-template/vue-util'; import { useIndexViewController, useNamespace } from '@ibiz-template/vue-util';
import { import {
computed, computed,
ComputedRef, ComputedRef,
...@@ -12,6 +12,7 @@ import { ...@@ -12,6 +12,7 @@ import {
import { createUUID } from 'qx-util'; import { createUUID } from 'qx-util';
import { useIndexRouteManage } from './index-view-default'; import { useIndexRouteManage } from './index-view-default';
import { useIndexExpRouteManage } from './index-view-exp'; import { useIndexExpRouteManage } from './index-view-exp';
import '@ibiz-template/theme/style/components/views/index-view/index-view.scss';
interface IndexViewProps { interface IndexViewProps {
context: IContext; context: IContext;
...@@ -155,7 +156,7 @@ onMounted(() => { ...@@ -155,7 +156,7 @@ onMounted(() => {
} }
}, 300); }, 300);
}); });
const ns = useNamespace('index-view');
// 菜单收缩变化 // 菜单收缩变化
const collapseChange = (collapse: boolean) => { const collapseChange = (collapse: boolean) => {
c.collapseChange = collapse; c.collapseChange = collapse;
...@@ -163,7 +164,9 @@ const collapseChange = (collapse: boolean) => { ...@@ -163,7 +164,9 @@ const collapseChange = (collapse: boolean) => {
</script> </script>
<template> <template>
<div :class="ns.b()">
<AppLayout <AppLayout
v-if="c.model?.source?.mainMenuAlign !== 'CENTER'"
:is-complete="c.complete" :is-complete="c.complete"
:model="c.model" :model="c.model"
:class="c.model?.source?.mainMenuAlign?.toLowerCase()" :class="c.model?.source?.mainMenuAlign?.toLowerCase()"
...@@ -211,4 +214,16 @@ const collapseChange = (collapse: boolean) => { ...@@ -211,4 +214,16 @@ const collapseChange = (collapse: boolean) => {
</AppKeepAlive> </AppKeepAlive>
</template> </template>
</AppLayout> </AppLayout>
<div v-else>
<app-menu
v-if="c.complete"
:current-path="currentPath"
:model-data="c.model.appMenu"
:context="c.context"
:collapse-change="c.collapseChange"
:menu-model="c.model?.source"
@menuRouteChange="onMenuRouteChange"
></app-menu>
</div>
</div>
</template> </template>
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ b68ea176
...@@ -1432,16 +1432,16 @@ ...@@ -1432,16 +1432,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ b68ea176
...@@ -9664,16 +9664,16 @@ ...@@ -9664,16 +9664,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
}, { }, {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
} ] } ]
}, { }, {
...@@ -9702,22 +9702,22 @@ ...@@ -9702,22 +9702,22 @@
"codeName" : "VMGroup3", "codeName" : "VMGroup3",
"name" : "视图消息类型测试", "name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息", "name" : "消息类型-常规信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg4"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg6" "id" : "ViewMsg5"
} }
}, { }, {
"name" : "消息类型-常规信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg4" "id" : "ViewMsg6"
} }
} ] } ]
}, { }, {
...@@ -9762,18 +9762,6 @@ ...@@ -9762,18 +9762,6 @@
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-警告信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -9787,12 +9775,6 @@ ...@@ -9787,12 +9775,6 @@
"id" : "ViewMsg6" "id" : "ViewMsg6"
}, },
"position" : "POPUP" "position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
}, { }, {
"name" : "消息类型-常规信息", "name" : "消息类型-常规信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -9800,6 +9782,12 @@ ...@@ -9800,6 +9782,12 @@
"id" : "ViewMsg4" "id" : "ViewMsg4"
}, },
"position" : "POPUP" "position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -9812,6 +9800,18 @@ ...@@ -9812,6 +9800,18 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg12"
} }
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或