Skip to content

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

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

上级 992dad6e
显示空白字符变更
内嵌 并排
正在显示 包含 136 行增加 和 84 行删除
app_Web/package.json
浏览文件 @ 8c4aeb57
...@@ -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.125", "@ibiz-template/controller": "^0.0.1-beta.126",
"@ibiz-template/core": "^0.0.1-beta.125", "@ibiz-template/core": "^0.0.1-beta.126",
"@ibiz-template/model": "^0.0.1-beta.125", "@ibiz-template/model": "^0.0.1-beta.126",
"@ibiz-template/runtime": "^0.0.1-beta.125", "@ibiz-template/runtime": "^0.0.1-beta.126",
"@ibiz-template/service": "^0.0.1-beta.125", "@ibiz-template/service": "^0.0.1-beta.126",
"@ibiz-template/theme": "^0.0.1-beta.125", "@ibiz-template/theme": "^0.0.1-beta.126",
"@ibiz-template/vue-util": "^0.0.1-beta.125", "@ibiz-template/vue-util": "^0.0.1-beta.126",
"@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
浏览文件 @ 8c4aeb57
...@@ -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.125 specifier: ^0.0.1-beta.126
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) version: 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/runtime@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(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.125 specifier: ^0.0.1-beta.126
version: 0.0.1-beta.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) version: 0.0.1-beta.126(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.125 specifier: ^0.0.1-beta.126
version: 0.0.1-beta.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) version: 0.0.1-beta.126(@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.125 specifier: ^0.0.1-beta.126
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) version: 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(qx-util@0.4.8)
'@ibiz-template/service': '@ibiz-template/service':
specifier: ^0.0.1-beta.125 specifier: ^0.0.1-beta.126
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) version: 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme': '@ibiz-template/theme':
specifier: ^0.0.1-beta.125 specifier: ^0.0.1-beta.126
version: 0.0.1-beta.125 version: 0.0.1-beta.126
'@ibiz-template/vue-util': '@ibiz-template/vue-util':
specifier: ^0.0.1-beta.125 specifier: ^0.0.1-beta.126
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) version: 0.0.1-beta.126(@ibiz-template/controller@0.0.1-beta.126)(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(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.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/controller@0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/runtime@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-ifHE04YIhIQB5l62ccGiMzuad3i5dBG+cqwZWaM9qit7uFNVDn+fvkxAFTkwDtaw8+TXo4U5hyv70xHjx9LPxg==} resolution: {integrity: sha512-+wo2yqXiWqf1c4RGdNWBQAiA/u0RtiFaxcAtXJ+iw5pasOYq0HeQ9FZSAk83thxN1x41qJ42Wb1AJnU6d6mA+g==}
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.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.126(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/model': 0.0.1-beta.126(@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/runtime': 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(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) '@ibiz-template/service': 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(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.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0): /@ibiz-template/core@0.0.1-beta.126(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-SINrxnYI8NamGqUODPVyiF3jSzj8sz4hV4JHLwdMvHiU1FUbrZgGyk1oSZwWDw8M1I6ZjY9Y5W4G6EEZVcD55g==} resolution: {integrity: sha512-ue+kv5LKvH2Q4LPDZJTKoem9pPzleaSQHujD0C55r4qL2MFWb9utShbhdXgdTcS9pnzAetjVhhHNcJ5jwKvB5A==}
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.125(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8): /@ibiz-template/model@0.0.1-beta.126(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-Uzatt11gfXTR4bHsOOnMtokhcRpfsRUL3DH1/kRpMvLj4HfGVxIdKKlBA5ZEl1aIkktcXFyxyFnxRI/DrIg8fQ==} resolution: {integrity: sha512-5OaakKcxBfvf18aW/fWsTypHIOpjsh5CX8fV9R+dSLDJVaTjGQJsRpvrmMukZ63Bk18UfaDi+bxJlEipkK+RDA==}
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.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/runtime@0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(qx-util@0.4.8):
resolution: {integrity: sha512-UF+MJXleE241M4J99ymthQjBAsIfiRb7paA4NLlor0TYKiJqzMvVRktLChssUzwqz14QjZwmusEJYTe/Tfhq4Q==} resolution: {integrity: sha512-4kxaB/4RjVGbotZd1OK/H8SaHF9ab7YIsbfgE9mKZH/6K6QKbe8xF8/a/4UXkcoBjpgw2+UeNZNVZ5JI74mhGg==}
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.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.126(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/model': 0.0.1-beta.126(@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) '@ibiz-template/service': 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(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.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/service@0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-ztVTvSXodM/vwslhEJlPcaM0XbICgZqbV+iIcnCE/VQWTUwfu7NUFlghUlncbfjyQqJlUAfEogKqvvJZiepfSg==} resolution: {integrity: sha512-NWWFEHwz03PLMV9JFivQQcTtKoI781qse98vdhi+tB663eZP9FUP3A8fSXDSxWn0l9TKJTivuf8AjvZDK67MlQ==}
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.125(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.126(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/model': 0.0.1-beta.126(@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.125: /@ibiz-template/theme@0.0.1-beta.126:
resolution: {integrity: sha512-9yEd3syK3HmimB4wsHeyvw2Y5ZQAleUeUyJPKzrS4qXiUGhAcILsmMBR4uzkRKbvajT940NHSiiebEy3avYMUg==} resolution: {integrity: sha512-pwGagVAONkPkoMtOBYG7Smobe4AqbKFLaoIx4mkpA0OElJKbxy6WPnG6lbevUDA6bvBoMQCJ5ghLzExrkwfnAA==}
dev: false dev: false
/@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): /@ibiz-template/vue-util@0.0.1-beta.126(@ibiz-template/controller@0.0.1-beta.126)(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(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==} resolution: {integrity: sha512-BCEGZSOV8BlZw/ze6CGNNUSIBYI1NzNBLA/JpWd4gaJTe7DUY9mOgy7s0C2ErMT6hoYEf7vKsrkDtnmzfe+21g==}
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.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/controller': 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(@ibiz-template/runtime@0.0.1-beta.126)(@ibiz-template/service@0.0.1-beta.126)(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/core': 0.0.1-beta.126(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/model': 0.0.1-beta.126(@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) '@ibiz-template/service': 0.0.1-beta.126(@ibiz-template/core@0.0.1-beta.126)(@ibiz-template/model@0.0.1-beta.126)(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/editor/text-box/ibiz-input/ibiz-input.tsx
浏览文件 @ 8c4aeb57
import { computed, defineComponent, ref, watch } from 'vue'; import { computed, defineComponent, ref, watch } from 'vue';
import { debounce } from 'lodash-es'; import { debounce, isNaN } from 'lodash-es';
import { import {
getEditorEmits, getEditorEmits,
getInputProps, getInputProps,
...@@ -7,6 +7,19 @@ import { ...@@ -7,6 +7,19 @@ import {
} from '@ibiz-template/vue-util'; } from '@ibiz-template/vue-util';
import '@ibiz-template/theme/style/components/editor/ibiz-input/ibiz-input.scss'; import '@ibiz-template/theme/style/components/editor/ibiz-input/ibiz-input.scss';
const fomatFloat = function (value: number, n: number) {
const f = Math.round(value * 10 ** n) / 10 ** n;
let s = f.toString();
const rs = s.indexOf('.');
if (rs < 0) {
s += '.';
}
for (let i = s.length - s.indexOf('.'); i <= n; i++) {
s += '0';
}
return s;
};
export const IBizInput = defineComponent({ export const IBizInput = defineComponent({
name: 'IBizInput', name: 'IBizInput',
props: getInputProps(), props: getInputProps(),
...@@ -31,6 +44,9 @@ export const IBizInput = defineComponent({ ...@@ -31,6 +44,9 @@ export const IBizInput = defineComponent({
// 类型 // 类型
const type = computed(() => { const type = computed(() => {
if (c.model.precision !== -1) {
return 'number';
}
switch (editorModel.editorType) { switch (editorModel.editorType) {
case 'TEXTBOX': case 'TEXTBOX':
return 'text'; return 'text';
...@@ -77,8 +93,23 @@ export const IBizInput = defineComponent({ ...@@ -77,8 +93,23 @@ export const IBizInput = defineComponent({
(e: IData) => { (e: IData) => {
// 拦截掉blur触发后change // 拦截掉blur触发后change
if (blurCacheValue !== e.target.value) { if (blurCacheValue !== e.target.value) {
if (c.model.precision !== -1) {
const num = Number(e.target.value);
if (!isNaN(num)) {
const number = fomatFloat(num, c.model.precision);
currentVal.value = e.target.value; // 1.001
setTimeout(() => {
currentVal.value = number;
// 1.00 1.001
if (number !== props.value) {
emit('change', number);
}
});
}
} else {
emit('change', e.target.value); emit('change', e.target.value);
} }
}
blurCacheValue = undefined; blurCacheValue = undefined;
isDebounce = false; isDebounce = false;
if (awaitSearch) { if (awaitSearch) {
...@@ -111,7 +142,12 @@ export const IBizInput = defineComponent({ ...@@ -111,7 +142,12 @@ export const IBizInput = defineComponent({
*/ */
const handleBlur = () => { const handleBlur = () => {
blurCacheValue = inputRef.value.currentValue; blurCacheValue = inputRef.value.currentValue;
const number = fomatFloat(Number(blurCacheValue), c.model.precision);
if (c.model.precision !== -1) {
emit('change', number);
} else {
emit('change', blurCacheValue); emit('change', blurCacheValue);
}
}; };
// 自动聚焦 // 自动聚焦
......
app_Web/src/components/widgets/grid-control/grid-control.tsx
浏览文件 @ 8c4aeb57
...@@ -53,6 +53,12 @@ export const GridControl = defineComponent({ ...@@ -53,6 +53,12 @@ export const GridControl = defineComponent({
const { onPageChange, onPageReset, onPageSizeChange } = const { onPageChange, onPageReset, onPageSizeChange } =
useAppGridPagination(c); useAppGridPagination(c);
const highlight = computed(() => {
const ctrlParams =
props.modelData?.source.getPSControlParam()?.ctrlParams;
return ctrlParams?.HIGHLIGHT !== 'false';
});
// iView表格单击行选中没有，必须手动调用选中方法 // iView表格单击行选中没有，必须手动调用选中方法
const onUIRowClick = (data: IData, index: number) => { const onUIRowClick = (data: IData, index: number) => {
const gridInstance: IData | undefined = proxy.$refs.grid; const gridInstance: IData | undefined = proxy.$refs.grid;
...@@ -60,8 +66,14 @@ export const GridControl = defineComponent({ ...@@ -60,8 +66,14 @@ export const GridControl = defineComponent({
if (gridInstance.toggleSelect) { if (gridInstance.toggleSelect) {
gridInstance.toggleSelect(index); gridInstance.toggleSelect(index);
} }
if (gridInstance.highlightCurrentRow) { const objData = gridInstance.objData;
const rowData = objData?.[index];
if (rowData) {
if (rowData._isChecked) {
gridInstance.highlightCurrentRow(index); gridInstance.highlightCurrentRow(index);
} else {
gridInstance.clearCurrentRow();
}
} }
} }
onRowClick(data); onRowClick(data);
...@@ -147,6 +159,7 @@ export const GridControl = defineComponent({ ...@@ -147,6 +159,7 @@ export const GridControl = defineComponent({
tableHeight, tableHeight,
gridRef, gridRef,
girdPaginationRef, girdPaginationRef,
highlight,
}; };
}, },
render() { render() {
...@@ -198,7 +211,7 @@ export const GridControl = defineComponent({ ...@@ -198,7 +211,7 @@ export const GridControl = defineComponent({
height={this.tableHeight} height={this.tableHeight}
class={this.ns.b('content')} class={this.ns.b('content')}
show-header={!this.c.model.source.hideHeader} show-header={!this.c.model.source.hideHeader}
highlight-row highlight-row={this.highlight}
data={this.tableData} data={this.tableData}
columns={this.columns} columns={this.columns}
on-on-row-click={this.onUIRowClick} on-on-row-click={this.onUIRowClick}
......
app_Web/src/components/widgets/grid-control/grid-control.util.ts
浏览文件 @ 8c4aeb57
...@@ -31,7 +31,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) { ...@@ -31,7 +31,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) {
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, userParams: column.source.userParams,
className: column.codeName, className: column.source.getCellPSSysCss()?.cssName,
}; };
if (columnChildren.length > 0) { if (columnChildren.length > 0) {
Object.assign(columnData, { children: columnChildren }); Object.assign(columnData, { children: columnChildren });
...@@ -139,7 +139,10 @@ export function useITableEvent(c: GridController) { ...@@ -139,7 +139,10 @@ export function useITableEvent(c: GridController) {
const origin = getOriginData(data); const origin = getOriginData(data);
// 单选的时候选中效果靠这个回调 // 单选的时候选中效果靠这个回调
if (c.singleSelect) { if (c.singleSelect) {
c.onSelectionChange([origin]); const selectedItem = c.selectedData.find(
item => item.srfkey === data.srfkey,
);
c.onSelectionChange(selectedItem ? [] : [origin]);
} }
c.onRowClick(origin); c.onRowClick(origin);
} }
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 8c4aeb57
...@@ -9830,16 +9830,16 @@ ...@@ -9830,16 +9830,16 @@
"id" : "ViewMsg4" "id" : "ViewMsg4"
} }
}, { }, {
"name" : "消息类型-警告信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg6"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg6" "id" : "ViewMsg5"
} }
} ] } ]
}, { }, {
...@@ -9856,12 +9856,6 @@ ...@@ -9856,12 +9856,6 @@
"codeName" : "VMGroup4", "codeName" : "VMGroup4",
"name" : "视图消息位置测试", "name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-弹出", "name" : "消息位置-弹出",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -9879,23 +9873,17 @@ ...@@ -9879,23 +9873,17 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg9"
} }
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, { }, {
"name" : "关闭模式-默认删除-上方-错误", "name" : "消息位置-视图下方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg8"
} }
} ]
}, { }, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除-上方-警告", "name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -9934,17 +9922,23 @@ ...@@ -9934,17 +9922,23 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
} ]
}, { }, {
"codeName" : "VMGroup5", "name" : "消息位置-视图内容区",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
} }
} ]
}, { }, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-无删除", "name" : "关闭模式-无删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -9956,6 +9950,12 @@ ...@@ -9956,6 +9950,12 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg12"
} }
}, {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup6", "codeName" : "VMGroup6",
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或