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

c9fcaba2 · ibizdev · 3e64cb95 · c9fcaba2 · c9fcaba2 · c9fcaba2
--- a/app_Web/index.html
+++ b/app_Web/index.html
@@ -16,7 +16,7 @@
      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 src="/extras/js/system/6.14.1/system.min.js"></script>
    <script
      type="systemjs-importmap"
      src="/extras/json/system-import.json"

--- a/app_Web/package.json
+++ b/app_Web/package.json
@@ -13,13 +13,13 @@
  "dependencies": {
    "@floating-ui/dom": "^1.0.11",
    "@ibiz-template/command": "^0.0.1-beta.50",
-    "@ibiz-template/controller": "^0.0.1-beta.50",
-    "@ibiz-template/core": "^0.0.1-beta.50",
+    "@ibiz-template/controller": "^0.0.1-beta.51",
+    "@ibiz-template/core": "^0.0.1-beta.51",
    "@ibiz-template/model": "^0.0.1-beta.50",
-    "@ibiz-template/runtime": "^0.0.1-beta.50",
-    "@ibiz-template/service": "^0.0.1-beta.50",
+    "@ibiz-template/runtime": "^0.0.1-beta.51",
+    "@ibiz-template/service": "^0.0.1-beta.51",
    "@ibiz-template/theme": "^0.0.1-beta.50",
-    "@ibiz-template/vue-util": "^0.0.1-beta.50",
+    "@ibiz-template/vue-util": "^0.0.1-beta.51",
    "@ibiz/dynamic-model-api": "^2.1.17",
    "dayjs": "^1.11.7",
    "lodash-es": "^4.17.21",

--- a/app_Web/pnpm-lock.yaml
+++ b/app_Web/pnpm-lock.yaml
@@ -8,26 +8,26 @@ dependencies:
    specifier: ^0.0.1-beta.50
    version: 0.0.1-beta.50
  '@ibiz-template/controller':
-    specifier: ^0.0.1-beta.50
-    version: 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/runtime@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
+    specifier: ^0.0.1-beta.51
+    version: 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/runtime@0.0.1-beta.51)(@ibiz-template/service@0.0.1-beta.51)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
  '@ibiz-template/core':
-    specifier: ^0.0.1-beta.50
-    version: 0.0.1-beta.50(lodash-es@4.17.21)(qx-util@0.4.8)
+    specifier: ^0.0.1-beta.51
+    version: 0.0.1-beta.51(lodash-es@4.17.21)(qx-util@0.4.8)
  '@ibiz-template/model':
    specifier: ^0.0.1-beta.50
    version: 0.0.1-beta.50(@ibiz/dynamic-model-api@2.1.17)(lodash-es@4.17.21)(qx-util@0.4.8)
  '@ibiz-template/runtime':
-    specifier: ^0.0.1-beta.50
-    version: 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(qx-util@0.4.8)
+    specifier: ^0.0.1-beta.51
+    version: 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.51)(qx-util@0.4.8)
  '@ibiz-template/service':
-    specifier: ^0.0.1-beta.50
-    version: 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
+    specifier: ^0.0.1-beta.51
+    version: 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
  '@ibiz-template/theme':
    specifier: ^0.0.1-beta.50
    version: 0.0.1-beta.50
  '@ibiz-template/vue-util':
-    specifier: ^0.0.1-beta.50
-    version: 0.0.1-beta.50(@ibiz-template/controller@0.0.1-beta.50)(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14)
+    specifier: ^0.0.1-beta.51
+    version: 0.0.1-beta.51(@ibiz-template/controller@0.0.1-beta.51)(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.51)(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.17
    version: 2.1.17(qx-util@0.4.8)
@@ -938,8 +938,8 @@ packages:
      qx-util: 0.4.8
    dev: false

-  /@ibiz-template/controller@0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/runtime@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
-    resolution: {integrity: sha512-NOLXOIgLmkL0HTdhw3IarN90GQJI5uaHdMmSQ60I5/PovWk//cuWM7yKHgEyHyWjURsVDF30hc9mKTIja1LIkQ==}
+  /@ibiz-template/controller@0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/runtime@0.0.1-beta.51)(@ibiz-template/service@0.0.1-beta.51)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8):
+    resolution: {integrity: sha512-kJCA2xgi3S6svxO6UWB1tm39oYG49ZUpmi6bacjLC3S2Mnzms64H04G20jA7uClgaSnOfmvuC6SZlqgTrlAErw==}
    peerDependencies:
      '@ibiz-template/core': ^0.0.1-beta.30
      '@ibiz-template/model': ^0.0.1-beta.30
@@ -949,10 +949,10 @@ packages:
      qs: ^6.11.0
      qx-util: ^0.4.8
    dependencies:
-      '@ibiz-template/core': 0.0.1-beta.50(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/core': 0.0.1-beta.51(lodash-es@4.17.21)(qx-util@0.4.8)
      '@ibiz-template/model': 0.0.1-beta.50(@ibiz/dynamic-model-api@2.1.17)(lodash-es@4.17.21)(qx-util@0.4.8)
-      '@ibiz-template/runtime': 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(qx-util@0.4.8)
-      '@ibiz-template/service': 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/runtime': 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.51)(qx-util@0.4.8)
+      '@ibiz-template/service': 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
      async-validator: 4.2.5
      dayjs: 1.11.7
      lodash-es: 4.17.21
@@ -960,8 +960,8 @@ packages:
      qx-util: 0.4.8
    dev: false

-  /@ibiz-template/core@0.0.1-beta.50(lodash-es@4.17.21)(qx-util@0.4.8):
-    resolution: {integrity: sha512-sqa1Omd+uGsnVWVlay0mdo04bg5JxZBNEjs8J+pRzIW0rqIqkJ6IOKhNcL+LN4TToz/AN2azfhfLYmOUwZWpTg==}
+  /@ibiz-template/core@0.0.1-beta.51(lodash-es@4.17.21)(qx-util@0.4.8):
+    resolution: {integrity: sha512-Bqvmg3WyBFt3GlcaUoAsSzNoSJAgOpjgt1rRxtnV+jxkZTUMhLeC3zbyg1ZsBe+JQMVH9Rs54QPmnpf/nsubpw==}
    peerDependencies:
      lodash-es: ^4.17.21
      qx-util: ^0.4.8
@@ -989,8 +989,8 @@ packages:
      qx-util: 0.4.8
    dev: false

-  /@ibiz-template/runtime@0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(qx-util@0.4.8):
-    resolution: {integrity: sha512-ocvOoWT0vBFODfG3AuHEDQZrDuwC8uG0gCpKwYbudVBPO+ywZmDQJYZydEbdR2hZSs5/nvzc6cSAfBAbYRfZHA==}
+  /@ibiz-template/runtime@0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.51)(qx-util@0.4.8):
+    resolution: {integrity: sha512-Zs31UILmTaP8dh1kGePp4uoXf5RiE5lPMs9cMw3cn84uOLZFc2Ftojhta3s2Xtl1tKD3E0QVAqMjr8HFvq+bng==}
    peerDependencies:
      '@ibiz-template/core': ^0.0.1-beta.30
      '@ibiz-template/model': ^0.0.1-beta.30
@@ -998,22 +998,22 @@ packages:
      qx-util: ^0.4.8
    dependencies:
      '@ibiz-template/command': 0.0.1-beta.50
