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

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -140,30 +140,6 @@
     "refTag" : "FETCH"
   } ],
   "getAllPSAppDEUIActions" : [ {
-    "actionTarget" : "NONE",
-    "caption" : "全部折叠",
-    "codeName" : "ALLCOLLAPSE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "ALLCOLLAPSE",
-    "name" : "全部折叠",
-    "scriptCode" : "view.callUIAction('AllCollapse');",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "ALLCOLLAPSE",
-    "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "全部展开",
-    "codeName" : "ALLEXPAND",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "ALLEXPAND",
-    "name" : "全部展开",
-    "scriptCode" : "view.callUIAction('AllExpand');",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "ALLEXPAND",
-    "uIActionType" : "DEUIACTION"
-  }, {
     "caption" : "添加全部",
     "codeName" : "AddAll",
     "fullCodeName" : "AddAll",
@@ -183,18 +159,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "AddSelection",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "折叠",
-    "codeName" : "COLLAPSE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "COLLAPSE",
-    "name" : "折叠",
-    "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "COLLAPSE",
-    "uIActionType" : "DEUIACTION"
   }, {
     "caption" : "取消",
     "codeName" : "Cancel",
@@ -215,6 +179,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CancelChanges",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "收缩",
+    "codeName" : "Collapse",
+    "fullCodeName" : "Collapse",
+    "name" : "收缩",
+    "predefinedType" : "UTIL_COLLAPSE",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Collapse",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部收缩",
+    "codeName" : "CollapseAll",
+    "fullCodeName" : "CollapseAll",
+    "name" : "全部收缩",
+    "predefinedType" : "UTIL_COLLAPSEALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "CollapseAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -267,18 +251,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CreateObject",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "展开",
-    "codeName" : "EXPAND",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "EXPAND",
-    "name" : "展开",
-    "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "EXPAND",
-    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -320,6 +292,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Exit",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "展开",
+    "codeName" : "Expand",
+    "fullCodeName" : "Expand",
+    "name" : "展开",
+    "predefinedType" : "UTIL_EXPAND",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Expand",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部展开",
+    "codeName" : "ExpandAll",
+    "fullCodeName" : "ExpandAll",
+    "name" : "全部展开",
+    "predefinedType" : "UTIL_EXPANDALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "ExpandAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.EXPORT"
@@ -888,18 +880,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Synchronize",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "切换",
-    "codeName" : "TOGGLE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "TOGGLE",
-    "name" : "切换",
-    "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "TOGGLE",
-    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.FILTER"

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

@@ -445,30 +445,6 @@
     "rSMode" : 2
   } ],
   "getAllPSAppDEUIActions" : [ {
-    "actionTarget" : "NONE",
-    "caption" : "全部折叠",
-    "codeName" : "ALLCOLLAPSE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "ALLCOLLAPSE",
-    "name" : "全部折叠",
-    "scriptCode" : "view.callUIAction('AllCollapse');",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "ALLCOLLAPSE",
-    "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "全部展开",
-    "codeName" : "ALLEXPAND",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "ALLEXPAND",
-    "name" : "全部展开",
-    "scriptCode" : "view.callUIAction('AllExpand');",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "ALLEXPAND",
-    "uIActionType" : "DEUIACTION"
-  }, {
     "caption" : "添加全部",
     "codeName" : "AddAll",
     "fullCodeName" : "AddAll",
@@ -488,18 +464,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "AddSelection",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "折叠",
-    "codeName" : "COLLAPSE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "COLLAPSE",
-    "name" : "折叠",
-    "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "COLLAPSE",
-    "uIActionType" : "DEUIACTION"
   }, {
     "caption" : "取消",
     "codeName" : "Cancel",
@@ -520,6 +484,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CancelChanges",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "收缩",
+    "codeName" : "Collapse",
+    "fullCodeName" : "Collapse",
+    "name" : "收缩",
+    "predefinedType" : "UTIL_COLLAPSE",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Collapse",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部收缩",
+    "codeName" : "CollapseAll",
+    "fullCodeName" : "CollapseAll",
+    "name" : "全部收缩",
+    "predefinedType" : "UTIL_COLLAPSEALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "CollapseAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -572,18 +556,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CreateObject",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "展开",
-    "codeName" : "EXPAND",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "EXPAND",
-    "name" : "展开",
-    "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "EXPAND",
-    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -625,6 +597,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Exit",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "展开",
+    "codeName" : "Expand",
+    "fullCodeName" : "Expand",
+    "name" : "展开",
+    "predefinedType" : "UTIL_EXPAND",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Expand",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部展开",
+    "codeName" : "ExpandAll",
+    "fullCodeName" : "ExpandAll",
+    "name" : "全部展开",
+    "predefinedType" : "UTIL_EXPANDALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "ExpandAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.EXPORT"
@@ -1179,18 +1171,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Synchronize",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "切换",
-    "codeName" : "TOGGLE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "TOGGLE",
-    "name" : "切换",
-    "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "TOGGLE",
-    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.FILTER"

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

@@ -362,30 +362,6 @@
     "templCode2" : "{\"template\":\"function anonymous(\\n) {\\nwith(this){return _c('div',{staticClass:\\\"plugin\\\"},[_v(\\\"插件\\\")])}\\n}\",\"script\":\"\\r\\nexport default {\\r\\n\\r\\n}\\r\\n\",\"style\":\"\\r\\n.plugin {\\r\\n    color: red;\\r\\n}\\r\\n\"}"
   } ],
   "getAllPSAppDEUIActions" : [ {
-    "actionTarget" : "NONE",
-    "caption" : "全部折叠",
-    "codeName" : "ALLCOLLAPSE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "ALLCOLLAPSE",
-    "name" : "全部折叠",
-    "scriptCode" : "view.callUIAction('AllCollapse');",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "ALLCOLLAPSE",
-    "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "全部展开",
-    "codeName" : "ALLEXPAND",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "ALLEXPAND",
-    "name" : "全部展开",
-    "scriptCode" : "view.callUIAction('AllExpand');",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "ALLEXPAND",
-    "uIActionType" : "DEUIACTION"
-  }, {
     "caption" : "添加全部",
     "codeName" : "AddAll",
     "fullCodeName" : "AddAll",
@@ -405,18 +381,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "AddSelection",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "折叠",
-    "codeName" : "COLLAPSE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "COLLAPSE",
-    "name" : "折叠",
-    "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "COLLAPSE",
-    "uIActionType" : "DEUIACTION"
   }, {
     "caption" : "取消",
     "codeName" : "Cancel",
@@ -437,6 +401,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CancelChanges",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "收缩",
+    "codeName" : "Collapse",
+    "fullCodeName" : "Collapse",
+    "name" : "收缩",
+    "predefinedType" : "UTIL_COLLAPSE",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Collapse",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部收缩",
+    "codeName" : "CollapseAll",
+    "fullCodeName" : "CollapseAll",
+    "name" : "全部收缩",
+    "predefinedType" : "UTIL_COLLAPSEALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "CollapseAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -489,18 +473,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CreateObject",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "展开",
-    "codeName" : "EXPAND",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "EXPAND",
-    "name" : "展开",
-    "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "EXPAND",
-    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -542,6 +514,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Exit",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "展开",
+    "codeName" : "Expand",
+    "fullCodeName" : "Expand",
+    "name" : "展开",
+    "predefinedType" : "UTIL_EXPAND",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Expand",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部展开",
+    "codeName" : "ExpandAll",
+    "fullCodeName" : "ExpandAll",
+    "name" : "全部展开",
+    "predefinedType" : "UTIL_EXPANDALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "ExpandAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.EXPORT"
@@ -1096,18 +1088,6 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Synchronize",
     "uIActionType" : "DEUIACTION"
-  }, {
-    "actionTarget" : "NONE",
-    "caption" : "切换",
-    "codeName" : "TOGGLE",
-    "frontProcessType" : "OTHER",
-    "fullCodeName" : "TOGGLE",
-    "name" : "切换",
-    "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-    "timeout" : 60000,
-    "uIActionMode" : "FRONT",
-    "uIActionTag" : "TOGGLE",
-    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.FILTER"

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

@@ -169,60 +169,54 @@
         "codeName" : "Usr0822434654",
         "name" : "测试折叠行为组",
         "getPSUIActionGroupDetails" : [ {
-          "caption" : "折叠",
+          "caption" : "收缩",
           "detailType" : "DEUIACTION",
-          "name" : "ud009acb",
+          "name" : "u3fa3a61",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "折叠",
-            "codeName" : "COLLAPSE",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "COLLAPSE",
-            "name" : "折叠",
-            "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
+            "caption" : "收缩",
+            "codeName" : "Collapse",
+            "fullCodeName" : "Collapse",
+            "name" : "收缩",
+            "predefinedType" : "UTIL_COLLAPSE",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "COLLAPSE",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Collapse",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
           "showCaption" : true,
           "showIcon" : true
         }, {
-          "caption" : "展开",
+          "caption" : "全部收缩",
           "detailType" : "DEUIACTION",
-          "name" : "u829c1c1",
+          "name" : "ucd03b62",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "展开",
-            "codeName" : "EXPAND",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "EXPAND",
-            "name" : "展开",
-            "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
+            "caption" : "全部收缩",
+            "codeName" : "CollapseAll",
+            "fullCodeName" : "CollapseAll",
+            "name" : "全部收缩",
+            "predefinedType" : "UTIL_COLLAPSEALL",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "EXPAND",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "CollapseAll",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
           "showCaption" : true,
           "showIcon" : true
         }, {
-          "caption" : "全部折叠",
+          "caption" : "展开",
           "detailType" : "DEUIACTION",
-          "name" : "u622015b",
+          "name" : "u64f00a7",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "全部折叠",
-            "codeName" : "ALLCOLLAPSE",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "ALLCOLLAPSE",
-            "name" : "全部折叠",
-            "scriptCode" : "view.callUIAction('AllCollapse');",
+            "caption" : "展开",
+            "codeName" : "Expand",
+            "fullCodeName" : "Expand",
+            "name" : "展开",
+            "predefinedType" : "UTIL_EXPAND",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "ALLCOLLAPSE",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Expand",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
@@ -231,38 +225,16 @@
         }, {
           "caption" : "全部展开",
           "detailType" : "DEUIACTION",
-          "name" : "u50499ea",
+          "name" : "u2e9f042",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
             "caption" : "全部展开",
-            "codeName" : "ALLEXPAND",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "ALLEXPAND",
+            "codeName" : "ExpandAll",
+            "fullCodeName" : "ExpandAll",
             "name" : "全部展开",
-            "scriptCode" : "view.callUIAction('AllExpand');",
+            "predefinedType" : "UTIL_EXPANDALL",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "ALLEXPAND",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : true
-        }, {
-          "caption" : "切换",
-          "detailType" : "DEUIACTION",
-          "name" : "u6b026f4",
-          "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "切换",
-            "codeName" : "TOGGLE",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "TOGGLE",
-            "name" : "切换",
-            "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-            "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "TOGGLE",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ExpandAll",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
@@ -343,60 +315,54 @@
           "codeName" : "Usr0822434654",
           "name" : "测试折叠行为组",
           "getPSUIActionGroupDetails" : [ {
-            "caption" : "折叠",
+            "caption" : "收缩",
             "detailType" : "DEUIACTION",
-            "name" : "ud009acb",
+            "name" : "u3fa3a61",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "折叠",
-              "codeName" : "COLLAPSE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "COLLAPSE",
-              "name" : "折叠",
-              "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
+              "caption" : "收缩",
+              "codeName" : "Collapse",
+              "fullCodeName" : "Collapse",
+              "name" : "收缩",
+              "predefinedType" : "UTIL_COLLAPSE",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "COLLAPSE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Collapse",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
             "showCaption" : true,
             "showIcon" : true
           }, {
-            "caption" : "展开",
+            "caption" : "全部收缩",
             "detailType" : "DEUIACTION",
-            "name" : "u829c1c1",
+            "name" : "ucd03b62",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "展开",
-              "codeName" : "EXPAND",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "EXPAND",
-              "name" : "展开",
-              "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
+              "caption" : "全部收缩",
+              "codeName" : "CollapseAll",
+              "fullCodeName" : "CollapseAll",
+              "name" : "全部收缩",
+              "predefinedType" : "UTIL_COLLAPSEALL",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "EXPAND",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "CollapseAll",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
             "showCaption" : true,
             "showIcon" : true
           }, {
-            "caption" : "全部折叠",
+            "caption" : "展开",
             "detailType" : "DEUIACTION",
-            "name" : "u622015b",
+            "name" : "u64f00a7",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "全部折叠",
-              "codeName" : "ALLCOLLAPSE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "ALLCOLLAPSE",
-              "name" : "全部折叠",
-              "scriptCode" : "view.callUIAction('AllCollapse');",
+              "caption" : "展开",
+              "codeName" : "Expand",
+              "fullCodeName" : "Expand",
+              "name" : "展开",
+              "predefinedType" : "UTIL_EXPAND",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "ALLCOLLAPSE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Expand",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
@@ -405,38 +371,16 @@
           }, {
             "caption" : "全部展开",
             "detailType" : "DEUIACTION",
-            "name" : "u50499ea",
+            "name" : "u2e9f042",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
               "caption" : "全部展开",
-              "codeName" : "ALLEXPAND",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "ALLEXPAND",
+              "codeName" : "ExpandAll",
+              "fullCodeName" : "ExpandAll",
               "name" : "全部展开",
-              "scriptCode" : "view.callUIAction('AllExpand');",
+              "predefinedType" : "UTIL_EXPANDALL",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "ALLEXPAND",
-              "uIActionType" : "DEUIACTION"
-            },
-            "addSeparator" : false,
-            "showCaption" : true,
-            "showIcon" : true
-          }, {
-            "caption" : "切换",
-            "detailType" : "DEUIACTION",
-            "name" : "u6b026f4",
-            "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "切换",
-              "codeName" : "TOGGLE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "TOGGLE",
-              "name" : "切换",
-              "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-              "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "TOGGLE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "ExpandAll",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
@@ -461,60 +405,54 @@
         "codeName" : "Usr0822434654",
         "name" : "测试折叠行为组",
         "getPSUIActionGroupDetails" : [ {
-          "caption" : "折叠",
+          "caption" : "收缩",
           "detailType" : "DEUIACTION",
-          "name" : "ud009acb",
+          "name" : "u3fa3a61",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "折叠",
-            "codeName" : "COLLAPSE",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "COLLAPSE",
-            "name" : "折叠",
-            "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
+            "caption" : "收缩",
+            "codeName" : "Collapse",
+            "fullCodeName" : "Collapse",
+            "name" : "收缩",
+            "predefinedType" : "UTIL_COLLAPSE",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "COLLAPSE",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Collapse",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
           "showCaption" : true,
           "showIcon" : true
         }, {
-          "caption" : "展开",
+          "caption" : "全部收缩",
           "detailType" : "DEUIACTION",
-          "name" : "u829c1c1",
+          "name" : "ucd03b62",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "展开",
-            "codeName" : "EXPAND",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "EXPAND",
-            "name" : "展开",
-            "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
+            "caption" : "全部收缩",
+            "codeName" : "CollapseAll",
+            "fullCodeName" : "CollapseAll",
+            "name" : "全部收缩",
+            "predefinedType" : "UTIL_COLLAPSEALL",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "EXPAND",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "CollapseAll",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
           "showCaption" : true,
           "showIcon" : true
         }, {
-          "caption" : "全部折叠",
+          "caption" : "展开",
           "detailType" : "DEUIACTION",
-          "name" : "u622015b",
+          "name" : "u64f00a7",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "全部折叠",
-            "codeName" : "ALLCOLLAPSE",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "ALLCOLLAPSE",
-            "name" : "全部折叠",
-            "scriptCode" : "view.callUIAction('AllCollapse');",
+            "caption" : "展开",
+            "codeName" : "Expand",
+            "fullCodeName" : "Expand",
+            "name" : "展开",
+            "predefinedType" : "UTIL_EXPAND",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "ALLCOLLAPSE",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "Expand",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,
@@ -523,38 +461,16 @@
         }, {
           "caption" : "全部展开",
           "detailType" : "DEUIACTION",
-          "name" : "u50499ea",
+          "name" : "u2e9f042",
           "getPSUIAction" : {
-            "actionTarget" : "NONE",
             "caption" : "全部展开",
-            "codeName" : "ALLEXPAND",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "ALLEXPAND",
+            "codeName" : "ExpandAll",
+            "fullCodeName" : "ExpandAll",
             "name" : "全部展开",
-            "scriptCode" : "view.callUIAction('AllExpand');",
-            "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "ALLEXPAND",
-            "uIActionType" : "DEUIACTION"
-          },
-          "addSeparator" : false,
-          "showCaption" : true,
-          "showIcon" : true
-        }, {
-          "caption" : "切换",
-          "detailType" : "DEUIACTION",
-          "name" : "u6b026f4",
-          "getPSUIAction" : {
-            "actionTarget" : "NONE",
-            "caption" : "切换",
-            "codeName" : "TOGGLE",
-            "frontProcessType" : "OTHER",
-            "fullCodeName" : "TOGGLE",
-            "name" : "切换",
-            "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
+            "predefinedType" : "UTIL_EXPANDALL",
             "timeout" : 60000,
-            "uIActionMode" : "FRONT",
-            "uIActionTag" : "TOGGLE",
+            "uIActionMode" : "SYS",
+            "uIActionTag" : "ExpandAll",
             "uIActionType" : "DEUIACTION"
           },
           "addSeparator" : false,

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

@@ -47,7 +47,7 @@
     "name" : "calendarexpbar",
     "getPSAppDataEntity" : {
       "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
     },
     "getPSAppViewRefs" : [ {
       "name" : "EXPITEM:calendarbookitem",
@@ -363,6 +363,124 @@
       "name" : "calendarexpbar_calendar",
       "modelid" : "C10C79E5-8EFD-4A5E-B0C6-E5DC49DA3E89",
       "modeltype" : "PSSYSCALENDAR"
+    }, {
+      "codeName" : "CalendarExpViewcalendarexpbar_toolbar",
+      "controlType" : "TOOLBAR",
+      "logicName" : "学生表格视图_工具栏",
+      "name" : "calendarexpbar_toolbar",
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Student.json"
+      },
+      "getPSControlParam" : {
+        "id" : "calendarexpbar_toolbar"
+      },
+      "getPSDEToolbarItems" : [ {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.NEW"
+        },
+        "caption" : "新建",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction1",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "calendarexpbar_toolbar_deuiaction1"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf0f6@FontAwesome",
+          "cssClass" : "fa fa-file-text-o"
+        },
+        "getPSUIAction" : {
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.NEW"
+          },
+          "caption" : "新建",
+          "codeName" : "New",
+          "fullCodeName" : "New",
+          "name" : "表格界面_新建操作",
+          "getPSSysImage" : {
+            "glyph" : "xf0f6@FontAwesome",
+            "cssClass" : "fa fa-file-text-o"
+          },
+          "predefinedType" : "GRIDVIEW_NEWACTION",
+          "refreshMode" : 1,
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.NEW"
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "New",
+          "uIActionType" : "DEUIACTION",
+          "reloadData" : true
+        },
+        "tooltip" : "新建",
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.NEW"
+        },
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "itemType" : "SEPERATOR",
+        "name" : "seperator1",
+        "getPSControlLogics" : [ {
+          "itemName" : "seperator1",
+          "logicTag" : "calendarexpbar_toolbar",
+          "logicType" : "SCRIPT",
+          "name" : "logic",
+          "scriptCode" : "false",
+          "triggerType" : "ITEMVISIBLE"
+        } ]
+      }, {
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.EDIT"
+        },
+        "caption" : "编辑",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction2",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "calendarexpbar_toolbar_deuiaction2"
+        },
+        "getPSSysImage" : {
+          "glyph" : "xf044@FontAwesome",
+          "cssClass" : "fa fa-edit"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "SINGLEKEY",
+          "getCapPSLanguageRes" : {
+            "lanResTag" : "TBB.TEXT.*.EDIT"
+          },
+          "caption" : "编辑",
+          "codeName" : "Edit",
+          "fullCodeName" : "Edit",
+          "name" : "表格界面_编辑操作",
+          "getPSSysImage" : {
+            "glyph" : "xf044@FontAwesome",
+            "cssClass" : "fa fa-edit"
+          },
+          "predefinedType" : "GRIDVIEW_EDITACTION",
+          "timeout" : 60000,
+          "getTooltipPSLanguageRes" : {
+            "lanResTag" : "TBB.TOOLTIP.*.EDIT"
+          },
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Edit",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "编辑",
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.EDIT"
+        },
+        "uIActionTarget" : "SINGLEKEY",
+        "showCaption" : true,
+        "showIcon" : true
+      } ],
+      "modelid" : "EA055F0F-4292-4BD9-85F4-82D57C5D8655",
+      "modeltype" : "PSDETOOLBAR"
     } ],
     "xDataControlName" : "calendarexpbar_calendar",
     "enableCounter" : true,

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

