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

52c6807c · ibizdev · 5f44bfc2 · 52c6807c · 52c6807c · 52c6807c
--- a/app_Web/package.json
+++ b/app_Web/package.json
@@ -13,13 +13,13 @@
  "dependencies": {
    "@floating-ui/dom": "^1.5.3",
    "@ibiz-template/command": "^0.0.1-beta.50",
-    "@ibiz-template/controller": "^0.0.1-beta.139",
-    "@ibiz-template/core": "^0.0.1-beta.139",
-    "@ibiz-template/model": "^0.0.1-beta.139",
-    "@ibiz-template/runtime": "^0.0.1-beta.139",
-    "@ibiz-template/service": "^0.0.1-beta.139",
-    "@ibiz-template/theme": "^0.0.1-beta.139",
-    "@ibiz-template/vue-util": "^0.0.1-beta.139",
+    "@ibiz-template/controller": "^0.0.1-beta.140",
+    "@ibiz-template/core": "^0.0.1-beta.140",
+    "@ibiz-template/model": "^0.0.1-beta.140",
+    "@ibiz-template/runtime": "^0.0.1-beta.140",
+    "@ibiz-template/service": "^0.0.1-beta.140",
+    "@ibiz-template/theme": "^0.0.1-beta.140",
+    "@ibiz-template/vue-util": "^0.0.1-beta.140",
    "@ibiz/dynamic-model-api": "^2.1.28",
    "@riophae/vue-treeselect": "^0.4.0",
    "dayjs": "^1.11.10",

--- a/app_Web/pnpm-lock.yaml
+++ b/app_Web/pnpm-lock.yaml
--- a/app_Web/src/components/views/mpickup-view2/mpickup-view2.tsx
+++ b/app_Web/src/components/views/mpickup-view2/mpickup-view2.tsx
@@ -34,7 +34,7 @@ export const MPickupView2 = defineComponent({
    };

    const addRight = () => {
-      c.addSelections(c.embedSelection);
+      c.addSelectData();
      UISelections.value = [];
    };

@@ -48,7 +48,7 @@ export const MPickupView2 = defineComponent({
      UISelections.value = [];
    };
    const removeRightAll = () => {
-      c.selfSelection = [];
+      c.removeAllSelections();
      UISelections.value = [];
    };


--- a/app_Web/src/components/widgets/grid-control/grid-control.tsx
+++ b/app_Web/src/components/widgets/grid-control/grid-control.tsx
@@ -161,7 +161,18 @@ export const GridControl = defineComponent({
    });

    const tableData = computed(() => {
-      return [{ hiddenRow: true }, ...c.items];
+      const data = c.items.map((item: IData) => {
+        // eslint-disable-next-line no-param-reassign
+        item._checked = c.selectedData.some(
+          (selected: IData) => selected.srfkey === item.srfkey,
+        );
+        return item;
+      });
+      data.unshift({
+        hiddenRow: true,
+        _checked: c.selectedData.length === c.items.length,
+      });
+      return data;
    });

    return {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1579,16 +1579,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"
      }
    } ]
  }, {

--- 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
@@ -12873,16 +12873,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"
      }
    } ]
  }, {
@@ -12917,16 +12917,16 @@
        "id" : "ViewMsg6"
      }
    }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      }
    }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg4"
      }
    } ]
  }, {
@@ -12948,12 +12948,6 @@
        "modelref" : true,
        "id" : "ViewMsg7"
      }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -12966,30 +12960,29 @@
        "modelref" : true,
        "id" : "ViewMsg10"
      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
    } ]
  }, {
    "codeName" : "VMGroup8",
    "name" : "【静态测试】",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-警告信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg5"
      },
      "position" : "POPUP"
    }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图内容区",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg9"
      }
-    }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
    }, {
      "name" : "关闭模式-默认删除-上方-错误",
      "getPSAppViewMsg" : {
@@ -12997,17 +12990,18 @@
        "id" : "ViewMsg12"
      }
    }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-本次删除-上方-警告",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg13"
      }
    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-错误信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
    }, {
      "name" : "消息位置-视图下方",
      "getPSAppViewMsg" : {
@@ -13015,23 +13009,23 @@
        "id" : "ViewMsg8"
      }
    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-常规信息",
      "getPSAppViewMsg" : {
        "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg4"
      },
      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
    } ]
  }, {
    "codeName" : "VMGroup5",
    "name" : "视图消息关闭模式",
    "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
      "name" : "关闭模式-本次删除",
      "getPSAppViewMsg" : {
        "modelref" : true,
@@ -13043,6 +13037,12 @@
        "modelref" : true,
        "id" : "ViewMsg11"
      }
+    }, {
+      "name" : "关闭模式-默认删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
    } ]
  }, {
    "codeName" : "VMGroup6",