Skip to content

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

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

上级 5f23e537
显示空白字符变更
内嵌 并排
正在显示 包含 228 行增加 和 110 行删除
app_Web/package.json
浏览文件 @ 814d3e66
......@@ -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.109",
"@ibiz-template/core": "^0.0.1-beta.109",
"@ibiz-template/model": "^0.0.1-beta.109",
"@ibiz-template/runtime": "^0.0.1-beta.109",
"@ibiz-template/service": "^0.0.1-beta.109",
"@ibiz-template/theme": "^0.0.1-beta.109",
"@ibiz-template/vue-util": "^0.0.1-beta.109",
"@ibiz-template/controller": "^0.0.1-beta.110",
"@ibiz-template/core": "^0.0.1-beta.110",
"@ibiz-template/model": "^0.0.1-beta.110",
"@ibiz-template/runtime": "^0.0.1-beta.110",
"@ibiz-template/service": "^0.0.1-beta.110",
"@ibiz-template/theme": "^0.0.1-beta.110",
"@ibiz-template/vue-util": "^0.0.1-beta.110",
"@ibiz/dynamic-model-api": "^2.1.28",
"@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7",
......
app_Web/pnpm-lock.yaml
浏览文件 @ 814d3e66
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.109
version: 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/runtime@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
specifier: ^0.0.1-beta.110
version: 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/runtime@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core':
specifier: ^0.0.1-beta.109
version: 0.0.1-beta.109(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.110
version: 0.0.1-beta.110(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model':
specifier: ^0.0.1-beta.109
version: 0.0.1-beta.109(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
specifier: ^0.0.1-beta.110
version: 0.0.1-beta.110(@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.109
version: 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(qx-util@0.4.8)
specifier: ^0.0.1-beta.110
version: 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(qx-util@0.4.8)
'@ibiz-template/service':
specifier: ^0.0.1-beta.109
version: 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.110
version: 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme':
specifier: ^0.0.1-beta.109
version: 0.0.1-beta.109
specifier: ^0.0.1-beta.110
version: 0.0.1-beta.110
'@ibiz-template/vue-util':
specifier: ^0.0.1-beta.109
version: 0.0.1-beta.109(@ibiz-template/controller@0.0.1-beta.109)(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(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.110
version: 0.0.1-beta.110(@ibiz-template/controller@0.0.1-beta.110)(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(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.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/runtime@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-vzDz0x0w/cJHCn12pGD5DhJJ6qPyA0zdrd8GlaKb9L0gYxtlK3bUps4lO70WKChFRI0BW62+oS9tuUwycIO1vQ==}
/@ibiz-template/controller@0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/runtime@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-bsSl+X/ZAGhhxC9kSdCCO9AGeP0k7OoMuAKsP79vkbGPjdEaYWorS2R7vLGk5oascUbtJsEgrP7v4rbQ/fxOqA==}
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.109(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.109(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.110(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.110(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(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.109(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-YKdmLhnWcZg76nXi4Eri4LMaHlZ8f4m1REPJLCm0ioNjArjRzYIhP4GxVq7I95TvybAlSJ2HljRVeszf0AeKYw==}
/@ibiz-template/core@0.0.1-beta.110(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-D/OncfV8rgi4ZkAY7uArFMmPzbHrE5lP94sr6J2oN5dpbwxbWm6g2CXuoFptU8d+0+s9gvCDTopUxorOym2Qgw==}
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.109(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-H8jtrofsaFc+grJ0QBrVPzYqf+XjY2QNqhbz7p5togzhOwcJXqxLdunqeKSCspo0/XXvMosz7ac0aAhS2D5N3w==}
/@ibiz-template/model@0.0.1-beta.110(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-VBOM8PMDQrZivbYPy/J69l8ZB79cMGx6jM4Gmi5A8i5CNWmLEGWERHokM9k3PvMBvsRfMlEWsW9CzfrMT56cpw==}
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.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(qx-util@0.4.8):
resolution: {integrity: sha512-FdEkfg8ZQB07BbG0oKsF45Up2B27H3plQeFXfx9nTnl+OREywHkf8sdDsE0tDe4u9UxlMZVYFxrvPZfYHqAU4A==}
/@ibiz-template/runtime@0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(qx-util@0.4.8):
resolution: {integrity: sha512-ryPzBX8qfHT09rvtK10xCMuYC8UUblNz+tADFO9hYWzmMlCymj36K1ksay0/++qD3ia+DA/vNg7UI/LbcGc1oQ==}
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.109(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.109(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.110(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.110(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(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.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-iYmr+FTEyUGcDzb190SSRw/KQWIJWTMRdw3KtD1B6B5G4yYQYp3Db9wRf2SfqXfXZTU1yZnTK+lOLlxyFOxXWw==}
/@ibiz-template/service@0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-B4FC7Ko3WG4rHRQUSGFn009lPWR4RQY+4sVi9fzezd9JqF/mhcAmA8xEG21T9lbPSNsHcfgvb39fLQOo1LRa6A==}
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.109(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.109(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.110(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.110(@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.109:
resolution: {integrity: sha512-h7pj30vBwZW3HJHUolW8XnYg2alzPSOLCJPAvXluB+e52LQJKfg8G8LK0JBKAHWGnogOnarnDnSEfOiSfTjn1g==}
/@ibiz-template/theme@0.0.1-beta.110:
resolution: {integrity: sha512-RhqLFh9yn1SHAbjw9HsJm42kvuJ/p0qk+tMb85EeDIvrHZ6AAuRCf3Ynydn+A4wG+NUwpBLs7S2t5zH/7o9MLA==}
dev: false
/@ibiz-template/vue-util@0.0.1-beta.109(@ibiz-template/controller@0.0.1-beta.109)(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(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-jDTJN2Y/pDXnmF4seOvdMf0xEIVhrTJN37fHLtZ0d28OpJ6YaNE/yxQw86ROsbm1jnNWC7gWHQjsR6DH7JqdRQ==}
/@ibiz-template/vue-util@0.0.1-beta.110(@ibiz-template/controller@0.0.1-beta.110)(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(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-Qvan/GHumqnvq4pHGHxjk5QZhQjQJ/5nFgFwRXKg1YFeIY9qD9IVjUy+1PyfNBSzipTQndSkydTI3KcM/vpvvQ==}
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.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(@ibiz-template/runtime@0.0.1-beta.109)(@ibiz-template/service@0.0.1-beta.109)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.109(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.109(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.109(@ibiz-template/core@0.0.1-beta.109)(@ibiz-template/model@0.0.1-beta.109)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/controller': 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(@ibiz-template/runtime@0.0.1-beta.110)(@ibiz-template/service@0.0.1-beta.110)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.110(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.110(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.110(@ibiz-template/core@0.0.1-beta.110)(@ibiz-template/model@0.0.1-beta.110)(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/app-register.ts
浏览文件 @ 814d3e66
......@@ -87,6 +87,7 @@ import {
ImagePreview,
CodeList,
TabPageExp,
ViewMessage,
} from './components/common';
// 编辑器组件
import {
......@@ -202,6 +203,7 @@ export const AppRegister = {
v.component('CodeList', CodeList);
v.component('PortletLayout', PortletLayout);
v.component('TabPageExp', TabPageExp);
v.component('ViewMessage', ViewMessage);
// 注册编辑器组件
v.component('GridEditor', GridEditor);
v.component('IBizSpan', IBizSpan);
......
app_Web/src/components/common/index.ts
浏览文件 @ 814d3e66
......@@ -13,6 +13,7 @@ import { WfVersionSelect } from './wf-version-select/wf-version-select';
import { ExtendActionTimeLine } from './extend-action-timeline/extend-action-timeline';
import { ExtendActionGrid } from './extend-action-grid/extend-action-grid';
import { TabPageExp } from './tab-page-exp/tab-page-exp';
import { ViewMessage } from './view-message/view-message';
export { ImagePreview } from './image-preview/image-preview';
export { DataImport } from './data-import/data-import';
......@@ -36,4 +37,5 @@ export {
ExtendActionTimeLine,
ExtendActionGrid,
TabPageExp,
ViewMessage,
};
app_Web/src/components/common/view-message/view-message.tsx 0 → 100644
浏览文件 @ 814d3e66
import { useNamespace } from '@ibiz-template/vue-util';
import { defineComponent } from 'vue';
import '@ibiz-template/theme/style/components/common/app-icon/app-icon.scss';
import { IViewMessage } from '@ibiz-template/controller';
export const ViewMessage = defineComponent({
name: 'ViewMessage',
props: {
messages: {
type: Array<IViewMessage>,
},
},
setup() {
const ns = useNamespace('view-message');
const getType = (messageType?: string): string => {
switch (messageType) {
case 'WARN':
return 'warning';
case 'ERROR':
return 'error';
default:
return 'info';
}
};
return { ns, getType };
},
render() {
if (!this.messages?.length) {
return null;
}
return (
<div class={[this.ns.b()]}>
{this.messages?.map(message => {
return (
<i-alert
type={this.getType(message.messageType)}
closable={message.removeMode !== 0}
>
{message.title}
{message.message && (
<template slot='desc'>{message.message}</template>
)}
</i-alert>
);
})}
</div>
);
},
});
app_Web/src/components/layout/view-base/view-base.tsx
浏览文件 @ 814d3e66
......@@ -10,10 +10,25 @@ export const ViewBase = defineComponent({
required: true,
},
},
setup() {
setup(props) {
const ns = useNamespace('view');
return { ns };
const renderViewMessage = () => {
const messageSlots: IData = {};
if (props.controller.complete) {
['TOP', 'BOTTOM', 'BODY'].forEach(position => {
const viewMessages = props.controller.viewMessages[position];
if (viewMessages?.length) {
messageSlots[`${position.toLowerCase()}Message`] = () => {
return <view-message messages={viewMessages}></view-message>;
};
}
});
}
return messageSlots;
};
return { ns, renderViewMessage };
},
render() {
const c = this.controller;
......@@ -76,6 +91,7 @@ export const ViewBase = defineComponent({
}
return null;
},
...this.renderViewMessage(),
...inheritSlots,
}}
/>
......
app_Web/src/components/layout/view-layout/view-layout.tsx
浏览文件 @ 814d3e66
......@@ -49,6 +49,9 @@ export const ViewLayout = defineComponent({
]}
>
{this.isLoading ? <i-spin size='large' fix></i-spin> : null}
<div class={this.ns.be('top', 'message')}>
{this.$scopedSlots.topMessage && this.$scopedSlots.topMessage({})}
</div>
{this.isShowHeader ? (
<div key='header' class={this.ns.b('header')}>
<div class={this.ns.b('header-content')}>
......@@ -74,7 +77,6 @@ export const ViewLayout = defineComponent({
) : null}
{this.$scopedSlots.searchForm && this.$scopedSlots.searchForm({}) && (
<div key='top' class={this.ns.b('top')}>
<div class={this.ns.be('top', 'message')}></div>
<div class={this.ns.be('top', 'search-form')}>
{this.$scopedSlots.searchForm && this.$scopedSlots.searchForm({})}
</div>
......@@ -83,15 +85,23 @@ export const ViewLayout = defineComponent({
<div key='content' class={this.ns.b('content')}>
<div class={this.ns.be('content', 'left')}></div>
<div class={this.ns.be('content', 'body')}>
<div class={this.ns.be('body', 'message')}>
{this.$scopedSlots.bodyMessage &&
this.$scopedSlots.bodyMessage({})}
</div>
{this.$scopedSlots.default && this.$scopedSlots.default({})}
</div>
<div class={this.ns.be('content', 'right')}></div>
</div>
{this.$scopedSlots.footer && (
{this.$scopedSlots.footer || this.$scopedSlots.bottomMessage ? (
<div key='footer' class={this.ns.b('footer')}>
<div class={this.ns.be('bottom', 'message')}>
{this.$scopedSlots.bottomMessage &&
this.$scopedSlots.bottomMessage({})}
</div>
{this.$scopedSlots.footer && this.$scopedSlots.footer({})}
</div>
)}
) : null}
</div>
);
},
......
app_Web/src/i-view-register.ts
浏览文件 @ 814d3e66
......@@ -46,6 +46,7 @@ import {
Badge,
Progress,
Poptip,
Alert,
} from 'view-design';
const components = [
......@@ -66,6 +67,7 @@ const components = [
Content,
Submenu,
Avatar,
Alert,
DropdownMenu,
Page,
Spin,
......
app_Web/src/util/model-util/model-util.ts
浏览文件 @ 814d3e66
......@@ -24,19 +24,48 @@ export class ModalUtil implements IModalUtil {
protected modal: ModalInstance = Vue.prototype.$Modal;
async info(params: ModalParams): Promise<void> {
this.modal.info(convertParams(params));
return new Promise(resolve => {
this.modal.info({
...convertParams(params),
onOk: () => {
resolve();
},
});
});
}
async success(params: ModalParams): Promise<void> {
this.modal.success(convertParams(params));
return new Promise(resolve => {
this.modal.success({
...convertParams(params),
onOk: () => {
resolve();
},
});
});
}
async warning(params: ModalParams): Promise<void> {
this.modal.warning(convertParams(params));
return new Promise(resolve => {
this.modal.success({
...convertParams(params),
onOk: () => {
resolve();
},
});
});
}
async error(params: ModalParams): Promise<void> {
this.modal.error(convertParams(params));
return new Promise(resolve => {
this.modal.error({
...convertParams(params),
onOk: () => {
resolve();
},
});
});
}
async confirm(params: ModalParams): Promise<boolean> {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXDMX/PSFORMS/Main.json
浏览文件 @ 814d3e66
......@@ -353,11 +353,14 @@
"name" : "formitem2",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "PICTURE",
"maxFileCount" : -1,
"maxFileSize" : -1,
"minFileCount" : 0,
"name" : "formitem2"
"editorParams" : {
"PICKUPVIEW" : "TRUE"
},
"editorType" : "LISTBOXPICKUP",
"name" : "formitem2",
"enableAC" : false,
"forceSelection" : true,
"showTrigger" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXDMXEditView.json
浏览文件 @ 814d3e66
......@@ -631,11 +631,14 @@
"name" : "formitem2",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "PICTURE",
"maxFileCount" : -1,
"maxFileSize" : -1,
"minFileCount" : 0,
"name" : "formitem2"
"editorParams" : {
"PICKUPVIEW" : "TRUE"
},
"editorType" : "LISTBOXPICKUP",
"name" : "formitem2",
"enableAC" : false,
"forceSelection" : true,
"showTrigger" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 814d3e66
......@@ -9366,10 +9366,10 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-常规信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-错误信息",
......@@ -9378,10 +9378,10 @@
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-警告信息",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg4"
}
} ]
}, {
......@@ -9398,40 +9398,45 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-弹出",
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg10"
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图上方",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-错误信息",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
......@@ -9440,53 +9445,42 @@
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-常规信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg11"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9498,21 +9492,27 @@
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-实体数据集",
"name" : "动态模式-静态内容",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg14"
"id" : "ViewMsg15"
}
}, {
"name" : "动态模式-静态内容",
"name" : "动态模式-实体数据集",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg15"
"id" : "ViewMsg14"
}
} ]
} ],
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或