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

app_Web/src/components/editor/text-box/ibiz-input-number/ibiz-input-number.tsx

@@ -73,36 +73,32 @@ export const IBizInputNumber = defineComponent({
           this.disabled ? this.ns.m('disabled') : '',
           this.readonly ? this.ns.m('readonly') : '',
           this.hiddenupdownbutton ? this.ns.m('hiddenupdownbutton') : '',
+          this.controller.model.unitName ? this.ns.m('showUnitName') : '',
         ]}
       >
         {[
           this.readonly && this.currentVal,
           !this.readonly &&
-            h(
-              'IInputNumber',
-              {
-                ref: 'inputRef',
-                props: {
-                  ...this.c.customProps,
-                  value: this.currentVal,
-                  placeholder: this.controller.placeHolder,
-                  precision:
-                    this.c.model.precision === -1
-                      ? undefined
-                      : this.c.model.precision,
-                  disabled: this.disabled,
-                },
-                on: {
-                  'on-change': this.handleChange,
-                },
+            h('IInputNumber', {
+              ref: 'inputRef',
+              props: {
+                ...this.c.customProps,
+                value: this.currentVal,
+                placeholder: this.controller.placeHolder,
+                precision:
+                  this.c.model.precision === -1
+                    ? undefined
+                    : this.c.model.precision,
+                disabled: this.disabled,
               },
-              [
-                this.controller.model.unitName &&
-                  h('i', { class: this.ns.e('unit'), slot: 'suffix' }, [
-                    this.controller.model.unitName,
-                  ]),
-              ],
-            ),
+              on: {
+                'on-change': this.handleChange,
+              },
+            }),
+          this.controller.model.unitName &&
+            h('i', { class: this.ns.e('unit'), slot: 'suffix' }, [
+              this.controller.model.unitName,
+            ]),
         ]}
       </div>
     );

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

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

@@ -11817,16 +11817,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"
       }
     } ]
   }, {
@@ -11855,16 +11855,16 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
       "name" : "消息类型-常规信息",
@@ -11887,6 +11887,12 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
       "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -11904,21 +11910,28 @@
         "modelref" : true,
         "id" : "ViewMsg10"
       }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg11"
+      }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息位置-视图下方",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "关闭模式-默认删除-上方-错误",
@@ -11926,6 +11939,12 @@
         "modelref" : true,
         "id" : "ViewMsg12"
       }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
     }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
@@ -11946,46 +11965,27 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "消息类型-常规信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg4"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {