ibizdev提交

PSMODULES/Base/PSDATAENTITIES/ACCOUNT/PSDERS/DER1N_ACCOUNT__CONTACT__PRIMARYCONTACTID/PSDER.json

@@ -4,5 +4,7 @@
   "majorpsdename" : "CONTACT",
   "majorpsdeid" : "<PSMODULE>/CONTACT",
   "validflag" : 1,
-  "psdername" : "DER1N_ACCOUNT__CONTACT__PRIMARYCONTACTID"
+  "psdername" : "DER1N_ACCOUNT__CONTACT__PRIMARYCONTACTID",
+  "codename" : "PrimaryContact",
+  "foreignkey" : 0
 }
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/LEGAL/PSDATAENTITY.json

@@ -151,6 +151,42 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "ORGANIZATIONTYPE",
+    "psdatatypename" : "继承属性",
+    "validflag" : 1,
+    "derpsdefid" : "<PSMODULE>/ORGANIZATION/ORGANIZATIONTYPE",
+    "physicalfield" : 1,
+    "codename" : "OrganizationType",
+    "psdatatypeid" : "INHERIT",
+    "derpsdefname" : "ORGANIZATIONTYPE",
+    "pscodelistname" : "组织类型",
+    "pkey" : 0,
+    "length" : 60,
+    "logicname" : "组织类型",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "psdername" : "DERINHERIT_LEGAL_ORGANIZATION",
+    "pscodelistid" : "<PSMODULE>/OrganizationType",
+    "tablename" : "LEGAL",
+    "psderid" : "<PSDATAENTITY>/DERINHERIT_LEGAL_ORGANIZATION",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[ORGANIZATIONTYPE][组织类型]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[ORGANIZATIONTYPE][组织类型]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "ORGANIZATIONTYPE",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "UPDATEDATE",

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHY/PSDATAENTITY.json