-      '@ibiz-template/core': 0.0.1-beta.50(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/core': 0.0.1-beta.51(lodash-es@4.17.21)(qx-util@0.4.8)
      '@ibiz-template/model': 0.0.1-beta.50(@ibiz/dynamic-model-api@2.1.17)(lodash-es@4.17.21)(qx-util@0.4.8)
-      '@ibiz-template/service': 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/service': 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
      qs: 6.11.1
      qx-util: 0.4.8
    dev: false

-  /@ibiz-template/service@0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0):
-    resolution: {integrity: sha512-rMr78knMB19eZfpM/LpqM/FMOGqYrSwGkOeXxG9Y9Nteurc/b9iIxai+4w+7IgTqU4XcP0KKzOsEhx+VUW+vXA==}
+  /@ibiz-template/service@0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0):
+    resolution: {integrity: sha512-sc4vy0zYlbcj2VjB3XShoJArXTLtaFn8NGyBweU8dCSpBw6PMV9Ltdm1SxxEyyrd7a989jCGq2aJfFvE+k8i9g==}
    peerDependencies:
      '@ibiz-template/core': ^0.0.1-beta.30
      '@ibiz-template/model': ^0.0.1-beta.30
      qx-util: ^0.4.8
      ramda: ^0.28.0
    dependencies:
-      '@ibiz-template/core': 0.0.1-beta.50(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/core': 0.0.1-beta.51(lodash-es@4.17.21)(qx-util@0.4.8)
      '@ibiz-template/model': 0.0.1-beta.50(@ibiz/dynamic-model-api@2.1.17)(lodash-es@4.17.21)(qx-util@0.4.8)
      qx-util: 0.4.8
      ramda: 0.28.0
@@ -1023,8 +1023,8 @@ packages:
    resolution: {integrity: sha512-ZyUvekQpuTUVh8YuF4i+ylheA5NO0zO+sEVggSvulo9xmhjbqXGP3sUOV12728M3tn5dM3E6alPtGRvlTAiTzQ==}
    dev: false

-  /@ibiz-template/vue-util@0.0.1-beta.50(@ibiz-template/controller@0.0.1-beta.50)(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14):
-    resolution: {integrity: sha512-zmnnsCbNMNZFQVZ9WN3G8Q3OydCaxgHlOg1uG9B9dOA/41FMcUep21tLhyEKqi7U2c3nC6bjVKZ81rBwkRGjQQ==}
+  /@ibiz-template/vue-util@0.0.1-beta.51(@ibiz-template/controller@0.0.1-beta.51)(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.51)(qs@6.11.1)(qx-util@0.4.8)(ramda@0.28.0)(vue-router@3.6.5)(vue@2.7.14):
+    resolution: {integrity: sha512-XmZ4q/hDp0X1yqOISWjFsxy182RhQ6Lg8zoDJHOXjp8HYlR1ob5nnpHNlzBDqhjhzTtknLZbLoCW85rq9T7LrQ==}
    peerDependencies:
      '@ibiz-template/controller': ^0.0.1-beta.30
      '@ibiz-template/core': ^0.0.1-beta.30
@@ -1036,10 +1036,10 @@ packages:
      vue: ^2.7.14
      vue-router: ^3.6.5
    dependencies:
-      '@ibiz-template/controller': 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/runtime@0.0.1-beta.50)(@ibiz-template/service@0.0.1-beta.50)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
-      '@ibiz-template/core': 0.0.1-beta.50(lodash-es@4.17.21)(qx-util@0.4.8)
+      '@ibiz-template/controller': 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(@ibiz-template/runtime@0.0.1-beta.51)(@ibiz-template/service@0.0.1-beta.51)(lodash-es@4.17.21)(qs@6.11.1)(qx-util@0.4.8)
+      '@ibiz-template/core': 0.0.1-beta.51(lodash-es@4.17.21)(qx-util@0.4.8)
      '@ibiz-template/model': 0.0.1-beta.50(@ibiz/dynamic-model-api@2.1.17)(lodash-es@4.17.21)(qx-util@0.4.8)
-      '@ibiz-template/service': 0.0.1-beta.50(@ibiz-template/core@0.0.1-beta.50)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
+      '@ibiz-template/service': 0.0.1-beta.51(@ibiz-template/core@0.0.1-beta.51)(@ibiz-template/model@0.0.1-beta.50)(qx-util@0.4.8)(ramda@0.28.0)
      qs: 6.11.1
      qx-util: 0.4.8
      ramda: 0.28.0

