fangzhihao 发布系统代码 [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.09.01.001#g" swarm.yaml
-      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/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Usr04119448EditView_Form.json

@@ -343,15 +343,19 @@
           "codeName" : "FIELD20"
         },
         "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "maxLength" : 100,
-          "name" : "field20"
+          "editorType" : "RADIOBUTTONLIST",
+          "name" : "field20",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__UsrCodeList0411260431.json"
+          }
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
         "allowEmpty" : true,
+        "needCodeListConfig" : true,
         "showCaption" : true
       }, {
         "caption" : "属性24",
@@ -360,7 +364,7 @@
         "detailStyle" : "DEFAULT",
         "detailType" : "FORMITEM",
         "enableCond" : 3,
-        "ignoreInput" : 0,
+        "ignoreInput" : 3,
         "labelPos" : "LEFT",
         "labelWidth" : 130,
         "name" : "field24",
@@ -370,15 +374,20 @@
           "codeName" : "FIELD24"
         },
         "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "maxLength" : 100,
-          "name" : "field24"
+          "editorType" : "SPAN",
+          "name" : "field24",
+          "getPSAppCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__UsrCodeList0411260431.json"
+          },
+          "enableLinkView" : false
         },
         "getPSLayoutPos" : {
           "colMD" : 24,
           "layout" : "TABLE_24COL"
         },
         "allowEmpty" : true,
+        "convertToCodeItemText" : true,
         "showCaption" : true
       } ],
       "getPSLayout" : {

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

@@ -461,15 +461,19 @@
             "codeName" : "FIELD20"
           },
           "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 100,
-            "name" : "field20"
+            "editorType" : "RADIOBUTTONLIST",
+            "name" : "field20",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__UsrCodeList0411260431.json"
+            }
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
           "allowEmpty" : true,
+          "needCodeListConfig" : true,
           "showCaption" : true
         }, {
           "caption" : "属性24",
@@ -478,7 +482,7 @@
           "detailStyle" : "DEFAULT",
           "detailType" : "FORMITEM",
           "enableCond" : 3,
-          "ignoreInput" : 0,
+          "ignoreInput" : 3,
           "labelPos" : "LEFT",
           "labelWidth" : 130,
           "name" : "field24",
@@ -488,15 +492,20 @@
             "codeName" : "FIELD24"
           },
           "getPSEditor" : {
-            "editorType" : "TEXTBOX",
-            "maxLength" : 100,
-            "name" : "field24"
+            "editorType" : "SPAN",
+            "name" : "field24",
+            "getPSAppCodeList" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__UsrCodeList0411260431.json"
+            },
+            "enableLinkView" : false
           },
           "getPSLayoutPos" : {
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
           "allowEmpty" : true,
+          "convertToCodeItemText" : true,
           "showCaption" : true
         } ],
         "getPSLayout" : {