Skip to content

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

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

上级 e0bdd6f3
显示空白字符变更
内嵌 并排
正在显示 包含 103 行增加 和 85 行删除
app_Web/package.json
浏览文件 @ d24ae405
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
"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.105", "@ibiz-template/controller": "^0.0.1-beta.106",
"@ibiz-template/core": "^0.0.1-beta.105", "@ibiz-template/core": "^0.0.1-beta.106",
"@ibiz-template/model": "^0.0.1-beta.105", "@ibiz-template/model": "^0.0.1-beta.106",
"@ibiz-template/runtime": "^0.0.1-beta.105", "@ibiz-template/runtime": "^0.0.1-beta.106",
"@ibiz-template/service": "^0.0.1-beta.105", "@ibiz-template/service": "^0.0.1-beta.106",
"@ibiz-template/theme": "^0.0.1-beta.105", "@ibiz-template/theme": "^0.0.1-beta.106",
"@ibiz-template/vue-util": "^0.0.1-beta.105", "@ibiz-template/vue-util": "^0.0.1-beta.106",
"@ibiz/dynamic-model-api": "^2.1.24", "@ibiz/dynamic-model-api": "^2.1.27",
"@riophae/vue-treeselect": "^0.4.0", "@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"echarts": "^5.4.2", "echarts": "^5.4.2",
......
app_Web/pnpm-lock.yaml
浏览文件 @ d24ae405
lockfileVersion: '6.1' lockfileVersion: '6.0'
settings: settings:
autoInstallPeers: true autoInstallPeers: true
...@@ -12,29 +12,29 @@ dependencies: ...@@ -12,29 +12,29 @@ 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.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/runtime@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8) version: 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/runtime@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(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.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) version: 0.0.1-beta.106(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.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8) version: 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': '@ibiz-template/runtime':
specifier: ^0.0.1-beta.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(qx-util@0.4.8) version: 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(qx-util@0.4.8)
'@ibiz-template/service': '@ibiz-template/service':
specifier: ^0.0.1-beta.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(qx-util@0.4.8)(ramda@0.28.0) version: 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme': '@ibiz-template/theme':
specifier: ^0.0.1-beta.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105 version: 0.0.1-beta.106
'@ibiz-template/vue-util': '@ibiz-template/vue-util':
specifier: ^0.0.1-beta.105 specifier: ^0.0.1-beta.106
version: 0.0.1-beta.105(@ibiz-template/controller@0.0.1-beta.105)(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(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.106(@ibiz-template/controller@0.0.1-beta.106)(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(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.24 specifier: ^2.1.27
version: 2.1.24(qx-util@0.4.8) version: 2.1.27(qx-util@0.4.8)
'@riophae/vue-treeselect': '@riophae/vue-treeselect':
specifier: ^0.4.0 specifier: ^0.4.0
version: 0.4.0(vue@2.7.14) version: 0.4.0(vue@2.7.14)
...@@ -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.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/runtime@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8): /@ibiz-template/controller@0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/runtime@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-sKh6FZfPuDSTMXCyIsSmTGQ4WZqNwDbI4CZ1PGgtXQ80m2ufWeXHkPU/+epuWWUdo9vhUFiDPFWxZ3recjYQ9g==} resolution: {integrity: sha512-p48PzbIKjEn6ZoNXXWtjVilYGndfEeBuhdxzE5VYGRPTwm5GoTpCvp2KIm8XcVFs6Js6XYUFt51+N7CgkvhxWw==}
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.105(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.105(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(qx-util@0.4.8) '@ibiz-template/runtime': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/service': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(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.105(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0): /@ibiz-template/core@0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-33RKabFW8a7GYVNthgSG5N1aZ75G6ORVSWcO3nRw6FIh1bxLlwPnTY4HFAHlHwMawnpg1bAzDe0ZtB7cihTDSQ==} resolution: {integrity: sha512-Y8oa1DvQUxLQPxGk/Ucu1sHp3s+7RI6v2gQcbmOZEWcjj6XyqKUB4ex/Yo63ghpAehzrDkBz2SU9Xrf8PIEQJQ==}
peerDependencies: peerDependencies:
lodash-es: ^4.17.21 lodash-es: ^4.17.21
qx-util: ^0.4.8 qx-util: ^0.4.8
...@@ -979,21 +979,21 @@ packages: ...@@ -979,21 +979,21 @@ packages:
- debug - debug
dev: false dev: false
/@ibiz-template/model@0.0.1-beta.105(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8): /@ibiz-template/model@0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-UfUlAf7+f66ELvt/UuQRaGjQbMg69txzodRRdg5QGs6yFmrhmFkzC+D4yzDkb9JlCqMmT9GSBmPFNRda2encxQ==} resolution: {integrity: sha512-A4RLonvcg4+lLhCJqhM1x/dlSokfXPPfQ6cgpwakd/DZ8fy+IWS08oZ9S7UqUxRgMiQawB5bAGLAStDC9W00EQ==}
peerDependencies: peerDependencies:
'@ibiz/dynamic-model-api': ^2.1.24 '@ibiz/dynamic-model-api': ^2.1.27
lodash-es: ^4.17.21 lodash-es: ^4.17.21
qx-util: ^0.4.8 qx-util: ^0.4.8
dependencies: dependencies:
'@ibiz/dynamic-model-api': 2.1.24(qx-util@0.4.8) '@ibiz/dynamic-model-api': 2.1.27(qx-util@0.4.8)
lodash-es: 4.17.21 lodash-es: 4.17.21
pluralize: 8.0.0 pluralize: 8.0.0
qx-util: 0.4.8 qx-util: 0.4.8
dev: false dev: false
/@ibiz-template/runtime@0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(qx-util@0.4.8): /@ibiz-template/runtime@0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(qx-util@0.4.8):
resolution: {integrity: sha512-tJ9c1zA0caKpMRMhp6hyg1KTxCV15IKvZhzCatxciB51bK6e58xlBrXmALzBOSSKeDJjXf/KWvMlnTkKoPRUKw==} resolution: {integrity: sha512-PFQE3xEzY1wekf83ICEgi6wjf7C5RDScaxJiOOGx2n8Q8GvGY+nS40M3Pz4MrXMgOsKdWzq/Ty/JurhMmYNhHA==}
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.105(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.105(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/service': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(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.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(qx-util@0.4.8)(ramda@0.28.0): /@ibiz-template/service@0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-ykf9dGCHkCx7krrH3MJFQu+Qsq4yRPkJnGX6RHL5DmHlyLv489XJ/FEdLBEnZNKbyL9CpxD4Iy3448sKfgjV0g==} resolution: {integrity: sha512-EUXBuCZqzGi/ckRDhx+EEsLP7FADIfu8nR27xJ0t+M5GVdAiyMrUJBjAznp6D5B40zBEgzIhzg4b+f1aNIsyQA==}
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.105(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.105(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(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.105: /@ibiz-template/theme@0.0.1-beta.106:
resolution: {integrity: sha512-tV2PAlqzkA9FviWaSAlXww1GFPK0m1pp89tQM9AMst7G2ZXefImAm+cF0VkfYkxVQuQ27W5jDmRdetMLvNmwgQ==} resolution: {integrity: sha512-WyTs8P2WhNZijGc0o8JJsuToBFeL3cti4DlBr+E/cv1hDyHf+U3dWCg0CfQFxfB/vFPXM2jhfxRyJLMqi2t7Zw==}
dev: false dev: false
/@ibiz-template/vue-util@0.0.1-beta.105(@ibiz-template/controller@0.0.1-beta.105)(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(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.106(@ibiz-template/controller@0.0.1-beta.106)(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(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-Uv4aVbcOz/j2HFVRPRYmt9aQ1/v205yAOPlsb0kq23AqjHlq3LCEoXKD9kwqtmDa+NJLeS2gQgWLBUvosCE9Gg==} resolution: {integrity: sha512-sovVS3qKE2z6jP+ec0fDaYirVt6oDxtZXGm3+vhDlfBFtH99TGvVZw64lyc5ajsu6CflPibCjGhQugbapniDWg==}
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.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(@ibiz-template/runtime@0.0.1-beta.105)(@ibiz-template/service@0.0.1-beta.105)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8) '@ibiz-template/controller': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/runtime@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.105(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.105(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.105(@ibiz-template/core@0.0.1-beta.105)(@ibiz-template/model@0.0.1-beta.105)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/service': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(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
...@@ -1050,8 +1050,8 @@ packages: ...@@ -1050,8 +1050,8 @@ packages:
vue-router: 3.6.5(vue@2.7.14) vue-router: 3.6.5(vue@2.7.14)
dev: false dev: false
/@ibiz/dynamic-model-api@2.1.24(qx-util@0.4.8): /@ibiz/dynamic-model-api@2.1.27(qx-util@0.4.8):
resolution: {integrity: sha512-aUQ7Hpup2Whg6ur59apAiw7LhrdWKXNs6lYpRRUGgu071VsMrDt681/LcwT17y4MOLeHetVV2F2fHQIwCJECnw==} resolution: {integrity: sha512-mcmWbLOyOnjgP21eRTp9hTtjUiCeL1pOE6fz3al7LlJE1gJpY7W/qTvu7DBogXbK14lWS1t/C7P84KYjGWkR6w==}
peerDependencies: peerDependencies:
qx-util: '>=0.4.8' qx-util: '>=0.4.8'
dependencies: dependencies:
......
app_Web/src/components/editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.scss 0 → 100644
浏览文件 @ d24ae405
@include b(grid-picker){
word-break:break-all;
.#{bem(mpicker, '', readonly)}{
white-space: pre-line;
}
}
\ No newline at end of file
app_Web/src/components/editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.tsx
浏览文件 @ d24ae405
...@@ -5,6 +5,7 @@ import { ...@@ -5,6 +5,7 @@ import {
useGridCellEditor, useGridCellEditor,
useNamespace, useNamespace,
} from '@ibiz-template/vue-util'; } from '@ibiz-template/vue-util';
import './ibiz-grid-picker.scss';
export const IBizGridPicker = defineComponent({ export const IBizGridPicker = defineComponent({
name: 'IBizGridPicker', name: 'IBizGridPicker',
......
app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
浏览文件 @ d24ae405
...@@ -117,9 +117,20 @@ export const IBizMPicker = defineComponent({ ...@@ -117,9 +117,20 @@ export const IBizMPicker = defineComponent({
const valArr: Array<IData> = []; const valArr: Array<IData> = [];
if (selects.length > 0) { if (selects.length > 0) {
selects.forEach((select: string) => { selects.forEach((select: string) => {
const findItem = items.value.find(item => let index = items.value.findIndex(item =>
Object.is(item.srfkey, select), Object.is(item.srfkey, select),
); );
let findItem: IData | null = null;
if (index >= 0) {
findItem = items.value[index];
} else {
index = selectItems.value.findIndex((item: IData) =>
Object.is(item.srfkey, select),
);
if (index >= 0) {
findItem = selectItems.value[index];
}
}
if (findItem) { if (findItem) {
valArr.push(findItem); valArr.push(findItem);
} }
......
app_Web/src/components/widgets/form-control/form-druipart/form-druipart.tsx
浏览文件 @ d24ae405
...@@ -62,9 +62,9 @@ export const FormDRUIPart = defineComponent({ ...@@ -62,9 +62,9 @@ export const FormDRUIPart = defineComponent({
neuronInit: this.onNeuronInit, neuronInit: this.onNeuronInit,
}, },
})} })}
{this.controller.showMask && ( {/* {this.controller.showMask && (
<div class={this.ns.e('mask')}>请先保存主数据</div> <div class={this.ns.e('mask')}>请先保存主数据</div>
)} )} */}
</div> </div>
); );
}, },
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ d24ae405
...@@ -1398,16 +1398,16 @@ ...@@ -1398,16 +1398,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
浏览文件 @ d24ae405
...@@ -3571,16 +3571,16 @@ ...@@ -3571,16 +3571,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"
} }
} ] } ]
}, { }, {
...@@ -3598,12 +3598,6 @@ ...@@ -3598,12 +3598,6 @@
"codeName" : "VMGroup3", "codeName" : "VMGroup3",
"name" : "视图消息类型测试", "name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-错误信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -3615,21 +3609,27 @@ ...@@ -3615,21 +3609,27 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg4" "id" : "ViewMsg4"
} }
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup4", "codeName" : "VMGroup4",
"name" : "视图消息位置测试", "name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区", "name" : "消息位置-视图上方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg7"
} }
}, { }, {
"name" : "消息位置-视图上方", "name" : "消息位置-弹出",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg7" "id" : "ViewMsg10"
} }
}, { }, {
"name" : "消息位置-视图下方", "name" : "消息位置-视图下方",
...@@ -3638,22 +3638,16 @@ ...@@ -3638,22 +3638,16 @@
"id" : "ViewMsg8" "id" : "ViewMsg8"
} }
}, { }, {
"name" : "消息位置-弹出", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg10" "id" : "ViewMsg9"
} }
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
"name" : "视图消息关闭模式", "name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-无删除", "name" : "关闭模式-无删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -3665,6 +3659,12 @@ ...@@ -3665,6 +3659,12 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg12"
} }
}, {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup6", "codeName" : "VMGroup6",
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或