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

app_Web/index.html

@@ -4,10 +4,9 @@
     <meta charset="UTF-8" />
     <link id="favicon" rel="icon" type="image/svg+xml" href="/assets/img/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Expires" content="0">
-    <meta http-equiv="Pragma" content="no-cache">
-    <meta http-equiv="Cache-control" content="no-cache">
-    <meta http-equiv="Cache" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
     <link type="text/css" href="/assets/css/app-loading.css" rel="stylesheet" />
     <link
       type="text/css"

app_Web/src/components/common/app-icon/app-icon.tsx

@@ -26,13 +26,17 @@ export const AppIcon = defineComponent({
           return <ion-icon class={ns.b()} name={icon.cssClass}></ion-icon>;
         }
         if (icon.imagePath) {
+          const prefixUrl =
+            icon.imagePath.startsWith('./') || icon.imagePath.startsWith('/')
+              ? ''
+              : BaseUrl;
           if (icon.imagePath.endsWith('svg')) {
             if (icon.imagePath.startsWith('http')) {
               return <ion-icon class={ns.b()} src={icon.imagePath}></ion-icon>;
             }
             return (
               <ion-icon
-                src={BaseUrl + icon.imagePath}
+                src={prefixUrl + icon.imagePath}
                 class={ns.b()}
               ></ion-icon>
             );
@@ -40,7 +44,7 @@ export const AppIcon = defineComponent({
           if (icon.imagePath.startsWith('http')) {
             return <img class={ns.b()} src={icon.imagePath} />;
           }
-          return <img class={ns.b()} src={BaseUrl + icon.imagePath} />;
+          return <img class={ns.b()} src={prefixUrl + icon.imagePath} />;
         }
       }
       return null;

app_Web/vite-plugins/ibiz-vite-plugin.ts

@@ -73,6 +73,10 @@ function IBizVitePlugin(): Plugin[] {
         '<script src="./assets/ionicons/ionicons/ionicons.js"></script>',
         '<script nomodule src="./assets/ionicons/ionicons/ionicons.js"></script>',
       );
+      // 匹配所有的 css 和 js 文件，加上时间戳
+      const scriptReg = /\.(css|js|json)"/g;
+      const time = new Date().getTime();
+      html = html.replace(scriptReg, `.$1?time=${time}"`);
       writeFileSync(htmlFilePath, html, 'utf-8');
       // 重新修改 system-import.json 补充时间戳
       {

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

@@ -1504,6 +1504,28 @@
     "codeName" : "BXDMXName"
   },
   "getMinorPSAppDERSs" : [ {
+    "actionRSMode" : 1,
+    "codeName" : "BXDMX",
+    "dataRSMode" : 0,
+    "majorDECodeName" : "BXD",
+    "majorDEName" : "BXD",
+    "getMajorPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
+    },
+    "minorDECodeName" : "BXDMX",
+    "minorDEName" : "BXDMX",
+    "getMinorPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXDMX.json"
+    },
+    "name" : "DER1N_BXDMX_BXD_BXDID",
+    "getParentPSAppDEField" : {
+      "name" : "BXDID",
+      "codeName" : "BXDId"
+    },
+    "rSMode" : 2
+  }, {
     "actionRSMode" : 1,
     "codeName" : "BXDMXes",
     "dataRSMode" : 0,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSFORMS/Main_2.json

@@ -196,6 +196,18 @@
         "editorType" : "PICKEREX_TRIGGER",
         "handlerType" : "PickupText",
         "name" : "field3",
+        "getPSAppDEACMode" : {
+          "modelref" : true,
+          "id" : "Default"
+        },
+        "getPSAppDEDataSet" : {
+          "modelref" : true,
+          "id" : "FetchDefault"
+        },
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
+        },
         "getPSEditorItems" : [ {
           "name" : "field4"
         } ],

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

@@ -1630,6 +1630,18 @@
             "editorType" : "PICKEREX_TRIGGER",
             "handlerType" : "PickupText",
             "name" : "field3",
+            "getPSAppDEACMode" : {
+              "modelref" : true,
+              "id" : "Default"
+            },
+            "getPSAppDEDataSet" : {
+              "modelref" : true,
+              "id" : "FetchDefault"
+            },
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
+            },
             "getPSEditorItems" : [ {
               "name" : "field4"
             } ],

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

@@ -132,6 +132,28 @@
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPCOUNTERS/WFExpBar.json"
   } ],
   "getAllPSAppDERSs" : [ {
+    "actionRSMode" : 1,
+    "codeName" : "BXDMX",
+    "dataRSMode" : 0,
+    "majorDECodeName" : "BXD",
+    "majorDEName" : "BXD",
+    "getMajorPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json"
+    },
+    "minorDECodeName" : "BXDMX",
+    "minorDEName" : "BXDMX",
+    "getMinorPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXDMX.json"
+    },
+    "name" : "DER1N_BXDMX_BXD_BXDID",
+    "getParentPSAppDEField" : {
+      "name" : "BXDID",
+      "codeName" : "BXDId"
+    },
+    "rSMode" : 2
+  }, {
     "actionRSMode" : 1,
     "codeName" : "BXDMXes",
     "dataRSMode" : 0,
@@ -1138,6 +1160,11 @@
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/City.json",
     "name" : "CITY",
     "codeName" : "City"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BXD.json",
+    "name" : "BXD",
+    "codeName" : "BXD"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD3.json",
@@ -1400,16 +1427,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/Student/PSTREEGRIDS/Treegrid.json

@@ -29,36 +29,36 @@
   "getPSDEGridColumns" : [ {
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
-    "caption" : "上级学生职位",
-    "codeName" : "pstudentid",
+    "caption" : "学生名称",
+    "codeName" : "studentname",
     "columnType" : "DEFTREEGRIDCOLUMN",
-    "dataItemName" : "pstudentid",
-    "excelCaption" : "上级学生职位",
-    "name" : "pstudentid",
+    "dataItemName" : "studentname",
+    "excelCaption" : "学生名称",
+    "name" : "studentname",
     "noPrivDisplayMode" : 1,
     "getPSAppDEField" : {
-      "name" : "PSTUDENTID",
-      "codeName" : "Pstudentid"
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
     },
-    "treeColumnMode" : 4,
-    "width" : 100,
+    "width" : 400,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "NONE",
-    "caption" : "学生名称",
-    "codeName" : "studentname",
+    "caption" : "上级学生职位",
+    "codeName" : "pstudentid",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "studentname",
-    "excelCaption" : "学生名称",
-    "name" : "studentname",
+    "dataItemName" : "pstudentid",
+    "excelCaption" : "上级学生职位",
+    "name" : "pstudentid",
     "noPrivDisplayMode" : 1,
     "getPSAppDEField" : {
-      "name" : "STUDENTNAME",
-      "codeName" : "StudentName"
+      "name" : "PSTUDENTID",
+      "codeName" : "Pstudentid"
     },
-    "width" : 400,
+    "treeColumnMode" : 4,
+    "width" : 100,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
@@ -168,17 +168,17 @@
   } ],
   "getPSDEGridDataItems" : [ {
     "dataType" : 25,
-    "name" : "pstudentid",
+    "name" : "studentname",
     "getPSAppDEField" : {
-      "name" : "PSTUDENTID",
-      "codeName" : "Pstudentid"
+      "name" : "STUDENTNAME",
+      "codeName" : "StudentName"
     }
   }, {
     "dataType" : 25,
-    "name" : "studentname",
+    "name" : "pstudentid",
     "getPSAppDEField" : {
-      "name" : "STUDENTNAME",
-      "codeName" : "StudentName"
+      "name" : "PSTUDENTID",
+      "codeName" : "Pstudentid"
     }
   }, {
     "dataType" : 25,

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

@@ -298,36 +298,36 @@
     "getPSDEGridColumns" : [ {
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
-      "caption" : "上级学生职位",
-      "codeName" : "pstudentid",
+      "caption" : "学生名称",
+      "codeName" : "studentname",
       "columnType" : "DEFTREEGRIDCOLUMN",
-      "dataItemName" : "pstudentid",
-      "excelCaption" : "上级学生职位",
-      "name" : "pstudentid",
+      "dataItemName" : "studentname",
+      "excelCaption" : "学生名称",
+      "name" : "studentname",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
-        "name" : "PSTUDENTID",
-        "codeName" : "Pstudentid"
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
       },
-      "treeColumnMode" : 4,
-      "width" : 100,
+      "width" : 400,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "NONE",
-      "caption" : "学生名称",
-      "codeName" : "studentname",
+      "caption" : "上级学生职位",
+      "codeName" : "pstudentid",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "studentname",
-      "excelCaption" : "学生名称",
-      "name" : "studentname",
+      "dataItemName" : "pstudentid",
+      "excelCaption" : "上级学生职位",
+      "name" : "pstudentid",
       "noPrivDisplayMode" : 1,
       "getPSAppDEField" : {
-        "name" : "STUDENTNAME",
-        "codeName" : "StudentName"
+        "name" : "PSTUDENTID",
+        "codeName" : "Pstudentid"
       },
-      "width" : 400,
+      "treeColumnMode" : 4,
+      "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -437,17 +437,17 @@
     } ],
     "getPSDEGridDataItems" : [ {
       "dataType" : 25,
-      "name" : "pstudentid",
+      "name" : "studentname",
       "getPSAppDEField" : {
-        "name" : "PSTUDENTID",
-        "codeName" : "Pstudentid"
+        "name" : "STUDENTNAME",
+        "codeName" : "StudentName"
       }
     }, {
       "dataType" : 25,
-      "name" : "studentname",
+      "name" : "pstudentid",
       "getPSAppDEField" : {
-        "name" : "STUDENTNAME",
-        "codeName" : "StudentName"
+        "name" : "PSTUDENTID",
+        "codeName" : "Pstudentid"
       }
     }, {
       "dataType" : 25,

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

@@ -9409,16 +9409,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"
       }
     } ]
   }, {
@@ -9474,16 +9474,16 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg10"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg8"
       }
     }, {
       "name" : "消息位置-视图内容区",
@@ -9496,12 +9496,11 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息类型-警告信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
@@ -9509,17 +9508,17 @@
         "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     }, {
@@ -9529,11 +9528,12 @@
         "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
-      }
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
@@ -9551,16 +9551,16 @@
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
       "name" : "关闭模式-本次删除",