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

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

@@ -15,13 +15,15 @@ import '@ibiz-template/theme/style/components/common/view-toolbar/view-toolbar.s
 const btnContent = (item: IPSDEToolbarItem, viewMode: string) => {
   const image = item.getPSSysImage();
   const showIcon = item.showIcon;
+  const showCaption = item.showCaption;
+  const caption = showCaption ? item.caption : '';
   if (viewMode === 'EMBED') {
     if (image) {
-      return [showIcon ? <app-icon icon={image} /> : null, item.caption];
+      return [showIcon ? <app-icon icon={image} /> : null, caption];
     }
-    return [null, item.caption];
+    return [null, caption];
   }
-  return [showIcon ? <app-icon icon={image} /> : null, item.caption];
+  return [showIcon ? <app-icon icon={image} /> : null, caption];
 };
 
 export const ViewToolbar = defineComponent({

app_Web/src/components/editor/check-box-list/ibiz-checkbox/ibiz-checkbox.tsx

@@ -128,7 +128,7 @@ export const IBizCheckbox = defineComponent({
       return items.value
         .filter(item => valueArr.includes(item.value))
         .map(item => item.text)
-        .join(',');
+        .join('、');
     });
 
     return {

app_Web/src/components/editor/data-picker/ibiz-picker-link/ibiz-picker-link.tsx

@@ -4,6 +4,7 @@ import {
   getEditorEmits,
   useNamespace,
 } from '@ibiz-template/vue-util';
+import '@ibiz-template/theme/style/components/editor/ibiz-picker-link/ibiz-picker-link.scss';
 
 export const IBizPickerLink = defineComponent({
   name: 'IBizPickerLink',

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

@@ -9820,16 +9820,16 @@
         "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     } ]
   }, {
@@ -9846,58 +9846,45 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg9"
       }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
         "id" : "ViewMsg12"
       }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -9924,17 +9911,24 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "关闭模式-无删除-上方-常规",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg11"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
-    }, {
       "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9946,6 +9940,12 @@
         "modelref" : true,
         "id" : "ViewMsg13"
       }
+    }, {
+      "name" : "关闭模式-默认删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",