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

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

@@ -1255,6 +1255,135 @@
     "stringLength" : 100,
     "valueFormat" : "%1$s",
     "linkDEField" : true
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "PTREENODENAME",
+      "dBType" : "MYSQL5",
+      "name" : "PTREENODENAME",
+      "queryCodeExp" : "t11.`TREENODENAME`",
+      "standardColumnName" : "`PTREENODENAME`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_PTREENODENAME_EQ",
+      "name" : "N_PTREENODENAME_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    }, {
+      "codeName" : "N_PTREENODENAME_LIKE",
+      "name" : "N_PTREENODENAME_LIKE",
+      "stdDataType" : 25,
+      "valueOP" : "LIKE"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[PTREENODENAME][树节点名称]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "PICKER",
+        "name" : "[PTREENODENAME][树节点名称]",
+        "refLinkPSDEViewCodeName" : "RedirectView",
+        "refMPickupPSDEViewCodeName" : "MPickupView",
+        "getRefPSDEACMode" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEACMODES/Default.json"
+        },
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+        },
+        "refPickupPSDEViewCodeName" : "PickupView",
+        "stringLength" : 200,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[PTREENODENAME][树节点名称]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBPICKER",
+        "name" : "[PTREENODENAME][树节点名称]移动端默认",
+        "refLinkPSDEViewCodeName" : "RedirectView",
+        "refMPickupPSDEViewCodeName" : "MPickupView",
+        "getRefPSDEACMode" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEACMODES/Default.json"
+        },
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+        },
+        "refPickupPSDEViewCodeName" : "PickupView",
+        "stringLength" : 200,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "PTREENODENAME",
+          "maxValue" : 200,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[200]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[200]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[200]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "Ptreenodename",
+    "dEFType" : 3,
+    "dataType" : "PICKUPTEXT",
+    "importOrder" : 1000,
+    "length" : 200,
+    "logicName" : "父树节点名称",
+    "name" : "PTREENODENAME",
+    "getPSDER" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json"
+    },
+    "getRealPSDEField" : {
+      "name" : "TREENODENAME",
+      "codeName" : "TreeNodeName"
+    },
+    "getRealPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+    },
+    "getRelatedPSDEField" : {
+      "name" : "TREENODENAME",
+      "codeName" : "TreeNodeName"
+    },
+    "getRelatedPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+    },
+    "serviceCodeName" : "Ptreenodename",
+    "stdDataType" : 25,
+    "stringLength" : 200,
+    "valueFormat" : "%1$s",
+    "getValuePSDEField" : {
+      "name" : "PTREENODEID",
+      "codeName" : "Ptreenodeid"
+    },
+    "viewLevel" : 0,
+    "linkDEField" : true,
+    "phisicalDEField" : false
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "TreeNodeDTO",
@@ -1305,6 +1434,17 @@
       "stdDataType" : 25,
       "stringLength" : 100,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "父树节点名称",
+      "name" : "Ptreenodename",
+      "getPSDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 200,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "树节点标识",
       "name" : "TreeNodeId",
@@ -1388,6 +1528,34 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "父树节点名称",
+      "name" : "N_PTREENODENAME_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_PTREENODENAME_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "logicName" : "父树节点名称",
+      "name" : "N_PTREENODENAME_LIKE",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_PTREENODENAME_LIKE"
+      },
+      "getPSDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "树节点标识",
       "name" : "N_TREENODEID_EQ",
@@ -1563,6 +1731,10 @@
       "name" : "PTREENODEID",
       "codeName" : "Ptreenodeid"
     },
+    "getPSPickupTextDEField" : {
+      "name" : "PTREENODENAME",
+      "codeName" : "Ptreenodename"
+    },
     "pickupDEFName" : "PTREENODEID",
     "removeActionType" : -1,
     "removeOrder" : 0,
@@ -1591,6 +1763,10 @@
       "name" : "PTREENODEID",
       "codeName" : "Ptreenodeid"
     },
+    "getPSPickupTextDEField" : {
+      "name" : "PTREENODENAME",
+      "codeName" : "Ptreenodename"
+    },
     "pickupDEFName" : "PTREENODEID",
     "removeActionType" : -1,
     "removeOrder" : 0,

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

