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

ec1241e5 · ibizdev · 2809773b · ec1241e5 · ec1241e5 · ec1241e5
--- a/app_Web/swarm.yaml
+++ b/app_Web/swarm.yaml
@@ -3,7 +3,7 @@ services:
  trainsys-app-web:
    image: dstimage
    ports:
-      - "50100:80"
+      - "80:80"
    networks:
      - agent_network
    environment:

--- a/config.xml
+++ b/config.xml
@@ -55,15 +55,6 @@
 	  git clone -b master $para2 trainsys/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd trainsys/
-      mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
-      if [ -e app_Web/.dynamic ]
-      then
-          cd app_Web
-      else
-          cd app_Web/app
-      fi
-      sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
-      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth    
      </command>
    </hudson.tasks.Shell>
  </builders>

--- 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
@@ -3810,12 +3810,24 @@
    "name" : "测试实体实体列表视图（部件视图）",
    "realModelSubType" : "DELISTVIEW9",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "MPickupView2",
+    "logicName" : "多项数据选择视图左右关系",
+    "name" : "多项数据选择视图左右关系",
+    "realModelSubType" : "DEMPICKUPVIEW2",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr07063055MobListView",
    "logicName" : "移动端列表视图",
    "name" : "移动端列表视图",
    "realModelSubType" : "DEMOBLISTVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "MPickupView2_PickupGridView",
+    "logicName" : "多项数据选择视图左右关系_选择数据视图",
+    "name" : "多项数据选择视图左右关系_选择数据视图",
+    "realModelSubType" : "DEPICKUPGRIDVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "OptionView",
    "logicName" : "测试实体实体选项操作视图",

--- 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
@@ -6792,6 +6792,12 @@
    "name" : "书实体编辑视图(树选择测试)",
    "realModelSubType" : "DEEDITVIEW",
    "realModelType" : "PSDEVIEWBASE"
