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

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

@@ -4096,6 +4096,12 @@
     "name" : "测试实体实体编辑视图_模态",
     "realModelSubType" : "DEEDITVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr6EditView",
+    "logicName" : "测试实体实体编辑视图(简单表单)",
+    "name" : "测试实体实体编辑视图(简单表单)",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
   }, {
     "codeName" : "GridExpView",
     "logicName" : "测试表格导航",
@@ -4120,6 +4126,13 @@
     "name" : "视图布局面板（基础）",
     "realModelSubType" : "DEGRIDVIEW",
     "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "simpleform",
+    "logicName" : "简单表单",
+    "modelTag2" : "0",
+    "name" : "简单表单",
+    "realModelSubType" : "EDITFORM",
+    "realModelType" : "PSDEFORM"
   }, {
     "codeName" : "gnqr_xsxxl",
     "logicName" : "功能确认-显示信息栏",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/RawMaterial.json

@@ -174,6 +174,14 @@
     },
     "builtinAction" : true
   } ],
+  "getAllPSDEDBConfigs" : [ {
+    "dBType" : "MYSQL5",
+    "name" : "MYSQL5",
+    "objNameCase" : "DEFAULT",
+    "standardTableName" : "`T_RAWMATERIAL`",
+    "tableName" : "T_RAWMATERIAL",
+    "valid" : true
+  } ],
   "getAllPSDEDBTables" : [ {
     "getAllPSDEFields" : [ {
       "name" : "RAWMATERIALID",
@@ -301,6 +309,13 @@
     "enableFront" : true
   } ],
   "getAllPSDEFields" : [ {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "RAWMATERIALID",
+      "dBType" : "MYSQL5",
+      "name" : "RAWMATERIALID",
+      "queryCodeExp" : "t1.`RAWMATERIALID`",
+      "standardColumnName" : "`RAWMATERIALID`"
+    } ],
     "getAllPSDEFSearchModes" : [ {
       "codeName" : "N_RAWMATERIALID_EQ",
       "name" : "N_RAWMATERIALID_EQ",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSLISTS/List.json

@@ -62,7 +62,7 @@
     }
   },
   "groupMode" : "NONE",
-  "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+  "hookEventNames" : [ "ONBEFORELOAD" ],
   "getItemPSLayoutPanel" : {
     "getAllPSPanelFields" : [ {
       "id" : "field_text_dynamic",
@@ -70,9 +70,6 @@
     }, {
       "id" : "field_text_dynamic1",
       "viewFieldName" : "TESTNAME"
-    }, {
-      "id" : "field_switch",
-      "viewFieldName" : "TESTID"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -92,7 +89,7 @@
       "caption" : "栅格容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container_grid1",
+      "name" : "container_grid",
       "getPSLayout" : {
         "layout" : "SIMPLEFLEX"
       },
@@ -104,7 +101,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container2",
+        "name" : "container",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -114,7 +111,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -141,7 +138,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container3",
+        "name" : "container1",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -151,7 +148,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -174,41 +171,6 @@
           "hidden" : false,
           "showCaption" : false
         } ]
-      }, {
-        "caption" : "面板容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container4",
-        "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "grow" : 4,
-          "layout" : "SIMPLEFLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "开关",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "FIELD",
-          "name" : "field_switch",
-          "getPSEditor" : {
-            "editorType" : "SWITCH",
-            "name" : "field_switch",
-            "predefinedType" : "FIELD_SWITCH"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "viewFieldName" : "TESTID",
-          "hidden" : false,
-          "showCaption" : false
-        } ]
       } ],
       "predefinedType" : "CONTAINER_GRID"
     } ],
@@ -254,44 +216,6 @@
       "uIActionTag" : "SaveChanges",
       "uIActionType" : "DEUIACTION"
     }
-  }, {
-    "eventNames" : "点击",
-    "logicTag" : "simplelist",
-    "logicType" : "APPDEUILOGIC",
-    "name" : "member1",
-    "getPSAppDEUILogic" : {
-      "modelref" : true,
-      "id" : "UILogic1"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-    }
-  }, {
-    "eventNames" : "点击",
-    "logicTag" : "simplelist",
-    "logicType" : "APPDEUILOGIC",
-    "name" : "member2",
-    "getPSAppDEUILogic" : {
-      "modelref" : true,
-      "id" : "UILogic1"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-    }
-  }, {
-    "logicTag" : "simplelist",
-    "logicType" : "PFPLUGIN",
-    "name" : "member3",
-    "timer" : 333,
-    "triggerType" : "TIMER"
-  }, {
-    "logicTag" : "simplelist",
-    "logicType" : "SCRIPT",
-    "name" : "member5",
-    "scriptCode" : "eeeee",
-    "triggerType" : "CUSTOM"
   } ],
   "getPSControls" : [ {
     "codeName" : "MobMPickupViewsimplelist_quicktoolbar",
@@ -324,10 +248,10 @@
   } ],
   "getPSDEListDataItems" : [ {
     "dataType" : 25,
-    "name" : "testname"
+    "name" : "testid"
   }, {
     "dataType" : 25,
-    "name" : "testid"
+    "name" : "testname"
   }, {
     "dataType" : 25,
     "name" : "srfkey",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMPickupView.json

@@ -81,7 +81,7 @@
       }
     },
     "groupMode" : "NONE",
