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

3ddd61de · ibizdev · 6d7abb97 · 3ddd61de · 3ddd61de · 3ddd61de
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/SongLanguage.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/SongLanguage.json
@@ -6,11 +6,28 @@
  "dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json",
  "emptyText" : "未定义",
  "name" : "歌曲语言",
+  "getPSCodeItems" : [ {
+    "codeName" : "Chinese",
+    "text" : "中文",
+    "value" : "Chinese"
+  }, {
+    "codeName" : "English",
+    "text" : "英语",
+    "value" : "English"
+  }, {
+    "codeName" : "Korean",
+    "text" : "韩语",
+    "value" : "Korean"
+  }, {
+    "codeName" : "Japanese",
+    "text" : "日语",
+    "value" : "Japanese"
+  } ],
  "getPSSystemModule" : {
    "modelref" : true,
    "path" : "PSMODULES/Test.json"
  },
-  "refFlag" : false,
+  "refFlag" : true,
  "systemTag" : "TrainSys",
  "codeItemValueNumber" : false,
  "enableCache" : true,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/Song.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/Song.json
@@ -381,6 +381,10 @@
    "length" : 60,
    "logicName" : "语言",
    "name" : "LANGUAGE",
+    "getPSCodeList" : {
+      "modelref" : true,
+      "path" : "PSMODULES/Test/PSCODELISTS/SongLanguage.json"
+    },
    "getPSDEDBTable" : {
      "modelref" : true,
      "id" : "Table"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/TEST.json
@@ -292,6 +292,54 @@
    },
    "tableType" : "MAIN"
  } ],
+  "getAllPSDEDataExports" : [ {
+    "codeName" : "DataExport",
+    "dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/TEST/PSDEDATAEXPS/DataExport.json",
+    "maxRowCount" : 1000,
+    "name" : "数据导出",
+    "getPSDEDataExportItems" : [ {
+      "caption" : "测试实体名称",
+      "format" : "%1$s",
+      "name" : "testname",
+      "getPSDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      }
+    }, {
+      "align" : "LEFT",
+      "caption" : "类型",
+      "format" : "%1$s",
+      "name" : "type",
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSMODULES/Test/PSCODELISTS/TestType.json"
+      },
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
+    }, {
+      "align" : "CENTER",
+      "caption" : "更新时间",
+      "format" : "%1$s",
+      "name" : "updatedate",
+      "getPSDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      }
+    }, {
+      "align" : "RIGHT",
+      "caption" : "金额",
+      "format" : "%1$s",
+      "name" : "amount",
+      "getPSDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      }
+    } ],
+    "enableBackend" : false,
+    "enableFront" : true
+  } ],
  "getAllPSDEDataQueries" : [ {
    "getAllPSDEDataQueryCodes" : [ {
      "modelref" : true,

--- 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
@@ -7074,12 +7074,24 @@
    "name" : "书实体编辑视图",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "BookMPickupView2_PickupGridView",
+    "logicName" : "书实体多项数据选择视图（左右关系）_选择数据视图",
+    "name" : "书实体多项数据选择视图（左右关系）_选择数据视图",
+    "realModelSubType" : "DEPICKUPGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "OptionView",
    "logicName" : "书实体选项操作视图",
    "name" : "书实体选项操作视图",
    "realModelSubType" : "DEOPTVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "BookMPickupView2",
+    "logicName" : "书实体多项数据选择视图（左右关系）",
+    "name" : "书实体多项数据选择视图（左右关系）",
+    "realModelSubType" : "DEMPICKUPVIEW2",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "DataView",
    "logicName" : "书实体数据视图",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/TESTGRID.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/TESTGRID.json
@@ -489,7 +489,6 @@
        "codeName" : "Default",
        "editorType" : "TEXTBOX",
        "name" : "[TEST3][属性3]",
-        "stringLength" : 100,
        "uIMode" : "DEFAULT"
      },
      "type" : "DEFAULT"
@@ -500,7 +499,6 @@
        "codeName" : "MobileDefault",
        "editorType" : "MOBTEXT",
        "name" : "[TEST3][属性3]移动端默认",
-        "stringLength" : 100,
        "uIMode" : "MOBILEDEFAULT",
        "mobileMode" : true
      },
@@ -513,20 +511,9 @@
      "getPSDEFVRGroupCondition" : {
        "condOp" : "AND",
        "condType" : "GROUP",
-        "name" : "默认组",
-        "getPSDEFVRConditions" : [ {
-          "condType" : "STRINGLENGTH",
-          "dEFName" : "TEST3",
-          "maxValue" : 100,
-          "name" : "默认字符串长度",
-          "ruleInfo" : "内容长度必须小于等于[100]",
-          "includeMaxValue" : true,
-          "includeMinValue" : false,
-          "keyCond" : true
-        } ],
-        "ruleInfo" : "内容长度必须小于等于[100]"
+        "name" : "默认组"
      },
-      "ruleInfo" : "内容长度必须小于等于[100]",
+      "ruleInfo" : "默认规则",
      "checkDefault" : true,
      "defaultMode" : true,
      "enableBackend" : true,
@@ -534,7 +521,7 @@
    } ],
    "codeName" : "Test3",
    "dEFType" : 1,
-    "dataType" : "TEXT",
+    "dataType" : "DECIMAL",
    "importOrder" : 1000,
    "length" : 100,
    "logicName" : "属性3",
@@ -548,8 +535,7 @@
      "id" : "TEST3"
    },
    "serviceCodeName" : "Test3",
-    "stdDataType" : 25,
-    "stringLength" : 100,
+    "stdDataType" : 6,
    "valueFormat" : "%1$s"
  }, {
    "getAllPSDEFDTColumns" : [ {
@@ -1349,8 +1335,7 @@
        "codeName" : "Test3"
      },
      "sourceType" : "DEFIELD",
-      "stdDataType" : 25,
-      "stringLength" : 100,
+      "stdDataType" : 6,
      "type" : "SIMPLE"
    }, {
      "logicName" : "属性4",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST.json
@@ -315,6 +315,69 @@
    "needResourceKey" : true,
    "noServiceCodeName" : true
  } ],
+  "getAllPSAppDEDataExports" : [ {
+    "codeName" : "DataExport",
+    "maxRowCount" : 1000,
+    "name" : "数据导出",
+    "getPSDEDataExportItems" : [ {
+      "caption" : "测试实体名称",
+      "format" : "%1$s",
+      "name" : "testname",
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "getPSDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      }
+    }, {
+      "align" : "LEFT",
+      "caption" : "类型",
+      "format" : "%1$s",
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Mob/PSAPPCODELISTS/TestType.json"
+      },
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
+    }, {
+      "align" : "CENTER",
+      "caption" : "更新时间",
+      "format" : "%1$s",
+      "name" : "updatedate",
+      "getPSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getPSDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      }
+    }, {
+      "align" : "RIGHT",
+      "caption" : "金额",
+      "format" : "%1$s",
+      "name" : "amount",
+      "getPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
+      "getPSDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      }
+    } ],
+    "enableBackend" : false,
+    "enableFront" : true
+  } ],
  "getAllPSAppDEDataSets" : [ {
    "codeName" : "FetchCodeListSet",
    "methodType" : "FETCH",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSSYSAPP.json
@@ -16152,6 +16152,69 @@
        "needResourceKey" : true,
        "noServiceCodeName" : true
      } ],
+      "getAllPSAppDEDataExports" : [ {
+        "codeName" : "DataExport",
+        "maxRowCount" : 1000,
+        "name" : "数据导出",
+        "getPSDEDataExportItems" : [ {
+          "caption" : "测试实体名称",
+          "format" : "%1$s",
+          "name" : "testname",
+          "getPSAppDEField" : {
+            "name" : "TESTNAME",
+            "codeName" : "TESTName"
+          },
+          "getPSDEField" : {
+            "name" : "TESTNAME",
+            "codeName" : "TESTName"
+          }
+        }, {
+          "align" : "LEFT",
+          "caption" : "类型",
+          "format" : "%1$s",
+          "name" : "type",
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          },
+          "getPSCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Mob/PSAPPCODELISTS/TestType.json"
+          },
+          "getPSDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          }
+        }, {
+          "align" : "CENTER",
+          "caption" : "更新时间",
+          "format" : "%1$s",
+          "name" : "updatedate",
+          "getPSAppDEField" : {
+            "name" : "UPDATEDATE",
+            "codeName" : "UpdateDate"
+          },
+          "getPSDEField" : {
+            "name" : "UPDATEDATE",
+            "codeName" : "UpdateDate"
+          }
+        }, {
+          "align" : "RIGHT",
+          "caption" : "金额",
+          "format" : "%1$s",
+          "name" : "amount",
+          "getPSAppDEField" : {
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
+          },
+          "getPSDEField" : {
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
+          }
+        } ],
+        "enableBackend" : false,
+        "enableFront" : true
+      } ],
      "getAllPSAppDEDataSets" : [ {
        "codeName" : "FetchCodeListSet",
        "methodType" : "FETCH",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/TestType.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/TestType.json
+{
+  "codeListTag" : "Test__TestType",
+  "codeListType" : "STATIC",
+  "codeName" : "TestType",
+  "dynaInstMode" : 0,
+  "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/TestType.json",
+  "emptyText" : "未定义",
+  "name" : "测试实体类型",
+  "getPSCodeItems" : [ {
+    "codeName" : "A",
+    "text" : "类型A",
+    "value" : "A"
+  }, {
+    "codeName" : "B",
+    "text" : "类型B",
+    "value" : "B"
+  }, {
+    "codeName" : "C",
+    "text" : "类型C",
+    "value" : "c"
+  } ],
+  "enableCache" : true
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST.json
@@ -315,6 +315,69 @@
    "needResourceKey" : true,
    "noServiceCodeName" : true
  } ],
+  "getAllPSAppDEDataExports" : [ {
+    "codeName" : "DataExport",
+    "maxRowCount" : 1000,
+    "name" : "数据导出",
+    "getPSDEDataExportItems" : [ {
+      "caption" : "测试实体名称",
+      "format" : "%1$s",
+      "name" : "testname",
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "getPSDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      }
+    }, {
+      "align" : "LEFT",
+      "caption" : "类型",
+      "format" : "%1$s",
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/TestType.json"
+      },
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
+    }, {
+      "align" : "CENTER",
+      "caption" : "更新时间",
+      "format" : "%1$s",
+      "name" : "updatedate",
+      "getPSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getPSDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      }
+    }, {
+      "align" : "RIGHT",
+      "caption" : "金额",
+      "format" : "%1$s",
+      "name" : "amount",
+      "getPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
+      "getPSDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      }
+    } ],
+    "enableBackend" : false,
+    "enableFront" : true
+  } ],
  "getAllPSAppDEDataSets" : [ {
    "codeName" : "FetchCodeListSet",
    "methodType" : "FETCH",

--- 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
@@ -62,6 +62,28 @@
    "name" : "云系统操作者",
    "predefinedType" : "OPERATOR",
    "enableCache" : true
+  }, {
+    "codeListTag" : "Test__TestType",
+    "codeListType" : "STATIC",
+    "codeName" : "TestType",
+    "dynaInstMode" : 0,
+    "dynaModelFilePath" : "PSSYSAPPS/TemplatePublish/PSAPPCODELISTS/TestType.json",
+    "emptyText" : "未定义",
+    "name" : "测试实体类型",
+    "getPSCodeItems" : [ {
+      "codeName" : "A",
+      "text" : "类型A",
+      "value" : "A"
+    }, {
+      "codeName" : "B",
+      "text" : "类型B",
+      "value" : "B"
+    }, {
+      "codeName" : "C",
+      "text" : "类型C",
+      "value" : "c"
+    } ],
+    "enableCache" : true
  }, {
    "codeListTag" : "common__UsrCodeList0129740128",
    "codeListType" : "STATIC",

--- 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
@@ -4188,6 +4188,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookWFDynaStartView.json",
    "viewType" : "DEWFDYNASTARTVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2.json",
+    "viewType" : "DEMPICKUPVIEW2"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07257969EditView.json",
@@ -4312,6 +4316,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
    "viewType" : "DEEDITVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2_PickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.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
@@ -164,6 +164,13 @@
      "name" : "FIELD38",
      "codeName" : "Field38"
    }
+  }, {
+    "id" : "field14",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "FIELD14",
+      "codeName" : "Field14"
+    }
  }, {
    "id" : "bookid",
    "hidden" : true,
@@ -454,7 +461,7 @@
      "detailType" : "GROUPPANEL",
      "name" : "grouppanel1",
      "getPSDEFormDetails" : [ {
-        "caption" : "左右选择（嵌入表格）",
+        "caption" : "左右选择（单选）",
        "codeName" : "field2",
        "dataType" : 25,
        "detailStyle" : "DEFAULT",
@@ -528,6 +535,40 @@
        },
        "allowEmpty" : true,
        "showCaption" : true
+      }, {
+        "caption" : "左右选择（多选）",
+        "codeName" : "field14",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "field14",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "FIELD14",
+          "codeName" : "Field14"
+        },
+        "getPSEditor" : {
+          "editorParams" : {
+            "PICKUPVIEW" : "TRUE"
+          },
+          "editorType" : "ADDRESSPICKUP",
+          "name" : "field14",
+          "enableAC" : false,
+          "enablePickupView" : true,
+          "forceSelection" : true,
+          "showTrigger" : true
+        },
+        "getPSLayoutPos" : {
+          "colLG" : 12,
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
      } ],
      "getPSLayout" : {
        "childColLG" : -1,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/BookMPickupView2_PickupGridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/BookMPickupView2_PickupGridView_Grid.json
+{
+  "aggMode" : "NONE",
+  "codeName" : "BookMPickupView2_PickupGridView_Grid",
+  "columnEnableFilter" : 2,
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/BookMPickupView2_PickupGridView_Grid.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    }
+  },
+  "groupMode" : "NONE",
+  "logicName" : "书实体多项数据选择视图（左右关系）_选择数据视图_表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "书名称",
+    "codeName" : "bookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "bookname",
+    "excelCaption" : "书名称",
+    "name" : "bookname",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "FRONT",
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updateman",
+    "excelCaption" : "更新人",
+    "name" : "updateman",
+    "noPrivDisplayMode" : 1,
+    "getPSAppCodeList" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+    },
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  }, {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "更新时间",
+    "codeName" : "updatedate",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "updatedate",
+    "excelCaption" : "更新时间",
+    "name" : "updatedate",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
+    "width" : 150,
+    "widthUnit" : "PX",
+    "enableSort" : true
+  } ],
+  "getPSDEGridDataItems" : [ {
+    "dataType" : 25,
+    "name" : "bookname",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    }
+  }, {
+    "format" : "YYYY-MM-DD HH:mm:ss",
+    "dataType" : 5,
+    "name" : "updatedate",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "phoneid",
+    "getPSAppDEField" : {
+      "name" : "PHONEID",
+      "codeName" : "PhoneId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "pbookid",
+    "getPSAppDEField" : {
+      "name" : "PBOOKID",
+      "codeName" : "Pbookid"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "BOOKNAME",
+      "codeName" : "BookName"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "书标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "BOOKID",
+      "codeName" : "BookId"
+    },
+    "getPSEditor" : {
+      "editorType" : "HIDDEN",
+      "name" : "srfkey"
+    },
+    "allowEmpty" : true
+  } ],
+  "pagingSize" : 20,
+  "getRemovePSControlAction" : {
+    "actionName" : "Remove",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "DELETE",
+    "name" : "remove",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Remove"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+    }
+  },
+  "sortMode" : "REMOTE",
+  "hasWFDataItems" : false,
+  "enableColFilter" : false,
+  "enableCustomized" : true,
+  "enableGroup" : false,
+  "enablePagingBar" : true,
+  "enableRowEdit" : false,
+  "enableRowEditOrder" : false,
+  "enableRowNew" : false,
+  "forceFit" : false,
+  "hideHeader" : false,
+  "noSort" : false,
+  "singleSelect" : false,
+  "modelid" : "C1701C3B-546C-40FA-B63E-B0558F1C23A8",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr09068994_SearchForm.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr09068994_SearchForm.json
+{
+  "codeName" : "Usr09068994_SearchForm",
+  "controlType" : "SEARCHFORM",
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSSEARCHFORMS/Usr09068994_SearchForm.json",
+  "logicName" : "书实体多项数据选择视图（左右关系）_选择数据视图_搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSDEFormPages" : [ {
+    "caption" : "常规条件",
+    "codeName" : "formpage1",
+    "detailStyle" : "DEFAULT",
+    "detailType" : "FORMPAGE",
+    "name" : "formpage1",
+    "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"
+  },
+  "searchButtonStyle" : "DEFAULT",
+  "tabHeaderPos" : "TOP",
+  "enableAdvanceSearch" : false,
+  "enableAutoSearch" : false,
+  "enableFilterSave" : false,
+  "noTabHeader" : true,
+  "modelid" : "EDE3BDCC-036A-4F85-A513-CF1351C6A95A",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/BookMPickupView2_TreeView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/BookMPickupView2_TreeView.json
+{
+  "codeName" : "BookMPickupView2_TreeView",
+  "controlType" : "TREEVIEW",
+  "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/Book.json"
+    }
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSTREEVIEWS/BookMPickupView2_TreeView.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.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/Book.json"
+    }
+  },
+  "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
+  "logicName" : "书实体多项数据选择视图（左右关系）_树视图",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
+  },
+  "getPSControlLogics" : [ {
+    "eventNames" : "SELECTIONCHANGE",
+    "logicTag" : "treeexpbar_tree",
+    "logicType" : "CUSTOM",
+    "name" : "treeexpbar_selectionchange"
+  }, {
+    "eventNames" : "LOAD",
+    "logicTag" : "treeexpbar_tree",
+    "logicType" : "CUSTOM",
+    "name" : "treeexpbar_load"
+  } ],
+  "getPSDETreeNodes" : [ {
+    "counterMode" : 0,
+    "name" : "默认根节点",
+    "nodeType" : "ROOT",
+    "nodeValue" : "root",
+    "text" : "默认根节点",
+    "treeNodeType" : "STATIC",
+    "hasPSDETreeNodeRSs" : false,
+    "appendPNodeId" : false,
+    "disableSelect" : false,
+    "enableCheck" : false,
+    "enableEditData" : false,
+    "enableNewData" : false,
+    "enableQuickCreate" : false,
+    "enableQuickSearch" : false,
+    "enableRemoveData" : false,
+    "enableViewData" : false,
+    "expandFirstOnly" : false,
+    "expanded" : false,
+    "rootNode" : true,
+    "selectFirstOnly" : false,
+    "selected" : false,
+    "id" : "ROOT"
+  } ],
+  "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/Book.json"
+    }
+  },
+  "treeGridMode" : 0,
+  "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/Book.json"
+    }
+  },
+  "enableRootSelect" : false,
+  "outputIconDefault" : true,
+  "rootVisible" : false,
+  "modelid" : "1A97736C-1357-4C7D-9899-8A9839834CCD",
+  "modeltype" : "PSDETREEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json
@@ -315,6 +315,69 @@
    "needResourceKey" : true,
    "noServiceCodeName" : true
  } ],