@@ -13,6 +13,9 @@
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
+  }, {
+    "expression" : "t11.`TREENODENAME`",
+    "name" : "PTREENODENAME"
   }, {
     "expression" : "t1.`TREENODEID`",
     "name" : "TREENODEID"
@@ -26,6 +29,6 @@
     "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",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt11.`TREENODENAME` AS `PTREENODENAME`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \nLEFT JOIN `T_TREENODE` t11 ON t1.`PTREENODEID` = t11.`TREENODEID` \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

@@ -18,6 +18,9 @@
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
+  }, {
+    "expression" : "t11.`TREENODENAME`",
+    "name" : "PTREENODENAME"
   }, {
     "expression" : "t1.`TREENODEID`",
     "name" : "TREENODEID"
@@ -31,6 +34,6 @@
     "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",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt11.`TREENODENAME` AS `PTREENODENAME`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \nLEFT JOIN `T_TREENODE` t11 ON t1.`PTREENODEID` = t11.`TREENODEID` \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

@@ -18,6 +18,9 @@
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
+  }, {
+    "expression" : "t11.`TREENODENAME`",
+    "name" : "PTREENODENAME"
   }, {
     "expression" : "t1.`TREENODEID`",
     "name" : "TREENODEID"
@@ -31,6 +34,6 @@
     "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",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt11.`TREENODENAME` AS `PTREENODENAME`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \nLEFT JOIN `T_TREENODE` t11 ON t1.`PTREENODEID` = t11.`TREENODEID` \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

@@ -13,6 +13,9 @@
   }, {
     "expression" : "t1.`PTREENODEID`",
     "name" : "PTREENODEID"
+  }, {
+    "expression" : "t11.`TREENODENAME`",
+    "name" : "PTREENODENAME"
   }, {
     "expression" : "t1.`TREENODEID`",
     "name" : "TREENODEID"
@@ -26,6 +29,6 @@
     "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",
+  "queryCode" : "SELECT\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEFAULTEXPAND`,\nt1.`PTREENODEID`,\nt11.`TREENODENAME` AS `PTREENODENAME`,\nt1.`TREENODEID`,\nt1.`TREENODENAME`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_TREENODE` t1 \nLEFT JOIN `T_TREENODE` t11 ON t1.`PTREENODEID` = t11.`TREENODEID` \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/PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDERS/DER1N_TREENODE_TREENODE_PTREENODEID.json

@@ -21,6 +21,10 @@
     "name" : "PTREENODEID",
     "codeName" : "Ptreenodeid"
   },
+  "getPSPickupTextDEField" : {
+    "name" : "PTREENODENAME",
+    "codeName" : "Ptreenodename"
+  },
   "pickupDEFName" : "PTREENODEID",
   "removeActionType" : -1,
   "removeOrder" : 0,

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

@@ -788,6 +788,59 @@
     "name" : "PTREENODEID",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "getAllPSAppDEFUIModes" : [ {
+      "codeName" : "Default",
+      "name" : "[PTREENODENAME][树节点名称]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "PICKER",
+        "name" : "[PTREENODENAME][树节点名称]",
+        "refLinkPSDEViewCodeName" : "RedirectView",
+        "refMPickupPSDEViewCodeName" : "MPickupView",
+        "getRefPSDEACMode" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEACMODES/Default.json"
+        },
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+        },
+        "refPickupPSDEViewCodeName" : "PickupView",
+        "stringLength" : 200,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    }, {
+      "codeName" : "MobileDefault",
+      "name" : "[PTREENODENAME][树节点名称]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "MOBPICKER",
+        "name" : "[PTREENODENAME][树节点名称]移动端默认",
+        "refLinkPSDEViewCodeName" : "RedirectView",
+        "refMPickupPSDEViewCodeName" : "MPickupView",
+        "getRefPSDEACMode" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode/PSDEACMODES/Default.json"
+        },
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/Test/PSDATAENTITIES/TreeNode.json"
+        },
+        "refPickupPSDEViewCodeName" : "PickupView",
+        "stringLength" : 200,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    } ],
+    "codeName" : "Ptreenodename",
+    "logicName" : "父树节点名称",
+    "name" : "PTREENODENAME",
+    "stdDataType" : 25,
+    "stringLength" : 200
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "TreeNodeDTO",
@@ -839,6 +892,17 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "Ptreenodename",
+      "logicName" : "父树节点名称",
+      "name" : "Ptreenodename",
+      "getPSAppDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "TreeNodeId",
       "logicName" : "树节点标识",
@@ -915,6 +979,28 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PTREENODENAME_EQ",
+      "logicName" : "父树节点名称",
+      "name" : "N_PTREENODENAME_EQ",
+      "getPSAppDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_PTREENODENAME_LIKE",
+      "logicName" : "父树节点名称",
+      "name" : "N_PTREENODENAME_LIKE",
+      "getPSAppDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "N_TREENODEID_EQ",
       "logicName" : "树节点标识",

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

