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

app_Web/package.json

@@ -20,7 +20,7 @@
     "@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",
+    "@ibiz/dynamic-model-api": "^2.1.28",
     "@riophae/vue-treeselect": "^0.4.0",
     "dayjs": "^1.11.7",
     "echarts": "^5.4.2",

app_Web/pnpm-lock.yaml

@@ -19,7 +19,7 @@ dependencies:
     version: 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
   '@ibiz-template/model':
     specifier: ^0.0.1-beta.106
-    version: 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
+    version: 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
   '@ibiz-template/runtime':
     specifier: ^0.0.1-beta.106
     version: 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(qx-util@0.4.8)
@@ -33,8 +33,8 @@ dependencies:
     specifier: ^0.0.1-beta.106
     version: 0.0.1-beta.106(@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/service@0.0.1-beta.106)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14)
   '@ibiz/dynamic-model-api':
-    specifier: ^2.1.27
-    version: 2.1.27(qx-util@0.4.8)
+    specifier: ^2.1.28
+    version: 2.1.28(qx-util@0.4.8)
   '@riophae/vue-treeselect':
     specifier: ^0.4.0
     version: 0.4.0(vue@2.7.14)
@@ -951,7 +951,7 @@ packages:
       qx-util: ^0.4.8
     dependencies:
       '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
       '@ibiz-template/runtime': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(@ibiz-template/service@0.0.1-beta.106)(qx-util@0.4.8)
       '@ibiz-template/service': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(qx-util@0.4.8)(ramda@0.28.0)
       async-validator: 4.2.5
@@ -979,14 +979,14 @@ packages:
       - debug
     dev: false
 
-  /@ibiz-template/model@0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8):
+  /@ibiz-template/model@0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8):
     resolution: {integrity: sha512-A4RLonvcg4+lLhCJqhM1x/dlSokfXPPfQ6cgpwakd/DZ8fy+IWS08oZ9S7UqUxRgMiQawB5bAGLAStDC9W00EQ==}
     peerDependencies:
       '@ibiz/dynamic-model-api': ^2.1.27
       lodash-es: ^4.17.21
       qx-util: ^0.4.8
     dependencies:
-      '@ibiz/dynamic-model-api': 2.1.27(qx-util@0.4.8)
+      '@ibiz/dynamic-model-api': 2.1.28(qx-util@0.4.8)
       lodash-es: 4.17.21
       pluralize: 8.0.0
       qx-util: 0.4.8
@@ -1002,7 +1002,7 @@ packages:
     dependencies:
       '@ibiz-template/command': 0.0.1-beta.50
       '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
       '@ibiz-template/service': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(qx-util@0.4.8)(ramda@0.28.0)
       qs: 6.11.1
       qx-util: 0.4.8
@@ -1017,7 +1017,7 @@ packages:
       ramda: ^0.28.0
     dependencies:
       '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
       qx-util: 0.4.8
       ramda: 0.28.0
     dev: false
@@ -1041,7 +1041,7 @@ packages:
     dependencies:
       '@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)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
       '@ibiz-template/core': 0.0.1-beta.106(lodash-es@4.17.21)(qx-util@0.4.8)(ramda@0.28.0)