--- a/app_Web/public/extras/js/system/6.14.1/system.min.js
+++ b/app_Web/public/extras/js/system/6.14.1/system.min.js
+/*!
+ * SystemJS 6.14.1
+ */
+!function(){function e(e,t){return(t||"")+" (SystemJS Error#"+e+" https://github.com/systemjs/systemjs/blob/main/docs/errors.md#"+e+")"}function t(e,t){if(-1!==e.indexOf("\\")&&(e=e.replace(j,"/")),"/"===e[0]&&"/"===e[1])return t.slice(0,t.indexOf(":")+1)+e;if("."===e[0]&&("/"===e[1]||"."===e[1]&&("/"===e[2]||2===e.length&&(e+="/"))||1===e.length&&(e+="/"))||"/"===e[0]){var n,r=t.slice(0,t.indexOf(":")+1);if(n="/"===t[r.length+1]?"file:"!==r?(n=t.slice(r.length+2)).slice(n.indexOf("/")+1):t.slice(8):t.slice(r.length+("/"===t[r.length])),"/"===e[0])return t.slice(0,t.length-n.length-1)+e;for(var i=n.slice(0,n.lastIndexOf("/")+1)+e,o=[],s=-1,u=0;u<i.length;u++)-1!==s?"/"===i[u]&&(o.push(i.slice(s,u+1)),s=-1):"."===i[u]?"."!==i[u+1]||"/"!==i[u+2]&&u+2!==i.length?"/"===i[u+1]||u+1===i.length?u+=1:s=u:(o.pop(),u+=2):s=u;return-1!==s&&o.push(i.slice(s)),t.slice(0,t.length-n.length)+o.join("")}}function n(e,n){return t(e,n)||(-1!==e.indexOf(":")?e:t("./"+e,n))}function r(e,n,r,i,o){for(var s in e){var a=t(s,r)||s,f=e[s];if("string"==typeof f){var l=c(i,t(f,r)||f,o);l?n[a]=l:u("W1",s,f,"bare specifier did not resolve")}}}function i(e,t,i){var o;for(o in e.imports&&r(e.imports,i.imports,t,i,null),e.scopes||{}){var s=n(o,t);r(e.scopes[o],i.scopes[s]||(i.scopes[s]={}),t,i,s)}for(o in e.depcache||{})i.depcache[n(o,t)]=e.depcache[o];for(o in e.integrity||{})i.integrity[n(o,t)]=e.integrity[o]}function o(e,t){if(t[e])return e;var n=e.length;do{var r=e.slice(0,n+1);if(r in t)return r}while(-1!==(n=e.lastIndexOf("/",n-1)))}function s(e,t){var n=o(e,t);if(n){var r=t[n];if(null===r)return;if(!(e.length>n.length&&"/"!==r[r.length-1]))return r+e.slice(n.length);u("W2",n,r,"should have a trailing '/'")}}function u(t,n,r,i){console.warn(e(t,"Package target "+i+", resolving target '"+r+"' for "+n))}function c(e,t,n){for(var r=e.scopes,i=n&&o(n,r);i;){var u=s(t,r[i]);if(u)return u;i=o(i.slice(0,i.lastIndexOf("/")),r)}return s(t,e.imports)||-1!==t.indexOf(":")&&t}function a(){this[M]={}}function f(e){return e.id}function l(e,t,n,r){if(e.onload(n,t.id,t.d&&t.d.map(f),!!r),n)throw n}function d(t,n,r,i){var o=t[M][n];if(o)return o;var s=[],u=Object.create(null);P&&Object.defineProperty(u,P,{value:"Module"});var c=Promise.resolve().then((function(){return t.instantiate(n,r,i)})).then((function(r){if(!r)throw Error(e(2,"Module "+n+" did not instantiate"));var i=r[1]((function(e,t){o.h=!0;var n=!1;if("string"==typeof e)e in u&&u[e]===t||(u[e]=t,n=!0);else{for(var r in e)t=e[r],r in u&&u[r]===t||(u[r]=t,n=!0);e&&e.__esModule&&(u.__esModule=e.__esModule)}if(n)for(var i=0;i<s.length;i++){var c=s[i];c&&c(u)}return t}),2===r[1].length?{import:function(e,r){return t.import(e,n,r)},meta:t.createContext(n)}:void 0);return o.e=i.execute||function(){},[r[0],i.setters||[],r[2]||[]]}),(function(e){throw o.e=null,o.er=e,l(t,o,e,!0),e})),a=c.then((function(e){return Promise.all(e[0].map((function(r,i){var o=e[1][i],s=e[2][i];return Promise.resolve(t.resolve(r,n)).then((function(e){var r=d(t,e,n,s);return Promise.resolve(r.I).then((function(){return o&&(r.i.push(o),!r.h&&r.I||o(r.n)),r}))}))}))).then((function(e){o.d=e}))}));return o=t[M][n]={id:n,i:s,n:u,m:i,I:c,L:a,h:!1,d:void 0,e:void 0,er:void 0,E:void 0,C:void 0,p:void 0}}function h(e,t,n,r){if(!r[t.id])return r[t.id]=!0,Promise.resolve(t.L).then((function(){return t.p&&null!==t.p.e||(t.p=n),Promise.all(t.d.map((function(t){return h(e,t,n,r)})))})).catch((function(n){if(t.er)throw n;throw t.e=null,l(e,t,n,!1),n}))}function p(e,t){return t.C=h(e,t,t,{}).then((function(){return v(e,t,{})})).then((function(){return t.n}))}function v(e,t,n){function r(){try{var n=o.call(C);if(n)return n=n.then((function(){t.C=t.n,t.E=null,l(e,t,null,!0)}),(function(n){throw t.er=n,t.E=null,l(e,t,n,!0),n})),t.E=n;t.C=t.n,t.L=t.I=void 0}catch(r){throw t.er=r,r}finally{l(e,t,t.er,!0)}}if(!n[t.id]){if(n[t.id]=!0,!t.e){if(t.er)throw t.er;return t.E?t.E:void 0}var i,o=t.e;return t.e=null,t.d.forEach((function(r){try{var o=v(e,r,n);o&&(i=i||[]).push(o)}catch(s){throw t.er=s,l(e,t,s,!1),s}})),i?Promise.all(i).then(r):r()}}function m(){[].forEach.call(document.querySelectorAll("script"),(function(t){if(!t.sp)if("systemjs-module"===t.type){if(t.sp=!0,!t.src)return;System.import("import:"===t.src.slice(0,7)?t.src.slice(7):n(t.src,g)).catch((function(e){if(e.message.indexOf("https://github.com/systemjs/systemjs/blob/main/docs/errors.md#3")>-1){var n=document.createEvent("Event");n.initEvent("error",!1,!1),t.dispatchEvent(n)}return Promise.reject(e)}))}else if("systemjs-importmap"===t.type){t.sp=!0;var r=t.src?(System.fetch||fetch)(t.src,{integrity:t.integrity,passThrough:!0}).then((function(e){if(!e.ok)throw Error("Invalid status code: "+e.status);return e.text()})).catch((function(n){return n.message=e("W4","Error fetching systemjs-import map "+t.src)+"\n"+n.message,console.warn(n),"function"==typeof t.onerror&&t.onerror(),"{}"})):t.innerHTML;W=W.then((function(){return r})).then((function(n){!function(t,n,r){var o={};try{o=JSON.parse(n)}catch(s){console.warn(Error(e("W5","systemjs-importmap contains invalid JSON")+"\n\n"+n+"\n"))}i(o,r,t)}(T,n,t.src||g)}))}}))}var g,y="undefined"!=typeof Symbol,b="undefined"!=typeof self,w="undefined"!=typeof document,S=b?self:global;if(w){var E=document.querySelector("base[href]");E&&(g=E.href)}if(!g&&"undefined"!=typeof location){var O=(g=location.href.split("#")[0].split("?")[0]).lastIndexOf("/");-1!==O&&(g=g.slice(0,O+1))}var x,j=/\\/g,P=y&&Symbol.toStringTag,M=y?Symbol():"@",L=a.prototype;L.import=function(e,t,n){var r=this;return t&&"object"==typeof t&&(n=t,t=void 0),Promise.resolve(r.prepareImport()).then((function(){return r.resolve(e,t,n)})).then((function(e){var t=d(r,e,void 0,n);return t.C||p(r,t)}))},L.createContext=function(e){var t=this;return{url:e,resolve:function(n,r){return Promise.resolve(t.resolve(n,r||e))}}},L.onload=function(){},L.register=function(e,t,n){x=[e,t,n]},L.getRegister=function(){var e=x;return x=void 0,e};var C=Object.freeze(Object.create(null));S.System=new a;var I,R,W=Promise.resolve(),T={imports:{},scopes:{},depcache:{},integrity:{}},A=w;if(L.prepareImport=function(e){return(A||e)&&(m(),A=!1),W},w&&(m(),window.addEventListener("DOMContentLoaded",m)),L.addImportMap=function(e,t){i(e,t||g,T)},w){window.addEventListener("error",(function(e){_=e.filename,J=e.error}));var N=location.origin}L.createScript=function(e){var t=document.createElement("script");t.async=!0,e.indexOf(N+"/")&&(t.crossOrigin="anonymous");var n=T.integrity[e];return n&&(t.integrity=n),t.src=e,t};var _,J,k={},U=L.register;L.register=function(e,t){if(w&&"loading"===document.readyState&&"string"!=typeof e){var n=document.querySelectorAll("script[src]"),r=n[n.length-1];if(r){I=e;var i=this;R=setTimeout((function(){k[r.src]=[e,t],i.import(r.src)}))}}else I=void 0;return U.call(this,e,t)},L.instantiate=function(t,n){var r=k[t];if(r)return delete k[t],r;var i=this;return Promise.resolve(L.createScript(t)).then((function(r){return new Promise((function(o,s){r.addEventListener("error",(function(){s(Error(e(3,"Error loading "+t+(n?" from "+n:""))))})),r.addEventListener("load",(function(){if(document.head.removeChild(r),_===t)s(J);else{var e=i.getRegister(t);e&&e[0]===I&&clearTimeout(R),o(e)}})),document.head.appendChild(r)}))}))},L.shouldFetch=function(){return!1},"undefined"!=typeof fetch&&(L.fetch=fetch);var $=L.instantiate,B=/^(text|application)\/(x-)?javascript(;|$)/;L.instantiate=function(t,n,r){var i=this;return this.shouldFetch(t,n,r)?this.fetch(t,{credentials:"same-origin",integrity:T.integrity[t],meta:r}).then((function(r){if(!r.ok)throw Error(e(7,r.status+" "+r.statusText+", loading "+t+(n?" from "+n:"")));var o=r.headers.get("content-type");if(!o||!B.test(o))throw Error(e(4,'Unknown Content-Type "'+o+'", loading '+t+(n?" from "+n:"")));return r.text().then((function(e){return e.indexOf("//# sourceURL=")<0&&(e+="\n//# sourceURL="+t),(0,eval)(e),i.getRegister(t)}))})):$.apply(this,arguments)},L.resolve=function(n,r){return c(T,t(n,r=r||g)||n,r)||function(t,n){throw Error(e(8,"Unable to resolve bare specifier '"+t+(n?"' from "+n:"'")))}(n,r)};var F=L.instantiate;L.instantiate=function(e,t,n){var r=T.depcache[e];if(r)for(var i=0;i<r.length;i++)d(this,this.resolve(r[i],e),e);return F.call(this,e,t,n)},b&&"function"==typeof importScripts&&(L.instantiate=function(e){var t=this;return Promise.resolve().then((function(){return importScripts(e),t.getRegister(e)}))}),function(e){function t(t){return!e.hasOwnProperty(t)||!isNaN(t)&&t<e.length||a&&e[t]&&"undefined"!=typeof window&&e[t].parent===window}var n,r,i,o=e.System.constructor.prototype,s=o.import;o.import=function(o,u,c){return function(){for(var o in n=r=void 0,e)t(o)||(n?r||(r=o):n=o,i=o)}(),s.call(this,o,u,c)};var u=[[],function(){return{}}],c=o.getRegister;o.getRegister=function(){var o=c.call(this);if(o)return o;var s,a=function(o){var s,u,c=0;for(var a in e)if(!t(a)){if(0===c&&a!==n||1===c&&a!==r)return a;s?(i=a,u=o&&u||a):s=a===i,c++}return u}(this.firstGlobalProp);if(!a)return u;try{s=e[a]}catch(f){return u}return[[],function(e){return{execute:function(){e(s),e({default:s,__useDefault:!0})}}}]};var a="undefined"!=typeof navigator&&-1!==navigator.userAgent.indexOf("Trident")}("undefined"!=typeof self?self:global),function(e){var t=e.System.constructor.prototype,r=/^[^#?]+\.(css|html|json|wasm)([?#].*)?$/,i=t.shouldFetch.bind(t);t.shouldFetch=function(e){return i(e)||r.test(e)};var o=/^application\/json(;|$)/,s=/^text\/css(;|$)/,u=/^application\/wasm(;|$)/,c=t.fetch;t.fetch=function(t,r){return c(t,r).then((function(i){if(r.passThrough)return i;if(!i.ok)return i;var c=i.headers.get("content-type");return o.test(c)?i.json().then((function(e){return new Response(new Blob(['System.register([],function(e){return{execute:function(){e("default",'+JSON.stringify(e)+")}}})"],{type:"application/javascript"}))})):s.test(c)?i.text().then((function(e){return e=e.replace(/url\(\s*(?:(["'])((?:\\.|[^\n\\"'])+)\1|((?:\\.|[^\s,"'()\\])+))\s*\)/g,(function(e,r,i,o){return"url("+r+n(i||o,t)+r+")"})),new Response(new Blob(["System.register([],function(e){return{execute:function(){var s=new CSSStyleSheet();s.replaceSync("+JSON.stringify(e)+');e("default",s)}}})'],{type:"application/javascript"}))})):u.test(c)?(WebAssembly.compileStreaming?WebAssembly.compileStreaming(i):i.arrayBuffer().then(WebAssembly.compile)).then((function(n){e.System.wasmModules||(e.System.wasmModules=Object.create(null)),e.System.wasmModules[t]=n;var r=[],i=[];return WebAssembly.Module.imports&&WebAssembly.Module.imports(n).forEach((function(e){var t=JSON.stringify(e.module);-1===r.indexOf(t)&&(r.push(t),i.push("function(m){i["+t+"]=m}"))})),new Response(new Blob(["System.register(["+r.join(",")+"],function(e){var i={};return{setters:["+i.join(",")+"],execute:function(){return WebAssembly.instantiate(System.wasmModules["+JSON.stringify(t)+"],i).then(function(m){e(m.exports)})}}})"],{type:"application/javascript"}))})):i}))}}("undefined"!=typeof self?self:global);var q="undefined"!=typeof Symbol&&Symbol.toStringTag;L.get=function(e){var t=this[M][e];if(t&&null===t.e&&!t.E)return t.er?null:t.n},L.set=function(t,n){try{new URL(t)}catch(s){console.warn(Error(e("W3",'"'+t+'" is not a valid URL to set in the module registry')))}var r;q&&"Module"===n[q]?r=n:(r=Object.assign(Object.create(null),n),q&&Object.defineProperty(r,q,{value:"Module"}));var i=Promise.resolve(r),o=this[M][t]||(this[M][t]={id:t,i:[],h:!1,d:[],e:null,er:void 0,E:void 0});return!o.e&&!o.E&&(Object.assign(o,{n:r,I:void 0,L:void 0,C:i}),r)},L.has=function(e){return!!this[M][e]},L.delete=function(e){var t=this[M],n=t[e];if(!n||n.p&&null!==n.p.e||n.E)return!1;var r=n.i;return n.d&&n.d.forEach((function(e){var t=e.i.indexOf(n);-1!==t&&e.i.splice(t,1)})),delete t[e],function(){var n=t[e];if(!n||!r||null!==n.e||n.E)return!1;r.forEach((function(e){n.i.push(e),e(n.n)})),r=null}};var D="undefined"!=typeof Symbol&&Symbol.iterator;L.entries=function(){var e,t,n=this,r=Object.keys(n[M]),i=0,o={next:function(){for(;void 0!==(t=r[i++])&&void 0===(e=n.get(t)););return{done:void 0===t,value:void 0!==t&&[t,e]}}};return o[D]=function(){return this},o}}();
--- a/app_Web/src/guard/auth-guard/auth-guard.ts
+++ b/app_Web/src/guard/auth-guard/auth-guard.ts
@@ -3,38 +3,6 @@ import { ModelUtil } from '@ibiz-template/model';
 import { getCookie, setCookie } from 'qx-util';
 import { UnauthorizedHandler } from '../unauthorized-handler/unauthorized-handler';

-/**
- * 预加载应用级引用插件
- *
- * @author chitanda
- * @date 2022-10-31 16:10:57
- * @return {*}  {Promise<void>}
- */
-async function loadAppPlugins(): Promise<void> {
-  const modelService = await ModelUtil.getModelService();
-  const { app } = modelService;
-  const pluginRefs = app.getAllPSAppPFPluginRefs();
-  const all = pluginRefs?.map(async pluginRef => {
-    if (
-      pluginRef &&
-      pluginRef.runtimeObject &&
-      pluginRef.rTObjectName &&
-      pluginRef.rTObjectRepo
-    ) {
-      const config = JSON.parse(pluginRef.rTObjectRepo);
-      if (config && config.app === true) {
-        await ibiz.plugin.loadPluginRef(
-          pluginRef.rTObjectName,
-          pluginRef.rTObjectRepo,
-        );
-      }
-    }
-  });
-  if (all) {
-    await Promise.all(all);
-  }
-}
-
 /**
 * 初始化模型
 *
@@ -51,7 +19,6 @@ async function loadModel(): Promise<void> {
    }
    return {};
  });
-  await loadAppPlugins();
 }

 /**

--- a/app_Web/src/plugin/plugin-factory/plugin-factory.ts
+++ b/app_Web/src/plugin/plugin-factory/plugin-factory.ts
@@ -8,7 +8,7 @@ import {
 } from '@ibiz-template/runtime';
 import { IPSAppPFPluginRef, IPSSysPFPlugin } from '@ibiz/dynamic-model-api';
 import { join } from 'path-browserify';
-import { VueConstructor, PluginObject } from 'vue';
+import Vue, { VueConstructor, PluginObject } from 'vue';

 /**
 * 插件工具类
@@ -57,16 +57,6 @@ export class PluginFactory implements IPluginFactory {
   */
  protected pluginCache: Map<string, RemotePluginItem> = new Map();

-  /**
-   * 所有的插件
-   *
-   * @author chitanda
-   * @date 2023-02-02 16:02:55
-   * @protected
-   * @type {PluginObject<unknown>[]}
-   */
-  protected pluginCodes: PluginObject<unknown>[] = [];
-
  /**
   * 预定义插件集合
   *
@@ -95,11 +85,7 @@ export class PluginFactory implements IPluginFactory {
   * @date 2023-02-02 16:02:51
   * @param {App} app
   */
-  register(app: VueConstructor): void {
-    this.pluginCodes.forEach(plugin => {
-      app.use(plugin);
-    });
-  }
+  register(_app: VueConstructor): void {}

  /**
   * 加载预置插件
@@ -127,7 +113,7 @@ export class PluginFactory implements IPluginFactory {
   * @param {PluginObject<unknown>} code
   */
  protected setPluginCode(code: PluginObject<unknown>): void {
-    this.pluginCodes.push(code);
+    Vue.use(code);
  }

  /**
@@ -295,12 +281,21 @@ export class PluginFactory implements IPluginFactory {
    if (this.urlReg.test(script)) {
      return script;
    }
+    let url: string = '';
    if (this.urlReg.test(ibiz.env.pluginBaseUrl)) {
      if (script.startsWith('/')) {
-        return ibiz.env.pluginBaseUrl + script;
+        url = ibiz.env.pluginBaseUrl + script;
+      } else {
+        url = `${ibiz.env.pluginBaseUrl}/${script}`;
      }
-      return `${ibiz.env.pluginBaseUrl}/${script}`;
+    } else {
+      url = `${join(ibiz.env.pluginBaseUrl, script)}`;
+    }
+    const { origin, pathname } = window.location;
+    if (pathname.endsWith('/') && url.startsWith('/')) {
+      url = url.substring(1);
    }
-    return `${join(ibiz.env.pluginBaseUrl, script)}`;
+    url = `${origin}${pathname}${url}`;
+    return url;
  }
 }
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
@@ -37,157 +37,6 @@
    }
  } ],
  "getPSDEFormItemVRs" : [ {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule9",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-      "name" : "field8值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "[条件组]AND",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "AND",
-            "condType" : "GROUP",
-            "name" : "[条件组]AND",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "GT",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 大于(>) (20)",
-              "paramValue" : "20"
-            }, {
-              "condOp" : "NOTEQ",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 不等于(<>) (30)",
-              "paramValue" : "30"
-            } ]
-          }, {
-            "condOp" : "OR",
-            "condType" : "GROUP",
-            "name" : "[条件组]OR",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "GT",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 大于(>) (35)",
-              "paramValue" : "35"
-            }, {
-              "condOp" : "LIKE",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD8",
-              "name" : "[常规条件] 文本包含(%) (2)",
-              "paramValue" : "2"
-            } ]
-          } ],
-          "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-        } ],
-        "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-      "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field8",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule7",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-      "name" : "field6值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "[条件组]AND",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "NOTEQ",
-            "condType" : "SIMPLE",
-            "dEFName" : "FIELD6",
-            "name" : "[常规条件] 不等于(<>) (20)",
-            "paramValue" : "20"
-          }, {
-            "condOp" : "GT",
-            "condType" : "SIMPLE",
-            "dEFName" : "FIELD6",
-            "name" : "[常规条件] 大于(>) (5)",
-            "paramValue" : "5"
-          } ],
-          "ruleInfo" : ">5并且不等于20"
-        } ],
-        "ruleInfo" : ">5并且不等于20"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-      "ruleInfo" : ">5并且不等于20",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field6",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
-    "checkMode" : 3,
-    "name" : "表单项值规则",
-    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule8",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-      "name" : "field7值规则",
-      "getPSDEFVRGroupCondition" : {
-        "condOp" : "AND",
-        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condOp" : "OR",
-          "condType" : "GROUP",
-          "name" : "[条件组]OR",
-          "getPSDEFVRConditions" : [ {
-            "condType" : "VALUERANGE2",
-            "dEFName" : "FIELD7",
-            "maxValue" : 20.0,
-            "minValue" : 10.0,
-            "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
-            "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
-            "includeMaxValue" : true,
-            "includeMinValue" : true
-          }, {
-            "condType" : "VALUERANGE2",
-            "dEFName" : "FIELD7",
-            "maxValue" : 40.0,
-            "minValue" : 30.0,
-            "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
-            "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
-            "includeMaxValue" : true,
-            "includeMinValue" : true
-          } ],
-          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-        } ],
-        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-      "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
-      "checkDefault" : false,
-      "defaultMode" : false,
-      "enableBackend" : true,
-      "enableFront" : true
-    },
-    "getPSDEFormItemName" : "field7",
-    "valueRuleType" : "DEFVALUERULE"
-  }, {
    "checkMode" : 3,
    "name" : "表单项值规则",
    "getPSDEFValueRule" : {
@@ -227,6 +76,37 @@
    },
    "getPSDEFormItemName" : "field4",
    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "name" : "amount值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SIMPLE",
+          "dEFName" : "AMOUNT",
+          "name" : "[常规条件] 等于(=) (100)",
+          "paramType" : "SRCENTITYFIELD",
+          "paramValue" : "100",
+          "ruleInfo" : "amount等于100"
+        } ],
+        "ruleInfo" : "amount等于100"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+      "ruleInfo" : "amount等于100",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "amount",
+    "valueRuleType" : "DEFVALUERULE"
  }, {
    "checkMode" : 3,
    "name" : "表单项值规则",
@@ -364,32 +244,152 @@
    "checkMode" : 3,
    "name" : "表单项值规则",
    "getPSDEFValueRule" : {
-      "codeName" : "ValueRule",
-      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "name" : "amount值规则",
+      "codeName" : "ValueRule9",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+      "name" : "field8值规则",
      "getPSDEFVRGroupCondition" : {
        "condOp" : "AND",
        "condType" : "GROUP",
        "name" : "默认组",
        "getPSDEFVRConditions" : [ {
-          "condOp" : "EQ",
-          "condType" : "SIMPLE",
-          "dEFName" : "AMOUNT",
-          "name" : "[常规条件] 等于(=) (100)",
-          "paramType" : "SRCENTITYFIELD",
-          "paramValue" : "100",
-          "ruleInfo" : "amount等于100"
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "[条件组]AND",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "AND",
+            "condType" : "GROUP",
+            "name" : "[条件组]AND",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "GT",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 大于(>) (20)",
+              "paramValue" : "20"
+            }, {
+              "condOp" : "NOTEQ",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 不等于(<>) (30)",
+              "paramValue" : "30"
+            } ]
+          }, {
+            "condOp" : "OR",
+            "condType" : "GROUP",
+            "name" : "[条件组]OR",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "GT",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 大于(>) (35)",
+              "paramValue" : "35"
+            }, {
+              "condOp" : "LIKE",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD8",
+              "name" : "[常规条件] 文本包含(%) (2)",
+              "paramValue" : "2"
+            } ]
+          } ],
+          "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
        } ],
-        "ruleInfo" : "amount等于100"
+        "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
      },
-      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-      "ruleInfo" : "amount等于100",
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+      "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
      "checkDefault" : false,
      "defaultMode" : false,
      "enableBackend" : true,
      "enableFront" : true
    },
-    "getPSDEFormItemName" : "amount",
+    "getPSDEFormItemName" : "field8",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule7",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "name" : "field6值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "[条件组]AND",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "NOTEQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 不等于(<>) (20)",
+            "paramValue" : "20"
+          }, {
+            "condOp" : "GT",
+            "condType" : "SIMPLE",
+            "dEFName" : "FIELD6",
+            "name" : "[常规条件] 大于(>) (5)",
+            "paramValue" : "5"
+          } ],
+          "ruleInfo" : ">5并且不等于20"
+        } ],
+        "ruleInfo" : ">5并且不等于20"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+      "ruleInfo" : ">5并且不等于20",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field6",
+    "valueRuleType" : "DEFVALUERULE"
+  }, {
+    "checkMode" : 3,
+    "name" : "表单项值规则",
+    "getPSDEFValueRule" : {
+      "codeName" : "ValueRule8",
+      "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+      "name" : "field7值规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condOp" : "OR",
+          "condType" : "GROUP",
+          "name" : "[条件组]OR",
+          "getPSDEFVRConditions" : [ {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "FIELD7",
+            "maxValue" : 20.0,
+            "minValue" : 10.0,
+            "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+            "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          }, {
+            "condType" : "VALUERANGE2",
+            "dEFName" : "FIELD7",
+            "maxValue" : 40.0,
+            "minValue" : 30.0,
+            "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+            "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+            "includeMaxValue" : true,
+            "includeMinValue" : true
+          } ],
+          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+        } ],
+        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+      },
+      "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+      "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+      "checkDefault" : false,
+      "defaultMode" : false,
+      "enableBackend" : true,
+      "enableFront" : true
+    },
+    "getPSDEFormItemName" : "field7",
    "valueRuleType" : "DEFVALUERULE"
  } ],
  "getPSDEFormItems" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
@@ -166,157 +166,6 @@
      "id" : "FORM"
    },
    "getPSDEFormItemVRs" : [ {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule9",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-        "name" : "field8值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "AND",
-            "condType" : "GROUP",
-            "name" : "[条件组]AND",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "[条件组]AND",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "GT",
-                "condType" : "SIMPLE",
-                "dEFName" : "FIELD8",
-                "name" : "[常规条件] 大于(>) (20)",
-                "paramValue" : "20"
-              }, {
-                "condOp" : "NOTEQ",
-                "condType" : "SIMPLE",
-                "dEFName" : "FIELD8",
-                "name" : "[常规条件] 不等于(<>) (30)",
-                "paramValue" : "30"
-              } ]
-            }, {
-              "condOp" : "OR",
-              "condType" : "GROUP",
-              "name" : "[条件组]OR",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "GT",
-                "condType" : "SIMPLE",
-                "dEFName" : "FIELD8",
-                "name" : "[常规条件] 大于(>) (35)",
-                "paramValue" : "35"
-              }, {
-                "condOp" : "LIKE",
-                "condType" : "SIMPLE",
-                "dEFName" : "FIELD8",
-                "name" : "[常规条件] 文本包含(%) (2)",
-                "paramValue" : "2"
-              } ]
-            } ],
-            "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-          } ],
-          "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-        "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field8",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule7",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-        "name" : "field6值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "AND",
-            "condType" : "GROUP",
-            "name" : "[条件组]AND",
-            "getPSDEFVRConditions" : [ {
-              "condOp" : "NOTEQ",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD6",
-              "name" : "[常规条件] 不等于(<>) (20)",
-              "paramValue" : "20"
-            }, {
-              "condOp" : "GT",
-              "condType" : "SIMPLE",
-              "dEFName" : "FIELD6",
-              "name" : "[常规条件] 大于(>) (5)",
-              "paramValue" : "5"
-            } ],
-            "ruleInfo" : ">5并且不等于20"
-          } ],
-          "ruleInfo" : ">5并且不等于20"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-        "ruleInfo" : ">5并且不等于20",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field6",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
-      "checkMode" : 3,
-      "name" : "表单项值规则",
-      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule8",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-        "name" : "field7值规则",
-        "getPSDEFVRGroupCondition" : {
-          "condOp" : "AND",
-          "condType" : "GROUP",
-          "name" : "默认组",
-          "getPSDEFVRConditions" : [ {
-            "condOp" : "OR",
-            "condType" : "GROUP",
-            "name" : "[条件组]OR",
-            "getPSDEFVRConditions" : [ {
-              "condType" : "VALUERANGE2",
-              "dEFName" : "FIELD7",
-              "maxValue" : 20.0,
-              "minValue" : 10.0,
-              "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
-              "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
-              "includeMaxValue" : true,
-              "includeMinValue" : true
-            }, {
-              "condType" : "VALUERANGE2",
-              "dEFName" : "FIELD7",
-              "maxValue" : 40.0,
-              "minValue" : 30.0,
-              "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
-              "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
-              "includeMaxValue" : true,
-              "includeMinValue" : true
-            } ],
-            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-          } ],
-          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
-        "checkDefault" : false,
-        "defaultMode" : false,
-        "enableBackend" : true,
-        "enableFront" : true
-      },
-      "getPSDEFormItemName" : "field7",
-      "valueRuleType" : "DEFVALUERULE"
-    }, {
      "checkMode" : 3,
      "name" : "表单项值规则",
      "getPSDEFValueRule" : {
@@ -356,6 +205,37 @@
      },
      "getPSDEFormItemName" : "field4",
      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+        "name" : "amount值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "EQ",
+            "condType" : "SIMPLE",
+            "dEFName" : "AMOUNT",
+            "name" : "[常规条件] 等于(=) (100)",
+            "paramType" : "SRCENTITYFIELD",
+            "paramValue" : "100",
+            "ruleInfo" : "amount等于100"
+          } ],
+          "ruleInfo" : "amount等于100"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+        "ruleInfo" : "amount等于100",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "amount",
+      "valueRuleType" : "DEFVALUERULE"
    }, {
      "checkMode" : 3,
      "name" : "表单项值规则",
@@ -493,32 +373,152 @@
      "checkMode" : 3,
      "name" : "表单项值规则",
      "getPSDEFValueRule" : {
-        "codeName" : "ValueRule",
-        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-        "name" : "amount值规则",
+        "codeName" : "ValueRule9",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+        "name" : "field8值规则",
        "getPSDEFVRGroupCondition" : {
          "condOp" : "AND",
          "condType" : "GROUP",
          "name" : "默认组",
          "getPSDEFVRConditions" : [ {
-            "condOp" : "EQ",
-            "condType" : "SIMPLE",
-            "dEFName" : "AMOUNT",
-            "name" : "[常规条件] 等于(=) (100)",
-            "paramType" : "SRCENTITYFIELD",
-            "paramValue" : "100",
-            "ruleInfo" : "amount等于100"
+            "condOp" : "AND",
+            "condType" : "GROUP",
+            "name" : "[条件组]AND",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "[条件组]AND",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "GT",
+                "condType" : "SIMPLE",
+                "dEFName" : "FIELD8",
+                "name" : "[常规条件] 大于(>) (20)",
+                "paramValue" : "20"
+              }, {
+                "condOp" : "NOTEQ",
+                "condType" : "SIMPLE",
+                "dEFName" : "FIELD8",
+                "name" : "[常规条件] 不等于(<>) (30)",
+                "paramValue" : "30"
+              } ]
+            }, {
+              "condOp" : "OR",
+              "condType" : "GROUP",
+              "name" : "[条件组]OR",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "GT",
+                "condType" : "SIMPLE",
+                "dEFName" : "FIELD8",
+                "name" : "[常规条件] 大于(>) (35)",
+                "paramValue" : "35"
+              }, {
+                "condOp" : "LIKE",
+                "condType" : "SIMPLE",
+                "dEFName" : "FIELD8",
+                "name" : "[常规条件] 文本包含(%) (2)",
+                "paramValue" : "2"
+              } ]
+            } ],
+            "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
          } ],
-          "ruleInfo" : "amount等于100"
+          "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
        },
-        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-        "ruleInfo" : "amount等于100",
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+        "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
        "checkDefault" : false,
        "defaultMode" : false,
        "enableBackend" : true,
        "enableFront" : true
      },
-      "getPSDEFormItemName" : "amount",
+      "getPSDEFormItemName" : "field8",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule7",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+        "name" : "field6值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "AND",
+            "condType" : "GROUP",
+            "name" : "[条件组]AND",
+            "getPSDEFVRConditions" : [ {
+              "condOp" : "NOTEQ",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD6",
+              "name" : "[常规条件] 不等于(<>) (20)",
+              "paramValue" : "20"
+            }, {
+              "condOp" : "GT",
+              "condType" : "SIMPLE",
+              "dEFName" : "FIELD6",
+              "name" : "[常规条件] 大于(>) (5)",
+              "paramValue" : "5"
+            } ],
+            "ruleInfo" : ">5并且不等于20"
+          } ],
+          "ruleInfo" : ">5并且不等于20"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+        "ruleInfo" : ">5并且不等于20",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field6",
+      "valueRuleType" : "DEFVALUERULE"
+    }, {
+      "checkMode" : 3,
+      "name" : "表单项值规则",
+      "getPSDEFValueRule" : {
+        "codeName" : "ValueRule8",
+        "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+        "name" : "field7值规则",
+        "getPSDEFVRGroupCondition" : {
+          "condOp" : "AND",
+          "condType" : "GROUP",
+          "name" : "默认组",
+          "getPSDEFVRConditions" : [ {
+            "condOp" : "OR",
+            "condType" : "GROUP",
+            "name" : "[条件组]OR",
+            "getPSDEFVRConditions" : [ {
+              "condType" : "VALUERANGE2",
+              "dEFName" : "FIELD7",
+              "maxValue" : 20.0,
+              "minValue" : 10.0,
+              "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+              "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+              "includeMaxValue" : true,
+              "includeMinValue" : true
+            }, {
+              "condType" : "VALUERANGE2",
+              "dEFName" : "FIELD7",
+              "maxValue" : 40.0,
+              "minValue" : 30.0,
+              "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+              "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+              "includeMaxValue" : true,
+              "includeMinValue" : true
+            } ],
+            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+          } ],
+          "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+        },
+        "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+        "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+        "checkDefault" : false,
+        "defaultMode" : false,
+        "enableBackend" : true,
+        "enableFront" : true
+      },
+      "getPSDEFormItemName" : "field7",
      "valueRuleType" : "DEFVALUERULE"
    } ],
    "getPSDEFormItems" : [ {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -18007,157 +18007,6 @@
          "id" : "FORM"
        },
        "getPSDEFormItemVRs" : [ {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule9",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-            "name" : "field8值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "AND",
-                "condType" : "GROUP",
-                "name" : "[条件组]AND",
-                "getPSDEFVRConditions" : [ {
-                  "condOp" : "AND",
-                  "condType" : "GROUP",
-                  "name" : "[条件组]AND",
-                  "getPSDEFVRConditions" : [ {
-                    "condOp" : "GT",
-                    "condType" : "SIMPLE",
-                    "dEFName" : "FIELD8",
-                    "name" : "[常规条件] 大于(>) (20)",
-                    "paramValue" : "20"
-                  }, {
-                    "condOp" : "NOTEQ",
-                    "condType" : "SIMPLE",
-                    "dEFName" : "FIELD8",
-                    "name" : "[常规条件] 不等于(<>) (30)",
-                    "paramValue" : "30"
-                  } ]
-                }, {
-                  "condOp" : "OR",
-                  "condType" : "GROUP",
-                  "name" : "[条件组]OR",
-                  "getPSDEFVRConditions" : [ {
-                    "condOp" : "GT",
-                    "condType" : "SIMPLE",
-                    "dEFName" : "FIELD8",
-                    "name" : "[常规条件] 大于(>) (35)",
-                    "paramValue" : "35"
-                  }, {
-                    "condOp" : "LIKE",
-                    "condType" : "SIMPLE",
-                    "dEFName" : "FIELD8",
-                    "name" : "[常规条件] 文本包含(%) (2)",
-                    "paramValue" : "2"
-                  } ]
-                } ],
-                "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-              } ],
-              "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
-            "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field8",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule7",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-            "name" : "field6值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "AND",
-                "condType" : "GROUP",
-                "name" : "[条件组]AND",
-                "getPSDEFVRConditions" : [ {
-                  "condOp" : "NOTEQ",
-                  "condType" : "SIMPLE",
-                  "dEFName" : "FIELD6",
-                  "name" : "[常规条件] 不等于(<>) (20)",
-                  "paramValue" : "20"
-                }, {
-                  "condOp" : "GT",
-                  "condType" : "SIMPLE",
-                  "dEFName" : "FIELD6",
-                  "name" : "[常规条件] 大于(>) (5)",
-                  "paramValue" : "5"
-                } ],
-                "ruleInfo" : ">5并且不等于20"
-              } ],
-              "ruleInfo" : ">5并且不等于20"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
-            "ruleInfo" : ">5并且不等于20",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field6",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
-          "checkMode" : 3,
-          "name" : "表单项值规则",
-          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule8",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-            "name" : "field7值规则",
-            "getPSDEFVRGroupCondition" : {
-              "condOp" : "AND",
-              "condType" : "GROUP",
-              "name" : "默认组",
-              "getPSDEFVRConditions" : [ {
-                "condOp" : "OR",
-                "condType" : "GROUP",
-                "name" : "[条件组]OR",
-                "getPSDEFVRConditions" : [ {
-                  "condType" : "VALUERANGE2",
-                  "dEFName" : "FIELD7",
-                  "maxValue" : 20.0,
-                  "minValue" : 10.0,
-                  "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
-                  "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
-                  "includeMaxValue" : true,
-                  "includeMinValue" : true
-                }, {
-                  "condType" : "VALUERANGE2",
-                  "dEFName" : "FIELD7",
-                  "maxValue" : 40.0,
-                  "minValue" : 30.0,
-                  "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
-                  "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
-                  "includeMaxValue" : true,
-                  "includeMinValue" : true
-                } ],
-                "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-              } ],
-              "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
-            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
-            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
-            "checkDefault" : false,
-            "defaultMode" : false,
-            "enableBackend" : true,
-            "enableFront" : true
-          },
-          "getPSDEFormItemName" : "field7",
-          "valueRuleType" : "DEFVALUERULE"
-        }, {
          "checkMode" : 3,
          "name" : "表单项值规则",
          "getPSDEFValueRule" : {
@@ -18197,6 +18046,37 @@
          },
          "getPSDEFormItemName" : "field4",
          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+            "name" : "amount值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "EQ",
+                "condType" : "SIMPLE",
+                "dEFName" : "AMOUNT",
+                "name" : "[常规条件] 等于(=) (100)",
+                "paramType" : "SRCENTITYFIELD",
+                "paramValue" : "100",
+                "ruleInfo" : "amount等于100"
+              } ],
+              "ruleInfo" : "amount等于100"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
+            "ruleInfo" : "amount等于100",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "amount",
+          "valueRuleType" : "DEFVALUERULE"
        }, {
          "checkMode" : 3,
          "name" : "表单项值规则",
@@ -18334,32 +18214,152 @@
          "checkMode" : 3,
          "name" : "表单项值规则",
          "getPSDEFValueRule" : {
-            "codeName" : "ValueRule",
-            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-            "name" : "amount值规则",
+            "codeName" : "ValueRule9",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+            "name" : "field8值规则",
            "getPSDEFVRGroupCondition" : {
              "condOp" : "AND",
              "condType" : "GROUP",
              "name" : "默认组",
              "getPSDEFVRConditions" : [ {
-                "condOp" : "EQ",
-                "condType" : "SIMPLE",
-                "dEFName" : "AMOUNT",
-                "name" : "[常规条件] 等于(=) (100)",
-                "paramType" : "SRCENTITYFIELD",
-                "paramValue" : "100",
-                "ruleInfo" : "amount等于100"
+                "condOp" : "AND",
+                "condType" : "GROUP",
+                "name" : "[条件组]AND",
+                "getPSDEFVRConditions" : [ {
+                  "condOp" : "AND",
+                  "condType" : "GROUP",
+                  "name" : "[条件组]AND",
+                  "getPSDEFVRConditions" : [ {
+                    "condOp" : "GT",
+                    "condType" : "SIMPLE",
+                    "dEFName" : "FIELD8",
+                    "name" : "[常规条件] 大于(>) (20)",
+                    "paramValue" : "20"
+                  }, {
+                    "condOp" : "NOTEQ",
+                    "condType" : "SIMPLE",
+                    "dEFName" : "FIELD8",
+                    "name" : "[常规条件] 不等于(<>) (30)",
+                    "paramValue" : "30"
+                  } ]
+                }, {
+                  "condOp" : "OR",
+                  "condType" : "GROUP",
+                  "name" : "[条件组]OR",
+                  "getPSDEFVRConditions" : [ {
+                    "condOp" : "GT",
+                    "condType" : "SIMPLE",
+                    "dEFName" : "FIELD8",
+                    "name" : "[常规条件] 大于(>) (35)",
+                    "paramValue" : "35"
+                  }, {
+                    "condOp" : "LIKE",
+                    "condType" : "SIMPLE",
+                    "dEFName" : "FIELD8",
+                    "name" : "[常规条件] 文本包含(%) (2)",
+                    "paramValue" : "2"
+                  } ]
+                } ],
+                "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
              } ],
-              "ruleInfo" : "amount等于100"
+              "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2"
            },
-            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
-            "ruleInfo" : "amount等于100",
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD8/psdefvaluerules/ValueRule9",
+            "ruleInfo" : "20<field8并且不等于30，并且在35以上或者文本包含2",
            "checkDefault" : false,
            "defaultMode" : false,
            "enableBackend" : true,
            "enableFront" : true
          },
-          "getPSDEFormItemName" : "amount",
+          "getPSDEFormItemName" : "field8",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule7",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+            "name" : "field6值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "AND",
+                "condType" : "GROUP",
+                "name" : "[条件组]AND",
+                "getPSDEFVRConditions" : [ {
+                  "condOp" : "NOTEQ",
+                  "condType" : "SIMPLE",
+                  "dEFName" : "FIELD6",
+                  "name" : "[常规条件] 不等于(<>) (20)",
+                  "paramValue" : "20"
+                }, {
+                  "condOp" : "GT",
+                  "condType" : "SIMPLE",
+                  "dEFName" : "FIELD6",
+                  "name" : "[常规条件] 大于(>) (5)",
+                  "paramValue" : "5"
+                } ],
+                "ruleInfo" : ">5并且不等于20"
+              } ],
+              "ruleInfo" : ">5并且不等于20"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD6/psdefvaluerules/ValueRule7",
+            "ruleInfo" : ">5并且不等于20",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field6",
+          "valueRuleType" : "DEFVALUERULE"
+        }, {
+          "checkMode" : 3,
+          "name" : "表单项值规则",
+          "getPSDEFValueRule" : {
+            "codeName" : "ValueRule8",
+            "mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+            "name" : "field7值规则",
+            "getPSDEFVRGroupCondition" : {
+              "condOp" : "AND",
+              "condType" : "GROUP",
+              "name" : "默认组",
+              "getPSDEFVRConditions" : [ {
+                "condOp" : "OR",
+                "condType" : "GROUP",
+                "name" : "[条件组]OR",
+                "getPSDEFVRConditions" : [ {
+                  "condType" : "VALUERANGE2",
+                  "dEFName" : "FIELD7",
+                  "maxValue" : 20.0,
+                  "minValue" : 10.0,
+                  "name" : "[数值范围] 大于等于 10.0 且  小于等于 20.0",
+                  "ruleInfo" : "数值必须大于等于[10.0]且小于等于[20.0]",
+                  "includeMaxValue" : true,
+                  "includeMinValue" : true
+                }, {
+                  "condType" : "VALUERANGE2",
+                  "dEFName" : "FIELD7",
+                  "maxValue" : 40.0,
+                  "minValue" : 30.0,
+                  "name" : "[数值范围] 大于等于 30.0 且  小于等于 40.0",
+                  "ruleInfo" : "数值必须大于等于[30.0]且小于等于[40.0]",
+                  "includeMaxValue" : true,
+                  "includeMinValue" : true
+                } ],
+                "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+              } ],
+              "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])"
+            },
+            "rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD7/psdefvaluerules/ValueRule8",
+            "ruleInfo" : "(数值必须大于等于[10.0]且小于等于[20.0] 或者 数值必须大于等于[30.0]且小于等于[40.0])",
+            "checkDefault" : false,
+            "defaultMode" : false,
+            "enableBackend" : true,
+            "enableFront" : true
+          },
+          "getPSDEFormItemName" : "field7",
          "valueRuleType" : "DEFVALUERULE"
        } ],
        "getPSDEFormItems" : [ {