+  "getAllPSAppDEDataExports" : [ {
+    "codeName" : "DataExport",
+    "maxRowCount" : 1000,
+    "name" : "数据导出",
+    "getPSDEDataExportItems" : [ {
+      "caption" : "测试实体名称",
+      "format" : "%1$s",
+      "name" : "testname",
+      "getPSAppDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      },
+      "getPSDEField" : {
+        "name" : "TESTNAME",
+        "codeName" : "TESTName"
+      }
+    }, {
+      "align" : "LEFT",
+      "caption" : "类型",
+      "format" : "%1$s",
+      "name" : "type",
+      "getPSAppDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      },
+      "getPSCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/TestType.json"
+      },
+      "getPSDEField" : {
+        "name" : "TYPE",
+        "codeName" : "Type"
+      }
+    }, {
+      "align" : "CENTER",
+      "caption" : "更新时间",
+      "format" : "%1$s",
+      "name" : "updatedate",
+      "getPSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getPSDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      }
+    }, {
+      "align" : "RIGHT",
+      "caption" : "金额",
+      "format" : "%1$s",
+      "name" : "amount",
+      "getPSAppDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      },
+      "getPSDEField" : {
+        "name" : "AMOUNT",
+        "codeName" : "Amount"
+      }
+    } ],
+    "enableBackend" : false,
+    "enableFront" : true
+  } ],
  "getAllPSAppDEDataSets" : [ {
    "codeName" : "FetchCodeListSet",
    "methodType" : "FETCH",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID.json
@@ -392,7 +392,6 @@
        "codeName" : "Default",
        "editorType" : "TEXTBOX",
        "name" : "[TEST3][属性3]",
-        "stringLength" : 100,
        "uIMode" : "DEFAULT"
      },
      "type" : "DEFAULT"
@@ -403,7 +402,6 @@
        "codeName" : "MobileDefault",
        "editorType" : "MOBTEXT",
        "name" : "[TEST3][属性3]移动端默认",
-        "stringLength" : 100,
        "uIMode" : "MOBILEDEFAULT",
        "mobileMode" : true
      },