-      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.27)(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/model': 0.0.1-beta.106(@ibiz/dynamic-model-api@2.1.28)(lodash-es@4.17.21)(qx-util@0.4.8)
       '@ibiz-template/service': 0.0.1-beta.106(@ibiz-template/core@0.0.1-beta.106)(@ibiz-template/model@0.0.1-beta.106)(qx-util@0.4.8)(ramda@0.28.0)
       qs: 6.11.1
       qx-util: 0.4.8
@@ -1050,8 +1050,8 @@ packages:
       vue-router: 3.6.5(vue@2.7.14)
     dev: false
 
-  /@ibiz/dynamic-model-api@2.1.27(qx-util@0.4.8):
-    resolution: {integrity: sha512-mcmWbLOyOnjgP21eRTp9hTtjUiCeL1pOE6fz3al7LlJE1gJpY7W/qTvu7DBogXbK14lWS1t/C7P84KYjGWkR6w==}
+  /@ibiz/dynamic-model-api@2.1.28(qx-util@0.4.8):
+    resolution: {integrity: sha512-j48NYD31dC6A7AY/jyyn5dOLOSjYwtDprSQ67R4T0nZkTb51F1LawTjrLlpOWN4LHRZVQeWbQshspkB3VPchYA==}
     peerDependencies:
       qx-util: '>=0.4.8'
     dependencies:

app_Web/src/components/layout/app-layout/app-layout.tsx

@@ -56,51 +56,26 @@ export const AppLayout = defineComponent({
     return { ns, collapseChange, isBlank, collapseMenus };
   },
   render() {
-    return this.isComplete ? (
-      <i-layout
-        class={[
-          this.ns.b(),
-          this.isBlank ? this.ns.m('blank') : '',
-          this.ns.is('collapse', this.collapseChange),
-          this.ns.is('tab', this.isShowTabPageExp),
-        ]}
-      >
-        {this.model.source.mainMenuAlign === 'CENTER' && this.$slots.menu}
-        {this.model.source.mainMenuAlign !== 'CENTER' && (
+    if (this.isComplete) {
+      let content = null;
+      if (this.model.source.mainMenuAlign === 'CENTER') {
+        content = this.$slots.menu;
+      } else {
+        content = [
           <i-sider
             hide-trigger
             class={[
               this.ns.b('nav'),
               this.ns.is('collapse', this.collapseChange),
-              this.model.source?.mainMenuAlign?.toLowerCase(),
             ]}
             value={this.collapseChange}
+            key='1'
           >
             {renderLogo(this.ns, this.model)}
             {this.$slots.menu}
-          </i-sider>
-        )}
-        {this.model.source.mainMenuAlign === 'CENTER' && (
-          <i-layout class={[this.ns.b('content')]}>
-            <i-header
-              class={[
-                this.ns.b('header'),
-                this.model.source?.mainMenuAlign?.toLowerCase(),
-              ]}
-            >
-              <div class={this.ns.be('header', 'left')}>
-                {renderLogo(this.ns, this.model)}
-              </div>
-            </i-header>
-            <i-content class={this.ns.be('content', 'main')}>
-              {this.$slots.tabPageExp}
-              {this.$slots.default}
-            </i-content>
-          </i-layout>
-        )}
-        {this.model.source.mainMenuAlign !== 'CENTER' && (
-          <i-layout class={[this.ns.b('content')]}>
-            <i-header class={this.ns.b('header')}>
+          </i-sider>,
+          <i-layout class={[this.ns.b('content')]} key='2'>
+            <i-header class={this.ns.b('header')} key='3'>
               <div class={this.ns.be('header', 'left')}>
                 {renderLogo(this.ns, this.model)}
                 <div class={this.ns.be('header', 'collapse-icon')}>
@@ -128,14 +103,27 @@ export const AppLayout = defineComponent({
                 <app-user />
               </div>
             </i-header>
-            <i-content class={this.ns.be('content', 'main')}>
+            <i-content class={this.ns.be('content', 'main')} key='4'>
               {this.$slots.tabPageExp}
               {this.$slots.default}
             </i-content>
             {/* <i-footer class={this.ns.b('footer')}>Footer</i-footer> */}
-          </i-layout>
-        )}
-      </i-layout>
-    ) : null;
+          </i-layout>,
+        ];
+      }
+      return (
+        <i-layout
+          class={[
+            this.ns.b(),
+            this.isBlank ? this.ns.m('blank') : '',
+            this.ns.is('collapse', this.collapseChange),
+            this.ns.is('tab', this.isShowTabPageExp),
+          ]}
+        >
+          {content}
+        </i-layout>
+      );
+    }
+    return null;
   },
 });

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

@@ -62,9 +62,11 @@ export const FormDRUIPart = defineComponent({
             neuronInit: this.onNeuronInit,
           },
         })}
-        {/* {this.controller.showMask && (
-          <div class={this.ns.e('mask')}>请先保存主数据</div>
-        )} */}
+        {this.controller.showMask && (
+          <div class={this.ns.e('mask')}>
+            {this.modelData.source.maskInfo || '请先保存主数据'}
+          </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" : "视图消息",
+      "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/PSAPPDATAENTITIES/TEST/PSFORMS/Gnqrbdlj.json

@@ -75,6 +75,11 @@
       "modelref" : true,
       "id" : "Get"
     }
+  }, {
+    "codeName" : "script",
+    "name" : "脚本代码",
+    "scriptCode" : "alert('script')",
+    "customCode" : true
   }, {
     "codeName" : "updatetest",
     "name" : "更新测试",
@@ -85,11 +90,6 @@
     "getPSDEFIUpdateDetails" : [ {
       "name" : "formitem8"
     } ]
-  }, {
-    "codeName" : "script",
-    "name" : "脚本代码",
-    "scriptCode" : "alert('script')",
-    "customCode" : true
   } ],
   "getPSDEFormItemVRs" : [ {
     "checkMode" : 2,

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

@@ -198,6 +198,11 @@
         "modelref" : true,
         "id" : "Get"
       }
+    }, {
+      "codeName" : "script",
+      "name" : "脚本代码",
+      "scriptCode" : "alert('script')",
+      "customCode" : true
     }, {
       "codeName" : "updatetest",
       "name" : "更新测试",
@@ -208,11 +213,6 @@
       "getPSDEFIUpdateDetails" : [ {
         "name" : "formitem8"
       } ]
-    }, {
-      "codeName" : "script",
-      "name" : "脚本代码",
-      "scriptCode" : "alert('script')",
-      "customCode" : true
     } ],
     "getPSDEFormItemVRs" : [ {
       "checkMode" : 2,

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

@@ -3571,16 +3571,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"
       }
     } ]
   }, {
@@ -3598,12 +3598,6 @@
     "codeName" : "VMGroup3",
     "name" : "视图消息类型测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      }
-    }, {
       "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -3615,21 +3609,27 @@
         "modelref" : true,
         "id" : "ViewMsg5"
       }
+    }, {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      }
     } ]
   }, {
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图上方",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg7"
+        "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg7"
       }
     }, {
       "name" : "消息位置-视图下方",
@@ -3638,10 +3638,10 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     } ]
   }, {
@@ -3670,16 +3670,16 @@
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],