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

app_Web/package.json

@@ -13,14 +13,14 @@
   "dependencies": {
     "@floating-ui/dom": "^1.0.11",
     "@ibiz-template/command": "^0.0.1-beta.50",
-    "@ibiz-template/controller": "^0.0.1-beta.105",
-    "@ibiz-template/core": "^0.0.1-beta.105",
-    "@ibiz-template/model": "^0.0.1-beta.105",
-    "@ibiz-template/runtime": "^0.0.1-beta.105",
-    "@ibiz-template/service": "^0.0.1-beta.105",
-    "@ibiz-template/theme": "^0.0.1-beta.105",
-    "@ibiz-template/vue-util": "^0.0.1-beta.105",
-    "@ibiz/dynamic-model-api": "^2.1.24",
+    "@ibiz-template/controller": "^0.0.1-beta.106",
+    "@ibiz-template/core": "^0.0.1-beta.106",
+    "@ibiz-template/model": "^0.0.1-beta.106",
+    "@ibiz-template/runtime": "^0.0.1-beta.106",
+    "@ibiz-template/service": "^0.0.1-beta.106",
+    "@ibiz-template/theme": "^0.0.1-beta.106",
+    "@ibiz-template/vue-util": "^0.0.1-beta.106",
+    "@ibiz/dynamic-model-api": "^2.1.27",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.2",

app_Web/src/components/editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.scss

+@include b(grid-picker){
+  word-break:break-all;
+  .#{bem(mpicker, '', readonly)}{
+    white-space: pre-line;
+  }
+}
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import {
   useGridCellEditor,
   useNamespace,
 } from '@ibiz-template/vue-util';
+import './ibiz-grid-picker.scss';
 
 export const IBizGridPicker = defineComponent({
   name: 'IBizGridPicker',

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

@@ -117,9 +117,20 @@ export const IBizMPicker = defineComponent({
       const valArr: Array<IData> = [];
       if (selects.length > 0) {
         selects.forEach((select: string) => {
-          const findItem = items.value.find(item =>
+          let index = items.value.findIndex(item =>
             Object.is(item.srfkey, select),
           );
+          let findItem: IData | null = null;
+          if (index >= 0) {
+            findItem = items.value[index];
+          } else {
+            index = selectItems.value.findIndex((item: IData) =>
+              Object.is(item.srfkey, select),
+            );
+            if (index >= 0) {
+              findItem = selectItems.value[index];
+            }
+          }
           if (findItem) {
             valArr.push(findItem);
           }

app_Web/src/components/widgets/form-control/form-druipart/form-druipart.tsx

@@ -62,9 +62,9 @@ export const FormDRUIPart = defineComponent({
             neuronInit: this.onNeuronInit,
           },
         })}
-        {this.controller.showMask && (
+        {/* {this.controller.showMask && (
           <div class={this.ns.e('mask')}>请先保存主数据</div>
-        )}
+        )} */}
       </div>
     );
   },

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

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

@@ -3571,16 +3571,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"
       }
     } ]
   }, {
@@ -3598,12 +3598,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      }
-    }, {
       "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -3615,21 +3609,27 @@
         "modelref" : true,
         "id" : "ViewMsg4"
       }
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      }
     } ]
   }, {
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图下方",
@@ -3638,22 +3638,16 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
-    }, {
       "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -3665,6 +3659,12 @@
         "modelref" : true,
         "id" : "ViewMsg12"
       }
+    }, {
+      "name" : "关闭模式-本次删除",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
     } ]
   }, {
     "codeName" : "VMGroup6",