@@ -85,6 +85,45 @@
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "OMHIERARCHYCATID",
+    "psdatatypename" : "外键值",
+    "validflag" : 1,
+    "derpsdefid" : "<PSMODULE>/OMHIERARCHYCAT/OMHIERARCHYCATID",
+    "physicalfield" : 1,
+    "codename" : "OMHierarchyCatId",
+    "psdatatypeid" : "PICKUP",
+    "derpsdefname" : "OMHIERARCHYCATID",
+    "pkey" : 0,
+    "logicname" : "实体标识",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 1,
+    "psdername" : "DER1N_OMHIERARCHY_OMHIERARCHYCAT_OMHIERARCHYCATID",
+    "tablename" : "OMHIERARCHY",
+    "psderid" : "<PSDATAENTITY>/DER1N_OMHIERARCHY_OMHIERARCHYCAT_OMHIERARCHYCATID",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[OMHIERARCHYCATID][实体标识]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[OMHIERARCHYCATID][实体标识]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "EQ",
+      "psdbvalueopname" : "等于(=)",
+      "psdefsfitemname" : "N_OMHIERARCHYCATID_EQ"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "OMHIERARCHYCATID",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
   }, {
     "enableuserinput" : 3,
     "psdefieldname" : "OMHIERARCHYID",

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHY/PSDERS/DER1N_OMHIERARCHY_OMHIERARCHYCAT_OMHIERARCHYCATID/PSDER.json

+{
+  "derfieldname" : "OMHIERARCHYCATID",
+  "dertype" : "DER1N",
+  "majorpsdename" : "OMHIERARCHYCAT",
+  "majorpsdeid" : "<PSMODULE>/OMHIERARCHYCAT",
+  "validflag" : 1,
+  "derfieldlname" : "实体标识",
+  "psdername" : "DER1N_OMHIERARCHY_OMHIERARCHYCAT_OMHIERARCHYCATID"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDATAENTITY.json

+{
+  "virtualflag" : 0,
+  "psdataentityname" : "OMHIERARCHYCAT",
+  "decat" : "DEFAULT",
+  "validflag" : 1,
+  "logicvalid" : 0,
+  "detype" : 1,
+  "svrpubmode" : 0,
+  "codename" : "OMHierarchyCat",
+  "noviewmode" : 1,
+  "storagemode" : 1,
+  "logicname" : "结构层次类别",
+  "existingmodel" : 0,
+  "enatempdata" : 0,
+  "systemflag" : 0,
+  "tablename" : "OMHIERARCHYCAT",
+  "psdedbcfgs" : [ {
+    "validflag" : 1,
+    "psdedbcfgname" : "MYSQL5"
+  } ],
+  "psdedrgroups" : [ {
+    "codename" : "Auto147",
+    "psdedrgroupname" : "详细信息",
+    "ordervalue" : 10000
+  } ],
+  "psdefields" : [ {
+    "enableuserinput" : 3,
+    "psdefieldname" : "CREATEDATE",
+    "psdatatypename" : "日期时间型",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "CreateDate",
+    "psdatatypeid" : "DATETIME",
+    "predefinetype" : "CREATEDATE",
+    "pkey" : 0,
+    "length" : 8,
+    "logicname" : "建立时间",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 0,
+    "fkey" : 0,
+    "tablename" : "OMHIERARCHYCAT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[CREATEDATE][建立时间]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[CREATEDATE][建立时间]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "CREATEDATE",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "CREATEMAN",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "CreateMan",
+    "psdatatypeid" : "TEXT",
+    "predefinetype" : "CREATEMAN",
+    "pkey" : 0,
+    "length" : 60,
+    "logicname" : "建立人",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 0,
+    "fkey" : 0,
+    "tablename" : "OMHIERARCHYCAT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[CREATEMAN][建立人]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[CREATEMAN][建立人]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "CREATEMAN",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "OMHIERARCHYCATID",
+    "psdatatypename" : "全局唯一标识，文本类型，用户不可见",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "OMHierarchyCatId",
+    "psdatatypeid" : "GUID",
+    "pkey" : 1,
+    "length" : 100,
+    "logicname" : " 结构层次类别标识",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 0,
+    "fkey" : 0,
+    "tablename" : "OMHIERARCHYCAT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[OMHIERARCHYCATID][实体标识]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[OMHIERARCHYCATID][实体标识]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "OMHIERARCHYCATID",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "OMHIERARCHYCATNAME",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "OMHierarchyCatName",
+    "psdatatypeid" : "TEXT",
+    "pkey" : 0,
+    "length" : 200,
+    "logicname" : " 结构层次类别名称",
+    "majorfield" : 1,
+    "deftype" : 1,
+    "allowempty" : 1,
+    "fkey" : 0,
+    "tablename" : "OMHIERARCHYCAT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[OMHIERARCHYCATNAME][实体名称]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[OMHIERARCHYCATNAME][实体名称]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefsfitems" : [ {
+      "psdeid" : "<PSDATAENTITY>",
+      "psdbvalueopid" : "LIKE",
+      "psdbvalueopname" : "文本包含(%)",
+      "psdefsfitemname" : "N_OMHIERARCHYCATNAME_LIKE"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "OMHIERARCHYCATNAME",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "UPDATEDATE",
+    "psdatatypename" : "日期时间型",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "UpdateDate",
+    "psdatatypeid" : "DATETIME",
+    "predefinetype" : "UPDATEDATE",
+    "pkey" : 0,
+    "length" : 8,
+    "logicname" : "更新时间",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 0,
+    "fkey" : 0,
+    "tablename" : "OMHIERARCHYCAT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[UPDATEDATE][更新时间]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[UPDATEDATE][更新时间]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "UPDATEDATE",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  }, {
+    "enableuserinput" : 3,
+    "psdefieldname" : "UPDATEMAN",
+    "psdatatypename" : "文本，可指定长度",
+    "validflag" : 1,
+    "physicalfield" : 1,
+    "codename" : "UpdateMan",
+    "psdatatypeid" : "TEXT",
+    "predefinetype" : "UPDATEMAN",
+    "pkey" : 0,
+    "length" : 60,
+    "logicname" : "更新人",
+    "majorfield" : 0,
+    "deftype" : 1,
+    "allowempty" : 0,
+    "fkey" : 0,
+    "tablename" : "OMHIERARCHYCAT",
+    "psdefformitems" : [ {
+      "psdefformitemname" : "[UPDATEMAN][更新人]",
+      "codename" : "Default",
+      "ftmode" : "DEFAULT"
+    }, {
+      "psdefformitemname" : "[UPDATEMAN][更新人]移动端默认",
+      "codename" : "MobileDefault",
+      "ftmode" : "MOBILEDEFAULT"
+    } ],
+    "psdefdtcols" : [ {
+      "psdefdtcolname" : "UPDATEMAN",
+      "customdatatype" : 0,
+      "dbtype" : "MYSQL5"
+    } ]
+  } ],
+  "psdeopprivs" : [ {
+    "logicname" : "建立",
+    "psdeopprivname" : "CREATE"
+  }, {
+    "logicname" : "删除",
+    "psdeopprivname" : "DELETE"
+  }, {
+    "logicname" : "读取",
+    "psdeopprivname" : "READ"
+  }, {
+    "logicname" : "更新",
+    "psdeopprivname" : "UPDATE"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACMODES/DEFAULT/PSDEACMODE.json

+{
+  "psdeacmodename" : "DEFAULT",
+  "codename" : "Default",
+  "defaultmode" : 1
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/CheckKey/PSDEACTION.json

+{
+  "logicname" : "CheckKey",
+  "psdeactionname" : "CheckKey",
+  "actiontype" : "BUILTIN",
+  "codename" : "CheckKey"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/Create/PSDEACTION.json

+{
+  "logicname" : "Create",
+  "psdeactionname" : "Create",
+  "actiontype" : "BUILTIN",
+  "codename" : "Create"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/Get/PSDEACTION.json

+{
+  "logicname" : "Get",
+  "psdeactionname" : "Get",
+  "actiontype" : "BUILTIN",
+  "codename" : "Get"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/GetDraft/PSDEACTION.json

+{
+  "logicname" : "GetDraft",
+  "psdeactionname" : "GetDraft",
+  "actiontype" : "BUILTIN",
+  "codename" : "GetDraft"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/Remove/PSDEACTION.json

+{
+  "logicname" : "Remove",
+  "psdeactionname" : "Remove",
+  "actiontype" : "BUILTIN",
+  "codename" : "Remove"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/Save/PSDEACTION.json

+{
+  "logicname" : "Save",
+  "psdeactionname" : "Save",
+  "actiontype" : "BUILTIN",
+  "codename" : "Save"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEACTIONS/Update/PSDEACTION.json

+{
+  "logicname" : "Update",
+  "psdeactionname" : "Update",
+  "actiontype" : "BUILTIN",
+  "codename" : "Update"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEDATAQUERIES/DEFAULT/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "DEFAULT",
+  "codename" : "Default",
+  "defaultmode" : 0,
+  "custommode" : 0,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "OMHIERARCHYCAT",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEDATAQUERIES/VIEW/PSDEDATAQUERY.json

+{
+  "privmode" : 0,
+  "psdedataqueryname" : "VIEW",
+  "logicname" : "默认（全部数据）",
+  "codename" : "View",
+  "defaultmode" : 0,
+  "custommode" : 0,
+  "viewcollevel" : 0,
+  "psdedqjoins" : [ {
+    "psdedqjoinname" : "OMHIERARCHYCAT",
+    "psdejointypeid" : "MAIN",
+    "joinpsdeid" : "<PSDATAENTITY>",
+    "mainflag" : 1,
+    "psdejointypename" : "主查询"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEDATARELATIONS/Default/PSDEDATARELATION.json

+{
+  "codename" : "Default",
+  "psdedatarelationname" : "实体默认关系界面组"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEDATASETS/DEFAULT/PSDEDATASET.json

+{
+  "codename" : "Default",
+  "defaultmode" : 1,
+  "psdedatasetname" : "DEFAULT",
+  "psdedsdqs" : [ {
+    "ordervalue" : 100,
+    "psdedqid" : "<PSDATAENTITY>/DEFAULT"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEFORMS/Default/PSDEFORM.json

+{
+  "formtype" : "SEARCHFORM",
+  "dynasysrefmode" : 0,
+  "codename" : "Default",
+  "psdeformname" : "默认搜索表单",
+  "mobflag" : 0,
+  "psdeformdetails" : [ {
+    "caption" : "常规条件",
+    "showcaption" : 0,
+    "psdeformdetailname" : "formpage1",
+    "detailtype" : "FORMPAGE",
+    "colmodel" : "33%;33%;34%"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEFORMS/Main/PSDEFORM.json

+{
+  "formtype" : "EDITFORM",
+  "dynasysrefmode" : 0,
+  "codename" : "Main",
+  "psdeformname" : "主编辑表单",
+  "mobflag" : 0,
+  "psdeformdetails" : [ {
+    "caption" : "基本信息",
+    "psdeformdetailname" : "formpage1",
+    "detailtype" : "FORMPAGE",
+    "psdeformdetails" : [ {
+      "caption" : "实体基本信息",
+      "psdeformdetailname" : "group1",
+      "detailtype" : "GROUPPANEL",
+      "psdeformid" : "<PSDEFORM>",
+      "colmodel" : "50%;50%"
+    } ]
+  }, {
+    "caption" : "其它",
+    "psdeformdetailname" : "formpage2",
+    "detailtype" : "FORMPAGE",
+    "psdeformdetails" : [ {
+      "caption" : "操作信息",
+      "psdeformdetailname" : "group2",
+      "detailtype" : "GROUPPANEL",
+      "psdeformid" : "<PSDEFORM>",
+      "colmodel" : "50%;50%"
+    } ]
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEGRIDS/Main/PSDEGRID.json

+{
+  "showheader" : 1,
+  "enablepagingbar" : 1,
+  "psdegridname" : "主表格",
+  "pagingsize" : 20,
+  "codename" : "Main"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDELISTS/MOB/PSDELIST.json

+{
+  "appenddeitems" : 1,
+  "logicname" : "移动端列表",
+  "psdelistname" : "MOB",
+  "psdedsid" : "<PSDATAENTITY>/DEFAULT",
+  "codename" : "Mob"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/EditView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEEDITVIEW",
+  "codename" : "EditView",
+  "predefineviewtype" : "EDITVIEW",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体编辑视图",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体编辑视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto51",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeformname" : "主编辑表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "FORM",
+    "psdeviewctrlname" : "FORM",
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主编辑表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto5",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/EditView2/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEEDITVIEW2",
+  "codename" : "EditView2",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体编辑视图（左右关系）",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体编辑视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "DRBAR",
+    "psdeviewctrlname" : "DRBAR",
+    "psdedrname" : "实体默认关系界面组",
+    "configinfo" : "[关系组]实体默认关系界面组",
+    "psdedrid" : "<PSDATAENTITY>/Default"
+  }, {
+    "psachandlerid" : "Auto51",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeformname" : "主编辑表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "FORM",
+    "psdeviewctrlname" : "FORM",
+    "psdeformid" : "<PSDATAENTITY>/Main",
+    "configinfo" : "[表单]主编辑表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认编辑界面）",
+    "psdetoolbarid" : "Auto5",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认编辑界面）"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/GridView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEGRIDVIEW",
+  "codename" : "GridView",
+  "predefineviewtype" : "MDATAVIEW",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体表格视图",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体表格视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto55",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdegridid" : "<PSDATAENTITY>/Main",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "GRID",
+    "psdeviewctrlname" : "GRID",
+    "psdegridname" : "主表格",
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+  }, {
+    "psachandlerid" : "Auto42",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeformname" : "默认搜索表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "SEARCHFORM",
+    "psdeviewctrlname" : "SEARCHFORM",
+    "psdeformid" : "<PSDATAENTITY>/Default",
+    "configinfo" : "[表单]默认搜索表单"
+  }, {
+    "psdetoolbarname" : "工具栏模板（默认表格界面）",
+    "psdetoolbarid" : "Auto8",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "TOOLBAR",
+    "psdeviewctrlname" : "TOOLBAR",
+    "configinfo" : "[工具栏]工具栏模板（默认表格界面）"
+  } ],
+  "psdeviewrvs" : [ {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
+    "refmodetext" : "编辑数据视图",
+    "psdeviewrvname" : "EDITDATA",
+    "defviewtype" : "EDITVIEW"
+  }, {
+    "minorpsdeviewid" : "<PSDATAENTITY>/EditView",
+    "refmodetext" : "新建数据视图",
+    "psdeviewrvname" : "NEWDATA",
+    "defviewtype" : "EDITVIEW"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/MPickupView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEMPICKUPVIEW",
+  "codename" : "MPickupView",
+  "predefineviewtype" : "MPICKUPVIEW",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体数据多项选择视图",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体数据多项选择视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeviewid" : "<PSDATAENTITY>/PickupGridView",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "PICKUPVIEWPANEL",
+    "psdeviewctrlname" : "PICKUPVIEWPANEL",
+    "configinfo" : "[实体视图]实体实体选择表格视图（部件视图）"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/PickupGridView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEPICKUPGRIDVIEW",
+  "codename" : "PickupGridView",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体选择表格视图（部件视图）",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体选择表格视图",
+  "psdeviewctrls" : [ {
+    "psachandlerid" : "Auto55",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeid" : "<PSDATAENTITY>",
+    "psdegridid" : "<PSDATAENTITY>/Main",
+    "enableviewactions" : 1,
+    "psdeviewctrltype" : "GRID",
+    "psdeviewctrlname" : "GRID",
+    "psdegridname" : "主表格",
+    "configinfo" : "[表格]主表格;[数据集合]DEFAULT",
+    "psdedatasetid" : "<PSDATAENTITY>/DEFAULT"
+  }, {
+    "psachandlerid" : "Auto42",
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeformname" : "默认搜索表单",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "SEARCHFORM",
+    "psdeviewctrlname" : "SEARCHFORM",
+    "psdeformid" : "<PSDATAENTITY>/Default",
+    "configinfo" : "[表单]默认搜索表单"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/PickupView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEPICKUPVIEW",
+  "codename" : "PickupView",
+  "predefineviewtype" : "PICKUPVIEW",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体数据选择视图",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体数据选择视图",
+  "psdeviewctrls" : [ {
+    "validflag" : 1,
+    "defaultflag" : 1,
+    "enabledynasys" : 0,
+    "psdeviewid" : "<PSDATAENTITY>/PickupGridView",
+    "psdeid" : "<PSDATAENTITY>",
+    "psdeviewctrltype" : "PICKUPVIEWPANEL",
+    "psdeviewctrlname" : "PICKUPVIEWPANEL",
+    "configinfo" : "[实体视图]实体实体选择表格视图（部件视图）"
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSDEVIEWBASES/RedirectView/PSDEVIEWBASE.json

+{
+  "psdeviewbasetype" : "DEREDIRECTVIEW",
+  "codename" : "RedirectView",
+  "predefineviewtype" : "REDIRECTVIEW",
+  "psappviewcnt" : 0,
+  "psdeviewbasename" : "实体实体数据重定向视图",
+  "readonlymode" : 0,
+  "dyncmode" : 0,
+  "title" : "实体数据重定向视图"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYCAT/PSHELPARTICLES/Auto149/PSHELPARTICLE.json

+{
+  "articletype" : "DEMODEL",
+  "pshelparticlename" : "[OMHIERARCHYCAT]模型说明",
+  "codename" : "Auto149",
+  "pshelpsections" : [ {
+    "validflag" : 1,
+    "codename" : "Auto5500",
+    "pshelpsectionname" : "概念",
+    "sectiontype" : "DECONCEPTS",
+    "ordervalue" : 100
+  }, {
+    "validflag" : 1,
+    "codename" : "Auto5499",
+    "pshelpsectionname" : "属性",
+    "sectiontype" : "DEFDESCS",
+    "ordervalue" : 200
+  }, {
+    "validflag" : 1,
+    "codename" : "Auto5498",
+    "pshelpsectionname" : "任务",
+    "sectiontype" : "DEMANUALS",
+    "ordervalue" : 300
+  } ]
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYPURPOSE/PSDATAENTITY.json

@@ -9,7 +9,7 @@
   "codename" : "OMHIERARCHYPURPOSE",
   "noviewmode" : 1,
   "storagemode" : 1,
-  "logicname" : "组织层次机构目的",
+  "logicname" : "组织层次结构应用",
   "existingmodel" : 0,
   "enatempdata" : 0,
   "systemflag" : 0,

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYPURPOSEREF/PSDATAENTITY.json

@@ -87,29 +87,29 @@
     } ]
   }, {
     "enableuserinput" : 3,
-    "psdefieldname" : "OMHIERARCHYID",
+    "psdefieldname" : "OMHIERARCHYCATID",
     "psdatatypename" : "外键值",
     "validflag" : 1,
-    "derpsdefid" : "<PSMODULE>/OMHIERARCHY/OMHIERARCHYID",
+    "derpsdefid" : "<PSMODULE>/OMHIERARCHYCAT/OMHIERARCHYCATID",
     "physicalfield" : 1,
-    "codename" : "OMHierarchyId",
+    "codename" : "OMHierarchyCatId",
     "psdatatypeid" : "PICKUP",
-    "derpsdefname" : "OMHIERARCHYID",
+    "derpsdefname" : "OMHIERARCHYCATID",
     "pkey" : 0,
-    "logicname" : "组织层次结构标识",
+    "logicname" : "实体标识",
     "majorfield" : 0,
     "deftype" : 1,
     "allowempty" : 1,
     "fkey" : 1,
-    "psdername" : "DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHY_OMHIERARCHYID",
+    "psdername" : "DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHYCAT_OMHIERARCHYCATID",
     "tablename" : "OMHIERARCHYPURPOSEREF",
-    "psderid" : "<PSDATAENTITY>/DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHY_OMHIERARCHYID",
+    "psderid" : "<PSDATAENTITY>/DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHYCAT_OMHIERARCHYCATID",
     "psdefformitems" : [ {
-      "psdefformitemname" : "[OMHIERARCHYID][组织层次结构标识]",
+      "psdefformitemname" : "[OMHIERARCHYCATID][实体标识]",
       "codename" : "Default",
       "ftmode" : "DEFAULT"
     }, {
-      "psdefformitemname" : "[OMHIERARCHYID][组织层次结构标识]移动端默认",
+      "psdefformitemname" : "[OMHIERARCHYCATID][实体标识]移动端默认",
       "codename" : "MobileDefault",
       "ftmode" : "MOBILEDEFAULT"
     } ],
@@ -117,10 +117,10 @@
       "psdeid" : "<PSDATAENTITY>",
       "psdbvalueopid" : "EQ",
       "psdbvalueopname" : "等于(=)",
-      "psdefsfitemname" : "N_OMHIERARCHYID_EQ"
+      "psdefsfitemname" : "N_OMHIERARCHYCATID_EQ"
     } ],
     "psdefdtcols" : [ {
-      "psdefdtcolname" : "OMHIERARCHYID",
+      "psdefdtcolname" : "OMHIERARCHYCATID",
       "customdatatype" : 0,
       "dbtype" : "MYSQL5"
     } ]

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYPURPOSEREF/PSDERS/DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHYCAT_OMHIERARCHYCATID/PSDER.json

+{
+  "derfieldname" : "OMHIERARCHYCATID",
+  "dertype" : "DER1N",
+  "majorpsdename" : "OMHIERARCHYCAT",
+  "majorpsdeid" : "<PSMODULE>/OMHIERARCHYCAT",
+  "validflag" : 1,
+  "derfieldlname" : "实体标识",
+  "psdername" : "DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHYCAT_OMHIERARCHYCATID"
+}
\ No newline at end of file

PSMODULES/Base/PSDATAENTITIES/OMHIERARCHYPURPOSEREF/PSDERS/DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHY_OMHIERARCHYID/PSDER.json

-{
-  "derfieldname" : "OMHIERARCHYID",
-  "dertype" : "DER1N",
-  "majorpsdename" : "OMHIERARCHY",
-  "majorpsdeid" : "<PSMODULE>/OMHIERARCHY",
-  "validflag" : 1,
-  "derfieldlname" : "组织层次结构标识",
-  "psdername" : "DER1N_OMHIERARCHYPURPOSEREF_OMHIERARCHY_OMHIERARCHYID"
-}
\ No newline at end of file

PSSYSERMAPS/OM/PSSYSERMAP.json

@@ -17,10 +17,16 @@
     "pssysermapnodename" : "LEGAL"
   }, {
     "psdeid" : "Base/OMHIERARCHY",
-    "toppos" : 378,
+    "toppos" : 498,
     "psdename" : "OMHIERARCHY",
-    "leftpos" : 193,
+    "leftpos" : 194,
     "pssysermapnodename" : "OMHIERARCHY"
+  }, {
+    "psdeid" : "Base/OMHIERARCHYCAT",
+    "toppos" : 383,
+    "psdename" : "OMHIERARCHYCAT",
+    "leftpos" : 193,
+    "pssysermapnodename" : "OMHIERARCHYCAT"
   }, {
     "psdeid" : "Base/OMHIERARCHYPURPOSE",
     "toppos" : 14,