zhanghengfeng 发布系统代码 [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/Gnqrbdys.json

@@ -3387,6 +3387,65 @@
       },
       "infoGroupMode" : false,
       "showCaption" : true
+    }, {
+      "actionGroupExtractMode" : "ITEM",
+      "caption" : "按钮行为",
+      "codeName" : "grouppanel26",
+      "detailStyle" : "DEFAULT",
+      "detailType" : "GROUPPANEL",
+      "name" : "grouppanel26",
+      "getPSDEFormDetails" : [ {
+        "actionType" : "UIACTION",
+        "caption" : "界面行为",
+        "codeName" : "button2",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "BUTTON",
+        "name" : "button2",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "form_button2"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "NONE",
+          "caption" : "百度",
+          "codeName" : "openbaidu",
+          "frontProcessType" : "OPENHTMLPAGE",
+          "fullCodeName" : "TEST_openbaidu",
+          "htmlPageUrl" : "https://www.baidu.com/",
+          "name" : "打开百度",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+          },
+          "timeout" : 60000,
+          "uIActionMode" : "FRONT",
+          "uIActionTag" : "openbaidu",
+          "uIActionType" : "DEUIACTION",
+          "id" : "openbaidu@TEST"
+        },
+        "tooltip" : "界面行为",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true
+      } ],
+      "getPSLayout" : {
+        "childColLG" : -1,
+        "childColMD" : 24,
+        "childColSM" : -1,
+        "childColXS" : -1,
+        "columnCount" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "titleBarCloseMode" : 2,
+      "infoGroupMode" : false,
+      "showCaption" : true
     } ],
     "getPSLayout" : {
       "childColLG" : -1,

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

@@ -100,14 +100,6 @@
     "id" : "VMGroup"
   },
   "getPSAppViewRefs" : [ {
-    "name" : "NEWDATA",
-    "realTitle" : "图表测试",
-    "getRefPSAppView" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
-      "viewType" : "DECHARTVIEW"
-    }
-  }, {
     "name" : "EDITDATA",
     "realTitle" : "测试实体编辑视图",
     "getRefPSAppView" : {
@@ -115,6 +107,14 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
       "viewType" : "DEEDITVIEW"
     }
+  }, {
+    "name" : "NEWDATA",
+    "realTitle" : "图表测试",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
+      "viewType" : "DECHARTVIEW"
+    }
   } ],
   "getPSControls" : [ {
     "codeName" : "Default",
@@ -1158,11 +1158,11 @@
       "id" : "searchbar"
     },
     "quickGroupCount" : -1,
-    "quickSearchMode" : 0,
+    "quickSearchMode" : 1,
     "quickSearchWidth" : 0,
     "enableFilter" : false,
     "enableGroup" : false,
-    "enableQuickSearch" : false,
+    "enableQuickSearch" : true,
     "mobileSearchBar" : false
   }, {
     "caption" : "列表视图",
@@ -1211,7 +1211,9 @@
   "xDataControlName" : "list",
   "enableDP" : true,
   "enableFilter" : true,
+  "enableQuickSearch" : true,
   "enableSearch" : true,
+  "expandSearchForm" : true,
   "modelid" : "cb0d9598545bcfa333c30b57d3cc546a",
   "modeltype" : "PSAPPDEVIEW"
 }
\ No newline at end of file

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

@@ -3510,6 +3510,65 @@
         },
         "infoGroupMode" : false,
         "showCaption" : true
+      }, {
+        "actionGroupExtractMode" : "ITEM",
+        "caption" : "按钮行为",
+        "codeName" : "grouppanel26",
+        "detailStyle" : "DEFAULT",
+        "detailType" : "GROUPPANEL",
+        "name" : "grouppanel26",
+        "getPSDEFormDetails" : [ {
+          "actionType" : "UIACTION",
+          "caption" : "界面行为",
+          "codeName" : "button2",
+          "detailStyle" : "DEFAULT",
+          "detailType" : "BUTTON",
+          "name" : "button2",
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "form_button2"
+          },
+          "getPSLayoutPos" : {
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "NONE",
+            "caption" : "百度",
+            "codeName" : "openbaidu",
+            "frontProcessType" : "OPENHTMLPAGE",
+            "fullCodeName" : "TEST_openbaidu",
+            "htmlPageUrl" : "https://www.baidu.com/",
+            "name" : "打开百度",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+            },
+            "timeout" : 60000,
+            "uIActionMode" : "FRONT",
+            "uIActionTag" : "openbaidu",
+            "uIActionType" : "DEUIACTION",
+            "id" : "openbaidu@TEST"
+          },
+          "tooltip" : "界面行为",
+          "uIActionTarget" : "NONE",
+          "showCaption" : true
+        } ],
+        "getPSLayout" : {
+          "childColLG" : -1,
+          "childColMD" : 24,
+          "childColSM" : -1,
+          "childColXS" : -1,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "titleBarCloseMode" : 2,
+        "infoGroupMode" : false,
+        "showCaption" : true
       } ],
       "getPSLayout" : {
         "childColLG" : -1,