@@ -413,8 +411,7 @@
    "codeName" : "Test3",
    "logicName" : "属性3",
    "name" : "TEST3",
-    "stdDataType" : 25,
-    "stringLength" : 100
+    "stdDataType" : 6
  }, {
    "getAllPSAppDEFUIModes" : [ {
      "codeName" : "Default",
@@ -837,7 +834,7 @@
        "codeName" : "Test3"
      },
      "sourceType" : "DEFIELD",
-      "stdDataType" : 25,
+      "stdDataType" : 6,
      "type" : "SIMPLE"
    }, {
      "codeName" : "Test4",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSFORMS/Test.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSFORMS/Test.json
@@ -135,7 +135,7 @@
    }
  }, {
    "id" : "test3",
-    "dataType" : 25,
+    "dataType" : 6,
    "getPSAppDEField" : {
      "name" : "TEST3",
      "codeName" : "Test3"
@@ -251,7 +251,7 @@
      }, {
        "caption" : "属性3",
        "codeName" : "test3",
-        "dataType" : 25,
+        "dataType" : 6,
        "detailStyle" : "DEFAULT",
        "detailType" : "FORMITEM",
        "enableCond" : 3,
@@ -266,7 +266,6 @@
        },
        "getPSEditor" : {
          "editorType" : "TEXTBOX",
-          "maxLength" : 100,
          "name" : "test3"
        },
        "getPSLayoutPos" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView1_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView1_Grid.json
@@ -1420,7 +1420,7 @@
      "codeName" : "Test4"
    }
  }, {
-    "dataType" : 25,
+    "dataType" : 6,
    "name" : "test3",
    "getPSAppDEField" : {
      "name" : "TEST3",
@@ -1514,7 +1514,6 @@
    },
    "getPSEditor" : {
      "editorType" : "TEXTBOX",
-      "maxLength" : 100,
      "name" : "test3"
    },
    "allowEmpty" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr09053571GridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr09053571GridView_Grid.json
@@ -269,7 +269,7 @@
    }
  }, {
    "format" : "0.##%",
-    "dataType" : 25,
+    "dataType" : 6,
    "name" : "test3",
    "getPSAppDEField" : {
      "name" : "TEST3",
@@ -331,7 +331,6 @@
    },
    "getPSEditor" : {
      "editorType" : "TEXTBOX",
-      "maxLength" : 100,
      "name" : "test3"
    },
    "allowEmpty" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView.json
@@ -2172,7 +2172,7 @@
        "codeName" : "Test4"
      }
    }, {
-      "dataType" : 25,
+      "dataType" : 6,
      "name" : "test3",
      "getPSAppDEField" : {
        "name" : "TEST3",
@@ -2266,7 +2266,6 @@
      },
      "getPSEditor" : {
        "editorType" : "TEXTBOX",
-        "maxLength" : 100,
        "name" : "test3"
      },
      "allowEmpty" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView1.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr08223952GridView1.json
@@ -2172,7 +2172,7 @@
        "codeName" : "Test4"
      }
    }, {
-      "dataType" : 25,
+      "dataType" : 6,
      "name" : "test3",
      "getPSAppDEField" : {
        "name" : "TEST3",
@@ -2266,7 +2266,6 @@
      },
      "getPSEditor" : {
        "editorType" : "TEXTBOX",
-        "maxLength" : 100,
        "name" : "test3"
      },
      "allowEmpty" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr09053571GridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr09053571GridView.json
@@ -659,7 +659,7 @@
      }
    }, {
      "format" : "0.##%",
-      "dataType" : 25,
+      "dataType" : 6,
      "name" : "test3",
      "getPSAppDEField" : {
        "name" : "TEST3",
@@ -721,7 +721,6 @@
      },
      "getPSEditor" : {
        "editorType" : "TEXTBOX",
-        "maxLength" : 100,
        "name" : "test3"
      },
      "allowEmpty" : true

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr4EditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTGRIDUsr4EditView.json
@@ -830,7 +830,7 @@
      }
    }, {
      "id" : "test3",
-      "dataType" : 25,
+      "dataType" : 6,
      "getPSAppDEField" : {
        "name" : "TEST3",
        "codeName" : "Test3"
@@ -946,7 +946,7 @@
        }, {
          "caption" : "属性3",
          "codeName" : "test3",
-          "dataType" : 25,
+          "dataType" : 6,
          "detailStyle" : "DEFAULT",
          "detailType" : "FORMITEM",
          "enableCond" : 3,
@@ -961,7 +961,6 @@
          },
          "getPSEditor" : {
            "editorType" : "TEXTBOX",
-            "maxLength" : 100,
            "name" : "test3"
          },
          "getPSLayoutPos" : {

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTListView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTListView.json
@@ -42,6 +42,10 @@
    "engineCat" : "VIEW",
    "engineType" : "ListView",
    "name" : "engine"
+  }, {
+    "engineCat" : "CTRL",
+    "engineType" : "CtrlLoadTrigger",
+    "name" : "engine_list_default"
  } ],
  "getPSAppViewLogics" : [ {
    "logicTrigger" : "CUSTOM",
@@ -100,14 +104,6 @@
    "id" : "VMGroup"
  },
  "getPSAppViewRefs" : [ {
-    "name" : "EDITDATA",
-    "realTitle" : "测试实体编辑视图",
-    "getRefPSAppView" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
-      "viewType" : "DEEDITVIEW"
-    }
-  }, {
    "name" : "NEWDATA",
    "realTitle" : "图表测试",
    "getRefPSAppView" : {
@@ -115,6 +111,14 @@
      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
      "viewType" : "DECHARTVIEW"
    }
+  }, {
+    "name" : "EDITDATA",
+    "realTitle" : "测试实体编辑视图",
+    "getRefPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
+      "viewType" : "DEEDITVIEW"
+    }
  } ],
  "getPSControls" : [ {
    "codeName" : "Default",
@@ -797,7 +801,7 @@
      "id" : "fetch",
      "getADPSAppDELogic" : {
        "modelref" : true,
-        "id" : "FieldComputeLogic"
+        "id" : "singleData"
      },
      "actionType" : "DEDATASET",
      "name" : "fetch",
@@ -960,7 +964,7 @@
      }, {
        "getADPSAppDELogic" : {
          "modelref" : true,
-          "id" : "FieldComputeLogic"
+          "id" : "singleData"
        },
        "actionType" : "DEDATASET",
        "name" : "fetch",
@@ -1071,6 +1075,10 @@
      "modelid" : "7E30D365-A33A-4D4F-A61F-66C2DA6CC551",
      "modeltype" : "PSDETOOLBAR"
    } ],