-    "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+    "hookEventNames" : [ "ONBEFORELOAD" ],
     "getItemPSLayoutPanel" : {
       "getAllPSPanelFields" : [ {
         "id" : "field_text_dynamic",
@@ -89,9 +89,6 @@
       }, {
         "id" : "field_text_dynamic1",
         "viewFieldName" : "TESTNAME"
-      }, {
-        "id" : "field_switch",
-        "viewFieldName" : "TESTID"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -111,7 +108,7 @@
         "caption" : "栅格容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_grid",
         "getPSLayout" : {
           "layout" : "SIMPLEFLEX"
         },
@@ -123,7 +120,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container2",
+          "name" : "container",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -133,7 +130,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -160,7 +157,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container3",
+          "name" : "container1",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -170,7 +167,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -193,41 +190,6 @@
             "hidden" : false,
             "showCaption" : false
           } ]
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container4",
-          "getPSLayout" : {
-            "childColLG" : -1,
-            "childColMD" : 24,
-            "childColSM" : -1,
-            "childColXS" : -1,
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 4,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "开关",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "field_switch",
-            "getPSEditor" : {
-              "editorType" : "SWITCH",
-              "name" : "field_switch",
-              "predefinedType" : "FIELD_SWITCH"
-            },
-            "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
-            },
-            "viewFieldName" : "TESTID",
-            "hidden" : false,
-            "showCaption" : false
-          } ]
         } ],
         "predefinedType" : "CONTAINER_GRID"
       } ],
@@ -346,44 +308,6 @@
         "uIActionTag" : "SaveChanges",
         "uIActionType" : "DEUIACTION"
       }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "simplelist",
-      "logicType" : "APPDEUILOGIC",
-      "name" : "member1",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "simplelist",
-      "logicType" : "APPDEUILOGIC",
-      "name" : "member2",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "logicTag" : "simplelist",
-      "logicType" : "PFPLUGIN",
-      "name" : "member3",
-      "timer" : 333,
-      "triggerType" : "TIMER"
-    }, {
-      "logicTag" : "simplelist",
-      "logicType" : "SCRIPT",
-      "name" : "member5",
-      "scriptCode" : "eeeee",
-      "triggerType" : "CUSTOM"
     } ],
     "getPSControlParam" : {
       "autoLoad" : true,
@@ -421,10 +345,10 @@
     } ],
     "getPSDEListDataItems" : [ {
       "dataType" : 25,
-      "name" : "testname"
+      "name" : "testid"
     }, {
       "dataType" : 25,
-      "name" : "testid"
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -7457,7 +7457,7 @@
           }
         },
         "groupMode" : "NONE",
-        "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+        "hookEventNames" : [ "ONBEFORELOAD" ],
         "getItemPSLayoutPanel" : {
           "getAllPSPanelFields" : [ {
             "id" : "field_text_dynamic",
@@ -7465,9 +7465,6 @@
           }, {
             "id" : "field_text_dynamic1",
             "viewFieldName" : "TESTNAME"
-          }, {
-            "id" : "field_switch",
-            "viewFieldName" : "TESTID"
           } ],
           "codeName" : "Usr0522433048",
           "controlType" : "PANEL",
@@ -7487,7 +7484,7 @@
             "caption" : "栅格容器",
             "itemStyle" : "DEFAULT",
             "itemType" : "CONTAINER",
-            "name" : "container_grid1",
+            "name" : "container_grid",
             "getPSLayout" : {
               "layout" : "SIMPLEFLEX"
             },
@@ -7499,7 +7496,7 @@
               "caption" : "面板容器",
               "itemStyle" : "DEFAULT",
               "itemType" : "CONTAINER",
-              "name" : "container2",
+              "name" : "container",
               "getPSLayout" : {
                 "childColLG" : -1,
                 "childColMD" : 24,
@@ -7509,7 +7506,7 @@
                 "layout" : "TABLE_24COL"
               },
               "getPSLayoutPos" : {
-                "grow" : 4,
+                "grow" : 6,
                 "layout" : "SIMPLEFLEX"
               },
               "getPSPanelItems" : [ {
@@ -7536,7 +7533,7 @@
               "caption" : "面板容器",
               "itemStyle" : "DEFAULT",
               "itemType" : "CONTAINER",
-              "name" : "container3",
+              "name" : "container1",
               "getPSLayout" : {
                 "childColLG" : -1,
                 "childColMD" : 24,
@@ -7546,7 +7543,7 @@
                 "layout" : "TABLE_24COL"
               },
               "getPSLayoutPos" : {
-                "grow" : 4,
+                "grow" : 6,
                 "layout" : "SIMPLEFLEX"
               },
               "getPSPanelItems" : [ {
@@ -7569,41 +7566,6 @@
                 "hidden" : false,
                 "showCaption" : false
               } ]
-            }, {
-              "caption" : "面板容器",
-              "itemStyle" : "DEFAULT",
-              "itemType" : "CONTAINER",
-              "name" : "container4",
-              "getPSLayout" : {
-                "childColLG" : -1,
-                "childColMD" : 24,
-                "childColSM" : -1,
-                "childColXS" : -1,
-                "columnCount" : 24,
-                "layout" : "TABLE_24COL"
-              },
-              "getPSLayoutPos" : {
-                "grow" : 4,
-                "layout" : "SIMPLEFLEX"
-              },
-              "getPSPanelItems" : [ {
-                "caption" : "开关",
-                "itemStyle" : "DEFAULT",
-                "itemType" : "FIELD",
-                "name" : "field_switch",
-                "getPSEditor" : {
-                  "editorType" : "SWITCH",
-                  "name" : "field_switch",
-                  "predefinedType" : "FIELD_SWITCH"
-                },
-                "getPSLayoutPos" : {
-                  "colMD" : 24,
-                  "layout" : "TABLE_24COL"
-                },
-                "viewFieldName" : "TESTID",
-                "hidden" : false,
-                "showCaption" : false
-              } ]
             } ],
             "predefinedType" : "CONTAINER_GRID"
           } ],
@@ -7722,44 +7684,6 @@
             "uIActionTag" : "SaveChanges",
             "uIActionType" : "DEUIACTION"
           }
-        }, {
-          "eventNames" : "点击",
-          "logicTag" : "simplelist",
-          "logicType" : "APPDEUILOGIC",
-          "name" : "member1",
-          "getPSAppDEUILogic" : {
-            "modelref" : true,
-            "id" : "UILogic1"
-          },
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-          }
-        }, {
-          "eventNames" : "点击",
-          "logicTag" : "simplelist",
-          "logicType" : "APPDEUILOGIC",
-          "name" : "member2",
-          "getPSAppDEUILogic" : {
-            "modelref" : true,
-            "id" : "UILogic1"
-          },
-          "getPSAppDataEntity" : {
-            "modelref" : true,
-            "path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json"
-          }
-        }, {
-          "logicTag" : "simplelist",
-          "logicType" : "PFPLUGIN",
-          "name" : "member3",
-          "timer" : 333,
-          "triggerType" : "TIMER"
-        }, {
-          "logicTag" : "simplelist",
-          "logicType" : "SCRIPT",
-          "name" : "member5",
-          "scriptCode" : "eeeee",
-          "triggerType" : "CUSTOM"
         } ],
         "getPSControlParam" : {
           "autoLoad" : true,
@@ -7797,10 +7721,10 @@
         } ],
         "getPSDEListDataItems" : [ {
           "dataType" : 25,
-          "name" : "testname"
+          "name" : "testid"
         }, {
           "dataType" : 25,
-          "name" : "testid"
+          "name" : "testname"
         }, {
           "dataType" : 25,
           "name" : "srfkey",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSLISTS/List.json

@@ -24,7 +24,7 @@
     "id" : "load"
   },
   "groupMode" : "NONE",
-  "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+  "hookEventNames" : [ "ONBEFORELOAD" ],
   "getItemPSLayoutPanel" : {
     "getAllPSPanelFields" : [ {
       "id" : "field_text_dynamic",
@@ -32,9 +32,6 @@
     }, {
       "id" : "field_text_dynamic1",
       "viewFieldName" : "TESTNAME"
-    }, {
-      "id" : "field_switch",
-      "viewFieldName" : "TESTID"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -54,7 +51,7 @@
       "caption" : "栅格容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container_grid1",
+      "name" : "container_grid",
       "getPSLayout" : {
         "layout" : "SIMPLEFLEX"
       },
@@ -66,7 +63,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container2",
+        "name" : "container",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -76,7 +73,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -103,7 +100,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container3",
+        "name" : "container1",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -113,7 +110,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -136,41 +133,6 @@
           "hidden" : false,
           "showCaption" : false
         } ]
-      }, {
-        "caption" : "面板容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container4",
-        "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "grow" : 4,
-          "layout" : "SIMPLEFLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "开关",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "FIELD",
-          "name" : "field_switch",
-          "getPSEditor" : {
-            "editorType" : "SWITCH",
-            "name" : "field_switch",
-            "predefinedType" : "FIELD_SWITCH"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "viewFieldName" : "TESTID",
-          "hidden" : false,
-          "showCaption" : false
-        } ]
       } ],
       "predefinedType" : "CONTAINER_GRID"
     } ],
@@ -216,44 +178,6 @@
       "uIActionTag" : "SaveChanges",
       "uIActionType" : "DEUIACTION"
     }
-  }, {
-    "eventNames" : "点击",
-    "logicTag" : "simplelist",
-    "logicType" : "DEUILOGIC",
-    "name" : "member1",
-    "getPSAppDEUILogic" : {
-      "modelref" : true,
-      "id" : "UILogic1"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-    }
-  }, {
-    "eventNames" : "点击",
-    "logicTag" : "simplelist",
-    "logicType" : "DEUILOGIC",
-    "name" : "member2",
-    "getPSAppDEUILogic" : {
-      "modelref" : true,
-      "id" : "UILogic1"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-    }
-  }, {
-    "logicTag" : "simplelist",
-    "logicType" : "PFPLUGIN",
-    "name" : "member3",
-    "timer" : 333,
-    "triggerType" : "TIMER"
-  }, {
-    "logicTag" : "simplelist",
-    "logicType" : "SCRIPT",
-    "name" : "member5",
-    "scriptCode" : "eeeee",
-    "triggerType" : "CUSTOM"
   } ],
   "getPSControls" : [ {
     "codeName" : "MobMPickupViewsimplelist_quicktoolbar",
@@ -286,10 +210,10 @@
   } ],
   "getPSDEListDataItems" : [ {
     "dataType" : 25,
-    "name" : "testname"
+    "name" : "testid"
   }, {
     "dataType" : 25,
-    "name" : "testid"
+    "name" : "testname"
   }, {
     "dataType" : 25,
     "name" : "srfkey",

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

@@ -49,7 +49,7 @@
       "id" : "load"
     },
     "groupMode" : "NONE",
-    "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+    "hookEventNames" : [ "ONBEFORELOAD" ],
     "getItemPSLayoutPanel" : {
       "getAllPSPanelFields" : [ {
         "id" : "field_text_dynamic",
@@ -57,9 +57,6 @@
       }, {
         "id" : "field_text_dynamic1",
         "viewFieldName" : "TESTNAME"
-      }, {
-        "id" : "field_switch",
-        "viewFieldName" : "TESTID"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -79,7 +76,7 @@
         "caption" : "栅格容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_grid",
         "getPSLayout" : {
           "layout" : "SIMPLEFLEX"
         },
@@ -91,7 +88,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container2",
+          "name" : "container",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -101,7 +98,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -128,7 +125,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container3",
+          "name" : "container1",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -138,7 +135,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -161,41 +158,6 @@
             "hidden" : false,
             "showCaption" : false
           } ]
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container4",
-          "getPSLayout" : {
-            "childColLG" : -1,
-            "childColMD" : 24,
-            "childColSM" : -1,
-            "childColXS" : -1,
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 4,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "开关",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "field_switch",
-            "getPSEditor" : {
-              "editorType" : "SWITCH",
-              "name" : "field_switch",
-              "predefinedType" : "FIELD_SWITCH"
-            },
-            "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
-            },
-            "viewFieldName" : "TESTID",
-            "hidden" : false,
-            "showCaption" : false
-          } ]
         } ],
         "predefinedType" : "CONTAINER_GRID"
       } ],
@@ -314,44 +276,6 @@
         "uIActionTag" : "SaveChanges",
         "uIActionType" : "DEUIACTION"
       }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "simplelist",
-      "logicType" : "DEUILOGIC",
-      "name" : "member1",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "simplelist",
-      "logicType" : "DEUILOGIC",
-      "name" : "member2",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "logicTag" : "simplelist",
-      "logicType" : "PFPLUGIN",
-      "name" : "member3",
-      "timer" : 333,
-      "triggerType" : "TIMER"
-    }, {
-      "logicTag" : "simplelist",
-      "logicType" : "SCRIPT",
-      "name" : "member5",
-      "scriptCode" : "eeeee",
-      "triggerType" : "CUSTOM"
     } ],
     "getPSControlParam" : {
       "autoLoad" : true,
@@ -389,10 +313,10 @@
     } ],
     "getPSDEListDataItems" : [ {
       "dataType" : 25,
-      "name" : "testname"
+      "name" : "testid"
     }, {
       "dataType" : 25,
-      "name" : "testid"
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -1360,16 +1360,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {

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

@@ -3729,6 +3729,10 @@
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTFormPickupDataView.json",
     "viewType" : "DEFORMPICKUPDATAVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
+    "viewType" : "DEEDITVIEW"
   } ],
   "getAllPSDEOPPrivs" : [ {
     "logicName" : "建立",

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

+{
+  "codeName" : "Simpleform",
+  "controlType" : "FORM",
+  "getCreatePSControlAction" : {
+    "modelref" : true,
+    "id" : "create",
+    "actionName" : "Create",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "create",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Create"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Simpleform.json",
+  "getGetDraftFromPSControlAction" : {
+    "modelref" : true,
+    "id" : "loaddraftfrom",
+    "actionName" : "GETDRAFTFROM",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "loaddraftfrom",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "getGetDraftPSControlAction" : {
+    "modelref" : true,
+    "id" : "loaddraft",
+    "actionName" : "GetDraft",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "loaddraft",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "GetDraft"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load",
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "logicName" : "简单表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+  },
+  "getPSDEFormItems" : [ {
+    "id" : "srfupdatedate",
+    "hidden" : true,
+    "dataType" : 5,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "id" : "srforikey",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfkey",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TESTID",
+      "codeName" : "TESTId"
+    }
+  }, {
+    "id" : "srfmajortext",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    }
+  }, {
+    "id" : "srftempmode",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfuf",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfdeid",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "srfsourcekey",
+    "hidden" : true,
+    "dataType" : 25
+  }, {
+    "id" : "testname",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    }
+  }, {
+    "id" : "testid",
+    "hidden" : true,
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "TESTID",
+      "codeName" : "TESTId"
+    }
+  } ],
+  "getPSDEFormPages" : [ {
+    "caption" : "基本信息",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "getPSDEFormDetails" : [ {
+      "caption" : "测试实体名称",
+      "codeName" : "testname",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "testname",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 200,
+        "name" : "testname"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
+    } ],
+    "getPSLayout" : {
+      "childColLG" : -1,
+      "childColMD" : 24,
+      "childColSM" : -1,
+      "childColXS" : -1,
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "infoGroupMode" : false
+  } ],
+  "getPSLayout" : {
+    "childColLG" : -1,
+    "childColMD" : 24,
+    "childColSM" : -1,
+    "childColXS" : -1,
+    "columnCount" : 24,
+    "layout" : "TABLE_24COL"
+  },
+  "getRemovePSControlAction" : {
+    "modelref" : true,
+    "id" : "remove",
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "tabHeaderPos" : "TOP",
+  "getUpdatePSControlAction" : {
+    "modelref" : true,
+    "id" : "update",
+    "actionName" : "Update",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "UPDATE",
+    "name" : "update",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "noTabHeader" : true,
+  "modelid" : "0C16F312-69FB-479A-87A2-2FCA71659888",
+  "modeltype" : "PSDEFORM_EDITFORM"
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSLISTS/List.json

@@ -62,7 +62,7 @@
     }
   },
   "groupMode" : "NONE",
-  "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+  "hookEventNames" : [ "ONBEFORELOAD" ],
   "getItemPSLayoutPanel" : {
     "getAllPSPanelFields" : [ {
       "id" : "field_text_dynamic",
@@ -70,9 +70,6 @@
     }, {
       "id" : "field_text_dynamic1",
       "viewFieldName" : "TESTNAME"
-    }, {
-      "id" : "field_switch",
-      "viewFieldName" : "TESTID"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -96,7 +93,7 @@
       "caption" : "栅格容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container_grid1",
+      "name" : "container_grid",
       "getPSLayout" : {
         "layout" : "SIMPLEFLEX"
       },
@@ -108,7 +105,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container2",
+        "name" : "container",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -118,7 +115,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -145,7 +142,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container3",
+        "name" : "container1",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -155,7 +152,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -178,41 +175,6 @@
           "hidden" : false,
           "showCaption" : false
         } ]
-      }, {
-        "caption" : "面板容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container4",
-        "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "grow" : 4,
-          "layout" : "SIMPLEFLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "开关",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "FIELD",
-          "name" : "field_switch",
-          "getPSEditor" : {
-            "editorType" : "SWITCH",
-            "name" : "field_switch",
-            "predefinedType" : "FIELD_SWITCH"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "viewFieldName" : "TESTID",
-          "hidden" : false,
-          "showCaption" : false
-        } ]
       } ],
       "predefinedType" : "CONTAINER_GRID"
     } ],
@@ -259,44 +221,6 @@
       "uIActionTag" : "SaveChanges",
       "uIActionType" : "DEUIACTION"
     }
-  }, {
-    "eventNames" : "点击",
-    "logicTag" : "simplelist",
-    "logicType" : "APPDEUILOGIC",
-    "name" : "member1",
-    "getPSAppDEUILogic" : {
-      "modelref" : true,
-      "id" : "UILogic1"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-    }
-  }, {
-    "eventNames" : "点击",
-    "logicTag" : "simplelist",
-    "logicType" : "APPDEUILOGIC",
-    "name" : "member2",
-    "getPSAppDEUILogic" : {
-      "modelref" : true,
-      "id" : "UILogic1"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-    }
-  }, {
-    "logicTag" : "simplelist",
-    "logicType" : "PFPLUGIN",
-    "name" : "member3",
-    "timer" : 333,
-    "triggerType" : "TIMER"
-  }, {
-    "logicTag" : "simplelist",
-    "logicType" : "SCRIPT",
-    "name" : "member5",
-    "scriptCode" : "eeeee",
-    "triggerType" : "CUSTOM"
   } ],
   "getPSControls" : [ {
     "codeName" : "MobMPickupViewsimplelist_quicktoolbar",
@@ -329,10 +253,10 @@
   } ],
   "getPSDEListDataItems" : [ {
     "dataType" : 25,
-    "name" : "testname"
+    "name" : "testid"
   }, {
     "dataType" : 25,
-    "name" : "testid"
+    "name" : "testname"
   }, {
     "dataType" : 25,
     "name" : "srfkey",

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

@@ -335,6 +335,7 @@
     "enableCond" : 1,
     "ignoreInput" : 0,
     "name" : "test2",
+    "outputCodeListConfigMode" : 2,
     "getPSAppDEField" : {
       "name" : "TEST2",
       "codeName" : "Test2"
@@ -359,7 +360,8 @@
     "resetItemName" : "test4",
     "updateDVT" : "APPLICATION",
     "valueItemName" : "test1",
-    "allowEmpty" : false
+    "allowEmpty" : false,
+    "needCodeListConfig" : true
   }, {
     "caption" : "属性",
     "codeName" : "test1",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewLayoutModelRepository/PSLISTS/ListViewViewLayout_List.json

@@ -56,9 +56,6 @@
     }, {
       "id" : "field_text_dynamic1",
       "viewFieldName" : "TESTNAME"
-    }, {
-      "id" : "field_switch",
-      "viewFieldName" : "TESTID"
     } ],
     "codeName" : "Usr0522433048",
     "controlType" : "PANEL",
@@ -82,7 +79,7 @@
       "caption" : "栅格容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container_grid1",
+      "name" : "container_grid",
       "getPSLayout" : {
         "layout" : "SIMPLEFLEX"
       },
@@ -94,7 +91,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container2",
+        "name" : "container",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -104,7 +101,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -131,7 +128,7 @@
         "caption" : "面板容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container3",
+        "name" : "container1",
         "getPSLayout" : {
           "childColLG" : -1,
           "childColMD" : 24,
@@ -141,7 +138,7 @@
           "layout" : "TABLE_24COL"
         },
         "getPSLayoutPos" : {
-          "grow" : 4,
+          "grow" : 6,
           "layout" : "SIMPLEFLEX"
         },
         "getPSPanelItems" : [ {
@@ -164,41 +161,6 @@
           "hidden" : false,
           "showCaption" : false
         } ]
-      }, {
-        "caption" : "面板容器",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "CONTAINER",
-        "name" : "container4",
-        "getPSLayout" : {
-          "childColLG" : -1,
-          "childColMD" : 24,
-          "childColSM" : -1,
-          "childColXS" : -1,
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "getPSLayoutPos" : {
-          "grow" : 4,
-          "layout" : "SIMPLEFLEX"
-        },
-        "getPSPanelItems" : [ {
-          "caption" : "开关",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "FIELD",
-          "name" : "field_switch",
-          "getPSEditor" : {
-            "editorType" : "SWITCH",
-            "name" : "field_switch",
-            "predefinedType" : "FIELD_SWITCH"
-          },
-          "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "viewFieldName" : "TESTID",
-          "hidden" : false,
-          "showCaption" : false
-        } ]
       } ],
       "predefinedType" : "CONTAINER_GRID"
     } ],

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/ViewLayoutModelRepository/PSPANELS/Usr0522433048.json

@@ -5,9 +5,6 @@
   }, {
     "id" : "field_text_dynamic1",
     "viewFieldName" : "TESTNAME"
-  }, {
-    "id" : "field_switch",
-    "viewFieldName" : "TESTID"
   } ],
   "codeName" : "Usr0522433048",
   "controlType" : "PANEL",
@@ -30,7 +27,7 @@
     "caption" : "栅格容器",
     "itemStyle" : "DEFAULT",
     "itemType" : "CONTAINER",
-    "name" : "container_grid1",
+    "name" : "container_grid",
     "getPSLayout" : {
       "layout" : "SIMPLEFLEX"
     },
@@ -42,7 +39,7 @@
       "caption" : "面板容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container2",
+      "name" : "container",
       "getPSLayout" : {
         "childColLG" : -1,
         "childColMD" : 24,
@@ -52,7 +49,7 @@
         "layout" : "TABLE_24COL"
       },
       "getPSLayoutPos" : {
-        "grow" : 4,
+        "grow" : 6,
         "layout" : "SIMPLEFLEX"
       },
       "getPSPanelItems" : [ {
@@ -79,7 +76,7 @@
       "caption" : "面板容器",
       "itemStyle" : "DEFAULT",
       "itemType" : "CONTAINER",
-      "name" : "container3",
+      "name" : "container1",
       "getPSLayout" : {
         "childColLG" : -1,
         "childColMD" : 24,
@@ -89,7 +86,7 @@
         "layout" : "TABLE_24COL"
       },
       "getPSLayoutPos" : {
-        "grow" : 4,
+        "grow" : 6,
         "layout" : "SIMPLEFLEX"
       },
       "getPSPanelItems" : [ {
@@ -112,41 +109,6 @@
         "hidden" : false,
         "showCaption" : false
       } ]
-    }, {
-      "caption" : "面板容器",
-      "itemStyle" : "DEFAULT",
-      "itemType" : "CONTAINER",
-      "name" : "container4",
-      "getPSLayout" : {
-        "childColLG" : -1,
-        "childColMD" : 24,
-        "childColSM" : -1,
-        "childColXS" : -1,
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
-      },
-      "getPSLayoutPos" : {
-        "grow" : 4,
-        "layout" : "SIMPLEFLEX"
-      },
-      "getPSPanelItems" : [ {
-        "caption" : "开关",
-        "itemStyle" : "DEFAULT",
-        "itemType" : "FIELD",
-        "name" : "field_switch",
-        "getPSEditor" : {
-          "editorType" : "SWITCH",
-          "name" : "field_switch",
-          "predefinedType" : "FIELD_SWITCH"
-        },
-        "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
-        },
-        "viewFieldName" : "TESTID",
-        "hidden" : false,
-        "showCaption" : false
-      } ]
     } ],
     "predefinedType" : "CONTAINER_GRID"
   } ],

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

@@ -725,6 +725,7 @@
       "enableCond" : 1,
       "ignoreInput" : 0,
       "name" : "test2",
+      "outputCodeListConfigMode" : 2,
       "getPSAppDEField" : {
         "name" : "TEST2",
         "codeName" : "Test2"
@@ -749,7 +750,8 @@
       "resetItemName" : "test4",
       "updateDVT" : "APPLICATION",
       "valueItemName" : "test1",
-      "allowEmpty" : false
+      "allowEmpty" : false,
+      "needCodeListConfig" : true
     }, {
       "caption" : "属性",
       "codeName" : "test1",

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

@@ -833,7 +833,7 @@
     },
     "groupMode" : "NONE",
     "height" : 100.0,
-    "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+    "hookEventNames" : [ "ONBEFORELOAD" ],
     "getItemPSLayoutPanel" : {
       "getAllPSPanelFields" : [ {
         "id" : "field_text_dynamic",
@@ -841,9 +841,6 @@
       }, {
         "id" : "field_text_dynamic1",
         "viewFieldName" : "TESTNAME"
-      }, {
-        "id" : "field_switch",
-        "viewFieldName" : "TESTID"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -867,7 +864,7 @@
         "caption" : "栅格容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_grid",
         "getPSLayout" : {
           "layout" : "SIMPLEFLEX"
         },
@@ -879,7 +876,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container2",
+          "name" : "container",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -889,7 +886,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -916,7 +913,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container3",
+          "name" : "container1",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -926,7 +923,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -949,41 +946,6 @@
             "hidden" : false,
             "showCaption" : false
           } ]
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container4",
-          "getPSLayout" : {
-            "childColLG" : -1,
-            "childColMD" : 24,
-            "childColSM" : -1,
-            "childColXS" : -1,
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 4,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "开关",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "field_switch",
-            "getPSEditor" : {
-              "editorType" : "SWITCH",
-              "name" : "field_switch",
-              "predefinedType" : "FIELD_SWITCH"
-            },
-            "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
-            },
-            "viewFieldName" : "TESTID",
-            "hidden" : false,
-            "showCaption" : false
-          } ]
         } ],
         "predefinedType" : "CONTAINER_GRID"
       } ],
@@ -1103,44 +1065,6 @@
         "uIActionTag" : "SaveChanges",
         "uIActionType" : "DEUIACTION"
       }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "list",
-      "logicType" : "APPDEUILOGIC",
-      "name" : "member1",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "list",
-      "logicType" : "APPDEUILOGIC",
-      "name" : "member2",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "logicTag" : "list",
-      "logicType" : "PFPLUGIN",
-      "name" : "member3",
-      "timer" : 333,
-      "triggerType" : "TIMER"
-    }, {
-      "logicTag" : "list",
-      "logicType" : "SCRIPT",
-      "name" : "member5",
-      "scriptCode" : "eeeee",
-      "triggerType" : "CUSTOM"
     } ],
     "getPSControlParam" : {
       "height" : 100.0,
@@ -1184,10 +1108,10 @@
     },
     "getPSDEListDataItems" : [ {
       "dataType" : 25,
-      "name" : "testname"
+      "name" : "testid"
     }, {
       "dataType" : 25,
-      "name" : "testid"
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -82,7 +82,7 @@
       }
     },
     "groupMode" : "NONE",
-    "hookEventNames" : [ "ONBEFORELOAD", "点击" ],
+    "hookEventNames" : [ "ONBEFORELOAD" ],
     "getItemPSLayoutPanel" : {
       "getAllPSPanelFields" : [ {
         "id" : "field_text_dynamic",
@@ -90,9 +90,6 @@
       }, {
         "id" : "field_text_dynamic1",
         "viewFieldName" : "TESTNAME"
-      }, {
-        "id" : "field_switch",
-        "viewFieldName" : "TESTID"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -116,7 +113,7 @@
         "caption" : "栅格容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_grid",
         "getPSLayout" : {
           "layout" : "SIMPLEFLEX"
         },
@@ -128,7 +125,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container2",
+          "name" : "container",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -138,7 +135,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -165,7 +162,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container3",
+          "name" : "container1",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -175,7 +172,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -198,41 +195,6 @@
             "hidden" : false,
             "showCaption" : false
           } ]
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container4",
-          "getPSLayout" : {
-            "childColLG" : -1,
-            "childColMD" : 24,
-            "childColSM" : -1,
-            "childColXS" : -1,
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 4,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "开关",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "field_switch",
-            "getPSEditor" : {
-              "editorType" : "SWITCH",
-              "name" : "field_switch",
-              "predefinedType" : "FIELD_SWITCH"
-            },
-            "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
-            },
-            "viewFieldName" : "TESTID",
-            "hidden" : false,
-            "showCaption" : false
-          } ]
         } ],
         "predefinedType" : "CONTAINER_GRID"
       } ],
