Skip to content

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

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

上级 69ee7db8
显示空白字符变更
内嵌 并排
正在显示 包含 301 行增加 和 88 行删除
app_Web/package.json
浏览文件 @ 357d9de2
...@@ -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.128", "@ibiz-template/controller": "^0.0.1-beta.129",
"@ibiz-template/core": "^0.0.1-beta.128", "@ibiz-template/core": "^0.0.1-beta.129",
"@ibiz-template/model": "^0.0.1-beta.128", "@ibiz-template/model": "^0.0.1-beta.129",
"@ibiz-template/runtime": "^0.0.1-beta.128", "@ibiz-template/runtime": "^0.0.1-beta.129",
"@ibiz-template/service": "^0.0.1-beta.128", "@ibiz-template/service": "^0.0.1-beta.129",
"@ibiz-template/theme": "^0.0.1-beta.128", "@ibiz-template/theme": "^0.0.1-beta.129",
"@ibiz-template/vue-util": "^0.0.1-beta.128", "@ibiz-template/vue-util": "^0.0.1-beta.129",
"@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
浏览文件 @ 357d9de2
...@@ -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.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/runtime@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8) version: 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/runtime@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(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.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) version: 0.0.1-beta.129(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.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) version: 0.0.1-beta.129(@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.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(qx-util@0.4.8) version: 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(qx-util@0.4.8)
'@ibiz-template/service': '@ibiz-template/service':
specifier: ^0.0.1-beta.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(qx-util@0.4.8)(ramda@0.28.0) version: 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme': '@ibiz-template/theme':
specifier: ^0.0.1-beta.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128 version: 0.0.1-beta.129
'@ibiz-template/vue-util': '@ibiz-template/vue-util':
specifier: ^0.0.1-beta.128 specifier: ^0.0.1-beta.129
version: 0.0.1-beta.128(@ibiz-template/controller@0.0.1-beta.128)(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(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.129(@ibiz-template/controller@0.0.1-beta.129)(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(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.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/runtime@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8): /@ibiz-template/controller@0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/runtime@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-uK7c5MfQ7HMUIHypAlqn/okfTV81iVVs51xjxleWMJexHdr5jOdaeznJivpP8U9UjhBS1lxja+7kzJ8KEunNdA==} resolution: {integrity: sha512-D+Tdcrrn/ZFbOAOKwyPoe6IKC3n6YgcagFWmRsYAtcmHhDWbY5jaTb53BMDwqCq+AjkKsMY9fYS0kOgeORVEhA==}
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.128(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.129(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.128(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.129(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(qx-util@0.4.8) '@ibiz-template/runtime': 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/service': 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(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.128(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0): /@ibiz-template/core@0.0.1-beta.129(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-VTuizfi/ck1SEiWuilj4L9Wl6njnT1EV95hgKVnIrE53VO/rEJFaTK3M1mq0vI69UBrdNESG7ClHfduQiwQ/WQ==} resolution: {integrity: sha512-Y+bFzqpUfwWTujnbdkE8a98qOUwr4vpwufcbEt0i57VpFDej9jc5cwmIp49/aa9RE0pxgh6yeHgvhSAK36PtcA==}
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.128(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8): /@ibiz-template/model@0.0.1-beta.129(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-YyO1/vCyUiUg+oPDltSmuVknpwTZ2Pv1cTfwlkKIYDXpv1dYzCJ0hb+910nKfS/6p6pm2JrfXlwLp9jyHFQBig==} resolution: {integrity: sha512-Uh82aBrIRSOqD9+qFpucakqZdjioR9XKpD6li1x2k2ZKlGPXztLU1Q7+wIVbEZgUmzWPRKS0KEFLZairbsYv5w==}
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.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(qx-util@0.4.8): /@ibiz-template/runtime@0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(qx-util@0.4.8):
resolution: {integrity: sha512-mukS6CXV/RvQZg4oYyRkyp9qp+LA+Ce8gUAdPlr3aJS/KWDltQNiSpXr07wxgTXs2Ph6LXztp6VGWWtfYdHgRg==} resolution: {integrity: sha512-2C+faaBVtaIlu7YBrS+IYNWpEseIPos/R2GTl7r6oPBR5sMgZjOFiQub1YL//09cEEhYhReDt9yWUpwyru65Yw==}
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.128(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.129(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.128(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.129(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/service': 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(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.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(qx-util@0.4.8)(ramda@0.28.0): /@ibiz-template/service@0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-xjPqQ0cq5Hc+pHLDlGQhw96jG699Wvg02L818b/cA+/42cLKIVjsRJAdGK//iPGSAqmrZmcc77gXMVOlmUQuEg==} resolution: {integrity: sha512-fpT9V36kGF6UMddPvxEiGeeJ0jNmkEot0+lQXoGsQe85IdFkiB/MsGpSAjK2rwnMgPAqPrEPsTMoZ0gVTUEf1g==}
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.128(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.129(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.128(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.129(@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.128: /@ibiz-template/theme@0.0.1-beta.129:
resolution: {integrity: sha512-3ZEBw0TO/7xO2UNQyR3Fw0hfERJzHTcH9sLQDv8rv4LNI1mRP3xfilv4UVBbj1xKb1VXmjYwE18j7R54Ii6Z/g==} resolution: {integrity: sha512-Y9irFfIdHeWdxAmsffOqV4JXMPFHPGq5/mtTSD/g/wCKWal/voEoTUwgeJeHv89CVWGsPrjdbuabJSVGFbPRtQ==}
dev: false dev: false
/@ibiz-template/vue-util@0.0.1-beta.128(@ibiz-template/controller@0.0.1-beta.128)(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(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.129(@ibiz-template/controller@0.0.1-beta.129)(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(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-cexyura4gSpJjI2Bg/lDD7IV2lztSPWyI/g7NdW8kXyiP3dHF3b3MNxxQ/0qVdCMLPlYpOBbhm1yt/8NzX33Kw==} resolution: {integrity: sha512-rkzvwag6OyV+bzGD4Od3k6ziKrIrF5SvBGi7OZPq7mc+XgZMg8TPADn+Ruv0HE4r3EULsCv/OBRYt3bCCLERpw==}
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.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(@ibiz-template/runtime@0.0.1-beta.128)(@ibiz-template/service@0.0.1-beta.128)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8) '@ibiz-template/controller': 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(@ibiz-template/runtime@0.0.1-beta.129)(@ibiz-template/service@0.0.1-beta.129)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.128(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/core': 0.0.1-beta.129(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.128(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8) '@ibiz-template/model': 0.0.1-beta.129(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.128(@ibiz-template/core@0.0.1-beta.128)(@ibiz-template/model@0.0.1-beta.128)(qx-util@0.4.8)(ramda@0.28.0) '@ibiz-template/service': 0.0.1-beta.129(@ibiz-template/core@0.0.1-beta.129)(@ibiz-template/model@0.0.1-beta.129)(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/app-register.ts
浏览文件 @ 357d9de2
...@@ -97,6 +97,7 @@ import { ...@@ -97,6 +97,7 @@ import {
IBizPickerLink, IBizPickerLink,
IBizCheckbox, IBizCheckbox,
IBizDatePicker, IBizDatePicker,
IBizDateRange,
IBizDropdown, IBizDropdown,
IBizFileUpload, IBizFileUpload,
IBizInput, IBizInput,
...@@ -213,6 +214,7 @@ export const AppRegister = { ...@@ -213,6 +214,7 @@ export const AppRegister = {
v.component('IBizCheckbox', IBizCheckbox); v.component('IBizCheckbox', IBizCheckbox);
v.component('IBizRadio', IBizRadio); v.component('IBizRadio', IBizRadio);
v.component('IBizDatePicker', IBizDatePicker); v.component('IBizDatePicker', IBizDatePicker);
v.component('IBizDateRange', IBizDateRange);
v.component('IBizDropdown', IBizDropdown); v.component('IBizDropdown', IBizDropdown);
v.component('IBizPicker', IBizPicker); v.component('IBizPicker', IBizPicker);
v.component('IBizPickerDropDown', IBizPickerDropDown); v.component('IBizPickerDropDown', IBizPickerDropDown);
......
app_Web/src/components/common/extend-action-timeline/extend-action-timeline.tsx
浏览文件 @ 357d9de2
...@@ -250,9 +250,11 @@ export const ExtendActionTimeLine = defineComponent({ ...@@ -250,9 +250,11 @@ export const ExtendActionTimeLine = defineComponent({
</div> </div>
<div class={ns.be('task', 'bottom')}> <div class={ns.be('task', 'bottom')}>
<div class={ns.be('task', 'full-message')}> <div class={ns.be('task', 'full-message')}>
{task.fullMessage {task.fullMessage ? (
? `审批意见： ${task.fullMessage}` `审批意见： ${task.fullMessage}`
: task.fullMessage} ) : (
<div>&nbsp;</div>
)}
</div> </div>
</div> </div>
{task.tasks && task.tasks.length >= 1 && ( {task.tasks && task.tasks.length >= 1 && (
......
app_Web/src/components/editor/date-range/ibiz-date-range/ibiz-date-range.tsx 0 → 100644
浏览文件 @ 357d9de2
import { ref, watch, defineComponent, Ref, computed } from 'vue';
import {
getDatePickerProps,
getEditorEmits,
useNamespace,
} from '@ibiz-template/vue-util';
import '@ibiz-template/theme/style/components/editor/ibiz-date-range/ibiz-date-range.scss';
export const IBizDateRange = defineComponent({
name: 'IBizDateRange',
props: getDatePickerProps(),
emits: getEditorEmits(),
setup(props, { emit }) {
const ns = useNamespace('date-range');
const c = props.controller;
const editorModel = c!.model;
// 类型
const type = ref('daterange');
switch (editorModel.editorType) {
case 'DATERANGE':
type.value = 'datetimerange';
break;
case 'DATERANGE_NOTIME':
type.value = 'daterange';
break;
default:
type.value = 'datetimerange';
}
// 格式
const format = ref('yyyy-MM-dd');
// 值格式化
const valueFormat = c!.valueFormat;
if (valueFormat) {
// 根据值格式化改变type
if (valueFormat === 'YYYY-MM') {
type.value = 'month';
} else if (valueFormat === 'YYYY') {
type.value = 'year';
}
const tempFormat: string = valueFormat
.replace('YYYY', 'yyyy')
.replace('DD', 'dd');
format.value = tempFormat;
}
// 值分割符
let valueSeparator = ',';
// 在范围选择器里取消两个日期面板之间的联动
let unlinkPanels = false;
// 选择范围时的分隔符
let rangeSeparator = '至';
if (editorModel.editorParams) {
if (editorModel.editorParams.valueSeparator) {
valueSeparator = editorModel.editorParams.valueSeparator;
}
if (editorModel.editorParams.rangeSeparator) {
rangeSeparator = editorModel.editorParams.rangeSeparator;
}
if (editorModel.editorParams.unlinkPanels) {
unlinkPanels = Object.is('true', editorModel.editorParams.unlinkPanels);
}
}
// 关系表单项集合
const refFormItem: Ref<string[]> = ref([]);
const editorItems = editorModel.source.getPSEditorItems();
if (editorItems && editorItems.length > 0) {
const editorItemNames: string[] = editorItems.map(
(item: IData) => item.id,
);
refFormItem.value = editorItemNames;
}
const curValue = computed({
get() {
let value: string[] = [];
if (refFormItem.value.length > 0) {
refFormItem.value.forEach((name: string) => {
if (props.data[name]) {
value.push(props.data[name]);
}
});
} else if (props.value && typeof props.value === 'string') {
value = props.value.split(valueSeparator);
}
return value;
},
set(dates: string[]) {
if (dates && dates.length > 0) {
emit('change', dates.join(valueSeparator));
if (refFormItem.value.length > 0) {
dates.forEach((date: string, index: number) => {
emit('change', date, refFormItem.value[index]);
});
}
} else {
emit('change', null);
if (refFormItem.value.length > 0) {
refFormItem.value.forEach((date: string, index: number) => {
emit('change', null, refFormItem.value[index]);
});
}
}
},
});
// 处理值变更
const handleChange = (dates: string[], _dateType: IData) => {
curValue.value = dates;
};
const onOpenChange = (isOpen: boolean) => {
emit('operate', isOpen);
};
const inputRef = ref();
if (props.autoFocus) {
watch(inputRef, newVal => {
if (newVal) {
const input = newVal.$el.getElementsByTagName('input')[0];
input.click();
}
});
}
return {
ns,
c,
editorModel,
type,
format,
handleChange,
onOpenChange,
inputRef,
rangeSeparator,
curValue,
unlinkPanels,
};
},
render() {
return (
<div
class={[
this.ns.b(),
this.disabled ? this.ns.m('disabled') : '',
this.readonly ? this.ns.m('readonly') : '',
]}
>
<i-date-picker
ref='inputRef'
value={this.curValue}
transfer
type={this.type}
format={this.format}
placeholder={this.c!.placeHolder}
disabled={this.disabled}
readonly={this.readonly}
separator={this.rangeSeparator}
split-panels={this.unlinkPanels}
on-on-open-change={this.onOpenChange} // 弹出日历和关闭日历时触发
on-on-change={this.handleChange} // 日期发生变化时触发
></i-date-picker>
</div>
);
},
});
app_Web/src/components/editor/date-range/index.ts 0 → 100644
浏览文件 @ 357d9de2
export { IBizDateRange } from './ibiz-date-range/ibiz-date-range';
app_Web/src/components/editor/index.ts
浏览文件 @ 357d9de2
...@@ -7,4 +7,5 @@ export * from './date-picker'; ...@@ -7,4 +7,5 @@ export * from './date-picker';
export * from './dropdown-list'; export * from './dropdown-list';
export * from './data-picker'; export * from './data-picker';
export * from './upload'; export * from './upload';
export * from './date-range';
export { NotSupportedEditor } from './not-supported-editor/not-supported-editor'; export { NotSupportedEditor } from './not-supported-editor/not-supported-editor';
app_Web/src/i-view-register.ts
浏览文件 @ 357d9de2
...@@ -113,5 +113,6 @@ export const IViewRegister = { ...@@ -113,5 +113,6 @@ export const IViewRegister = {
} }
}); });
v.component('ITimePicker', TimePicker); v.component('ITimePicker', TimePicker);
v.component('IDatePicker', DatePicker);
}, },
}; };
app_Web/src/provider/editor/date-range-provider.ts 0 → 100644
浏览文件 @ 357d9de2
import { DatePickerEditorModel } from '@ibiz-template/model';
import {
DateRangeEditorController,
FormItemController,
GridEditItemController,
IEditorProvider,
} from '@ibiz-template/controller';
/**
* 日期范围选择器编辑器适配器
*
* @author lxm
* @date 2022-09-19 22:09:03
* @export
* @class DatePickerEditorProvider
* @implements {EditorProvider}
*/
export class DateRangeEditorProvider implements IEditorProvider {
formEditor: string = 'IBizDateRange';
gridEditor: string = 'IBizGridDateRange';
async createController(
editorModel: DatePickerEditorModel,
parentController: FormItemController | GridEditItemController,
): Promise<DateRangeEditorController> {
const c = new DateRangeEditorController(editorModel, parentController);
await c.init();
return c;
}
}
app_Web/src/provider/editor/index.ts
浏览文件 @ 357d9de2
...@@ -6,6 +6,7 @@ import { DropDownListEditorProvider } from './drop-down-list-provider'; ...@@ -6,6 +6,7 @@ import { DropDownListEditorProvider } from './drop-down-list-provider';
import { DatePickerEditorProvider } from './date-picker-provider'; import { DatePickerEditorProvider } from './date-picker-provider';
import { FileUploaderEditorProvider } from './file-uploader-provider'; import { FileUploaderEditorProvider } from './file-uploader-provider';
import { DataPickerEditorProvider } from './data-picker-provider'; import { DataPickerEditorProvider } from './data-picker-provider';
import { DateRangeEditorProvider } from './date-range-provider';
/** /**
* 预置默认的编辑器适配器 * 预置默认的编辑器适配器
...@@ -54,6 +55,10 @@ export function presetEditorProvider(): void { ...@@ -54,6 +55,10 @@ export function presetEditorProvider(): void {
editorRegister.register('DATEPICKEREX_NODAY', datePickerProvider); editorRegister.register('DATEPICKEREX_NODAY', datePickerProvider);
editorRegister.register('DATEPICKEREX_NODAY_NOSECOND', datePickerProvider); editorRegister.register('DATEPICKEREX_NODAY_NOSECOND', datePickerProvider);
// 日期范围选择器
const dateRangeEditorProvider = new DateRangeEditorProvider();
editorRegister.register('DATERANGE', dateRangeEditorProvider);
// 文件上传 // 文件上传
editorRegister.register( editorRegister.register(
'FILEUPLOADER', 'FILEUPLOADER',
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 357d9de2
...@@ -1432,16 +1432,16 @@ ...@@ -1432,16 +1432,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
}, { }, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 357d9de2
...@@ -11189,16 +11189,16 @@ ...@@ -11189,16 +11189,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
}, { }, {
...@@ -11259,6 +11259,12 @@ ...@@ -11259,6 +11259,12 @@
"codeName" : "VMGroup4", "codeName" : "VMGroup4",
"name" : "视图消息位置测试", "name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图上方", "name" : "消息位置-视图上方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -11276,34 +11282,21 @@ ...@@ -11276,34 +11282,21 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg10" "id" : "ViewMsg10"
} }
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息", "name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg8"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-常规信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg6" "id" : "ViewMsg4"
}, },
"position" : "POPUP" "position" : "POPUP"
}, { }, {
...@@ -11313,17 +11306,17 @@ ...@@ -11313,17 +11306,17 @@
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
}, { }, {
"name" : "消息类型-常规信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg4" "id" : "ViewMsg5"
}, },
"position" : "POPUP" "position" : "POPUP"
}, { }, {
"name" : "消息位置-视图下方", "name" : "消息位置-视图内容区",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg8" "id" : "ViewMsg9"
} }
}, { }, {
"name" : "关闭模式-默认删除-上方-错误", "name" : "关闭模式-默认删除-上方-错误",
...@@ -11332,22 +11325,23 @@ ...@@ -11332,22 +11325,23 @@
"id" : "ViewMsg12" "id" : "ViewMsg12"
} }
}, { }, {
"name" : "消息位置-视图内容区", "name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg9" "id" : "ViewMsg13"
} }
}, {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
"name" : "视图消息关闭模式", "name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除", "name" : "关闭模式-默认删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
...@@ -11359,6 +11353,12 @@ ...@@ -11359,6 +11353,12 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg13"
} }
}, {
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup6", "codeName" : "VMGroup6",
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或