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

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.92",
-    "@ibiz-template/core": "^0.0.1-beta.92",
-    "@ibiz-template/model": "^0.0.1-beta.92",
-    "@ibiz-template/runtime": "^0.0.1-beta.92",
-    "@ibiz-template/service": "^0.0.1-beta.92",
-    "@ibiz-template/theme": "^0.0.1-beta.92",
-    "@ibiz-template/vue-util": "^0.0.1-beta.92",
+    "@ibiz-template/controller": "^0.0.1-beta.93",
+    "@ibiz-template/core": "^0.0.1-beta.93",
+    "@ibiz-template/model": "^0.0.1-beta.93",
+    "@ibiz-template/runtime": "^0.0.1-beta.93",
+    "@ibiz-template/service": "^0.0.1-beta.93",
+    "@ibiz-template/theme": "^0.0.1-beta.93",
+    "@ibiz-template/vue-util": "^0.0.1-beta.93",
     "@ibiz/dynamic-model-api": "^2.1.24",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",

app_Web/src/components/common/view-toolbar/view-toolbar.tsx

@@ -106,6 +106,14 @@ export const ViewToolbar = defineComponent({
             item.itemType === 'DEUIACTION' &&
             this.toolbarState[item.id].visible
           ) {
+            // 特殊处理，工具栏关闭按钮在非顶级容器分页模式打开时(即页面本身有X按钮)的场景，自动去掉工具栏中的关闭按钮
+            const notShowCloseBtnViewMode = ['MODAL', 'DRAWER', 'POPOVER'];
+            if (notShowCloseBtnViewMode.includes(this.viewMode)) {
+              const uiAction = (item as IPSDETBUIActionItem).getPSUIAction();
+              if (uiAction?.codeName === 'Exit') {
+                return;
+              }
+            }
             return (
               <div
                 key={item.id}

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1238,16 +1238,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -2784,16 +2784,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   } ],