zhujiamin 发布系统代码 [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.122",
-    "@ibiz-template/core": "^0.0.1-beta.122",
-    "@ibiz-template/model": "^0.0.1-beta.122",
-    "@ibiz-template/runtime": "^0.0.1-beta.122",
-    "@ibiz-template/service": "^0.0.1-beta.122",
-    "@ibiz-template/theme": "^0.0.1-beta.122",
-    "@ibiz-template/vue-util": "^0.0.1-beta.122",
+    "@ibiz-template/controller": "^0.0.1-beta.123",
+    "@ibiz-template/core": "^0.0.1-beta.123",
+    "@ibiz-template/model": "^0.0.1-beta.123",
+    "@ibiz-template/runtime": "^0.0.1-beta.123",
+    "@ibiz-template/service": "^0.0.1-beta.123",
+    "@ibiz-template/theme": "^0.0.1-beta.123",
+    "@ibiz-template/vue-util": "^0.0.1-beta.123",
     "@ibiz/dynamic-model-api": "^2.1.28",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",

app_Web/src/components/editor/span/ibiz-span/ibiz-span.tsx

-import { ref, defineComponent, Ref, watch, computed } from 'vue';
+import { ref, defineComponent, Ref, watch, computed, VNode } from 'vue';
 import { getSpanProps, useNamespace } from '@ibiz-template/vue-util';
 import dayjs from 'dayjs';
 import '@ibiz-template/theme/style/components/editor/ibiz-span/ibiz-span.scss';
@@ -79,14 +79,22 @@ export const IBizSpan = defineComponent({
       ns,
       text,
       codeListText,
+      items,
+      codeList,
     };
   },
   render() {
-    let text = '';
-    if (this.codeListText != null) {
-      text = this.codeListText as string;
+    let content: string | VNode = '';
+    if (this.codeList && this.items.length) {
+      content = (
+        <code-list
+          codeListItems={this.items}
+          codeList={this.codeList}
+          value={this.value}
+        ></code-list>
+      );
     } else if (this.text != null) {
-      text = this.text;
+      content = this.text;
     }
     return (
       <span
@@ -96,7 +104,7 @@ export const IBizSpan = defineComponent({
           this.readonly ? this.ns.m('readonly') : '',
         ]}
       >
-        {text}
+        {content}
       </span>
     );
   },

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

@@ -1432,16 +1432,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/PSSYSAPP.json

@@ -9664,16 +9664,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"
       }
     } ]
   }, {
@@ -9702,12 +9702,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      }
-    }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9719,6 +9713,12 @@
         "modelref" : true,
         "id" : "ViewMsg6"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      }
     } ]
   }, {
     "codeName" : "VMGroup7",
@@ -9734,12 +9734,6 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
-    }, {
       "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9757,30 +9751,17 @@
         "modelref" : true,
         "id" : "ViewMsg10"
       }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9812,27 +9793,46 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     } ]
   }, {