+  }, {
+    "codeName" : "RepeatEditView",
+    "logicName" : "重复器测试",
+    "name" : "重复器测试",
+    "realModelSubType" : "DEEDITVIEW",
+    "realModelType" : "PSDEVIEWBASE"
  }, {
    "codeName" : "Usr7EditView",
    "logicName" : "书实体编辑视图(多数据部件测试_卡片)",

--- 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
@@ -4100,6 +4100,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTabExpView9.json",
    "viewType" : "DETABEXPVIEW9"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
+    "viewType" : "DEEDITVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",

--- 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
@@ -3377,6 +3377,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPageAggGridView.json",
    "viewType" : "DEGRIDVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2_PickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
@@ -3477,6 +3481,10 @@
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTDEPanelViewLayout.json",
    "viewType" : "DEPANELVIEW"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2.json",
+    "viewType" : "DEMPICKUPVIEW2"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTKanbanView.json",

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/MPickupView2_PickupGridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/MPickupView2_PickupGridView_Grid.json
+{
+  "aggMode" : "NONE",
+  "codeName" : "MPickupView2_PickupGridView_Grid",
+  "columnEnableFilter" : 2,
+  "columnEnableLink" : 2,
+  "controlType" : "GRID",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/MPickupView2_PickupGridView_Grid.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "FetchDefault"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "groupMode" : "NONE",
+  "logicName" : "多项数据选择视图左右关系_选择数据视图_表格",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+  },
+  "getPSDEGridColumns" : [ {
+    "align" : "LEFT",
+    "cLConvertMode" : "NONE",
+    "caption" : "测试实体名称",
+    "codeName" : "testname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "testname",
+    "excelCaption" : "测试实体名称",
+    "name" : "testname",
+    "noPrivDisplayMode" : 1,
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    },
+    "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" : "testname",
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    }
+  }, {
+    "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" : "TESTID",
+      "codeName" : "TESTId"
+    }
+  }, {
+    "dataType" : 25,
+    "name" : "srfdataaccaction",
+    "getPSAppDEField" : {
+      "name" : "TESTID",
+      "codeName" : "TESTId"
+    },
+    "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "srfmajortext",
+    "getPSAppDEField" : {
+      "name" : "TESTNAME",
+      "codeName" : "TESTName"
+    }
+  } ],
+  "getPSDEGridEditItems" : [ {
+    "caption" : "测试实体标识",
+    "codeName" : "srfkey",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "srfkey",
+    "getPSAppDEField" : {
+      "name" : "TESTID",
+      "codeName" : "TESTId"
+    },
+    "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/TEST.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" : "F010CAEC-54A0-4319-A80B-859AA812273D",
+  "modeltype" : "PSDEGRID"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr08222584_SearchForm.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr08222584_SearchForm.json
+{
+  "codeName" : "Usr08222584_SearchForm",
+  "controlType" : "SEARCHFORM",
+  "defaultLabelWidth" : 130,
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSSEARCHFORMS/Usr08222584_SearchForm.json",
+  "logicName" : "多项数据选择视图左右关系_选择数据视图_搜索表单",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.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" : "734AB1FD-463D-4C56-A3D9-C7EB863C94D4",
+  "modeltype" : "PSDEFORM_SEARCHFORM"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/MPickupView2_TreeView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/MPickupView2_TreeView.json
+{
+  "codeName" : "MPickupView2_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/TEST.json"
+    }
+  },
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSTREEVIEWS/MPickupView2_TreeView.json",
+  "getFetchPSControlAction" : {
+    "modelref" : true,
+    "id" : "fetch",
+    "actionType" : "DEDATASET",
+    "name" : "fetch",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "getGetPSControlAction" : {
+    "modelref" : true,
+    "id" : "load",
+    "actionName" : "Get",
+    "actionType" : "DEACTION",
+    "dataAccessAction" : "READ",
+    "name" : "load",
+    "getPSAppDEMethod" : {
+      "modelref" : true,
+      "id" : "Get"
+    },
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
+    }
+  },
+  "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
+  "logicName" : "多项数据选择视图左右关系_树视图",
+  "getPSAppDataEntity" : {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.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/TEST.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/TEST.json"
+    }
+  },
+  "enableRootSelect" : false,
+  "outputIconDefault" : true,
+  "rootVisible" : false,
+  "modelid" : "70BB8543-EE30-478C-8131-AEE41BC13CF5",
+  "modeltype" : "PSDETREEVIEW"
+}
\ No newline at end of file
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView_Grid.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TESTGRID/PSGRIDS/Usr08223952GridView_Grid.json
@@ -67,6 +67,7 @@
    },
    "width" : 150,
    "widthUnit" : "PX",
+    "enableRowEdit" : true,
    "enableSort" : false
  }, {
    "align" : "LEFT",
@@ -95,6 +96,7 @@
    },
    "width" : 150,
    "widthUnit" : "PX",