@@ -52,29 +52,39 @@
   }, {
     "align" : "LEFT",
     "cLConvertMode" : "FRONT",
-    "getCapPSLanguageRes" : {
-      "defaultContent" : "更新人",
-      "lanResTag" : "DEF.LNAME.UPDATEMAN",
-      "lanResType" : "DEF.LNAME",
-      "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-      "refFlag" : true
-    },
-    "caption" : "更新人",
-    "codeName" : "updateman",
+    "caption" : "是否默认展开",
+    "codeName" : "defaultexpand",
     "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "updateman",
-    "excelCaption" : "更新人",
-    "name" : "updateman",
+    "dataItemName" : "defaultexpand",
+    "excelCaption" : "是否默认展开",
+    "name" : "defaultexpand",
     "noPrivDisplayMode" : 1,
     "getPSAppCodeList" : {
       "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
     },
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "DEFAULTEXPAND",
+      "codeName" : "DefaultExpand"
     },
-    "width" : 150,
+    "width" : 100,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "父树节点名称",
+    "codeName" : "ptreenodename",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ptreenodename",
+    "excelCaption" : "父树节点名称",
+    "name" : "ptreenodename",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "PTREENODENAME",
+      "codeName" : "Ptreenodename"
+    },
+    "width" : 100,
     "widthUnit" : "PX",
     "enableSort" : true
   }, {
@@ -110,12 +120,19 @@
       "name" : "TREENODENAME",
       "codeName" : "TreeNodeName"
     }
+  }, {
+    "dataType" : 9,
+    "name" : "defaultexpand",
+    "getPSAppDEField" : {
+      "name" : "DEFAULTEXPAND",
+      "codeName" : "DefaultExpand"
+    }
   }, {
     "dataType" : 25,
-    "name" : "updateman",
+    "name" : "ptreenodename",
     "getPSAppDEField" : {
-      "name" : "UPDATEMAN",
-      "codeName" : "UpdateMan"
+      "name" : "PTREENODENAME",
+      "codeName" : "Ptreenodename"
     }
   }, {
     "format" : "YYYY-MM-DD HH:mm:ss",

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

@@ -696,6 +696,10 @@
         "name" : "PTREENODEID",
         "codeName" : "Ptreenodeid"
       },
+      "getPSPickupTextDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
       "pickupDEFName" : "PTREENODEID",
       "removeActionType" : -1,
       "removeOrder" : 0,
@@ -741,6 +745,10 @@
         "name" : "PTREENODEID",
         "codeName" : "Ptreenodeid"
       },
+      "getPSPickupTextDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
       "pickupDEFName" : "PTREENODEID",
       "removeActionType" : -1,
       "removeOrder" : 0,
@@ -786,6 +794,10 @@
         "name" : "PTREENODEID",
         "codeName" : "Ptreenodeid"
       },
+      "getPSPickupTextDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
       "pickupDEFName" : "PTREENODEID",
       "removeActionType" : -1,
       "removeOrder" : 0,
@@ -874,6 +886,10 @@
         "name" : "PTREENODEID",
         "codeName" : "Ptreenodeid"
       },
+      "getPSPickupTextDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
       "pickupDEFName" : "PTREENODEID",
       "removeActionType" : -1,
       "removeOrder" : 0,
@@ -1268,6 +1284,10 @@
         "name" : "PTREENODEID",
         "codeName" : "Ptreenodeid"
       },
+      "getPSPickupTextDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
       "pickupDEFName" : "PTREENODEID",
       "removeActionType" : -1,
       "removeOrder" : 0,

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

@@ -252,29 +252,39 @@
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "FRONT",
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "更新人",
-        "lanResTag" : "DEF.LNAME.UPDATEMAN",
-        "lanResType" : "DEF.LNAME",
-        "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-        "refFlag" : true
-      },
-      "caption" : "更新人",
-      "codeName" : "updateman",
+      "caption" : "是否默认展开",
+      "codeName" : "defaultexpand",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updateman",
-      "excelCaption" : "更新人",
-      "name" : "updateman",
+      "dataItemName" : "defaultexpand",
+      "excelCaption" : "是否默认展开",
+      "name" : "defaultexpand",
       "noPrivDisplayMode" : 1,
       "getPSAppCodeList" : {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
       },
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
       },
-      "width" : 150,
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "父树节点名称",
+      "codeName" : "ptreenodename",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ptreenodename",
+      "excelCaption" : "父树节点名称",
+      "name" : "ptreenodename",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -310,12 +320,19 @@
         "name" : "TREENODENAME",
         "codeName" : "TreeNodeName"
       }
