Skip to content

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

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

上级 0ad5c750
隐藏空白字符变更
内嵌 并排
正在显示 包含 84 行增加 和 59 行删除
app_Web/package.json
浏览文件 @ 40946ea4
......@@ -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.94",
"@ibiz-template/core": "^0.0.1-beta.94",
"@ibiz-template/model": "^0.0.1-beta.94",
"@ibiz-template/runtime": "^0.0.1-beta.94",
"@ibiz-template/service": "^0.0.1-beta.94",
"@ibiz-template/theme": "^0.0.1-beta.94",
"@ibiz-template/vue-util": "^0.0.1-beta.94",
"@ibiz-template/controller": "^0.0.1-beta.95",
"@ibiz-template/core": "^0.0.1-beta.95",
"@ibiz-template/model": "^0.0.1-beta.95",
"@ibiz-template/runtime": "^0.0.1-beta.95",
"@ibiz-template/service": "^0.0.1-beta.95",
"@ibiz-template/theme": "^0.0.1-beta.95",
"@ibiz-template/vue-util": "^0.0.1-beta.95",
"@ibiz/dynamic-model-api": "^2.1.24",
"@riophae/vue-treeselect": "^0.4.0",
"dayjs": "^1.11.7",
......
app_Web/pnpm-lock.yaml
浏览文件 @ 40946ea4
......@@ -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.94
version: 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/runtime@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
specifier: ^0.0.1-beta.95
version: 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/runtime@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core':
specifier: ^0.0.1-beta.94
version: 0.0.1-beta.94(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.95
version: 0.0.1-beta.95(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model':
specifier: ^0.0.1-beta.94
version: 0.0.1-beta.94(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
specifier: ^0.0.1-beta.95
version: 0.0.1-beta.95(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime':
specifier: ^0.0.1-beta.94
version: 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(qx-util@0.4.8)
specifier: ^0.0.1-beta.95
version: 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(qx-util@0.4.8)
'@ibiz-template/service':
specifier: ^0.0.1-beta.94
version: 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(qx-util@0.4.8)(ramda@0.28.0)
specifier: ^0.0.1-beta.95
version: 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/theme':
specifier: ^0.0.1-beta.94
version: 0.0.1-beta.94
specifier: ^0.0.1-beta.95
version: 0.0.1-beta.95
'@ibiz-template/vue-util':
specifier: ^0.0.1-beta.94
version: 0.0.1-beta.94(@ibiz-template/controller@0.0.1-beta.94)(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(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.95
version: 0.0.1-beta.95(@ibiz-template/controller@0.0.1-beta.95)(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(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.24
version: 2.1.24(qx-util@0.4.8)
......@@ -939,8 +939,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/controller@0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/runtime@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-xmjl0WE2mhRVC3u9i6ss/jAJ2T2K0dxRJv67fNoWLP6T+suCm1kgHp+YyFEyJHBCfusJjikqK5zZ4nrM0JO+1g==}
/@ibiz-template/controller@0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/runtime@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
resolution: {integrity: sha512-ayKN4S9IIQTrciIoSo/yWmWMV8wEh4s0Va3dnC4+C5kenqE7b3Gmy2YVZzyA6ZvO8hR9IhNZUGsEl/5deVYqyg==}
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.94(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.94(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.95(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.95(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/runtime': 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(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.94(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-WJywXdjfjKBwr2dSz+HsrMQiTV9Np7xRg//xM1m/qnJ1KWwkDkk7GHi/not4ZwS3mKx6hYUMvzG1zvQVHQZoDw==}
/@ibiz-template/core@0.0.1-beta.95(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-/lmB8fRUEyOv7AHTUdqiUMPzl8heHMHEiyLJYNyCyqIiGDMjovQXd30O1IdEq2ebHLifzYoWfOdd/2iI0baZSw==}
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.94(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-6JJL+ILLK7xEwUfBdKoxZv0FsQKoFJri7vg05wZYQjHbDM88e/GjUi9oSck7DTI+uSKaUWgUxs0F8PMQfQB1Ug==}
/@ibiz-template/model@0.0.1-beta.95(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8):
resolution: {integrity: sha512-/uiyYekWjXljwsj4C+CEl4iwEd7WLDX3VyVo9GLLW0qgcuYb/soSZxU85hZhcmvIQBVE2eGNYk8sih8v7nWlYA==}
peerDependencies:
'@ibiz/dynamic-model-api': ^2.1.24
lodash-es: ^4.17.21
......@@ -992,8 +992,8 @@ packages:
qx-util: 0.4.8
dev: false
/@ibiz-template/runtime@0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(qx-util@0.4.8):
resolution: {integrity: sha512-yBEjjEzkQNZ3t3kq7IPG5OSyPuafctgBYc9Oo9NjM09wopZg7m8MAmn8M6EUp1VWa3VSnVajgBvf6jLdn9Dhww==}
/@ibiz-template/runtime@0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(qx-util@0.4.8):
resolution: {integrity: sha512-lr3JjBFi3nH153UMiMYgHjQP+DidhXlHlMxqKb6mz7vjuniGYQV1Rlg6MJDZC3TTUX504qZQ9r9y4HrFy6xKHQ==}
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.94(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.94(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/core': 0.0.1-beta.95(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.95(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(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.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-TqtgvSHWICt32TD2tJ96tCSdkuPU8HuOrfdF0ymR211UeBBedAOHpyFGiWv9NSsOSuahkAkZUgeQjB1+BCejGw==}
/@ibiz-template/service@0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(qx-util@0.4.8)(ramda@0.28.0):
resolution: {integrity: sha512-I5ULWcTZIq9IMRON/kFS8Poj4lgWDCZRZGfsJ00FDvg7bsIQN/LLN4gtxQCxUtJJyiTx6UahaLHFl3cMPGvKsQ==}
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.94(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.94(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.95(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.95(@ibiz/dynamic-model-api@2.1.24)(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.94:
resolution: {integrity: sha512-8FaVFoHYc0nQYNDZNi0I5We5vKdKmE6oe1XuYbMnX+RrD5XduzRlZsXaE834EuHT1SLFJWjgck/TQAfa/5EPrg==}
/@ibiz-template/theme@0.0.1-beta.95:
resolution: {integrity: sha512-4x/NDwqaLYOMlheeAeCS8y40wka9uK+9TNCG3PlrCs6ODFabhMgfxPOayoMLG0Ye9JUEAjSDQtOxKeDOe1Eq4A==}
dev: false
/@ibiz-template/vue-util@0.0.1-beta.94(@ibiz-template/controller@0.0.1-beta.94)(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(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-fknClbp/BJ8JnnUJx7wZmrG66A/T4dD+gU6t0paAVjDTI5mAjivM+8GYGyGZUnlU6pOhng9JTIGEA3khZWKcDw==}
/@ibiz-template/vue-util@0.0.1-beta.95(@ibiz-template/controller@0.0.1-beta.95)(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(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-YAAgu50mtnCAPvqEsasNGNf60HX92CbxoxrTOgXS0qqdnX4ROQZAvD3nPK0VNkU+HtJTnoD0VqirteaPrhDc6A==}
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.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(@ibiz-template/runtime@0.0.1-beta.94)(@ibiz-template/service@0.0.1-beta.94)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.94(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.94(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.94(@ibiz-template/core@0.0.1-beta.94)(@ibiz-template/model@0.0.1-beta.94)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/controller': 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(@ibiz-template/runtime@0.0.1-beta.95)(@ibiz-template/service@0.0.1-beta.95)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
'@ibiz-template/core': 0.0.1-beta.95(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
'@ibiz-template/model': 0.0.1-beta.95(@ibiz/dynamic-model-api@2.1.24)(lodash-es@4.17.21)(qx-util@0.4.8)
'@ibiz-template/service': 0.0.1-beta.95(@ibiz-template/core@0.0.1-beta.95)(@ibiz-template/model@0.0.1-beta.95)(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/components/editor/text-box/ibiz-input-number/ibiz-input-number.tsx
浏览文件 @ 40946ea4
......@@ -15,14 +15,14 @@ export const IBizInputNumber = defineComponent({
const c = props.controller;
const currentVal = ref<number | null>(null);
const currentVal = ref<number | null | string>('');
watch(
() => props.value,
(newVal, oldVal) => {
if (newVal !== oldVal) {
const number = Number(newVal);
currentVal.value = Number.isNaN(number) ? 0 : number;
currentVal.value = Number.isNaN(number) ? '' : number;
}
},
{ immediate: true },
......
app_Web/src/views/index-view/index-view-exp.ts
浏览文件 @ 40946ea4
......@@ -84,7 +84,12 @@ export function useIndexExpRouteManage(
item => item.key === currentKey.value,
);
if (find) {
find.fullPath = route.fullPath;
if (route.matched.length === 2) {
// 如果有缓存，并且现在matched为2说明少了参数，这样直接Push原来的路径即可
router.push(find.fullPath);
} else {
find.fullPath = route.fullPath;
}
} else {
// 全关闭后到首页只显示空白不需要加入到routeMsgs里
if (newVal === indexPath.value) {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 40946ea4
......@@ -1238,16 +1238,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/RawMaterial/PSFORMS/Main.json
浏览文件 @ 40946ea4
......@@ -336,6 +336,10 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSSysImage" : {
"glyph" : "xf04b@FontAwesome",
"cssClass" : "fa fa-play"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "启动流程",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSFORMS/Main.json
浏览文件 @ 40946ea4
......@@ -1965,6 +1965,10 @@
"width" : 100,
"widthMode" : "PX"
},
"getPSSysImage" : {
"glyph" : "xf021@FontAwesome",
"cssClass" : "fa fa-refresh"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "刷新",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/RawMaterialEditView.json
浏览文件 @ 40946ea4
......@@ -1032,6 +1032,10 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSSysImage" : {
"glyph" : "xf04b@FontAwesome",
"cssClass" : "fa fa-play"
},
"getPSUIAction" : {
"getCapPSLanguageRes" : {
"defaultContent" : "启动流程",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView.json
浏览文件 @ 40946ea4
......@@ -2662,6 +2662,10 @@
"width" : 100,
"widthMode" : "PX"
},
"getPSSysImage" : {
"glyph" : "xf021@FontAwesome",
"cssClass" : "fa fa-refresh"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "刷新",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView2.json
浏览文件 @ 40946ea4
......@@ -2660,6 +2660,10 @@
"width" : 100,
"widthMode" : "PX"
},
"getPSSysImage" : {
"glyph" : "xf021@FontAwesome",
"cssClass" : "fa fa-refresh"
},
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"caption" : "刷新",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 40946ea4
......@@ -2784,16 +2784,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
} ],
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或