+    "enableRowEdit" : true,
    "enableSort" : false
  }, {
    "align" : "LEFT",
@@ -120,6 +122,7 @@
    "valueFormat" : "YYYY-MM-DD HH:mm:ss",
    "width" : 150,
    "widthUnit" : "PX",
+    "enableRowEdit" : true,
    "enableSort" : false
  } ],
  "getPSDEGridDataItems" : [ {
@@ -168,6 +171,59 @@
    }
  } ],
  "getPSDEGridEditItems" : [ {
+    "caption" : "测试表格名称",
+    "codeName" : "testgridname",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "testgridname",
+    "getPSAppDEField" : {
+      "name" : "TESTGRIDNAME",
+      "codeName" : "TESTGRIDName"
+    },
+    "getPSEditor" : {
+      "editorType" : "TEXTBOX",
+      "maxLength" : 200,
+      "name" : "testgridname"
+    },
+    "allowEmpty" : true
+  }, {
+    "caption" : "更新人",
+    "codeName" : "updateman",
+    "enableCond" : 3,
+    "ignoreInput" : 3,
+    "name" : "updateman",
+    "getPSAppDEField" : {
+      "name" : "UPDATEMAN",
+      "codeName" : "UpdateMan"
+    },
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "updateman",
+      "getPSAppCodeList" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+      },
+      "enableLinkView" : false
+    },
+    "allowEmpty" : true,
+    "convertToCodeItemText" : true
+  }, {
+    "caption" : "更新时间",
+    "codeName" : "updatedate",
+    "enableCond" : 3,
+    "ignoreInput" : 0,
+    "name" : "updatedate",
+    "getPSAppDEField" : {
+      "name" : "UPDATEDATE",
+      "codeName" : "UpdateDate"
+    },
+    "getPSEditor" : {
+      "editorType" : "SPAN",
+      "name" : "updatedate",
+      "enableLinkView" : false
+    },
+    "allowEmpty" : true
+  }, {
    "caption" : "测试表格标识",
    "codeName" : "srfkey",
    "enableCond" : 3,

--- 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
@@ -71,7 +71,7 @@
    }
  } ],
  "getPSAppViewRefs" : [ {
-    "name" : "NEWDATA",
+    "name" : "EDITDATA",
    "realTitle" : "测试表格编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -79,7 +79,7 @@
      "viewType" : "DEEDITVIEW"
    }
  }, {
-    "name" : "EDITDATA",
+    "name" : "NEWDATA",
    "realTitle" : "测试表格编辑视图",
    "getRefPSAppView" : {
      "modelref" : true,
@@ -99,6 +99,67 @@
    "getPSControlParam" : {
      "id" : "TOOLBAR"
    },
+    "getPSDEToolbarItems" : [ {
+      "getCapPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TEXT.*.NEW",
+        "lanResType" : "TBB.TEXT",
+        "name" : "工具栏按钮文本[*.NEW]",
+        "refFlag" : true
+      },
+      "caption" : "新建",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "deuiaction3",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_deuiaction3"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf0f6@FontAwesome",
+        "cssClass" : "fa fa-file-text-o"
+      },
+      "getPSUIAction" : {
+        "getCapPSLanguageRes" : {
+          "defaultContent" : "新建",
+          "lanResTag" : "TBB.TEXT.*.NEW",
+          "lanResType" : "TBB.TEXT",
+          "name" : "工具栏按钮文本[*.NEW]",
+          "refFlag" : true
+        },
+        "caption" : "新建",
+        "codeName" : "New",
+        "fullCodeName" : "New",
+        "name" : "表格界面_新建操作",
+        "getPSSysImage" : {
+          "glyph" : "xf0f6@FontAwesome",
+          "cssClass" : "fa fa-file-text-o"
+        },
+        "predefinedType" : "GRIDVIEW_NEWACTION",
+        "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "defaultContent" : "新建",
+          "lanResTag" : "TBB.TOOLTIP.*.NEW",
+          "lanResType" : "TBB.TOOLTIP",
+          "name" : "工具栏按钮提示[*.NEW]",
+          "refFlag" : true
+        },
+        "uIActionMode" : "SYS",
+        "uIActionTag" : "New",
+        "uIActionType" : "DEUIACTION"
+      },
+      "tooltip" : "新建",
+      "getTooltipPSLanguageRes" : {
+        "defaultContent" : "新建",
+        "lanResTag" : "TBB.TOOLTIP.*.NEW",
+        "lanResType" : "TBB.TOOLTIP",
+        "name" : "工具栏按钮提示[*.NEW]",
+        "refFlag" : true
+      },
+      "showCaption" : true,
+      "showIcon" : true
+    } ],
    "xDataControlName" : "grid",
    "modelid" : "1A4F8562-DE58-4233-94B4-7A2AD215B3BF",
    "modeltype" : "PSDETOOLBAR"
@@ -258,6 +319,7 @@
      },
      "width" : 150,
      "widthUnit" : "PX",
