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

7d37a1c1 · ibizdev · 46bdf042 · 7d37a1c1 · 7d37a1c1 · 7d37a1c1
--- a/app_Web/index.html
+++ b/app_Web/index.html
@@ -2,16 +2,31 @@
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/svg+xml" href="/assets/img/favicon.ico" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link type="text/css" href="/assets/css/app-loading.css" rel="stylesheet">
-    <link type="text/css" href="/assets/fontawesome/css/fontawesome.min.css" rel="stylesheet" />
-    <link type="text/css" href="/assets/fontawesome/css/solid.min.css" rel="stylesheet" />
+    <link type="text/css" href="/assets/css/app-loading.css" rel="stylesheet" />
+    <link
+      type="text/css"
+      href="/assets/fontawesome/css/fontawesome.min.css"
+      rel="stylesheet"
+    />
+    <link
+      type="text/css"
+      href="/assets/fontawesome/css/solid.min.css"
+      rel="stylesheet"
+    />
    <link type="text/css" href="/extras/css/iview.css" rel="stylesheet" />
    <script src="/extras/js/system/6.13.0/system.min.js"></script>
-    <script type="systemjs-importmap" src="/extras/json/system-import.json" crossorigin="anonymous"></script>
+    <script
+      type="systemjs-importmap"
+      src="/extras/json/system-import.json"
+      crossorigin="anonymous"
+    ></script>
    <script src="/environments/environment.js"></script>
-    <script type="module" src="/assets/ionicons/ionicons/ionicons.esm.js"></script>
+    <script
+      type="module"
+      src="/assets/ionicons/ionicons/ionicons.esm.js"
+    ></script>
    <script nomodule src="/assets/ionicons/ionicons/ionicons.js"></script>
    <title>页面加载中</title>
  </head>
@@ -29,4 +44,4 @@
    </div>
    <script type="module" src="/src/main.ts"></script>
  </body>
-</html>
\ No newline at end of file
+</html>
--- a/app_Web/public/assets/img/favicon.ico
+++ b/app_Web/public/assets/img/favicon.ico
--- a/app_Web/src/guard/unauthorized-handler/unauthorized-handler.ts
+++ b/app_Web/src/guard/unauthorized-handler/unauthorized-handler.ts
@@ -24,10 +24,14 @@ export class UnauthorizedHandler {
    if (!ibiz.env.casLoginUrl) {
      throw new RuntimeError('找不到环境参数casLoginUrl');
    }
+    const { origin } = window.location;
+    const baseUrl = `${origin}${ibiz.env.baseUrl}`;
+
    // 登录后返回来的登录的地址
-    const backUrl = `${UrlHelper.appBase}/cas/v7/login${qs.stringify(
+    const backUrl = `${baseUrl}/cas/v7/login${qs.stringify(
      {
        RU: UrlHelper.fullPath,
+        base: baseUrl,
      },
      { addQueryPrefix: true },
    )}`;

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json
@@ -37,6 +37,23 @@
    }
  } ],
  "getPSDEFormItemVRs" : [ {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFormItemName" : "Name",
+    "getPSSysValueRule" : {
+      "codeName" : "ValueRule14",
+      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
+      "mOSFilePath" : "pssysvaluerules/ValueRule14",
+      "name" : "由26个英文字母组成的字符串",
+      "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
+      "regExCode" : "[A-Za-z]+",
+      "ruleInfo" : "内容必须为26个英文字母组成的字符串",
+      "ruleType" : "REG",
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "valueRuleType" : "SYSVALUERULE"
+  }, {
    "checkMode" : 3,
    "name" : "表单项值规则",
    "getPSDEFValueRule" : {
@@ -68,23 +85,6 @@
    },
    "getPSDEFormItemName" : "StuNo",
    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFormItemName" : "Name",
-    "getPSSysValueRule" : {
-      "codeName" : "ValueRule14",
-      "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
-      "mOSFilePath" : "pssysvaluerules/ValueRule14",
-      "name" : "由26个英文字母组成的字符串",
-      "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
-      "regExCode" : "[A-Za-z]+",
-      "ruleInfo" : "内容必须为26个英文字母组成的字符串",
-      "ruleType" : "REG",
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "valueRuleType" : "SYSVALUERULE"
  } ],
  "getPSDEFormItems" : [ {
    "id" : "srfupdatedate",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json
@@ -1109,6 +1109,23 @@
      "id" : "FORM"
    },
    "getPSDEFormItemVRs" : [ {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFormItemName" : "Name",
+      "getPSSysValueRule" : {
+        "codeName" : "ValueRule14",
+        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
+        "mOSFilePath" : "pssysvaluerules/ValueRule14",
+        "name" : "由26个英文字母组成的字符串",
+        "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
+        "regExCode" : "[A-Za-z]+",
+        "ruleInfo" : "内容必须为26个英文字母组成的字符串",
+        "ruleType" : "REG",
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "valueRuleType" : "SYSVALUERULE"
+    }, {
      "checkMode" : 3,
      "name" : "表单项值规则",
      "getPSDEFValueRule" : {
@@ -1140,23 +1157,6 @@
      },
      "getPSDEFormItemName" : "StuNo",
      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFormItemName" : "Name",
-      "getPSSysValueRule" : {
-        "codeName" : "ValueRule14",
-        "dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
-        "mOSFilePath" : "pssysvaluerules/ValueRule14",
-        "name" : "由26个英文字母组成的字符串",
-        "rTMOSFilePath" : "pssysvaluerules/ValueRule14",
-        "regExCode" : "[A-Za-z]+",
-        "ruleInfo" : "内容必须为26个英文字母组成的字符串",
-        "ruleType" : "REG",
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "valueRuleType" : "SYSVALUERULE"
    } ],
    "getPSDEFormItems" : [ {
      "id" : "srfupdatedate",