@@ -287,60 +287,54 @@
           "codeName" : "Usr0822434654",
           "name" : "测试折叠行为组",
           "getPSUIActionGroupDetails" : [ {
-            "caption" : "折叠",
+            "caption" : "收缩",
             "detailType" : "DEUIACTION",
-            "name" : "ud009acb",
+            "name" : "u3fa3a61",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "折叠",
-              "codeName" : "COLLAPSE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "COLLAPSE",
-              "name" : "折叠",
-              "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
+              "caption" : "收缩",
+              "codeName" : "Collapse",
+              "fullCodeName" : "Collapse",
+              "name" : "收缩",
+              "predefinedType" : "UTIL_COLLAPSE",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "COLLAPSE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Collapse",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
             "showCaption" : true,
             "showIcon" : true
           }, {
-            "caption" : "展开",
+            "caption" : "全部收缩",
             "detailType" : "DEUIACTION",
-            "name" : "u829c1c1",
+            "name" : "ucd03b62",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "展开",
-              "codeName" : "EXPAND",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "EXPAND",
-              "name" : "展开",
-              "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
+              "caption" : "全部收缩",
+              "codeName" : "CollapseAll",
+              "fullCodeName" : "CollapseAll",
+              "name" : "全部收缩",
+              "predefinedType" : "UTIL_COLLAPSEALL",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "EXPAND",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "CollapseAll",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
             "showCaption" : true,
             "showIcon" : true
           }, {
-            "caption" : "全部折叠",
+            "caption" : "展开",
             "detailType" : "DEUIACTION",
-            "name" : "u622015b",
+            "name" : "u64f00a7",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "全部折叠",
-              "codeName" : "ALLCOLLAPSE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "ALLCOLLAPSE",
-              "name" : "全部折叠",
-              "scriptCode" : "view.callUIAction('AllCollapse');",
+              "caption" : "展开",
+              "codeName" : "Expand",
+              "fullCodeName" : "Expand",
+              "name" : "展开",
+              "predefinedType" : "UTIL_EXPAND",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "ALLCOLLAPSE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Expand",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
@@ -349,38 +343,16 @@
           }, {
             "caption" : "全部展开",
             "detailType" : "DEUIACTION",
-            "name" : "u50499ea",
+            "name" : "u2e9f042",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
               "caption" : "全部展开",
-              "codeName" : "ALLEXPAND",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "ALLEXPAND",
+              "codeName" : "ExpandAll",
+              "fullCodeName" : "ExpandAll",
               "name" : "全部展开",
-              "scriptCode" : "view.callUIAction('AllExpand');",
+              "predefinedType" : "UTIL_EXPANDALL",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "ALLEXPAND",
-              "uIActionType" : "DEUIACTION"
-            },
-            "addSeparator" : false,
-            "showCaption" : true,
-            "showIcon" : true
-          }, {
-            "caption" : "切换",
-            "detailType" : "DEUIACTION",
-            "name" : "u6b026f4",
-            "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "切换",
-              "codeName" : "TOGGLE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "TOGGLE",
-              "name" : "切换",
-              "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-              "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "TOGGLE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "ExpandAll",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
@@ -461,60 +433,54 @@
             "codeName" : "Usr0822434654",
             "name" : "测试折叠行为组",
             "getPSUIActionGroupDetails" : [ {
-              "caption" : "折叠",
+              "caption" : "收缩",
               "detailType" : "DEUIACTION",
-              "name" : "ud009acb",
+              "name" : "u3fa3a61",
               "getPSUIAction" : {
-                "actionTarget" : "NONE",
-                "caption" : "折叠",
-                "codeName" : "COLLAPSE",
-                "frontProcessType" : "OTHER",
-                "fullCodeName" : "COLLAPSE",
-                "name" : "折叠",
-                "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
+                "caption" : "收缩",
+                "codeName" : "Collapse",
+                "fullCodeName" : "Collapse",
+                "name" : "收缩",
+                "predefinedType" : "UTIL_COLLAPSE",
                 "timeout" : 60000,
-                "uIActionMode" : "FRONT",
-                "uIActionTag" : "COLLAPSE",
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "Collapse",
                 "uIActionType" : "DEUIACTION"
               },
               "addSeparator" : false,
               "showCaption" : true,
               "showIcon" : true
             }, {
-              "caption" : "展开",
+              "caption" : "全部收缩",
               "detailType" : "DEUIACTION",
-              "name" : "u829c1c1",
+              "name" : "ucd03b62",
               "getPSUIAction" : {
-                "actionTarget" : "NONE",
-                "caption" : "展开",
-                "codeName" : "EXPAND",
-                "frontProcessType" : "OTHER",
-                "fullCodeName" : "EXPAND",
-                "name" : "展开",
-                "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
+                "caption" : "全部收缩",
+                "codeName" : "CollapseAll",
+                "fullCodeName" : "CollapseAll",
+                "name" : "全部收缩",
+                "predefinedType" : "UTIL_COLLAPSEALL",
                 "timeout" : 60000,
-                "uIActionMode" : "FRONT",
-                "uIActionTag" : "EXPAND",
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "CollapseAll",
                 "uIActionType" : "DEUIACTION"
               },
               "addSeparator" : false,
               "showCaption" : true,
               "showIcon" : true
             }, {
-              "caption" : "全部折叠",
+              "caption" : "展开",
               "detailType" : "DEUIACTION",
-              "name" : "u622015b",
+              "name" : "u64f00a7",
               "getPSUIAction" : {
-                "actionTarget" : "NONE",
-                "caption" : "全部折叠",
-                "codeName" : "ALLCOLLAPSE",
-                "frontProcessType" : "OTHER",
-                "fullCodeName" : "ALLCOLLAPSE",
-                "name" : "全部折叠",
-                "scriptCode" : "view.callUIAction('AllCollapse');",
+                "caption" : "展开",
+                "codeName" : "Expand",
+                "fullCodeName" : "Expand",
+                "name" : "展开",
+                "predefinedType" : "UTIL_EXPAND",
                 "timeout" : 60000,
-                "uIActionMode" : "FRONT",
-                "uIActionTag" : "ALLCOLLAPSE",
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "Expand",
                 "uIActionType" : "DEUIACTION"
               },
               "addSeparator" : false,
@@ -523,38 +489,16 @@
             }, {
               "caption" : "全部展开",
               "detailType" : "DEUIACTION",
-              "name" : "u50499ea",
+              "name" : "u2e9f042",
               "getPSUIAction" : {
-                "actionTarget" : "NONE",
                 "caption" : "全部展开",
-                "codeName" : "ALLEXPAND",
-                "frontProcessType" : "OTHER",
-                "fullCodeName" : "ALLEXPAND",
+                "codeName" : "ExpandAll",
+                "fullCodeName" : "ExpandAll",
                 "name" : "全部展开",
-                "scriptCode" : "view.callUIAction('AllExpand');",
+                "predefinedType" : "UTIL_EXPANDALL",
                 "timeout" : 60000,
-                "uIActionMode" : "FRONT",
-                "uIActionTag" : "ALLEXPAND",
-                "uIActionType" : "DEUIACTION"
-              },
-              "addSeparator" : false,
-              "showCaption" : true,
-              "showIcon" : true
-            }, {
-              "caption" : "切换",
-              "detailType" : "DEUIACTION",
-              "name" : "u6b026f4",
-              "getPSUIAction" : {
-                "actionTarget" : "NONE",
-                "caption" : "切换",
-                "codeName" : "TOGGLE",
-                "frontProcessType" : "OTHER",
-                "fullCodeName" : "TOGGLE",
-                "name" : "切换",
-                "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
-                "timeout" : 60000,
-                "uIActionMode" : "FRONT",
-                "uIActionTag" : "TOGGLE",
+                "uIActionMode" : "SYS",
+                "uIActionTag" : "ExpandAll",
                 "uIActionType" : "DEUIACTION"
               },
               "addSeparator" : false,
@@ -579,60 +523,54 @@
           "codeName" : "Usr0822434654",
           "name" : "测试折叠行为组",
           "getPSUIActionGroupDetails" : [ {
-            "caption" : "折叠",
+            "caption" : "收缩",
             "detailType" : "DEUIACTION",
-            "name" : "ud009acb",
+            "name" : "u3fa3a61",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "折叠",
-              "codeName" : "COLLAPSE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "COLLAPSE",
-              "name" : "折叠",
-              "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Collapse', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Collapse', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('Collapse', {tag: params.srfgroupid});",
+              "caption" : "收缩",
+              "codeName" : "Collapse",
+              "fullCodeName" : "Collapse",
+              "name" : "收缩",
+              "predefinedType" : "UTIL_COLLAPSE",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "COLLAPSE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Collapse",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
             "showCaption" : true,
             "showIcon" : true
           }, {
-            "caption" : "展开",
+            "caption" : "全部收缩",
             "detailType" : "DEUIACTION",
-            "name" : "u829c1c1",
+            "name" : "ucd03b62",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "展开",
-              "codeName" : "EXPAND",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "EXPAND",
-              "name" : "展开",
-              "scriptCode" : "\r\nconst grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('Expand', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('Expand', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\n\r\nview.callUIAction('Expand', {tag: params.srfgroupid});",
+              "caption" : "全部收缩",
+              "codeName" : "CollapseAll",
+              "fullCodeName" : "CollapseAll",
+              "name" : "全部收缩",
+              "predefinedType" : "UTIL_COLLAPSEALL",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "EXPAND",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "CollapseAll",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
             "showCaption" : true,
             "showIcon" : true
           }, {
-            "caption" : "全部折叠",
+            "caption" : "展开",
             "detailType" : "DEUIACTION",
-            "name" : "u622015b",
+            "name" : "u64f00a7",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "全部折叠",
-              "codeName" : "ALLCOLLAPSE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "ALLCOLLAPSE",
-              "name" : "全部折叠",
-              "scriptCode" : "view.callUIAction('AllCollapse');",
+              "caption" : "展开",
+              "codeName" : "Expand",
+              "fullCodeName" : "Expand",
+              "name" : "展开",
+              "predefinedType" : "UTIL_EXPAND",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "ALLCOLLAPSE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "Expand",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,
@@ -641,38 +579,16 @@
           }, {
             "caption" : "全部展开",
             "detailType" : "DEUIACTION",
-            "name" : "u50499ea",
+            "name" : "u2e9f042",
             "getPSUIAction" : {
-              "actionTarget" : "NONE",
               "caption" : "全部展开",
-              "codeName" : "ALLEXPAND",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "ALLEXPAND",
+              "codeName" : "ExpandAll",
+              "fullCodeName" : "ExpandAll",
               "name" : "全部展开",
-              "scriptCode" : "view.callUIAction('AllExpand');",
-              "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "ALLEXPAND",
-              "uIActionType" : "DEUIACTION"
-            },
-            "addSeparator" : false,
-            "showCaption" : true,
-            "showIcon" : true
-          }, {
-            "caption" : "切换",
-            "detailType" : "DEUIACTION",
-            "name" : "u6b026f4",
-            "getPSUIAction" : {
-              "actionTarget" : "NONE",
-              "caption" : "切换",
-              "codeName" : "TOGGLE",
-              "frontProcessType" : "OTHER",
-              "fullCodeName" : "TOGGLE",
-              "name" : "切换",
-              "scriptCode" : "const grid = view.getController('grid');\r\nif (grid) {\r\n    const selectedData = grid.state.selectedData;\r\n    const group = selectedData.find(x => x.isGroupData);\r\n    view.callUIAction('ToggleExpansion', {tag: group.srfkey});\r\n    return;\r\n}\r\nif (data.length > 0) {\r\n    const option = data[0];\r\n    if (option.srfnodeid) {\r\n        view.callUIAction('ToggleExpansion', {tag: option.srfnodeid});\r\n        return;\r\n    }\r\n}\r\nview.callUIAction('ToggleExpansion', {tag: params.srfgroupid});",
+              "predefinedType" : "UTIL_EXPANDALL",
               "timeout" : 60000,
-              "uIActionMode" : "FRONT",
-              "uIActionTag" : "TOGGLE",
+              "uIActionMode" : "SYS",
+              "uIActionTag" : "ExpandAll",
               "uIActionType" : "DEUIACTION"
             },
             "addSeparator" : false,

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

@@ -1641,6 +1641,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CancelChanges",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "收缩",
+    "codeName" : "Collapse",
+    "fullCodeName" : "Collapse",
+    "name" : "收缩",
+    "predefinedType" : "UTIL_COLLAPSE",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Collapse",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部收缩",
+    "codeName" : "CollapseAll",
+    "fullCodeName" : "CollapseAll",
+    "name" : "全部收缩",
+    "predefinedType" : "UTIL_COLLAPSEALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "CollapseAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -1746,6 +1766,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Exit",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "展开",
+    "codeName" : "Expand",
+    "fullCodeName" : "Expand",
+    "name" : "展开",
+    "predefinedType" : "UTIL_EXPAND",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Expand",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部展开",
+    "codeName" : "ExpandAll",
+    "fullCodeName" : "ExpandAll",
+    "name" : "全部展开",
+    "predefinedType" : "UTIL_EXPANDALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "ExpandAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.EXPORT"
@@ -36728,59 +36768,48 @@
     "codeName" : "Usr0822434654",
     "name" : "测试折叠行为组",
     "getPSUIActionGroupDetails" : [ {
-      "caption" : "折叠",
+      "caption" : "收缩",
       "detailType" : "DEUIACTION",
-      "name" : "ud009acb",
+      "name" : "u3fa3a61",
       "addSeparator" : false,
       "showCaption" : true,
       "showIcon" : true,
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "COLLAPSE"
+        "id" : "Collapse"
       }
     }, {
-      "caption" : "展开",
+      "caption" : "全部收缩",
       "detailType" : "DEUIACTION",
-      "name" : "u829c1c1",
+      "name" : "ucd03b62",
       "addSeparator" : false,
       "showCaption" : true,
       "showIcon" : true,
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "EXPAND"
+        "id" : "CollapseAll"
       }
     }, {
-      "caption" : "全部折叠",
+      "caption" : "展开",
       "detailType" : "DEUIACTION",
-      "name" : "u622015b",
+      "name" : "u64f00a7",
       "addSeparator" : false,
       "showCaption" : true,
       "showIcon" : true,
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "ALLCOLLAPSE"
+        "id" : "Expand"
       }
     }, {
       "caption" : "全部展开",
       "detailType" : "DEUIACTION",
-      "name" : "u50499ea",
-      "addSeparator" : false,
-      "showCaption" : true,
-      "showIcon" : true,
-      "getPSUIAction" : {
-        "modelref" : true,
-        "id" : "ALLEXPAND"
-      }
-    }, {
-      "caption" : "切换",
-      "detailType" : "DEUIACTION",
-      "name" : "u6b026f4",
+      "name" : "u2e9f042",
       "addSeparator" : false,
       "showCaption" : true,
       "showIcon" : true,
       "getPSUIAction" : {
         "modelref" : true,
-        "id" : "TOGGLE"
+        "id" : "ExpandAll"
       }
     } ]
   }, {

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

@@ -1442,6 +1442,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "CancelChanges",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "收缩",
+    "codeName" : "Collapse",
+    "fullCodeName" : "Collapse",
+    "name" : "收缩",
+    "predefinedType" : "UTIL_COLLAPSE",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Collapse",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部收缩",
+    "codeName" : "CollapseAll",
+    "fullCodeName" : "CollapseAll",
+    "name" : "全部收缩",
+    "predefinedType" : "UTIL_COLLAPSEALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "CollapseAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "actionTarget" : "SINGLEKEY",
     "getCapPSLanguageRes" : {
@@ -1547,6 +1567,26 @@
     "uIActionMode" : "SYS",
     "uIActionTag" : "Exit",
     "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "展开",
+    "codeName" : "Expand",
+    "fullCodeName" : "Expand",
+    "name" : "展开",
+    "predefinedType" : "UTIL_EXPAND",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "Expand",
+    "uIActionType" : "DEUIACTION"
+  }, {
+    "caption" : "全部展开",
+    "codeName" : "ExpandAll",
+    "fullCodeName" : "ExpandAll",
+    "name" : "全部展开",
+    "predefinedType" : "UTIL_EXPANDALL",
+    "timeout" : 60000,
+    "uIActionMode" : "SYS",
+    "uIActionTag" : "ExpandAll",
+    "uIActionType" : "DEUIACTION"
   }, {
     "getCapPSLanguageRes" : {
       "lanResTag" : "TBB.TEXT.*.EXPORT"

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: