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

e883bfde · ibizdev · 688b7ec5 · e883bfde · e883bfde · e883bfde
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book.json
@@ -820,6 +820,9 @@
  }, {
    "modelref" : true,
    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/Usr03117794TabExpView_DR.json"
+  }, {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/test2024815.json"
  } ],
  "getAllPSDEDataSets" : [ {
    "codeName" : "Default",
@@ -8092,6 +8095,12 @@
    "name" : "实体数据多项选择视图测试1",
    "realModelSubType" : "DEMPICKUPVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "Usr2TestMPickupView",
+    "logicName" : "书实体数据多项选择测试视图(树选择测试)",
+    "name" : "书实体数据多项选择测试视图(树选择测试)",
+    "realModelSubType" : "DEMPICKUPVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr12186283TreeGridView",
    "logicName" : "树表格测试",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/test2024815.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/test2024815.json
+{
+  "codeName" : "test2024815",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDATARELATIONS/test2024815.json",
+  "formCaption" : "书",
+  "name" : "测试关系界面组",
+  "getPSDEDRDetails" : [ {
+    "caption" : "书实体表格视图",
+    "detailType" : "DRITEM",
+    "name" : "test",
+    "orderValue" : 100,
+    "getPSDEDRItem" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Book/PSDEDRITEMS/UsrDRItem0311726913.json"
+    }
+  } ]
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2/PSGRIDS/Main.json
+{
+  "aggMode" : "NONE",
+  "codeName" : "Main",
+  "columnEnableFilter" : 2,
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "getCreatePSControlAction" : {
+    "actionName" : "Create",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "create",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Create"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2/PSGRIDS/Main.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "getGetDraftPSControlAction" : {
+    "actionName" : "GetDraft",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "CREATE",
+    "name" : "loaddraft",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "GetDraft"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "groupMode" : "NONE",
+  "logicName" : "主表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+  },
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "getCapPSLanguageRes" : {
+      "lanResTag" : "DEF.LNAME.BOOKCHILD2NAME"
+    },
+    "caption" : "图书子2名称",
+    "codeName" : "bookchild2name",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "bookchild2name",
+    "excelCaption" : "图书子2名称",
+    "name" : "bookchild2name",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "类型",
+    "codeName" : "type",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "type",
+    "excelCaption" : "类型",
+    "name" : "type",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/ModelRepository__CodeList44.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableRowEdit" : true,
+    "enableSort" : true
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "bookchild2name",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2ID",
+      "codeName" : "BOOKCHILD2Id"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2ID",
+      "codeName" : "BOOKCHILD2Id"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "bookid",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "图书子2名称",
+    "codeName" : "bookchild2name",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "bookchild2name",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2NAME",
+      "codeName" : "BOOKCHILD2Name"
+    },
+    "getPSEditor" : {
+      "editorType" : "TEXTBOX",
+      "maxLength" : 200,
+      "name" : "bookchild2name"
+    },
+    "allowEmpty" : true
+  }, {
+    "caption" : "类型",
+    "codeName" : "type",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "type",
+    "getPSAppDEField" : {
+      "name" : "TYPE",
+      "codeName" : "TYPE"
+    },
+    "getPSEditor" : {
+      "editorType" : "DROPDOWNLIST",
+      "name" : "type",
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/ModelRepository__CodeList44.json"
+      },
+      "singleSelect" : true
+    },
+    "allowEmpty" : false,
+    "needCodeListConfig" : true
+  }, {
+    "caption" : "图书子2标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKCHILD2ID",
+      "codeName" : "BOOKCHILD2Id"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingMode" : 1,
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "getUpdatePSControlAction" : {
+    "actionName" : "Update",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "UPDATE",
+    "name" : "update",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/BOOKCHILD2.json"
+    }
+  },
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : true,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : true,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "b1dca72ce843b7645e11a4b32c655a69",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json
@@ -4571,6 +4571,150 @@
    "reportType" : "USER",
    "defaultMode" : true
  } ],
+  "getAllPSAppDEUIActions" : [ {
+    "actionTarget" : "SINGLEDATA",
+    "caption" : "打开HTML界面",
+    "codeName" : "OpenHtml",
+    "frontProcessType" : "OPENHTMLPAGE",
+    "fullCodeName" : "Book_OpenHtml",
+    "htmlPageUrl" : "https://www.baidu.com",
+    "name" : "OpenHtml",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "OpenHtml",
+    "uIActionType" : "DEUIACTION",
+    "id" : "OpenHtml@Book"
+  }, {
+    "actionTarget" : "SINGLEKEY",
+    "caption" : "打开多数据卡片",
+    "codeName" : "dkdsjkp",
+    "frontPSAppView" : "无法获取指定应用视图，标识为[cc2625b5cd3e907f9c79b7defbaf45a1]，请确认实体视图[BOOK][书实体编辑视图(多数据部件测试_卡片11111)]已经添加到应用[模板发布]中",
+    "frontProcessType" : "TOP",
+    "fullCodeName" : "Book_dkdsjkp",
+    "name" : "打开多数据卡片",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Update"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "dkdsjkp",
+    "uIActionType" : "DEUIACTION",
+    "showBusyIndicator" : false,
+    "id" : "dkdsjkp@Book"
+  }, {
+    "actionTarget" : "SINGLEKEY",
+    "caption" : "打开多数据表单",
+    "codeName" : "opendsjbd",
+    "frontPSAppView" : "无法获取指定应用视图，标识为[a2f14a15d16f3675d2056cb000291f84]，请确认实体视图[BOOK][书实体编辑视图(多数据测试_表单)]已经添加到应用[模板发布]中",
+    "frontProcessType" : "TOP",
+    "fullCodeName" : "Book_opendsjbd",
+    "name" : "打开多数据表单",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "opendsjbd",
+    "uIActionType" : "DEUIACTION",
+    "id" : "opendsjbd@Book"
+  }, {
+    "actionTarget" : "SINGLEKEY",
+    "caption" : "打开多数据列表",
+    "codeName" : "opendsjlb",
+    "frontPSAppView" : "无法获取指定应用视图，标识为[dc0f1a5fad9e993f1c75b2f72ed3c927]，请确认实体视图[BOOK][书实体编辑视图(多数据部件测试_列表)]已经添加到应用[模板发布]中",
+    "frontProcessType" : "TOP",
+    "fullCodeName" : "Book_opendsjlb",
+    "name" : "打开多数据列表",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "opendsjlb",
+    "uIActionType" : "DEUIACTION",
+    "id" : "opendsjlb@Book"
+  }, {
+    "actionTarget" : "NONE",
+    "caption" : "项行为",
+    "codeName" : "panel_Usr0506765794_action1_click",
+    "fullCodeName" : "Book_panel_Usr0506765794_action1_click",
+    "name" : "项行为",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "CUSTOM",
+    "uIActionTag" : "panel_Usr0506765794_action1_click",
+    "uIActionType" : "DEUIACTION",
+    "id" : "panel_Usr0506765794_action1_click@Book"
+  }, {
+    "actionTarget" : "NONE",
+    "caption" : "项行为2",
+    "codeName" : "panel_Usr0506765794_action2_click",
+    "fullCodeName" : "Book_panel_Usr0506765794_action2_click",
+    "name" : "项行为2",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "CUSTOM",
+    "uIActionTag" : "panel_Usr0506765794_action2_click",
+    "uIActionType" : "DEUIACTION",
+    "id" : "panel_Usr0506765794_action2_click@Book"
+  }, {
+    "actionTarget" : "MULTIDATA",
+    "caption" : "测试多项",
+    "codeName" : "testMuti",
+    "fullCodeName" : "Book_testMuti",
+    "name" : "测试多项",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "BACKEND",
+    "uIActionTag" : "testMuti",
+    "uIActionType" : "DEUIACTION",
+    "enableConfirm" : true,
+    "id" : "testMuti@Book"
+  }, {
+    "actionTarget" : "MULTIKEY",
+    "caption" : "测试多项主键",
+    "codeName" : "testMutiKey",
+    "fullCodeName" : "Book_testMutiKey",
+    "name" : "测试多项主键",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "BACKEND",
+    "uIActionTag" : "testMutiKey",
+    "uIActionType" : "DEUIACTION",
+    "enableConfirm" : true,
+    "id" : "testMutiKey@Book"
+  } ],
  "getAllPSAppDEUILogics" : [ {
    "codeName" : "copyFormId",
    "defaultParamName" : "Default",
@@ -4901,6 +5045,18 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr3EditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json",
+    "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookRepeatEditView.json",
+    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsrPopoverEditView.json",
@@ -5068,5 +5224,88 @@
  "enableUIModify" : true,
  "enableUIRemove" : true,
  "enableWFActions" : false,
-  "major" : true
+  "major" : true,
+  "getAllPSAppDEUIActionGroups" : [ {
+    "name" : "打开多数据表单",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+    },
+    "getPSUIActionGroupDetails" : [ {
+      "caption" : "打开多数据列表",
+      "detailType" : "DEUIACTION",
+      "name" : "u3624d39",
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true,
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+        },
+        "modelref" : true,
+        "id" : "opendsjlb@Book"
+      }
+    }, {
+      "caption" : "打开多数据卡片",
+      "detailType" : "DEUIACTION",
+      "name" : "u7820387",
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true,
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+        },
+        "modelref" : true,
+        "id" : "dkdsjkp@Book"
+      }
+    }, {
+      "caption" : "打开多数据表单",
+      "detailType" : "DEUIACTION",
+      "name" : "u7d41599",
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true,
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+        },
+        "modelref" : true,
+        "id" : "opendsjbd@Book"
+      }
+    }, {
+      "caption" : "测试多项",
+      "detailType" : "DEUIACTION",
+      "name" : "u0bba3bd",
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true,
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+        },
+        "modelref" : true,
+        "id" : "testMuti@Book"
+      }
+    }, {
+      "caption" : "测试多项主键",
+      "detailType" : "DEUIACTION",
+      "name" : "u45f9d84",
+      "addSeparator" : false,
+      "showCaption" : true,
+      "showIcon" : true,
+      "getPSUIAction" : {
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+        },
+        "modelref" : true,
+        "id" : "testMutiKey@Book"
+      }
+    } ]
+  } ]
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSFORMS/Repeat.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSFORMS/Repeat.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSGRIDS/Main.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSGRIDS/Main.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSLISTS/Samplelist.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSLISTS/Samplelist.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSLISTS/Usr08024416ListView_List.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSLISTS/Usr08024416ListView_List.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSPANELS/Usr0506765794.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSPANELS/Usr0506765794.json
+{
+  "getAllPSPanelFields" : [ {
+    "id" : "field_text_dynamic",
+    "viewFieldName" : "dataitem"
+  } ],
+  "codeName" : "Usr0506765794",
+  "controlType" : "PANEL",
+  "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book/PSPANELS/Usr0506765794.json",
+  "layoutMode" : "FLEX",
+  "logicName" : "samplelist列表",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSLayout" : {
+    "layout" : "FLEX"
+  },
+  "getRootPSPanelItems" : [ {
+    "itemStyle" : "DEFAULT",
+    "itemType" : "CONTAINER",
+    "name" : "container1",
+    "getPSLayout" : {
+      "align" : "space-between",
+      "layout" : "FLEX"
+    },
+    "getPSLayoutPos" : {
+      "grow" : -1,
+      "layout" : "FLEX"
+    },
+    "getPSPanelItems" : [ {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container2",
+      "getPSLayout" : {
+        "layout" : "FLEX"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "caption" : "主文本",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "RAWITEM",
+        "name" : "srfmajortext",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSRawItem" : {
+          "name" : "srfmajortext"
+        },
+        "showCaption" : true
+      }, {
+        "caption" : "内容",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "RAWITEM",
+        "name" : "content",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSRawItem" : {
+          "name" : "content"
+        },
+        "showCaption" : true
+      } ]
+    }, {
+      "itemStyle" : "DEFAULT",
+      "itemType" : "CONTAINER",
+      "name" : "container3",
+      "getPSLayout" : {
+        "dir" : "row",
+        "layout" : "FLEX",
+        "vAlign" : "center"
+      },
+      "getPSLayoutPos" : {
+        "grow" : -1,
+        "layout" : "FLEX"
+      },
+      "getPSPanelItems" : [ {
+        "actionType" : "UIACTION",
+        "buttonStyle" : "DEFAULT",
+        "caption" : "项行为",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "BUTTON",
+        "name" : "action1",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "simplelist_itempanel_action1"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "NONE",
+          "caption" : "项行为",
+          "codeName" : "panel_Usr0506765794_action1_click",
+          "fullCodeName" : "Book_panel_Usr0506765794_action1_click",
+          "name" : "项行为",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+          },
+          "timeout" : 60000,
+          "uIActionMode" : "CUSTOM",
+          "uIActionTag" : "panel_Usr0506765794_action1_click",
+          "uIActionType" : "DEUIACTION",
+          "id" : "panel_Usr0506765794_action1_click@Book"
+        },
+        "tooltip" : "项行为",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true
+      }, {
+        "actionType" : "UIACTION",
+        "buttonStyle" : "DEFAULT",
+        "caption" : "项行为2",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "BUTTON",
+        "name" : "action2",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "simplelist_itempanel_action2"
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSUIAction" : {
+          "actionTarget" : "NONE",
+          "caption" : "项行为2",
+          "codeName" : "panel_Usr0506765794_action2_click",
+          "fullCodeName" : "Book_panel_Usr0506765794_action2_click",
+          "name" : "项行为2",
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/Book.json"
+          },
+          "timeout" : 60000,
+          "uIActionMode" : "CUSTOM",
+          "uIActionTag" : "panel_Usr0506765794_action2_click",
+          "uIActionType" : "DEUIACTION",
+          "id" : "panel_Usr0506765794_action2_click@Book"
+        },
+        "tooltip" : "项行为2",
+        "uIActionTarget" : "NONE",
+        "showCaption" : true
+      }, {
+        "caption" : "文本(动态)",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "FIELD",
+        "name" : "field_text_dynamic",
+        "getPSEditor" : {
+          "editorType" : "SPAN",
+          "name" : "field_text_dynamic",
+          "predefinedType" : "FIELD_TEXT_DYNAMIC",
+          "renderMode" : "TEXT_DYNAMIC",
+          "enableLinkView" : false
+        },
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "viewFieldName" : "dataitem"
+      } ]
+    } ]
+  } ],
+  "layoutPanel" : true,
+  "modelid" : "E0F9BAB5-7A37-4620-938E-B2AA4B0DE01D",
+  "modeltype" : "PSSYSVIEWPANEL"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookRepeatEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookRepeatEditView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr2TestMPickupView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr2TestMPickupView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
@@ -1657,6 +1657,27 @@
    "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
    "pluginType" : "AC_ITEM",
    "refMode" : "DEACMODE"
+  }, {
+    "name" : "测试列表绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "LIST_RENDER",
+      "pluginCode" : "testlistplugin"
+    },
+    "pluginCode" : "testlistplugin",
+    "pluginType" : "LIST_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "LIST"
+  }, {
+    "name" : "测试列表项绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "LIST_ITEMRENDER",
+      "pluginCode" : "testlistitemplugin"
+    },
+    "pluginCode" : "testlistitemplugin",
+    "pluginType" : "LIST_ITEMRENDER",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "LIST",
+    "refTag2" : "DATAITEM"
  }, {
    "name" : "测试向导面板绘制插件",
    "getPSSysPFPlugin" : {
@@ -1772,6 +1793,20 @@
    "templCode2" : "editor22222",
    "templCode3" : "editor3333",
    "templCode4" : "editor44444"
+  }, {
+    "name" : "编辑器插件test",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "editorTest"
+    },
+    "pluginCode" : "editorTest",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "refMode" : "CONTROL",
+    "refTag" : "LIST",
+    "templCode" : "editor11111",
+    "templCode2" : "editor22222",
+    "templCode3" : "editor3333",
+    "templCode4" : "editor44444"
  }, {
    "name" : "自定义登出",
    "getPSSysPFPlugin" : {
@@ -2587,6 +2622,12 @@
    "viewType" : "DEGRIDVIEW",
    "resource" : "TEST",
    "view" : "GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookGridView.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "Book",
+    "view" : "GridView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/RawMaterialEditView.json",
@@ -2641,6 +2682,12 @@
    "viewType" : "DEPICKUPGRIDVIEW",
    "resource" : "Student",
    "view" : "PickupGridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookRepeatEditView.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "Book",
+    "view" : "RepeatEditView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/phoneUsr0301842414TreeExpView.json",
@@ -2652,6 +2699,12 @@
    "path" : "PSSYSAPPS/TemplatePublish/PSAPPPORTALVIEWS/AppPortalView.json",
    "viewType" : "APPPORTALVIEW",
    "view" : "AppPortalView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW",
+    "resource" : "Book",
+    "view" : "Usr2TestMPickupView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/ReginfoUsr0423209603EditView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.simple.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.simple.json
@@ -145,6 +145,27 @@
    "pluginCode" : "DATA_PICKER_CUSTOM_SELECT",
    "pluginType" : "AC_ITEM",
    "refMode" : "DEACMODE"
+  }, {
+    "name" : "测试列表绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "LIST_RENDER",
+      "pluginCode" : "testlistplugin"
+    },
+    "pluginCode" : "testlistplugin",
+    "pluginType" : "LIST_RENDER",
+    "refMode" : "CONTROL",
+    "refTag" : "LIST"
+  }, {
+    "name" : "测试列表项绘制插件",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "LIST_ITEMRENDER",
+      "pluginCode" : "testlistitemplugin"
+    },
+    "pluginCode" : "testlistitemplugin",
+    "pluginType" : "LIST_ITEMRENDER",
+    "refMode" : "CONTROLITEM",
+    "refTag" : "LIST",
+    "refTag2" : "DATAITEM"
  }, {
    "name" : "测试向导面板绘制插件",
    "getPSSysPFPlugin" : {
@@ -260,6 +281,20 @@
    "templCode2" : "editor22222",
    "templCode3" : "editor3333",
    "templCode4" : "editor44444"
+  }, {
+    "name" : "编辑器插件test",
+    "getPSSysPFPlugin" : {
+      "pluginType" : "EDITOR_CUSTOMSTYLE",
+      "pluginCode" : "editorTest"
+    },
+    "pluginCode" : "editorTest",
+    "pluginType" : "EDITOR_CUSTOMSTYLE",
+    "refMode" : "CONTROL",
+    "refTag" : "LIST",
+    "templCode" : "editor11111",
+    "templCode2" : "editor22222",
+    "templCode3" : "editor3333",
+    "templCode4" : "editor44444"
  }, {
    "name" : "自定义登出",
    "getPSSysPFPlugin" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json
@@ -5805,6 +5805,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupView2.json",
    "viewType" : "DEPICKUPVIEW2"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr7EditView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_3.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main_3.json
@@ -157,6 +157,9 @@
      "name" : "FIELD18",
      "codeName" : "Field18"
    }
+  }, {
+    "id" : "formitem2",
+    "dataType" : 25
  }, {
    "id" : "field2",
    "dataType" : 25,
@@ -541,6 +544,40 @@
        },
        "allowEmpty" : true,
        "showCaption" : true
+      }, {
+        "codeName" : "formitem2",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "formitem2",
+        "noPrivDisplayMode" : 1,
+        "getPSEditor" : {
+          "editorParams" : {
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "ADDRESSPICKUP",
+          "name" : "formitem2",
+          "getPickupPSAppView" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+            "viewType" : "DEMPICKUPVIEW"
+          },
+          "enableAC" : false,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "childColMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr8EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr8EditView.json
@@ -260,6 +260,9 @@
        "name" : "FIELD18",
        "codeName" : "Field18"
      }
+    }, {
+      "id" : "formitem2",
+      "dataType" : 25
    }, {
      "id" : "field2",
      "dataType" : 25,
@@ -644,6 +647,40 @@
          },
          "allowEmpty" : true,
          "showCaption" : true
+        }, {
+          "codeName" : "formitem2",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "formitem2",
+          "noPrivDisplayMode" : 1,
+          "getPSEditor" : {
+            "editorParams" : {
+              "PICKUPVIEW" : "TRUE"
+            },
+            "editorType" : "ADDRESSPICKUP",
+            "name" : "formitem2",
+            "getPickupPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+              "viewType" : "DEMPICKUPVIEW"
+            },
+            "enableAC" : false,
+            "enablePickupView" : true,
+            "forceSelection" : true,
+            "showTrigger" : true
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 12,
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
        } ],
        "getPSLayout" : {
          "childColMD" : 24,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -36121,6 +36121,12 @@
    "viewType" : "DEEDITVIEW",
    "resource" : "BookType",
    "view" : "EditView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+    "viewType" : "DEMPICKUPVIEW",
+    "resource" : "Book",
+    "view" : "Usr2TestMPickupView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr6EditView.json",
@@ -113353,6 +113359,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookPickupView2.json",
        "viewType" : "DEPICKUPVIEW2"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2TestMPickupView.json",
+        "viewType" : "DEMPICKUPVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr7EditView.json",