+    "getPSDEDataExport" : {
+      "modelref" : true,
+      "id" : "DataExport"
+    },
    "getPSDEListDataItems" : [ {
      "dataType" : 25,
      "name" : "testid"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2_PickupGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2_PickupGridView.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
@@ -281,6 +281,13 @@
        "name" : "FIELD38",
        "codeName" : "Field38"
      }
+    }, {
+      "id" : "field14",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "FIELD14",
+        "codeName" : "Field14"
+      }
    }, {
      "id" : "bookid",
      "hidden" : true,
@@ -571,7 +578,7 @@
        "detailType" : "GROUPPANEL",
        "name" : "grouppanel1",
        "getPSDEFormDetails" : [ {
-          "caption" : "左右选择（嵌入表格）",
+          "caption" : "左右选择（单选）",
          "codeName" : "field2",
          "dataType" : 25,
          "detailStyle" : "DEFAULT",
@@ -645,6 +652,40 @@
          },
          "allowEmpty" : true,
          "showCaption" : true
+        }, {
+          "caption" : "左右选择（多选）",
+          "codeName" : "field14",
+          "dataType" : 25,
+          "detailStyle" : "DEFAULT",
+          "detailType" : "FORMITEM",
+          "enableCond" : 3,
+          "ignoreInput" : 0,
+          "labelPos" : "LEFT",
+          "labelWidth" : 130,
+          "name" : "field14",
+          "noPrivDisplayMode" : 1,
+          "getPSAppDEField" : {
+            "name" : "FIELD14",
+            "codeName" : "Field14"
+          },
+          "getPSEditor" : {
+            "editorParams" : {
+              "PICKUPVIEW" : "TRUE"
+            },
+            "editorType" : "ADDRESSPICKUP",
+            "name" : "field14",
+            "enableAC" : false,
+            "enablePickupView" : true,
+            "forceSelection" : true,
+            "showTrigger" : true
+          },
+          "getPSLayoutPos" : {
+            "colLG" : 12,
+            "colMD" : 24,
+            "layout" : "TABLE_24COL"
+          },
+          "allowEmpty" : true,
+          "showCaption" : true
        } ],
        "getPSLayout" : {
          "childColLG" : -1,

--- 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
@@ -3733,6 +3733,12 @@
    "viewType" : "DEGRIDVIEW9",
    "resource" : "BXDMX",
    "view" : "GridView9"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2.json",
+    "viewType" : "DEMPICKUPVIEW2",
+    "resource" : "Book",
+    "view" : "BookMPickupView2"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BXDEditView.json",
@@ -4614,6 +4620,12 @@
    "viewType" : "DECHARTVIEW",
    "resource" : "ViewLayoutModelRepository",
    "view" : "DEChartViewLayout"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2_PickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "Book",
+    "view" : "BookMPickupView2_PickupGridView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",
@@ -28791,6 +28803,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookWFDynaStartView.json",
        "viewType" : "DEWFDYNASTARTVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2.json",
+        "viewType" : "DEMPICKUPVIEW2"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr07257969EditView.json",
@@ -28915,6 +28931,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
        "viewType" : "DEEDITVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookMPickupView2_PickupGridView.json",
+        "viewType" : "DEPICKUPGRIDVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",
@@ -29435,6 +29455,69 @@
        "needResourceKey" : true,
        "noServiceCodeName" : true
      } ],
