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

app_Web/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-web:
     image: dstimage
     ports:
-      - "50100:80"
+      - "80:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,15 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.07.29.003#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
       </command>
     </hudson.tasks.Shell>
   </builders>

pom.xml

@@ -29,31 +29,31 @@
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-cloud</artifactId>
-            <version>8.1.0.183</version>
+            <version>8.1.0.188</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-redis</artifactId>
-            <version>8.1.0.183</version>
+            <version>8.1.0.188</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-mybatisplus-spring-boot-starter</artifactId>
-            <version>8.1.0.183</version>
+            <version>8.1.0.188</version>
         </dependency>
 
          <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-zookeeper</artifactId>
-            <version>8.1.0.183</version>
+            <version>8.1.0.188</version>
         </dependency>
 
         <dependency>
             <groupId>net.ibizsys.plugin</groupId>
             <artifactId>ibiz-plugin-poi</artifactId>
-            <version>8.1.0.183</version>
+            <version>8.1.0.188</version>
         </dependency>
 
     </dependencies>

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-139-3">
+    <changeSet author="root" id="tab-book-142-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>

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

@@ -169,6 +169,13 @@
       "name" : "FIELD9",
       "codeName" : "Field9"
     }
+  }, {
+    "id" : "field15",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD15",
+      "codeName" : "Field15"
+    }
   }, {
     "id" : "field11",
     "dataType" : 25,
@@ -672,6 +679,43 @@
         "valueItemName" : "type",
         "allowEmpty" : true,
         "showCaption" : true
+      }, {
+        "caption" : "数据选择无AC",
+        "codeName" : "field15",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field15",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD15",
+          "codeName" : "Field15"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "AC" : "FALSE",
+            "TRIGGER" : "TRUE",
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "PICKEREX_NOAC",
+          "handlerType" : "PickupText",
+          "name" : "field15",
+          "enableAC" : false,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true,
+          "singleSelect" : true
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
       }, {
         "caption" : "数据选择（下拉）",
         "codeName" : "field11",

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

@@ -290,6 +290,13 @@
         "name" : "FIELD9",
         "codeName" : "Field9"
       }
+    }, {
+      "id" : "field15",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD15",
+        "codeName" : "Field15"
+      }
     }, {
       "id" : "field11",
       "dataType" : 25,
@@ -793,6 +800,43 @@
           "valueItemName" : "type",
           "allowEmpty" : true,
           "showCaption" : true
+        }, {
+          "caption" : "数据选择无AC",
+          "codeName" : "field15",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field15",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD15",
+            "codeName" : "Field15"
+          },
+          "getPSEditor" : {
+            "editorParams" : {
+              "AC" : "FALSE",
+              "TRIGGER" : "TRUE",
+              "PICKUPVIEW" : "TRUE"
+            },
+            "editorType" : "PICKEREX_NOAC",
+            "handlerType" : "PickupText",
+            "name" : "field15",
+            "enableAC" : false,
+            "enablePickupView" : true,
+            "forceSelection" : true,
+            "showTrigger" : true,
+            "singleSelect" : true
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
         }, {
           "caption" : "数据选择（下拉）",
           "codeName" : "field11",

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

@@ -3875,6 +3875,13 @@
             "name" : "FIELD9",
             "codeName" : "Field9"
           }
+        }, {
+          "id" : "field15",
+          "dataType" : 25,
+          "getPSAppDEField" : {
+            "name" : "FIELD15",
+            "codeName" : "Field15"
+          }
         }, {
           "id" : "field11",
           "dataType" : 25,
@@ -4378,6 +4385,43 @@
               "valueItemName" : "type",
               "allowEmpty" : true,
               "showCaption" : true
+            }, {
+              "caption" : "数据选择无AC",
+              "codeName" : "field15",
+              "dataType" : 25,
+              "detailStyle" : "DEFAULT",
+              "detailType" : "FORMITEM",
+              "enableCond" : 3,
+              "ignoreInput" : 0,
+              "labelPos" : "LEFT",
+              "labelWidth" : 130,
+              "name" : "field15",
+              "noPrivDisplayMode" : 1,
+              "getPSAppDEField" : {
+                "name" : "FIELD15",
+                "codeName" : "Field15"
+              },
+              "getPSEditor" : {
+                "editorParams" : {
+                  "AC" : "FALSE",
+                  "TRIGGER" : "TRUE",
+                  "PICKUPVIEW" : "TRUE"
+                },
+                "editorType" : "PICKEREX_NOAC",
+                "handlerType" : "PickupText",
+                "name" : "field15",
+                "enableAC" : false,
+                "enablePickupView" : true,
+                "forceSelection" : true,
+                "showTrigger" : true,
+                "singleSelect" : true
+              },
+              "getPSLayoutPos" : {
+                "colMD" : 24,
+                "layout" : "TABLE_24COL"
+              },
+              "allowEmpty" : true,
+              "showCaption" : true
             }, {
               "caption" : "数据选择（下拉）",
               "codeName" : "field11",