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

app_Web/package.json

@@ -12,14 +12,14 @@
   },
   "dependencies": {
     "@floating-ui/dom": "^1.0.11",
-    "@ibiz-template/command": "^0.0.1-beta.40",
-    "@ibiz-template/controller": "^0.0.1-beta.40",
-    "@ibiz-template/core": "^0.0.1-beta.40",
-    "@ibiz-template/model": "^0.0.1-beta.40",
-    "@ibiz-template/runtime": "^0.0.1-beta.40",
-    "@ibiz-template/service": "^0.0.1-beta.40",
-    "@ibiz-template/theme": "^0.0.1-beta.40",
-    "@ibiz-template/vue-util": "^0.0.1-beta.40",
+    "@ibiz-template/command": "^0.0.1-beta.41",
+    "@ibiz-template/controller": "^0.0.1-beta.41",
+    "@ibiz-template/core": "^0.0.1-beta.41",
+    "@ibiz-template/model": "^0.0.1-beta.41",
+    "@ibiz-template/runtime": "^0.0.1-beta.41",
+    "@ibiz-template/service": "^0.0.1-beta.41",
+    "@ibiz-template/theme": "^0.0.1-beta.41",
+    "@ibiz-template/vue-util": "^0.0.1-beta.41",
     "@ibiz/dynamic-model-api": "^2.1.11",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",

app_Web/pnpm-lock.yaml

@@ -4,14 +4,14 @@ specifiers:
   '@commitlint/cli': ^17.3.0
   '@commitlint/config-conventional': ^17.3.0
   '@floating-ui/dom': ^1.0.11
-  '@ibiz-template/command': ^0.0.1-beta.40
-  '@ibiz-template/controller': ^0.0.1-beta.40
-  '@ibiz-template/core': ^0.0.1-beta.40
-  '@ibiz-template/model': ^0.0.1-beta.40
-  '@ibiz-template/runtime': ^0.0.1-beta.40
-  '@ibiz-template/service': ^0.0.1-beta.40
-  '@ibiz-template/theme': ^0.0.1-beta.40
-  '@ibiz-template/vue-util': ^0.0.1-beta.40
+  '@ibiz-template/command': ^0.0.1-beta.41
+  '@ibiz-template/controller': ^0.0.1-beta.41
+  '@ibiz-template/core': ^0.0.1-beta.41
+  '@ibiz-template/model': ^0.0.1-beta.41
+  '@ibiz-template/runtime': ^0.0.1-beta.41
+  '@ibiz-template/service': ^0.0.1-beta.41
+  '@ibiz-template/theme': ^0.0.1-beta.41
+  '@ibiz-template/vue-util': ^0.0.1-beta.41
   '@ibiz/dynamic-model-api': ^2.1.11
   '@types/lodash-es': ^4.17.6
   '@types/node': ^18.11.15
@@ -63,14 +63,14 @@ specifiers:
 
 dependencies:
   '@floating-ui/dom': 1.0.11
-  '@ibiz-template/command': 0.0.1-beta.40
-  '@ibiz-template/controller': 0.0.1-beta.40_37ayjn5zkwz5xrcggrk7vrtss4
-  '@ibiz-template/core': 0.0.1-beta.40_qzytosuu5eg3bvoa74ldx6evva
-  '@ibiz-template/model': 0.0.1-beta.40_nngk5znuztmoeynqrwf7jk7xse
-  '@ibiz-template/runtime': 0.0.1-beta.40_e7rgjzviy5tpqlggmtw55jhx5m
-  '@ibiz-template/service': 0.0.1-beta.40_b3wzgms7gw3yr4dgumchumncyq
-  '@ibiz-template/theme': 0.0.1-beta.40
-  '@ibiz-template/vue-util': 0.0.1-beta.40_rlbhvadyq25fgcwpie3epzkuwi
+  '@ibiz-template/command': 0.0.1-beta.41
+  '@ibiz-template/controller': 0.0.1-beta.41_mhiv3zm2gzaps2sbh5iulywewu
+  '@ibiz-template/core': 0.0.1-beta.41_qzytosuu5eg3bvoa74ldx6evva
+  '@ibiz-template/model': 0.0.1-beta.41_nngk5znuztmoeynqrwf7jk7xse
+  '@ibiz-template/runtime': 0.0.1-beta.41_5shx2vah5cuah4fqujcr4k2cja
+  '@ibiz-template/service': 0.0.1-beta.41_r3w3xhniijev2yzvfsjiwouuxi
+  '@ibiz-template/theme': 0.0.1-beta.41
+  '@ibiz-template/vue-util': 0.0.1-beta.41_ej6v47uock3ysfitevcsukqpay
   '@ibiz/dynamic-model-api': 2.1.11_qx-util@0.4.4
   dayjs: 1.11.7
   lodash-es: 4.17.21
@@ -891,14 +891,14 @@ packages:
     resolution: {integrity: sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==}
     dev: true
 
-  /@ibiz-template/command/0.0.1-beta.40:
-    resolution: {integrity: sha512-s42DRfv/hNKI9Fo9xxvw6JFcyTX3l/aZp2ktO8ImxWMfJpKhCDoEHzVCxovQ6AfJS3J0wvxbow3rLsqxtxiRNQ==}
+  /@ibiz-template/command/0.0.1-beta.41:
+    resolution: {integrity: sha512-cNshIH+N3wrib63K7XWu9tHEstmCtIo+sP0SVZ5hJFWeoE7Ewghg+7Cw6wm7DMklxEq38Y1C2d9bxqaJY7dQDQ==}
     dependencies:
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/controller/0.0.1-beta.40_37ayjn5zkwz5xrcggrk7vrtss4:
-    resolution: {integrity: sha512-VJX7AbqAKAKj+p7tL64qNV8QVnR4Yt5gkIJGbqcnmDdvQm62MYJLhE7GU+NG1zID27d6MASxUeYbKJvSZlEEig==}
+  /@ibiz-template/controller/0.0.1-beta.41_mhiv3zm2gzaps2sbh5iulywewu:
+    resolution: {integrity: sha512-FlRm1Ki+ML0lAnRqJo2O9om1aQShRKIQU9HyQL8WpGfGJP95Rlh7TDRcJd5d4s9deJed1KU5nMTTH9o0IQDOZA==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-beta.30
       '@ibiz-template/model': ^0.0.1-beta.30
@@ -908,10 +908,10 @@ packages:
       qs: ^6.11.0
       qx-util: ^0.4.4
     dependencies:
-      '@ibiz-template/core': 0.0.1-beta.40_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.40_nngk5znuztmoeynqrwf7jk7xse
-      '@ibiz-template/runtime': 0.0.1-beta.40_e7rgjzviy5tpqlggmtw55jhx5m
-      '@ibiz-template/service': 0.0.1-beta.40_b3wzgms7gw3yr4dgumchumncyq
+      '@ibiz-template/core': 0.0.1-beta.41_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.41_nngk5znuztmoeynqrwf7jk7xse
+      '@ibiz-template/runtime': 0.0.1-beta.41_5shx2vah5cuah4fqujcr4k2cja
+      '@ibiz-template/service': 0.0.1-beta.41_r3w3xhniijev2yzvfsjiwouuxi
       async-validator: 4.2.5
       dayjs: 1.11.7
       lodash-es: 4.17.21
@@ -919,8 +919,8 @@ packages:
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/core/0.0.1-beta.40_qzytosuu5eg3bvoa74ldx6evva:
-    resolution: {integrity: sha512-FWyK9inmmq9a/5mW5feEqI356edd/4kQKsM1B+GjkOPDr28zxDscuZ2tz3SPNjNQ76TLOPOeCKhc6vNt7ZBijw==}
+  /@ibiz-template/core/0.0.1-beta.41_qzytosuu5eg3bvoa74ldx6evva:
+    resolution: {integrity: sha512-viuGlkK8VjTI1wia0yIz4zxtZBvSCzJEmlpiRovCo9jAnl+Bm7FE+H/MJl//CenVD+vEL0GDaUh+YR1tNQ4t2Q==}
     peerDependencies:
       lodash-es: ^4.17.21
       qx-util: ^0.4.4
@@ -935,8 +935,8 @@ packages:
       - debug
     dev: false
 
-  /@ibiz-template/model/0.0.1-beta.40_nngk5znuztmoeynqrwf7jk7xse:
-    resolution: {integrity: sha512-e+rkkzu69lfR7UTDzS0LCNZI+s477AXaBHZZHljSiKJUYjiyL6gZqDu38PtrNh7oEwI2WGSz+uoPmOu3Qsv6NQ==}
+  /@ibiz-template/model/0.0.1-beta.41_nngk5znuztmoeynqrwf7jk7xse:
+    resolution: {integrity: sha512-7bLJHEbIUeAX2B2VYNCF8nKTT1CCr4bLZTFBKYMqx9itySEaPfCHy0TWXsvbZ8HTGPjpsBiBgyYcN0UEPPOyAQ==}
     peerDependencies:
       '@ibiz/dynamic-model-api': ^2.1.11
       lodash-es: ^4.17.21
@@ -948,42 +948,42 @@ packages:
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/runtime/0.0.1-beta.40_e7rgjzviy5tpqlggmtw55jhx5m:
-    resolution: {integrity: sha512-8/iqeafg6QkhaEdlyXg+wU5yUQBoH4RXn3s8habC2L6Z9hvGNkQplkgmmIya+Ndi7LazFGBZfVSzSQWNp2Xcyg==}
+  /@ibiz-template/runtime/0.0.1-beta.41_5shx2vah5cuah4fqujcr4k2cja:
+    resolution: {integrity: sha512-Y2brQzrfLr/NmEkAaWwOI53Qo/pjA+qyAzDf3dS++vIPhZ0u4SltFNLpJKY3LERsYU9cPobx8V2zbK2P20t3Cg==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-beta.30
       '@ibiz-template/model': ^0.0.1-beta.30
       '@ibiz-template/service': ^0.0.1-beta.30
       qx-util: ^0.4.4
     dependencies:
-      '@ibiz-template/command': 0.0.1-beta.40
-      '@ibiz-template/core': 0.0.1-beta.40_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.40_nngk5znuztmoeynqrwf7jk7xse
-      '@ibiz-template/service': 0.0.1-beta.40_b3wzgms7gw3yr4dgumchumncyq
+      '@ibiz-template/command': 0.0.1-beta.41
+      '@ibiz-template/core': 0.0.1-beta.41_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.41_nngk5znuztmoeynqrwf7jk7xse
+      '@ibiz-template/service': 0.0.1-beta.41_r3w3xhniijev2yzvfsjiwouuxi
       qs: 6.11.0
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/service/0.0.1-beta.40_b3wzgms7gw3yr4dgumchumncyq:
-    resolution: {integrity: sha512-axqcFVRkOB+Gt+IGNxtqkwm8lpANBy6rts9z/YR2kgWwvG2eAXXyN4XZzysKFBKKe/ATXIspXp+JLzDByWLUUg==}
+  /@ibiz-template/service/0.0.1-beta.41_r3w3xhniijev2yzvfsjiwouuxi:
+    resolution: {integrity: sha512-XAlLgCU1DKs2ApNBE+7wFjHeGwcKB4sctWCpPNUoJLGmSCJtgoEpCWLojVk0zhgzGkYF36WQFurmVn1RkN20Aw==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-beta.30
       '@ibiz-template/model': ^0.0.1-beta.30
       qx-util: ^0.4.4
       ramda: ^0.28.0
     dependencies:
-      '@ibiz-template/core': 0.0.1-beta.40_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.40_nngk5znuztmoeynqrwf7jk7xse
+      '@ibiz-template/core': 0.0.1-beta.41_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.41_nngk5znuztmoeynqrwf7jk7xse
       qx-util: 0.4.4
       ramda: 0.28.0
     dev: false
 
-  /@ibiz-template/theme/0.0.1-beta.40:
-    resolution: {integrity: sha512-97Nm2XjAJzvZYRJHT4MNl/6ayFoc5aeITqgSZoTuwUSqP/HWgd9yZzeJ9l5dVLa/6/fR7R8sqDqUoWa+F2X57w==}
+  /@ibiz-template/theme/0.0.1-beta.41:
+    resolution: {integrity: sha512-kKGu0XA/wh5qQApHaPrGVfdcIITmSySdsay1+FJ4Xoq3f772LXSBPQmuvBYXdWeKYNcQJgqhkk9v0KvVAjUZOw==}
     dev: false
 
-  /@ibiz-template/vue-util/0.0.1-beta.40_rlbhvadyq25fgcwpie3epzkuwi:
-    resolution: {integrity: sha512-yKMC5wffJa9rHaUIs7YClEFxouHQkiEqvBhETGtqfImwaI+BMw0ytz6g01SWXQcRivy6r+nYBqqawCSbz7d8+g==}
+  /@ibiz-template/vue-util/0.0.1-beta.41_ej6v47uock3ysfitevcsukqpay:
+    resolution: {integrity: sha512-z6qc+9HKbsM7fSBaPxlTFy8l9OOHytKPVaWNSrzulVvBjaltDvAaF+Ksdi/JKkNpCoEmz1T86BBTczaagBF5PQ==}
     peerDependencies:
       '@ibiz-template/controller': ^0.0.1-beta.30
       '@ibiz-template/core': ^0.0.1-beta.30
@@ -994,9 +994,9 @@ packages:
       vue: ^2.7.14
       vue-router: ^3.6.5
     dependencies:
-      '@ibiz-template/controller': 0.0.1-beta.40_37ayjn5zkwz5xrcggrk7vrtss4
-      '@ibiz-template/core': 0.0.1-beta.40_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.40_nngk5znuztmoeynqrwf7jk7xse
+      '@ibiz-template/controller': 0.0.1-beta.41_mhiv3zm2gzaps2sbh5iulywewu
+      '@ibiz-template/core': 0.0.1-beta.41_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.41_nngk5znuztmoeynqrwf7jk7xse
       qs: 6.11.0
       qx-util: 0.4.4
       ramda: 0.28.0

app_Web/src/guard/auth-guard/auth-guard.ts

-import { OrgData } from '@ibiz-template/core';
+import { CoreConst, OrgData } from '@ibiz-template/core';
 import { ModelUtil } from '@ibiz-template/model';
+import { getCookie, setCookie } from 'qx-util';
 import { UnauthorizedHandler } from '../unauthorized-handler/unauthorized-handler';
 
 /**
@@ -82,6 +83,28 @@ async function loadOrgData(): Promise<void> {
   }
 }
 
+function setRefreshToken() {
+  const token = getCookie(CoreConst.TOKEN);
+  const expirein = getCookie(CoreConst.TOKEN_EXPIRES);
+  if (token && expirein) {
+    // 计算到过期时间所需的延时毫秒数，预留提前量
+    let wait = Number(expirein) - new Date().getTime();
+    const early = 5 * 60 * 1000;
+    wait = wait > early ? wait - early : 0;
+    setTimeout(async () => {
+      const res = await ibiz.net.get(`/uaa/refreshtoken2`);
+      if (res.ok) {
+        setCookie(CoreConst.TOKEN, res.data.token, 0, true);
+        const expiredDate =
+          new Date().getTime() + (res.data.expirein || 7199) * 1000;
+        setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
+      }
+      // 下一次延时做准备
+      setRefreshToken();
+    }, wait);
+  }
+}
+
 /**
  * 应用参数初始化
  *
@@ -94,6 +117,7 @@ async function appInit(): Promise<void> {
     await loadOrgData();
     await loadAppData();
     await loadModel();
+    setRefreshToken();
     // 设置权限服务需要的appData里的数据
     await ibiz.authority.init();
   } catch (error) {

app_Web/src/provider/editor/file-uploader-provider.ts

@@ -20,9 +20,9 @@ export class FileUploaderEditorProvider implements IEditorProvider {
   gridEditor: string = 'IBizGridFileUpload';
 
   constructor(editorType: string) {
-    if (editorType === 'PICTURE') {
+    if (editorType.includes('PICTURE')) {
       this.formEditor = 'IBizImageUpload';
-    } else if (editorType === 'FILEUPLOADER') {
+    } else if (editorType.includes('FILEUPLOADER')) {
       this.formEditor = 'IBizFileUpload';
     }
   }

app_Web/src/provider/editor/index.ts

@@ -58,8 +58,16 @@ export function presetEditorProvider(): void {
     'FILEUPLOADER',
     new FileUploaderEditorProvider('FILEUPLOADER'),
   );
+  editorRegister.register(
+    'FILEUPLOADER_ONE',
+    new FileUploaderEditorProvider('FILEUPLOADER_ONE'),
+  );
   // 图片上传
   editorRegister.register('PICTURE', new FileUploaderEditorProvider('PICTURE'));
+  editorRegister.register(
+    'PICTURE_ONE',
+    new FileUploaderEditorProvider('PICTURE_ONE'),
+  );
 
   // 数据选择类
   editorRegister.register('PICKER', new DataPickerEditorProvider('PICKER'));

app_Web/src/views/login-view/login-view.tsx

@@ -77,7 +77,10 @@ export default defineComponent({
             if (res.ok) {
               const { data } = res;
               if (data && data.token) {
-                setCookie(CoreConst.TOKEN, data.token, 7, true);
+                setCookie(CoreConst.TOKEN, data.token, 0, true);
+                const expiredDate =
+                  new Date().getTime() + (data.expirein || 7199) * 1000;
+                setCookie(CoreConst.TOKEN_EXPIRES, `${expiredDate}`, 0, true);
                 router.push({ path: ru });
                 return;
               }

app_Web/yarn.lock

@@ -637,61 +637,61 @@
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@ibiz-template/command@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcommand/-/command-0.0.1-beta.40.tgz#ac59fe33c2afa8de10e1d5d05a3e0ee159ecaf45"
-  integrity sha512-s42DRfv/hNKI9Fo9xxvw6JFcyTX3l/aZp2ktO8ImxWMfJpKhCDoEHzVCxovQ6AfJS3J0wvxbow3rLsqxtxiRNQ==
+"@ibiz-template/command@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcommand/-/command-0.0.1-beta.41.tgz#e44133575219ab3dadd5658f5ccdccd46dd3bbe0"
+  integrity sha512-cNshIH+N3wrib63K7XWu9tHEstmCtIo+sP0SVZ5hJFWeoE7Ewghg+7Cw6wm7DMklxEq38Y1C2d9bxqaJY7dQDQ==
   dependencies:
     qx-util "^0.4.4"
 
-"@ibiz-template/controller@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.40.tgz#912f5f6a43daa15902779d13d7c91dab9d055ee6"
-  integrity sha512-VJX7AbqAKAKj+p7tL64qNV8QVnR4Yt5gkIJGbqcnmDdvQm62MYJLhE7GU+NG1zID27d6MASxUeYbKJvSZlEEig==
+"@ibiz-template/controller@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.41.tgz#7f8c8073be112ab94c0ec040d5c2dc361cd85f6a"
+  integrity sha512-FlRm1Ki+ML0lAnRqJo2O9om1aQShRKIQU9HyQL8WpGfGJP95Rlh7TDRcJd5d4s9deJed1KU5nMTTH9o0IQDOZA==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.40.tgz#3d9769005c4f869f1fcfc49508544015a2f765d1"
-  integrity sha512-FWyK9inmmq9a/5mW5feEqI356edd/4kQKsM1B+GjkOPDr28zxDscuZ2tz3SPNjNQ76TLOPOeCKhc6vNt7ZBijw==
+"@ibiz-template/core@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.41.tgz#93f6e1706d9e717a03f41e7ae00d72a809c89ce3"
+  integrity sha512-viuGlkK8VjTI1wia0yIz4zxtZBvSCzJEmlpiRovCo9jAnl+Bm7FE+H/MJl//CenVD+vEL0GDaUh+YR1tNQ4t2Q==
   dependencies:
     axios "^1.2.1"
     loglevel "^1.8.0"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.40.tgz#5386c514902515b66eece39ca0256d1642fd4dcc"
-  integrity sha512-e+rkkzu69lfR7UTDzS0LCNZI+s477AXaBHZZHljSiKJUYjiyL6gZqDu38PtrNh7oEwI2WGSz+uoPmOu3Qsv6NQ==
+"@ibiz-template/model@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.41.tgz#b3f5606e3212016f62503da470a6b45a7c54ead7"
+  integrity sha512-7bLJHEbIUeAX2B2VYNCF8nKTT1CCr4bLZTFBKYMqx9itySEaPfCHy0TWXsvbZ8HTGPjpsBiBgyYcN0UEPPOyAQ==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.1.11"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.40.tgz#67a79e2b1996fbbe489a9d510b695151dbd26506"
-  integrity sha512-8/iqeafg6QkhaEdlyXg+wU5yUQBoH4RXn3s8habC2L6Z9hvGNkQplkgmmIya+Ndi7LazFGBZfVSzSQWNp2Xcyg==
+"@ibiz-template/runtime@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.41.tgz#efe6fbe4276a1dad2496af99987d9870990229fa"
+  integrity sha512-Y2brQzrfLr/NmEkAaWwOI53Qo/pjA+qyAzDf3dS++vIPhZ0u4SltFNLpJKY3LERsYU9cPobx8V2zbK2P20t3Cg==
   dependencies:
-    "@ibiz-template/command" "^0.0.1-beta.40"
+    "@ibiz-template/command" "^0.0.1-beta.41"
     qs "^6.11.0"
 
-"@ibiz-template/service@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.40.tgz#48a1bd3af9d19c6dbe49e35d8f3c413d3e1d83a3"
-  integrity sha512-axqcFVRkOB+Gt+IGNxtqkwm8lpANBy6rts9z/YR2kgWwvG2eAXXyN4XZzysKFBKKe/ATXIspXp+JLzDByWLUUg==
+"@ibiz-template/service@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.41.tgz#82f25c1cbf4f5e0e6357c744a3d354ff5a20f572"
+  integrity sha512-XAlLgCU1DKs2ApNBE+7wFjHeGwcKB4sctWCpPNUoJLGmSCJtgoEpCWLojVk0zhgzGkYF36WQFurmVn1RkN20Aw==
 
-"@ibiz-template/theme@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.40.tgz#b857bf1e6b3e9c6c55701d13313209190bb64586"
-  integrity sha512-97Nm2XjAJzvZYRJHT4MNl/6ayFoc5aeITqgSZoTuwUSqP/HWgd9yZzeJ9l5dVLa/6/fR7R8sqDqUoWa+F2X57w==
+"@ibiz-template/theme@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.41.tgz#62408384c67fa37893b3f19812df9286468079ed"
+  integrity sha512-kKGu0XA/wh5qQApHaPrGVfdcIITmSySdsay1+FJ4Xoq3f772LXSBPQmuvBYXdWeKYNcQJgqhkk9v0KvVAjUZOw==
 
-"@ibiz-template/vue-util@^0.0.1-beta.40":
-  version "0.0.1-beta.40"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.40.tgz#074b6ad3beaa7516785748c628ca09a799b4b79a"
-  integrity sha512-yKMC5wffJa9rHaUIs7YClEFxouHQkiEqvBhETGtqfImwaI+BMw0ytz6g01SWXQcRivy6r+nYBqqawCSbz7d8+g==
+"@ibiz-template/vue-util@^0.0.1-beta.41":
+  version "0.0.1-beta.41"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.41.tgz#a35ea850c5f282c60e1d3a4a369737654407c679"
+  integrity sha512-z6qc+9HKbsM7fSBaPxlTFy8l9OOHytKPVaWNSrzulVvBjaltDvAaF+Ksdi/JKkNpCoEmz1T86BBTczaagBF5PQ==
 
 "@ibiz/dynamic-model-api@^2.1.11":
   version "2.1.11"

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

@@ -1209,16 +1209,16 @@
     "mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"

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

@@ -2155,16 +2155,16 @@
     "mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ],
     "rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"