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/PSMODULES/common/PSDATAENTITIES/Book.json

@@ -8260,6 +8260,12 @@
     "name" : "书实体表格视图(多数据部件测试)",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr07166944GridViewnop",
+    "logicName" : "测试不分页表格编辑切换数据",
+    "name" : "测试不分页表格编辑切换数据",
+    "realModelSubType" : "DEGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "TabExpView9",
     "logicName" : "书实体分页导航视图（部件视图）",

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

@@ -4927,6 +4927,28 @@
     "uIActionTag" : "testscriptt",
     "uIActionType" : "DEUIACTION",
     "id" : "testscriptt@Book"
+  }, {
+    "actionTarget" : "SINGLEDATA",
+    "caption" : "界面逻辑",
+    "codeName" : "toolbar_Usr07166944GridViewnoptoolbar_deuiaction1_click",
+    "frontProcessType" : "OTHER",
+    "fullCodeName" : "Book_toolbar_Usr07166944GridViewnoptoolbar_deuiaction1_click",
+    "name" : "界面逻辑",
+    "getPSAppDEUILogic" : {
+      "modelref" : true,
+      "id" : "test"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "toolbar_Usr07166944GridViewnoptoolbar_deuiaction1_click",
+    "uIActionType" : "DEUIACTION",
+    "uILogicAttachMode" : "REPLACE",
+    "uILogicType" : "DELOGIC",
+    "id" : "toolbar_Usr07166944GridViewnoptoolbar_deuiaction1_click@Book"
   }, {
     "actionTarget" : "SINGLEDATA",
     "caption" : "界面逻辑",
@@ -5481,6 +5503,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr03113527TabSearchView.json",
     "viewType" : "DETABSEARCHVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07166944GridViewnop.json",
+    "viewType" : "DEGRIDVIEW"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView_Test.json",

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

@@ -324,7 +324,6 @@
     },
     "allowEmpty" : true
   } ],
-  "pagingMode" : 1,
   "pagingSize" : 20,
   "getRemovePSControlAction" : {
     "actionName" : "Remove",
@@ -345,7 +344,7 @@
   "enableColFilter" : false,
   "enableCustomized" : true,
   "enableGroup" : false,
-  "enablePagingBar" : true,
+  "enablePagingBar" : false,
   "enableRowEdit" : false,
   "enableRowEditOrder" : false,
   "enableRowNew" : false,

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

@@ -1889,6 +1889,7 @@
     "layoutPanel" : true,
     "useDefaultLayout" : true
   },
+  "refFlag" : false,
   "title" : "测试focus",
   "viewStyle" : "DEFAULT",
   "viewType" : "DEGRIDVIEW",

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

@@ -75,7 +75,7 @@
     }
   } ],
   "getPSAppViewRefs" : [ {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
     "realTitle" : "书编辑视图",
     "getRefPSAppView" : {
       "modelref" : true,
@@ -83,7 +83,7 @@
       "viewType" : "DEEDITVIEW"
     }
   }, {
-    "name" : "EDITDATA",
+    "name" : "NEWDATA",
     "realTitle" : "书编辑视图",
     "getRefPSAppView" : {
       "modelref" : true,
@@ -902,7 +902,6 @@
       },
       "allowEmpty" : true
     } ],
-    "pagingMode" : 1,
     "pagingSize" : 20,
     "getRemovePSControlAction" : {
       "actionName" : "Remove",
@@ -923,7 +922,7 @@
     "enableColFilter" : false,
     "enableCustomized" : true,
     "enableGroup" : false,
-    "enablePagingBar" : true,
+    "enablePagingBar" : false,
     "enableRowEdit" : false,
     "enableRowEditOrder" : false,
     "enableRowNew" : false,

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

@@ -5674,53 +5674,31 @@
         "layout" : "TABLE_24COL"
       },
       "tooltip" : "CRM测试视图"
-    }, {
-      "accUserMode" : 2,
-      "caption" : "测试focus",
-      "itemType" : "MENUITEM",
-      "name" : "menuitem295",
-      "getPSAppFunc" : {
-        "modelref" : true,
-        "id" : "UsrAppFunc0613882517"
-      },
-      "getPSLayout" : {
-        "childColMD" : 24,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "tooltip" : "测试focus"
     }, {
       "accUserMode" : 0,
-      "caption" : "测试执行脚本",
+      "caption" : "测试表格",
       "itemType" : "MENUITEM",
-      "name" : "menuitem299",
-      "getPSAppFunc" : {
-        "modelref" : true,
-        "id" : "AppFunc113"
-      },
-      "getPSLayout" : {
-        "childColMD" : 24,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "getPSLayoutPos" : {
-        "colMD" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "tooltip" : "测试执行脚本"
-    }, {
-      "accUserMode" : 0,
-      "caption" : "测试界面行为",
-      "itemType" : "MENUITEM",
-      "name" : "menuitem300",
-      "getPSAppFunc" : {
-        "modelref" : true,
-        "id" : "AppFunc114"
-      },
+      "name" : "menuitem295",
+      "getPSAppMenuItems" : [ {
+        "accUserMode" : 2,
+        "caption" : "测试不分页表格编辑切换数据",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem299",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "UsrAppFunc0716718928"
+        },
+        "getPSLayout" : {
+          "childColMD" : 24,
+          "columnCount" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "tooltip" : "测试不分页表格编辑切换数据"
+      } ],
       "getPSLayout" : {
         "childColMD" : 24,
         "columnCount" : 24,
@@ -5730,7 +5708,7 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
-      "tooltip" : "测试界面行为"
+      "tooltip" : "测试表格"
     } ],
     "getPSControlHandler" : {
       "enableDEFieldPrivilege" : false,

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

@@ -2936,36 +2936,23 @@
       "id" : "UsrAppFunc0530875699"
     },
     "tooltip" : "CRM测试视图"
-  }, {
-    "accUserMode" : 2,
-    "caption" : "测试focus",
-    "itemType" : "MENUITEM",
-    "name" : "menuitem295",
-    "getPSAppFunc" : {
-      "modelref" : true,
-      "id" : "UsrAppFunc0613882517"
-    },
-    "tooltip" : "测试focus"
-  }, {
-    "accUserMode" : 0,
-    "caption" : "测试执行脚本",
-    "itemType" : "MENUITEM",
-    "name" : "menuitem299",
-    "getPSAppFunc" : {
-      "modelref" : true,
-      "id" : "AppFunc113"
-    },
-    "tooltip" : "测试执行脚本"
   }, {
     "accUserMode" : 0,
-    "caption" : "测试界面行为",
+    "caption" : "测试表格",
     "itemType" : "MENUITEM",
-    "name" : "menuitem300",
-    "getPSAppFunc" : {
-      "modelref" : true,
-      "id" : "AppFunc114"
-    },
-    "tooltip" : "测试界面行为"
+    "name" : "menuitem295",
+    "getPSAppMenuItems" : [ {
+      "accUserMode" : 2,
+      "caption" : "测试不分页表格编辑切换数据",
+      "itemType" : "MENUITEM",
+      "name" : "menuitem299",
+      "getPSAppFunc" : {
+        "modelref" : true,
+        "id" : "UsrAppFunc0716718928"
+      },
+      "tooltip" : "测试不分页表格编辑切换数据"
+    } ],
+    "tooltip" : "测试表格"
   } ],
   "name" : "appindex",
   "modelid" : "6A3E233F-FB4A-493B-B3C2-1860D5502904",