+    }, {
+      "dataType" : 9,
+      "name" : "defaultexpand",
+      "getPSAppDEField" : {
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
+      }
     }, {
       "dataType" : 25,
-      "name" : "updateman",
+      "name" : "ptreenodename",
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
       }
     }, {
       "format" : "YYYY-MM-DD HH:mm:ss",

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

@@ -197,29 +197,39 @@
         }, {
           "align" : "LEFT",
           "cLConvertMode" : "FRONT",
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "更新人",
-            "lanResTag" : "DEF.LNAME.UPDATEMAN",
-            "lanResType" : "DEF.LNAME",
-            "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-            "refFlag" : true
-          },
-          "caption" : "更新人",
-          "codeName" : "updateman",
+          "caption" : "是否默认展开",
+          "codeName" : "defaultexpand",
           "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "updateman",
-          "excelCaption" : "更新人",
-          "name" : "updateman",
+          "dataItemName" : "defaultexpand",
+          "excelCaption" : "是否默认展开",
+          "name" : "defaultexpand",
           "noPrivDisplayMode" : 1,
           "getPSAppCodeList" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
           },
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "DEFAULTEXPAND",
+            "codeName" : "DefaultExpand"
           },
-          "width" : 150,
+          "width" : 100,
+          "widthUnit" : "PX",
+          "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "NONE",
+          "caption" : "父树节点名称",
+          "codeName" : "ptreenodename",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "ptreenodename",
+          "excelCaption" : "父树节点名称",
+          "name" : "ptreenodename",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
+          "width" : 100,
           "widthUnit" : "PX",
           "enableSort" : true
         }, {
@@ -255,12 +265,19 @@
             "name" : "TREENODENAME",
             "codeName" : "TreeNodeName"
           }
+        }, {
+          "dataType" : 9,
+          "name" : "defaultexpand",
+          "getPSAppDEField" : {
+            "name" : "DEFAULTEXPAND",
+            "codeName" : "DefaultExpand"
+          }
         }, {
           "dataType" : 25,
-          "name" : "updateman",
+          "name" : "ptreenodename",
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
           }
         }, {
           "format" : "YYYY-MM-DD HH:mm:ss",

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

@@ -167,29 +167,39 @@
     }, {
       "align" : "LEFT",
       "cLConvertMode" : "FRONT",
-      "getCapPSLanguageRes" : {
-        "defaultContent" : "更新人",
-        "lanResTag" : "DEF.LNAME.UPDATEMAN",
-        "lanResType" : "DEF.LNAME",
-        "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-        "refFlag" : true
-      },
-      "caption" : "更新人",
-      "codeName" : "updateman",
+      "caption" : "是否默认展开",
+      "codeName" : "defaultexpand",
       "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "updateman",
-      "excelCaption" : "更新人",
-      "name" : "updateman",
+      "dataItemName" : "defaultexpand",
+      "excelCaption" : "是否默认展开",
+      "name" : "defaultexpand",
       "noPrivDisplayMode" : 1,
       "getPSAppCodeList" : {
         "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
       },
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
       },
-      "width" : 150,
+      "width" : 100,
+      "widthUnit" : "PX",
+      "enableSort" : true
+    }, {
+      "align" : "LEFT",
+      "cLConvertMode" : "NONE",
+      "caption" : "父树节点名称",
+      "codeName" : "ptreenodename",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ptreenodename",
+      "excelCaption" : "父树节点名称",
+      "name" : "ptreenodename",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
+      },
+      "width" : 100,
       "widthUnit" : "PX",
       "enableSort" : true
     }, {
@@ -225,12 +235,19 @@
         "name" : "TREENODENAME",
         "codeName" : "TreeNodeName"
       }
