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

app_Web/package.json

@@ -13,13 +13,13 @@
   "dependencies": {
     "@floating-ui/dom": "^1.0.4",
     "@ibiz-template/command": "^0.0.1-beta.1",
-    "@ibiz-template/controller": "^0.0.1-beta.9",
-    "@ibiz-template/core": "^0.0.1-beta.9",
-    "@ibiz-template/model": "^0.0.1-beta.9",
-    "@ibiz-template/runtime": "^0.0.1-beta.9",
-    "@ibiz-template/service": "^0.0.1-beta.9",
-    "@ibiz-template/theme": "^0.0.1-beta.9",
-    "@ibiz-template/vue-util": "^0.0.1-beta.9",
+    "@ibiz-template/controller": "^0.0.1-beta.10",
+    "@ibiz-template/core": "^0.0.1-beta.10",
+    "@ibiz-template/model": "^0.0.1-beta.10",
+    "@ibiz-template/runtime": "^0.0.1-beta.10",
+    "@ibiz-template/service": "^0.0.1-beta.10",
+    "@ibiz-template/theme": "^0.0.1-beta.10",
+    "@ibiz-template/vue-util": "^0.0.1-beta.10",
     "@ibiz/dynamic-model-api": "^2.1.5",
     "dayjs": "^1.11.6",
     "lodash-es": "^4.17.21",

app_Web/pnpm-lock.yaml

@@ -5,13 +5,13 @@ specifiers:
   '@commitlint/config-conventional': ^17.2.0
   '@floating-ui/dom': ^1.0.4
   '@ibiz-template/command': ^0.0.1-beta.1
-  '@ibiz-template/controller': ^0.0.1-beta.9
-  '@ibiz-template/core': ^0.0.1-beta.9
-  '@ibiz-template/model': ^0.0.1-beta.9
-  '@ibiz-template/runtime': ^0.0.1-beta.9
-  '@ibiz-template/service': ^0.0.1-beta.9
-  '@ibiz-template/theme': ^0.0.1-beta.9
-  '@ibiz-template/vue-util': ^0.0.1-beta.9
+  '@ibiz-template/controller': ^0.0.1-beta.10
+  '@ibiz-template/core': ^0.0.1-beta.10
+  '@ibiz-template/model': ^0.0.1-beta.10
+  '@ibiz-template/runtime': ^0.0.1-beta.10
+  '@ibiz-template/service': ^0.0.1-beta.10
+  '@ibiz-template/theme': ^0.0.1-beta.10
+  '@ibiz-template/vue-util': ^0.0.1-beta.10
   '@ibiz/dynamic-model-api': ^2.1.5
   '@types/lodash-es': ^4.17.6
   '@types/node': ^18.11.9
@@ -64,13 +64,13 @@ specifiers:
 dependencies:
   '@floating-ui/dom': 1.0.4
   '@ibiz-template/command': 0.0.1-beta.1
-  '@ibiz-template/controller': 0.0.1-beta.9_jbbpjip6gx27x2h3s7bfbxjrqi
-  '@ibiz-template/core': 0.0.1-beta.9_qzytosuu5eg3bvoa74ldx6evva
-  '@ibiz-template/model': 0.0.1-beta.9_yslesr4iih24kokbsmhl36awki
-  '@ibiz-template/runtime': 0.0.1-beta.9_lkkuic6vxpkkl4wpr26kof3rz4
-  '@ibiz-template/service': 0.0.1-beta.9_lbu6ahgqzt7csmij3mhpyrs7fe
-  '@ibiz-template/theme': 0.0.1-beta.9
-  '@ibiz-template/vue-util': 0.0.1-beta.9_gwbafhelszwpbleofloi5a7x2e
+  '@ibiz-template/controller': 0.0.1-beta.10_unp6biys27d6le6lqoop6n2bla
+  '@ibiz-template/core': 0.0.1-beta.10_qzytosuu5eg3bvoa74ldx6evva
+  '@ibiz-template/model': 0.0.1-beta.10_yslesr4iih24kokbsmhl36awki
+  '@ibiz-template/runtime': 0.0.1-beta.10_2a2trvylgcatbxwknfautolhlu
+  '@ibiz-template/service': 0.0.1-beta.10_an55gmo4qg7zh5kafwmyxxpbnu
+  '@ibiz-template/theme': 0.0.1-beta.10
+  '@ibiz-template/vue-util': 0.0.1-beta.10_jovdfgtsta2vzkiozh3c6s54vi
   '@ibiz/dynamic-model-api': 2.1.5_qx-util@0.4.4
   dayjs: 1.11.6
   lodash-es: 4.17.21
@@ -679,8 +679,8 @@ packages:
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/controller/0.0.1-beta.9_jbbpjip6gx27x2h3s7bfbxjrqi:
-    resolution: {integrity: sha512-+3+0b4k3uYZHtuWjBm2vQbxP+x/5q+xDGA8La3SY109n+zWZeUXZxQJTYvwNkxbqhAKBvoYAkquY5Kw95lUNLA==}
+  /@ibiz-template/controller/0.0.1-beta.10_unp6biys27d6le6lqoop6n2bla:
+    resolution: {integrity: sha512-IHdgx6Nn7QUG/2mOghDsYgtkqaqqaOw3anPkpW0yQEMUuOjJlcvZwqaVAzwGf7g13DJLmBfe6/Sj7ktKdhWKrA==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-alpha.2
       '@ibiz-template/model': ^0.0.1-alpha.2
@@ -690,10 +690,10 @@ packages:
       qs: ^6.11.0
       qx-util: ^0.4.4
     dependencies:
-      '@ibiz-template/core': 0.0.1-beta.9_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.9_yslesr4iih24kokbsmhl36awki
-      '@ibiz-template/runtime': 0.0.1-beta.9_lkkuic6vxpkkl4wpr26kof3rz4
-      '@ibiz-template/service': 0.0.1-beta.9_lbu6ahgqzt7csmij3mhpyrs7fe
+      '@ibiz-template/core': 0.0.1-beta.10_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.10_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/runtime': 0.0.1-beta.10_2a2trvylgcatbxwknfautolhlu
+      '@ibiz-template/service': 0.0.1-beta.10_an55gmo4qg7zh5kafwmyxxpbnu
       async-validator: 4.2.5
       dayjs: 1.11.6
       lodash-es: 4.17.21
@@ -701,8 +701,8 @@ packages:
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/core/0.0.1-beta.9_qzytosuu5eg3bvoa74ldx6evva:
-    resolution: {integrity: sha512-/AMm4dlTg7kkeMhY8agm+8bnV/W+gA4VPClg7G0zK2/yLTeI7Df9t5jp/0Y2+QooRLY3JTvwKD16PIBQqpnsAw==}
+  /@ibiz-template/core/0.0.1-beta.10_qzytosuu5eg3bvoa74ldx6evva:
+    resolution: {integrity: sha512-DjNUnGXGmGBEXlD/MhRxO/o1CG52RM1N5AJav2G/Tkxlk4WYQIWLD0VgCkGScTPYKDe4sI3xbDlbmmksYeOGcQ==}
     peerDependencies:
       lodash-es: ^4.17.21
       qx-util: ^0.4.4
@@ -717,8 +717,8 @@ packages:
       - debug
     dev: false
 
-  /@ibiz-template/model/0.0.1-beta.9_yslesr4iih24kokbsmhl36awki:
-    resolution: {integrity: sha512-IOaDzubqD49R7q4iOREhY50hOdyWBhM1fuWZn3lQVeD/3S/owkpMXsBR3ktNSvTA/5FbO8Xe1yKh+PEyjntT/w==}
+  /@ibiz-template/model/0.0.1-beta.10_yslesr4iih24kokbsmhl36awki:
+    resolution: {integrity: sha512-fkjdskefcAULQqlwP9NiLbrXgjcCU+fRvmVAFhzBI1qJ7fzvlsAuU5nlnoALPFv30Cl1KWc2n8+APHM5ud5Y+A==}
     peerDependencies:
       '@ibiz/dynamic-model-api': ^2.1.5
       lodash-es: ^4.17.21
@@ -730,8 +730,8 @@ packages:
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/runtime/0.0.1-beta.9_lkkuic6vxpkkl4wpr26kof3rz4:
-    resolution: {integrity: sha512-p7LIPOQiCwPTy3rOL1M2lbaUXyZTz9lxvDlVHOlDIcTi64mXTFCUgBb55bi8cZ6sYUL5CL6ZHJ+RGcZ0Qo3T3w==}
+  /@ibiz-template/runtime/0.0.1-beta.10_2a2trvylgcatbxwknfautolhlu:
+    resolution: {integrity: sha512-HxHIoT01dAoywIvC5hHL7f/1ngDiFkYghZDMHBA7naJ1zgQS+KiIXHonA6uGeyrETJ8tei6eti0KMMdo2iOr8w==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-alpha.2
       '@ibiz-template/model': ^0.0.1-alpha.2
@@ -739,32 +739,32 @@ packages:
       qx-util: ^0.4.4
     dependencies:
       '@ibiz-template/command': 0.0.1-beta.1
-      '@ibiz-template/core': 0.0.1-beta.9_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.9_yslesr4iih24kokbsmhl36awki
-      '@ibiz-template/service': 0.0.1-beta.9_lbu6ahgqzt7csmij3mhpyrs7fe
+      '@ibiz-template/core': 0.0.1-beta.10_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.10_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/service': 0.0.1-beta.10_an55gmo4qg7zh5kafwmyxxpbnu
       qx-util: 0.4.4
     dev: false
 
-  /@ibiz-template/service/0.0.1-beta.9_lbu6ahgqzt7csmij3mhpyrs7fe:
-    resolution: {integrity: sha512-kT/Tv6wlS/1C8PSYD16rOW9w5Q7ApXczndGTYcYCanDBRLsXcFbmTGcDQVZ8F/qXdALG6cF/uOZF8shZB4BfxA==}
+  /@ibiz-template/service/0.0.1-beta.10_an55gmo4qg7zh5kafwmyxxpbnu:
+    resolution: {integrity: sha512-wvc5gIjCOazX1E/bD8kljAhGbQB3Hq6evdsu/5YD5ByQGm3AZJ1722eEW2Z92wefiL0mh5QT/HW5xJ/wag2P9Q==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-alpha.2
       '@ibiz-template/model': ^0.0.1-alpha.2
       qx-util: ^0.4.4
       ramda: ^0.28.0
     dependencies:
-      '@ibiz-template/core': 0.0.1-beta.9_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.9_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/core': 0.0.1-beta.10_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.10_yslesr4iih24kokbsmhl36awki
       qx-util: 0.4.4
       ramda: 0.28.0
     dev: false
 
-  /@ibiz-template/theme/0.0.1-beta.9:
-    resolution: {integrity: sha512-CcSIi3S1Gh+3+Y/5cp1CsgSP3S0fw0/gW1/zE6bflIW2tS/828oysFTn+4Pk/RaF2q/+HqwTd7Liruz/e/Zd6A==}
+  /@ibiz-template/theme/0.0.1-beta.10:
+    resolution: {integrity: sha512-wXTcu1GKOuIk7RatfS59KSXY0LXQWP8nnVM4avbl8wyTybkYEKpY6O6PAdbn7ysPq0RoAznOfvJ46qyTGvTd9A==}
     dev: false
 
-  /@ibiz-template/vue-util/0.0.1-beta.9_gwbafhelszwpbleofloi5a7x2e:
-    resolution: {integrity: sha512-oIyJFU6k4B0FwAGMNZxpjowpjtPmS+W5Ndute+qi0H1zsEiL66nHcr1b3tFikp6a7LcFFfLVwg+/FiDP6KGYcw==}
+  /@ibiz-template/vue-util/0.0.1-beta.10_jovdfgtsta2vzkiozh3c6s54vi:
+    resolution: {integrity: sha512-9a4iaGy+2+SGiENHnDeQNC/VoTjeOuPcobKAIQ7627eOIHW9FNy0DZ6MoSMQ5+Og6aXtfItnF07slZlxj9H2kQ==}
     peerDependencies:
       '@ibiz-template/controller': '>=0.0.1-alpha.2'
       '@ibiz-template/core': '>=0.0.1-alpha.2'
@@ -775,9 +775,9 @@ packages:
       vue: ^2.7.13
       vue-router: ^3.6.5
     dependencies:
-      '@ibiz-template/controller': 0.0.1-beta.9_jbbpjip6gx27x2h3s7bfbxjrqi
-      '@ibiz-template/core': 0.0.1-beta.9_qzytosuu5eg3bvoa74ldx6evva
-      '@ibiz-template/model': 0.0.1-beta.9_yslesr4iih24kokbsmhl36awki
+      '@ibiz-template/controller': 0.0.1-beta.10_unp6biys27d6le6lqoop6n2bla
+      '@ibiz-template/core': 0.0.1-beta.10_qzytosuu5eg3bvoa74ldx6evva
+      '@ibiz-template/model': 0.0.1-beta.10_yslesr4iih24kokbsmhl36awki
       qs: 6.11.0
       qx-util: 0.4.4
       ramda: 0.28.0

app_Web/src/components/common/view-toolbar/view-toolbar.tsx

@@ -76,14 +76,20 @@ export const ViewToolbar = defineComponent({
         {this.modelData!.source.getPSDEToolbarItems()?.map(item => {
           if (item.itemType === 'SEPERATOR') {
             return (
-              <div key={item.id} class={this.ns.b('item')}>
+              <div
+                key={item.id}
+                class={[this.ns.e('item'), this.ns.e('item-separator')]}
+              >
                 |
               </div>
             );
           }
           if (item.itemType === 'RAWITEM') {
             return (
-              <div key={item.id} class={this.ns.b('item')}>
+              <div
+                key={item.id}
+                class={[this.ns.e('item'), this.ns.e('item-rawitem')]}
+              >
                 {btnContent(item, this.viewMode)}
               </div>
             );
@@ -93,7 +99,10 @@ export const ViewToolbar = defineComponent({
             this.toolbarState[item.id].visible
           ) {
             return (
-              <div key={item.id} class={this.ns.b('item')}>
+              <div
+                key={item.id}
+                class={[this.ns.e('item'), this.ns.e('item-deuiaction')]}
+              >
                 <i-button
                   title={item.tooltip}
                   size={this.btnSize}
@@ -108,7 +117,10 @@ export const ViewToolbar = defineComponent({
           }
           if (item.itemType === 'ITEMS') {
             return (
-              <div key={item.id} class={this.ns.b('item')}>
+              <div
+                key={item.id}
+                class={[this.ns.e('item'), this.ns.e('item-items')]}
+              >
                 <i-dropdown trigger='click' placement='bottom-start'>
                   <i-button title={item.tooltip} size={this.btnSize}>
                     {btnContent(item, this.viewMode)}

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

-import { defineComponent, ref } from 'vue';
+import { computed, defineComponent, ref } from 'vue';
 import { IndexViewModel } from '@ibiz-template/model';
 import { useNamespace } from '@ibiz-template/vue-util';
 import { Namespace } from '@ibiz-template/core';
@@ -39,12 +39,18 @@ export const AppLayout = defineComponent({
       emit('onCollapseChange', collapseChange.value);
     };
 
-    return { ns, collapseChange, collapseMenus };
+    const isBlank = computed(() => props.model.source.blankMode === true);
+
+    return { ns, collapseChange, isBlank, collapseMenus };
   },
   render() {
     return this.isComplete ? (
       <i-layout
-        class={[this.ns.b(), this.ns.is('collapse', this.collapseChange)]}
+        class={[
+          this.ns.b(),
+          this.isBlank ? this.ns.m('blank') : '',
+          this.ns.is('collapse', this.collapseChange),
+        ]}
       >
         <i-sider
           hide-trigger
@@ -61,7 +67,7 @@ export const AppLayout = defineComponent({
           <i-header class={this.ns.b('header')}>
             <div class={this.ns.be('header', 'left')}>
               {renderLogo(this.ns, this.model)}
-              <div class={this.ns.be('header', 'icon')}>
+              <div class={this.ns.be('header', 'collapse-icon')}>
                 {!this.collapseChange ? (
                   <ion-icon
                     src={'./assets/img/menu-fold.svg'}

app_Web/src/util/open-view-util/open-view-util.ts

@@ -29,13 +29,13 @@ export class OpenViewUtil implements IOpenViewUtil {
   root(
     appView: IPSAppView,
     context?: IBizContext | undefined,
-    _params?: IParams | undefined,
+    params?: IParams | undefined,
   ): void {
     const path = generateRoutePath(
       appView,
       router.currentRoute,
       context,
-      _params,
+      params,
     );
 
     router.push({ path });

app_Web/src/views/app-redirect-view/app-redirect-view.tsx

@@ -61,7 +61,6 @@ export default defineComponent({
 
       // 删除跳转用参数
       delete params.srfdename;
-      delete params.srfindexname;
 
       await ibiz.commands.execute(
         OpenAppViewCommand.TAG,

app_Web/src/views/index-view/index-view.ts

+import { IndexViewController } from '@ibiz-template/controller';
 import { useRouter } from '@ibiz-template/vue-util';
 import Vue, { ref, watch } from 'vue';
 
@@ -22,7 +23,10 @@ export interface RouteMsg {
   caption?: string;
 }
 
-export function useIndexRouteManage(proxy: Vue) {
+export function useIndexRouteManage(
+  proxy: Vue,
+  controller: IndexViewController,
+) {
   const router = useRouter(proxy);
 
   /** 当前的路由标识，只由二级路由组成，二级路由一致则就是同一个视图 */
@@ -129,8 +133,12 @@ export function useIndexRouteManage(proxy: Vue) {
     deleteRouteCache([key]);
     const toKey = keyHistory.value[0];
     if (!toKey) {
-      currentKey.value = '';
-      router.push(indexPath.value);
+      if (controller.model.source.blankMode) {
+        window.close();
+      } else {
+        currentKey.value = '';
+        router.push(indexPath.value);
+      }
     } else {
       const find = routeMsgs.value.find(item => item.key === toKey);
       router.push(find!.fullPath);

app_Web/src/views/index-view/index-view.vue

@@ -25,7 +25,7 @@ const {
   updateRouteMsg,
   closeView,
   deleteRouteCache,
-} = useIndexRouteManage(proxy);
+} = useIndexRouteManage(proxy, c);
 
 // 视图初始化，监听事件
 const onCreated = (neuron: ViewNeuron) => {

app_Web/yarn.lock

@@ -504,53 +504,53 @@
   dependencies:
     qx-util "^0.4.4"
 
-"@ibiz-template/controller@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.9.tgz#bfa55b6b2fc3544e408d55f6ea9c72f108755e68"
-  integrity sha512-+3+0b4k3uYZHtuWjBm2vQbxP+x/5q+xDGA8La3SY109n+zWZeUXZxQJTYvwNkxbqhAKBvoYAkquY5Kw95lUNLA==
+"@ibiz-template/controller@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.10.tgz#3bd7443e44f18f90c56be6f7c3542e332196190f"
+  integrity sha512-IHdgx6Nn7QUG/2mOghDsYgtkqaqqaOw3anPkpW0yQEMUuOjJlcvZwqaVAzwGf7g13DJLmBfe6/Sj7ktKdhWKrA==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.9.tgz#5d19b3b6cedaf2e7e09d2d8841697d8c9f42824e"
-  integrity sha512-/AMm4dlTg7kkeMhY8agm+8bnV/W+gA4VPClg7G0zK2/yLTeI7Df9t5jp/0Y2+QooRLY3JTvwKD16PIBQqpnsAw==
+"@ibiz-template/core@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.10.tgz#377763e885534e0b0370a44bc4312128ba1a1d07"
+  integrity sha512-DjNUnGXGmGBEXlD/MhRxO/o1CG52RM1N5AJav2G/Tkxlk4WYQIWLD0VgCkGScTPYKDe4sI3xbDlbmmksYeOGcQ==
   dependencies:
     axios "^1.1.3"
     loglevel "^1.8.0"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.9.tgz#859e180b3c5791166940c77eb86c3b28dcac6256"
-  integrity sha512-IOaDzubqD49R7q4iOREhY50hOdyWBhM1fuWZn3lQVeD/3S/owkpMXsBR3ktNSvTA/5FbO8Xe1yKh+PEyjntT/w==
+"@ibiz-template/model@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.10.tgz#c3176060b9b6677556277a2558deab121f1170e3"
+  integrity sha512-fkjdskefcAULQqlwP9NiLbrXgjcCU+fRvmVAFhzBI1qJ7fzvlsAuU5nlnoALPFv30Cl1KWc2n8+APHM5ud5Y+A==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.1.5"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.9.tgz#8852cf8b9bf6341152aaaaeb6c6c6a660e062f89"
-  integrity sha512-p7LIPOQiCwPTy3rOL1M2lbaUXyZTz9lxvDlVHOlDIcTi64mXTFCUgBb55bi8cZ6sYUL5CL6ZHJ+RGcZ0Qo3T3w==
+"@ibiz-template/runtime@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.10.tgz#b0e42da32f472941d71a41c8af3dc6896ab538e1"
+  integrity sha512-HxHIoT01dAoywIvC5hHL7f/1ngDiFkYghZDMHBA7naJ1zgQS+KiIXHonA6uGeyrETJ8tei6eti0KMMdo2iOr8w==
   dependencies:
     "@ibiz-template/command" "^0.0.1-beta.1"
 
-"@ibiz-template/service@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.9.tgz#3c04aca42ef8efee4b6015de78ce6fa3a6d41a92"
-  integrity sha512-kT/Tv6wlS/1C8PSYD16rOW9w5Q7ApXczndGTYcYCanDBRLsXcFbmTGcDQVZ8F/qXdALG6cF/uOZF8shZB4BfxA==
+"@ibiz-template/service@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.10.tgz#d15cff75435c8ebc173175d0f8a5d6639c576f35"
+  integrity sha512-wvc5gIjCOazX1E/bD8kljAhGbQB3Hq6evdsu/5YD5ByQGm3AZJ1722eEW2Z92wefiL0mh5QT/HW5xJ/wag2P9Q==
 
-"@ibiz-template/theme@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.9.tgz#07484278826f15c1003f746840730bef3b99fab7"
-  integrity sha512-CcSIi3S1Gh+3+Y/5cp1CsgSP3S0fw0/gW1/zE6bflIW2tS/828oysFTn+4Pk/RaF2q/+HqwTd7Liruz/e/Zd6A==
+"@ibiz-template/theme@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.10.tgz#805843c9c5b726bd45b353572a3bcd66d090002f"
+  integrity sha512-wXTcu1GKOuIk7RatfS59KSXY0LXQWP8nnVM4avbl8wyTybkYEKpY6O6PAdbn7ysPq0RoAznOfvJ46qyTGvTd9A==
 
-"@ibiz-template/vue-util@^0.0.1-beta.9":
-  version "0.0.1-beta.9"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.9.tgz#a4968c9de4d09349f792248c888fbb328772288c"
-  integrity sha512-oIyJFU6k4B0FwAGMNZxpjowpjtPmS+W5Ndute+qi0H1zsEiL66nHcr1b3tFikp6a7LcFFfLVwg+/FiDP6KGYcw==
+"@ibiz-template/vue-util@^0.0.1-beta.10":
+  version "0.0.1-beta.10"
+  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.10.tgz#a34aed1933c0b5d8586b463da65d47f4d60bdf97"
+  integrity sha512-9a4iaGy+2+SGiENHnDeQNC/VoTjeOuPcobKAIQ7627eOIHW9FNy0DZ6MoSMQ5+Og6aXtfItnF07slZlxj9H2kQ==
 
 "@ibiz/dynamic-model-api@^2.1.5":
   version "2.1.5"

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",

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",