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

app_Web/CHANGELOG.md

+# 版本变更日志
+
+这个项目的所有关键变化都将记录在此文件中.
+
+此日志格式基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.0.0/),
+并且此项目遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/).
+
+## [Unreleased]
+
+## [0.0.1] - 2023-05-16
+
+### Added
+
+- 补充视图逻辑类型、界面行为补充标题等输出\

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

app_Web/src/components/widgets/grid-control/grid-control.tsx

 import { GridModel } from '@ibiz-template/model';
 import { useGridController, useNamespace } from '@ibiz-template/vue-util';
 import {
+  computed,
   defineComponent,
   getCurrentInstance,
   h,
@@ -127,10 +128,15 @@ export const GridControl = defineComponent({
       }
     });
 
+    const tableData = computed(() => {
+      return [{ hiddenRow: true }, ...c.items];
+    });
+
     return {
       c,
       ns,
       columns,
+      tableData,
       onDbRowClick,
       onUIRowClick,
       onSelectionChange,
@@ -158,6 +164,13 @@ export const GridControl = defineComponent({
       const columnName = column.codeName;
       columnSlots[columnName] = ({ row, index }: IData) => {
         const rowController = this.c.rows[index];
+        if (row.hiddenRow) {
+          return (
+            <span style='word-break: break-word;white-space: pre-wrap;'>
+              隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列隐藏行的列
+            </span>
+          );
+        }
         if (rowController) {
           return h(this.c.providers[columnName].component, {
             props: {
@@ -186,12 +199,13 @@ export const GridControl = defineComponent({
             class={this.ns.b('content')}
             show-header={!this.c.model.source.hideHeader}
             highlight-row
-            data={this.c.items}
+            data={this.tableData}
             columns={this.columns}
             on-on-row-click={this.onUIRowClick}
             on-on-row-dblclick={this.onDbRowClick}
             on-on-selection-change={this.onSelectionChange}
             on-on-sort-change={this.onSortChange}
+            row-class-name={(row: IData) => (row.hiddenRow ? 'hidden-row' : '')}
             scopedSlots={columnSlots}
           ></i-table>
           {this.c.model.source.enablePagingBar && (

app_Web/src/components/widgets/grid-control/grid-control.util.ts

@@ -140,7 +140,13 @@ export function useITableEvent(c: GridController) {
   function onSelectionChange(selection: IData[]) {
     // 单选的时候选中效果靠点击事件
     if (!c.singleSelect) {
-      const origins = selection.map(item => getOriginData(item));
+      const origins: IData[] = [];
+      selection.forEach(item => {
+        const find = getOriginData(item);
+        if (find) {
+          origins.push(find);
+        }
+      });
       c.onSelectionChange(origins);
     }
   }

app_Web/yarn.lock

@@ -651,54 +651,54 @@
   dependencies:
     qx-util "^0.4.8"
 
-"@ibiz-template/controller@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/controller/-/controller-0.0.1-beta.77.tgz#20362ed4bc3a818c342a27d0acb95e626e720112"
-  integrity sha512-GgeVlmwwEKUyKzgA7KqKejCfzEcXs4wpDwAs3pZgCJa+wkm7d5MbFsAnG07ltvYEy8re1hP8V+uTTLwWP1IvFg==
+"@ibiz-template/controller@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/controller/-/controller-0.0.1-beta.78.tgz#d2abc93214a0346ec81cf5083bd06839f34d1d90"
+  integrity sha512-V6tjmXDb3YXXW+uzZyCiFdgyXQt/JB7fg5x2V6jH6pQxr9502butZWw9wLOGQWOZIknDmBR7h3vAoL3aL88Mzg==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/core/-/core-0.0.1-beta.77.tgz#655c5845c0e9d27ec815a21a879c47b0b6a4c10e"
-  integrity sha512-rDKXX1z8CSnWkAYzgyIj0ZyIniCREMiTQke5R/fvFkAkivnOw0nT2nDdmQ9nCMCLnEJTIYuT2t5tA+Q5Gv4BnQ==
+"@ibiz-template/core@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/core/-/core-0.0.1-beta.78.tgz#0d08d56814485b9a7dad2383bbbaf26bd89323e6"
+  integrity sha512-QOJl1T3IZ5limPO3qWHIoHsZHpXVzUfl4gZ+9vTM/GUq48lFO8i1Xfefcl6uMWtOtrXnuGnZ/QdzvwwvTwVsAA==
   dependencies:
     axios "^1.2.1"
     loglevel "^1.8.0"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/model/-/model-0.0.1-beta.77.tgz#9115e5bf2316333808598c7efa7b62a85f2e7946"
-  integrity sha512-oHoqkbcxHPasJxcx4Pkng8g52mNS9DmwgUawQQJaA/1WWwwO7VP1Yi0wXjrROtj302gt/KZOeg2AJ5REy0w/vA==
+"@ibiz-template/model@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/model/-/model-0.0.1-beta.78.tgz#a1b1f2efaa8a2e4c27ebe53b128743ad862ac1e6"
+  integrity sha512-iQsG1sOP5B9B/j6eeUkb7cSkrk2Cs15bQKc2IGhSNxfknoFb6ItuONDj6Fo0RBW/B+FBF1PK2Cp6w9JSsfFXdQ==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.1.17"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/runtime/-/runtime-0.0.1-beta.77.tgz#f4398d83c8561c75b2f46b132a26b05e75800125"
-  integrity sha512-MLZTfCDkPIKUJV6Bdab3w1ulR7V8FDH4BBDb32bwyU4UDJ1JxiMmrLv9lcrc5BTvN2Dt9chjei+WK1NiAqND4w==
+"@ibiz-template/runtime@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/runtime/-/runtime-0.0.1-beta.78.tgz#0956ba6ae53d7aa2fbdcb683fe43ecf41c15aeb2"
+  integrity sha512-WqzofBjaCLb8L5gsdM4hlsyqlx6uy5BHdkBQg70Cq2XdNSvph9wSjgMfYnPB+VHUOrrOtzcfpmEUXOVlOccymw==
   dependencies:
     "@ibiz-template/command" "^0.0.1-beta.50"
     qs "^6.11.0"
 
-"@ibiz-template/service@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/service/-/service-0.0.1-beta.77.tgz#bd2d7d3b17c7beea49b9800d1c0fa41555633f79"
-  integrity sha512-SNcZRp5uNcFH5g36POla2HwhDthBToggF0WWpTWVo721o623E8Qb88MF9KEwdbHMi30ZURZbzp79yVQN5pTx5Q==
+"@ibiz-template/service@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/service/-/service-0.0.1-beta.78.tgz#3acb003ad0263e92c25d02d2415ecd4f1d006610"
+  integrity sha512-CZ40KJnsjMQoJLCC4wRzSWe/q0nmTVVrk1uN992aR8HEwgj4BLldtTCxLnNmLQ2qkXyCSxinNakDCX8/2Xf/8Q==
 
-"@ibiz-template/theme@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/theme/-/theme-0.0.1-beta.77.tgz#d51a29d2da68c6e51b320d712976261b80843c9f"
-  integrity sha512-4RHj4vm7Mwn+MiVHfKSQZLZYqhVXYQvZo2BQN8CoP4Fg6UGooE1PirCm8YKe5arJNgEefooT1nTJ3ArDThg9wQ==
+"@ibiz-template/theme@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/theme/-/theme-0.0.1-beta.78.tgz#ea28c0592cbf895d142b461a3a4c49fc16b914ea"
+  integrity sha512-k0P+ofq70achR2sXrq7P0mj8ckoZ+ZNXmSXFZAgUgcISdXqJakFYz0YjI+tN3+7kFymruFImaD7KsRjSzUm5bA==
 
-"@ibiz-template/vue-util@^0.0.1-beta.77":
-  version "0.0.1-beta.77"
-  resolved "http://npm.zhr.icu/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.77.tgz#0d63e9946b59e6a835debf2deaafc3edc9c490d7"
-  integrity sha512-PCc93yJJDIjs2pNnkDPpJ1z679iITbeLvviWCohxDWpzV5zZw7s6lie0PKNBt+qsHUVGl1YmgkGKhqHpeOPVzg==
+"@ibiz-template/vue-util@^0.0.1-beta.78":
+  version "0.0.1-beta.78"
+  resolved "http://npm.zhr.icu/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.78.tgz#5f2300843eb0ffcf2fdfe6fe49b1f3666dd10fa8"
+  integrity sha512-NXc6cO/hA9OKkllk+ayVsn9QwPDsVfL2gvjrzG/0NN7f6hBslZPNvIhzyfkQHAHxBIbEP9NagUvo33LaM47kWA==
 
 "@ibiz/dynamic-model-api@^2.1.17":
   version "2.1.17"

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

@@ -1049,16 +1049,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

@@ -2078,16 +2078,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"
       }
     } ]
   } ],