+    }, {
+      "dataType" : 9,
+      "name" : "defaultexpand",
+      "getPSAppDEField" : {
+        "name" : "DEFAULTEXPAND",
+        "codeName" : "DefaultExpand"
+      }
     }, {
       "dataType" : 25,
-      "name" : "updateman",
+      "name" : "ptreenodename",
       "getPSAppDEField" : {
-        "name" : "UPDATEMAN",
-        "codeName" : "UpdateMan"
+        "name" : "PTREENODENAME",
+        "codeName" : "Ptreenodename"
       }
     }, {
       "format" : "YYYY-MM-DD HH:mm:ss",

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

@@ -197,29 +197,39 @@
         }, {
           "align" : "LEFT",
           "cLConvertMode" : "FRONT",
-          "getCapPSLanguageRes" : {
-            "defaultContent" : "更新人",
-            "lanResTag" : "DEF.LNAME.UPDATEMAN",
-            "lanResType" : "DEF.LNAME",
-            "name" : "属性逻辑名称（DEF.LNAME.*）[UPDATEMAN]",
-            "refFlag" : true
-          },
-          "caption" : "更新人",
-          "codeName" : "updateman",
+          "caption" : "是否默认展开",
+          "codeName" : "defaultexpand",
           "columnType" : "DEFGRIDCOLUMN",
-          "dataItemName" : "updateman",
-          "excelCaption" : "更新人",
-          "name" : "updateman",
+          "dataItemName" : "defaultexpand",
+          "excelCaption" : "是否默认展开",
+          "name" : "defaultexpand",
           "noPrivDisplayMode" : 1,
           "getPSAppCodeList" : {
             "modelref" : true,
-            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/YesNo.json"
           },
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "DEFAULTEXPAND",
+            "codeName" : "DefaultExpand"
           },
-          "width" : 150,
+          "width" : 100,
+          "widthUnit" : "PX",
+          "enableSort" : true
+        }, {
+          "align" : "LEFT",
+          "cLConvertMode" : "NONE",
+          "caption" : "父树节点名称",
+          "codeName" : "ptreenodename",
+          "columnType" : "DEFGRIDCOLUMN",
+          "dataItemName" : "ptreenodename",
+          "excelCaption" : "父树节点名称",
+          "name" : "ptreenodename",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
+          "width" : 100,
           "widthUnit" : "PX",
           "enableSort" : true
         }, {
@@ -255,12 +265,19 @@
             "name" : "TREENODENAME",
             "codeName" : "TreeNodeName"
           }
+        }, {
+          "dataType" : 9,
+          "name" : "defaultexpand",
+          "getPSAppDEField" : {
+            "name" : "DEFAULTEXPAND",
+            "codeName" : "DefaultExpand"
+          }
         }, {
           "dataType" : 25,
-          "name" : "updateman",
+          "name" : "ptreenodename",
           "getPSAppDEField" : {
-            "name" : "UPDATEMAN",
-            "codeName" : "UpdateMan"
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
           }
         }, {
           "format" : "YYYY-MM-DD HH:mm:ss",

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

@@ -934,6 +934,10 @@
             "name" : "PTREENODEID",
             "codeName" : "Ptreenodeid"
           },
+          "getPSPickupTextDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
           "pickupDEFName" : "PTREENODEID",
           "removeActionType" : -1,
           "removeOrder" : 0,
@@ -979,6 +983,10 @@
             "name" : "PTREENODEID",
             "codeName" : "Ptreenodeid"
           },
+          "getPSPickupTextDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
           "pickupDEFName" : "PTREENODEID",
           "removeActionType" : -1,
           "removeOrder" : 0,
@@ -1024,6 +1032,10 @@
             "name" : "PTREENODEID",
             "codeName" : "Ptreenodeid"
           },
+          "getPSPickupTextDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
           "pickupDEFName" : "PTREENODEID",
           "removeActionType" : -1,
           "removeOrder" : 0,
@@ -1112,6 +1124,10 @@
             "name" : "PTREENODEID",
             "codeName" : "Ptreenodeid"
           },
+          "getPSPickupTextDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
           "pickupDEFName" : "PTREENODEID",
           "removeActionType" : -1,
           "removeOrder" : 0,
@@ -1506,6 +1522,10 @@
             "name" : "PTREENODEID",
             "codeName" : "Ptreenodeid"
           },
+          "getPSPickupTextDEField" : {
+            "name" : "PTREENODENAME",
+            "codeName" : "Ptreenodename"
+          },
           "pickupDEFName" : "PTREENODEID",
           "removeActionType" : -1,
           "removeOrder" : 0,

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

@@ -9020,6 +9020,19 @@
       "enableModify" : true,
       "keyField" : false,
       "majorField" : false
+    }, {
+      "codeName" : "Ptreenodename",
+      "codeName2" : "Ptreenodename",
+      "logicName" : "父树节点名称",
+      "name" : "PTREENODENAME",
+      "orderValue" : 1000,
+      "stdDataType" : 25,
+      "stringLength" : 200,
+      "allowEmpty" : true,
+      "enableCreate" : true,
+      "enableModify" : true,
+      "keyField" : false,
+      "majorField" : false
     } ],
     "getPSDEServiceAPIMethods" : [ {
       "dataAccessAction" : "CREATE",