tony001 部署微服务应用 [TrainSys，Mob]

app_Mob/CHANGELOG.md

@@ -7,6 +7,15 @@
 
 ## [Unreleased]
 
+## [0.0.7] - 2023-12-21
+
+### Fixed
+
+- 兼容数值属性配置字符串代码表回显异常
+- 修复下拉多选最后一个数据无法删除
+- 修复数值框placeholder 颜色异常
+- span编辑器支持禁用状态
+
 ## [0.0.6] - 2023-12-20
 
 ### Fixed

app_Mob/package.json

 {
   "name": "@ibiz-template/next-mob",
   "private": true,
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "An Ionic project",
   "scripts": {
     "dev": "vite",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@ibiz-template-package/vs-tree-ex": "^0.1.1",
     "@ibiz-template/mob-theme": "^0.2.11",
-    "@ibiz-template/mob-vue3-components": "^0.0.6",
+    "@ibiz-template/mob-vue3-components": "^0.0.7",
     "@ibiz-template/core": "^0.4.12",
     "@ibiz-template/model-helper": "^0.4.13",
     "@ibiz-template/runtime": "^0.4.13",

app_Mob/pnpm-lock.yaml

@@ -15,8 +15,8 @@ dependencies:
     specifier: ^0.2.11
     version: 0.2.11(@ibiz-template/core@0.4.12)(@ibiz/model-core@0.0.27)(async-validator@4.2.5)(dayjs@1.11.10)(echarts@5.4.3)(handlebars@4.7.8)(lodash-es@4.17.21)(mqtt@2.18.9)(path-browserify@1.0.1)(qs@6.11.2)(qx-util@0.4.8)(ramda@0.29.1)
   '@ibiz-template/mob-vue3-components':
-    specifier: ^0.0.6
-    version: 0.0.6(@ibiz-template/core@0.4.12)(@ibiz-template/model-helper@0.4.13)(@ibiz-template/runtime@0.4.13)(@ibiz-template/theme@0.4.0)(@ibiz-template/vue3-util@0.4.13)(@ibiz/model-core@0.0.27)(async-validator@4.2.5)(dayjs@1.11.10)(echarts@5.4.3)(lodash-es@4.17.21)(pinia@2.1.7)(qs@6.11.2)(qx-util@0.4.8)(ramda@0.29.1)(vant@4.7.2)(vue-router@4.2.5)(vue3-hash-calendar@1.1.3)(vue@3.3.8)
+    specifier: ^0.0.7
+    version: 0.0.7(@ibiz-template/core@0.4.12)(@ibiz-template/model-helper@0.4.13)(@ibiz-template/runtime@0.4.13)(@ibiz-template/theme@0.4.0)(@ibiz-template/vue3-util@0.4.13)(@ibiz/model-core@0.0.27)(async-validator@4.2.5)(dayjs@1.11.10)(echarts@5.4.3)(lodash-es@4.17.21)(pinia@2.1.7)(qs@6.11.2)(qx-util@0.4.8)(ramda@0.29.1)(vant@4.7.2)(vue-router@4.2.5)(vue3-hash-calendar@1.1.3)(vue@3.3.8)
   '@ibiz-template/model-helper':
     specifier: ^0.4.13
     version: 0.4.13(@ibiz-template/runtime@0.4.13)(ramda@0.29.1)
@@ -2115,8 +2115,8 @@ packages:
       - ramda
     dev: false
 
-  /@ibiz-template/mob-vue3-components@0.0.6(@ibiz-template/core@0.4.12)(@ibiz-template/model-helper@0.4.13)(@ibiz-template/runtime@0.4.13)(@ibiz-template/theme@0.4.0)(@ibiz-template/vue3-util@0.4.13)(@ibiz/model-core@0.0.27)(async-validator@4.2.5)(dayjs@1.11.10)(echarts@5.4.3)(lodash-es@4.17.21)(pinia@2.1.7)(qs@6.11.2)(qx-util@0.4.8)(ramda@0.29.1)(vant@4.7.2)(vue-router@4.2.5)(vue3-hash-calendar@1.1.3)(vue@3.3.8):
-    resolution: {integrity: sha512-yRoIbtqqV3W83ykDbILVYrhgaVbBewvXxSA0D0ELVzfyh0YYoAlOZ74u4dF2vBu8ZgoawsN9QxHPKbi6eBjAXw==}
+  /@ibiz-template/mob-vue3-components@0.0.7(@ibiz-template/core@0.4.12)(@ibiz-template/model-helper@0.4.13)(@ibiz-template/runtime@0.4.13)(@ibiz-template/theme@0.4.0)(@ibiz-template/vue3-util@0.4.13)(@ibiz/model-core@0.0.27)(async-validator@4.2.5)(dayjs@1.11.10)(echarts@5.4.3)(lodash-es@4.17.21)(pinia@2.1.7)(qs@6.11.2)(qx-util@0.4.8)(ramda@0.29.1)(vant@4.7.2)(vue-router@4.2.5)(vue3-hash-calendar@1.1.3)(vue@3.3.8):
+    resolution: {integrity: sha512-58eDKGjxPyHlFlOwXBNp4EauJNPyjszWdULlqWFJ6XvJZvaWiAZDpr6+nQ98REC8sC4YF3fAPZcHGL9ehsOz3g==}
     peerDependencies:
       '@ibiz-template/core': ^0.1.3
       '@ibiz-template/model-helper': ^0.1.3

config.xml

@@ -55,6 +55,36 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
+      mkdir -p /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5
+      if [ -e app_Mob/.dynamic ]
+      then
+          cd app_Mob
+      else
+          cd app_Mob/app
+      fi
+      sed -i "s#dstimage#$para5#g" swarm.yaml      
+      if [[ $para3 = all ]];then
+          mv Dockerfile-ALL Dockerfile      
+          set +e
+          sed -i "s#/api#/sztrainsys__mob#g" src/environments/environment.ts  
+          sed -i "s#outputDir#//outputDir#g" vue.config.js 
+          set -e
+          yarn
+          ln -s /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5 node_modules/.cache
+          yarn build
+      else
+          if [ -e .dynamic ]
+          then
+              mv  ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
+          else
+              mv  ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
+          fi
+          sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
+          mv Dockerfile-MODEL Dockerfile
+      fi          
+      docker build -t $para5 .
+      docker push $para5
+      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json

@@ -88,6 +88,14 @@
     "codeName" : "ceshi3",
     "name" : "ceshi3",
     "customCode" : true
+  }, {
+    "codeName" : "ceshi1",
+    "name" : "表单项更新(不显示)",
+    "getPSDEFIUpdateDetails" : [ {
+      "name" : "testname"
+    } ],
+    "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+    "customCode" : true
   }, {
     "codeName" : "ceshi2",
     "name" : "表单项更新2",
@@ -97,14 +105,6 @@
     "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
     "customCode" : true,
     "showBusyIndicator" : false
-  }, {
-    "codeName" : "ceshi1",
-    "name" : "表单项更新(不显示)",
-    "getPSDEFIUpdateDetails" : [ {
-      "name" : "testname"
-    } ],
-    "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-    "customCode" : true
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",
@@ -483,6 +483,35 @@
           "name" : "FIELD",
           "codeName" : "Field"
         },
+        "getPSDEFDGroupLogics" : [ {
+          "groupOP" : "AND",
+          "logicCat" : "PANELVISIBLE",
+          "logicType" : "GROUP",
+          "name" : "表单成员[field][面板显示]逻辑",
+          "getPSDEFDLogics" : [ {
+            "groupOP" : "AND",
+            "logicType" : "GROUP",
+            "name" : "逻辑分组",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "EQ",
+              "dEFDName" : "testname",
+              "logicType" : "SINGLE"
+            } ],
+            "notMode" : false
+          }, {
+            "groupOP" : "OR",
+            "logicType" : "GROUP",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "NOTEQ",
+              "dEFDName" : "field10",
+              "logicType" : "SINGLE",
+              "value" : "ddd"
+            } ],
+            "notMode" : false
+          } ],
+          "relatedDetailNames" : [ "testname", "field10" ],
+          "notMode" : false
+        } ],
         "getPSEditor" : {
           "editorType" : "MOBTEXT",
           "maxLength" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTEditView.json

@@ -192,6 +192,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -201,14 +209,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -587,6 +587,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "MOBTEXT",
             "maxLength" : 100,

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

@@ -88,6 +88,14 @@
     "codeName" : "ceshi3",
     "name" : "ceshi3",
     "customCode" : true
+  }, {
+    "codeName" : "ceshi1",
+    "name" : "表单项更新(不显示)",
+    "getPSDEFIUpdateDetails" : [ {
+      "name" : "testname"
+    } ],
+    "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+    "customCode" : true
   }, {
     "codeName" : "ceshi2",
     "name" : "表单项更新2",
@@ -97,14 +105,6 @@
     "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
     "customCode" : true,
     "showBusyIndicator" : false
-  }, {
-    "codeName" : "ceshi1",
-    "name" : "表单项更新(不显示)",
-    "getPSDEFIUpdateDetails" : [ {
-      "name" : "testname"
-    } ],
-    "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-    "customCode" : true
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",
@@ -486,6 +486,35 @@
           "name" : "FIELD",
           "codeName" : "Field"
         },