+      "enableRowEdit" : true,
      "enableSort" : false
    }, {
      "align" : "LEFT",
@@ -286,6 +348,7 @@
      },
      "width" : 150,
      "widthUnit" : "PX",
+      "enableRowEdit" : true,
      "enableSort" : false
    }, {
      "align" : "LEFT",
@@ -311,6 +374,7 @@
      "valueFormat" : "YYYY-MM-DD HH:mm:ss",
      "width" : 150,
      "widthUnit" : "PX",
+      "enableRowEdit" : true,
      "enableSort" : false
    } ],
    "getPSDEGridDataItems" : [ {
@@ -359,6 +423,59 @@
      }
    } ],
    "getPSDEGridEditItems" : [ {
+      "caption" : "测试表格名称",
+      "codeName" : "testgridname",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "testgridname",
+      "getPSAppDEField" : {
+        "name" : "TESTGRIDNAME",
+        "codeName" : "TESTGRIDName"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "maxLength" : 200,
+        "name" : "testgridname"
+      },
+      "allowEmpty" : true
+    }, {
+      "caption" : "更新人",
+      "codeName" : "updateman",
+      "enableCond" : 3,
+      "ignoreInput" : 3,
+      "name" : "updateman",
+      "getPSAppDEField" : {
+        "name" : "UPDATEMAN",
+        "codeName" : "UpdateMan"
+      },
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "updateman",
+        "getPSAppCodeList" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
+        },
+        "enableLinkView" : false
+      },
+      "allowEmpty" : true,
+      "convertToCodeItemText" : true
+    }, {
+      "caption" : "更新时间",
+      "codeName" : "updatedate",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "name" : "updatedate",
+      "getPSAppDEField" : {
+        "name" : "UPDATEDATE",
+        "codeName" : "UpdateDate"
+      },
+      "getPSEditor" : {
+        "editorType" : "SPAN",
+        "name" : "updatedate",
+        "enableLinkView" : false
+      },
+      "allowEmpty" : true
+    }, {
      "caption" : "测试表格标识",
      "codeName" : "srfkey",
      "enableCond" : 3,

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2_PickupGridView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2_PickupGridView.json
--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json
--- 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
@@ -3457,6 +3457,12 @@
    "viewType" : "DEGRIDEXPVIEW",
    "resource" : "Phone",
    "view" : "GridExpView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2_PickupGridView.json",
+    "viewType" : "DEPICKUPGRIDVIEW",
+    "resource" : "TEST",
+    "view" : "MPickupView2_PickupGridView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEMPickupViewLayout.json",
@@ -4176,6 +4182,12 @@
    "viewType" : "DEPANELVIEW",
    "resource" : "TEST",
    "view" : "DEPanelViewLayout"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2.json",
+    "viewType" : "DEMPICKUPVIEW2",
+    "resource" : "TEST",
+    "view" : "MPickupView2"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2PickupGridView.json",
@@ -4188,6 +4200,12 @@
    "viewType" : "DETABEXPVIEW9",
    "resource" : "Book",
    "view" : "TabExpView9"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
+    "viewType" : "DEEDITVIEW",
+    "resource" : "Book",
+    "view" : "RepeatEditView"
  }, {
    "modelref" : true,
    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ViewLayoutModelRepositoryDEPickupGridViewLayout.json",
@@ -25328,6 +25346,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookTabExpView9.json",
        "viewType" : "DETABEXPVIEW9"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookRepeatEditView.json",
+        "viewType" : "DEEDITVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2DataView.json",
@@ -28906,6 +28928,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTPageAggGridView.json",
        "viewType" : "DEGRIDVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2_PickupGridView.json",
+        "viewType" : "DEPICKUPGRIDVIEW"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestChartView.json",
@@ -29006,6 +29032,10 @@
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTDEPanelViewLayout.json",
        "viewType" : "DEPANELVIEW"
+      }, {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTMPickupView2.json",
+        "viewType" : "DEMPICKUPVIEW2"
      }, {
        "modelref" : true,
        "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTKanbanView.json",