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

eeb5f9d3 · ibizdev · f9c61625 · eeb5f9d3 · eeb5f9d3 · eeb5f9d3
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/DataView1.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSDATAVIEWS/DataView1.json
@@ -60,6 +60,83 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__CodeList44.json"
  },
+  "getGroupPSUIActionGroup" : {
+    "codeName" : "Usr0822434654",
+    "name" : "测试折叠行为组",
+    "getPSUIActionGroupDetails" : [ {
+      "caption" : "收缩",
+      "detailType" : "DEUIACTION",
+      "name" : "u3fa3a61",
+      "getPSUIAction" : {
+        "caption" : "收缩",
+        "codeName" : "Collapse",
+        "fullCodeName" : "Collapse",
+        "name" : "收缩",
+        "predefinedType" : "UTIL_COLLAPSE",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Collapse",
+        "uIActionType" : "DEUIACTION"
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "全部收缩",
+      "detailType" : "DEUIACTION",
+      "name" : "ucd03b62",
+      "getPSUIAction" : {
+        "caption" : "全部收缩",
+        "codeName" : "CollapseAll",
+        "fullCodeName" : "CollapseAll",
+        "name" : "全部收缩",
+        "predefinedType" : "UTIL_COLLAPSEALL",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "CollapseAll",
+        "uIActionType" : "DEUIACTION"
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "展开",
+      "detailType" : "DEUIACTION",
+      "name" : "u64f00a7",
+      "getPSUIAction" : {
+        "caption" : "展开",
+        "codeName" : "Expand",
+        "fullCodeName" : "Expand",
+        "name" : "展开",
+        "predefinedType" : "UTIL_EXPAND",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "Expand",
+        "uIActionType" : "DEUIACTION"
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "caption" : "全部展开",
+      "detailType" : "DEUIACTION",
+      "name" : "u2e9f042",
+      "getPSUIAction" : {
+        "caption" : "全部展开",
+        "codeName" : "ExpandAll",
+        "fullCodeName" : "ExpandAll",
+        "name" : "全部展开",
+        "predefinedType" : "UTIL_EXPANDALL",
+        "timeout" : 60000,
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "ExpandAll",
+        "uIActionType" : "DEUIACTION"
+      },
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true
+    } ]
+  },
  "logicName" : "卡片（分组宽高）",
  "getPSAppDataEntity" : {
    "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSLISTS/Usr08024416ListView_List.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSLISTS/Usr08024416ListView_List.json
@@ -263,17 +263,17 @@
  } ],
  "getPSDEListDataItems" : [ {
    "dataType" : 25,
-    "name" : "text",
+    "name" : "kind",
    "getPSAppDEField" : {
-      "name" : "BOOKNAME",
+      "name" : "TYPE",
-      "codeName" : "BookName"
+      "codeName" : "Type"
    }
  }, {
    "dataType" : 25,
-    "name" : "kind",
+    "name" : "text",
    "getPSAppDEField" : {
-      "name" : "TYPE",
+      "name" : "BOOKNAME",
-      "codeName" : "Type"
+      "codeName" : "BookName"
    }
  }, {
    "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTreeExpView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTreeExpView.json
@@ -1329,6 +1329,72 @@
        "tooltip" : "表格刷新",
        "showCaption" : true,
        "showIcon" : true
+      }, {
+        "caption" : "收缩",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction4",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "treeexpbar_toolbar_deuiaction4"
+        },
+        "getPSUIAction" : {
+          "caption" : "收缩",
+          "codeName" : "Collapse",
+          "fullCodeName" : "Collapse",
+          "name" : "自定义收缩",
+          "getPSNavigateParams" : [ {
+            "key" : "srfcollapsetag",
+            "name" : "srfcollapsetag",
+            "value" : "srfgroupid",
+            "rawValue" : false
+          } ],
+          "predefinedType" : "UTIL_COLLAPSE",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionParamJO" : {
+            "srfcollapsetag" : "%srfgroupid%"
+          },
+          "uIActionTag" : "Collapse",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "收缩",
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "caption" : "展开",
+        "groupExtractMode" : "ITEM",
+        "itemType" : "DEUIACTION",
+        "name" : "deuiaction5",
+        "noPrivDisplayMode" : 2,
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "treeexpbar_toolbar_deuiaction5"
+        },
+        "getPSUIAction" : {
+          "caption" : "展开",
+          "codeName" : "Expand",
+          "fullCodeName" : "Expand",
+          "name" : "自定义展开",
+          "getPSNavigateParams" : [ {
+            "key" : "srfcollapsetag",
+            "name" : "srfcollapsetag",
+            "value" : "srfgroupid",
+            "rawValue" : false
+          } ],
+          "predefinedType" : "UTIL_EXPAND",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionParamJO" : {
+            "srfcollapsetag" : "%srfgroupid%"
+          },
+          "uIActionTag" : "Expand",
+          "uIActionType" : "DEUIACTION"
+        },
+        "tooltip" : "展开",
+        "showCaption" : true,
+        "showIcon" : true
      } ],
      "modelid" : "00CAA72A-A604-42F4-8B9D-AE17CE5A9854",
      "modeltype" : "PSDETOOLBAR"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr01028976MPickupView2.json
