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

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TreeNode.json

@@ -184,6 +184,9 @@
   } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
+      "name" : "DEFAULTEXPAND",
+      "codeName" : "DefaultExpand"
+    }, {
       "name" : "TREENODENAME",
       "codeName" : "TreeNodeName"
     }, {
@@ -246,6 +249,54 @@
       "type" : "DTOS"
     },
     "defaultMode" : true
+  }, {
+    "getAllPSDEDataQueryCodes" : [ {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/DefaultExpand/PSDEDQCODES/MYSQL5.json"
+    } ],
+    "codeName" : "DefaultExpand",
+    "logicName" : "默认展开",
+    "name" : "DefaultExpand",
+    "getPSDEDQMain" : {
+      "getJoinPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "joinType" : "MAIN",
+      "name" : "TREENODE",
+      "getPSDEDQGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "连接条件",
+        "getPSDEDQConditions" : [ {
+          "condOp" : "EQ",
+          "condType" : "SINGLE",
+          "condValue" : "1",
+          "fieldName" : "DEFAULTEXPAND",
+          "name" : "(DEFAULTEXPAND) 等于(=) 1",
+          "getPSDEField" : {
+            "name" : "DEFAULTEXPAND",
+            "codeName" : "DefaultExpand"
+          }
+        } ]
+      }
+    },
+    "getPSDEDataQueryInput" : {
+      "name" : "DefaultExpandInput",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataQueryReturn" : {
+      "name" : "DefaultExpandResult",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeDTO"
+      },
+      "type" : "DTOS"
+    }
   }, {
     "getAllPSDEDataQueryCodes" : [ {
       "modelref" : true,
@@ -354,6 +405,32 @@
     "defaultMode" : true,
     "enableBackend" : true,
     "enableFront" : true
+  }, {
+    "codeName" : "DefaultExpand",
+    "logicName" : "默认展开",
+    "name" : "DefaultExpand",
+    "getPSDEDataQueries" : [ {
+      "modelref" : true,
+      "id" : "DefaultExpand"
+    } ],
+    "getPSDEDataSetInput" : {
+      "name" : "DefaultExpandInput",
+      "getPSDEFilterDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSDEDataSetReturn" : {
+      "name" : "DefaultExpandResult",
+      "getPSDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeDTO"
+      },
+      "type" : "PAGE"
+    },
+    "enableBackend" : true,
+    "enableFront" : true
   }, {
     "codeName" : "RootNodes",
     "logicName" : "根节点集合",
@@ -382,6 +459,80 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "DEFAULTEXPAND",
+      "dBType" : "MYSQL5",
+      "name" : "DEFAULTEXPAND",
+      "queryCodeExp" : "t1.`DEFAULTEXPAND`",
+      "standardColumnName" : "`DEFAULTEXPAND`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_DEFAULTEXPAND_EQ",
+      "name" : "N_DEFAULTEXPAND_EQ",
+      "stdDataType" : 9,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[DEFAULTEXPAND][是否默认展开]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST_100",
+        "name" : "[DEFAULTEXPAND][是否默认展开]",
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[DEFAULTEXPAND][是否默认展开]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBSWITCH",
+        "name" : "[DEFAULTEXPAND][是否默认展开]移动端默认",
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true,
+        "needCodeListConfig" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组"
+      },
+      "ruleInfo" : "默认规则",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "DefaultExpand",
+    "dEFType" : 1,
+    "dataType" : "YESNO",
+    "importOrder" : 1000,
+    "logicName" : "是否默认展开",
+    "name" : "DEFAULTEXPAND",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSCODELISTS/YesNo.json"
+    },
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "id" : "Table"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "DEFAULTEXPAND"
+    },
+    "serviceCodeName" : "DefaultExpand",
+    "stdDataType" : 9,
+    "valueFormat" : "%1$s"
+  }, {
     "getAllPSDEFDTColumns" : [ {
       "columnName" : "TREENODENAME",
       "dBType" : "MYSQL5",
@@ -1108,6 +1259,16 @@
   "getAllPSDEMethodDTOs" : [ {
     "name" : "TreeNodeDTO",
     "getPSDEMethodDTOFields" : [ {
+      "logicName" : "是否默认展开",
+      "name" : "DefaultExpand",
+      "getPSDEField" : {
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 9,
+      "type" : "SIMPLE"
+    }, {
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
       "name" : "CreateDate",
@@ -1200,6 +1361,20 @@
   }, {
     "name" : "TreeNodeFilterDTO",
     "getPSDEFilterDTOFields" : [ {
+      "logicName" : "是否默认展开",
+      "name" : "N_DEFAULTEXPAND_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_DEFAULTEXPAND_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 9,
+      "type" : "SIMPLE"
+    }, {
       "logicName" : "父树节点标识",
       "name" : "N_PTREENODEID_EQ",
       "getPSDEFSearchMode" : {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -7,6 +7,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEFAULTEXPAND`",
+    "name" : "DEFAULTEXPAND"
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
@@ -23,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/DefaultExpand/PSDEDQCODES/MYSQL5.json

+{
+  "dBType" : "MYSQL5",
+  "name" : "MySQL5",
+  "getPSDEDataQueryCodeConds" : [ {
+    "condType" : "CUSTOM",
+    "customCond" : "( t1.`DEFAULTEXPAND` = 1 )",
+    "name" : "查询条件"
+  } ],
+  "getPSDEDataQueryCodeExps" : [ {
+    "expression" : "t1.`CREATEDATE`",
+    "name" : "CREATEDATE"
+  }, {
+    "expression" : "t1.`CREATEMAN`",
+    "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEFAULTEXPAND`",
+    "name" : "DEFAULTEXPAND"
+  }, {
+    "expression" : "t1.`PTREENODEID`",
+    "name" : "PTREENODEID"
+  }, {
+    "expression" : "t1.`TREENODEID`",
+    "name" : "TREENODEID"
+  }, {
+    "expression" : "t1.`TREENODENAME`",
+    "name" : "TREENODENAME"
+  }, {
+    "expression" : "t1.`UPDATEDATE`",
+    "name" : "UPDATEDATE"
+  }, {
+    "expression" : "t1.`UPDATEMAN`",
+    "name" : "UPDATEMAN"
+  } ],
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
+  "id" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/DefaultExpand/PSDEDQCODES/MYSQL5.json"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/RootNodes/PSDEDQCODES/MYSQL5.json

@@ -12,6 +12,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEFAULTEXPAND`",
+    "name" : "DEFAULTEXPAND"
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
@@ -28,6 +31,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/RootNodes/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -7,6 +7,9 @@
   }, {
     "expression" : "t1.`CREATEMAN`",
     "name" : "CREATEMAN"
+  }, {
+    "expression" : "t1.`DEFAULTEXPAND`",
+    "name" : "DEFAULTEXPAND"
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
@@ -23,6 +26,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \n",
   "id" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

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

@@ -321,6 +321,42 @@
     "requestParamType" : "ENTITY",
     "requestPath" : "/fetchdefault",
     "builtinMethod" : false
+  }, {
+    "codeName" : "FetchDefaultExpand",
+    "methodType" : "FETCH",
+    "name" : "FetchDefaultExpand",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "DefaultExpand"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefaultExpand"
+    },
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchdefaultexpand",
+    "builtinMethod" : false
   }, {
     "codeName" : "FetchRootNodes",
     "methodType" : "FETCH",
@@ -359,6 +395,36 @@
     "builtinMethod" : false
   } ],
   "getAllPSAppDEFields" : [ {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[DEFAULTEXPAND][是否默认展开]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "DROPDOWNLIST_100",
+        "name" : "[DEFAULTEXPAND][是否默认展开]",
+        "uIMode" : "DEFAULT",
+        "needCodeListConfig" : true
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[DEFAULTEXPAND][是否默认展开]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBSWITCH",
+        "name" : "[DEFAULTEXPAND][是否默认展开]移动端默认",
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true,
+        "needCodeListConfig" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "DefaultExpand",
+    "logicName" : "是否默认展开",
+    "name" : "DEFAULTEXPAND",
+    "stdDataType" : 9
+  }, {
     "getAllPSAppDEFUIModes" : [ {
       "codeName" : "Default",
       "name" : "[TREENODENAME][树节点名称]",
@@ -727,6 +793,17 @@
     "codeName" : "TreeNodeDTO",
     "name" : "TreeNodeDTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "DefaultExpand",
+      "logicName" : "是否默认展开",
+      "name" : "DefaultExpand",
+      "getPSAppDEField" : {
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 9,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "CreateDate",
       "jsonFormat" : "yyyy-MM-dd HH:mm:ss",
       "logicName" : "建立时间",
@@ -817,6 +894,17 @@
     "codeName" : "TreeNodeFilterDTO",
     "name" : "TreeNodeFilterDTO",
     "getPSAppDEMethodDTOFields" : [ {
+      "codeName" : "N_DEFAULTEXPAND_EQ",
+      "logicName" : "是否默认展开",
+      "name" : "N_DEFAULTEXPAND_EQ",
+      "getPSAppDEField" : {
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 9,
+      "type" : "SIMPLE"
+    }, {
       "codeName" : "N_PTREENODEID_EQ",
       "logicName" : "父树节点标识",
       "name" : "N_PTREENODEID_EQ",
@@ -1143,6 +1231,42 @@
     "requestParamType" : "ENTITY",
     "requestPath" : "/fetchdefault",
     "builtinMethod" : false
+  }, {
+    "codeName" : "FetchDefaultExpand",
+    "methodType" : "FETCH",
+    "name" : "FetchDefaultExpand",
+    "getPSAppDEMethodInput" : {
+      "name" : "输入对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeFilterDTO"
+      },
+      "type" : "DTO"
+    },
+    "getPSAppDEMethodReturn" : {
+      "name" : "返回对象",
+      "getPSAppDEMethodDTO" : {
+        "modelref" : true,
+        "id" : "TreeNodeDTO"
+      },
+      "type" : "PAGE"
+    },
+    "getPSDEDataSet" : {
+      "modelref" : true,
+      "id" : "DefaultExpand"
+    },
+    "getPSDEOPPriv" : {
+      "modelref" : true,
+      "id" : "READ"
+    },
+    "getPSDEServiceAPIMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefaultExpand"
+    },
+    "requestMethod" : "POST",
+    "requestParamType" : "ENTITY",
+    "requestPath" : "/fetchdefaultexpand",
+    "builtinMethod" : false
   }, {
     "codeName" : "FetchRootNodes",
     "methodType" : "FETCH",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode/PSTREEVIEWS/RefreshTree.json

@@ -62,16 +62,16 @@
     "name" : "treeexpbar_load"
   } ],
   "getPSControls" : [ {
-    "codeName" : "TreeRefreshTestexpandnode_cm",
+    "codeName" : "TreeRefreshTestrootnode_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "expandnode_cm",
+    "name" : "rootnode_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "expandnode_cm"
+      "id" : "rootnode_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -81,7 +81,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "expandnode_cm_deuiaction1"
+        "id" : "rootnode_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -113,7 +113,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "expandnode_cm_deuiaction2"
+        "id" : "rootnode_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -152,7 +152,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "expandnode_cm_deuiaction3"
+        "id" : "rootnode_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -203,16 +203,16 @@
     "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "TreeRefreshTestchildnode_cm",
+    "codeName" : "TreeRefreshTestdefaultexpand_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "childnode_cm",
+    "name" : "defaultexpand_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "childnode_cm"
+      "id" : "defaultexpand_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -222,7 +222,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "childnode_cm_deuiaction1"
+        "id" : "defaultexpand_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -254,7 +254,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "childnode_cm_deuiaction2"
+        "id" : "defaultexpand_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -293,7 +293,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "childnode_cm_deuiaction3"
+        "id" : "defaultexpand_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -344,16 +344,16 @@
     "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "TreeRefreshTestrootnode_cm",
+    "codeName" : "TreeRefreshTestexpandnode_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "rootnode_cm",
+    "name" : "expandnode_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "rootnode_cm"
+      "id" : "expandnode_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -363,7 +363,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "rootnode_cm_deuiaction1"
+        "id" : "expandnode_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -395,7 +395,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "rootnode_cm_deuiaction2"
+        "id" : "expandnode_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -434,7 +434,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "rootnode_cm_deuiaction3"
+        "id" : "expandnode_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -485,16 +485,16 @@
     "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
     "modeltype" : "PSDETOOLBAR"
   }, {
-    "codeName" : "TreeRefreshTestdefaultexpand_cm",
+    "codeName" : "TreeRefreshTestchildnode_cm",
     "controlType" : "CONTEXTMENU",
     "logicName" : "刷新测试上下文菜单",
-    "name" : "defaultexpand_cm",
+    "name" : "childnode_cm",
     "getPSAppDataEntity" : {
       "modelref" : true,
       "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TreeNode.json"
     },
     "getPSControlParam" : {
-      "id" : "defaultexpand_cm"
+      "id" : "childnode_cm"
     },
     "getPSDEToolbarItems" : [ {
       "caption" : "刷新全部",
@@ -504,7 +504,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "defaultexpand_cm_deuiaction1"
+        "id" : "childnode_cm_deuiaction1"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -536,7 +536,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "defaultexpand_cm_deuiaction2"
+        "id" : "childnode_cm_deuiaction2"
       },
       "getPSSysImage" : {
         "glyph" : "xf021@FontAwesome",
@@ -575,7 +575,7 @@
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "defaultexpand_cm_deuiaction3"
+        "id" : "childnode_cm_deuiaction3"
       },
       "getPSSysImage" : {
         "glyph" : "xf044@FontAwesome",
@@ -798,7 +798,13 @@
   "getPSDETreeNodes" : [ {
     "counterMode" : 0,
     "name" : "默认根节点",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TreeNodeGridView.json",
+      "viewType" : "DEGRIDVIEW"
+    },
     "nodeType" : "ROOT",
+    "nodeValue" : "Root",
     "text" : "默认根节点",
     "treeNodeType" : "STATIC",
     "hasPSDETreeNodeRSs" : true,
@@ -1033,6 +1039,11 @@
   }, {
     "counterMode" : 0,
     "name" : "默认展开",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TreeNodeGridView.json",
+      "viewType" : "DEGRIDVIEW"
+    },
     "nodeType" : "defaultExpand",
     "getPSDEContextMenu" : {
       "codeName" : "TreeRefreshTestdefaultexpand_cm",
@@ -1176,6 +1187,12 @@
       "modelid" : "449BCB62-7C41-44C7-B74E-D1345D34DB9E",
       "modeltype" : "PSDETOOLBAR"
     },
+    "getPSNavigateParams" : [ {
+      "key" : "n_defaultexpand_eq",
+      "name" : "n_defaultexpand_eq",
+      "value" : "1",
+      "rawValue" : true
+    } ],
     "text" : "默认展开",
     "treeNodeType" : "STATIC",
     "hasPSDETreeNodeRSs" : true,
@@ -1202,10 +1219,43 @@
     },
     "maxSize" : -1,
     "name" : "默认展开子节点",
+    "getNavPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TreeNodeGridView.json",
+      "viewType" : "DEGRIDVIEW"
+    },
+    "getNavPSDER" : {
+      "codeName" : "TreeNode",
+      "dERType" : "DER1N",
+      "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json",
+      "fKeyName" : "F7C67C7EB8CBF195CB",
+      "logicName" : "自关系",
+      "getMajorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "masterOrder" : -1,
+      "masterRS" : 0,
+      "minorCodeName" : "TreeNodes",
+      "getMinorPSDataEntity" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+      },
+      "name" : "DER1N_TREENODE_TREENODE_PTREENODEID",
+      "orderValue" : 100,
+      "getPSPickupDEField" : {
+        "name" : "PTREENODEID",
+        "codeName" : "Ptreenodeid"
+      },
+      "pickupDEFName" : "PTREENODEID",
+      "removeActionType" : -1,
+      "removeOrder" : 0,
+      "enableFKey" : true
+    },
     "nodeType" : "expandNode",
     "getPSAppDEDataSet" : {
       "modelref" : true,
-      "id" : "FetchDefault"
+      "id" : "FetchDefaultExpand"
     },
     "getPSAppDataEntity" : {
       "modelref" : true,

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

@@ -9615,6 +9615,12 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息位置-视图内容区",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg9"
+      }
+    }, {
       "name" : "消息位置-视图上方",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -9632,22 +9638,23 @@
         "modelref" : true,
         "id" : "ViewMsg10"
       }
-    }, {
-      "name" : "消息位置-视图内容区",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg9"
-      }
     } ]
   }, {
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-默认删除-上方-错误",
+      "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
+    }, {
+      "name" : "消息类型-常规信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg4"
+      },
+      "position" : "POPUP"
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -9660,12 +9667,6 @@
         "modelref" : true,
         "id" : "ViewMsg9"
       }
-    }, {
-      "name" : "关闭模式-本次删除-上方-警告",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg13"
-      }
     }, {
       "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
@@ -9674,23 +9675,22 @@
       },
       "position" : "POPUP"
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg12"
+      }
     }, {
-      "name" : "关闭模式-无删除-上方-常规",
+      "name" : "关闭模式-本次删除-上方-警告",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-常规信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg4"
+        "id" : "ViewMsg6"
       },
       "position" : "POPUP"
     } ]
@@ -9698,22 +9698,22 @@
     "codeName" : "VMGroup5",
     "name" : "视图消息关闭模式",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-默认删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-默认删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg12"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -2846,6 +2846,12 @@
       "name" : "CREATEMAN",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "DEFAULTEXPAND",
+      "logicName" : "是否默认展开",
+      "name" : "DEFAULTEXPAND",
+      "stdDataType" : 9,
+      "nullable" : true
     }, {
       "codeName" : "PTREENODEID",
       "length" : 100,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json

@@ -8878,6 +8878,18 @@
     "logicName" : "树节点",
     "name" : "TREENODE",
     "getPSDEServiceAPIFields" : [ {
+      "codeName" : "DefaultExpand",
+      "codeName2" : "DefaultExpand",
+      "logicName" : "是否默认展开",
+      "name" : "DEFAULTEXPAND",
+      "orderValue" : 170,
+      "stdDataType" : 9,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
+    }, {
       "codeName" : "TreeNodeName",
       "codeName2" : "TreeNodeName",
       "getLNPSLanguageRes" : {
@@ -9231,6 +9243,35 @@
       "requestParamType" : "ENTITY",
       "requestPath" : "/fetchdefault",
       "uniqueTag" : "TREENODE__FETCH__DEFAULT"
+    }, {
+      "codeName" : "FetchDefaultExpand",
+      "dataAccessAction" : "READ",
+      "methodType" : "FETCH",
+      "name" : "FetchDefaultExpand",
+      "getPSDEDataSet" : {
+        "modelref" : true,
+        "id" : "DefaultExpand"
+      },
+      "getPSDEServiceAPIMethodInput" : {
+        "name" : "输入对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "TreeNodeFilterDTO"
+        },
+        "type" : "DTO"
+      },
+      "getPSDEServiceAPIMethodReturn" : {
+        "name" : "返回对象",
+        "getPSDEMethodDTO" : {
+          "modelref" : true,
+          "id" : "TreeNodeDTO"
+        },
+        "type" : "PAGE"
+      },
+      "requestMethod" : "POST",
+      "requestParamType" : "ENTITY",
+      "requestPath" : "/fetchdefaultexpand",
+      "uniqueTag" : "TREENODE__FETCH__DEFAULTEXPAND"
     }, {
       "codeName" : "FetchRootNodes",
       "dataAccessAction" : "READ",