+      "getAllPSAppDEDataExports" : [ {
+        "codeName" : "DataExport",
+        "maxRowCount" : 1000,
+        "name" : "数据导出",
+        "getPSDEDataExportItems" : [ {
+          "caption" : "测试实体名称",
+          "format" : "%1$s",
+          "name" : "testname",
+          "getPSAppDEField" : {
+            "name" : "TESTNAME",
+            "codeName" : "TESTName"
+          },
+          "getPSDEField" : {
+            "name" : "TESTNAME",
+            "codeName" : "TESTName"
+          }
+        }, {
+          "align" : "LEFT",
+          "caption" : "类型",
+          "format" : "%1$s",
+          "name" : "type",
+          "getPSAppDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          },
+          "getPSCodeList" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/TestType.json"
+          },
+          "getPSDEField" : {
+            "name" : "TYPE",
+            "codeName" : "Type"
+          }
+        }, {
+          "align" : "CENTER",
+          "caption" : "更新时间",
+          "format" : "%1$s",
+          "name" : "updatedate",
+          "getPSAppDEField" : {
+            "name" : "UPDATEDATE",
+            "codeName" : "UpdateDate"
+          },
+          "getPSDEField" : {
+            "name" : "UPDATEDATE",
+            "codeName" : "UpdateDate"
+          }
+        }, {
+          "align" : "RIGHT",
+          "caption" : "金额",
+          "format" : "%1$s",
+          "name" : "amount",
+          "getPSAppDEField" : {
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
+          },
+          "getPSDEField" : {
+            "name" : "AMOUNT",
+            "codeName" : "Amount"
+          }
+        } ],
+        "enableBackend" : false,
+        "enableFront" : true
+      } ],
      "getAllPSAppDEDataSets" : [ {
        "codeName" : "FetchCodeListSet",
        "methodType" : "FETCH",
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSSERVICEAPIS/TrainSys.json
@@ -4027,8 +4027,7 @@
      "logicName" : "属性3",
      "name" : "TEST3",
      "orderValue" : 180,
-      "stdDataType" : 25,
-      "stringLength" : 100,
+      "stdDataType" : 6,
      "allowEmpty" : true,
      "enableCreate" : true,
      "enableModify" : true,