+        "getPSDEFDGroupLogics" : [ {
+          "groupOP" : "AND",
+          "logicCat" : "PANELVISIBLE",
+          "logicType" : "GROUP",
+          "name" : "表单成员[field][面板显示]逻辑",
+          "getPSDEFDLogics" : [ {
+            "groupOP" : "AND",
+            "logicType" : "GROUP",
+            "name" : "逻辑分组",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "EQ",
+              "dEFDName" : "testname",
+              "logicType" : "SINGLE"
+            } ],
+            "notMode" : false
+          }, {
+            "groupOP" : "OR",
+            "logicType" : "GROUP",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "NOTEQ",
+              "dEFDName" : "field10",
+              "logicType" : "SINGLE",
+              "value" : "ddd"
+            } ],
+            "notMode" : false
+          } ],
+          "relatedDetailNames" : [ "testname", "field10" ],
+          "notMode" : false
+        } ],
         "getPSEditor" : {
           "editorType" : "TEXTBOX",
           "maxLength" : 100,

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

@@ -192,6 +192,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -201,14 +209,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -590,6 +590,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 100,

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

@@ -178,6 +178,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -187,14 +195,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -576,6 +576,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 100,

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

@@ -370,6 +370,14 @@
             "codeName" : "ceshi3",
             "name" : "ceshi3",
             "customCode" : true
+          }, {
+            "codeName" : "ceshi1",
+            "name" : "表单项更新(不显示)",
+            "getPSDEFIUpdateDetails" : [ {
+              "name" : "testname"
+            } ],
+            "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+            "customCode" : true
           }, {
             "codeName" : "ceshi2",
             "name" : "表单项更新2",
@@ -379,14 +387,6 @@
             "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
             "customCode" : true,
             "showBusyIndicator" : false
-          }, {
-            "codeName" : "ceshi1",
-            "name" : "表单项更新(不显示)",
-            "getPSDEFIUpdateDetails" : [ {
-              "name" : "testname"
-            } ],
-            "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-            "customCode" : true
           } ],
           "getPSDEFormItems" : [ {
             "id" : "srfupdatedate",
@@ -768,6 +768,35 @@
                   "name" : "FIELD",
                   "codeName" : "Field"
                 },
+                "getPSDEFDGroupLogics" : [ {
+                  "groupOP" : "AND",
+                  "logicCat" : "PANELVISIBLE",
+                  "logicType" : "GROUP",
+                  "name" : "表单成员[field][面板显示]逻辑",
+                  "getPSDEFDLogics" : [ {
+                    "groupOP" : "AND",
+                    "logicType" : "GROUP",
+                    "name" : "逻辑分组",
+                    "getPSDEFDLogics" : [ {
+                      "condOP" : "EQ",
+                      "dEFDName" : "testname",
+                      "logicType" : "SINGLE"
+                    } ],
+                    "notMode" : false
+                  }, {
+                    "groupOP" : "OR",
+                    "logicType" : "GROUP",
+                    "getPSDEFDLogics" : [ {
+                      "condOP" : "NOTEQ",
+                      "dEFDName" : "field10",
+                      "logicType" : "SINGLE",
+                      "value" : "ddd"
+                    } ],
+                    "notMode" : false
+                  } ],
+                  "relatedDetailNames" : [ "testname", "field10" ],
+                  "notMode" : false
+                } ],
                 "getPSEditor" : {
                   "editorType" : "TEXTBOX",
                   "maxLength" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json

@@ -88,6 +88,14 @@
     "codeName" : "ceshi3",
     "name" : "ceshi3",
     "customCode" : true
+  }, {
+    "codeName" : "ceshi1",
+    "name" : "表单项更新(不显示)",
+    "getPSDEFIUpdateDetails" : [ {
+      "name" : "testname"
+    } ],
+    "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+    "customCode" : true
   }, {
     "codeName" : "ceshi2",
     "name" : "表单项更新2",
@@ -97,14 +105,6 @@
     "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
     "customCode" : true,
     "showBusyIndicator" : false
-  }, {
-    "codeName" : "ceshi1",
-    "name" : "表单项更新(不显示)",
-    "getPSDEFIUpdateDetails" : [ {
-      "name" : "testname"
-    } ],
-    "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-    "customCode" : true
   } ],
   "getPSDEFormItems" : [ {
     "id" : "srfupdatedate",
@@ -486,6 +486,35 @@
           "name" : "FIELD",
           "codeName" : "Field"
         },
+        "getPSDEFDGroupLogics" : [ {
+          "groupOP" : "AND",
+          "logicCat" : "PANELVISIBLE",
+          "logicType" : "GROUP",
+          "name" : "表单成员[field][面板显示]逻辑",
+          "getPSDEFDLogics" : [ {
+            "groupOP" : "AND",
+            "logicType" : "GROUP",
+            "name" : "逻辑分组",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "EQ",
+              "dEFDName" : "testname",
+              "logicType" : "SINGLE"
+            } ],
+            "notMode" : false
+          }, {
+            "groupOP" : "OR",
+            "logicType" : "GROUP",
+            "getPSDEFDLogics" : [ {
+              "condOP" : "NOTEQ",
+              "dEFDName" : "field10",
+              "logicType" : "SINGLE",
+              "value" : "ddd"
+            } ],
+            "notMode" : false
+          } ],
+          "relatedDetailNames" : [ "testname", "field10" ],
+          "notMode" : false
+        } ],
         "getPSEditor" : {
           "editorType" : "TEXTBOX",
           "maxLength" : 100,

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

@@ -191,6 +191,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -200,14 +208,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -589,6 +589,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 100,

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

@@ -177,6 +177,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -186,14 +194,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -575,6 +575,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 100,

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

@@ -195,6 +195,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -204,14 +212,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -593,6 +593,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 100,

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

@@ -189,6 +189,14 @@
       "codeName" : "ceshi3",
       "name" : "ceshi3",
       "customCode" : true
+    }, {
+      "codeName" : "ceshi1",
+      "name" : "表单项更新(不显示)",
+      "getPSDEFIUpdateDetails" : [ {
+        "name" : "testname"
+      } ],
+      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+      "customCode" : true
     }, {
       "codeName" : "ceshi2",
       "name" : "表单项更新2",
@@ -198,14 +206,6 @@
       "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
       "customCode" : true,
       "showBusyIndicator" : false
-    }, {
-      "codeName" : "ceshi1",
-      "name" : "表单项更新(不显示)",
-      "getPSDEFIUpdateDetails" : [ {
-        "name" : "testname"
-      } ],
-      "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-      "customCode" : true
     } ],
     "getPSDEFormItems" : [ {
       "id" : "srfupdatedate",
@@ -587,6 +587,35 @@
             "name" : "FIELD",
             "codeName" : "Field"
           },
+          "getPSDEFDGroupLogics" : [ {
+            "groupOP" : "AND",
+            "logicCat" : "PANELVISIBLE",
+            "logicType" : "GROUP",
+            "name" : "表单成员[field][面板显示]逻辑",
+            "getPSDEFDLogics" : [ {
+              "groupOP" : "AND",
+              "logicType" : "GROUP",
+              "name" : "逻辑分组",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "EQ",
+                "dEFDName" : "testname",
+                "logicType" : "SINGLE"
+              } ],
+              "notMode" : false
+            }, {
+              "groupOP" : "OR",
+              "logicType" : "GROUP",
+              "getPSDEFDLogics" : [ {
+                "condOP" : "NOTEQ",
+                "dEFDName" : "field10",
+                "logicType" : "SINGLE",
+                "value" : "ddd"
+              } ],
+              "notMode" : false
+            } ],
+            "relatedDetailNames" : [ "testname", "field10" ],
+            "notMode" : false
+          } ],
           "getPSEditor" : {
             "editorType" : "TEXTBOX",
             "maxLength" : 100,

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

@@ -488,6 +488,14 @@
               "codeName" : "ceshi3",
               "name" : "ceshi3",
               "customCode" : true
+            }, {
+              "codeName" : "ceshi1",
+              "name" : "表单项更新(不显示)",
+              "getPSDEFIUpdateDetails" : [ {
+                "name" : "testname"
+              } ],
+              "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+              "customCode" : true
             }, {
               "codeName" : "ceshi2",
               "name" : "表单项更新2",
@@ -497,14 +505,6 @@
               "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
               "customCode" : true,
               "showBusyIndicator" : false
-            }, {
-              "codeName" : "ceshi1",
-              "name" : "表单项更新(不显示)",
-              "getPSDEFIUpdateDetails" : [ {
-                "name" : "testname"
-              } ],
-              "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-              "customCode" : true
             } ],
             "getPSDEFormItems" : [ {
               "id" : "srfupdatedate",
@@ -886,6 +886,35 @@
                     "name" : "FIELD",
                     "codeName" : "Field"
                   },
+                  "getPSDEFDGroupLogics" : [ {
+                    "groupOP" : "AND",
+                    "logicCat" : "PANELVISIBLE",
+                    "logicType" : "GROUP",
+                    "name" : "表单成员[field][面板显示]逻辑",
+                    "getPSDEFDLogics" : [ {
+                      "groupOP" : "AND",
+                      "logicType" : "GROUP",
+                      "name" : "逻辑分组",
+                      "getPSDEFDLogics" : [ {
+                        "condOP" : "EQ",
+                        "dEFDName" : "testname",
+                        "logicType" : "SINGLE"
+                      } ],
+                      "notMode" : false
+                    }, {
+                      "groupOP" : "OR",
+                      "logicType" : "GROUP",
+                      "getPSDEFDLogics" : [ {
+                        "condOP" : "NOTEQ",
+                        "dEFDName" : "field10",
+                        "logicType" : "SINGLE",
+                        "value" : "ddd"
+                      } ],
+                      "notMode" : false
+                    } ],
+                    "relatedDetailNames" : [ "testname", "field10" ],
+                    "notMode" : false
+                  } ],
                   "getPSEditor" : {
                     "editorType" : "TEXTBOX",
                     "maxLength" : 100,

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

@@ -902,6 +902,14 @@
         "codeName" : "ceshi3",
         "name" : "ceshi3",
         "customCode" : true
+      }, {
+        "codeName" : "ceshi1",
+        "name" : "表单项更新(不显示)",
+        "getPSDEFIUpdateDetails" : [ {
+          "name" : "testname"
+        } ],
+        "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+        "customCode" : true
       }, {
         "codeName" : "ceshi2",
         "name" : "表单项更新2",
@@ -911,14 +919,6 @@
         "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
         "customCode" : true,
         "showBusyIndicator" : false
-      }, {
-        "codeName" : "ceshi1",
-        "name" : "表单项更新(不显示)",
-        "getPSDEFIUpdateDetails" : [ {
-          "name" : "testname"
-        } ],
-        "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-        "customCode" : true
       } ],
       "getPSDEFormItems" : [ {
         "id" : "srfupdatedate",
@@ -1300,6 +1300,35 @@
               "name" : "FIELD",
               "codeName" : "Field"
             },
+            "getPSDEFDGroupLogics" : [ {
+              "groupOP" : "AND",
+              "logicCat" : "PANELVISIBLE",
+              "logicType" : "GROUP",
+              "name" : "表单成员[field][面板显示]逻辑",
+              "getPSDEFDLogics" : [ {
+                "groupOP" : "AND",
+                "logicType" : "GROUP",
+                "name" : "逻辑分组",
+                "getPSDEFDLogics" : [ {
+                  "condOP" : "EQ",
+                  "dEFDName" : "testname",
+                  "logicType" : "SINGLE"
+                } ],
+                "notMode" : false
+              }, {
+                "groupOP" : "OR",
+                "logicType" : "GROUP",
+                "getPSDEFDLogics" : [ {
+                  "condOP" : "NOTEQ",
+                  "dEFDName" : "field10",
+                  "logicType" : "SINGLE",
+                  "value" : "ddd"
+                } ],
+                "notMode" : false
+              } ],
+              "relatedDetailNames" : [ "testname", "field10" ],
+              "notMode" : false
+            } ],
             "getPSEditor" : {
               "editorType" : "TEXTBOX",
               "maxLength" : 100,

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

@@ -12458,6 +12458,18 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "关闭模式-默认删除-上方-错误",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg12"
+      }
+    }, {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -12477,12 +12489,6 @@
         "id" : "ViewMsg6"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-无删除-上方-常规",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg11"
-      }
     }, {
       "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
@@ -12491,44 +12497,38 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息位置-视图下方",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg8"
-      }
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg8"
       }
     } ]
   }, {
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     } ]
   }, {
@@ -36306,6 +36306,14 @@
           "codeName" : "ceshi3",
           "name" : "ceshi3",
           "customCode" : true
+        }, {
+          "codeName" : "ceshi1",
+          "name" : "表单项更新(不显示)",
+          "getPSDEFIUpdateDetails" : [ {
+            "name" : "testname"
+          } ],
+          "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
+          "customCode" : true
         }, {
           "codeName" : "ceshi2",
           "name" : "表单项更新2",
@@ -36315,14 +36323,6 @@
           "scriptCode" : "return {\r\n    testname: '测试2'\r\n}",
           "customCode" : true,
           "showBusyIndicator" : false
-        }, {
-          "codeName" : "ceshi1",
-          "name" : "表单项更新(不显示)",
-          "getPSDEFIUpdateDetails" : [ {
-            "name" : "testname"
-          } ],
-          "scriptCode" : "return {\r\n    testname: '测试1'\r\n}",
-          "customCode" : true
         } ],
         "getPSDEFormItems" : [ {
           "id" : "srfupdatedate",
@@ -36704,6 +36704,35 @@
                 "name" : "FIELD",
                 "codeName" : "Field"
               },
+              "getPSDEFDGroupLogics" : [ {
+                "groupOP" : "AND",
+                "logicCat" : "PANELVISIBLE",
+                "logicType" : "GROUP",
+                "name" : "表单成员[field][面板显示]逻辑",
+                "getPSDEFDLogics" : [ {
+                  "groupOP" : "AND",
+                  "logicType" : "GROUP",
+                  "name" : "逻辑分组",
+                  "getPSDEFDLogics" : [ {
+                    "condOP" : "EQ",
+                    "dEFDName" : "testname",
+                    "logicType" : "SINGLE"
+                  } ],
+                  "notMode" : false
+                }, {
+                  "groupOP" : "OR",
+                  "logicType" : "GROUP",
+                  "getPSDEFDLogics" : [ {
+                    "condOP" : "NOTEQ",
+                    "dEFDName" : "field10",
+                    "logicType" : "SINGLE",
+                    "value" : "ddd"
+                  } ],
+                  "notMode" : false
+                } ],
+                "relatedDetailNames" : [ "testname", "field10" ],
+                "notMode" : false
+              } ],
               "getPSEditor" : {
                 "editorType" : "TEXTBOX",
                 "maxLength" : 100,