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

3df10018 · ibizdev · 7a4b6878 · 3df10018 · 3df10018 · 3df10018
--- a/app_Web/package.json
+++ b/app_Web/package.json
@@ -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.116",
-    "@ibiz-template/core": "^0.0.1-beta.116",
-    "@ibiz-template/model": "^0.0.1-beta.116",
-    "@ibiz-template/runtime": "^0.0.1-beta.116",
-    "@ibiz-template/service": "^0.0.1-beta.116",
-    "@ibiz-template/theme": "^0.0.1-beta.116",
-    "@ibiz-template/vue-util": "^0.0.1-beta.116",
+    "@ibiz-template/controller": "^0.0.1-beta.117",
+    "@ibiz-template/core": "^0.0.1-beta.117",
+    "@ibiz-template/model": "^0.0.1-beta.117",
+    "@ibiz-template/runtime": "^0.0.1-beta.117",
+    "@ibiz-template/service": "^0.0.1-beta.117",
+    "@ibiz-template/theme": "^0.0.1-beta.117",
+    "@ibiz-template/vue-util": "^0.0.1-beta.117",
    "@ibiz/dynamic-model-api": "^2.1.28",
    "@riophae/vue-treeselect": "^0.4.0",
    "dayjs": "^1.11.7",

--- a/app_Web/pnpm-lock.yaml
+++ b/app_Web/pnpm-lock.yaml
@@ -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.116
-    version: 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/runtime@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
+    specifier: ^0.0.1-beta.117
+    version: 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/runtime@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
  '@ibiz-template/core':