@@ -1467,17 +1467,17 @@
      } ],
      "getPSDEListDataItems" : [ {
        "dataType" : 25,
-        "name" : "text",
+        "name" : "kind",
        "getPSAppDEField" : {
-          "name" : "BOOKNAME",
+          "name" : "TYPE",
-          "codeName" : "BookName"
+          "codeName" : "Type"
        }
      }, {
        "dataType" : 25,
-        "name" : "kind",
+        "name" : "text",
        "getPSAppDEField" : {
-          "name" : "TYPE",
+          "name" : "BOOKNAME",
-          "codeName" : "Type"
+          "codeName" : "BookName"
        }
      }, {
        "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr08024416ListView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr08024416ListView.json
@@ -614,17 +614,17 @@
    } ],
    "getPSDEListDataItems" : [ {
      "dataType" : 25,
-      "name" : "text",
+      "name" : "kind",
      "getPSAppDEField" : {
-        "name" : "BOOKNAME",
+        "name" : "TYPE",
-        "codeName" : "BookName"
+        "codeName" : "Type"
      }
    }, {
      "dataType" : 25,
-      "name" : "kind",
+      "name" : "text",
      "getPSAppDEField" : {
-        "name" : "TYPE",
+        "name" : "BOOKNAME",
-        "codeName" : "Type"
+        "codeName" : "BookName"
      }
    }, {
      "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr3DataView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr3DataView.json
@@ -318,6 +318,83 @@
      "modelref" : true,
      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/ModelRepository__CodeList44.json"
    },
+    "getGroupPSUIActionGroup" : {
+      "codeName" : "Usr0822434654",
+      "name" : "测试折叠行为组",
+      "getPSUIActionGroupDetails" : [ {
+        "caption" : "收缩",
+        "detailType" : "DEUIACTION",
+        "name" : "u3fa3a61",
+        "getPSUIAction" : {
+          "caption" : "收缩",
+          "codeName" : "Collapse",
+          "fullCodeName" : "Collapse",
+          "name" : "收缩",
+          "predefinedType" : "UTIL_COLLAPSE",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Collapse",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "caption" : "全部收缩",
+        "detailType" : "DEUIACTION",
+        "name" : "ucd03b62",
+        "getPSUIAction" : {
+          "caption" : "全部收缩",
+          "codeName" : "CollapseAll",
+          "fullCodeName" : "CollapseAll",
+          "name" : "全部收缩",
+          "predefinedType" : "UTIL_COLLAPSEALL",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "CollapseAll",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "caption" : "展开",
+        "detailType" : "DEUIACTION",
+        "name" : "u64f00a7",
+        "getPSUIAction" : {
+          "caption" : "展开",
+          "codeName" : "Expand",
+          "fullCodeName" : "Expand",
+          "name" : "展开",
+          "predefinedType" : "UTIL_EXPAND",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "Expand",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : true
+      }, {
+        "caption" : "全部展开",
+        "detailType" : "DEUIACTION",
+        "name" : "u2e9f042",
+        "getPSUIAction" : {
+          "caption" : "全部展开",
+          "codeName" : "ExpandAll",
+          "fullCodeName" : "ExpandAll",
+          "name" : "全部展开",
+          "predefinedType" : "UTIL_EXPANDALL",
+          "timeout" : 60000,
+          "uIActionMode" : "SYS",
+          "uIActionTag" : "ExpandAll",
+          "uIActionType" : "DEUIACTION"
+        },
+        "addSeparator" : false,
+        "showCaption" : true,
+        "showIcon" : true
+      } ]
+    },
    "logicName" : "卡片（分组宽高）",
    "getPSAppDataEntity" : {
      "modelref" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json
@@ -415,17 +415,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView6.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView6.json
@@ -390,17 +390,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,
@@ -874,17 +874,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,
@@ -3294,17 +3294,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -28032,17 +28032,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,
@@ -28543,17 +28543,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,
@@ -30336,17 +30336,17 @@
        } ],
        "getPSDEListDataItems" : [ {
          "dataType" : 25,
-          "name" : "text",
+          "name" : "kind",
          "getPSAppDEField" : {
-            "name" : "BOOKNAME",
+            "name" : "TYPE",
-            "codeName" : "BookName"
+            "codeName" : "Type"
          }
        }, {
          "dataType" : 25,
-          "name" : "kind",
+          "name" : "text",
          "getPSAppDEField" : {
-            "name" : "TYPE",
+            "name" : "BOOKNAME",
-            "codeName" : "Type"
+            "codeName" : "BookName"
          }
        }, {
          "dataType" : 25,
@@ -48460,17 +48460,17 @@
            } ],
            "getPSDEListDataItems" : [ {
              "dataType" : 25,
-              "name" : "text",
+              "name" : "kind",
              "getPSAppDEField" : {
-                "name" : "BOOKNAME",
+                "name" : "TYPE",
-                "codeName" : "BookName"
+                "codeName" : "Type"
              }
            }, {
              "dataType" : 25,
-              "name" : "kind",
+              "name" : "text",
              "getPSAppDEField" : {
-                "name" : "TYPE",
+                "name" : "BOOKNAME",
-                "codeName" : "Type"
+                "codeName" : "BookName"
              }
            }, {
              "dataType" : 25,
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSCONTENTCATS/UsrContentCat0830986685.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSCONTENTCATS/UsrContentCat0830986685.json
@@ -3,6 +3,10 @@
  "dynaModelFilePath" : "PSSYSCONTENTCATS/UsrContentCat0830986685.json",
  "name" : "test",
  "getPSSysContents" : [ {
+    "codeName" : "UsrContent08306802621",
+    "contentType" : "RAW",
+    "name" : "test2"
+  }, {
    "codeName" : "UsrContent0830680261",
    "contentType" : "RAW",
    "name" : "test"