@@ -352,44 +314,6 @@
         "uIActionTag" : "SaveChanges",
         "uIActionType" : "DEUIACTION"
       }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "simplelist",
-      "logicType" : "APPDEUILOGIC",
-      "name" : "member1",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "eventNames" : "点击",
-      "logicTag" : "simplelist",
-      "logicType" : "APPDEUILOGIC",
-      "name" : "member2",
-      "getPSAppDEUILogic" : {
-        "modelref" : true,
-        "id" : "UILogic1"
-      },
-      "getPSAppDataEntity" : {
-        "modelref" : true,
-        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
-      }
-    }, {
-      "logicTag" : "simplelist",
-      "logicType" : "PFPLUGIN",
-      "name" : "member3",
-      "timer" : 333,
-      "triggerType" : "TIMER"
-    }, {
-      "logicTag" : "simplelist",
-      "logicType" : "SCRIPT",
-      "name" : "member5",
-      "scriptCode" : "eeeee",
-      "triggerType" : "CUSTOM"
     } ],
     "getPSControlParam" : {
       "autoLoad" : true,
@@ -427,10 +351,10 @@
     } ],
     "getPSDEListDataItems" : [ {
       "dataType" : 25,
-      "name" : "testname"
+      "name" : "testid"
     }, {
       "dataType" : 25,
-      "name" : "testid"
+      "name" : "testname"
     }, {
       "dataType" : 25,
       "name" : "srfkey",

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

@@ -634,9 +634,6 @@
       }, {
         "id" : "field_text_dynamic1",
         "viewFieldName" : "TESTNAME"
-      }, {
-        "id" : "field_switch",
-        "viewFieldName" : "TESTID"
       } ],
       "codeName" : "Usr0522433048",
       "controlType" : "PANEL",
@@ -660,7 +657,7 @@
         "caption" : "栅格容器",
         "itemStyle" : "DEFAULT",
         "itemType" : "CONTAINER",
-        "name" : "container_grid1",
+        "name" : "container_grid",
         "getPSLayout" : {
           "layout" : "SIMPLEFLEX"
         },
@@ -672,7 +669,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container2",
+          "name" : "container",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -682,7 +679,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -709,7 +706,7 @@
           "caption" : "面板容器",
           "itemStyle" : "DEFAULT",
           "itemType" : "CONTAINER",
-          "name" : "container3",
+          "name" : "container1",
           "getPSLayout" : {
             "childColLG" : -1,
             "childColMD" : 24,
@@ -719,7 +716,7 @@
             "layout" : "TABLE_24COL"
           },
           "getPSLayoutPos" : {
-            "grow" : 4,
+            "grow" : 6,
             "layout" : "SIMPLEFLEX"
           },
           "getPSPanelItems" : [ {
@@ -742,41 +739,6 @@
             "hidden" : false,
             "showCaption" : false
           } ]
-        }, {
-          "caption" : "面板容器",
-          "itemStyle" : "DEFAULT",
-          "itemType" : "CONTAINER",
-          "name" : "container4",
-          "getPSLayout" : {
-            "childColLG" : -1,
-            "childColMD" : 24,
-            "childColSM" : -1,
-            "childColXS" : -1,
-            "columnCount" : 24,
-            "layout" : "TABLE_24COL"
-          },
-          "getPSLayoutPos" : {
-            "grow" : 4,
-            "layout" : "SIMPLEFLEX"
-          },
-          "getPSPanelItems" : [ {
-            "caption" : "开关",
-            "itemStyle" : "DEFAULT",
-            "itemType" : "FIELD",
-            "name" : "field_switch",
-            "getPSEditor" : {
-              "editorType" : "SWITCH",
-              "name" : "field_switch",
-              "predefinedType" : "FIELD_SWITCH"
-            },
-            "getPSLayoutPos" : {
-              "colMD" : 24,
-              "layout" : "TABLE_24COL"
-            },
-            "viewFieldName" : "TESTID",
-            "hidden" : false,
-            "showCaption" : false
-          } ]
         } ],
         "predefinedType" : "CONTAINER_GRID"
       } ],

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

@@ -3396,16 +3396,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {
@@ -5048,6 +5048,12 @@
     "viewType" : "DEEDITVIEW",
     "resource" : "BookType",
     "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "TEST",
+    "view" : "Usr6EditView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalViewLayout.json",
@@ -32993,6 +32999,10 @@
         "modelref" : true,
         "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTFormPickupDataView.json",
         "viewType" : "DEFORMPICKUPDATAVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
+        "viewType" : "DEEDITVIEW"
       } ],
       "getAllPSDEOPPrivs" : [ {
         "logicName" : "建立",