-    specifier: ^0.0.1-beta.116
-    version: 0.0.1-beta.116(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
+    specifier: ^0.0.1-beta.117
+    version: 0.0.1-beta.117(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
  '@ibiz-template/model':
-    specifier: ^0.0.1-beta.116
-    version: 0.0.1-beta.116(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
+    specifier: ^0.0.1-beta.117
+    version: 0.0.1-beta.117(@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.116
-    version: 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(qx-util@0.4.8)
+    specifier: ^0.0.1-beta.117
+    version: 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(qx-util@0.4.8)
  '@ibiz-template/service':
-    specifier: ^0.0.1-beta.116
-    version: 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(qx-util@0.4.8)(ramda@0.28.0)
+    specifier: ^0.0.1-beta.117
+    version: 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(qx-util@0.4.8)(ramda@0.28.0)
  '@ibiz-template/theme':
-    specifier: ^0.0.1-beta.116
-    version: 0.0.1-beta.116
+    specifier: ^0.0.1-beta.117
+    version: 0.0.1-beta.117
  '@ibiz-template/vue-util':
-    specifier: ^0.0.1-beta.116
-    version: 0.0.1-beta.116(@ibiz-template/controller@0.0.1-beta.116)(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(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.117
+    version: 0.0.1-beta.117(@ibiz-template/controller@0.0.1-beta.117)(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(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.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/runtime@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
-    resolution: {integrity: sha512-OB1Y31bqgCAIAZy0xZp6HVuMvKHVxwh0AHZYFNyrE3P6C8qmH8L4gm5wXsXD4id2UxwociB4wYtufn60hEi1IQ==}
+  /@ibiz-template/controller@0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/runtime@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
+    resolution: {integrity: sha512-Mv9uuiawgXK5QsaPIF8qHu9W324TL3O4XnpnBCsEW4td82ghYj8iyBLNqnZsGT+MlPH+8ADWq+5QSlqk5SNJJw==}
    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.116(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.116(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
-      '@ibiz-template/runtime': 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(qx-util@0.4.8)
-      '@ibiz-template/service': 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/core': 0.0.1-beta.117(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/model': 0.0.1-beta.117(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/runtime': 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(qx-util@0.4.8)
+      '@ibiz-template/service': 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(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.116(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
-    resolution: {integrity: sha512-mhiQqBgTl9OjXt9Vogg0y4sSchoOp4Bt4pgi54gMbF9RVuJ2WfE2oS9yTAODDFpyQlDDqd9Rq1COc7VAb6gXrQ==}
+  /@ibiz-template/core@0.0.1-beta.117(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0):
+    resolution: {integrity: sha512-XZJ1qC5cC1/u+ZbXC39JFr2FEHMJAxsVmFBNaHo9/t6Yk/04lKEJNPBeF7NwP1FpbIn4DWHPVnpgTaV9R9CpTw==}
    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.116(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
-    resolution: {integrity: sha512-dl0YxZACmzc1hzz2kycB/vkyj5lbJxIxGKn3NRkRgJPwPwlD6uDQFDqeIAREroD4gnxZArGipl8b7FNeeruOrg==}
+  /@ibiz-template/model@0.0.1-beta.117(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
+    resolution: {integrity: sha512-GUUJ66YxDP9dDHN6nVgGP/sEOpuxAoBXS0II7lzbAqYzZPQk1YRDCoI46T2JpbMqTXw9VNbZJCpJOG/O7DvPag==}
    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.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(qx-util@0.4.8):
-    resolution: {integrity: sha512-t8IAHymsxUyzufxs+iMJRIAVZ/crfQlws2vug//cMnIv0DUOmhh0ENv2FBtsdS8zwm7l2UgYzzVpIsLCOGPiAA==}
+  /@ibiz-template/runtime@0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(qx-util@0.4.8):
+    resolution: {integrity: sha512-jY2khYbuucCZ6nX+IiI/Eu4kejSehPntfEL8QSrvA2Yoely54o/USQAamn5s4Y4Pz4q7VkOx3LI0LWJQN7Mqdg==}
    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.116(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.116(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
-      '@ibiz-template/service': 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/core': 0.0.1-beta.117(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/model': 0.0.1-beta.117(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/service': 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(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.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(qx-util@0.4.8)(ramda@0.28.0):
-    resolution: {integrity: sha512-psuniUSKfl2JMlO17eqmRLk4Hh/PuSjEbT5V4vRWQweo3mswcnSyubdD35XhniWjPyaOXMg4+CKAP80QbH5HzA==}
+  /@ibiz-template/service@0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(qx-util@0.4.8)(ramda@0.28.0):
+    resolution: {integrity: sha512-Tek9btkBCkw/X9l45rToVmf+Mxf3jWysJN+AXVny5kRZfeGOluMiJoxOcr6ErE0VvLOMk5BNiyLlncqh4LWt9w==}
    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.116(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.116(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/core': 0.0.1-beta.117(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/model': 0.0.1-beta.117(@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.116:
-    resolution: {integrity: sha512-83GvMBlCtZoxQhW7UZLA57vW+73qlGI9e9KEmqK61nZiVt/Pu5sYQH09ojkDz9E7/zZRKZ3YUYS3k+QulOgdvg==}
+  /@ibiz-template/theme@0.0.1-beta.117:
+    resolution: {integrity: sha512-OYu8+VB1O6wA0uJ16knBPRn5c6IfAgNzMgEPwSyDGLWf9cWfygPfJQ1dKT6h8j7f8qS2docb2fG23Jxuxq4LWg==}
    dev: false

-  /@ibiz-template/vue-util@0.0.1-beta.116(@ibiz-template/controller@0.0.1-beta.116)(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(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-iapEKwWKrsqNziamMT9WYAGnkr/AI8RbXrd+UmlLkkuIDUp0I7COzwjwVecFobyUBQFCiXthgrFcORmlu4gtfA==}
+  /@ibiz-template/vue-util@0.0.1-beta.117(@ibiz-template/controller@0.0.1-beta.117)(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(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-vDIaC1Sb/HeWZaECJOXU/PKM3TFzdVOCOwNhdLnSa+5aXwc8pQcCNefOu8qL6fescOOdkMclsDp0Lg5jXyVtKA==}
    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.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(@ibiz-template/runtime@0.0.1-beta.116)(@ibiz-template/service@0.0.1-beta.116)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
-      '@ibiz-template/core': 0.0.1-beta.116(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.116(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
-      '@ibiz-template/service': 0.0.1-beta.116(@ibiz-template/core@0.0.1-beta.116)(@ibiz-template/model@0.0.1-beta.116)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/controller': 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(@ibiz-template/runtime@0.0.1-beta.117)(@ibiz-template/service@0.0.1-beta.117)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
+      '@ibiz-template/core': 0.0.1-beta.117(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/model': 0.0.1-beta.117(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/service': 0.0.1-beta.117(@ibiz-template/core@0.0.1-beta.117)(@ibiz-template/model@0.0.1-beta.117)(qx-util@0.4.8)(ramda@0.28.0)
      qs: 6.11.1
      qx-util: 0.4.8
      ramda: 0.28.0

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -9691,12 +9691,6 @@
    "codeName" : "VMGroup3",
    "name" : "视图消息类型测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -9708,6 +9702,12 @@
        "modelref" : true,
        "id" : "ViewMsg5"
      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
    } ]
  }, {
    "codeName" : "VMGroup7",
@@ -9723,16 +9723,16 @@
    "codeName" : "VMGroup4",
    "name" : "视图消息位置测试",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
      }
    }, {
      "name" : "消息位置-视图内容区",
@@ -9751,6 +9751,12 @@
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
+    }, {
      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -9771,28 +9777,22 @@
        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg9"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "消息类型-警告信息",
@@ -9806,16 +9806,16 @@
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
      }
    }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
      }
    }, {
      "name" : "关闭模式-本次删除",